diff --git a/src/melee/db/dbcamera.c b/src/melee/db/dbcamera.c
index e266f1f28a..7a55c356b1 100644
--- a/src/melee/db/dbcamera.c
+++ b/src/melee/db/dbcamera.c
@@ -328,8 +328,6 @@ void fn_CheckCameraInfo(int player, int buttons_down, int buttons_pressed,
     }
 }
 
-/// #fn_802277E8
-
 static inline float cstick_threshold(float cstick, float val)
 {
     if (ABS(cstick) < val) {
diff --git a/src/melee/ft/chara/ftCommon/ftCo_CaptureWait.c b/src/melee/ft/chara/ftCommon/ftCo_CaptureWait.c
index 3f7bfcb6c2..157323dfb2 100644
--- a/src/melee/ft/chara/ftCommon/ftCo_CaptureWait.c
+++ b/src/melee/ft/chara/ftCommon/ftCo_CaptureWait.c
@@ -255,8 +255,6 @@ void ftCo_CaptureWaitLw_IASA(Fighter_GObj* gobj)
     fn_800DC014(gobj);
 }
 
-/// #ftCo_CaptureWaitLw_Phys
-
 static inline void ftCo_CaptureWaitLw_Phys_inline(Fighter_GObj* gobj)
 {
     register Fighter* temp_r31;
diff --git a/src/melee/ft/chara/ftCrazyHand/ftCh_SweepWait.c b/src/melee/ft/chara/ftCrazyHand/ftCh_SweepWait.c
index fe237b2674..cf3193022b 100644
--- a/src/melee/ft/chara/ftCrazyHand/ftCh_SweepWait.c
+++ b/src/melee/ft/chara/ftCrazyHand/ftCh_SweepWait.c
@@ -84,8 +84,6 @@ void ftCh_Slap_Phys(HSD_GObj* gobj)
     fp->self_vel.x += da->x40;
 }
 
-/// #fn_801577B4
-
 static void fn_801577B4(HSD_GObj* gobj)
 {
     Fighter* fp = GET_FIGHTER(gobj);
diff --git a/src/melee/ft/chara/ftKirby/ftkirby.c b/src/melee/ft/chara/ftKirby/ftkirby.c
index fba6cdef03..da5880f128 100644
--- a/src/melee/ft/chara/ftKirby/ftkirby.c
+++ b/src/melee/ft/chara/ftKirby/ftkirby.c
@@ -2810,8 +2810,6 @@ void ftKb_SpecialN_800EEEC4(HSD_GObj* gobj, FighterKind kind)
     }
 }
 
-/// #ftKb_SpecialN_800EEEC4
-
 void ftKb_UnkMtxFunc0(Fighter_GObj* gobj, int arg1, Mtx mtx)
 {
     Fighter* fp = gobj->user_data;
@@ -3771,7 +3769,6 @@ void ftKb_SpecialN_800F15D8(Fighter_GObj* gobj)
     Fighter_UpdateModelScale(gobj);
 }
 
-/// #ftKb_SpecialN_Enter
 void ftKb_SpecialN_Enter(Fighter_GObj* gobj)
 {
     Fighter* fp = GET_FIGHTER(gobj);
@@ -3783,7 +3780,6 @@ void ftKb_SpecialN_Enter(Fighter_GObj* gobj)
     }
 }
 
-/// #ftKb_SpecialAirN_Enter
 void ftKb_SpecialAirN_Enter(Fighter_GObj* gobj)
 {
     Fighter* fp = GET_FIGHTER(gobj);
diff --git a/src/melee/ft/chara/ftSeak/ftSk_SpecialHi.c b/src/melee/ft/chara/ftSeak/ftSk_SpecialHi.c
index 0a703cc46d..1c8bbd7970 100644
--- a/src/melee/ft/chara/ftSeak/ftSk_SpecialHi.c
+++ b/src/melee/ft/chara/ftSeak/ftSk_SpecialHi.c
@@ -122,18 +122,6 @@ void ftSk_SpecialAirHi_Enter(HSD_GObj* gobj)
     ftAnim_8006EBA4(gobj);
 }
 
-/// #fn_80112ED8
-
-/// #ftSk_SpecialHi_80112F48
-
-/// #ftSk_SpecialHi_80112FA8
-
-/// #fn_80113038
-
-/// #ftSk_SpecialHi_Enter
-
-/// #ftSk_SpecialAirHi_Enter
-
 void ftSk_SpecialHiStart_0_Anim(HSD_GObj* gobj)
 {
     if (!ftAnim_IsFramesRemaining(gobj)) {
diff --git a/src/melee/ft/ft_0892.c b/src/melee/ft/ft_0892.c
index 96756e4909..8b822d555a 100644
--- a/src/melee/ft/ft_0892.c
+++ b/src/melee/ft/ft_0892.c
@@ -37,8 +37,6 @@ typedef struct {
     u8 x11_b0 : 1;
 } UnkStruct89768;
 
-/// #ft_800892D4
-
 void ft_800892D4(Fighter* arg0)
 {
     union Struct2070 spC;
@@ -84,8 +82,6 @@ void ft_800892D4(Fighter* arg0)
     arg0->x2074.x2088 = 0;
 }
 
-/// #ft_80089460
-
 void ft_80089460(Fighter* fp)
 {
     *(s32*) &fp->x2074.x2074_vec.x = 0;
diff --git a/src/melee/gm/gm_1832.c b/src/melee/gm/gm_1832.c
index 665c1e5628..a1bbf7a72d 100644
--- a/src/melee/gm/gm_1832.c
+++ b/src/melee/gm/gm_1832.c
@@ -1379,8 +1379,6 @@ void fn_801874FC(void)
     lb_80011E24(jobj, &lbl_804736B0.xC, 6, -1);
 }
 
-/// #fn_801874FC
-
 #ifdef MUST_MATCH
 #pragma push
 #pragma dont_inline on
diff --git a/src/melee/gm/gmallstar.c b/src/melee/gm/gmallstar.c
index e6ed521313..e9f744acb5 100644
--- a/src/melee/gm/gmallstar.c
+++ b/src/melee/gm/gmallstar.c
@@ -721,8 +721,6 @@ void gm_801B5F50(GameModeState* arg0)
     lbDvd_800174BC();
 }
 
-/// #gm_801B5F50
-
 void gm_801B5FB4(GameModeState* arg0)
 {
     CSSData* temp_r31 = gm_GetGameSceneLeaveData(arg0);
diff --git a/src/melee/gm/gmevent.c b/src/melee/gm/gmevent.c
index e4f450e9eb..fcc5ab08f0 100644
--- a/src/melee/gm/gmevent.c
+++ b/src/melee/gm/gmevent.c
@@ -1099,11 +1099,9 @@ void gm_801BC00C(void)
 }
 
 static u8 gm_803DF918[] = {
-    0x00, 0x11, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
-    0x0B, 0x0C, 0x0D, 0x24, 0x0F, 0x10, 0x01, 0x12, 0x13, 0x14, 0x15,
-    0x1A, 0x17, 0x18, 0x19, 0x16, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
-    0x21, 0x2F, 0x23, 0x0E, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B,
-    0x2C, 0x2D, 0x2E, 0x22, 0x30, 0x31, 0x32,
+    0,  17, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 36, 15, 16,
+    1,  18, 19, 20, 21, 26, 23, 24, 25, 22, 27, 28, 29, 30, 31, 32, 33,
+    47, 35, 14, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 34, 48, 49, 50,
 };
 
 static gm_803DF94C_t gm_804D4330 = { gm_801BC754, NULL };
@@ -2549,8 +2547,6 @@ void gm_801BEA88(int arg0, int arg1)
     }
 }
 
-/// #gm_801BEA88
-
 void gm_801BEAF0(int arg0)
 {
     gm_801BEA10(arg0);
diff --git a/src/melee/gm/gmtou_1.c b/src/melee/gm/gmtou_1.c
index 002736102e..2a161008fc 100644
--- a/src/melee/gm/gmtou_1.c
+++ b/src/melee/gm/gmtou_1.c
@@ -1767,8 +1767,6 @@ void fn_8019A158(void)
     }
 }
 
-/// #fn_8019A158_end
-
 void fn_8019A71C(s32* state, u32 unused1, u32 unused2)
 {
     u32* counter = &lbl_804799D8.x0;
diff --git a/src/melee/gm/gmtoulib.c b/src/melee/gm/gmtoulib.c
index 8304f3eef5..36186d8ef9 100644
--- a/src/melee/gm/gmtoulib.c
+++ b/src/melee/gm/gmtoulib.c
@@ -2052,8 +2052,6 @@ int fn_8018F410(void)
     return char_id;
 }
 
-/// #fn_8018F410
-
 #ifdef MUST_MATCH
 #pragma push
 #pragma auto_inline off
@@ -2606,8 +2604,6 @@ void fn_80190520(f32 x, f32 y, f32 z)
 #pragma pop
 #endif
 
-/// #fn_80190520
-
 static inline int gm_801905F0_inline0(int c_kind)
 {
     if (c_kind < CKIND_SEAK) {
diff --git a/src/melee/gr/grfourside.c b/src/melee/gr/grfourside.c
index a78b889af3..3bae8ea700 100644
--- a/src/melee/gr/grfourside.c
+++ b/src/melee/gr/grfourside.c
@@ -162,7 +162,6 @@ bool grFourside_801F2DC8(void)
     return false;
 }
 
-/// #grFourside_801F2DD0
 HSD_GObj* grFourside_801F2DD0(int gobj_id)
 {
     HSD_GObj* gobj;
@@ -210,7 +209,6 @@ void grFourside_801F2F2C(Ground_GObj* arg) {}
 
 void grFourside_801F2F30(Ground_GObj* arg) {}
 
-/// #grFourside_801F2F34
 void grFourside_801F2F34(Ground_GObj* gobj)
 {
     HSD_GObj* pHVar1;
@@ -286,7 +284,6 @@ void grFourside_801F314C(Ground_GObj* arg) {}
 
 void grFourside_801F3150(Ground_GObj* arg) {}
 
-/// #grFourside_801F3154
 void grFourside_801F3154(Ground_GObj* gobj)
 {
     Ground* gp = GET_GROUND(gobj);
@@ -476,7 +473,6 @@ static inline HSD_JObj* grFourside_GetCraneIron(HSD_GObj* gobj)
     return Ground_801C3FA4(gobj, 4);
 }
 
-/// #grFourside_801F3274
 void grFourside_801F3274(Ground_GObj* gobj)
 {
     Ground* gp = GET_GROUND(gobj);
diff --git a/src/melee/gr/gronett.c b/src/melee/gr/gronett.c
index 1d1b0a8897..3687eebb14 100644
--- a/src/melee/gr/gronett.c
+++ b/src/melee/gr/gronett.c
@@ -948,7 +948,6 @@ void grOnett_801E5538(Ground_GObj* gobj)
     }
 }
 
-/// #grOnett_801E56FC
 DynamicModelDesc* grOnett_801E56FC(void)
 {
     UnkArchiveStruct* archive = grDatFiles_801C6330(0x1);
diff --git a/src/melee/gr/grvenom.c b/src/melee/gr/grvenom.c
index d8f225d7ba..cccf16c543 100644
--- a/src/melee/gr/grvenom.c
+++ b/src/melee/gr/grvenom.c
@@ -1721,8 +1721,6 @@ void grVenom_80206874(Ground_GObj* gobj)
     gp->u.venom.xFC = 0;
 }
 
-/// #grVenom_80206874
-
 bool grVenom_80206B68(Ground_GObj* arg)
 {
     return false;
diff --git a/src/melee/it/items/itevyoshiegg.c b/src/melee/it/items/itevyoshiegg.c
index a4f490cb55..2f6da5d217 100644
--- a/src/melee/it/items/itevyoshiegg.c
+++ b/src/melee/it/items/itevyoshiegg.c
@@ -152,7 +152,6 @@ bool itEvyoshiegg_UnkMotion3_Coll(Item_GObj* gobj)
     return false;
 }
 
-/// #itEvyoshiegg_UnkMotion5_Anim
 bool itEvyoshiegg_UnkMotion5_Anim(Item_GObj* gobj)
 {
     Item* ip = GET_ITEM(gobj);
diff --git a/src/melee/it/items/itgamewatchrescue.c b/src/melee/it/items/itgamewatchrescue.c
index 16d17d3671..4e45a8ba61 100644
--- a/src/melee/it/items/itgamewatchrescue.c
+++ b/src/melee/it/items/itgamewatchrescue.c
@@ -90,7 +90,6 @@ void it_802C8208(HSD_GObj* hsd_gobj, enum_t msid)
     Item_802694CC(hsd_gobj);
 }
 
-/// #itGamewatchrescue_UnkMotion1_Anim
 bool itGamewatchrescue_UnkMotion1_Anim(Item_GObj* item_gobj)
 {
     Item* item1;
diff --git a/src/melee/it/items/ittincle.c b/src/melee/it/items/ittincle.c
index ff39de40c5..512ec92838 100644
--- a/src/melee/it/items/ittincle.c
+++ b/src/melee/it/items/ittincle.c
@@ -626,8 +626,6 @@ void it_802EC4D0(Item_GObj* gobj)
     Item_80268E5C(gobj, 10, 2);
 }
 
-/// #itTincle_UnkMotion10_Anim
-
 bool itTincle_UnkMotion10_Anim(Item_GObj* gobj)
 {
     Item* ip = GET_ITEM(gobj);
diff --git a/src/melee/lb/lbcardgame.c b/src/melee/lb/lbcardgame.c
index a499a4c6c8..cd82573778 100644
--- a/src/melee/lb/lbcardgame.c
+++ b/src/melee/lb/lbcardgame.c
@@ -90,8 +90,6 @@ u32 lb_8001C87C(void)
                        &lb_803BAB60, &_p(x4));
 }
 
-/// #lb_8001C87C
-
 int lb_8001C8BC(void)
 {
     HSD_ASSERT(0x140, _p(enable));
diff --git a/src/melee/mn/mnstagesel.c b/src/melee/mn/mnstagesel.c
index 1d37646a79..d691940e9e 100644
--- a/src/melee/mn/mnstagesel.c
+++ b/src/melee/mn/mnstagesel.c
@@ -368,9 +368,6 @@ void fn_8025A974(HSD_GObj* gobj, int unused)
     HSD_FogSet(gobj->hsd_obj);
 }
 
-/// OnLoad
-/// #mnStageSel_Scene_OnEnter
-
 static const Vec3 mnStageSel_803B8550 = { 0, -13, 0 };
 
 static inline void make_stage_icon(HSD_JObj** out)