summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-01-25 12:24:14 -0800
committerGitHub <noreply@github.com>2022-01-25 21:24:14 +0100
commit612f26c132280da43ecfa5fa8c8cc32966f06eb6 (patch)
treeac20d071712cf830ec526222c98d340d90721f77 /asm
parent6f4d068f1d7c5a9f25f1920e64e5b10dc29aea07 (diff)
d_kankyo_wether / d_eye_hl (#178)
* d_eye_hl / d_kankyo_wether wip * more d_kankyo_wether + format * remove asm * some d_kankyo wip * fix dccs vtable * some m_Do_graphic / d_meter2_draw work
Diffstat (limited to 'asm')
-rw-r--r--asm/d/cc/d_cc_s/Ct__4dCcSFv.s14
-rw-r--r--asm/d/cc/d_cc_s/Draw__4dCcSFv.s16
-rw-r--r--asm/d/cc/d_cc_s/Dt__4dCcSFv.s9
-rw-r--r--asm/d/cc/d_cc_s/MassClear__4dCcSFv.s10
-rw-r--r--asm/d/cc/d_cc_s/Move__4dCcSFv.s9
-rw-r--r--asm/d/d_eye_hl/entry__12dEyeHL_mng_cFP8dEyeHL_c.s10
-rw-r--r--asm/d/d_eye_hl/entry__8dEyeHL_cFP12J3DModelDataPCc.s55
-rw-r--r--asm/d/d_eye_hl/remove__12dEyeHL_mng_cFP8dEyeHL_c.s25
-rw-r--r--asm/d/d_eye_hl/remove__8dEyeHL_cFv.s9
-rw-r--r--asm/d/kankyo/d_kankyo/Sndpos__18dScnKy_env_light_cFv.s18
-rw-r--r--asm/d/kankyo/d_kankyo/__ct__18dScnKy_env_light_cFv.s71
-rw-r--r--asm/d/kankyo/d_kankyo/__ct__19GB_MAPLE_COL_CHANGEFv.s15
-rw-r--r--asm/d/kankyo/d_kankyo/__dt__10BOSS_LIGHTFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo/__dt__13DUNGEON_LIGHTFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo/__dt__15WIND_INF_ENTITYFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_FiveSenses_fullthrottle_dark__Fv.s9
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_WolfPowerup_AmbCol__FP11_GXColorS10.s8
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10.s118
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_daynight_check__Fv.s18
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_getDarktime_hour__Fv.s16
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_getDarktime_week__Fv.s5
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_get_parcent__Ffff.s9
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_getdaytime_hour__Fv.s12
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_light_influence_col__Fi.s12
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_light_influence_pos__Fi.s17
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_light_influence_power__Fi.s11
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_light_influence_yuragi__Fi.s11
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_light_size_get__FPCc.s57
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_plight_near_pos__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_sense_pat_get__Fv.s509
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_setLight_again__Fv.s9
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_setLight_nowroom__Fc.s16
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_shadow_mode_check__FUc.s7
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_shadow_mode_reset__FUc.s7
-rw-r--r--asm/d/kankyo/d_kankyo/dKy_shadow_mode_set__FUc.s7
-rw-r--r--asm/d/kankyo/d_kankyo/darkmist_init__Fv.s13
-rw-r--r--asm/d/kankyo/d_kankyo/drawKankyo__18dScnKy_env_light_cFv.s21
-rw-r--r--asm/d/kankyo/d_kankyo/getDarkDaytime__18dScnKy_env_light_cFv.s3
-rw-r--r--asm/d/kankyo/d_kankyo/plight_init__Fv.s32
-rw-r--r--asm/d/kankyo/d_kankyo/undwater_init__Fv.s80
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__10EF_MUD_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__10VRKUMO_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__11EF_EVIL_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__12EF_ODOUR_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_mud_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_sun_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_evil_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_rain_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_snow_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_star_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_cloud_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_housi_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_odour_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__21dKankyo_vrkumo_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__22dKankyo_sunlenz_PacketFv.s36
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__8RAIN_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__8SNOW_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__8STAR_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__9CLOUD_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/__dt__9HOUSI_EFFFv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Cloud_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Housi_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Odour_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Rain_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Snow_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Star_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Sun_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Sunlenz_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_Vrkumo_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_custom_windpower__Ff.s5
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawCloud__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawHousi__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawRain__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawSnow__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawStar__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawSun__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawSunlenz__Fi.s20
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_drawVrkumo__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_evil_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_evil_packet__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set__Fss.s8
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set_go__Fv.s6
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_pow__Fv.s5
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vec__Fv.s5
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vecpow__Fv.s26
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_mud_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_mud_packet__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_odour_packet__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_set__FP14WIND_INFLUENCE.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_cut__FP14WIND_INFLUENCE.s15
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_get_info__FP4cXyzP4cXyzPf.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_init__Fv.s24
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_set__FP14WIND_INFLUENCE.s12
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_rain_set__Fi.s6
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListIndScreen__FP9J3DPacketi.s23
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListSky__FP9J3DPacketi.s39
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListXluBg__FP9J3DPacketi.s37
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketList__FP9J3DPacketi.s23
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_shstar_Draw__Fv.s10
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_shstar_packet__Fi.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete2__Fv.s27
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete__Fv.s180
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw2__Fv.s17
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw__Fv.s111
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_init2__Fv.s7
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_init__Fv.s327
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_move__Fv.s9
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw2__Fv.s9
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw__Fv.s42
-rw-r--r--asm/d/kankyo/d_kankyo_wether/dKyw_wind_init__Fv.s18
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_mud_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_sun_PacketFv.s15
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_evil_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_rain_PacketFv.s19
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_snow_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_star_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_cloud_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_housi_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_odour_PacketFv.s13
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__21dKankyo_vrkumo_PacketFv.s14
-rw-r--r--asm/d/kankyo/d_kankyo_wether/draw__22dKankyo_sunlenz_PacketFv.s15
-rw-r--r--asm/d/kankyo/d_kankyo_wether/pntwind_set__FP14WIND_INFLUENCE.s29
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_evil__Fv.s87
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_housi__Fv.s327
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_moya__Fv.s114
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_mud__Fv.s85
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_odour__Fv.s115
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_snow__Fv.s40
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_star__Fv.s247
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_sun__Fv.s367
-rw-r--r--asm/d/kankyo/d_kankyo_wether/wether_move_thunder__Fv.s30
-rw-r--r--asm/d/map/d_map_path/__dt__Q28dMpath_n18dTexObjAggregate_cFv.s22
-rw-r--r--asm/d/map/d_map_path/__sinit_d_map_path_cpp.s25
-rw-r--r--asm/d/map/d_map_path/drawBack__18dRenderingFDAmap_cCFv.s56
-rw-r--r--asm/d/map/d_map_path/preRenderingMap__18dRenderingFDAmap_cFv.s103
-rw-r--r--asm/d/map/d_map_path/renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class.s184
-rw-r--r--asm/d/meter/d_meter2_draw/__dt__13dMeter2Draw_cFv.s908
-rw-r--r--asm/d/meter/d_meter2_draw/drawButtonS__13dMeter2Draw_cFUc.s22
-rw-r--r--asm/d/meter/d_meter2_draw/exec__13dMeter2Draw_cFUl.s121
-rw-r--r--asm/d/meter/d_meter2_draw/getButtonTimer__13dMeter2Draw_cFv.s4
-rw-r--r--asm/d/meter/d_meter2_draw/getCanoeFishing__13dMeter2Draw_cFv.s31
-rw-r--r--asm/d/meter/d_meter2_draw/getFishingType__13dMeter2Draw_cFv.s21
-rw-r--r--asm/d/meter/d_meter2_draw/getNumberTexture__13dMeter2Draw_cFi.s23
-rw-r--r--asm/d/meter/d_meter2_draw/getPlayerSubject__13dMeter2Draw_cFv.s6
-rw-r--r--asm/d/meter/d_meter2_draw/init__13dMeter2Draw_cFv.s241
-rw-r--r--asm/d/meter/d_meter2_draw/isButtonVisible__13dMeter2Draw_cFv.s16
-rw-r--r--asm/d/meter/d_meter2_draw/playPikariBckAnimation__13dMeter2Draw_cFf.s33
-rw-r--r--asm/d/meter/d_meter2_draw/playPikariBpkAnimation__13dMeter2Draw_cFf.s23
-rw-r--r--asm/d/meter/d_meter2_draw/setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s53
-rw-r--r--asm/m_Do/m_Do_graphic/beginRender__13mDoGph_gInf_cFv.s20
-rw-r--r--asm/m_Do/m_Do_graphic/create__Q213mDoGph_gInf_c7bloom_cFv.s47
-rw-r--r--asm/m_Do/m_Do_graphic/dScnPly_BeforeOfPaint__Fv.s12
-rw-r--r--asm/m_Do/m_Do_graphic/drawItem3D__Fv.s31
-rw-r--r--asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFf.s10
-rw-r--r--asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFfR8_GXColor.s23
-rw-r--r--asm/m_Do/m_Do_graphic/fadeOut_f__13mDoGph_gInf_cFfR8_GXColor.s23
-rw-r--r--asm/m_Do/m_Do_graphic/mDoGph_BeforeOfDraw__Fv.s10
-rw-r--r--asm/m_Do/m_Do_graphic/mDoGph_Create__Fv.s24
-rw-r--r--asm/m_Do/m_Do_graphic/mDoGph_drawFilterQuad__FScSc.s37
-rw-r--r--asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFPA4_Cf.s13
-rw-r--r--asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFv.s11
-rw-r--r--asm/m_Do/m_Do_graphic/remove__Q213mDoGph_gInf_c7bloom_cFv.s24
163 files changed, 0 insertions, 6947 deletions
diff --git a/asm/d/cc/d_cc_s/Ct__4dCcSFv.s b/asm/d/cc/d_cc_s/Ct__4dCcSFv.s
deleted file mode 100644
index 709c4dc315..0000000000
--- a/asm/d/cc/d_cc_s/Ct__4dCcSFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_80085ED4:
-/* 80085ED4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80085ED8 7C 08 02 A6 */ mflr r0
-/* 80085EDC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80085EE0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80085EE4 7C 7F 1B 78 */ mr r31, r3
-/* 80085EE8 48 1D EB AD */ bl Ct__4cCcSFv
-/* 80085EEC 38 7F 28 4C */ addi r3, r31, 0x284c
-/* 80085EF0 4B FF F6 F5 */ bl Ct__12dCcMassS_MngFv
-/* 80085EF4 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80085EF8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80085EFC 7C 08 03 A6 */ mtlr r0
-/* 80085F00 38 21 00 10 */ addi r1, r1, 0x10
-/* 80085F04 4E 80 00 20 */ blr
diff --git a/asm/d/cc/d_cc_s/Draw__4dCcSFv.s b/asm/d/cc/d_cc_s/Draw__4dCcSFv.s
deleted file mode 100644
index db2ff8ff84..0000000000
--- a/asm/d/cc/d_cc_s/Draw__4dCcSFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_800872D0:
-/* 800872D0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800872D4 7C 08 02 A6 */ mflr r0
-/* 800872D8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800872DC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 800872E0 7C 7F 1B 78 */ mr r31, r3
-/* 800872E4 4B FF FF C9 */ bl DrawAfter__4dCcSFv
-/* 800872E8 7F E3 FB 78 */ mr r3, r31
-/* 800872EC 48 1D EA 45 */ bl DrawClear__4cCcSFv
-/* 800872F0 38 7F 28 4C */ addi r3, r31, 0x284c
-/* 800872F4 4B FF E9 FD */ bl Clear__12dCcMassS_MngFv
-/* 800872F8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 800872FC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80087300 7C 08 03 A6 */ mtlr r0
-/* 80087304 38 21 00 10 */ addi r1, r1, 0x10
-/* 80087308 4E 80 00 20 */ blr
diff --git a/asm/d/cc/d_cc_s/Dt__4dCcSFv.s b/asm/d/cc/d_cc_s/Dt__4dCcSFv.s
deleted file mode 100644
index f3f51ae19d..0000000000
--- a/asm/d/cc/d_cc_s/Dt__4dCcSFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80085F08:
-/* 80085F08 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80085F0C 7C 08 02 A6 */ mflr r0
-/* 80085F10 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80085F14 48 1D EC 4D */ bl Dt__4cCcSFv
-/* 80085F18 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80085F1C 7C 08 03 A6 */ mtlr r0
-/* 80085F20 38 21 00 10 */ addi r1, r1, 0x10
-/* 80085F24 4E 80 00 20 */ blr
diff --git a/asm/d/cc/d_cc_s/MassClear__4dCcSFv.s b/asm/d/cc/d_cc_s/MassClear__4dCcSFv.s
deleted file mode 100644
index bae8667241..0000000000
--- a/asm/d/cc/d_cc_s/MassClear__4dCcSFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8008730C:
-/* 8008730C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80087310 7C 08 02 A6 */ mflr r0
-/* 80087314 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80087318 38 63 28 4C */ addi r3, r3, 0x284c
-/* 8008731C 4B FF E9 D5 */ bl Clear__12dCcMassS_MngFv
-/* 80087320 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80087324 7C 08 03 A6 */ mtlr r0
-/* 80087328 38 21 00 10 */ addi r1, r1, 0x10
-/* 8008732C 4E 80 00 20 */ blr
diff --git a/asm/d/cc/d_cc_s/Move__4dCcSFv.s b/asm/d/cc/d_cc_s/Move__4dCcSFv.s
deleted file mode 100644
index 66379e7f2c..0000000000
--- a/asm/d/cc/d_cc_s/Move__4dCcSFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_800872B0:
-/* 800872B0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800872B4 7C 08 02 A6 */ mflr r0
-/* 800872B8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800872BC 48 1D EA 11 */ bl Move__4cCcSFv
-/* 800872C0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800872C4 7C 08 03 A6 */ mtlr r0
-/* 800872C8 38 21 00 10 */ addi r1, r1, 0x10
-/* 800872CC 4E 80 00 20 */ blr
diff --git a/asm/d/d_eye_hl/entry__12dEyeHL_mng_cFP8dEyeHL_c.s b/asm/d/d_eye_hl/entry__12dEyeHL_mng_cFP8dEyeHL_c.s
deleted file mode 100644
index 1b819a6003..0000000000
--- a/asm/d/d_eye_hl/entry__12dEyeHL_mng_cFP8dEyeHL_c.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8009CB14:
-/* 8009CB14 80 8D 8A 28 */ lwz r4, m_obj__12dEyeHL_mng_c(r13)
-/* 8009CB18 28 04 00 00 */ cmplwi r4, 0
-/* 8009CB1C 41 82 00 08 */ beq lbl_8009CB24
-/* 8009CB20 90 64 00 0C */ stw r3, 0xc(r4)
-lbl_8009CB24:
-/* 8009CB24 80 0D 8A 28 */ lwz r0, m_obj__12dEyeHL_mng_c(r13)
-/* 8009CB28 90 03 00 10 */ stw r0, 0x10(r3)
-/* 8009CB2C 90 6D 8A 28 */ stw r3, m_obj__12dEyeHL_mng_c(r13)
-/* 8009CB30 4E 80 00 20 */ blr
diff --git a/asm/d/d_eye_hl/entry__8dEyeHL_cFP12J3DModelDataPCc.s b/asm/d/d_eye_hl/entry__8dEyeHL_cFP12J3DModelDataPCc.s
deleted file mode 100644
index 50e67403ce..0000000000
--- a/asm/d/d_eye_hl/entry__8dEyeHL_cFP12J3DModelDataPCc.s
+++ /dev/null
@@ -1,55 +0,0 @@
-lbl_8009C964:
-/* 8009C964 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 8009C968 7C 08 02 A6 */ mflr r0
-/* 8009C96C 90 01 00 24 */ stw r0, 0x24(r1)
-/* 8009C970 39 61 00 20 */ addi r11, r1, 0x20
-/* 8009C974 48 2C 58 61 */ bl _savegpr_27
-/* 8009C978 7C 7B 1B 78 */ mr r27, r3
-/* 8009C97C 7C BC 2B 78 */ mr r28, r5
-/* 8009C980 83 E4 00 6C */ lwz r31, 0x6c(r4)
-/* 8009C984 83 C4 00 70 */ lwz r30, 0x70(r4)
-/* 8009C988 28 1F 00 00 */ cmplwi r31, 0
-/* 8009C98C 41 82 00 74 */ beq lbl_8009CA00
-/* 8009C990 28 1E 00 00 */ cmplwi r30, 0
-/* 8009C994 41 82 00 6C */ beq lbl_8009CA00
-/* 8009C998 3B A0 00 00 */ li r29, 0
-/* 8009C99C 48 00 00 54 */ b lbl_8009C9F0
-lbl_8009C9A0:
-/* 8009C9A0 7F C3 F3 78 */ mr r3, r30
-/* 8009C9A4 7F A4 EB 78 */ mr r4, r29
-/* 8009C9A8 48 24 21 51 */ bl getName__10JUTNameTabCFUs
-/* 8009C9AC 28 03 00 00 */ cmplwi r3, 0
-/* 8009C9B0 41 82 00 3C */ beq lbl_8009C9EC
-/* 8009C9B4 7F 84 E3 78 */ mr r4, r28
-/* 8009C9B8 48 2C BF DD */ bl strcmp
-/* 8009C9BC 2C 03 00 00 */ cmpwi r3, 0
-/* 8009C9C0 40 82 00 2C */ bne lbl_8009C9EC
-/* 8009C9C4 80 7F 00 04 */ lwz r3, 4(r31)
-/* 8009C9C8 57 A0 2A F4 */ rlwinm r0, r29, 5, 0xb, 0x1a
-/* 8009C9CC 7C 03 02 14 */ add r0, r3, r0
-/* 8009C9D0 90 1B 00 04 */ stw r0, 4(r27)
-/* 8009C9D4 80 7B 00 04 */ lwz r3, 4(r27)
-/* 8009C9D8 A8 03 00 1A */ lha r0, 0x1a(r3)
-/* 8009C9DC B0 1B 00 08 */ sth r0, 8(r27)
-/* 8009C9E0 7F 63 DB 78 */ mr r3, r27
-/* 8009C9E4 48 00 01 31 */ bl entry__12dEyeHL_mng_cFP8dEyeHL_c
-/* 8009C9E8 48 00 00 28 */ b lbl_8009CA10
-lbl_8009C9EC:
-/* 8009C9EC 3B BD 00 01 */ addi r29, r29, 1
-lbl_8009C9F0:
-/* 8009C9F0 57 A3 04 3E */ clrlwi r3, r29, 0x10
-/* 8009C9F4 A0 1F 00 00 */ lhz r0, 0(r31)
-/* 8009C9F8 7C 03 00 40 */ cmplw r3, r0
-/* 8009C9FC 41 80 FF A4 */ blt lbl_8009C9A0
-lbl_8009CA00:
-/* 8009CA00 3C 60 80 38 */ lis r3, d_d_eye_hl__stringBase0@ha /* 0x8037B100@ha */
-/* 8009CA04 38 63 B1 00 */ addi r3, r3, d_d_eye_hl__stringBase0@l /* 0x8037B100@l */
-/* 8009CA08 4C C6 31 82 */ crclr 6
-/* 8009CA0C 4B F6 A2 01 */ bl OSReport_Error
-lbl_8009CA10:
-/* 8009CA10 39 61 00 20 */ addi r11, r1, 0x20
-/* 8009CA14 48 2C 58 0D */ bl _restgpr_27
-/* 8009CA18 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8009CA1C 7C 08 03 A6 */ mtlr r0
-/* 8009CA20 38 21 00 20 */ addi r1, r1, 0x20
-/* 8009CA24 4E 80 00 20 */ blr
diff --git a/asm/d/d_eye_hl/remove__12dEyeHL_mng_cFP8dEyeHL_c.s b/asm/d/d_eye_hl/remove__12dEyeHL_mng_cFP8dEyeHL_c.s
deleted file mode 100644
index a7294d05ba..0000000000
--- a/asm/d/d_eye_hl/remove__12dEyeHL_mng_cFP8dEyeHL_c.s
+++ /dev/null
@@ -1,25 +0,0 @@
-lbl_8009CB34:
-/* 8009CB34 80 03 00 04 */ lwz r0, 4(r3)
-/* 8009CB38 28 00 00 00 */ cmplwi r0, 0
-/* 8009CB3C 4D 82 00 20 */ beqlr
-/* 8009CB40 80 83 00 0C */ lwz r4, 0xc(r3)
-/* 8009CB44 80 A3 00 10 */ lwz r5, 0x10(r3)
-/* 8009CB48 28 05 00 00 */ cmplwi r5, 0
-/* 8009CB4C 41 82 00 08 */ beq lbl_8009CB54
-/* 8009CB50 90 85 00 0C */ stw r4, 0xc(r5)
-lbl_8009CB54:
-/* 8009CB54 28 04 00 00 */ cmplwi r4, 0
-/* 8009CB58 40 82 00 0C */ bne lbl_8009CB64
-/* 8009CB5C 90 AD 8A 28 */ stw r5, m_obj__12dEyeHL_mng_c(r13)
-/* 8009CB60 48 00 00 08 */ b lbl_8009CB68
-lbl_8009CB64:
-/* 8009CB64 90 A4 00 10 */ stw r5, 0x10(r4)
-lbl_8009CB68:
-/* 8009CB68 A8 03 00 08 */ lha r0, 8(r3)
-/* 8009CB6C 80 83 00 04 */ lwz r4, 4(r3)
-/* 8009CB70 B0 04 00 1A */ sth r0, 0x1a(r4)
-/* 8009CB74 38 00 00 00 */ li r0, 0
-/* 8009CB78 90 03 00 04 */ stw r0, 4(r3)
-/* 8009CB7C 90 03 00 0C */ stw r0, 0xc(r3)
-/* 8009CB80 90 03 00 10 */ stw r0, 0x10(r3)
-/* 8009CB84 4E 80 00 20 */ blr
diff --git a/asm/d/d_eye_hl/remove__8dEyeHL_cFv.s b/asm/d/d_eye_hl/remove__8dEyeHL_cFv.s
deleted file mode 100644
index 2796a79dfe..0000000000
--- a/asm/d/d_eye_hl/remove__8dEyeHL_cFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_8009CA28:
-/* 8009CA28 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8009CA2C 7C 08 02 A6 */ mflr r0
-/* 8009CA30 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8009CA34 48 00 01 01 */ bl remove__12dEyeHL_mng_cFP8dEyeHL_c
-/* 8009CA38 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8009CA3C 7C 08 03 A6 */ mtlr r0
-/* 8009CA40 38 21 00 10 */ addi r1, r1, 0x10
-/* 8009CA44 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/Sndpos__18dScnKy_env_light_cFv.s b/asm/d/kankyo/d_kankyo/Sndpos__18dScnKy_env_light_cFv.s
deleted file mode 100644
index cee280b555..0000000000
--- a/asm/d/kankyo/d_kankyo/Sndpos__18dScnKy_env_light_cFv.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_801A4F24:
-/* 801A4F24 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 801A4F28 7C 08 02 A6 */ mflr r0
-/* 801A4F2C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 801A4F30 80 83 09 84 */ lwz r4, 0x984(r3)
-/* 801A4F34 2C 04 00 00 */ cmpwi r4, 0
-/* 801A4F38 41 82 00 1C */ beq lbl_801A4F54
-/* 801A4F3C 38 04 FF FF */ addi r0, r4, -1
-/* 801A4F40 90 03 09 84 */ stw r0, 0x984(r3)
-/* 801A4F44 80 03 09 84 */ lwz r0, 0x984(r3)
-/* 801A4F48 2C 00 00 00 */ cmpwi r0, 0
-/* 801A4F4C 40 82 00 08 */ bne lbl_801A4F54
-/* 801A4F50 48 00 32 41 */ bl dKy_Sound_init__Fv
-lbl_801A4F54:
-/* 801A4F54 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 801A4F58 7C 08 03 A6 */ mtlr r0
-/* 801A4F5C 38 21 00 10 */ addi r1, r1, 0x10
-/* 801A4F60 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/__ct__18dScnKy_env_light_cFv.s b/asm/d/kankyo/d_kankyo/__ct__18dScnKy_env_light_cFv.s
deleted file mode 100644
index 30efe87b84..0000000000
--- a/asm/d/kankyo/d_kankyo/__ct__18dScnKy_env_light_cFv.s
+++ /dev/null
@@ -1,71 +0,0 @@
-lbl_8019F2E8:
-/* 8019F2E8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019F2EC 7C 08 02 A6 */ mflr r0
-/* 8019F2F0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019F2F4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019F2F8 7C 7F 1B 78 */ mr r31, r3
-/* 8019F2FC 3C 60 80 3C */ lis r3, __vt__18dScnKy_env_light_c@ha /* 0x803BC13C@ha */
-/* 8019F300 38 03 C1 3C */ addi r0, r3, __vt__18dScnKy_env_light_c@l /* 0x803BC13C@l */
-/* 8019F304 90 1F 00 00 */ stw r0, 0(r31)
-/* 8019F308 38 7F 00 38 */ addi r3, r31, 0x38
-/* 8019F30C 3C 80 80 1A */ lis r4, __ct__15LIGHT_INFLUENCEFv@ha /* 0x8019F4F8@ha */
-/* 8019F310 38 84 F4 F8 */ addi r4, r4, __ct__15LIGHT_INFLUENCEFv@l /* 0x8019F4F8@l */
-/* 8019F314 3C A0 80 0D */ lis r5, __dt__15LIGHT_INFLUENCEFv@ha /* 0x800CFC7C@ha */
-/* 8019F318 38 A5 FC 7C */ addi r5, r5, __dt__15LIGHT_INFLUENCEFv@l /* 0x800CFC7C@l */
-/* 8019F31C 38 C0 00 20 */ li r6, 0x20
-/* 8019F320 38 E0 00 1E */ li r7, 0x1e
-/* 8019F324 48 1C 2A 3D */ bl __construct_array
-/* 8019F328 38 7F 07 64 */ addi r3, r31, 0x764
-/* 8019F32C 3C 80 80 1A */ lis r4, __ct__15LIGHT_INFLUENCEFv@ha /* 0x8019F4F8@ha */
-/* 8019F330 38 84 F4 F8 */ addi r4, r4, __ct__15LIGHT_INFLUENCEFv@l /* 0x8019F4F8@l */
-/* 8019F334 3C A0 80 0D */ lis r5, __dt__15LIGHT_INFLUENCEFv@ha /* 0x800CFC7C@ha */
-/* 8019F338 38 A5 FC 7C */ addi r5, r5, __dt__15LIGHT_INFLUENCEFv@l /* 0x800CFC7C@l */
-/* 8019F33C 38 C0 00 20 */ li r6, 0x20
-/* 8019F340 38 E0 00 02 */ li r7, 2
-/* 8019F344 48 1C 2A 1D */ bl __construct_array
-/* 8019F348 38 7F 08 48 */ addi r3, r31, 0x848
-/* 8019F34C 3C 80 80 1A */ lis r4, __ct__15WIND_INF_ENTITYFv@ha /* 0x8019F4F4@ha */
-/* 8019F350 38 84 F4 F4 */ addi r4, r4, __ct__15WIND_INF_ENTITYFv@l /* 0x8019F4F4@l */
-/* 8019F354 3C A0 80 1A */ lis r5, __dt__15WIND_INF_ENTITYFv@ha /* 0x8019F4B8@ha */
-/* 8019F358 38 A5 F4 B8 */ addi r5, r5, __dt__15WIND_INF_ENTITYFv@l /* 0x8019F4B8@l */
-/* 8019F35C 38 C0 00 3C */ li r6, 0x3c
-/* 8019F360 38 E0 00 05 */ li r7, 5
-/* 8019F364 48 1C 29 FD */ bl __construct_array
-/* 8019F368 38 7F 09 B8 */ addi r3, r31, 0x9b8
-/* 8019F36C 3C 80 80 1A */ lis r4, __ct__13DUNGEON_LIGHTFv@ha /* 0x8019F4B4@ha */
-/* 8019F370 38 84 F4 B4 */ addi r4, r4, __ct__13DUNGEON_LIGHTFv@l /* 0x8019F4B4@l */
-/* 8019F374 3C A0 80 1A */ lis r5, __dt__13DUNGEON_LIGHTFv@ha /* 0x8019F478@ha */
-/* 8019F378 38 A5 F4 78 */ addi r5, r5, __dt__13DUNGEON_LIGHTFv@l /* 0x8019F478@l */
-/* 8019F37C 38 C0 00 4C */ li r6, 0x4c
-/* 8019F380 38 E0 00 08 */ li r7, 8
-/* 8019F384 48 1C 29 DD */ bl __construct_array
-/* 8019F388 38 7F 0C 18 */ addi r3, r31, 0xc18
-/* 8019F38C 3C 80 80 1A */ lis r4, __ct__10BOSS_LIGHTFv@ha /* 0x8019F474@ha */
-/* 8019F390 38 84 F4 74 */ addi r4, r4, __ct__10BOSS_LIGHTFv@l /* 0x8019F474@l */
-/* 8019F394 3C A0 80 1A */ lis r5, __dt__10BOSS_LIGHTFv@ha /* 0x8019F438@ha */
-/* 8019F398 38 A5 F4 38 */ addi r5, r5, __dt__10BOSS_LIGHTFv@l /* 0x8019F438@l */
-/* 8019F39C 38 C0 00 28 */ li r6, 0x28
-/* 8019F3A0 38 E0 00 08 */ li r7, 8
-/* 8019F3A4 48 1C 29 BD */ bl __construct_array
-/* 8019F3A8 38 7F 0D 58 */ addi r3, r31, 0xd58
-/* 8019F3AC 3C 80 80 1A */ lis r4, __ct__10BOSS_LIGHTFv@ha /* 0x8019F474@ha */
-/* 8019F3B0 38 84 F4 74 */ addi r4, r4, __ct__10BOSS_LIGHTFv@l /* 0x8019F474@l */
-/* 8019F3B4 3C A0 80 1A */ lis r5, __dt__10BOSS_LIGHTFv@ha /* 0x8019F438@ha */
-/* 8019F3B8 38 A5 F4 38 */ addi r5, r5, __dt__10BOSS_LIGHTFv@l /* 0x8019F438@l */
-/* 8019F3BC 38 C0 00 28 */ li r6, 0x28
-/* 8019F3C0 38 E0 00 06 */ li r7, 6
-/* 8019F3C4 48 1C 29 9D */ bl __construct_array
-/* 8019F3C8 38 7F 0F 50 */ addi r3, r31, 0xf50
-/* 8019F3CC 3C 80 80 1A */ lis r4, __ct__19GB_MAPLE_COL_CHANGEFv@ha /* 0x8019F400@ha */
-/* 8019F3D0 38 84 F4 00 */ addi r4, r4, __ct__19GB_MAPLE_COL_CHANGEFv@l /* 0x8019F400@l */
-/* 8019F3D4 38 A0 00 00 */ li r5, 0
-/* 8019F3D8 38 C0 00 74 */ li r6, 0x74
-/* 8019F3DC 38 E0 00 02 */ li r7, 2
-/* 8019F3E0 48 1C 29 81 */ bl __construct_array
-/* 8019F3E4 4B FF FE 81 */ bl dKy_clear_game_init__Fv
-/* 8019F3E8 7F E3 FB 78 */ mr r3, r31
-/* 8019F3EC 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019F3F0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019F3F4 7C 08 03 A6 */ mtlr r0
-/* 8019F3F8 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019F3FC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/__ct__19GB_MAPLE_COL_CHANGEFv.s b/asm/d/kankyo/d_kankyo/__ct__19GB_MAPLE_COL_CHANGEFv.s
deleted file mode 100644
index 6092aa251e..0000000000
--- a/asm/d/kankyo/d_kankyo/__ct__19GB_MAPLE_COL_CHANGEFv.s
+++ /dev/null
@@ -1,15 +0,0 @@
-lbl_8019F400:
-/* 8019F400 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019F404 7C 08 02 A6 */ mflr r0
-/* 8019F408 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019F40C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019F410 7C 7F 1B 78 */ mr r31, r3
-/* 8019F414 3C 80 80 3A */ lis r4, j3dDefaultLightInfo@ha /* 0x803A1EC8@ha */
-/* 8019F418 38 84 1E C8 */ addi r4, r4, j3dDefaultLightInfo@l /* 0x803A1EC8@l */
-/* 8019F41C 48 18 62 A9 */ bl __as__12J3DLightInfoFRC12J3DLightInfo
-/* 8019F420 7F E3 FB 78 */ mr r3, r31
-/* 8019F424 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019F428 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019F42C 7C 08 03 A6 */ mtlr r0
-/* 8019F430 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019F434 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/__dt__10BOSS_LIGHTFv.s b/asm/d/kankyo/d_kankyo/__dt__10BOSS_LIGHTFv.s
deleted file mode 100644
index 39c4e2054a..0000000000
--- a/asm/d/kankyo/d_kankyo/__dt__10BOSS_LIGHTFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_8019F438:
-/* 8019F438 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019F43C 7C 08 02 A6 */ mflr r0
-/* 8019F440 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019F444 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019F448 7C 7F 1B 79 */ or. r31, r3, r3
-/* 8019F44C 41 82 00 10 */ beq lbl_8019F45C
-/* 8019F450 7C 80 07 35 */ extsh. r0, r4
-/* 8019F454 40 81 00 08 */ ble lbl_8019F45C
-/* 8019F458 48 12 F8 E5 */ bl __dl__FPv
-lbl_8019F45C:
-/* 8019F45C 7F E3 FB 78 */ mr r3, r31
-/* 8019F460 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019F464 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019F468 7C 08 03 A6 */ mtlr r0
-/* 8019F46C 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019F470 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/__dt__13DUNGEON_LIGHTFv.s b/asm/d/kankyo/d_kankyo/__dt__13DUNGEON_LIGHTFv.s
deleted file mode 100644
index 9132107d92..0000000000
--- a/asm/d/kankyo/d_kankyo/__dt__13DUNGEON_LIGHTFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_8019F478:
-/* 8019F478 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019F47C 7C 08 02 A6 */ mflr r0
-/* 8019F480 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019F484 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019F488 7C 7F 1B 79 */ or. r31, r3, r3
-/* 8019F48C 41 82 00 10 */ beq lbl_8019F49C
-/* 8019F490 7C 80 07 35 */ extsh. r0, r4
-/* 8019F494 40 81 00 08 */ ble lbl_8019F49C
-/* 8019F498 48 12 F8 A5 */ bl __dl__FPv
-lbl_8019F49C:
-/* 8019F49C 7F E3 FB 78 */ mr r3, r31
-/* 8019F4A0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019F4A4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019F4A8 7C 08 03 A6 */ mtlr r0
-/* 8019F4AC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019F4B0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/__dt__15WIND_INF_ENTITYFv.s b/asm/d/kankyo/d_kankyo/__dt__15WIND_INF_ENTITYFv.s
deleted file mode 100644
index b4b1006722..0000000000
--- a/asm/d/kankyo/d_kankyo/__dt__15WIND_INF_ENTITYFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_8019F4B8:
-/* 8019F4B8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019F4BC 7C 08 02 A6 */ mflr r0
-/* 8019F4C0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019F4C4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019F4C8 7C 7F 1B 79 */ or. r31, r3, r3
-/* 8019F4CC 41 82 00 10 */ beq lbl_8019F4DC
-/* 8019F4D0 7C 80 07 35 */ extsh. r0, r4
-/* 8019F4D4 40 81 00 08 */ ble lbl_8019F4DC
-/* 8019F4D8 48 12 F8 65 */ bl __dl__FPv
-lbl_8019F4DC:
-/* 8019F4DC 7F E3 FB 78 */ mr r3, r31
-/* 8019F4E0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019F4E4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019F4E8 7C 08 03 A6 */ mtlr r0
-/* 8019F4EC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019F4F0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_FiveSenses_fullthrottle_dark__Fv.s b/asm/d/kankyo/d_kankyo/dKy_FiveSenses_fullthrottle_dark__Fv.s
deleted file mode 100644
index 7443d66147..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_FiveSenses_fullthrottle_dark__Fv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_8019DD4C:
-/* 8019DD4C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019DD50 7C 08 02 A6 */ mflr r0
-/* 8019DD54 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019DD58 4B FF FB 75 */ bl dKy_FiveSenses_fullthrottle_dark_static1__Fv
-/* 8019DD5C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019DD60 7C 08 03 A6 */ mtlr r0
-/* 8019DD64 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019DD68 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_WolfPowerup_AmbCol__FP11_GXColorS10.s b/asm/d/kankyo/d_kankyo/dKy_WolfPowerup_AmbCol__FP11_GXColorS10.s
deleted file mode 100644
index b824bfd84e..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_WolfPowerup_AmbCol__FP11_GXColorS10.s
+++ /dev/null
@@ -1,8 +0,0 @@
-lbl_8019C388:
-/* 8019C388 38 00 00 28 */ li r0, 0x28
-/* 8019C38C B0 03 00 00 */ sth r0, 0(r3)
-/* 8019C390 38 00 00 34 */ li r0, 0x34
-/* 8019C394 B0 03 00 02 */ sth r0, 2(r3)
-/* 8019C398 38 00 00 31 */ li r0, 0x31
-/* 8019C39C B0 03 00 04 */ sth r0, 4(r3)
-/* 8019C3A0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10.s b/asm/d/kankyo/d_kankyo/dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10.s
deleted file mode 100644
index 84888adef2..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10.s
+++ /dev/null
@@ -1,118 +0,0 @@
-lbl_8019CB0C:
-/* 8019CB0C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019CB10 7C 08 02 A6 */ mflr r0
-/* 8019CB14 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019CB18 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019CB1C 7C 7F 1B 78 */ mr r31, r3
-/* 8019CB20 4B FF F8 85 */ bl dKy_sense_pat_get__Fv
-/* 8019CB24 28 03 00 0F */ cmplwi r3, 0xf
-/* 8019CB28 41 81 01 A0 */ bgt lbl_8019CCC8
-/* 8019CB2C 3C 80 80 3C */ lis r4, lit_4322@ha /* 0x803BBEBC@ha */
-/* 8019CB30 38 84 BE BC */ addi r4, r4, lit_4322@l /* 0x803BBEBC@l */
-/* 8019CB34 54 60 10 3A */ slwi r0, r3, 2
-/* 8019CB38 7C 04 00 2E */ lwzx r0, r4, r0
-/* 8019CB3C 7C 09 03 A6 */ mtctr r0
-/* 8019CB40 4E 80 04 20 */ bctr
-/* 8019CB44 38 00 00 21 */ li r0, 0x21
-/* 8019CB48 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CB4C 38 00 00 30 */ li r0, 0x30
-/* 8019CB50 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CB54 38 00 00 2C */ li r0, 0x2c
-/* 8019CB58 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CB5C 48 00 01 6C */ b lbl_8019CCC8
-/* 8019CB60 38 00 00 21 */ li r0, 0x21
-/* 8019CB64 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CB68 38 00 00 30 */ li r0, 0x30
-/* 8019CB6C B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CB70 38 00 00 2C */ li r0, 0x2c
-/* 8019CB74 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CB78 48 00 01 50 */ b lbl_8019CCC8
-/* 8019CB7C 38 00 00 28 */ li r0, 0x28
-/* 8019CB80 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CB84 38 00 00 35 */ li r0, 0x35
-/* 8019CB88 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CB8C 38 00 00 31 */ li r0, 0x31
-/* 8019CB90 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CB94 48 00 01 34 */ b lbl_8019CCC8
-/* 8019CB98 38 00 00 20 */ li r0, 0x20
-/* 8019CB9C B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CBA0 38 00 00 2E */ li r0, 0x2e
-/* 8019CBA4 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CBA8 38 00 00 28 */ li r0, 0x28
-/* 8019CBAC B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CBB0 48 00 01 18 */ b lbl_8019CCC8
-/* 8019CBB4 38 00 00 2D */ li r0, 0x2d
-/* 8019CBB8 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CBBC 38 00 00 40 */ li r0, 0x40
-/* 8019CBC0 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CBC4 38 00 00 3A */ li r0, 0x3a
-/* 8019CBC8 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CBCC 48 00 00 FC */ b lbl_8019CCC8
-/* 8019CBD0 38 00 00 21 */ li r0, 0x21
-/* 8019CBD4 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CBD8 38 00 00 30 */ li r0, 0x30
-/* 8019CBDC B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CBE0 38 00 00 2C */ li r0, 0x2c
-/* 8019CBE4 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CBE8 48 00 00 E0 */ b lbl_8019CCC8
-/* 8019CBEC 38 00 00 26 */ li r0, 0x26
-/* 8019CBF0 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CBF4 38 00 00 35 */ li r0, 0x35
-/* 8019CBF8 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CBFC 38 00 00 31 */ li r0, 0x31
-/* 8019CC00 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CC04 48 00 00 C4 */ b lbl_8019CCC8
-/* 8019CC08 38 00 00 21 */ li r0, 0x21
-/* 8019CC0C B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CC10 38 00 00 30 */ li r0, 0x30
-/* 8019CC14 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CC18 38 00 00 2C */ li r0, 0x2c
-/* 8019CC1C B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CC20 48 00 00 A8 */ b lbl_8019CCC8
-/* 8019CC24 38 00 00 28 */ li r0, 0x28
-/* 8019CC28 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CC2C 38 00 00 3B */ li r0, 0x3b
-/* 8019CC30 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CC34 38 00 00 35 */ li r0, 0x35
-/* 8019CC38 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CC3C 48 00 00 8C */ b lbl_8019CCC8
-/* 8019CC40 38 00 00 2D */ li r0, 0x2d
-/* 8019CC44 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CC48 38 00 00 40 */ li r0, 0x40
-/* 8019CC4C B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CC50 38 00 00 3A */ li r0, 0x3a
-/* 8019CC54 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CC58 48 00 00 70 */ b lbl_8019CCC8
-/* 8019CC5C 38 00 00 28 */ li r0, 0x28
-/* 8019CC60 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CC64 38 00 00 3C */ li r0, 0x3c
-/* 8019CC68 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CC6C 38 00 00 3A */ li r0, 0x3a
-/* 8019CC70 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CC74 48 00 00 54 */ b lbl_8019CCC8
-/* 8019CC78 38 00 00 21 */ li r0, 0x21
-/* 8019CC7C B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CC80 38 00 00 30 */ li r0, 0x30
-/* 8019CC84 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CC88 38 00 00 2C */ li r0, 0x2c
-/* 8019CC8C B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CC90 48 00 00 38 */ b lbl_8019CCC8
-/* 8019CC94 38 00 00 21 */ li r0, 0x21
-/* 8019CC98 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CC9C 38 00 00 30 */ li r0, 0x30
-/* 8019CCA0 B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CCA4 38 00 00 2C */ li r0, 0x2c
-/* 8019CCA8 B0 1F 00 04 */ sth r0, 4(r31)
-/* 8019CCAC 48 00 00 1C */ b lbl_8019CCC8
-/* 8019CCB0 38 00 00 1E */ li r0, 0x1e
-/* 8019CCB4 B0 1F 00 00 */ sth r0, 0(r31)
-/* 8019CCB8 38 00 00 30 */ li r0, 0x30
-/* 8019CCBC B0 1F 00 02 */ sth r0, 2(r31)
-/* 8019CCC0 38 00 00 3B */ li r0, 0x3b
-/* 8019CCC4 B0 1F 00 04 */ sth r0, 4(r31)
-lbl_8019CCC8:
-/* 8019CCC8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019CCCC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019CCD0 7C 08 03 A6 */ mtlr r0
-/* 8019CCD4 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019CCD8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_daynight_check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_daynight_check__Fv.s
deleted file mode 100644
index 24d9e180ae..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_daynight_check__Fv.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_8019FAB8:
-/* 8019FAB8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019FABC 7C 08 02 A6 */ mflr r0
-/* 8019FAC0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019FAC4 4B FF FF 4D */ bl dKy_getdaytime_hour__Fv
-/* 8019FAC8 2C 03 00 06 */ cmpwi r3, 6
-/* 8019FACC 41 80 00 14 */ blt lbl_8019FAE0
-/* 8019FAD0 2C 03 00 13 */ cmpwi r3, 0x13
-/* 8019FAD4 40 80 00 0C */ bge lbl_8019FAE0
-/* 8019FAD8 38 60 00 00 */ li r3, 0
-/* 8019FADC 48 00 00 08 */ b lbl_8019FAE4
-lbl_8019FAE0:
-/* 8019FAE0 38 60 00 01 */ li r3, 1
-lbl_8019FAE4:
-/* 8019FAE4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019FAE8 7C 08 03 A6 */ mtlr r0
-/* 8019FAEC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019FAF0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_getDarktime_hour__Fv.s b/asm/d/kankyo/d_kankyo/dKy_getDarktime_hour__Fv.s
deleted file mode 100644
index 4a04fc04d1..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_getDarktime_hour__Fv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_8019FAF4:
-/* 8019FAF4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019FAF8 7C 08 02 A6 */ mflr r0
-/* 8019FAFC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019FB00 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019FB04 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019FB08 48 00 00 C5 */ bl getDarkDaytime__18dScnKy_env_light_cFv
-/* 8019FB0C C0 02 A2 AC */ lfs f0, lit_5347(r2)
-/* 8019FB10 EC 01 00 24 */ fdivs f0, f1, f0
-/* 8019FB14 FC 00 00 1E */ fctiwz f0, f0
-/* 8019FB18 D8 01 00 08 */ stfd f0, 8(r1)
-/* 8019FB1C 80 61 00 0C */ lwz r3, 0xc(r1)
-/* 8019FB20 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019FB24 7C 08 03 A6 */ mtlr r0
-/* 8019FB28 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019FB2C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_getDarktime_week__Fv.s b/asm/d/kankyo/d_kankyo/dKy_getDarktime_week__Fv.s
deleted file mode 100644
index 237fc4263f..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_getDarktime_week__Fv.s
+++ /dev/null
@@ -1,5 +0,0 @@
-lbl_8019FBBC:
-/* 8019FBBC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019FBC0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019FBC4 88 63 12 FD */ lbz r3, 0x12fd(r3)
-/* 8019FBC8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_get_parcent__Ffff.s b/asm/d/kankyo/d_kankyo/dKy_get_parcent__Ffff.s
deleted file mode 100644
index 23bc338866..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_get_parcent__Ffff.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_8019D8AC:
-/* 8019D8AC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019D8B0 7C 08 02 A6 */ mflr r0
-/* 8019D8B4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019D8B8 4B FF FF C1 */ bl get_parcent__Ffff
-/* 8019D8BC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019D8C0 7C 08 03 A6 */ mtlr r0
-/* 8019D8C4 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019D8C8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_getdaytime_hour__Fv.s b/asm/d/kankyo/d_kankyo/dKy_getdaytime_hour__Fv.s
deleted file mode 100644
index 9d7a4ab33f..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_getdaytime_hour__Fv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_8019FA10:
-/* 8019FA10 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019FA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8019FA18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8019FA1C C0 23 00 34 */ lfs f1, 0x34(r3)
-/* 8019FA20 C0 02 A2 AC */ lfs f0, lit_5347(r2)
-/* 8019FA24 EC 01 00 24 */ fdivs f0, f1, f0
-/* 8019FA28 FC 00 00 1E */ fctiwz f0, f0
-/* 8019FA2C D8 01 00 08 */ stfd f0, 8(r1)
-/* 8019FA30 80 61 00 0C */ lwz r3, 0xc(r1)
-/* 8019FA34 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019FA38 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_light_influence_col__Fi.s b/asm/d/kankyo/d_kankyo/dKy_light_influence_col__Fi.s
deleted file mode 100644
index ae4c07244c..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_light_influence_col__Fi.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_8019E404:
-/* 8019E404 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E408 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019E40C 54 64 0F FE */ srwi r4, r3, 0x1f
-/* 8019E410 38 04 FF FF */ addi r0, r4, -1
-/* 8019E414 7C 60 00 38 */ and r0, r3, r0
-/* 8019E418 54 00 10 3A */ slwi r0, r0, 2
-/* 8019E41C 7C 65 02 14 */ add r3, r5, r0
-/* 8019E420 80 83 03 F8 */ lwz r4, 0x3f8(r3)
-/* 8019E424 80 64 00 0C */ lwz r3, 0xc(r4)
-/* 8019E428 80 84 00 10 */ lwz r4, 0x10(r4)
-/* 8019E42C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_light_influence_pos__Fi.s b/asm/d/kankyo/d_kankyo/dKy_light_influence_pos__Fi.s
deleted file mode 100644
index 1e1c60bb25..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_light_influence_pos__Fi.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_801A76D8:
-/* 801A76D8 2C 04 00 00 */ cmpwi r4, 0
-/* 801A76DC 40 80 00 08 */ bge lbl_801A76E4
-/* 801A76E0 38 80 00 00 */ li r4, 0
-lbl_801A76E4:
-/* 801A76E4 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */
-/* 801A76E8 38 A5 CA 54 */ addi r5, r5, g_env_light@l /* 0x8042CA54@l */
-/* 801A76EC 54 80 10 3A */ slwi r0, r4, 2
-/* 801A76F0 7C 85 02 14 */ add r4, r5, r0
-/* 801A76F4 80 84 03 F8 */ lwz r4, 0x3f8(r4)
-/* 801A76F8 C0 04 00 00 */ lfs f0, 0(r4)
-/* 801A76FC D0 03 00 00 */ stfs f0, 0(r3)
-/* 801A7700 C0 04 00 04 */ lfs f0, 4(r4)
-/* 801A7704 D0 03 00 04 */ stfs f0, 4(r3)
-/* 801A7708 C0 04 00 08 */ lfs f0, 8(r4)
-/* 801A770C D0 03 00 08 */ stfs f0, 8(r3)
-/* 801A7710 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_light_influence_power__Fi.s b/asm/d/kankyo/d_kankyo/dKy_light_influence_power__Fi.s
deleted file mode 100644
index 463fea5b96..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_light_influence_power__Fi.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_8019E520:
-/* 8019E520 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E524 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019E528 54 64 0F FE */ srwi r4, r3, 0x1f
-/* 8019E52C 38 04 FF FF */ addi r0, r4, -1
-/* 8019E530 7C 60 00 38 */ and r0, r3, r0
-/* 8019E534 54 00 10 3A */ slwi r0, r0, 2
-/* 8019E538 7C 65 02 14 */ add r3, r5, r0
-/* 8019E53C 80 63 03 F8 */ lwz r3, 0x3f8(r3)
-/* 8019E540 C0 23 00 14 */ lfs f1, 0x14(r3)
-/* 8019E544 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_light_influence_yuragi__Fi.s b/asm/d/kankyo/d_kankyo/dKy_light_influence_yuragi__Fi.s
deleted file mode 100644
index 7e0880a7a1..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_light_influence_yuragi__Fi.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_8019E548:
-/* 8019E548 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E54C 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019E550 54 64 0F FE */ srwi r4, r3, 0x1f
-/* 8019E554 38 04 FF FF */ addi r0, r4, -1
-/* 8019E558 7C 60 00 38 */ and r0, r3, r0
-/* 8019E55C 54 00 10 3A */ slwi r0, r0, 2
-/* 8019E560 7C 65 02 14 */ add r3, r5, r0
-/* 8019E564 80 63 03 F8 */ lwz r3, 0x3f8(r3)
-/* 8019E568 C0 23 00 18 */ lfs f1, 0x18(r3)
-/* 8019E56C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_light_size_get__FPCc.s b/asm/d/kankyo/d_kankyo/dKy_light_size_get__FPCc.s
deleted file mode 100644
index f87b99aa7b..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_light_size_get__FPCc.s
+++ /dev/null
@@ -1,57 +0,0 @@
-lbl_8019EBD0:
-/* 8019EBD0 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 8019EBD4 7C 08 02 A6 */ mflr r0
-/* 8019EBD8 90 01 00 24 */ stw r0, 0x24(r1)
-/* 8019EBDC 39 61 00 20 */ addi r11, r1, 0x20
-/* 8019EBE0 48 1C 35 FD */ bl _savegpr_29
-/* 8019EBE4 7C 7D 1B 78 */ mr r29, r3
-/* 8019EBE8 4B EB 7E 95 */ bl dKyd_light_size_tbl_getp__Fv
-/* 8019EBEC 7C 7F 1B 78 */ mr r31, r3
-/* 8019EBF0 4B EB 7E 99 */ bl dKyd_light_tw_size_tbl_getp__Fv
-/* 8019EBF4 7C 7E 1B 78 */ mr r30, r3
-/* 8019EBF8 48 00 D9 85 */ bl dKy_darkworld_check__Fv
-/* 8019EBFC 54 60 06 3F */ clrlwi. r0, r3, 0x18
-/* 8019EC00 40 82 00 44 */ bne lbl_8019EC44
-/* 8019EC04 3B C0 00 00 */ li r30, 0
-lbl_8019EC08:
-/* 8019EC08 7F A3 EB 78 */ mr r3, r29
-/* 8019EC0C 80 9F 00 00 */ lwz r4, 0(r31)
-/* 8019EC10 48 1C 9D 85 */ bl strcmp
-/* 8019EC14 2C 03 00 00 */ cmpwi r3, 0
-/* 8019EC18 40 82 00 18 */ bne lbl_8019EC30
-/* 8019EC1C 88 1F 00 04 */ lbz r0, 4(r31)
-/* 8019EC20 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019EC24 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019EC28 98 03 13 09 */ stb r0, 0x1309(r3)
-/* 8019EC2C 48 00 00 54 */ b lbl_8019EC80
-lbl_8019EC30:
-/* 8019EC30 3B DE 00 01 */ addi r30, r30, 1
-/* 8019EC34 2C 1E 00 24 */ cmpwi r30, 0x24
-/* 8019EC38 3B FF 00 08 */ addi r31, r31, 8
-/* 8019EC3C 41 80 FF CC */ blt lbl_8019EC08
-/* 8019EC40 48 00 00 40 */ b lbl_8019EC80
-lbl_8019EC44:
-/* 8019EC44 3B E0 00 00 */ li r31, 0
-lbl_8019EC48:
-/* 8019EC48 7F A3 EB 78 */ mr r3, r29
-/* 8019EC4C 80 9E 00 00 */ lwz r4, 0(r30)
-/* 8019EC50 48 1C 9D 45 */ bl strcmp
-/* 8019EC54 2C 03 00 00 */ cmpwi r3, 0
-/* 8019EC58 40 82 00 18 */ bne lbl_8019EC70
-/* 8019EC5C 88 1E 00 04 */ lbz r0, 4(r30)
-/* 8019EC60 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019EC64 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019EC68 98 03 13 09 */ stb r0, 0x1309(r3)
-/* 8019EC6C 48 00 00 14 */ b lbl_8019EC80
-lbl_8019EC70:
-/* 8019EC70 3B FF 00 01 */ addi r31, r31, 1
-/* 8019EC74 2C 1F 00 09 */ cmpwi r31, 9
-/* 8019EC78 3B DE 00 08 */ addi r30, r30, 8
-/* 8019EC7C 41 80 FF CC */ blt lbl_8019EC48
-lbl_8019EC80:
-/* 8019EC80 39 61 00 20 */ addi r11, r1, 0x20
-/* 8019EC84 48 1C 35 A5 */ bl _restgpr_29
-/* 8019EC88 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8019EC8C 7C 08 03 A6 */ mtlr r0
-/* 8019EC90 38 21 00 20 */ addi r1, r1, 0x20
-/* 8019EC94 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_plight_near_pos__Fv.s b/asm/d/kankyo/d_kankyo/dKy_plight_near_pos__Fv.s
deleted file mode 100644
index e42d09f7c2..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_plight_near_pos__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_801A7714:
-/* 801A7714 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 801A7718 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 801A771C C0 04 10 7C */ lfs f0, 0x107c(r4)
-/* 801A7720 D0 03 00 00 */ stfs f0, 0(r3)
-/* 801A7724 C0 04 10 80 */ lfs f0, 0x1080(r4)
-/* 801A7728 D0 03 00 04 */ stfs f0, 4(r3)
-/* 801A772C C0 04 10 84 */ lfs f0, 0x1084(r4)
-/* 801A7730 D0 03 00 08 */ stfs f0, 8(r3)
-/* 801A7734 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_sense_pat_get__Fv.s b/asm/d/kankyo/d_kankyo/dKy_sense_pat_get__Fv.s
deleted file mode 100644
index d3b0919787..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_sense_pat_get__Fv.s
+++ /dev/null
@@ -1,509 +0,0 @@
-lbl_8019C3A4:
-/* 8019C3A4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8019C3A8 7C 08 02 A6 */ mflr r0
-/* 8019C3AC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8019C3B0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8019C3B4 93 C1 00 08 */ stw r30, 8(r1)
-/* 8019C3B8 48 00 FE 71 */ bl dKy_Outdoor_check__Fv
-/* 8019C3BC 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C3C0 38 00 00 05 */ li r0, 5
-/* 8019C3C4 41 82 00 08 */ beq lbl_8019C3CC
-/* 8019C3C8 38 00 00 01 */ li r0, 1
-lbl_8019C3CC:
-/* 8019C3CC 7C 1E 03 78 */ mr r30, r0
-/* 8019C3D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8019C3D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8019C3D8 3B E3 4E 00 */ addi r31, r3, 0x4e00
-/* 8019C3DC 7F E3 FB 78 */ mr r3, r31
-/* 8019C3E0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C3E4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C3E8 48 1C C5 AD */ bl strcmp
-/* 8019C3EC 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C3F0 40 82 00 60 */ bne lbl_8019C450
-/* 8019C3F4 3B C0 00 09 */ li r30, 9
-/* 8019C3F8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 8019C3FC 7C 00 07 75 */ extsb. r0, r0
-/* 8019C400 40 82 00 3C */ bne lbl_8019C43C
-/* 8019C404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8019C408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8019C40C 3B E3 09 58 */ addi r31, r3, 0x958
-/* 8019C410 7F E3 FB 78 */ mr r3, r31
-/* 8019C414 38 80 00 11 */ li r4, 0x11
-/* 8019C418 4B E9 84 49 */ bl isSwitch__12dSv_memBit_cCFi
-/* 8019C41C 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C420 41 82 00 1C */ beq lbl_8019C43C
-/* 8019C424 7F E3 FB 78 */ mr r3, r31
-/* 8019C428 38 80 00 75 */ li r4, 0x75
-/* 8019C42C 4B E9 84 35 */ bl isSwitch__12dSv_memBit_cCFi
-/* 8019C430 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C434 40 82 00 08 */ bne lbl_8019C43C
-/* 8019C438 3B C0 00 02 */ li r30, 2
-lbl_8019C43C:
-/* 8019C43C 4B E9 14 FD */ bl dComIfGs_sense_type_change_Get__Fv
-/* 8019C440 7C 60 07 75 */ extsb. r0, r3
-/* 8019C444 40 81 06 AC */ ble lbl_8019CAF0
-/* 8019C448 3B C0 00 0D */ li r30, 0xd
-/* 8019C44C 48 00 06 A4 */ b lbl_8019CAF0
-lbl_8019C450:
-/* 8019C450 7F E3 FB 78 */ mr r3, r31
-/* 8019C454 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C458 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C45C 38 84 00 08 */ addi r4, r4, 8
-/* 8019C460 48 1C C5 35 */ bl strcmp
-/* 8019C464 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C468 40 82 00 20 */ bne lbl_8019C488
-/* 8019C46C 4B E9 14 CD */ bl dComIfGs_sense_type_change_Get__Fv
-/* 8019C470 7C 60 07 75 */ extsb. r0, r3
-/* 8019C474 40 81 00 0C */ ble lbl_8019C480
-/* 8019C478 3B C0 00 0D */ li r30, 0xd
-/* 8019C47C 48 00 06 74 */ b lbl_8019CAF0
-lbl_8019C480:
-/* 8019C480 3B C0 00 01 */ li r30, 1
-/* 8019C484 48 00 06 6C */ b lbl_8019CAF0
-lbl_8019C488:
-/* 8019C488 7F E3 FB 78 */ mr r3, r31
-/* 8019C48C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C490 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C494 38 84 00 10 */ addi r4, r4, 0x10
-/* 8019C498 48 1C C4 FD */ bl strcmp
-/* 8019C49C 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C4A0 40 82 00 0C */ bne lbl_8019C4AC
-/* 8019C4A4 3B C0 00 01 */ li r30, 1
-/* 8019C4A8 48 00 06 48 */ b lbl_8019CAF0
-lbl_8019C4AC:
-/* 8019C4AC 7F E3 FB 78 */ mr r3, r31
-/* 8019C4B0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C4B4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C4B8 38 84 00 17 */ addi r4, r4, 0x17
-/* 8019C4BC 48 1C C4 D9 */ bl strcmp
-/* 8019C4C0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C4C4 40 82 00 0C */ bne lbl_8019C4D0
-/* 8019C4C8 3B C0 00 03 */ li r30, 3
-/* 8019C4CC 48 00 06 24 */ b lbl_8019CAF0
-lbl_8019C4D0:
-/* 8019C4D0 7F E3 FB 78 */ mr r3, r31
-/* 8019C4D4 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C4D8 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C4DC 38 84 00 1F */ addi r4, r4, 0x1f
-/* 8019C4E0 48 1C C4 B5 */ bl strcmp
-/* 8019C4E4 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C4E8 40 82 00 0C */ bne lbl_8019C4F4
-/* 8019C4EC 3B C0 00 06 */ li r30, 6
-/* 8019C4F0 48 00 06 00 */ b lbl_8019CAF0
-lbl_8019C4F4:
-/* 8019C4F4 7F E3 FB 78 */ mr r3, r31
-/* 8019C4F8 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C4FC 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C500 38 84 00 27 */ addi r4, r4, 0x27
-/* 8019C504 48 1C C4 91 */ bl strcmp
-/* 8019C508 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C50C 40 82 00 0C */ bne lbl_8019C518
-/* 8019C510 3B C0 00 04 */ li r30, 4
-/* 8019C514 48 00 05 DC */ b lbl_8019CAF0
-lbl_8019C518:
-/* 8019C518 7F E3 FB 78 */ mr r3, r31
-/* 8019C51C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C520 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C524 38 84 00 2F */ addi r4, r4, 0x2f
-/* 8019C528 38 A0 00 06 */ li r5, 6
-/* 8019C52C 48 1C 9B 61 */ bl memcmp
-/* 8019C530 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C534 41 82 00 E4 */ beq lbl_8019C618
-/* 8019C538 7F E3 FB 78 */ mr r3, r31
-/* 8019C53C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C540 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C544 38 84 00 36 */ addi r4, r4, 0x36
-/* 8019C548 38 A0 00 06 */ li r5, 6
-/* 8019C54C 48 1C 9B 41 */ bl memcmp
-/* 8019C550 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C554 41 82 00 C4 */ beq lbl_8019C618
-/* 8019C558 7F E3 FB 78 */ mr r3, r31
-/* 8019C55C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C560 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C564 38 84 00 3D */ addi r4, r4, 0x3d
-/* 8019C568 38 A0 00 06 */ li r5, 6
-/* 8019C56C 48 1C 9B 21 */ bl memcmp
-/* 8019C570 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C574 41 82 00 A4 */ beq lbl_8019C618
-/* 8019C578 7F E3 FB 78 */ mr r3, r31
-/* 8019C57C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C580 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C584 38 84 00 44 */ addi r4, r4, 0x44
-/* 8019C588 38 A0 00 06 */ li r5, 6
-/* 8019C58C 48 1C 9B 01 */ bl memcmp
-/* 8019C590 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C594 41 82 00 84 */ beq lbl_8019C618
-/* 8019C598 7F E3 FB 78 */ mr r3, r31
-/* 8019C59C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C5A0 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C5A4 38 84 00 4B */ addi r4, r4, 0x4b
-/* 8019C5A8 38 A0 00 06 */ li r5, 6
-/* 8019C5AC 48 1C 9A E1 */ bl memcmp
-/* 8019C5B0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C5B4 41 82 00 64 */ beq lbl_8019C618
-/* 8019C5B8 7F E3 FB 78 */ mr r3, r31
-/* 8019C5BC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C5C0 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C5C4 38 84 00 52 */ addi r4, r4, 0x52
-/* 8019C5C8 38 A0 00 06 */ li r5, 6
-/* 8019C5CC 48 1C 9A C1 */ bl memcmp
-/* 8019C5D0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C5D4 41 82 00 44 */ beq lbl_8019C618
-/* 8019C5D8 7F E3 FB 78 */ mr r3, r31
-/* 8019C5DC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C5E0 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C5E4 38 84 00 59 */ addi r4, r4, 0x59
-/* 8019C5E8 38 A0 00 06 */ li r5, 6
-/* 8019C5EC 48 1C 9A A1 */ bl memcmp
-/* 8019C5F0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C5F4 41 82 00 24 */ beq lbl_8019C618
-/* 8019C5F8 7F E3 FB 78 */ mr r3, r31
-/* 8019C5FC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C600 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C604 38 84 00 60 */ addi r4, r4, 0x60
-/* 8019C608 38 A0 00 06 */ li r5, 6
-/* 8019C60C 48 1C 9A 81 */ bl memcmp
-/* 8019C610 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C614 40 82 00 0C */ bne lbl_8019C620
-lbl_8019C618:
-/* 8019C618 3B C0 00 05 */ li r30, 5
-/* 8019C61C 48 00 04 D4 */ b lbl_8019CAF0
-lbl_8019C620:
-/* 8019C620 7F E3 FB 78 */ mr r3, r31
-/* 8019C624 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C628 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C62C 38 84 00 67 */ addi r4, r4, 0x67
-/* 8019C630 48 1C C3 65 */ bl strcmp
-/* 8019C634 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C638 41 82 00 20 */ beq lbl_8019C658
-/* 8019C63C 7F E3 FB 78 */ mr r3, r31
-/* 8019C640 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C644 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C648 38 84 00 6F */ addi r4, r4, 0x6f
-/* 8019C64C 48 1C C3 49 */ bl strcmp
-/* 8019C650 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C654 40 82 00 0C */ bne lbl_8019C660
-lbl_8019C658:
-/* 8019C658 3B C0 00 0E */ li r30, 0xe
-/* 8019C65C 48 00 04 94 */ b lbl_8019CAF0
-lbl_8019C660:
-/* 8019C660 7F E3 FB 78 */ mr r3, r31
-/* 8019C664 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C668 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C66C 38 84 00 77 */ addi r4, r4, 0x77
-/* 8019C670 48 1C C3 25 */ bl strcmp
-/* 8019C674 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C678 40 82 00 0C */ bne lbl_8019C684
-/* 8019C67C 3B C0 00 0F */ li r30, 0xf
-/* 8019C680 48 00 04 70 */ b lbl_8019CAF0
-lbl_8019C684:
-/* 8019C684 7F E3 FB 78 */ mr r3, r31
-/* 8019C688 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C68C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C690 38 84 00 7F */ addi r4, r4, 0x7f
-/* 8019C694 48 1C C3 01 */ bl strcmp
-/* 8019C698 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C69C 40 82 00 38 */ bne lbl_8019C6D4
-/* 8019C6A0 3B C0 00 08 */ li r30, 8
-/* 8019C6A4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 8019C6A8 7C 00 07 74 */ extsb r0, r0
-/* 8019C6AC 2C 00 00 02 */ cmpwi r0, 2
-/* 8019C6B0 40 82 00 0C */ bne lbl_8019C6BC
-/* 8019C6B4 3B C0 00 0E */ li r30, 0xe
-/* 8019C6B8 48 00 04 38 */ b lbl_8019CAF0
-lbl_8019C6BC:
-/* 8019C6BC 2C 00 00 03 */ cmpwi r0, 3
-/* 8019C6C0 41 82 00 0C */ beq lbl_8019C6CC
-/* 8019C6C4 2C 00 00 08 */ cmpwi r0, 8
-/* 8019C6C8 40 82 04 28 */ bne lbl_8019CAF0
-lbl_8019C6CC:
-/* 8019C6CC 3B C0 00 06 */ li r30, 6
-/* 8019C6D0 48 00 04 20 */ b lbl_8019CAF0
-lbl_8019C6D4:
-/* 8019C6D4 7F E3 FB 78 */ mr r3, r31
-/* 8019C6D8 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C6DC 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C6E0 38 84 00 86 */ addi r4, r4, 0x86
-/* 8019C6E4 48 1C C2 B1 */ bl strcmp
-/* 8019C6E8 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C6EC 40 82 00 0C */ bne lbl_8019C6F8
-/* 8019C6F0 3B C0 00 04 */ li r30, 4
-/* 8019C6F4 48 00 03 FC */ b lbl_8019CAF0
-lbl_8019C6F8:
-/* 8019C6F8 7F E3 FB 78 */ mr r3, r31
-/* 8019C6FC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C700 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C704 38 84 00 8E */ addi r4, r4, 0x8e
-/* 8019C708 48 1C C2 8D */ bl strcmp
-/* 8019C70C 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C710 41 82 00 40 */ beq lbl_8019C750
-/* 8019C714 7F E3 FB 78 */ mr r3, r31
-/* 8019C718 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C71C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C720 38 84 00 95 */ addi r4, r4, 0x95
-/* 8019C724 48 1C C2 71 */ bl strcmp
-/* 8019C728 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C72C 41 82 00 24 */ beq lbl_8019C750
-/* 8019C730 7F E3 FB 78 */ mr r3, r31
-/* 8019C734 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C738 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C73C 38 84 00 9D */ addi r4, r4, 0x9d
-/* 8019C740 38 A0 00 06 */ li r5, 6
-/* 8019C744 48 1C 99 49 */ bl memcmp
-/* 8019C748 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C74C 40 82 00 38 */ bne lbl_8019C784
-lbl_8019C750:
-/* 8019C750 3B C0 00 07 */ li r30, 7
-/* 8019C754 7F E3 FB 78 */ mr r3, r31
-/* 8019C758 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C75C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C760 38 84 00 8E */ addi r4, r4, 0x8e
-/* 8019C764 48 1C C2 31 */ bl strcmp
-/* 8019C768 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C76C 40 82 03 84 */ bne lbl_8019CAF0
-/* 8019C770 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 8019C774 2C 00 00 04 */ cmpwi r0, 4
-/* 8019C778 40 82 03 78 */ bne lbl_8019CAF0
-/* 8019C77C 3B C0 00 04 */ li r30, 4
-/* 8019C780 48 00 03 70 */ b lbl_8019CAF0
-lbl_8019C784:
-/* 8019C784 7F E3 FB 78 */ mr r3, r31
-/* 8019C788 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C78C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C790 38 84 00 A4 */ addi r4, r4, 0xa4
-/* 8019C794 48 1C C2 01 */ bl strcmp
-/* 8019C798 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C79C 41 82 00 3C */ beq lbl_8019C7D8
-/* 8019C7A0 7F E3 FB 78 */ mr r3, r31
-/* 8019C7A4 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C7A8 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C7AC 38 84 00 AC */ addi r4, r4, 0xac
-/* 8019C7B0 48 1C C1 E5 */ bl strcmp
-/* 8019C7B4 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C7B8 41 82 00 20 */ beq lbl_8019C7D8
-/* 8019C7BC 7F E3 FB 78 */ mr r3, r31
-/* 8019C7C0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C7C4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C7C8 38 84 00 B4 */ addi r4, r4, 0xb4
-/* 8019C7CC 48 1C C1 C9 */ bl strcmp
-/* 8019C7D0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C7D4 40 82 00 0C */ bne lbl_8019C7E0
-lbl_8019C7D8:
-/* 8019C7D8 3B C0 00 01 */ li r30, 1
-/* 8019C7DC 48 00 03 14 */ b lbl_8019CAF0
-lbl_8019C7E0:
-/* 8019C7E0 7F E3 FB 78 */ mr r3, r31
-/* 8019C7E4 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C7E8 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C7EC 38 84 00 BC */ addi r4, r4, 0xbc
-/* 8019C7F0 38 A0 00 06 */ li r5, 6
-/* 8019C7F4 48 1C 98 99 */ bl memcmp
-/* 8019C7F8 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C7FC 41 82 00 CC */ beq lbl_8019C8C8
-/* 8019C800 7F E3 FB 78 */ mr r3, r31
-/* 8019C804 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C808 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C80C 38 84 00 C3 */ addi r4, r4, 0xc3
-/* 8019C810 48 1C C1 85 */ bl strcmp
-/* 8019C814 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C818 41 82 00 B0 */ beq lbl_8019C8C8
-/* 8019C81C 7F E3 FB 78 */ mr r3, r31
-/* 8019C820 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C824 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C828 38 84 00 CA */ addi r4, r4, 0xca
-/* 8019C82C 48 1C C1 69 */ bl strcmp
-/* 8019C830 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C834 41 82 00 94 */ beq lbl_8019C8C8
-/* 8019C838 7F E3 FB 78 */ mr r3, r31
-/* 8019C83C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C840 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C844 38 84 00 D2 */ addi r4, r4, 0xd2
-/* 8019C848 38 A0 00 06 */ li r5, 6
-/* 8019C84C 48 1C 98 41 */ bl memcmp
-/* 8019C850 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C854 41 82 00 74 */ beq lbl_8019C8C8
-/* 8019C858 7F E3 FB 78 */ mr r3, r31
-/* 8019C85C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C860 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C864 38 84 00 D9 */ addi r4, r4, 0xd9
-/* 8019C868 48 1C C1 2D */ bl strcmp
-/* 8019C86C 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C870 41 82 00 58 */ beq lbl_8019C8C8
-/* 8019C874 7F E3 FB 78 */ mr r3, r31
-/* 8019C878 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C87C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C880 38 84 00 E1 */ addi r4, r4, 0xe1
-/* 8019C884 48 1C C1 11 */ bl strcmp
-/* 8019C888 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C88C 41 82 00 3C */ beq lbl_8019C8C8
-/* 8019C890 7F E3 FB 78 */ mr r3, r31
-/* 8019C894 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C898 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C89C 38 84 00 E9 */ addi r4, r4, 0xe9
-/* 8019C8A0 48 1C C0 F5 */ bl strcmp
-/* 8019C8A4 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C8A8 41 82 00 20 */ beq lbl_8019C8C8
-/* 8019C8AC 7F E3 FB 78 */ mr r3, r31
-/* 8019C8B0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C8B4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C8B8 38 84 00 F0 */ addi r4, r4, 0xf0
-/* 8019C8BC 48 1C C0 D9 */ bl strcmp
-/* 8019C8C0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C8C4 40 82 00 0C */ bne lbl_8019C8D0
-lbl_8019C8C8:
-/* 8019C8C8 3B C0 00 08 */ li r30, 8
-/* 8019C8CC 48 00 02 24 */ b lbl_8019CAF0
-lbl_8019C8D0:
-/* 8019C8D0 7F E3 FB 78 */ mr r3, r31
-/* 8019C8D4 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C8D8 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C8DC 38 84 00 F8 */ addi r4, r4, 0xf8
-/* 8019C8E0 48 1C C0 B5 */ bl strcmp
-/* 8019C8E4 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C8E8 40 82 00 0C */ bne lbl_8019C8F4
-/* 8019C8EC 3B C0 00 0E */ li r30, 0xe
-/* 8019C8F0 48 00 02 00 */ b lbl_8019CAF0
-lbl_8019C8F4:
-/* 8019C8F4 7F E3 FB 78 */ mr r3, r31
-/* 8019C8F8 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C8FC 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C900 38 84 01 00 */ addi r4, r4, 0x100
-/* 8019C904 38 A0 00 06 */ li r5, 6
-/* 8019C908 48 1C 97 85 */ bl memcmp
-/* 8019C90C 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C910 40 82 00 0C */ bne lbl_8019C91C
-/* 8019C914 3B C0 00 09 */ li r30, 9
-/* 8019C918 48 00 01 D8 */ b lbl_8019CAF0
-lbl_8019C91C:
-/* 8019C91C 7F E3 FB 78 */ mr r3, r31
-/* 8019C920 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C924 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C928 38 84 01 07 */ addi r4, r4, 0x107
-/* 8019C92C 38 A0 00 06 */ li r5, 6
-/* 8019C930 48 1C 97 5D */ bl memcmp
-/* 8019C934 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C938 41 82 00 24 */ beq lbl_8019C95C
-/* 8019C93C 7F E3 FB 78 */ mr r3, r31
-/* 8019C940 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C944 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C948 38 84 01 0E */ addi r4, r4, 0x10e
-/* 8019C94C 38 A0 00 06 */ li r5, 6
-/* 8019C950 48 1C 97 3D */ bl memcmp
-/* 8019C954 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C958 40 82 00 0C */ bne lbl_8019C964
-lbl_8019C95C:
-/* 8019C95C 3B C0 00 0A */ li r30, 0xa
-/* 8019C960 48 00 01 90 */ b lbl_8019CAF0
-lbl_8019C964:
-/* 8019C964 7F E3 FB 78 */ mr r3, r31
-/* 8019C968 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C96C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C970 38 84 01 15 */ addi r4, r4, 0x115
-/* 8019C974 48 1C C0 21 */ bl strcmp
-/* 8019C978 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C97C 41 82 00 AC */ beq lbl_8019CA28
-/* 8019C980 7F E3 FB 78 */ mr r3, r31
-/* 8019C984 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C988 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C98C 38 84 01 1C */ addi r4, r4, 0x11c
-/* 8019C990 48 1C C0 05 */ bl strcmp
-/* 8019C994 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C998 41 82 00 90 */ beq lbl_8019CA28
-/* 8019C99C 7F E3 FB 78 */ mr r3, r31
-/* 8019C9A0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C9A4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C9A8 38 84 01 24 */ addi r4, r4, 0x124
-/* 8019C9AC 48 1C BF E9 */ bl strcmp
-/* 8019C9B0 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C9B4 41 82 00 74 */ beq lbl_8019CA28
-/* 8019C9B8 7F E3 FB 78 */ mr r3, r31
-/* 8019C9BC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C9C0 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C9C4 38 84 01 2C */ addi r4, r4, 0x12c
-/* 8019C9C8 48 1C BF CD */ bl strcmp
-/* 8019C9CC 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C9D0 41 82 00 58 */ beq lbl_8019CA28
-/* 8019C9D4 7F E3 FB 78 */ mr r3, r31
-/* 8019C9D8 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C9DC 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C9E0 38 84 01 34 */ addi r4, r4, 0x134
-/* 8019C9E4 48 1C BF B1 */ bl strcmp
-/* 8019C9E8 2C 03 00 00 */ cmpwi r3, 0
-/* 8019C9EC 41 82 00 3C */ beq lbl_8019CA28
-/* 8019C9F0 7F E3 FB 78 */ mr r3, r31
-/* 8019C9F4 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019C9F8 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019C9FC 38 84 01 3C */ addi r4, r4, 0x13c
-/* 8019CA00 48 1C BF 95 */ bl strcmp
-/* 8019CA04 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CA08 41 82 00 20 */ beq lbl_8019CA28
-/* 8019CA0C 7F E3 FB 78 */ mr r3, r31
-/* 8019CA10 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019CA14 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019CA18 38 84 01 44 */ addi r4, r4, 0x144
-/* 8019CA1C 48 1C BF 79 */ bl strcmp
-/* 8019CA20 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CA24 40 82 00 38 */ bne lbl_8019CA5C
-lbl_8019CA28:
-/* 8019CA28 3B C0 00 0B */ li r30, 0xb
-/* 8019CA2C 7F E3 FB 78 */ mr r3, r31
-/* 8019CA30 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019CA34 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019CA38 38 84 01 15 */ addi r4, r4, 0x115
-/* 8019CA3C 48 1C BF 59 */ bl strcmp
-/* 8019CA40 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CA44 40 82 00 AC */ bne lbl_8019CAF0
-/* 8019CA48 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 8019CA4C 2C 00 00 01 */ cmpwi r0, 1
-/* 8019CA50 40 82 00 A0 */ bne lbl_8019CAF0
-/* 8019CA54 3B C0 00 0C */ li r30, 0xc
-/* 8019CA58 48 00 00 98 */ b lbl_8019CAF0
-lbl_8019CA5C:
-/* 8019CA5C 7F E3 FB 78 */ mr r3, r31
-/* 8019CA60 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019CA64 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019CA68 38 84 01 4C */ addi r4, r4, 0x14c
-/* 8019CA6C 48 1C BF 29 */ bl strcmp
-/* 8019CA70 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CA74 41 82 00 3C */ beq lbl_8019CAB0
-/* 8019CA78 7F E3 FB 78 */ mr r3, r31
-/* 8019CA7C 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019CA80 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019CA84 38 84 01 54 */ addi r4, r4, 0x154
-/* 8019CA88 48 1C BF 0D */ bl strcmp
-/* 8019CA8C 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CA90 41 82 00 20 */ beq lbl_8019CAB0
-/* 8019CA94 7F E3 FB 78 */ mr r3, r31
-/* 8019CA98 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019CA9C 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019CAA0 38 84 01 5C */ addi r4, r4, 0x15c
-/* 8019CAA4 48 1C BE F1 */ bl strcmp
-/* 8019CAA8 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CAAC 40 82 00 0C */ bne lbl_8019CAB8
-lbl_8019CAB0:
-/* 8019CAB0 3B C0 00 0C */ li r30, 0xc
-/* 8019CAB4 48 00 00 3C */ b lbl_8019CAF0
-lbl_8019CAB8:
-/* 8019CAB8 7F E3 FB 78 */ mr r3, r31
-/* 8019CABC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019CAC0 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019CAC4 38 84 01 64 */ addi r4, r4, 0x164
-/* 8019CAC8 48 1C BE CD */ bl strcmp
-/* 8019CACC 2C 03 00 00 */ cmpwi r3, 0
-/* 8019CAD0 40 82 00 20 */ bne lbl_8019CAF0
-/* 8019CAD4 3B C0 00 0C */ li r30, 0xc
-/* 8019CAD8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 8019CADC 7C 00 07 75 */ extsb. r0, r0
-/* 8019CAE0 41 82 00 0C */ beq lbl_8019CAEC
-/* 8019CAE4 2C 00 00 02 */ cmpwi r0, 2
-/* 8019CAE8 40 82 00 08 */ bne lbl_8019CAF0
-lbl_8019CAEC:
-/* 8019CAEC 3B C0 00 0B */ li r30, 0xb
-lbl_8019CAF0:
-/* 8019CAF0 7F C3 F3 78 */ mr r3, r30
-/* 8019CAF4 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8019CAF8 83 C1 00 08 */ lwz r30, 8(r1)
-/* 8019CAFC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8019CB00 7C 08 03 A6 */ mtlr r0
-/* 8019CB04 38 21 00 10 */ addi r1, r1, 0x10
-/* 8019CB08 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_setLight_again__Fv.s b/asm/d/kankyo/d_kankyo/dKy_setLight_again__Fv.s
deleted file mode 100644
index 5d45b30053..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_setLight_again__Fv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_801A75C0:
-/* 801A75C0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 801A75C4 7C 08 02 A6 */ mflr r0
-/* 801A75C8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 801A75CC 4B FF EB 15 */ bl dKy_GlobalLight_set__Fv
-/* 801A75D0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 801A75D4 7C 08 03 A6 */ mtlr r0
-/* 801A75D8 38 21 00 10 */ addi r1, r1, 0x10
-/* 801A75DC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom__Fc.s b/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom__Fc.s
deleted file mode 100644
index 4354a41b4c..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom__Fc.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_801A6C20:
-/* 801A6C20 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 801A6C24 7C 08 02 A6 */ mflr r0
-/* 801A6C28 90 01 00 14 */ stw r0, 0x14(r1)
-/* 801A6C2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801A6C30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801A6C34 80 04 5D 74 */ lwz r0, 0x5d74(r4)
-/* 801A6C38 28 00 00 00 */ cmplwi r0, 0
-/* 801A6C3C 41 82 00 0C */ beq lbl_801A6C48
-/* 801A6C40 C0 22 A2 48 */ lfs f1, lit_4505(r2)
-/* 801A6C44 4B FF F6 35 */ bl dKy_setLight_nowroom_common__Fcf
-lbl_801A6C48:
-/* 801A6C48 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 801A6C4C 7C 08 03 A6 */ mtlr r0
-/* 801A6C50 38 21 00 10 */ addi r1, r1, 0x10
-/* 801A6C54 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_shadow_mode_check__FUc.s b/asm/d/kankyo/d_kankyo/dKy_shadow_mode_check__FUc.s
deleted file mode 100644
index 5ee255f872..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_shadow_mode_check__FUc.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_801ACD0C:
-/* 801ACD0C 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 801ACD10 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 801ACD14 88 04 12 D7 */ lbz r0, 0x12d7(r4)
-/* 801ACD18 7C 00 18 38 */ and r0, r0, r3
-/* 801ACD1C 54 03 06 3E */ clrlwi r3, r0, 0x18
-/* 801ACD20 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_shadow_mode_reset__FUc.s b/asm/d/kankyo/d_kankyo/dKy_shadow_mode_reset__FUc.s
deleted file mode 100644
index f481e34a85..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_shadow_mode_reset__FUc.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_801ACCF4:
-/* 801ACCF4 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 801ACCF8 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 801ACCFC 88 04 12 D7 */ lbz r0, 0x12d7(r4)
-/* 801ACD00 7C 00 18 78 */ andc r0, r0, r3
-/* 801ACD04 98 04 12 D7 */ stb r0, 0x12d7(r4)
-/* 801ACD08 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/dKy_shadow_mode_set__FUc.s b/asm/d/kankyo/d_kankyo/dKy_shadow_mode_set__FUc.s
deleted file mode 100644
index 28cba6c5b6..0000000000
--- a/asm/d/kankyo/d_kankyo/dKy_shadow_mode_set__FUc.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_801ACCDC:
-/* 801ACCDC 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 801ACCE0 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 801ACCE4 88 04 12 D7 */ lbz r0, 0x12d7(r4)
-/* 801ACCE8 7C 00 1B 78 */ or r0, r0, r3
-/* 801ACCEC 98 04 12 D7 */ stb r0, 0x12d7(r4)
-/* 801ACCF0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/darkmist_init__Fv.s b/asm/d/kankyo/d_kankyo/darkmist_init__Fv.s
deleted file mode 100644
index 7eb2a8cd69..0000000000
--- a/asm/d/kankyo/d_kankyo/darkmist_init__Fv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_8019E708:
-/* 8019E708 38 60 00 00 */ li r3, 0
-/* 8019E70C 7C 66 1B 78 */ mr r6, r3
-/* 8019E710 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E714 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019E718 38 00 00 0A */ li r0, 0xa
-/* 8019E71C 7C 09 03 A6 */ mtctr r0
-lbl_8019E720:
-/* 8019E720 7C 85 1A 14 */ add r4, r5, r3
-/* 8019E724 90 C4 09 90 */ stw r6, 0x990(r4)
-/* 8019E728 38 63 00 04 */ addi r3, r3, 4
-/* 8019E72C 42 00 FF F4 */ bdnz lbl_8019E720
-/* 8019E730 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/drawKankyo__18dScnKy_env_light_cFv.s b/asm/d/kankyo/d_kankyo/drawKankyo__18dScnKy_env_light_cFv.s
deleted file mode 100644
index fb8552e05d..0000000000
--- a/asm/d/kankyo/d_kankyo/drawKankyo__18dScnKy_env_light_cFv.s
+++ /dev/null
@@ -1,21 +0,0 @@
-lbl_801A56DC:
-/* 801A56DC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 801A56E0 7C 08 02 A6 */ mflr r0
-/* 801A56E4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 801A56E8 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 801A56EC 7C 7F 1B 78 */ mr r31, r3
-/* 801A56F0 4B FF A0 99 */ bl setSunpos__18dScnKy_env_light_cFv
-/* 801A56F4 7F E3 FB 78 */ mr r3, r31
-/* 801A56F8 4B FF FA 75 */ bl SetBaseLight__18dScnKy_env_light_cFv
-/* 801A56FC 7F E3 FB 78 */ mr r3, r31
-/* 801A5700 4B FF AD 0D */ bl setLight__18dScnKy_env_light_cFv
-/* 801A5704 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 801A5708 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 801A570C 88 03 12 C6 */ lbz r0, 0x12c6(r3)
-/* 801A5710 7C 03 07 74 */ extsb r3, r0
-/* 801A5714 48 00 15 0D */ bl dKy_setLight_nowroom__Fc
-/* 801A5718 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 801A571C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 801A5720 7C 08 03 A6 */ mtlr r0
-/* 801A5724 38 21 00 10 */ addi r1, r1, 0x10
-/* 801A5728 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/getDarkDaytime__18dScnKy_env_light_cFv.s b/asm/d/kankyo/d_kankyo/getDarkDaytime__18dScnKy_env_light_cFv.s
deleted file mode 100644
index ff955c68c9..0000000000
--- a/asm/d/kankyo/d_kankyo/getDarkDaytime__18dScnKy_env_light_cFv.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_8019FBCC:
-/* 8019FBCC C0 23 12 50 */ lfs f1, 0x1250(r3)
-/* 8019FBD0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/plight_init__Fv.s b/asm/d/kankyo/d_kankyo/plight_init__Fv.s
deleted file mode 100644
index 1c16a6a929..0000000000
--- a/asm/d/kankyo/d_kankyo/plight_init__Fv.s
+++ /dev/null
@@ -1,32 +0,0 @@
-lbl_8019E694:
-/* 8019E694 C0 02 A2 88 */ lfs f0, lit_5077(r2)
-/* 8019E698 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E69C 38 C3 CA 54 */ addi r6, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019E6A0 D0 06 00 4C */ stfs f0, 0x4c(r6)
-/* 8019E6A4 38 60 00 00 */ li r3, 0
-/* 8019E6A8 7C 65 1B 78 */ mr r5, r3
-/* 8019E6AC 38 00 00 64 */ li r0, 0x64
-/* 8019E6B0 7C 09 03 A6 */ mtctr r0
-lbl_8019E6B4:
-/* 8019E6B4 7C 86 1A 14 */ add r4, r6, r3
-/* 8019E6B8 90 A4 03 F8 */ stw r5, 0x3f8(r4)
-/* 8019E6BC 38 63 00 04 */ addi r3, r3, 4
-/* 8019E6C0 42 00 FF F4 */ bdnz lbl_8019E6B4
-/* 8019E6C4 38 60 00 00 */ li r3, 0
-/* 8019E6C8 38 A0 00 00 */ li r5, 0
-/* 8019E6CC 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E6D0 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019E6D4 38 00 00 05 */ li r0, 5
-/* 8019E6D8 7C 09 03 A6 */ mtctr r0
-lbl_8019E6DC:
-/* 8019E6DC 7C C4 1A 14 */ add r6, r4, r3
-/* 8019E6E0 90 A6 05 88 */ stw r5, 0x588(r6)
-/* 8019E6E4 90 A6 07 2C */ stw r5, 0x72c(r6)
-/* 8019E6E8 38 63 00 04 */ addi r3, r3, 4
-/* 8019E6EC 42 00 FF F0 */ bdnz lbl_8019E6DC
-/* 8019E6F0 38 00 FF FF */ li r0, -1
-/* 8019E6F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019E6F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019E6FC 90 03 12 A4 */ stw r0, 0x12a4(r3)
-/* 8019E700 90 03 12 A8 */ stw r0, 0x12a8(r3)
-/* 8019E704 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo/undwater_init__Fv.s b/asm/d/kankyo/d_kankyo/undwater_init__Fv.s
deleted file mode 100644
index 895eb15b2b..0000000000
--- a/asm/d/kankyo/d_kankyo/undwater_init__Fv.s
+++ /dev/null
@@ -1,80 +0,0 @@
-lbl_8019EAA0:
-/* 8019EAA0 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 8019EAA4 7C 08 02 A6 */ mflr r0
-/* 8019EAA8 90 01 00 24 */ stw r0, 0x24(r1)
-/* 8019EAAC 39 61 00 20 */ addi r11, r1, 0x20
-/* 8019EAB0 48 1C 37 25 */ bl _savegpr_27
-/* 8019EAB4 3C 60 80 39 */ lis r3, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019EAB8 38 63 4C 6C */ addi r3, r3, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019EABC 38 63 01 73 */ addi r3, r3, 0x173
-/* 8019EAC0 38 80 00 1D */ li r4, 0x1d
-/* 8019EAC4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8019EAC8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8019EACC 3F 85 00 02 */ addis r28, r5, 2
-/* 8019EAD0 3B 9C C2 F8 */ addi r28, r28, -15624
-/* 8019EAD4 7F 85 E3 78 */ mr r5, r28
-/* 8019EAD8 38 C0 00 80 */ li r6, 0x80
-/* 8019EADC 4B E9 D8 11 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 8019EAE0 7C 7B 1B 78 */ mr r27, r3
-/* 8019EAE4 38 60 06 00 */ li r3, 0x600
-/* 8019EAE8 38 80 00 20 */ li r4, 0x20
-/* 8019EAEC 4B E7 05 59 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl
-/* 8019EAF0 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019EAF4 3B A4 CA 54 */ addi r29, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019EAF8 90 7D 0F 38 */ stw r3, 0xf38(r29)
-/* 8019EAFC 28 03 00 00 */ cmplwi r3, 0
-/* 8019EB00 41 82 00 B8 */ beq lbl_8019EBB8
-/* 8019EB04 7F 63 DB 78 */ mr r3, r27
-/* 8019EB08 3C 80 00 08 */ lis r4, 8
-/* 8019EB0C 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */
-/* 8019EB10 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */
-/* 8019EB14 4B E7 61 41 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
-/* 8019EB18 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019EB1C 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8019EB20 90 64 0F 30 */ stw r3, 0xf30(r4)
-/* 8019EB24 28 03 00 00 */ cmplwi r3, 0
-/* 8019EB28 41 82 00 84 */ beq lbl_8019EBAC
-/* 8019EB2C 38 60 00 18 */ li r3, 0x18
-/* 8019EB30 48 13 01 1D */ bl __nw__FUl
-/* 8019EB34 7C 7E 1B 79 */ or. r30, r3, r3
-/* 8019EB38 41 82 00 20 */ beq lbl_8019EB58
-/* 8019EB3C 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */
-/* 8019EB40 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */
-/* 8019EB44 90 1E 00 00 */ stw r0, 0(r30)
-/* 8019EB48 38 80 00 00 */ li r4, 0
-/* 8019EB4C 48 18 98 B1 */ bl init__12J3DFrameCtrlFs
-/* 8019EB50 38 00 00 00 */ li r0, 0
-/* 8019EB54 90 1E 00 14 */ stw r0, 0x14(r30)
-lbl_8019EB58:
-/* 8019EB58 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8019EB5C 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8019EB60 93 DF 10 5C */ stw r30, 0x105c(r31)
-/* 8019EB64 28 1E 00 00 */ cmplwi r30, 0
-/* 8019EB68 41 82 00 44 */ beq lbl_8019EBAC
-/* 8019EB6C 3C 60 80 39 */ lis r3, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */
-/* 8019EB70 38 63 4C 6C */ addi r3, r3, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */
-/* 8019EB74 38 63 01 73 */ addi r3, r3, 0x173
-/* 8019EB78 38 80 00 3C */ li r4, 0x3c
-/* 8019EB7C 7F 85 E3 78 */ mr r5, r28
-/* 8019EB80 38 C0 00 80 */ li r6, 0x80
-/* 8019EB84 4B E9 D7 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 8019EB88 7C 65 1B 78 */ mr r5, r3
-/* 8019EB8C 80 7F 10 5C */ lwz r3, 0x105c(r31)
-/* 8019EB90 38 9B 00 58 */ addi r4, r27, 0x58
-/* 8019EB94 38 C0 00 01 */ li r6, 1
-/* 8019EB98 38 E0 00 02 */ li r7, 2
-/* 8019EB9C C0 22 A2 48 */ lfs f1, lit_4505(r2)
-/* 8019EBA0 39 00 00 00 */ li r8, 0
-/* 8019EBA4 39 20 FF FF */ li r9, -1
-/* 8019EBA8 4B E6 EA 95 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss
-lbl_8019EBAC:
-/* 8019EBAC 4B E7 06 49 */ bl mDoExt_restoreCurrentHeap__Fv
-/* 8019EBB0 80 7D 0F 38 */ lwz r3, 0xf38(r29)
-/* 8019EBB4 4B E7 04 D9 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap
-lbl_8019EBB8:
-/* 8019EBB8 39 61 00 20 */ addi r11, r1, 0x20
-/* 8019EBBC 48 1C 36 65 */ bl _restgpr_27
-/* 8019EBC0 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8019EBC4 7C 08 03 A6 */ mtlr r0
-/* 8019EBC8 38 21 00 20 */ addi r1, r1, 0x20
-/* 8019EBCC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__10EF_MUD_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__10EF_MUD_EFFFv.s
deleted file mode 100644
index 4a49a13873..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__10EF_MUD_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056FFC:
-/* 80056FFC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057000 7C 08 02 A6 */ mflr r0
-/* 80057004 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057008 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8005700C 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80057010 41 82 00 10 */ beq lbl_80057020
-/* 80057014 7C 80 07 35 */ extsh. r0, r4
-/* 80057018 40 81 00 08 */ ble lbl_80057020
-/* 8005701C 48 27 7D 21 */ bl __dl__FPv
-lbl_80057020:
-/* 80057020 7F E3 FB 78 */ mr r3, r31
-/* 80057024 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057028 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005702C 7C 08 03 A6 */ mtlr r0
-/* 80057030 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057034 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__10VRKUMO_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__10VRKUMO_EFFFv.s
deleted file mode 100644
index eee53bd6f8..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__10VRKUMO_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056F18:
-/* 80056F18 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056F1C 7C 08 02 A6 */ mflr r0
-/* 80056F20 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056F24 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056F28 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056F2C 41 82 00 10 */ beq lbl_80056F3C
-/* 80056F30 7C 80 07 35 */ extsh. r0, r4
-/* 80056F34 40 81 00 08 */ ble lbl_80056F3C
-/* 80056F38 48 27 7E 05 */ bl __dl__FPv
-lbl_80056F3C:
-/* 80056F3C 7F E3 FB 78 */ mr r3, r31
-/* 80056F40 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056F44 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056F48 7C 08 03 A6 */ mtlr r0
-/* 80056F4C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056F50 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__11EF_EVIL_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__11EF_EVIL_EFFFv.s
deleted file mode 100644
index 26a61be7e4..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__11EF_EVIL_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_8005706C:
-/* 8005706C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057070 7C 08 02 A6 */ mflr r0
-/* 80057074 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057078 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8005707C 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80057080 41 82 00 10 */ beq lbl_80057090
-/* 80057084 7C 80 07 35 */ extsh. r0, r4
-/* 80057088 40 81 00 08 */ ble lbl_80057090
-/* 8005708C 48 27 7C B1 */ bl __dl__FPv
-lbl_80057090:
-/* 80057090 7F E3 FB 78 */ mr r3, r31
-/* 80057094 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057098 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005709C 7C 08 03 A6 */ mtlr r0
-/* 800570A0 38 21 00 10 */ addi r1, r1, 0x10
-/* 800570A4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__12EF_ODOUR_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__12EF_ODOUR_EFFFv.s
deleted file mode 100644
index 5479b97dcb..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__12EF_ODOUR_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056F8C:
-/* 80056F8C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056F90 7C 08 02 A6 */ mflr r0
-/* 80056F94 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056F98 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056F9C 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056FA0 41 82 00 10 */ beq lbl_80056FB0
-/* 80056FA4 7C 80 07 35 */ extsh. r0, r4
-/* 80056FA8 40 81 00 08 */ ble lbl_80056FB0
-/* 80056FAC 48 27 7D 91 */ bl __dl__FPv
-lbl_80056FB0:
-/* 80056FB0 7F E3 FB 78 */ mr r3, r31
-/* 80056FB4 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056FB8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056FBC 7C 08 03 A6 */ mtlr r0
-/* 80056FC0 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056FC4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_mud_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_mud_PacketFv.s
deleted file mode 100644
index e919f0206f..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_mud_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057D08:
-/* 80057D08 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057D0C 7C 08 02 A6 */ mflr r0
-/* 80057D10 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057D14 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057D18 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057D1C 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057D20 7C 9F 23 78 */ mr r31, r4
-/* 80057D24 41 82 00 4C */ beq lbl_80057D70
-/* 80057D28 3C 60 80 3B */ lis r3, __vt__18dKankyo_mud_Packet@ha /* 0x803A9AD4@ha */
-/* 80057D2C 38 03 9A D4 */ addi r0, r3, __vt__18dKankyo_mud_Packet@l /* 0x803A9AD4@l */
-/* 80057D30 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057D34 38 7E 00 18 */ addi r3, r30, 0x18
-/* 80057D38 3C 80 80 05 */ lis r4, __dt__10EF_MUD_EFFFv@ha /* 0x80056FFC@ha */
-/* 80057D3C 38 84 6F FC */ addi r4, r4, __dt__10EF_MUD_EFFFv@l /* 0x80056FFC@l */
-/* 80057D40 38 A0 00 48 */ li r5, 0x48
-/* 80057D44 38 C0 00 64 */ li r6, 0x64
-/* 80057D48 48 30 9F A1 */ bl __destroy_arr
-/* 80057D4C 28 1E 00 00 */ cmplwi r30, 0
-/* 80057D50 41 82 00 10 */ beq lbl_80057D60
-/* 80057D54 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057D58 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057D5C 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057D60:
-/* 80057D60 7F E0 07 35 */ extsh. r0, r31
-/* 80057D64 40 81 00 0C */ ble lbl_80057D70
-/* 80057D68 7F C3 F3 78 */ mr r3, r30
-/* 80057D6C 48 27 6F D1 */ bl __dl__FPv
-lbl_80057D70:
-/* 80057D70 7F C3 F3 78 */ mr r3, r30
-/* 80057D74 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057D78 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057D7C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057D80 7C 08 03 A6 */ mtlr r0
-/* 80057D84 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057D88 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_sun_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_sun_PacketFv.s
deleted file mode 100644
index a0b6d5f640..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__18dKankyo_sun_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80058128:
-/* 80058128 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005812C 7C 08 02 A6 */ mflr r0
-/* 80058130 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80058134 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80058138 93 C1 00 08 */ stw r30, 8(r1)
-/* 8005813C 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80058140 7C 9F 23 78 */ mr r31, r4
-/* 80058144 41 82 00 4C */ beq lbl_80058190
-/* 80058148 3C 60 80 3B */ lis r3, __vt__18dKankyo_sun_Packet@ha /* 0x803A9B88@ha */
-/* 8005814C 38 03 9B 88 */ addi r0, r3, __vt__18dKankyo_sun_Packet@l /* 0x803A9B88@l */
-/* 80058150 90 1E 00 00 */ stw r0, 0(r30)
-/* 80058154 38 7E 00 10 */ addi r3, r30, 0x10
-/* 80058158 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */
-/* 8005815C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */
-/* 80058160 38 A0 00 0C */ li r5, 0xc
-/* 80058164 38 C0 00 02 */ li r6, 2
-/* 80058168 48 30 9B 81 */ bl __destroy_arr
-/* 8005816C 28 1E 00 00 */ cmplwi r30, 0
-/* 80058170 41 82 00 10 */ beq lbl_80058180
-/* 80058174 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80058178 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 8005817C 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80058180:
-/* 80058180 7F E0 07 35 */ extsh. r0, r31
-/* 80058184 40 81 00 0C */ ble lbl_80058190
-/* 80058188 7F C3 F3 78 */ mr r3, r30
-/* 8005818C 48 27 6B B1 */ bl __dl__FPv
-lbl_80058190:
-/* 80058190 7F C3 F3 78 */ mr r3, r30
-/* 80058194 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80058198 83 C1 00 08 */ lwz r30, 8(r1)
-/* 8005819C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800581A0 7C 08 03 A6 */ mtlr r0
-/* 800581A4 38 21 00 10 */ addi r1, r1, 0x10
-/* 800581A8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_evil_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_evil_PacketFv.s
deleted file mode 100644
index ca4772c590..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_evil_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057C84:
-/* 80057C84 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057C88 7C 08 02 A6 */ mflr r0
-/* 80057C8C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057C90 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057C94 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057C98 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057C9C 7C 9F 23 78 */ mr r31, r4
-/* 80057CA0 41 82 00 4C */ beq lbl_80057CEC
-/* 80057CA4 3C 60 80 3B */ lis r3, __vt__19dKankyo_evil_Packet@ha /* 0x803A9AC0@ha */
-/* 80057CA8 38 03 9A C0 */ addi r0, r3, __vt__19dKankyo_evil_Packet@l /* 0x803A9AC0@l */
-/* 80057CAC 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057CB0 38 7E 00 1C */ addi r3, r30, 0x1c
-/* 80057CB4 3C 80 80 05 */ lis r4, __dt__11EF_EVIL_EFFFv@ha /* 0x8005706C@ha */
-/* 80057CB8 38 84 70 6C */ addi r4, r4, __dt__11EF_EVIL_EFFFv@l /* 0x8005706C@l */
-/* 80057CBC 38 A0 00 44 */ li r5, 0x44
-/* 80057CC0 38 C0 07 D0 */ li r6, 0x7d0
-/* 80057CC4 48 30 A0 25 */ bl __destroy_arr
-/* 80057CC8 28 1E 00 00 */ cmplwi r30, 0
-/* 80057CCC 41 82 00 10 */ beq lbl_80057CDC
-/* 80057CD0 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057CD4 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057CD8 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057CDC:
-/* 80057CDC 7F E0 07 35 */ extsh. r0, r31
-/* 80057CE0 40 81 00 0C */ ble lbl_80057CEC
-/* 80057CE4 7F C3 F3 78 */ mr r3, r30
-/* 80057CE8 48 27 70 55 */ bl __dl__FPv
-lbl_80057CEC:
-/* 80057CEC 7F C3 F3 78 */ mr r3, r30
-/* 80057CF0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057CF4 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057CF8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057CFC 7C 08 03 A6 */ mtlr r0
-/* 80057D00 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057D04 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_rain_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_rain_PacketFv.s
deleted file mode 100644
index eea2897f95..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_rain_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80058020:
-/* 80058020 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80058024 7C 08 02 A6 */ mflr r0
-/* 80058028 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005802C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80058030 93 C1 00 08 */ stw r30, 8(r1)
-/* 80058034 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80058038 7C 9F 23 78 */ mr r31, r4
-/* 8005803C 41 82 00 4C */ beq lbl_80058088
-/* 80058040 3C 60 80 3B */ lis r3, __vt__19dKankyo_rain_Packet@ha /* 0x803A9B60@ha */
-/* 80058044 38 03 9B 60 */ addi r0, r3, __vt__19dKankyo_rain_Packet@l /* 0x803A9B60@l */
-/* 80058048 90 1E 00 00 */ stw r0, 0(r30)
-/* 8005804C 38 7E 00 18 */ addi r3, r30, 0x18
-/* 80058050 3C 80 80 05 */ lis r4, __dt__8RAIN_EFFFv@ha /* 0x80056CD0@ha */
-/* 80058054 38 84 6C D0 */ addi r4, r4, __dt__8RAIN_EFFFv@l /* 0x80056CD0@l */
-/* 80058058 38 A0 00 38 */ li r5, 0x38
-/* 8005805C 38 C0 00 FA */ li r6, 0xfa
-/* 80058060 48 30 9C 89 */ bl __destroy_arr
-/* 80058064 28 1E 00 00 */ cmplwi r30, 0
-/* 80058068 41 82 00 10 */ beq lbl_80058078
-/* 8005806C 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80058070 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80058074 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80058078:
-/* 80058078 7F E0 07 35 */ extsh. r0, r31
-/* 8005807C 40 81 00 0C */ ble lbl_80058088
-/* 80058080 7F C3 F3 78 */ mr r3, r30
-/* 80058084 48 27 6C B9 */ bl __dl__FPv
-lbl_80058088:
-/* 80058088 7F C3 F3 78 */ mr r3, r30
-/* 8005808C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80058090 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80058094 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80058098 7C 08 03 A6 */ mtlr r0
-/* 8005809C 38 21 00 10 */ addi r1, r1, 0x10
-/* 800580A0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_snow_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_snow_PacketFv.s
deleted file mode 100644
index 4f06b6aff8..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_snow_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057F9C:
-/* 80057F9C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057FA0 7C 08 02 A6 */ mflr r0
-/* 80057FA4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057FA8 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057FAC 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057FB0 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057FB4 7C 9F 23 78 */ mr r31, r4
-/* 80057FB8 41 82 00 4C */ beq lbl_80058004
-/* 80057FBC 3C 60 80 3B */ lis r3, __vt__19dKankyo_snow_Packet@ha /* 0x803A9B4C@ha */
-/* 80057FC0 38 03 9B 4C */ addi r0, r3, __vt__19dKankyo_snow_Packet@l /* 0x803A9B4C@l */
-/* 80057FC4 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057FC8 38 7E 00 14 */ addi r3, r30, 0x14
-/* 80057FCC 3C 80 80 05 */ lis r4, __dt__8SNOW_EFFFv@ha /* 0x80056D58@ha */
-/* 80057FD0 38 84 6D 58 */ addi r4, r4, __dt__8SNOW_EFFFv@l /* 0x80056D58@l */
-/* 80057FD4 38 A0 00 38 */ li r5, 0x38
-/* 80057FD8 38 C0 01 F4 */ li r6, 0x1f4
-/* 80057FDC 48 30 9D 0D */ bl __destroy_arr
-/* 80057FE0 28 1E 00 00 */ cmplwi r30, 0
-/* 80057FE4 41 82 00 10 */ beq lbl_80057FF4
-/* 80057FE8 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057FEC 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057FF0 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057FF4:
-/* 80057FF4 7F E0 07 35 */ extsh. r0, r31
-/* 80057FF8 40 81 00 0C */ ble lbl_80058004
-/* 80057FFC 7F C3 F3 78 */ mr r3, r30
-/* 80058000 48 27 6D 3D */ bl __dl__FPv
-lbl_80058004:
-/* 80058004 7F C3 F3 78 */ mr r3, r30
-/* 80058008 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8005800C 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80058010 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80058014 7C 08 03 A6 */ mtlr r0
-/* 80058018 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005801C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_star_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_star_PacketFv.s
deleted file mode 100644
index 2f8988f616..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__19dKankyo_star_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057F18:
-/* 80057F18 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057F1C 7C 08 02 A6 */ mflr r0
-/* 80057F20 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057F24 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057F28 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057F2C 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057F30 7C 9F 23 78 */ mr r31, r4
-/* 80057F34 41 82 00 4C */ beq lbl_80057F80
-/* 80057F38 3C 60 80 3B */ lis r3, __vt__19dKankyo_star_Packet@ha /* 0x803A9B38@ha */
-/* 80057F3C 38 03 9B 38 */ addi r0, r3, __vt__19dKankyo_star_Packet@l /* 0x803A9B38@l */
-/* 80057F40 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057F44 38 7E 00 14 */ addi r3, r30, 0x14
-/* 80057F48 3C 80 80 05 */ lis r4, __dt__8STAR_EFFFv@ha /* 0x80056DC8@ha */
-/* 80057F4C 38 84 6D C8 */ addi r4, r4, __dt__8STAR_EFFFv@l /* 0x80056DC8@l */
-/* 80057F50 38 A0 00 34 */ li r5, 0x34
-/* 80057F54 38 C0 00 01 */ li r6, 1
-/* 80057F58 48 30 9D 91 */ bl __destroy_arr
-/* 80057F5C 28 1E 00 00 */ cmplwi r30, 0
-/* 80057F60 41 82 00 10 */ beq lbl_80057F70
-/* 80057F64 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057F68 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057F6C 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057F70:
-/* 80057F70 7F E0 07 35 */ extsh. r0, r31
-/* 80057F74 40 81 00 0C */ ble lbl_80057F80
-/* 80057F78 7F C3 F3 78 */ mr r3, r30
-/* 80057F7C 48 27 6D C1 */ bl __dl__FPv
-lbl_80057F80:
-/* 80057F80 7F C3 F3 78 */ mr r3, r30
-/* 80057F84 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057F88 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057F8C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057F90 7C 08 03 A6 */ mtlr r0
-/* 80057F94 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057F98 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_cloud_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_cloud_PacketFv.s
deleted file mode 100644
index ebc9140391..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_cloud_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057E10:
-/* 80057E10 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057E14 7C 08 02 A6 */ mflr r0
-/* 80057E18 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057E1C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057E20 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057E24 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057E28 7C 9F 23 78 */ mr r31, r4
-/* 80057E2C 41 82 00 4C */ beq lbl_80057E78
-/* 80057E30 3C 60 80 3B */ lis r3, __vt__20dKankyo_cloud_Packet@ha /* 0x803A9B24@ha */
-/* 80057E34 38 03 9B 24 */ addi r0, r3, __vt__20dKankyo_cloud_Packet@l /* 0x803A9B24@l */
-/* 80057E38 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057E3C 38 7E 00 18 */ addi r3, r30, 0x18
-/* 80057E40 3C 80 80 05 */ lis r4, __dt__9CLOUD_EFFFv@ha /* 0x80056E38@ha */
-/* 80057E44 38 84 6E 38 */ addi r4, r4, __dt__9CLOUD_EFFFv@l /* 0x80056E38@l */
-/* 80057E48 38 A0 00 38 */ li r5, 0x38
-/* 80057E4C 38 C0 00 32 */ li r6, 0x32
-/* 80057E50 48 30 9E 99 */ bl __destroy_arr
-/* 80057E54 28 1E 00 00 */ cmplwi r30, 0
-/* 80057E58 41 82 00 10 */ beq lbl_80057E68
-/* 80057E5C 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057E60 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057E64 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057E68:
-/* 80057E68 7F E0 07 35 */ extsh. r0, r31
-/* 80057E6C 40 81 00 0C */ ble lbl_80057E78
-/* 80057E70 7F C3 F3 78 */ mr r3, r30
-/* 80057E74 48 27 6E C9 */ bl __dl__FPv
-lbl_80057E78:
-/* 80057E78 7F C3 F3 78 */ mr r3, r30
-/* 80057E7C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057E80 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057E84 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057E88 7C 08 03 A6 */ mtlr r0
-/* 80057E8C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057E90 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_housi_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_housi_PacketFv.s
deleted file mode 100644
index f8bb806e7e..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_housi_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057E94:
-/* 80057E94 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057E98 7C 08 02 A6 */ mflr r0
-/* 80057E9C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057EA0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057EA4 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057EA8 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057EAC 7C 9F 23 78 */ mr r31, r4
-/* 80057EB0 41 82 00 4C */ beq lbl_80057EFC
-/* 80057EB4 3C 60 80 3B */ lis r3, __vt__20dKankyo_housi_Packet@ha /* 0x803A9B10@ha */
-/* 80057EB8 38 03 9B 10 */ addi r0, r3, __vt__20dKankyo_housi_Packet@l /* 0x803A9B10@l */
-/* 80057EBC 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057EC0 38 7E 00 20 */ addi r3, r30, 0x20
-/* 80057EC4 3C 80 80 05 */ lis r4, __dt__9HOUSI_EFFFv@ha /* 0x80056EA8@ha */
-/* 80057EC8 38 84 6E A8 */ addi r4, r4, __dt__9HOUSI_EFFFv@l /* 0x80056EA8@l */
-/* 80057ECC 38 A0 00 50 */ li r5, 0x50
-/* 80057ED0 38 C0 01 2C */ li r6, 0x12c
-/* 80057ED4 48 30 9E 15 */ bl __destroy_arr
-/* 80057ED8 28 1E 00 00 */ cmplwi r30, 0
-/* 80057EDC 41 82 00 10 */ beq lbl_80057EEC
-/* 80057EE0 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057EE4 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057EE8 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057EEC:
-/* 80057EEC 7F E0 07 35 */ extsh. r0, r31
-/* 80057EF0 40 81 00 0C */ ble lbl_80057EFC
-/* 80057EF4 7F C3 F3 78 */ mr r3, r30
-/* 80057EF8 48 27 6E 45 */ bl __dl__FPv
-lbl_80057EFC:
-/* 80057EFC 7F C3 F3 78 */ mr r3, r30
-/* 80057F00 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057F04 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057F08 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057F0C 7C 08 03 A6 */ mtlr r0
-/* 80057F10 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057F14 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_odour_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_odour_PacketFv.s
deleted file mode 100644
index 5e6b630696..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__20dKankyo_odour_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_80057D8C:
-/* 80057D8C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057D90 7C 08 02 A6 */ mflr r0
-/* 80057D94 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057D98 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057D9C 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057DA0 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80057DA4 7C 9F 23 78 */ mr r31, r4
-/* 80057DA8 41 82 00 4C */ beq lbl_80057DF4
-/* 80057DAC 3C 60 80 3B */ lis r3, __vt__20dKankyo_odour_Packet@ha /* 0x803A9AE8@ha */
-/* 80057DB0 38 03 9A E8 */ addi r0, r3, __vt__20dKankyo_odour_Packet@l /* 0x803A9AE8@l */
-/* 80057DB4 90 1E 00 00 */ stw r0, 0(r30)
-/* 80057DB8 38 7E 00 14 */ addi r3, r30, 0x14
-/* 80057DBC 3C 80 80 05 */ lis r4, __dt__12EF_ODOUR_EFFFv@ha /* 0x80056F8C@ha */
-/* 80057DC0 38 84 6F 8C */ addi r4, r4, __dt__12EF_ODOUR_EFFFv@l /* 0x80056F8C@l */
-/* 80057DC4 38 A0 00 30 */ li r5, 0x30
-/* 80057DC8 38 C0 07 D0 */ li r6, 0x7d0
-/* 80057DCC 48 30 9F 1D */ bl __destroy_arr
-/* 80057DD0 28 1E 00 00 */ cmplwi r30, 0
-/* 80057DD4 41 82 00 10 */ beq lbl_80057DE4
-/* 80057DD8 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80057DDC 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80057DE0 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80057DE4:
-/* 80057DE4 7F E0 07 35 */ extsh. r0, r31
-/* 80057DE8 40 81 00 0C */ ble lbl_80057DF4
-/* 80057DEC 7F C3 F3 78 */ mr r3, r30
-/* 80057DF0 48 27 6F 4D */ bl __dl__FPv
-lbl_80057DF4:
-/* 80057DF4 7F C3 F3 78 */ mr r3, r30
-/* 80057DF8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057DFC 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057E00 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057E04 7C 08 03 A6 */ mtlr r0
-/* 80057E08 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057E0C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__21dKankyo_vrkumo_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__21dKankyo_vrkumo_PacketFv.s
deleted file mode 100644
index 80a813fe68..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__21dKankyo_vrkumo_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_8005820C:
-/* 8005820C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80058210 7C 08 02 A6 */ mflr r0
-/* 80058214 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80058218 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8005821C 93 C1 00 08 */ stw r30, 8(r1)
-/* 80058220 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80058224 7C 9F 23 78 */ mr r31, r4
-/* 80058228 41 82 00 4C */ beq lbl_80058274
-/* 8005822C 3C 60 80 3B */ lis r3, __vt__21dKankyo_vrkumo_Packet@ha /* 0x803A9AFC@ha */
-/* 80058230 38 03 9A FC */ addi r0, r3, __vt__21dKankyo_vrkumo_Packet@l /* 0x803A9AFC@l */
-/* 80058234 90 1E 00 00 */ stw r0, 0(r30)
-/* 80058238 38 7E 00 20 */ addi r3, r30, 0x20
-/* 8005823C 3C 80 80 05 */ lis r4, __dt__10VRKUMO_EFFFv@ha /* 0x80056F18@ha */
-/* 80058240 38 84 6F 18 */ addi r4, r4, __dt__10VRKUMO_EFFFv@l /* 0x80056F18@l */
-/* 80058244 38 A0 00 2C */ li r5, 0x2c
-/* 80058248 38 C0 00 64 */ li r6, 0x64
-/* 8005824C 48 30 9A 9D */ bl __destroy_arr
-/* 80058250 28 1E 00 00 */ cmplwi r30, 0
-/* 80058254 41 82 00 10 */ beq lbl_80058264
-/* 80058258 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 8005825C 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80058260 90 1E 00 00 */ stw r0, 0(r30)
-lbl_80058264:
-/* 80058264 7F E0 07 35 */ extsh. r0, r31
-/* 80058268 40 81 00 0C */ ble lbl_80058274
-/* 8005826C 7F C3 F3 78 */ mr r3, r30
-/* 80058270 48 27 6A CD */ bl __dl__FPv
-lbl_80058274:
-/* 80058274 7F C3 F3 78 */ mr r3, r30
-/* 80058278 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8005827C 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80058280 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80058284 7C 08 03 A6 */ mtlr r0
-/* 80058288 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005828C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__22dKankyo_sunlenz_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__22dKankyo_sunlenz_PacketFv.s
deleted file mode 100644
index 8875405b1c..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__22dKankyo_sunlenz_PacketFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_800580A4:
-/* 800580A4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800580A8 7C 08 02 A6 */ mflr r0
-/* 800580AC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800580B0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 800580B4 93 C1 00 08 */ stw r30, 8(r1)
-/* 800580B8 7C 7E 1B 79 */ or. r30, r3, r3
-/* 800580BC 7C 9F 23 78 */ mr r31, r4
-/* 800580C0 41 82 00 4C */ beq lbl_8005810C
-/* 800580C4 3C 60 80 3B */ lis r3, __vt__22dKankyo_sunlenz_Packet@ha /* 0x803A9B74@ha */
-/* 800580C8 38 03 9B 74 */ addi r0, r3, __vt__22dKankyo_sunlenz_Packet@l /* 0x803A9B74@l */
-/* 800580CC 90 1E 00 00 */ stw r0, 0(r30)
-/* 800580D0 38 7E 00 24 */ addi r3, r30, 0x24
-/* 800580D4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */
-/* 800580D8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */
-/* 800580DC 38 A0 00 0C */ li r5, 0xc
-/* 800580E0 38 C0 00 08 */ li r6, 8
-/* 800580E4 48 30 9C 05 */ bl __destroy_arr
-/* 800580E8 28 1E 00 00 */ cmplwi r30, 0
-/* 800580EC 41 82 00 10 */ beq lbl_800580FC
-/* 800580F0 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 800580F4 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 800580F8 90 1E 00 00 */ stw r0, 0(r30)
-lbl_800580FC:
-/* 800580FC 7F E0 07 35 */ extsh. r0, r31
-/* 80058100 40 81 00 0C */ ble lbl_8005810C
-/* 80058104 7F C3 F3 78 */ mr r3, r30
-/* 80058108 48 27 6C 35 */ bl __dl__FPv
-lbl_8005810C:
-/* 8005810C 7F C3 F3 78 */ mr r3, r30
-/* 80058110 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80058114 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80058118 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005811C 7C 08 03 A6 */ mtlr r0
-/* 80058120 38 21 00 10 */ addi r1, r1, 0x10
-/* 80058124 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__8RAIN_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__8RAIN_EFFFv.s
deleted file mode 100644
index b1e6b0759e..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__8RAIN_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056CD0:
-/* 80056CD0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056CD4 7C 08 02 A6 */ mflr r0
-/* 80056CD8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056CDC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056CE0 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056CE4 41 82 00 10 */ beq lbl_80056CF4
-/* 80056CE8 7C 80 07 35 */ extsh. r0, r4
-/* 80056CEC 40 81 00 08 */ ble lbl_80056CF4
-/* 80056CF0 48 27 80 4D */ bl __dl__FPv
-lbl_80056CF4:
-/* 80056CF4 7F E3 FB 78 */ mr r3, r31
-/* 80056CF8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056CFC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056D00 7C 08 03 A6 */ mtlr r0
-/* 80056D04 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056D08 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__8SNOW_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__8SNOW_EFFFv.s
deleted file mode 100644
index 239d1d4c40..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__8SNOW_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056D58:
-/* 80056D58 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056D5C 7C 08 02 A6 */ mflr r0
-/* 80056D60 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056D64 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056D68 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056D6C 41 82 00 10 */ beq lbl_80056D7C
-/* 80056D70 7C 80 07 35 */ extsh. r0, r4
-/* 80056D74 40 81 00 08 */ ble lbl_80056D7C
-/* 80056D78 48 27 7F C5 */ bl __dl__FPv
-lbl_80056D7C:
-/* 80056D7C 7F E3 FB 78 */ mr r3, r31
-/* 80056D80 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056D84 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056D88 7C 08 03 A6 */ mtlr r0
-/* 80056D8C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056D90 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__8STAR_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__8STAR_EFFFv.s
deleted file mode 100644
index 67e7465586..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__8STAR_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056DC8:
-/* 80056DC8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056DCC 7C 08 02 A6 */ mflr r0
-/* 80056DD0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056DD4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056DD8 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056DDC 41 82 00 10 */ beq lbl_80056DEC
-/* 80056DE0 7C 80 07 35 */ extsh. r0, r4
-/* 80056DE4 40 81 00 08 */ ble lbl_80056DEC
-/* 80056DE8 48 27 7F 55 */ bl __dl__FPv
-lbl_80056DEC:
-/* 80056DEC 7F E3 FB 78 */ mr r3, r31
-/* 80056DF0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056DF4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056DF8 7C 08 03 A6 */ mtlr r0
-/* 80056DFC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056E00 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__9CLOUD_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__9CLOUD_EFFFv.s
deleted file mode 100644
index 93db691115..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__9CLOUD_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056E38:
-/* 80056E38 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056E3C 7C 08 02 A6 */ mflr r0
-/* 80056E40 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056E44 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056E48 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056E4C 41 82 00 10 */ beq lbl_80056E5C
-/* 80056E50 7C 80 07 35 */ extsh. r0, r4
-/* 80056E54 40 81 00 08 */ ble lbl_80056E5C
-/* 80056E58 48 27 7E E5 */ bl __dl__FPv
-lbl_80056E5C:
-/* 80056E5C 7F E3 FB 78 */ mr r3, r31
-/* 80056E60 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056E64 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056E68 7C 08 03 A6 */ mtlr r0
-/* 80056E6C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056E70 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/__dt__9HOUSI_EFFFv.s b/asm/d/kankyo/d_kankyo_wether/__dt__9HOUSI_EFFFv.s
deleted file mode 100644
index efdabfee0b..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/__dt__9HOUSI_EFFFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80056EA8:
-/* 80056EA8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056EAC 7C 08 02 A6 */ mflr r0
-/* 80056EB0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056EB4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056EB8 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056EBC 41 82 00 10 */ beq lbl_80056ECC
-/* 80056EC0 7C 80 07 35 */ extsh. r0, r4
-/* 80056EC4 40 81 00 08 */ ble lbl_80056ECC
-/* 80056EC8 48 27 7E 75 */ bl __dl__FPv
-lbl_80056ECC:
-/* 80056ECC 7F E3 FB 78 */ mr r3, r31
-/* 80056ED0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056ED4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056ED8 7C 08 03 A6 */ mtlr r0
-/* 80056EDC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056EE0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Cloud_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Cloud_Draw__Fv.s
deleted file mode 100644
index 2415e2872e..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Cloud_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80057318:
-/* 80057318 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005731C 7C 08 02 A6 */ mflr r0
-/* 80057320 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057324 38 60 00 01 */ li r3, 1
-/* 80057328 4B FF FF C1 */ bl dKyw_drawCloud__Fi
-/* 8005732C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057330 7C 08 03 A6 */ mtlr r0
-/* 80057334 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057338 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Housi_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Housi_Draw__Fv.s
deleted file mode 100644
index 4a233c5db5..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Housi_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_800572C4:
-/* 800572C4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800572C8 7C 08 02 A6 */ mflr r0
-/* 800572CC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800572D0 38 60 00 01 */ li r3, 1
-/* 800572D4 4B FF FF C1 */ bl dKyw_drawHousi__Fi
-/* 800572D8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800572DC 7C 08 03 A6 */ mtlr r0
-/* 800572E0 38 21 00 10 */ addi r1, r1, 0x10
-/* 800572E4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Odour_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Odour_Draw__Fv.s
deleted file mode 100644
index d9d778d9a8..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Odour_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80057414:
-/* 80057414 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057418 7C 08 02 A6 */ mflr r0
-/* 8005741C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057420 38 60 00 01 */ li r3, 1
-/* 80057424 4B FF FF C1 */ bl dKyw_odour_packet__Fi
-/* 80057428 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005742C 7C 08 03 A6 */ mtlr r0
-/* 80057430 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057434 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Rain_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Rain_Draw__Fv.s
deleted file mode 100644
index c5c15c3e52..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Rain_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_800571C8:
-/* 800571C8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800571CC 7C 08 02 A6 */ mflr r0
-/* 800571D0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800571D4 38 60 00 01 */ li r3, 1
-/* 800571D8 4B FF FF C1 */ bl dKyw_drawRain__Fi
-/* 800571DC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800571E0 7C 08 03 A6 */ mtlr r0
-/* 800571E4 38 21 00 10 */ addi r1, r1, 0x10
-/* 800571E8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Snow_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Snow_Draw__Fv.s
deleted file mode 100644
index 0564e45bb3..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Snow_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8005721C:
-/* 8005721C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057220 7C 08 02 A6 */ mflr r0
-/* 80057224 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057228 38 60 00 01 */ li r3, 1
-/* 8005722C 4B FF FF C1 */ bl dKyw_drawSnow__Fi
-/* 80057230 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057234 7C 08 03 A6 */ mtlr r0
-/* 80057238 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005723C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Star_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Star_Draw__Fv.s
deleted file mode 100644
index c630227829..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Star_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80057270:
-/* 80057270 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057274 7C 08 02 A6 */ mflr r0
-/* 80057278 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005727C 38 60 00 01 */ li r3, 1
-/* 80057280 4B FF FF C1 */ bl dKyw_drawStar__Fi
-/* 80057284 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057288 7C 08 03 A6 */ mtlr r0
-/* 8005728C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057290 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Sun_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Sun_Draw__Fv.s
deleted file mode 100644
index 099f3bc8c3..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Sun_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8005710C:
-/* 8005710C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057110 7C 08 02 A6 */ mflr r0
-/* 80057114 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057118 38 60 00 01 */ li r3, 1
-/* 8005711C 4B FF FF C1 */ bl dKyw_drawSun__Fi
-/* 80057120 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057124 7C 08 03 A6 */ mtlr r0
-/* 80057128 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005712C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Sunlenz_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Sunlenz_Draw__Fv.s
deleted file mode 100644
index 35f4da4202..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Sunlenz_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80057174:
-/* 80057174 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057178 7C 08 02 A6 */ mflr r0
-/* 8005717C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057180 38 60 00 01 */ li r3, 1
-/* 80057184 4B FF FF AD */ bl dKyw_drawSunlenz__Fi
-/* 80057188 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005718C 7C 08 03 A6 */ mtlr r0
-/* 80057190 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057194 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_Vrkumo_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_Vrkumo_Draw__Fv.s
deleted file mode 100644
index c97e40d392..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_Vrkumo_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8005736C:
-/* 8005736C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057370 7C 08 02 A6 */ mflr r0
-/* 80057374 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057378 38 60 00 01 */ li r3, 1
-/* 8005737C 4B FF FF C1 */ bl dKyw_drawVrkumo__Fi
-/* 80057380 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057384 7C 08 03 A6 */ mtlr r0
-/* 80057388 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005738C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_custom_windpower__Ff.s b/asm/d/kankyo/d_kankyo_wether/dKyw_custom_windpower__Ff.s
deleted file mode 100644
index 98066dbfea..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_custom_windpower__Ff.s
+++ /dev/null
@@ -1,5 +0,0 @@
-lbl_8005B60C:
-/* 8005B60C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005B610 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005B614 D0 23 0E 5C */ stfs f1, 0xe5c(r3)
-/* 8005B618 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawCloud__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawCloud__Fi.s
deleted file mode 100644
index d894e0719f..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawCloud__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_800572E8:
-/* 800572E8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800572EC 7C 08 02 A6 */ mflr r0
-/* 800572F0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800572F4 7C 64 1B 78 */ mr r4, r3
-/* 800572F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800572FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057300 80 63 0E C0 */ lwz r3, 0xec0(r3)
-/* 80057304 4B FF F7 F5 */ bl dKyw_setDrawPacketListIndScreen__FP9J3DPacketi
-/* 80057308 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005730C 7C 08 03 A6 */ mtlr r0
-/* 80057310 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057314 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawHousi__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawHousi__Fi.s
deleted file mode 100644
index 2575936de2..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawHousi__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80057294:
-/* 80057294 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057298 7C 08 02 A6 */ mflr r0
-/* 8005729C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800572A0 7C 64 1B 78 */ mr r4, r3
-/* 800572A4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800572A8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800572AC 80 63 0E B0 */ lwz r3, 0xeb0(r3)
-/* 800572B0 4B FF F7 F9 */ bl dKyw_setDrawPacketList__FP9J3DPacketi
-/* 800572B4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800572B8 7C 08 03 A6 */ mtlr r0
-/* 800572BC 38 21 00 10 */ addi r1, r1, 0x10
-/* 800572C0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawRain__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawRain__Fi.s
deleted file mode 100644
index b62bc383eb..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawRain__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80057198:
-/* 80057198 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005719C 7C 08 02 A6 */ mflr r0
-/* 800571A0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800571A4 7C 64 1B 78 */ mr r4, r3
-/* 800571A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800571AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800571B0 80 63 0E 84 */ lwz r3, 0xe84(r3)
-/* 800571B4 4B FF F8 F5 */ bl dKyw_setDrawPacketList__FP9J3DPacketi
-/* 800571B8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800571BC 7C 08 03 A6 */ mtlr r0
-/* 800571C0 38 21 00 10 */ addi r1, r1, 0x10
-/* 800571C4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawSnow__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawSnow__Fi.s
deleted file mode 100644
index 9aeb0a99fb..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawSnow__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_800571EC:
-/* 800571EC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800571F0 7C 08 02 A6 */ mflr r0
-/* 800571F4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800571F8 7C 64 1B 78 */ mr r4, r3
-/* 800571FC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057200 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057204 80 63 0E 94 */ lwz r3, 0xe94(r3)
-/* 80057208 4B FF F8 A1 */ bl dKyw_setDrawPacketList__FP9J3DPacketi
-/* 8005720C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057210 7C 08 03 A6 */ mtlr r0
-/* 80057214 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057218 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawStar__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawStar__Fi.s
deleted file mode 100644
index cbc1fa0c2c..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawStar__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80057240:
-/* 80057240 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057244 7C 08 02 A6 */ mflr r0
-/* 80057248 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005724C 7C 64 1B 78 */ mr r4, r3
-/* 80057250 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057254 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057258 80 63 0E A4 */ lwz r3, 0xea4(r3)
-/* 8005725C 4B FF F8 ED */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi
-/* 80057260 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057264 7C 08 03 A6 */ mtlr r0
-/* 80057268 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005726C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawSun__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawSun__Fi.s
deleted file mode 100644
index df3df29e36..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawSun__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_800570DC:
-/* 800570DC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800570E0 7C 08 02 A6 */ mflr r0
-/* 800570E4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800570E8 7C 64 1B 78 */ mr r4, r3
-/* 800570EC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800570F0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800570F4 80 63 0E 74 */ lwz r3, 0xe74(r3)
-/* 800570F8 4B FF FA 51 */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi
-/* 800570FC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057100 7C 08 03 A6 */ mtlr r0
-/* 80057104 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057108 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawSunlenz__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawSunlenz__Fi.s
deleted file mode 100644
index 1055484410..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawSunlenz__Fi.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80057130:
-/* 80057130 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057134 7C 08 02 A6 */ mflr r0
-/* 80057138 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005713C 7C 64 1B 78 */ mr r4, r3
-/* 80057140 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057144 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057148 80 63 0E 78 */ lwz r3, 0xe78(r3)
-/* 8005714C 88 03 00 9E */ lbz r0, 0x9e(r3)
-/* 80057150 28 00 00 00 */ cmplwi r0, 0
-/* 80057154 40 82 00 0C */ bne lbl_80057160
-/* 80057158 4B FF F9 A1 */ bl dKyw_setDrawPacketListIndScreen__FP9J3DPacketi
-/* 8005715C 48 00 00 08 */ b lbl_80057164
-lbl_80057160:
-/* 80057160 4B FF F9 E9 */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi
-lbl_80057164:
-/* 80057164 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057168 7C 08 03 A6 */ mtlr r0
-/* 8005716C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057170 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_drawVrkumo__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_drawVrkumo__Fi.s
deleted file mode 100644
index 88db301920..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_drawVrkumo__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_8005733C:
-/* 8005733C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057340 7C 08 02 A6 */ mflr r0
-/* 80057344 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057348 7C 64 1B 78 */ mr r4, r3
-/* 8005734C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057350 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057354 80 63 0E D0 */ lwz r3, 0xed0(r3)
-/* 80057358 4B FF F7 F1 */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi
-/* 8005735C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057360 7C 08 03 A6 */ mtlr r0
-/* 80057364 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057368 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_evil_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_evil_Draw__Fv.s
deleted file mode 100644
index 5273b618ff..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_evil_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_800574BC:
-/* 800574BC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800574C0 7C 08 02 A6 */ mflr r0
-/* 800574C4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800574C8 38 60 00 01 */ li r3, 1
-/* 800574CC 4B FF FF C1 */ bl dKyw_evil_packet__Fi
-/* 800574D0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800574D4 7C 08 03 A6 */ mtlr r0
-/* 800574D8 38 21 00 10 */ addi r1, r1, 0x10
-/* 800574DC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_evil_packet__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_evil_packet__Fi.s
deleted file mode 100644
index 4031fb23ef..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_evil_packet__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_8005748C:
-/* 8005748C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057490 7C 08 02 A6 */ mflr r0
-/* 80057494 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057498 7C 64 1B 78 */ mr r4, r3
-/* 8005749C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800574A0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800574A4 80 63 10 58 */ lwz r3, 0x1058(r3)
-/* 800574A8 4B FF F7 31 */ bl dKyw_setDrawPacketListXluBg__FP9J3DPacketi
-/* 800574AC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800574B0 7C 08 03 A6 */ mtlr r0
-/* 800574B4 38 21 00 10 */ addi r1, r1, 0x10
-/* 800574B8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set__Fss.s b/asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set__Fss.s
deleted file mode 100644
index 1ccfcc5ff4..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set__Fss.s
+++ /dev/null
@@ -1,8 +0,0 @@
-lbl_8005B61C:
-/* 8005B61C 38 00 00 01 */ li r0, 1
-/* 8005B620 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005B624 38 A5 CA 54 */ addi r5, r5, g_env_light@l /* 0x8042CA54@l */
-/* 8005B628 98 05 0E 6D */ stb r0, 0xe6d(r5)
-/* 8005B62C B0 65 0E 68 */ sth r3, 0xe68(r5)
-/* 8005B630 B0 85 0E 6A */ sth r4, 0xe6a(r5)
-/* 8005B634 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set_go__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set_go__Fv.s
deleted file mode 100644
index 6dfd0aeb15..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_evt_wind_set_go__Fv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_8005B638:
-/* 8005B638 38 00 00 01 */ li r0, 1
-/* 8005B63C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005B640 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005B644 98 03 0E 6D */ stb r0, 0xe6d(r3)
-/* 8005B648 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_pow__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_pow__Fv.s
deleted file mode 100644
index 54d5a88595..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_pow__Fv.s
+++ /dev/null
@@ -1,5 +0,0 @@
-lbl_8005AAF0:
-/* 8005AAF0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005AAF4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005AAF8 C0 23 0E 58 */ lfs f1, 0xe58(r3)
-/* 8005AAFC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vec__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vec__Fv.s
deleted file mode 100644
index 8754a49093..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vec__Fv.s
+++ /dev/null
@@ -1,5 +0,0 @@
-lbl_8005AAE0:
-/* 8005AAE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005AAE4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005AAE8 38 63 0E 48 */ addi r3, r3, 0xe48
-/* 8005AAEC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vecpow__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vecpow__Fv.s
deleted file mode 100644
index 26e15184ea..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_get_wind_vecpow__Fv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_8005AB00:
-/* 8005AB00 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 8005AB04 7C 08 02 A6 */ mflr r0
-/* 8005AB08 90 01 00 34 */ stw r0, 0x34(r1)
-/* 8005AB0C 93 E1 00 2C */ stw r31, 0x2c(r1)
-/* 8005AB10 7C 7F 1B 78 */ mr r31, r3
-/* 8005AB14 38 61 00 08 */ addi r3, r1, 8
-/* 8005AB18 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005AB1C 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8005AB20 38 85 0E 48 */ addi r4, r5, 0xe48
-/* 8005AB24 C0 25 0E 58 */ lfs f1, 0xe58(r5)
-/* 8005AB28 48 20 C0 5D */ bl __ml__4cXyzCFf
-/* 8005AB2C C0 41 00 08 */ lfs f2, 8(r1)
-/* 8005AB30 D0 41 00 14 */ stfs f2, 0x14(r1)
-/* 8005AB34 C0 21 00 0C */ lfs f1, 0xc(r1)
-/* 8005AB38 D0 21 00 18 */ stfs f1, 0x18(r1)
-/* 8005AB3C C0 01 00 10 */ lfs f0, 0x10(r1)
-/* 8005AB40 D0 01 00 1C */ stfs f0, 0x1c(r1)
-/* 8005AB44 D0 5F 00 00 */ stfs f2, 0(r31)
-/* 8005AB48 D0 3F 00 04 */ stfs f1, 4(r31)
-/* 8005AB4C D0 1F 00 08 */ stfs f0, 8(r31)
-/* 8005AB50 83 E1 00 2C */ lwz r31, 0x2c(r1)
-/* 8005AB54 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 8005AB58 7C 08 03 A6 */ mtlr r0
-/* 8005AB5C 38 21 00 30 */ addi r1, r1, 0x30
-/* 8005AB60 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_mud_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_mud_Draw__Fv.s
deleted file mode 100644
index e5245a8b79..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_mud_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80057468:
-/* 80057468 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005746C 7C 08 02 A6 */ mflr r0
-/* 80057470 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057474 38 60 00 01 */ li r3, 1
-/* 80057478 4B FF FF C1 */ bl dKyw_mud_packet__Fi
-/* 8005747C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057480 7C 08 03 A6 */ mtlr r0
-/* 80057484 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057488 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_mud_packet__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_mud_packet__Fi.s
deleted file mode 100644
index 229c48c01a..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_mud_packet__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80057438:
-/* 80057438 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005743C 7C 08 02 A6 */ mflr r0
-/* 80057440 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057444 7C 64 1B 78 */ mr r4, r3
-/* 80057448 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005744C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057450 80 63 10 4C */ lwz r3, 0x104c(r3)
-/* 80057454 4B FF F7 85 */ bl dKyw_setDrawPacketListXluBg__FP9J3DPacketi
-/* 80057458 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005745C 7C 08 03 A6 */ mtlr r0
-/* 80057460 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057464 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_odour_packet__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_odour_packet__Fi.s
deleted file mode 100644
index e148f107b2..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_odour_packet__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_800573E4:
-/* 800573E4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800573E8 7C 08 02 A6 */ mflr r0
-/* 800573EC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800573F0 7C 64 1B 78 */ mr r4, r3
-/* 800573F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800573F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800573FC 80 63 0F 28 */ lwz r3, 0xf28(r3)
-/* 80057400 4B FF F6 F9 */ bl dKyw_setDrawPacketListIndScreen__FP9J3DPacketi
-/* 80057404 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057408 7C 08 03 A6 */ mtlr r0
-/* 8005740C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057410 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf.s b/asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf.s
deleted file mode 100644
index b5a97b6bf1..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8005B260:
-/* 8005B260 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005B264 7C 08 02 A6 */ mflr r0
-/* 8005B268 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005B26C 38 C0 00 01 */ li r6, 1
-/* 8005B270 4B FF FC 21 */ bl pntwind_get_info__FP4cXyzP4cXyzPfUc
-/* 8005B274 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005B278 7C 08 03 A6 */ mtlr r0
-/* 8005B27C 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005B280 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_set__FP14WIND_INFLUENCE.s b/asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_set__FP14WIND_INFLUENCE.s
deleted file mode 100644
index dec2ac3c2d..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_pntlight_set__FP14WIND_INFLUENCE.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_8005AE28:
-/* 8005AE28 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005AE2C 7C 08 02 A6 */ mflr r0
-/* 8005AE30 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005AE34 38 00 00 00 */ li r0, 0
-/* 8005AE38 98 03 00 28 */ stb r0, 0x28(r3)
-/* 8005AE3C 38 00 00 01 */ li r0, 1
-/* 8005AE40 98 03 00 29 */ stb r0, 0x29(r3)
-/* 8005AE44 4B FF FF 55 */ bl pntwind_set__FP14WIND_INFLUENCE
-/* 8005AE48 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005AE4C 7C 08 03 A6 */ mtlr r0
-/* 8005AE50 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005AE54 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_cut__FP14WIND_INFLUENCE.s b/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_cut__FP14WIND_INFLUENCE.s
deleted file mode 100644
index 0496e59216..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_cut__FP14WIND_INFLUENCE.s
+++ /dev/null
@@ -1,15 +0,0 @@
-lbl_8005AE58:
-/* 8005AE58 28 03 00 00 */ cmplwi r3, 0
-/* 8005AE5C 4D 82 00 20 */ beqlr
-/* 8005AE60 80 03 00 24 */ lwz r0, 0x24(r3)
-/* 8005AE64 2C 00 00 00 */ cmpwi r0, 0
-/* 8005AE68 4D 80 00 20 */ bltlr
-/* 8005AE6C 2C 00 00 1E */ cmpwi r0, 0x1e
-/* 8005AE70 4C 80 00 20 */ bgelr
-/* 8005AE74 38 80 00 00 */ li r4, 0
-/* 8005AE78 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005AE7C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005AE80 54 00 10 3A */ slwi r0, r0, 2
-/* 8005AE84 7C 63 02 14 */ add r3, r3, r0
-/* 8005AE88 90 83 07 D0 */ stw r4, 0x7d0(r3)
-/* 8005AE8C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_get_info__FP4cXyzP4cXyzPf.s b/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_get_info__FP4cXyzP4cXyzPf.s
deleted file mode 100644
index 1531e20ec3..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_get_info__FP4cXyzP4cXyzPf.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8005B23C:
-/* 8005B23C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005B240 7C 08 02 A6 */ mflr r0
-/* 8005B244 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005B248 38 C0 00 00 */ li r6, 0
-/* 8005B24C 4B FF FC 45 */ bl pntwind_get_info__FP4cXyzP4cXyzPfUc
-/* 8005B250 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005B254 7C 08 03 A6 */ mtlr r0
-/* 8005B258 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005B25C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_init__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_init__Fv.s
deleted file mode 100644
index 91e1bfc6ca..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_init__Fv.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_8005AD44:
-/* 8005AD44 38 60 00 00 */ li r3, 0
-/* 8005AD48 7C 66 1B 78 */ mr r6, r3
-/* 8005AD4C 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005AD50 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8005AD54 38 00 00 1E */ li r0, 0x1e
-/* 8005AD58 7C 09 03 A6 */ mtctr r0
-lbl_8005AD5C:
-/* 8005AD5C 7C 85 1A 14 */ add r4, r5, r3
-/* 8005AD60 90 C4 07 D0 */ stw r6, 0x7d0(r4)
-/* 8005AD64 38 63 00 04 */ addi r3, r3, 4
-/* 8005AD68 42 00 FF F4 */ bdnz lbl_8005AD5C
-/* 8005AD6C 38 60 00 00 */ li r3, 0
-/* 8005AD70 38 C0 00 00 */ li r6, 0
-/* 8005AD74 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005AD78 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8005AD7C 38 00 00 05 */ li r0, 5
-/* 8005AD80 7C 09 03 A6 */ mtctr r0
-lbl_8005AD84:
-/* 8005AD84 7C 85 1A 14 */ add r4, r5, r3
-/* 8005AD88 98 C4 08 48 */ stb r6, 0x848(r4)
-/* 8005AD8C 38 63 00 3C */ addi r3, r3, 0x3c
-/* 8005AD90 42 00 FF F4 */ bdnz lbl_8005AD84
-/* 8005AD94 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_set__FP14WIND_INFLUENCE.s b/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_set__FP14WIND_INFLUENCE.s
deleted file mode 100644
index e214eb6cec..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_pntwind_set__FP14WIND_INFLUENCE.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_8005ADFC:
-/* 8005ADFC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005AE00 7C 08 02 A6 */ mflr r0
-/* 8005AE04 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005AE08 38 00 00 00 */ li r0, 0
-/* 8005AE0C 98 03 00 28 */ stb r0, 0x28(r3)
-/* 8005AE10 98 03 00 29 */ stb r0, 0x29(r3)
-/* 8005AE14 4B FF FF 85 */ bl pntwind_set__FP14WIND_INFLUENCE
-/* 8005AE18 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005AE1C 7C 08 03 A6 */ mtlr r0
-/* 8005AE20 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005AE24 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_rain_set__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_rain_set__Fi.s
deleted file mode 100644
index 8888eded47..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_rain_set__Fi.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_8005B64C:
-/* 8005B64C 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005B650 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
-/* 8005B654 90 64 0E 80 */ stw r3, 0xe80(r4)
-/* 8005B658 90 64 12 9C */ stw r3, 0x129c(r4)
-/* 8005B65C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListIndScreen__FP9J3DPacketi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListIndScreen__FP9J3DPacketi.s
deleted file mode 100644
index 069747c6a0..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListIndScreen__FP9J3DPacketi.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80056AF8:
-/* 80056AF8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056AFC 7C 08 02 A6 */ mflr r0
-/* 80056B00 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056B04 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056B08 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056B0C 40 82 00 0C */ bne lbl_80056B18
-/* 80056B10 38 60 00 00 */ li r3, 0
-/* 80056B14 48 00 00 20 */ b lbl_80056B34
-lbl_80056B18:
-/* 80056B18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80056B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80056B20 80 63 5F 6C */ lwz r3, 0x5f6c(r3)
-/* 80056B24 7F E4 FB 78 */ mr r4, r31
-/* 80056B28 38 A0 00 00 */ li r5, 0
-/* 80056B2C 48 2C E9 61 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs
-/* 80056B30 7F E3 FB 78 */ mr r3, r31
-lbl_80056B34:
-/* 80056B34 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056B38 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056B3C 7C 08 03 A6 */ mtlr r0
-/* 80056B40 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056B44 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListSky__FP9J3DPacketi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListSky__FP9J3DPacketi.s
deleted file mode 100644
index e84b5afca3..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListSky__FP9J3DPacketi.s
+++ /dev/null
@@ -1,39 +0,0 @@
-lbl_80056B48:
-/* 80056B48 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80056B4C 7C 08 02 A6 */ mflr r0
-/* 80056B50 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80056B54 39 61 00 20 */ addi r11, r1, 0x20
-/* 80056B58 48 30 B6 85 */ bl _savegpr_29
-/* 80056B5C 7C 7D 1B 79 */ or. r29, r3, r3
-/* 80056B60 40 82 00 0C */ bne lbl_80056B6C
-/* 80056B64 38 60 00 00 */ li r3, 0
-/* 80056B68 48 00 00 58 */ b lbl_80056BC0
-lbl_80056B6C:
-/* 80056B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80056B70 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80056B74 80 05 5F 64 */ lwz r0, 0x5f64(r5)
-/* 80056B78 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056B7C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056B80 3B DF 00 48 */ addi r30, r31, 0x48
-/* 80056B84 90 1F 00 48 */ stw r0, 0x48(r31)
-/* 80056B88 80 05 5F 68 */ lwz r0, 0x5f68(r5)
-/* 80056B8C 90 1F 00 4C */ stw r0, 0x4c(r31)
-/* 80056B90 54 80 10 3A */ slwi r0, r4, 2
-/* 80056B94 7C 7E 00 2E */ lwzx r3, r30, r0
-/* 80056B98 7F A4 EB 78 */ mr r4, r29
-/* 80056B9C 38 A0 00 00 */ li r5, 0
-/* 80056BA0 48 2C E8 ED */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs
-/* 80056BA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80056BA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80056BAC 80 03 5F 80 */ lwz r0, 0x5f80(r3)
-/* 80056BB0 90 1E 00 00 */ stw r0, 0(r30)
-/* 80056BB4 80 03 5F 84 */ lwz r0, 0x5f84(r3)
-/* 80056BB8 90 1F 00 4C */ stw r0, 0x4c(r31)
-/* 80056BBC 7F A3 EB 78 */ mr r3, r29
-lbl_80056BC0:
-/* 80056BC0 39 61 00 20 */ addi r11, r1, 0x20
-/* 80056BC4 48 30 B6 65 */ bl _restgpr_29
-/* 80056BC8 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80056BCC 7C 08 03 A6 */ mtlr r0
-/* 80056BD0 38 21 00 20 */ addi r1, r1, 0x20
-/* 80056BD4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListXluBg__FP9J3DPacketi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListXluBg__FP9J3DPacketi.s
deleted file mode 100644
index 0695c3a573..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketListXluBg__FP9J3DPacketi.s
+++ /dev/null
@@ -1,37 +0,0 @@
-lbl_80056BD8:
-/* 80056BD8 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80056BDC 7C 08 02 A6 */ mflr r0
-/* 80056BE0 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80056BE4 39 61 00 20 */ addi r11, r1, 0x20
-/* 80056BE8 48 30 B5 F5 */ bl _savegpr_29
-/* 80056BEC 7C 7D 1B 79 */ or. r29, r3, r3
-/* 80056BF0 40 82 00 0C */ bne lbl_80056BFC
-/* 80056BF4 38 60 00 00 */ li r3, 0
-/* 80056BF8 48 00 00 50 */ b lbl_80056C48
-lbl_80056BFC:
-/* 80056BFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80056C00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80056C04 80 03 5F 74 */ lwz r0, 0x5f74(r3)
-/* 80056C08 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056C0C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056C10 90 1F 00 4C */ stw r0, 0x4c(r31)
-/* 80056C14 3B DF 00 48 */ addi r30, r31, 0x48
-/* 80056C18 54 80 10 3A */ slwi r0, r4, 2
-/* 80056C1C 7C 7E 00 2E */ lwzx r3, r30, r0
-/* 80056C20 7F A4 EB 78 */ mr r4, r29
-/* 80056C24 38 A0 00 00 */ li r5, 0
-/* 80056C28 48 2C E8 65 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs
-/* 80056C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80056C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80056C34 80 03 5F 80 */ lwz r0, 0x5f80(r3)
-/* 80056C38 90 1E 00 00 */ stw r0, 0(r30)
-/* 80056C3C 80 03 5F 84 */ lwz r0, 0x5f84(r3)
-/* 80056C40 90 1F 00 4C */ stw r0, 0x4c(r31)
-/* 80056C44 7F A3 EB 78 */ mr r3, r29
-lbl_80056C48:
-/* 80056C48 39 61 00 20 */ addi r11, r1, 0x20
-/* 80056C4C 48 30 B5 DD */ bl _restgpr_29
-/* 80056C50 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80056C54 7C 08 03 A6 */ mtlr r0
-/* 80056C58 38 21 00 20 */ addi r1, r1, 0x20
-/* 80056C5C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketList__FP9J3DPacketi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketList__FP9J3DPacketi.s
deleted file mode 100644
index e82b43dd1d..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_setDrawPacketList__FP9J3DPacketi.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80056AA8:
-/* 80056AA8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056AAC 7C 08 02 A6 */ mflr r0
-/* 80056AB0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056AB4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056AB8 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80056ABC 40 82 00 0C */ bne lbl_80056AC8
-/* 80056AC0 38 60 00 00 */ li r3, 0
-/* 80056AC4 48 00 00 20 */ b lbl_80056AE4
-lbl_80056AC8:
-/* 80056AC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80056ACC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80056AD0 80 63 5F 94 */ lwz r3, 0x5f94(r3)
-/* 80056AD4 7F E4 FB 78 */ mr r4, r31
-/* 80056AD8 38 A0 00 00 */ li r5, 0
-/* 80056ADC 48 2C E9 B1 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs
-/* 80056AE0 7F E3 FB 78 */ mr r3, r31
-lbl_80056AE4:
-/* 80056AE4 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056AE8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056AEC 7C 08 03 A6 */ mtlr r0
-/* 80056AF0 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056AF4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_shstar_Draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_shstar_Draw__Fv.s
deleted file mode 100644
index 9924530f9e..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_shstar_Draw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_800573C0:
-/* 800573C0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800573C4 7C 08 02 A6 */ mflr r0
-/* 800573C8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800573CC 38 60 00 01 */ li r3, 1
-/* 800573D0 4B FF FF C1 */ bl dKyw_shstar_packet__Fi
-/* 800573D4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800573D8 7C 08 03 A6 */ mtlr r0
-/* 800573DC 38 21 00 10 */ addi r1, r1, 0x10
-/* 800573E0 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_shstar_packet__Fi.s b/asm/d/kankyo/d_kankyo_wether/dKyw_shstar_packet__Fi.s
deleted file mode 100644
index cae0b095b7..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_shstar_packet__Fi.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80057390:
-/* 80057390 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057394 7C 08 02 A6 */ mflr r0
-/* 80057398 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005739C 7C 64 1B 78 */ mr r4, r3
-/* 800573A0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800573A4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800573A8 80 63 0F 1C */ lwz r3, 0xf1c(r3)
-/* 800573AC 4B FF F7 9D */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi
-/* 800573B0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800573B4 7C 08 03 A6 */ mtlr r0
-/* 800573B8 38 21 00 10 */ addi r1, r1, 0x10
-/* 800573BC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete2__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete2__Fv.s
deleted file mode 100644
index 6c13113c79..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete2__Fv.s
+++ /dev/null
@@ -1,27 +0,0 @@
-lbl_800581AC:
-/* 800581AC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800581B0 7C 08 02 A6 */ mflr r0
-/* 800581B4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800581B8 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 800581BC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800581C0 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800581C4 88 1F 0E C4 */ lbz r0, 0xec4(r31)
-/* 800581C8 28 00 00 00 */ cmplwi r0, 0
-/* 800581CC 41 82 00 2C */ beq lbl_800581F8
-/* 800581D0 80 7F 0E D0 */ lwz r3, 0xed0(r31)
-/* 800581D4 28 03 00 00 */ cmplwi r3, 0
-/* 800581D8 41 82 00 18 */ beq lbl_800581F0
-/* 800581DC 38 80 00 01 */ li r4, 1
-/* 800581E0 81 83 00 00 */ lwz r12, 0(r3)
-/* 800581E4 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 800581E8 7D 89 03 A6 */ mtctr r12
-/* 800581EC 4E 80 04 21 */ bctrl
-lbl_800581F0:
-/* 800581F0 38 00 00 00 */ li r0, 0
-/* 800581F4 90 1F 0E D0 */ stw r0, 0xed0(r31)
-lbl_800581F8:
-/* 800581F8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 800581FC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80058200 7C 08 03 A6 */ mtlr r0
-/* 80058204 38 21 00 10 */ addi r1, r1, 0x10
-/* 80058208 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete__Fv.s
deleted file mode 100644
index 5c00a912b8..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_delete__Fv.s
+++ /dev/null
@@ -1,180 +0,0 @@
-lbl_80057A04:
-/* 80057A04 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057A08 7C 08 02 A6 */ mflr r0
-/* 80057A0C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057A10 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80057A14 93 C1 00 08 */ stw r30, 8(r1)
-/* 80057A18 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057A1C 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057A20 88 1E 0E 70 */ lbz r0, 0xe70(r30)
-/* 80057A24 28 00 00 00 */ cmplwi r0, 0
-/* 80057A28 41 82 00 58 */ beq lbl_80057A80
-/* 80057A2C 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 80057A30 28 03 00 00 */ cmplwi r3, 0
-/* 80057A34 41 82 00 18 */ beq lbl_80057A4C
-/* 80057A38 38 80 00 01 */ li r4, 1
-/* 80057A3C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057A40 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057A44 7D 89 03 A6 */ mtctr r12
-/* 80057A48 4E 80 04 21 */ bctrl
-lbl_80057A4C:
-/* 80057A4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057A50 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057A54 80 7F 0E 78 */ lwz r3, 0xe78(r31)
-/* 80057A58 28 03 00 00 */ cmplwi r3, 0
-/* 80057A5C 41 82 00 18 */ beq lbl_80057A74
-/* 80057A60 38 80 00 01 */ li r4, 1
-/* 80057A64 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057A68 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057A6C 7D 89 03 A6 */ mtctr r12
-/* 80057A70 4E 80 04 21 */ bctrl
-lbl_80057A74:
-/* 80057A74 38 00 00 00 */ li r0, 0
-/* 80057A78 90 1E 0E 74 */ stw r0, 0xe74(r30)
-/* 80057A7C 90 1F 0E 78 */ stw r0, 0xe78(r31)
-lbl_80057A80:
-/* 80057A80 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057A84 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057A88 88 1F 0E 7C */ lbz r0, 0xe7c(r31)
-/* 80057A8C 28 00 00 00 */ cmplwi r0, 0
-/* 80057A90 41 82 00 2C */ beq lbl_80057ABC
-/* 80057A94 80 7F 0E 84 */ lwz r3, 0xe84(r31)
-/* 80057A98 28 03 00 00 */ cmplwi r3, 0
-/* 80057A9C 41 82 00 18 */ beq lbl_80057AB4
-/* 80057AA0 38 80 00 01 */ li r4, 1
-/* 80057AA4 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057AA8 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057AAC 7D 89 03 A6 */ mtctr r12
-/* 80057AB0 4E 80 04 21 */ bctrl
-lbl_80057AB4:
-/* 80057AB4 38 00 00 00 */ li r0, 0
-/* 80057AB8 90 1F 0E 84 */ stw r0, 0xe84(r31)
-lbl_80057ABC:
-/* 80057ABC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057AC0 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057AC4 88 1F 0E 88 */ lbz r0, 0xe88(r31)
-/* 80057AC8 28 00 00 00 */ cmplwi r0, 0
-/* 80057ACC 41 82 00 38 */ beq lbl_80057B04
-/* 80057AD0 80 7F 0E 94 */ lwz r3, 0xe94(r31)
-/* 80057AD4 28 03 00 00 */ cmplwi r3, 0
-/* 80057AD8 41 82 00 18 */ beq lbl_80057AF0
-/* 80057ADC 38 80 00 01 */ li r4, 1
-/* 80057AE0 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057AE4 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057AE8 7D 89 03 A6 */ mtctr r12
-/* 80057AEC 4E 80 04 21 */ bctrl
-lbl_80057AF0:
-/* 80057AF0 38 00 00 00 */ li r0, 0
-/* 80057AF4 90 1F 0E 94 */ stw r0, 0xe94(r31)
-/* 80057AF8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057AFC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057B00 98 03 0E 90 */ stb r0, 0xe90(r3)
-lbl_80057B04:
-/* 80057B04 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057B08 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057B0C 88 1F 0E 98 */ lbz r0, 0xe98(r31)
-/* 80057B10 28 00 00 00 */ cmplwi r0, 0
-/* 80057B14 41 82 00 2C */ beq lbl_80057B40
-/* 80057B18 80 7F 0E A4 */ lwz r3, 0xea4(r31)
-/* 80057B1C 28 03 00 00 */ cmplwi r3, 0
-/* 80057B20 41 82 00 18 */ beq lbl_80057B38
-/* 80057B24 38 80 00 01 */ li r4, 1
-/* 80057B28 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057B2C 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057B30 7D 89 03 A6 */ mtctr r12
-/* 80057B34 4E 80 04 21 */ bctrl
-lbl_80057B38:
-/* 80057B38 38 00 00 00 */ li r0, 0
-/* 80057B3C 90 1F 0E A4 */ stw r0, 0xea4(r31)
-lbl_80057B40:
-/* 80057B40 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057B44 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057B48 88 1F 0E A8 */ lbz r0, 0xea8(r31)
-/* 80057B4C 28 00 00 00 */ cmplwi r0, 0
-/* 80057B50 41 82 00 2C */ beq lbl_80057B7C
-/* 80057B54 80 7F 0E B0 */ lwz r3, 0xeb0(r31)
-/* 80057B58 28 03 00 00 */ cmplwi r3, 0
-/* 80057B5C 41 82 00 18 */ beq lbl_80057B74
-/* 80057B60 38 80 00 01 */ li r4, 1
-/* 80057B64 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057B68 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057B6C 7D 89 03 A6 */ mtctr r12
-/* 80057B70 4E 80 04 21 */ bctrl
-lbl_80057B74:
-/* 80057B74 38 00 00 00 */ li r0, 0
-/* 80057B78 90 1F 0E B0 */ stw r0, 0xeb0(r31)
-lbl_80057B7C:
-/* 80057B7C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057B80 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057B84 88 1F 0E B4 */ lbz r0, 0xeb4(r31)
-/* 80057B88 28 00 00 00 */ cmplwi r0, 0
-/* 80057B8C 41 82 00 2C */ beq lbl_80057BB8
-/* 80057B90 80 7F 0E C0 */ lwz r3, 0xec0(r31)
-/* 80057B94 28 03 00 00 */ cmplwi r3, 0
-/* 80057B98 41 82 00 18 */ beq lbl_80057BB0
-/* 80057B9C 38 80 00 01 */ li r4, 1
-/* 80057BA0 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057BA4 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057BA8 7D 89 03 A6 */ mtctr r12
-/* 80057BAC 4E 80 04 21 */ bctrl
-lbl_80057BB0:
-/* 80057BB0 38 00 00 00 */ li r0, 0
-/* 80057BB4 90 1F 0E C0 */ stw r0, 0xec0(r31)
-lbl_80057BB8:
-/* 80057BB8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057BBC 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057BC0 88 1F 0F 20 */ lbz r0, 0xf20(r31)
-/* 80057BC4 28 00 00 00 */ cmplwi r0, 0
-/* 80057BC8 41 82 00 2C */ beq lbl_80057BF4
-/* 80057BCC 80 7F 0F 28 */ lwz r3, 0xf28(r31)
-/* 80057BD0 28 03 00 00 */ cmplwi r3, 0
-/* 80057BD4 41 82 00 18 */ beq lbl_80057BEC
-/* 80057BD8 38 80 00 01 */ li r4, 1
-/* 80057BDC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057BE0 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057BE4 7D 89 03 A6 */ mtctr r12
-/* 80057BE8 4E 80 04 21 */ bctrl
-lbl_80057BEC:
-/* 80057BEC 38 00 00 00 */ li r0, 0
-/* 80057BF0 90 1F 0F 28 */ stw r0, 0xf28(r31)
-lbl_80057BF4:
-/* 80057BF4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057BF8 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057BFC 88 1F 10 44 */ lbz r0, 0x1044(r31)
-/* 80057C00 28 00 00 00 */ cmplwi r0, 0
-/* 80057C04 41 82 00 2C */ beq lbl_80057C30
-/* 80057C08 80 7F 10 4C */ lwz r3, 0x104c(r31)
-/* 80057C0C 28 03 00 00 */ cmplwi r3, 0
-/* 80057C10 41 82 00 18 */ beq lbl_80057C28
-/* 80057C14 38 80 00 01 */ li r4, 1
-/* 80057C18 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057C1C 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057C20 7D 89 03 A6 */ mtctr r12
-/* 80057C24 4E 80 04 21 */ bctrl
-lbl_80057C28:
-/* 80057C28 38 00 00 00 */ li r0, 0
-/* 80057C2C 90 1F 10 4C */ stw r0, 0x104c(r31)
-lbl_80057C30:
-/* 80057C30 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80057C34 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057C38 88 1F 10 50 */ lbz r0, 0x1050(r31)
-/* 80057C3C 28 00 00 00 */ cmplwi r0, 0
-/* 80057C40 41 82 00 2C */ beq lbl_80057C6C
-/* 80057C44 80 7F 10 58 */ lwz r3, 0x1058(r31)
-/* 80057C48 28 03 00 00 */ cmplwi r3, 0
-/* 80057C4C 41 82 00 18 */ beq lbl_80057C64
-/* 80057C50 38 80 00 01 */ li r4, 1
-/* 80057C54 81 83 00 00 */ lwz r12, 0(r3)
-/* 80057C58 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80057C5C 7D 89 03 A6 */ mtctr r12
-/* 80057C60 4E 80 04 21 */ bctrl
-lbl_80057C64:
-/* 80057C64 38 00 00 00 */ li r0, 0
-/* 80057C68 90 1F 10 58 */ stw r0, 0x1058(r31)
-lbl_80057C6C:
-/* 80057C6C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80057C70 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80057C74 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057C78 7C 08 03 A6 */ mtlr r0
-/* 80057C7C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057C80 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw2__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw2__Fv.s
deleted file mode 100644
index f39f10de2b..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw2__Fv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_8005A304:
-/* 8005A304 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005A308 7C 08 02 A6 */ mflr r0
-/* 8005A30C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005A310 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A314 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A318 88 03 0E C4 */ lbz r0, 0xec4(r3)
-/* 8005A31C 28 00 00 00 */ cmplwi r0, 0
-/* 8005A320 41 82 00 10 */ beq lbl_8005A330
-/* 8005A324 28 00 00 63 */ cmplwi r0, 0x63
-/* 8005A328 40 80 00 08 */ bge lbl_8005A330
-/* 8005A32C 4B FF D0 41 */ bl dKyw_Vrkumo_Draw__Fv
-lbl_8005A330:
-/* 8005A330 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005A334 7C 08 03 A6 */ mtlr r0
-/* 8005A338 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005A33C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw__Fv.s
deleted file mode 100644
index 028173fbca..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_draw__Fv.s
+++ /dev/null
@@ -1,111 +0,0 @@
-lbl_8005A174:
-/* 8005A174 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005A178 7C 08 02 A6 */ mflr r0
-/* 8005A17C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005A180 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8005A184 93 C1 00 08 */ stw r30, 8(r1)
-/* 8005A188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8005A18C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8005A190 3B DF 4E 00 */ addi r30, r31, 0x4e00
-/* 8005A194 7F C3 F3 78 */ mr r3, r30
-/* 8005A198 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005A19C 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005A1A0 38 84 01 46 */ addi r4, r4, 0x146
-/* 8005A1A4 48 30 E7 F1 */ bl strcmp
-/* 8005A1A8 2C 03 00 00 */ cmpwi r3, 0
-/* 8005A1AC 41 82 00 1C */ beq lbl_8005A1C8
-/* 8005A1B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A1B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A1B8 88 03 0E B4 */ lbz r0, 0xeb4(r3)
-/* 8005A1BC 28 00 00 00 */ cmplwi r0, 0
-/* 8005A1C0 41 82 00 08 */ beq lbl_8005A1C8
-/* 8005A1C4 4B FF D1 55 */ bl dKyw_Cloud_Draw__Fv
-lbl_8005A1C8:
-/* 8005A1C8 7F C3 F3 78 */ mr r3, r30
-/* 8005A1CC 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005A1D0 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005A1D4 38 84 01 46 */ addi r4, r4, 0x146
-/* 8005A1D8 48 30 E7 BD */ bl strcmp
-/* 8005A1DC 2C 03 00 00 */ cmpwi r3, 0
-/* 8005A1E0 41 82 00 40 */ beq lbl_8005A220
-/* 8005A1E4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A1E8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A1EC 88 03 0E 70 */ lbz r0, 0xe70(r3)
-/* 8005A1F0 28 00 00 00 */ cmplwi r0, 0
-/* 8005A1F4 41 82 00 2C */ beq lbl_8005A220
-/* 8005A1F8 38 7F 4E 20 */ addi r3, r31, 0x4e20
-/* 8005A1FC 81 9F 4E 20 */ lwz r12, 0x4e20(r31)
-/* 8005A200 81 8C 00 BC */ lwz r12, 0xbc(r12)
-/* 8005A204 7D 89 03 A6 */ mtctr r12
-/* 8005A208 4E 80 04 21 */ bctrl
-/* 8005A20C 80 03 00 0C */ lwz r0, 0xc(r3)
-/* 8005A210 54 00 66 3F */ rlwinm. r0, r0, 0xc, 0x18, 0x1f
-/* 8005A214 41 82 00 0C */ beq lbl_8005A220
-/* 8005A218 4B FF CE F5 */ bl dKyw_Sun_Draw__Fv
-/* 8005A21C 4B FF CF 59 */ bl dKyw_Sunlenz_Draw__Fv
-lbl_8005A220:
-/* 8005A220 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A224 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A228 88 03 0E 98 */ lbz r0, 0xe98(r3)
-/* 8005A22C 28 00 00 00 */ cmplwi r0, 0
-/* 8005A230 41 82 00 0C */ beq lbl_8005A23C
-/* 8005A234 4B FF D0 3D */ bl dKyw_Star_Draw__Fv
-/* 8005A238 4B FF D1 89 */ bl dKyw_shstar_Draw__Fv
-lbl_8005A23C:
-/* 8005A23C 7F C3 F3 78 */ mr r3, r30
-/* 8005A240 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005A244 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005A248 38 84 01 46 */ addi r4, r4, 0x146
-/* 8005A24C 48 30 E7 49 */ bl strcmp
-/* 8005A250 2C 03 00 00 */ cmpwi r3, 0
-/* 8005A254 41 82 00 98 */ beq lbl_8005A2EC
-/* 8005A258 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A25C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A260 88 03 0E 7C */ lbz r0, 0xe7c(r3)
-/* 8005A264 28 00 00 00 */ cmplwi r0, 0
-/* 8005A268 41 82 00 08 */ beq lbl_8005A270
-/* 8005A26C 4B FF CF 5D */ bl dKyw_Rain_Draw__Fv
-lbl_8005A270:
-/* 8005A270 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A274 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A278 88 03 0E 88 */ lbz r0, 0xe88(r3)
-/* 8005A27C 28 00 00 00 */ cmplwi r0, 0
-/* 8005A280 41 82 00 08 */ beq lbl_8005A288
-/* 8005A284 4B FF CF 99 */ bl dKyw_Snow_Draw__Fv
-lbl_8005A288:
-/* 8005A288 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A28C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A290 88 03 0E A8 */ lbz r0, 0xea8(r3)
-/* 8005A294 28 00 00 00 */ cmplwi r0, 0
-/* 8005A298 41 82 00 08 */ beq lbl_8005A2A0
-/* 8005A29C 4B FF D0 29 */ bl dKyw_Housi_Draw__Fv
-lbl_8005A2A0:
-/* 8005A2A0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A2A4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A2A8 88 03 0F 20 */ lbz r0, 0xf20(r3)
-/* 8005A2AC 28 00 00 00 */ cmplwi r0, 0
-/* 8005A2B0 41 82 00 08 */ beq lbl_8005A2B8
-/* 8005A2B4 4B FF D1 61 */ bl dKyw_Odour_Draw__Fv
-lbl_8005A2B8:
-/* 8005A2B8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A2BC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A2C0 88 03 10 44 */ lbz r0, 0x1044(r3)
-/* 8005A2C4 28 00 00 00 */ cmplwi r0, 0
-/* 8005A2C8 41 82 00 08 */ beq lbl_8005A2D0
-/* 8005A2CC 4B FF D1 9D */ bl dKyw_mud_Draw__Fv
-lbl_8005A2D0:
-/* 8005A2D0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A2D4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A2D8 88 03 10 50 */ lbz r0, 0x1050(r3)
-/* 8005A2DC 28 00 00 00 */ cmplwi r0, 0
-/* 8005A2E0 41 82 00 08 */ beq lbl_8005A2E8
-/* 8005A2E4 4B FF D1 D9 */ bl dKyw_evil_Draw__Fv
-lbl_8005A2E8:
-/* 8005A2E8 48 14 B4 45 */ bl dKy_undwater_filter_draw__Fv
-lbl_8005A2EC:
-/* 8005A2EC 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8005A2F0 83 C1 00 08 */ lwz r30, 8(r1)
-/* 8005A2F4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005A2F8 7C 08 03 A6 */ mtlr r0
-/* 8005A2FC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005A300 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_init2__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_init2__Fv.s
deleted file mode 100644
index f20bf531a2..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_init2__Fv.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_800579EC:
-/* 800579EC 38 00 00 00 */ li r0, 0
-/* 800579F0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800579F4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800579F8 98 03 0E C4 */ stb r0, 0xec4(r3)
-/* 800579FC 90 03 0E C8 */ stw r0, 0xec8(r3)
-/* 80057A00 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_init__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_init__Fv.s
deleted file mode 100644
index b3b8e01563..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_init__Fv.s
+++ /dev/null
@@ -1,327 +0,0 @@
-lbl_800574E0:
-/* 800574E0 94 21 FF C0 */ stwu r1, -0x40(r1)
-/* 800574E4 7C 08 02 A6 */ mflr r0
-/* 800574E8 90 01 00 44 */ stw r0, 0x44(r1)
-/* 800574EC 93 E1 00 3C */ stw r31, 0x3c(r1)
-/* 800574F0 93 C1 00 38 */ stw r30, 0x38(r1)
-/* 800574F4 38 00 00 00 */ li r0, 0
-/* 800574F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800574FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80057500 98 03 0E 70 */ stb r0, 0xe70(r3)
-/* 80057504 98 03 0E D4 */ stb r0, 0xed4(r3)
-/* 80057508 90 03 0E D8 */ stw r0, 0xed8(r3)
-/* 8005750C 98 03 0E 7C */ stb r0, 0xe7c(r3)
-/* 80057510 90 03 0E 80 */ stw r0, 0xe80(r3)
-/* 80057514 98 03 0E 88 */ stb r0, 0xe88(r3)
-/* 80057518 98 03 0E 92 */ stb r0, 0xe92(r3)
-/* 8005751C 90 03 0E 8C */ stw r0, 0xe8c(r3)
-/* 80057520 98 03 0E 90 */ stb r0, 0xe90(r3)
-/* 80057524 98 03 0E 91 */ stb r0, 0xe91(r3)
-/* 80057528 98 03 0E 98 */ stb r0, 0xe98(r3)
-/* 8005752C 90 03 0E 9C */ stw r0, 0xe9c(r3)
-/* 80057530 C0 02 86 E0 */ lfs f0, lit_4378(r2)
-/* 80057534 D0 03 0E A0 */ stfs f0, 0xea0(r3)
-/* 80057538 98 03 0E B4 */ stb r0, 0xeb4(r3)
-/* 8005753C 90 03 0E B8 */ stw r0, 0xeb8(r3)
-/* 80057540 D0 03 0E BC */ stfs f0, 0xebc(r3)
-/* 80057544 98 03 0E B5 */ stb r0, 0xeb5(r3)
-/* 80057548 98 03 0E A8 */ stb r0, 0xea8(r3)
-/* 8005754C 90 03 0E AC */ stw r0, 0xeac(r3)
-/* 80057550 98 03 0F 20 */ stb r0, 0xf20(r3)
-/* 80057554 90 03 0F 24 */ stw r0, 0xf24(r3)
-/* 80057558 98 03 0F 21 */ stb r0, 0xf21(r3)
-/* 8005755C 90 03 0F 28 */ stw r0, 0xf28(r3)
-/* 80057560 98 03 10 38 */ stb r0, 0x1038(r3)
-/* 80057564 90 03 10 3C */ stw r0, 0x103c(r3)
-/* 80057568 98 03 10 44 */ stb r0, 0x1044(r3)
-/* 8005756C 90 03 10 48 */ stw r0, 0x1048(r3)
-/* 80057570 98 03 10 50 */ stb r0, 0x1050(r3)
-/* 80057574 90 03 10 54 */ stw r0, 0x1054(r3)
-/* 80057578 98 03 10 51 */ stb r0, 0x1051(r3)
-/* 8005757C D0 03 0E 60 */ stfs f0, 0xe60(r3)
-/* 80057580 48 00 2F FD */ bl dKyw_wind_init__Fv
-/* 80057584 48 00 37 C1 */ bl dKyw_pntwind_init__Fv
-/* 80057588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8005758C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80057590 3B C3 4E 00 */ addi r30, r3, 0x4e00
-/* 80057594 7F C3 F3 78 */ mr r3, r30
-/* 80057598 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005759C 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800575A0 48 31 13 F5 */ bl strcmp
-/* 800575A4 2C 03 00 00 */ cmpwi r3, 0
-/* 800575A8 40 82 03 E0 */ bne lbl_80057988
-/* 800575AC 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 800575B0 2C 00 00 01 */ cmpwi r0, 1
-/* 800575B4 40 82 03 D4 */ bne lbl_80057988
-/* 800575B8 38 60 00 00 */ li r3, 0
-/* 800575BC 4B FD 53 C1 */ bl getLayerNo__14dComIfG_play_cFi
-/* 800575C0 2C 03 00 08 */ cmpwi r3, 8
-/* 800575C4 40 80 03 C4 */ bge lbl_80057988
-/* 800575C8 C0 02 86 E0 */ lfs f0, lit_4378(r2)
-/* 800575CC D0 01 00 28 */ stfs f0, 0x28(r1)
-/* 800575D0 D0 01 00 24 */ stfs f0, 0x24(r1)
-/* 800575D4 D0 01 00 20 */ stfs f0, 0x20(r1)
-/* 800575D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800575DC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800575E0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 800575E4 38 80 00 00 */ li r4, 0
-/* 800575E8 90 81 00 08 */ stw r4, 8(r1)
-/* 800575EC 38 00 FF FF */ li r0, -1
-/* 800575F0 90 01 00 0C */ stw r0, 0xc(r1)
-/* 800575F4 90 81 00 10 */ stw r4, 0x10(r1)
-/* 800575F8 90 81 00 14 */ stw r4, 0x14(r1)
-/* 800575FC 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057600 38 80 00 00 */ li r4, 0
-/* 80057604 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000878F@ha */
-/* 80057608 38 A5 87 8F */ addi r5, r5, 0x878F /* 0x0000878F@l */
-/* 8005760C 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057610 38 E0 00 00 */ li r7, 0
-/* 80057614 39 00 00 00 */ li r8, 0
-/* 80057618 39 20 00 00 */ li r9, 0
-/* 8005761C 39 40 00 FF */ li r10, 0xff
-/* 80057620 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 80057624 4B FF 54 6D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057628 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 8005762C 38 80 00 00 */ li r4, 0
-/* 80057630 90 81 00 08 */ stw r4, 8(r1)
-/* 80057634 38 00 FF FF */ li r0, -1
-/* 80057638 90 01 00 0C */ stw r0, 0xc(r1)
-/* 8005763C 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057640 90 81 00 14 */ stw r4, 0x14(r1)
-/* 80057644 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057648 38 80 00 00 */ li r4, 0
-/* 8005764C 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008790@ha */
-/* 80057650 38 A5 87 90 */ addi r5, r5, 0x8790 /* 0x00008790@l */
-/* 80057654 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057658 38 E0 00 00 */ li r7, 0
-/* 8005765C 39 00 00 00 */ li r8, 0
-/* 80057660 39 20 00 00 */ li r9, 0
-/* 80057664 39 40 00 FF */ li r10, 0xff
-/* 80057668 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 8005766C 4B FF 54 25 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057670 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 80057674 38 80 00 00 */ li r4, 0
-/* 80057678 90 81 00 08 */ stw r4, 8(r1)
-/* 8005767C 38 00 FF FF */ li r0, -1
-/* 80057680 90 01 00 0C */ stw r0, 0xc(r1)
-/* 80057684 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057688 90 81 00 14 */ stw r4, 0x14(r1)
-/* 8005768C 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057690 38 80 00 00 */ li r4, 0
-/* 80057694 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008791@ha */
-/* 80057698 38 A5 87 91 */ addi r5, r5, 0x8791 /* 0x00008791@l */
-/* 8005769C 38 C1 00 20 */ addi r6, r1, 0x20
-/* 800576A0 38 E0 00 00 */ li r7, 0
-/* 800576A4 39 00 00 00 */ li r8, 0
-/* 800576A8 39 20 00 00 */ li r9, 0
-/* 800576AC 39 40 00 FF */ li r10, 0xff
-/* 800576B0 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 800576B4 4B FF 53 DD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 800576B8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 800576BC 38 80 00 00 */ li r4, 0
-/* 800576C0 90 81 00 08 */ stw r4, 8(r1)
-/* 800576C4 38 00 FF FF */ li r0, -1
-/* 800576C8 90 01 00 0C */ stw r0, 0xc(r1)
-/* 800576CC 90 81 00 10 */ stw r4, 0x10(r1)
-/* 800576D0 90 81 00 14 */ stw r4, 0x14(r1)
-/* 800576D4 90 81 00 18 */ stw r4, 0x18(r1)
-/* 800576D8 38 80 00 00 */ li r4, 0
-/* 800576DC 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008792@ha */
-/* 800576E0 38 A5 87 92 */ addi r5, r5, 0x8792 /* 0x00008792@l */
-/* 800576E4 38 C1 00 20 */ addi r6, r1, 0x20
-/* 800576E8 38 E0 00 00 */ li r7, 0
-/* 800576EC 39 00 00 00 */ li r8, 0
-/* 800576F0 39 20 00 00 */ li r9, 0
-/* 800576F4 39 40 00 FF */ li r10, 0xff
-/* 800576F8 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 800576FC 4B FF 53 95 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057700 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 80057704 38 80 00 00 */ li r4, 0
-/* 80057708 90 81 00 08 */ stw r4, 8(r1)
-/* 8005770C 38 00 FF FF */ li r0, -1
-/* 80057710 90 01 00 0C */ stw r0, 0xc(r1)
-/* 80057714 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057718 90 81 00 14 */ stw r4, 0x14(r1)
-/* 8005771C 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057720 38 80 00 00 */ li r4, 0
-/* 80057724 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008793@ha */
-/* 80057728 38 A5 87 93 */ addi r5, r5, 0x8793 /* 0x00008793@l */
-/* 8005772C 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057730 38 E0 00 00 */ li r7, 0
-/* 80057734 39 00 00 00 */ li r8, 0
-/* 80057738 39 20 00 00 */ li r9, 0
-/* 8005773C 39 40 00 FF */ li r10, 0xff
-/* 80057740 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 80057744 4B FF 53 4D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057748 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 8005774C 38 80 00 00 */ li r4, 0
-/* 80057750 90 81 00 08 */ stw r4, 8(r1)
-/* 80057754 38 00 FF FF */ li r0, -1
-/* 80057758 90 01 00 0C */ stw r0, 0xc(r1)
-/* 8005775C 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057760 90 81 00 14 */ stw r4, 0x14(r1)
-/* 80057764 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057768 38 80 00 00 */ li r4, 0
-/* 8005776C 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008794@ha */
-/* 80057770 38 A5 87 94 */ addi r5, r5, 0x8794 /* 0x00008794@l */
-/* 80057774 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057778 38 E0 00 00 */ li r7, 0
-/* 8005777C 39 00 00 00 */ li r8, 0
-/* 80057780 39 20 00 00 */ li r9, 0
-/* 80057784 39 40 00 FF */ li r10, 0xff
-/* 80057788 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 8005778C 4B FF 53 05 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057790 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 80057794 38 80 00 00 */ li r4, 0
-/* 80057798 90 81 00 08 */ stw r4, 8(r1)
-/* 8005779C 38 00 FF FF */ li r0, -1
-/* 800577A0 90 01 00 0C */ stw r0, 0xc(r1)
-/* 800577A4 90 81 00 10 */ stw r4, 0x10(r1)
-/* 800577A8 90 81 00 14 */ stw r4, 0x14(r1)
-/* 800577AC 90 81 00 18 */ stw r4, 0x18(r1)
-/* 800577B0 38 80 00 00 */ li r4, 0
-/* 800577B4 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008795@ha */
-/* 800577B8 38 A5 87 95 */ addi r5, r5, 0x8795 /* 0x00008795@l */
-/* 800577BC 38 C1 00 20 */ addi r6, r1, 0x20
-/* 800577C0 38 E0 00 00 */ li r7, 0
-/* 800577C4 39 00 00 00 */ li r8, 0
-/* 800577C8 39 20 00 00 */ li r9, 0
-/* 800577CC 39 40 00 FF */ li r10, 0xff
-/* 800577D0 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 800577D4 4B FF 52 BD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 800577D8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 800577DC 38 80 00 00 */ li r4, 0
-/* 800577E0 90 81 00 08 */ stw r4, 8(r1)
-/* 800577E4 38 00 FF FF */ li r0, -1
-/* 800577E8 90 01 00 0C */ stw r0, 0xc(r1)
-/* 800577EC 90 81 00 10 */ stw r4, 0x10(r1)
-/* 800577F0 90 81 00 14 */ stw r4, 0x14(r1)
-/* 800577F4 90 81 00 18 */ stw r4, 0x18(r1)
-/* 800577F8 38 80 00 00 */ li r4, 0
-/* 800577FC 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008796@ha */
-/* 80057800 38 A5 87 96 */ addi r5, r5, 0x8796 /* 0x00008796@l */
-/* 80057804 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057808 38 E0 00 00 */ li r7, 0
-/* 8005780C 39 00 00 00 */ li r8, 0
-/* 80057810 39 20 00 00 */ li r9, 0
-/* 80057814 39 40 00 FF */ li r10, 0xff
-/* 80057818 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 8005781C 4B FF 52 75 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057820 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 80057824 38 80 00 00 */ li r4, 0
-/* 80057828 90 81 00 08 */ stw r4, 8(r1)
-/* 8005782C 38 00 FF FF */ li r0, -1
-/* 80057830 90 01 00 0C */ stw r0, 0xc(r1)
-/* 80057834 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057838 90 81 00 14 */ stw r4, 0x14(r1)
-/* 8005783C 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057840 38 80 00 00 */ li r4, 0
-/* 80057844 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008797@ha */
-/* 80057848 38 A5 87 97 */ addi r5, r5, 0x8797 /* 0x00008797@l */
-/* 8005784C 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057850 38 E0 00 00 */ li r7, 0
-/* 80057854 39 00 00 00 */ li r8, 0
-/* 80057858 39 20 00 00 */ li r9, 0
-/* 8005785C 39 40 00 FF */ li r10, 0xff
-/* 80057860 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 80057864 4B FF 52 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057868 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 8005786C 38 80 00 00 */ li r4, 0
-/* 80057870 90 81 00 08 */ stw r4, 8(r1)
-/* 80057874 38 00 FF FF */ li r0, -1
-/* 80057878 90 01 00 0C */ stw r0, 0xc(r1)
-/* 8005787C 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057880 90 81 00 14 */ stw r4, 0x14(r1)
-/* 80057884 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057888 38 80 00 00 */ li r4, 0
-/* 8005788C 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008798@ha */
-/* 80057890 38 A5 87 98 */ addi r5, r5, 0x8798 /* 0x00008798@l */
-/* 80057894 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057898 38 E0 00 00 */ li r7, 0
-/* 8005789C 39 00 00 00 */ li r8, 0
-/* 800578A0 39 20 00 00 */ li r9, 0
-/* 800578A4 39 40 00 FF */ li r10, 0xff
-/* 800578A8 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 800578AC 4B FF 51 E5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 800578B0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 800578B4 38 80 00 00 */ li r4, 0
-/* 800578B8 90 81 00 08 */ stw r4, 8(r1)
-/* 800578BC 38 00 FF FF */ li r0, -1
-/* 800578C0 90 01 00 0C */ stw r0, 0xc(r1)
-/* 800578C4 90 81 00 10 */ stw r4, 0x10(r1)
-/* 800578C8 90 81 00 14 */ stw r4, 0x14(r1)
-/* 800578CC 90 81 00 18 */ stw r4, 0x18(r1)
-/* 800578D0 38 80 00 00 */ li r4, 0
-/* 800578D4 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008799@ha */
-/* 800578D8 38 A5 87 99 */ addi r5, r5, 0x8799 /* 0x00008799@l */
-/* 800578DC 38 C1 00 20 */ addi r6, r1, 0x20
-/* 800578E0 38 E0 00 00 */ li r7, 0
-/* 800578E4 39 00 00 00 */ li r8, 0
-/* 800578E8 39 20 00 00 */ li r9, 0
-/* 800578EC 39 40 00 FF */ li r10, 0xff
-/* 800578F0 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 800578F4 4B FF 51 9D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 800578F8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 800578FC 38 80 00 00 */ li r4, 0
-/* 80057900 90 81 00 08 */ stw r4, 8(r1)
-/* 80057904 38 00 FF FF */ li r0, -1
-/* 80057908 90 01 00 0C */ stw r0, 0xc(r1)
-/* 8005790C 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057910 90 81 00 14 */ stw r4, 0x14(r1)
-/* 80057914 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057918 38 80 00 00 */ li r4, 0
-/* 8005791C 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000879A@ha */
-/* 80057920 38 A5 87 9A */ addi r5, r5, 0x879A /* 0x0000879A@l */
-/* 80057924 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057928 38 E0 00 00 */ li r7, 0
-/* 8005792C 39 00 00 00 */ li r8, 0
-/* 80057930 39 20 00 00 */ li r9, 0
-/* 80057934 39 40 00 FF */ li r10, 0xff
-/* 80057938 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 8005793C 4B FF 51 55 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80057940 80 7F 5D 3C */ lwz r3, 0x5d3c(r31)
-/* 80057944 38 80 00 00 */ li r4, 0
-/* 80057948 90 81 00 08 */ stw r4, 8(r1)
-/* 8005794C 38 00 FF FF */ li r0, -1
-/* 80057950 90 01 00 0C */ stw r0, 0xc(r1)
-/* 80057954 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80057958 90 81 00 14 */ stw r4, 0x14(r1)
-/* 8005795C 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80057960 38 80 00 00 */ li r4, 0
-/* 80057964 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000879B@ha */
-/* 80057968 38 A5 87 9B */ addi r5, r5, 0x879B /* 0x0000879B@l */
-/* 8005796C 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80057970 38 E0 00 00 */ li r7, 0
-/* 80057974 39 00 00 00 */ li r8, 0
-/* 80057978 39 20 00 00 */ li r9, 0
-/* 8005797C 39 40 00 FF */ li r10, 0xff
-/* 80057980 C0 22 86 E4 */ lfs f1, lit_4379(r2)
-/* 80057984 4B FF 51 0D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-lbl_80057988:
-/* 80057988 7F C3 F3 78 */ mr r3, r30
-/* 8005798C 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80057990 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80057994 38 84 00 08 */ addi r4, r4, 8
-/* 80057998 48 31 0F FD */ bl strcmp
-/* 8005799C 2C 03 00 00 */ cmpwi r3, 0
-/* 800579A0 40 82 00 34 */ bne lbl_800579D4
-/* 800579A4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 800579A8 7C 00 07 75 */ extsb. r0, r0
-/* 800579AC 41 82 00 1C */ beq lbl_800579C8
-/* 800579B0 2C 00 00 03 */ cmpwi r0, 3
-/* 800579B4 41 82 00 14 */ beq lbl_800579C8
-/* 800579B8 2C 00 00 06 */ cmpwi r0, 6
-/* 800579BC 41 82 00 0C */ beq lbl_800579C8
-/* 800579C0 2C 00 00 0D */ cmpwi r0, 0xd
-/* 800579C4 40 82 00 10 */ bne lbl_800579D4
-lbl_800579C8:
-/* 800579C8 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
-/* 800579CC 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
-/* 800579D0 48 27 05 ED */ bl initStrongWindSe__10Z2EnvSeMgrFv
-lbl_800579D4:
-/* 800579D4 83 E1 00 3C */ lwz r31, 0x3c(r1)
-/* 800579D8 83 C1 00 38 */ lwz r30, 0x38(r1)
-/* 800579DC 80 01 00 44 */ lwz r0, 0x44(r1)
-/* 800579E0 7C 08 03 A6 */ mtlr r0
-/* 800579E4 38 21 00 40 */ addi r1, r1, 0x40
-/* 800579E8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move__Fv.s
deleted file mode 100644
index de4fd9ee98..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move__Fv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_800582F8:
-/* 800582F8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800582FC 7C 08 02 A6 */ mflr r0
-/* 80058300 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80058304 4B FF FF 8D */ bl wether_move_thunder__Fv
-/* 80058308 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005830C 7C 08 03 A6 */ mtlr r0
-/* 80058310 38 21 00 10 */ addi r1, r1, 0x10
-/* 80058314 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw2__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw2__Fv.s
deleted file mode 100644
index f9f8a7c9d7..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw2__Fv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_8005A154:
-/* 8005A154 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005A158 7C 08 02 A6 */ mflr r0
-/* 8005A15C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005A160 4B FF F5 C9 */ bl wether_move_vrkumo__Fv
-/* 8005A164 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005A168 7C 08 03 A6 */ mtlr r0
-/* 8005A16C 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005A170 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw__Fv.s
deleted file mode 100644
index 6a3781f572..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wether_move_draw__Fv.s
+++ /dev/null
@@ -1,42 +0,0 @@
-lbl_8005A0B8:
-/* 8005A0B8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8005A0BC 7C 08 02 A6 */ mflr r0
-/* 8005A0C0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005A0C4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8005A0C8 38 00 00 00 */ li r0, 0
-/* 8005A0CC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A0D0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A0D4 90 03 12 88 */ stw r0, 0x1288(r3)
-/* 8005A0D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8005A0DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8005A0E0 3B E3 4E 00 */ addi r31, r3, 0x4e00
-/* 8005A0E4 7F E3 FB 78 */ mr r3, r31
-/* 8005A0E8 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005A0EC 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005A0F0 38 84 01 46 */ addi r4, r4, 0x146
-/* 8005A0F4 48 30 E8 A1 */ bl strcmp
-/* 8005A0F8 2C 03 00 00 */ cmpwi r3, 0
-/* 8005A0FC 41 82 00 10 */ beq lbl_8005A10C
-/* 8005A100 4B FF E2 19 */ bl wether_move_sun__Fv
-/* 8005A104 4B FF E7 91 */ bl wether_move_rain__Fv
-/* 8005A108 4B FF E9 F9 */ bl wether_move_snow__Fv
-lbl_8005A10C:
-/* 8005A10C 4B FF EA 81 */ bl wether_move_star__Fv
-/* 8005A110 7F E3 FB 78 */ mr r3, r31
-/* 8005A114 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005A118 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005A11C 38 84 01 46 */ addi r4, r4, 0x146
-/* 8005A120 48 30 E8 75 */ bl strcmp
-/* 8005A124 2C 03 00 00 */ cmpwi r3, 0
-/* 8005A128 41 82 00 18 */ beq lbl_8005A140
-/* 8005A12C 4B FF ED ED */ bl wether_move_housi__Fv
-/* 8005A130 4B FF F4 51 */ bl wether_move_moya__Fv
-/* 8005A134 4B FF FD 05 */ bl wether_move_mud__Fv
-/* 8005A138 4B FF FE 3D */ bl wether_move_evil__Fv
-/* 8005A13C 4B FF F2 A1 */ bl wether_move_odour__Fv
-lbl_8005A140:
-/* 8005A140 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8005A144 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005A148 7C 08 03 A6 */ mtlr r0
-/* 8005A14C 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005A150 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wind_init__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wind_init__Fv.s
deleted file mode 100644
index a197a92ec4..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/dKyw_wind_init__Fv.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_8005A57C:
-/* 8005A57C C0 02 86 F0 */ lfs f0, lit_4668(r2)
-/* 8005A580 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A584 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A588 D0 03 0E 48 */ stfs f0, 0xe48(r3)
-/* 8005A58C C0 02 86 E0 */ lfs f0, lit_4378(r2)
-/* 8005A590 D0 03 0E 4C */ stfs f0, 0xe4c(r3)
-/* 8005A594 D0 03 0E 50 */ stfs f0, 0xe50(r3)
-/* 8005A598 D0 03 0E 58 */ stfs f0, 0xe58(r3)
-/* 8005A59C 38 00 00 00 */ li r0, 0
-/* 8005A5A0 98 03 0E 6C */ stb r0, 0xe6c(r3)
-/* 8005A5A4 B0 03 0E 64 */ sth r0, 0xe64(r3)
-/* 8005A5A8 B0 03 0E 66 */ sth r0, 0xe66(r3)
-/* 8005A5AC 90 03 0E 54 */ stw r0, 0xe54(r3)
-/* 8005A5B0 D0 03 0E 5C */ stfs f0, 0xe5c(r3)
-/* 8005A5B4 98 03 0E 6D */ stb r0, 0xe6d(r3)
-/* 8005A5B8 98 03 0E 6E */ stb r0, 0xe6e(r3)
-/* 8005A5BC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_mud_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_mud_PacketFv.s
deleted file mode 100644
index 2c2a176ead..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_mud_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_8005703C:
-/* 8005703C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80057040 7C 08 02 A6 */ mflr r0
-/* 80057044 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80057048 7C 64 1B 78 */ mr r4, r3
-/* 8005704C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80057050 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80057054 38 84 00 14 */ addi r4, r4, 0x14
-/* 80057058 48 01 5F C5 */ bl dKyr_mud_draw__FPA4_fPPUc
-/* 8005705C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80057060 7C 08 03 A6 */ mtlr r0
-/* 80057064 38 21 00 10 */ addi r1, r1, 0x10
-/* 80057068 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_sun_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_sun_PacketFv.s
deleted file mode 100644
index 5e75617267..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__18dKankyo_sun_PacketFv.s
+++ /dev/null
@@ -1,15 +0,0 @@
-lbl_80056C60:
-/* 80056C60 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056C64 7C 08 02 A6 */ mflr r0
-/* 80056C68 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056C6C 7C 66 1B 78 */ mr r6, r3
-/* 80056C70 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056C74 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056C78 38 86 00 10 */ addi r4, r6, 0x10
-/* 80056C7C 38 A6 00 70 */ addi r5, r6, 0x70
-/* 80056C80 38 C6 00 2C */ addi r6, r6, 0x2c
-/* 80056C84 48 00 C9 ED */ bl dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc
-/* 80056C88 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056C8C 7C 08 03 A6 */ mtlr r0
-/* 80056C90 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056C94 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_evil_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_evil_PacketFv.s
deleted file mode 100644
index a8181dab9a..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_evil_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_800570AC:
-/* 800570AC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800570B0 7C 08 02 A6 */ mflr r0
-/* 800570B4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800570B8 7C 64 1B 78 */ mr r4, r3
-/* 800570BC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 800570C0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 800570C4 38 84 00 14 */ addi r4, r4, 0x14
-/* 800570C8 48 01 75 E9 */ bl dKyr_evil_draw__FPA4_fPPUc
-/* 800570CC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800570D0 7C 08 03 A6 */ mtlr r0
-/* 800570D4 38 21 00 10 */ addi r1, r1, 0x10
-/* 800570D8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_rain_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_rain_PacketFv.s
deleted file mode 100644
index c43c9d7f85..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_rain_PacketFv.s
+++ /dev/null
@@ -1,19 +0,0 @@
-lbl_80056D10:
-/* 80056D10 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056D14 7C 08 02 A6 */ mflr r0
-/* 80056D18 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056D1C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80056D20 7C 7F 1B 78 */ mr r31, r3
-/* 80056D24 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056D28 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056D2C 38 9F 00 10 */ addi r4, r31, 0x10
-/* 80056D30 48 00 F3 19 */ bl dKyr_drawSibuki__FPA4_fPPUc
-/* 80056D34 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056D38 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056D3C 38 9F 00 10 */ addi r4, r31, 0x10
-/* 80056D40 48 00 E8 ED */ bl dKyr_drawRain__FPA4_fPPUc
-/* 80056D44 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80056D48 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056D4C 7C 08 03 A6 */ mtlr r0
-/* 80056D50 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056D54 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_snow_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_snow_PacketFv.s
deleted file mode 100644
index 7936f01d75..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_snow_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80056D98:
-/* 80056D98 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056D9C 7C 08 02 A6 */ mflr r0
-/* 80056DA0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056DA4 7C 64 1B 78 */ mr r4, r3
-/* 80056DA8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056DAC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056DB0 38 84 00 10 */ addi r4, r4, 0x10
-/* 80056DB4 48 01 06 D5 */ bl dKyr_drawSnow__FPA4_fPPUc
-/* 80056DB8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056DBC 7C 08 03 A6 */ mtlr r0
-/* 80056DC0 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056DC4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_star_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_star_PacketFv.s
deleted file mode 100644
index efe1f67128..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__19dKankyo_star_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80056E08:
-/* 80056E08 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056E0C 7C 08 02 A6 */ mflr r0
-/* 80056E10 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056E14 7C 64 1B 78 */ mr r4, r3
-/* 80056E18 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056E1C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056E20 38 84 00 10 */ addi r4, r4, 0x10
-/* 80056E24 48 01 17 B9 */ bl dKyr_drawStar__FPA4_fPPUc
-/* 80056E28 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056E2C 7C 08 03 A6 */ mtlr r0
-/* 80056E30 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056E34 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_cloud_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_cloud_PacketFv.s
deleted file mode 100644
index 961d1dbe73..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_cloud_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80056E78:
-/* 80056E78 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056E7C 7C 08 02 A6 */ mflr r0
-/* 80056E80 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056E84 7C 64 1B 78 */ mr r4, r3
-/* 80056E88 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056E8C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056E90 38 84 00 10 */ addi r4, r4, 0x10
-/* 80056E94 48 01 26 79 */ bl drawCloudShadow__FPA4_fPPUc
-/* 80056E98 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056E9C 7C 08 03 A6 */ mtlr r0
-/* 80056EA0 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056EA4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_housi_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_housi_PacketFv.s
deleted file mode 100644
index f45b72fe49..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_housi_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80056EE8:
-/* 80056EE8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056EEC 7C 08 02 A6 */ mflr r0
-/* 80056EF0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056EF4 7C 64 1B 78 */ mr r4, r3
-/* 80056EF8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056EFC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056F00 38 84 00 1C */ addi r4, r4, 0x1c
-/* 80056F04 48 00 F6 39 */ bl dKyr_drawHousi__FPA4_fPPUc
-/* 80056F08 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056F0C 7C 08 03 A6 */ mtlr r0
-/* 80056F10 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056F14 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_odour_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_odour_PacketFv.s
deleted file mode 100644
index 9edf81f73b..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__20dKankyo_odour_PacketFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80056FCC:
-/* 80056FCC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056FD0 7C 08 02 A6 */ mflr r0
-/* 80056FD4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056FD8 7C 64 1B 78 */ mr r4, r3
-/* 80056FDC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056FE0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056FE4 38 84 00 10 */ addi r4, r4, 0x10
-/* 80056FE8 48 01 4E 25 */ bl dKyr_odour_draw__FPA4_fPPUc
-/* 80056FEC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056FF0 7C 08 03 A6 */ mtlr r0
-/* 80056FF4 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056FF8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__21dKankyo_vrkumo_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__21dKankyo_vrkumo_PacketFv.s
deleted file mode 100644
index 972ab69303..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__21dKankyo_vrkumo_PacketFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_80056F58:
-/* 80056F58 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056F5C 7C 08 02 A6 */ mflr r0
-/* 80056F60 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056F64 7C 65 1B 78 */ mr r5, r3
-/* 80056F68 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056F6C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056F70 38 85 00 10 */ addi r4, r5, 0x10
-/* 80056F74 38 A5 00 14 */ addi r5, r5, 0x14
-/* 80056F78 48 01 31 19 */ bl drawVrkumo__FPA4_fR8_GXColorPPUc
-/* 80056F7C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056F80 7C 08 03 A6 */ mtlr r0
-/* 80056F84 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056F88 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/draw__22dKankyo_sunlenz_PacketFv.s b/asm/d/kankyo/d_kankyo_wether/draw__22dKankyo_sunlenz_PacketFv.s
deleted file mode 100644
index 91c0e9c60f..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/draw__22dKankyo_sunlenz_PacketFv.s
+++ /dev/null
@@ -1,15 +0,0 @@
-lbl_80056C98:
-/* 80056C98 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80056C9C 7C 08 02 A6 */ mflr r0
-/* 80056CA0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80056CA4 7C 66 1B 78 */ mr r6, r3
-/* 80056CA8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80056CAC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80056CB0 38 86 00 24 */ addi r4, r6, 0x24
-/* 80056CB4 38 A6 00 10 */ addi r5, r6, 0x10
-/* 80056CB8 38 C6 00 14 */ addi r6, r6, 0x14
-/* 80056CBC 48 00 D7 91 */ bl dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc
-/* 80056CC0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80056CC4 7C 08 03 A6 */ mtlr r0
-/* 80056CC8 38 21 00 10 */ addi r1, r1, 0x10
-/* 80056CCC 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/pntwind_set__FP14WIND_INFLUENCE.s b/asm/d/kankyo/d_kankyo_wether/pntwind_set__FP14WIND_INFLUENCE.s
deleted file mode 100644
index 9f63c50b14..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/pntwind_set__FP14WIND_INFLUENCE.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_8005AD98:
-/* 8005AD98 38 E0 00 00 */ li r7, 0
-/* 8005AD9C 38 80 00 00 */ li r4, 0
-/* 8005ADA0 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005ADA4 38 C5 CA 54 */ addi r6, r5, g_env_light@l /* 0x8042CA54@l */
-/* 8005ADA8 38 00 00 1E */ li r0, 0x1e
-/* 8005ADAC 7C 09 03 A6 */ mtctr r0
-lbl_8005ADB0:
-/* 8005ADB0 7C A6 22 14 */ add r5, r6, r4
-/* 8005ADB4 80 05 07 D0 */ lwz r0, 0x7d0(r5)
-/* 8005ADB8 28 00 00 00 */ cmplwi r0, 0
-/* 8005ADBC 40 82 00 20 */ bne lbl_8005ADDC
-/* 8005ADC0 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005ADC4 38 05 CA 54 */ addi r0, r5, g_env_light@l /* 0x8042CA54@l */
-/* 8005ADC8 7C 80 22 14 */ add r4, r0, r4
-/* 8005ADCC 90 64 07 D0 */ stw r3, 0x7d0(r4)
-/* 8005ADD0 80 84 07 D0 */ lwz r4, 0x7d0(r4)
-/* 8005ADD4 90 E4 00 24 */ stw r7, 0x24(r4)
-/* 8005ADD8 48 00 00 10 */ b lbl_8005ADE8
-lbl_8005ADDC:
-/* 8005ADDC 38 E7 00 01 */ addi r7, r7, 1
-/* 8005ADE0 38 84 00 04 */ addi r4, r4, 4
-/* 8005ADE4 42 00 FF CC */ bdnz lbl_8005ADB0
-lbl_8005ADE8:
-/* 8005ADE8 2C 07 00 1E */ cmpwi r7, 0x1e
-/* 8005ADEC 4D 80 00 20 */ bltlr
-/* 8005ADF0 38 00 27 0F */ li r0, 0x270f
-/* 8005ADF4 90 03 00 24 */ stw r0, 0x24(r3)
-/* 8005ADF8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_evil__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_evil__Fv.s
deleted file mode 100644
index 972f5647f7..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_evil__Fv.s
+++ /dev/null
@@ -1,87 +0,0 @@
-lbl_80059F74:
-/* 80059F74 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80059F78 7C 08 02 A6 */ mflr r0
-/* 80059F7C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80059F80 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80059F84 93 C1 00 08 */ stw r30, 8(r1)
-/* 80059F88 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059F8C 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059F90 88 1F 10 50 */ lbz r0, 0x1050(r31)
-/* 80059F94 54 00 07 3E */ clrlwi r0, r0, 0x1c
-/* 80059F98 2C 00 00 01 */ cmpwi r0, 1
-/* 80059F9C 41 82 00 B0 */ beq lbl_8005A04C
-/* 80059FA0 40 80 01 00 */ bge lbl_8005A0A0
-/* 80059FA4 2C 00 00 00 */ cmpwi r0, 0
-/* 80059FA8 40 80 00 08 */ bge lbl_80059FB0
-/* 80059FAC 48 00 00 F4 */ b lbl_8005A0A0
-lbl_80059FB0:
-/* 80059FB0 80 1F 10 54 */ lwz r0, 0x1054(r31)
-/* 80059FB4 2C 00 00 00 */ cmpwi r0, 0
-/* 80059FB8 41 82 00 E8 */ beq lbl_8005A0A0
-/* 80059FBC 3C 60 00 02 */ lis r3, 0x0002 /* 0x00021364@ha */
-/* 80059FC0 38 63 13 64 */ addi r3, r3, 0x1364 /* 0x00021364@l */
-/* 80059FC4 38 80 00 20 */ li r4, 0x20
-/* 80059FC8 48 27 4C AD */ bl __nw__FUli
-/* 80059FCC 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80059FD0 41 82 00 50 */ beq lbl_8005A020
-/* 80059FD4 7F C4 F3 78 */ mr r4, r30
-/* 80059FD8 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80059FDC 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80059FE0 90 1E 00 00 */ stw r0, 0(r30)
-/* 80059FE4 38 00 00 00 */ li r0, 0
-/* 80059FE8 90 1E 00 04 */ stw r0, 4(r30)
-/* 80059FEC 90 1E 00 08 */ stw r0, 8(r30)
-/* 80059FF0 90 1E 00 0C */ stw r0, 0xc(r30)
-/* 80059FF4 3C 60 80 3B */ lis r3, __vt__19dKankyo_evil_Packet@ha /* 0x803A9AC0@ha */
-/* 80059FF8 38 03 9A C0 */ addi r0, r3, __vt__19dKankyo_evil_Packet@l /* 0x803A9AC0@l */
-/* 80059FFC 90 1E 00 00 */ stw r0, 0(r30)
-/* 8005A000 38 64 00 1C */ addi r3, r4, 0x1c
-/* 8005A004 3C 80 80 05 */ lis r4, __ct__11EF_EVIL_EFFFv@ha /* 0x800570A8@ha */
-/* 8005A008 38 84 70 A8 */ addi r4, r4, __ct__11EF_EVIL_EFFFv@l /* 0x800570A8@l */
-/* 8005A00C 3C A0 80 05 */ lis r5, __dt__11EF_EVIL_EFFFv@ha /* 0x8005706C@ha */
-/* 8005A010 38 A5 70 6C */ addi r5, r5, __dt__11EF_EVIL_EFFFv@l /* 0x8005706C@l */
-/* 8005A014 38 C0 00 44 */ li r6, 0x44
-/* 8005A018 38 E0 07 D0 */ li r7, 0x7d0
-/* 8005A01C 48 30 7D 45 */ bl __construct_array
-lbl_8005A020:
-/* 8005A020 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A024 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A028 93 C3 10 58 */ stw r30, 0x1058(r3)
-/* 8005A02C 28 1E 00 00 */ cmplwi r30, 0
-/* 8005A030 41 82 00 70 */ beq lbl_8005A0A0
-/* 8005A034 48 01 38 E1 */ bl dKyr_evil_init__Fv
-/* 8005A038 48 01 39 CD */ bl dKyr_evil_move__Fv
-/* 8005A03C 88 7F 10 50 */ lbz r3, 0x1050(r31)
-/* 8005A040 38 03 00 01 */ addi r0, r3, 1
-/* 8005A044 98 1F 10 50 */ stb r0, 0x1050(r31)
-/* 8005A048 48 00 00 58 */ b lbl_8005A0A0
-lbl_8005A04C:
-/* 8005A04C 48 01 39 B9 */ bl dKyr_evil_move__Fv
-/* 8005A050 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 8005A054 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005A058 80 1E 10 54 */ lwz r0, 0x1054(r30)
-/* 8005A05C 2C 00 00 00 */ cmpwi r0, 0
-/* 8005A060 40 82 00 40 */ bne lbl_8005A0A0
-/* 8005A064 80 7E 10 58 */ lwz r3, 0x1058(r30)
-/* 8005A068 80 03 00 10 */ lwz r0, 0x10(r3)
-/* 8005A06C 2C 00 00 00 */ cmpwi r0, 0
-/* 8005A070 40 82 00 30 */ bne lbl_8005A0A0
-/* 8005A074 38 00 00 00 */ li r0, 0
-/* 8005A078 98 1F 10 50 */ stb r0, 0x1050(r31)
-/* 8005A07C 28 03 00 00 */ cmplwi r3, 0
-/* 8005A080 41 82 00 18 */ beq lbl_8005A098
-/* 8005A084 38 80 00 01 */ li r4, 1
-/* 8005A088 81 83 00 00 */ lwz r12, 0(r3)
-/* 8005A08C 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 8005A090 7D 89 03 A6 */ mtctr r12
-/* 8005A094 4E 80 04 21 */ bctrl
-lbl_8005A098:
-/* 8005A098 38 00 00 00 */ li r0, 0
-/* 8005A09C 90 1E 10 58 */ stw r0, 0x1058(r30)
-lbl_8005A0A0:
-/* 8005A0A0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8005A0A4 83 C1 00 08 */ lwz r30, 8(r1)
-/* 8005A0A8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8005A0AC 7C 08 03 A6 */ mtlr r0
-/* 8005A0B0 38 21 00 10 */ addi r1, r1, 0x10
-/* 8005A0B4 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_housi__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_housi__Fv.s
deleted file mode 100644
index f00523104f..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_housi__Fv.s
+++ /dev/null
@@ -1,327 +0,0 @@
-lbl_80058F18:
-/* 80058F18 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80058F1C 7C 08 02 A6 */ mflr r0
-/* 80058F20 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80058F24 39 61 00 20 */ addi r11, r1, 0x20
-/* 80058F28 48 30 92 B5 */ bl _savegpr_29
-/* 80058F2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80058F30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80058F34 3B E3 4E 00 */ addi r31, r3, 0x4e00
-/* 80058F38 7F E3 FB 78 */ mr r3, r31
-/* 80058F3C 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058F40 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058F44 38 84 00 A9 */ addi r4, r4, 0xa9
-/* 80058F48 48 30 FA 4D */ bl strcmp
-/* 80058F4C 2C 03 00 00 */ cmpwi r3, 0
-/* 80058F50 40 82 00 18 */ bne lbl_80058F68
-/* 80058F54 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 80058F58 7C 00 07 75 */ extsb. r0, r0
-/* 80058F5C 41 82 00 0C */ beq lbl_80058F68
-/* 80058F60 2C 00 00 0B */ cmpwi r0, 0xb
-/* 80058F64 40 82 04 60 */ bne lbl_800593C4
-lbl_80058F68:
-/* 80058F68 7F E3 FB 78 */ mr r3, r31
-/* 80058F6C 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058F70 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058F74 38 84 00 B0 */ addi r4, r4, 0xb0
-/* 80058F78 48 30 FA 1D */ bl strcmp
-/* 80058F7C 2C 03 00 00 */ cmpwi r3, 0
-/* 80058F80 41 82 04 44 */ beq lbl_800593C4
-/* 80058F84 7F E3 FB 78 */ mr r3, r31
-/* 80058F88 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058F8C 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058F90 38 84 00 B8 */ addi r4, r4, 0xb8
-/* 80058F94 48 30 FA 01 */ bl strcmp
-/* 80058F98 2C 03 00 00 */ cmpwi r3, 0
-/* 80058F9C 41 82 04 28 */ beq lbl_800593C4
-/* 80058FA0 7F E3 FB 78 */ mr r3, r31
-/* 80058FA4 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058FA8 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058FAC 38 84 00 C0 */ addi r4, r4, 0xc0
-/* 80058FB0 48 30 F9 E5 */ bl strcmp
-/* 80058FB4 2C 03 00 00 */ cmpwi r3, 0
-/* 80058FB8 40 82 00 08 */ bne lbl_80058FC0
-/* 80058FBC 48 00 04 08 */ b lbl_800593C4
-lbl_80058FC0:
-/* 80058FC0 48 15 35 BD */ bl dKy_darkworld_check__Fv
-/* 80058FC4 54 60 06 3E */ clrlwi r0, r3, 0x18
-/* 80058FC8 28 00 00 01 */ cmplwi r0, 1
-/* 80058FCC 41 82 00 40 */ beq lbl_8005900C
-/* 80058FD0 7F E3 FB 78 */ mr r3, r31
-/* 80058FD4 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058FD8 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058FDC 38 84 00 C8 */ addi r4, r4, 0xc8
-/* 80058FE0 48 30 F9 B5 */ bl strcmp
-/* 80058FE4 2C 03 00 00 */ cmpwi r3, 0
-/* 80058FE8 40 82 01 34 */ bne lbl_8005911C
-/* 80058FEC 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13)
-/* 80058FF0 2C 00 00 01 */ cmpwi r0, 1
-/* 80058FF4 40 82 01 28 */ bne lbl_8005911C
-/* 80058FF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80058FFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80059000 88 03 4E 0B */ lbz r0, 0x4e0b(r3)
-/* 80059004 2C 00 00 09 */ cmpwi r0, 9
-/* 80059008 40 82 01 14 */ bne lbl_8005911C
-lbl_8005900C:
-/* 8005900C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059010 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059014 88 1E 12 D2 */ lbz r0, 0x12d2(r30)
-/* 80059018 28 00 00 00 */ cmplwi r0, 0
-/* 8005901C 41 82 01 00 */ beq lbl_8005911C
-/* 80059020 38 00 00 00 */ li r0, 0
-/* 80059024 98 1E 0E A9 */ stb r0, 0xea9(r30)
-/* 80059028 38 00 00 C8 */ li r0, 0xc8
-/* 8005902C 90 1E 0E AC */ stw r0, 0xeac(r30)
-/* 80059030 7F E3 FB 78 */ mr r3, r31
-/* 80059034 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80059038 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005903C 38 84 00 D0 */ addi r4, r4, 0xd0
-/* 80059040 48 30 F9 55 */ bl strcmp
-/* 80059044 2C 03 00 00 */ cmpwi r3, 0
-/* 80059048 40 82 00 24 */ bne lbl_8005906C
-/* 8005904C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80059050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80059054 88 03 4E 0A */ lbz r0, 0x4e0a(r3)
-/* 80059058 2C 00 00 01 */ cmpwi r0, 1
-/* 8005905C 40 82 00 10 */ bne lbl_8005906C
-/* 80059060 88 03 4E 0B */ lbz r0, 0x4e0b(r3)
-/* 80059064 2C 00 00 0D */ cmpwi r0, 0xd
-/* 80059068 41 82 00 AC */ beq lbl_80059114
-lbl_8005906C:
-/* 8005906C 7F E3 FB 78 */ mr r3, r31
-/* 80059070 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80059074 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80059078 38 84 00 D8 */ addi r4, r4, 0xd8
-/* 8005907C 48 30 F9 19 */ bl strcmp
-/* 80059080 2C 03 00 00 */ cmpwi r3, 0
-/* 80059084 40 82 00 24 */ bne lbl_800590A8
-/* 80059088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8005908C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80059090 88 03 4E 0A */ lbz r0, 0x4e0a(r3)
-/* 80059094 7C 00 07 75 */ extsb. r0, r0
-/* 80059098 40 82 00 10 */ bne lbl_800590A8
-/* 8005909C 88 03 4E 0B */ lbz r0, 0x4e0b(r3)
-/* 800590A0 2C 00 00 08 */ cmpwi r0, 8
-/* 800590A4 41 82 00 70 */ beq lbl_80059114
-lbl_800590A8:
-/* 800590A8 7F E3 FB 78 */ mr r3, r31
-/* 800590AC 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800590B0 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800590B4 38 84 00 D0 */ addi r4, r4, 0xd0
-/* 800590B8 48 30 F8 DD */ bl strcmp
-/* 800590BC 2C 03 00 00 */ cmpwi r3, 0
-/* 800590C0 40 82 00 24 */ bne lbl_800590E4
-/* 800590C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800590C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800590CC 88 03 4E 0A */ lbz r0, 0x4e0a(r3)
-/* 800590D0 7C 00 07 75 */ extsb. r0, r0
-/* 800590D4 40 82 00 10 */ bne lbl_800590E4
-/* 800590D8 88 03 4E 0B */ lbz r0, 0x4e0b(r3)
-/* 800590DC 2C 00 00 09 */ cmpwi r0, 9
-/* 800590E0 41 82 00 34 */ beq lbl_80059114
-lbl_800590E4:
-/* 800590E4 7F E3 FB 78 */ mr r3, r31
-/* 800590E8 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800590EC 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800590F0 38 84 00 C8 */ addi r4, r4, 0xc8
-/* 800590F4 48 30 F8 A1 */ bl strcmp
-/* 800590F8 2C 03 00 00 */ cmpwi r3, 0
-/* 800590FC 40 82 00 20 */ bne lbl_8005911C
-/* 80059100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80059104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80059108 88 03 4E 0B */ lbz r0, 0x4e0b(r3)
-/* 8005910C 2C 00 00 09 */ cmpwi r0, 9
-/* 80059110 40 82 00 0C */ bne lbl_8005911C
-lbl_80059114:
-/* 80059114 38 00 00 00 */ li r0, 0
-/* 80059118 90 1E 0E AC */ stw r0, 0xeac(r30)
-lbl_8005911C:
-/* 8005911C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059120 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059124 88 1E 0E A8 */ lbz r0, 0xea8(r30)
-/* 80059128 2C 00 00 01 */ cmpwi r0, 1
-/* 8005912C 41 82 02 2C */ beq lbl_80059358
-/* 80059130 40 80 02 94 */ bge lbl_800593C4
-/* 80059134 2C 00 00 00 */ cmpwi r0, 0
-/* 80059138 40 80 00 08 */ bge lbl_80059140
-/* 8005913C 48 00 02 88 */ b lbl_800593C4
-lbl_80059140:
-/* 80059140 80 1E 0E AC */ lwz r0, 0xeac(r30)
-/* 80059144 2C 00 00 00 */ cmpwi r0, 0
-/* 80059148 41 82 02 7C */ beq lbl_800593C4
-/* 8005914C 38 60 5D F0 */ li r3, 0x5df0
-/* 80059150 38 80 00 20 */ li r4, 0x20
-/* 80059154 48 27 5B 21 */ bl __nw__FUli
-/* 80059158 7C 7D 1B 79 */ or. r29, r3, r3
-/* 8005915C 41 82 00 50 */ beq lbl_800591AC
-/* 80059160 7F A4 EB 78 */ mr r4, r29
-/* 80059164 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80059168 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 8005916C 90 1D 00 00 */ stw r0, 0(r29)
-/* 80059170 38 00 00 00 */ li r0, 0
-/* 80059174 90 1D 00 04 */ stw r0, 4(r29)
-/* 80059178 90 1D 00 08 */ stw r0, 8(r29)
-/* 8005917C 90 1D 00 0C */ stw r0, 0xc(r29)
-/* 80059180 3C 60 80 3B */ lis r3, __vt__20dKankyo_housi_Packet@ha /* 0x803A9B10@ha */
-/* 80059184 38 03 9B 10 */ addi r0, r3, __vt__20dKankyo_housi_Packet@l /* 0x803A9B10@l */
-/* 80059188 90 1D 00 00 */ stw r0, 0(r29)
-/* 8005918C 38 64 00 20 */ addi r3, r4, 0x20
-/* 80059190 3C 80 80 05 */ lis r4, __ct__9HOUSI_EFFFv@ha /* 0x80056EE4@ha */
-/* 80059194 38 84 6E E4 */ addi r4, r4, __ct__9HOUSI_EFFFv@l /* 0x80056EE4@l */
-/* 80059198 3C A0 80 05 */ lis r5, __dt__9HOUSI_EFFFv@ha /* 0x80056EA8@ha */
-/* 8005919C 38 A5 6E A8 */ addi r5, r5, __dt__9HOUSI_EFFFv@l /* 0x80056EA8@l */
-/* 800591A0 38 C0 00 50 */ li r6, 0x50
-/* 800591A4 38 E0 01 2C */ li r7, 0x12c
-/* 800591A8 48 30 8B B9 */ bl __construct_array
-lbl_800591AC:
-/* 800591AC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800591B0 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800591B4 93 BF 0E B0 */ stw r29, 0xeb0(r31)
-/* 800591B8 28 1D 00 00 */ cmplwi r29, 0
-/* 800591BC 41 82 02 08 */ beq lbl_800593C4
-/* 800591C0 48 15 33 BD */ bl dKy_darkworld_check__Fv
-/* 800591C4 54 60 06 3E */ clrlwi r0, r3, 0x18
-/* 800591C8 28 00 00 01 */ cmplwi r0, 1
-/* 800591CC 40 82 00 38 */ bne lbl_80059204
-/* 800591D0 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800591D4 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800591D8 38 63 00 82 */ addi r3, r3, 0x82
-/* 800591DC 38 80 00 5E */ li r4, 0x5e
-/* 800591E0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800591E4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800591E8 3C A5 00 02 */ addis r5, r5, 2
-/* 800591EC 38 C0 00 80 */ li r6, 0x80
-/* 800591F0 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 800591F4 4B FE 30 F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800591F8 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 800591FC 90 64 00 1C */ stw r3, 0x1c(r4)
-/* 80059200 48 00 01 08 */ b lbl_80059308
-lbl_80059204:
-/* 80059204 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059208 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005920C 88 03 0E A9 */ lbz r0, 0xea9(r3)
-/* 80059210 28 00 00 02 */ cmplwi r0, 2
-/* 80059214 40 82 00 88 */ bne lbl_8005929C
-/* 80059218 88 03 12 FE */ lbz r0, 0x12fe(r3)
-/* 8005921C 28 00 00 03 */ cmplwi r0, 3
-/* 80059220 40 82 00 20 */ bne lbl_80059240
-/* 80059224 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80059228 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005922C 38 63 00 E0 */ addi r3, r3, 0xe0
-/* 80059230 4B FD 62 05 */ bl dComIfG_getStageRes__FPCc
-/* 80059234 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 80059238 90 64 00 1C */ stw r3, 0x1c(r4)
-/* 8005923C 48 00 00 1C */ b lbl_80059258
-lbl_80059240:
-/* 80059240 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80059244 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80059248 38 63 00 F1 */ addi r3, r3, 0xf1
-/* 8005924C 4B FD 61 E9 */ bl dComIfG_getStageRes__FPCc
-/* 80059250 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 80059254 90 64 00 1C */ stw r3, 0x1c(r4)
-lbl_80059258:
-/* 80059258 80 7F 0E B0 */ lwz r3, 0xeb0(r31)
-/* 8005925C 80 03 00 1C */ lwz r0, 0x1c(r3)
-/* 80059260 28 00 00 00 */ cmplwi r0, 0
-/* 80059264 40 82 00 A4 */ bne lbl_80059308
-/* 80059268 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005926C 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80059270 38 63 00 82 */ addi r3, r3, 0x82
-/* 80059274 38 80 00 55 */ li r4, 0x55
-/* 80059278 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8005927C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80059280 3C A5 00 02 */ addis r5, r5, 2
-/* 80059284 38 C0 00 80 */ li r6, 0x80
-/* 80059288 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 8005928C 4B FE 30 61 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80059290 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 80059294 90 64 00 1C */ stw r3, 0x1c(r4)
-/* 80059298 48 00 00 70 */ b lbl_80059308
-lbl_8005929C:
-/* 8005929C 28 00 00 00 */ cmplwi r0, 0
-/* 800592A0 40 82 00 38 */ bne lbl_800592D8
-/* 800592A4 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800592A8 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800592AC 38 63 00 82 */ addi r3, r3, 0x82
-/* 800592B0 38 80 00 55 */ li r4, 0x55
-/* 800592B4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800592B8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800592BC 3C A5 00 02 */ addis r5, r5, 2
-/* 800592C0 38 C0 00 80 */ li r6, 0x80
-/* 800592C4 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 800592C8 4B FE 30 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800592CC 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 800592D0 90 64 00 1C */ stw r3, 0x1c(r4)
-/* 800592D4 48 00 00 34 */ b lbl_80059308
-lbl_800592D8:
-/* 800592D8 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800592DC 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800592E0 38 63 00 82 */ addi r3, r3, 0x82
-/* 800592E4 38 80 00 56 */ li r4, 0x56
-/* 800592E8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800592EC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800592F0 3C A5 00 02 */ addis r5, r5, 2
-/* 800592F4 38 C0 00 80 */ li r6, 0x80
-/* 800592F8 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 800592FC 4B FE 2F F1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80059300 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 80059304 90 64 00 1C */ stw r3, 0x1c(r4)
-lbl_80059308:
-/* 80059308 C0 02 86 E0 */ lfs f0, lit_4378(r2)
-/* 8005930C 80 7F 0E B0 */ lwz r3, 0xeb0(r31)
-/* 80059310 D0 03 5D E8 */ stfs f0, 0x5de8(r3)
-/* 80059314 80 7F 0E B0 */ lwz r3, 0xeb0(r31)
-/* 80059318 D0 03 00 10 */ stfs f0, 0x10(r3)
-/* 8005931C D0 03 00 14 */ stfs f0, 0x14(r3)
-/* 80059320 D0 03 00 18 */ stfs f0, 0x18(r3)
-/* 80059324 38 60 00 00 */ li r3, 0
-/* 80059328 7C 65 1B 78 */ mr r5, r3
-/* 8005932C 38 00 01 2C */ li r0, 0x12c
-/* 80059330 7C 09 03 A6 */ mtctr r0
-lbl_80059334:
-/* 80059334 80 9F 0E B0 */ lwz r4, 0xeb0(r31)
-/* 80059338 38 03 00 20 */ addi r0, r3, 0x20
-/* 8005933C 7C A4 01 AE */ stbx r5, r4, r0
-/* 80059340 38 63 00 50 */ addi r3, r3, 0x50
-/* 80059344 42 00 FF F0 */ bdnz lbl_80059334
-/* 80059348 48 00 55 B1 */ bl dKyr_housi_move__Fv
-/* 8005934C 38 00 00 01 */ li r0, 1
-/* 80059350 98 1E 0E A8 */ stb r0, 0xea8(r30)
-/* 80059354 48 00 00 70 */ b lbl_800593C4
-lbl_80059358:
-/* 80059358 80 1E 0E AC */ lwz r0, 0xeac(r30)
-/* 8005935C 2C 00 00 00 */ cmpwi r0, 0
-/* 80059360 40 82 00 4C */ bne lbl_800593AC
-/* 80059364 80 7E 0E B0 */ lwz r3, 0xeb0(r30)
-/* 80059368 C0 23 5D E8 */ lfs f1, 0x5de8(r3)
-/* 8005936C C0 02 86 E0 */ lfs f0, lit_4378(r2)
-/* 80059370 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80059374 4C 40 13 82 */ cror 2, 0, 2
-/* 80059378 40 82 00 34 */ bne lbl_800593AC
-/* 8005937C 38 00 00 00 */ li r0, 0
-/* 80059380 98 1E 0E A8 */ stb r0, 0xea8(r30)
-/* 80059384 28 03 00 00 */ cmplwi r3, 0
-/* 80059388 41 82 00 18 */ beq lbl_800593A0
-/* 8005938C 38 80 00 01 */ li r4, 1
-/* 80059390 81 83 00 00 */ lwz r12, 0(r3)
-/* 80059394 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80059398 7D 89 03 A6 */ mtctr r12
-/* 8005939C 4E 80 04 21 */ bctrl
-lbl_800593A0:
-/* 800593A0 38 00 00 00 */ li r0, 0
-/* 800593A4 90 1E 0E B0 */ stw r0, 0xeb0(r30)
-/* 800593A8 48 00 00 1C */ b lbl_800593C4
-lbl_800593AC:
-/* 800593AC 48 00 55 4D */ bl dKyr_housi_move__Fv
-/* 800593B0 48 15 31 CD */ bl dKy_darkworld_check__Fv
-/* 800593B4 54 60 06 3F */ clrlwi. r0, r3, 0x18
-/* 800593B8 40 82 00 0C */ bne lbl_800593C4
-/* 800593BC 38 00 00 00 */ li r0, 0
-/* 800593C0 90 1E 0E AC */ stw r0, 0xeac(r30)
-lbl_800593C4:
-/* 800593C4 39 61 00 20 */ addi r11, r1, 0x20
-/* 800593C8 48 30 8E 61 */ bl _restgpr_29
-/* 800593CC 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 800593D0 7C 08 03 A6 */ mtlr r0
-/* 800593D4 38 21 00 20 */ addi r1, r1, 0x20
-/* 800593D8 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_moya__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_moya__Fv.s
deleted file mode 100644
index f770da6356..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_moya__Fv.s
+++ /dev/null
@@ -1,114 +0,0 @@
-lbl_80059580:
-/* 80059580 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80059584 7C 08 02 A6 */ mflr r0
-/* 80059588 90 01 00 24 */ stw r0, 0x24(r1)
-/* 8005958C 39 61 00 20 */ addi r11, r1, 0x20
-/* 80059590 48 30 8C 4D */ bl _savegpr_29
-/* 80059594 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059598 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005959C 88 1F 0E B4 */ lbz r0, 0xeb4(r31)
-/* 800595A0 2C 00 00 01 */ cmpwi r0, 1
-/* 800595A4 41 82 01 08 */ beq lbl_800596AC
-/* 800595A8 40 80 01 68 */ bge lbl_80059710
-/* 800595AC 2C 00 00 00 */ cmpwi r0, 0
-/* 800595B0 40 80 00 08 */ bge lbl_800595B8
-/* 800595B4 48 00 01 5C */ b lbl_80059710
-lbl_800595B8:
-/* 800595B8 80 1F 0E B8 */ lwz r0, 0xeb8(r31)
-/* 800595BC 2C 00 00 00 */ cmpwi r0, 0
-/* 800595C0 41 82 01 50 */ beq lbl_80059710
-/* 800595C4 38 60 0B 08 */ li r3, 0xb08
-/* 800595C8 38 80 00 20 */ li r4, 0x20
-/* 800595CC 48 27 56 A9 */ bl __nw__FUli
-/* 800595D0 7C 7D 1B 79 */ or. r29, r3, r3
-/* 800595D4 41 82 00 50 */ beq lbl_80059624
-/* 800595D8 7F A4 EB 78 */ mr r4, r29
-/* 800595DC 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 800595E0 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 800595E4 90 1D 00 00 */ stw r0, 0(r29)
-/* 800595E8 38 00 00 00 */ li r0, 0
-/* 800595EC 90 1D 00 04 */ stw r0, 4(r29)
-/* 800595F0 90 1D 00 08 */ stw r0, 8(r29)
-/* 800595F4 90 1D 00 0C */ stw r0, 0xc(r29)
-/* 800595F8 3C 60 80 3B */ lis r3, __vt__20dKankyo_cloud_Packet@ha /* 0x803A9B24@ha */
-/* 800595FC 38 03 9B 24 */ addi r0, r3, __vt__20dKankyo_cloud_Packet@l /* 0x803A9B24@l */
-/* 80059600 90 1D 00 00 */ stw r0, 0(r29)
-/* 80059604 38 64 00 18 */ addi r3, r4, 0x18
-/* 80059608 3C 80 80 05 */ lis r4, __ct__9CLOUD_EFFFv@ha /* 0x80056E74@ha */
-/* 8005960C 38 84 6E 74 */ addi r4, r4, __ct__9CLOUD_EFFFv@l /* 0x80056E74@l */
-/* 80059610 3C A0 80 05 */ lis r5, __dt__9CLOUD_EFFFv@ha /* 0x80056E38@ha */
-/* 80059614 38 A5 6E 38 */ addi r5, r5, __dt__9CLOUD_EFFFv@l /* 0x80056E38@l */
-/* 80059618 38 C0 00 38 */ li r6, 0x38
-/* 8005961C 38 E0 00 32 */ li r7, 0x32
-/* 80059620 48 30 87 41 */ bl __construct_array
-lbl_80059624:
-/* 80059624 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059628 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005962C 93 BE 0E C0 */ stw r29, 0xec0(r30)
-/* 80059630 28 1D 00 00 */ cmplwi r29, 0
-/* 80059634 41 82 00 DC */ beq lbl_80059710
-/* 80059638 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005963C 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80059640 38 63 00 82 */ addi r3, r3, 0x82
-/* 80059644 38 80 00 53 */ li r4, 0x53
-/* 80059648 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8005964C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80059650 3C A5 00 02 */ addis r5, r5, 2
-/* 80059654 38 C0 00 80 */ li r6, 0x80
-/* 80059658 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 8005965C 4B FE 2C 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80059660 80 9E 0E C0 */ lwz r4, 0xec0(r30)
-/* 80059664 90 64 00 10 */ stw r3, 0x10(r4)
-/* 80059668 38 60 00 00 */ li r3, 0
-/* 8005966C 7C 65 1B 78 */ mr r5, r3
-/* 80059670 38 00 00 32 */ li r0, 0x32
-/* 80059674 7C 09 03 A6 */ mtctr r0
-lbl_80059678:
-/* 80059678 80 9E 0E C0 */ lwz r4, 0xec0(r30)
-/* 8005967C 38 03 00 18 */ addi r0, r3, 0x18
-/* 80059680 7C A4 01 AE */ stbx r5, r4, r0
-/* 80059684 38 63 00 38 */ addi r3, r3, 0x38
-/* 80059688 42 00 FF F0 */ bdnz lbl_80059678
-/* 8005968C 38 00 00 00 */ li r0, 0
-/* 80059690 80 7E 0E C0 */ lwz r3, 0xec0(r30)
-/* 80059694 90 03 00 14 */ stw r0, 0x14(r3)
-/* 80059698 48 00 7D A1 */ bl cloud_shadow_move__Fv
-/* 8005969C 88 7F 0E B4 */ lbz r3, 0xeb4(r31)
-/* 800596A0 38 03 00 01 */ addi r0, r3, 1
-/* 800596A4 98 1F 0E B4 */ stb r0, 0xeb4(r31)
-/* 800596A8 48 00 00 68 */ b lbl_80059710
-lbl_800596AC:
-/* 800596AC 88 1F 0E B5 */ lbz r0, 0xeb5(r31)
-/* 800596B0 28 00 00 00 */ cmplwi r0, 0
-/* 800596B4 40 82 00 08 */ bne lbl_800596BC
-/* 800596B8 48 00 14 39 */ bl dKyw_get_wind_pow__Fv
-lbl_800596BC:
-/* 800596BC 48 00 7D 7D */ bl cloud_shadow_move__Fv
-/* 800596C0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800596C4 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800596C8 80 1E 0E B8 */ lwz r0, 0xeb8(r30)
-/* 800596CC 2C 00 00 00 */ cmpwi r0, 0
-/* 800596D0 40 82 00 40 */ bne lbl_80059710
-/* 800596D4 80 7E 0E C0 */ lwz r3, 0xec0(r30)
-/* 800596D8 80 03 00 14 */ lwz r0, 0x14(r3)
-/* 800596DC 2C 00 00 00 */ cmpwi r0, 0
-/* 800596E0 40 82 00 30 */ bne lbl_80059710
-/* 800596E4 38 00 00 00 */ li r0, 0
-/* 800596E8 98 1F 0E B4 */ stb r0, 0xeb4(r31)
-/* 800596EC 28 03 00 00 */ cmplwi r3, 0
-/* 800596F0 41 82 00 18 */ beq lbl_80059708
-/* 800596F4 38 80 00 01 */ li r4, 1
-/* 800596F8 81 83 00 00 */ lwz r12, 0(r3)
-/* 800596FC 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80059700 7D 89 03 A6 */ mtctr r12
-/* 80059704 4E 80 04 21 */ bctrl
-lbl_80059708:
-/* 80059708 38 00 00 00 */ li r0, 0
-/* 8005970C 90 1E 0E C0 */ stw r0, 0xec0(r30)
-lbl_80059710:
-/* 80059710 39 61 00 20 */ addi r11, r1, 0x20
-/* 80059714 48 30 8B 15 */ bl _restgpr_29
-/* 80059718 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8005971C 7C 08 03 A6 */ mtlr r0
-/* 80059720 38 21 00 20 */ addi r1, r1, 0x20
-/* 80059724 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_mud__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_mud__Fv.s
deleted file mode 100644
index f1fd87958a..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_mud__Fv.s
+++ /dev/null
@@ -1,85 +0,0 @@
-lbl_80059E38:
-/* 80059E38 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80059E3C 7C 08 02 A6 */ mflr r0
-/* 80059E40 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80059E44 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80059E48 93 C1 00 08 */ stw r30, 8(r1)
-/* 80059E4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059E50 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059E54 88 1F 10 44 */ lbz r0, 0x1044(r31)
-/* 80059E58 2C 00 00 01 */ cmpwi r0, 1
-/* 80059E5C 41 82 00 AC */ beq lbl_80059F08
-/* 80059E60 40 80 00 FC */ bge lbl_80059F5C
-/* 80059E64 2C 00 00 00 */ cmpwi r0, 0
-/* 80059E68 40 80 00 08 */ bge lbl_80059E70
-/* 80059E6C 48 00 00 F0 */ b lbl_80059F5C
-lbl_80059E70:
-/* 80059E70 80 1F 10 48 */ lwz r0, 0x1048(r31)
-/* 80059E74 2C 00 00 00 */ cmpwi r0, 0
-/* 80059E78 41 82 00 E4 */ beq lbl_80059F5C
-/* 80059E7C 38 60 1C 40 */ li r3, 0x1c40
-/* 80059E80 38 80 00 20 */ li r4, 0x20
-/* 80059E84 48 27 4D F1 */ bl __nw__FUli
-/* 80059E88 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80059E8C 41 82 00 50 */ beq lbl_80059EDC
-/* 80059E90 7F C4 F3 78 */ mr r4, r30
-/* 80059E94 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80059E98 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80059E9C 90 1E 00 00 */ stw r0, 0(r30)
-/* 80059EA0 38 00 00 00 */ li r0, 0
-/* 80059EA4 90 1E 00 04 */ stw r0, 4(r30)
-/* 80059EA8 90 1E 00 08 */ stw r0, 8(r30)
-/* 80059EAC 90 1E 00 0C */ stw r0, 0xc(r30)
-/* 80059EB0 3C 60 80 3B */ lis r3, __vt__18dKankyo_mud_Packet@ha /* 0x803A9AD4@ha */
-/* 80059EB4 38 03 9A D4 */ addi r0, r3, __vt__18dKankyo_mud_Packet@l /* 0x803A9AD4@l */
-/* 80059EB8 90 1E 00 00 */ stw r0, 0(r30)
-/* 80059EBC 38 64 00 18 */ addi r3, r4, 0x18
-/* 80059EC0 3C 80 80 05 */ lis r4, __ct__10EF_MUD_EFFFv@ha /* 0x80057038@ha */
-/* 80059EC4 38 84 70 38 */ addi r4, r4, __ct__10EF_MUD_EFFFv@l /* 0x80057038@l */
-/* 80059EC8 3C A0 80 05 */ lis r5, __dt__10EF_MUD_EFFFv@ha /* 0x80056FFC@ha */
-/* 80059ECC 38 A5 6F FC */ addi r5, r5, __dt__10EF_MUD_EFFFv@l /* 0x80056FFC@l */
-/* 80059ED0 38 C0 00 48 */ li r6, 0x48
-/* 80059ED4 38 E0 00 64 */ li r7, 0x64
-/* 80059ED8 48 30 7E 89 */ bl __construct_array
-lbl_80059EDC:
-/* 80059EDC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059EE0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059EE4 93 C3 10 4C */ stw r30, 0x104c(r3)
-/* 80059EE8 28 1E 00 00 */ cmplwi r30, 0
-/* 80059EEC 41 82 00 70 */ beq lbl_80059F5C
-/* 80059EF0 48 01 28 A1 */ bl dKyr_mud_init__Fv
-/* 80059EF4 48 01 29 69 */ bl dKyr_mud_move__Fv
-/* 80059EF8 88 7F 10 44 */ lbz r3, 0x1044(r31)
-/* 80059EFC 38 03 00 01 */ addi r0, r3, 1
-/* 80059F00 98 1F 10 44 */ stb r0, 0x1044(r31)
-/* 80059F04 48 00 00 58 */ b lbl_80059F5C
-lbl_80059F08:
-/* 80059F08 48 01 29 55 */ bl dKyr_mud_move__Fv
-/* 80059F0C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059F10 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059F14 80 1E 10 48 */ lwz r0, 0x1048(r30)
-/* 80059F18 2C 00 00 00 */ cmpwi r0, 0
-/* 80059F1C 40 82 00 40 */ bne lbl_80059F5C
-/* 80059F20 80 7E 10 4C */ lwz r3, 0x104c(r30)
-/* 80059F24 80 03 00 10 */ lwz r0, 0x10(r3)
-/* 80059F28 2C 00 00 00 */ cmpwi r0, 0
-/* 80059F2C 40 82 00 30 */ bne lbl_80059F5C
-/* 80059F30 38 00 00 00 */ li r0, 0
-/* 80059F34 98 1F 10 44 */ stb r0, 0x1044(r31)
-/* 80059F38 28 03 00 00 */ cmplwi r3, 0
-/* 80059F3C 41 82 00 18 */ beq lbl_80059F54
-/* 80059F40 38 80 00 01 */ li r4, 1
-/* 80059F44 81 83 00 00 */ lwz r12, 0(r3)
-/* 80059F48 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80059F4C 7D 89 03 A6 */ mtctr r12
-/* 80059F50 4E 80 04 21 */ bctrl
-lbl_80059F54:
-/* 80059F54 38 00 00 00 */ li r0, 0
-/* 80059F58 90 1E 10 4C */ stw r0, 0x104c(r30)
-lbl_80059F5C:
-/* 80059F5C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80059F60 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80059F64 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80059F68 7C 08 03 A6 */ mtlr r0
-/* 80059F6C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80059F70 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_odour__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_odour__Fv.s
deleted file mode 100644
index 9eea3e6f30..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_odour__Fv.s
+++ /dev/null
@@ -1,115 +0,0 @@
-lbl_800593DC:
-/* 800593DC 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 800593E0 7C 08 02 A6 */ mflr r0
-/* 800593E4 90 01 00 24 */ stw r0, 0x24(r1)
-/* 800593E8 39 61 00 20 */ addi r11, r1, 0x20
-/* 800593EC 48 30 8D F1 */ bl _savegpr_29
-/* 800593F0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800593F4 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800593F8 88 1F 0F 20 */ lbz r0, 0xf20(r31)
-/* 800593FC 2C 00 00 01 */ cmpwi r0, 1
-/* 80059400 41 82 00 E8 */ beq lbl_800594E8
-/* 80059404 40 80 00 10 */ bge lbl_80059414
-/* 80059408 2C 00 00 00 */ cmpwi r0, 0
-/* 8005940C 40 80 00 14 */ bge lbl_80059420
-/* 80059410 48 00 01 58 */ b lbl_80059568
-lbl_80059414:
-/* 80059414 2C 00 00 03 */ cmpwi r0, 3
-/* 80059418 40 80 01 50 */ bge lbl_80059568
-/* 8005941C 48 00 01 18 */ b lbl_80059534
-lbl_80059420:
-/* 80059420 88 1F 0F 21 */ lbz r0, 0xf21(r31)
-/* 80059424 28 00 00 00 */ cmplwi r0, 0
-/* 80059428 41 82 01 40 */ beq lbl_80059568
-/* 8005942C 3C 60 00 01 */ lis r3, 0x0001 /* 0x00017728@ha */
-/* 80059430 38 63 77 28 */ addi r3, r3, 0x7728 /* 0x00017728@l */
-/* 80059434 38 80 00 20 */ li r4, 0x20
-/* 80059438 48 27 58 3D */ bl __nw__FUli
-/* 8005943C 7C 7D 1B 79 */ or. r29, r3, r3
-/* 80059440 41 82 00 50 */ beq lbl_80059490
-/* 80059444 7F A4 EB 78 */ mr r4, r29
-/* 80059448 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 8005944C 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80059450 90 1D 00 00 */ stw r0, 0(r29)
-/* 80059454 38 00 00 00 */ li r0, 0
-/* 80059458 90 1D 00 04 */ stw r0, 4(r29)
-/* 8005945C 90 1D 00 08 */ stw r0, 8(r29)
-/* 80059460 90 1D 00 0C */ stw r0, 0xc(r29)
-/* 80059464 3C 60 80 3B */ lis r3, __vt__20dKankyo_odour_Packet@ha /* 0x803A9AE8@ha */
-/* 80059468 38 03 9A E8 */ addi r0, r3, __vt__20dKankyo_odour_Packet@l /* 0x803A9AE8@l */
-/* 8005946C 90 1D 00 00 */ stw r0, 0(r29)
-/* 80059470 38 64 00 14 */ addi r3, r4, 0x14
-/* 80059474 3C 80 80 05 */ lis r4, __ct__12EF_ODOUR_EFFFv@ha /* 0x80056FC8@ha */
-/* 80059478 38 84 6F C8 */ addi r4, r4, __ct__12EF_ODOUR_EFFFv@l /* 0x80056FC8@l */
-/* 8005947C 3C A0 80 05 */ lis r5, __dt__12EF_ODOUR_EFFFv@ha /* 0x80056F8C@ha */
-/* 80059480 38 A5 6F 8C */ addi r5, r5, __dt__12EF_ODOUR_EFFFv@l /* 0x80056F8C@l */
-/* 80059484 38 C0 00 30 */ li r6, 0x30
-/* 80059488 38 E0 07 D0 */ li r7, 0x7d0
-/* 8005948C 48 30 88 D5 */ bl __construct_array
-lbl_80059490:
-/* 80059490 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80059494 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80059498 93 BE 0F 28 */ stw r29, 0xf28(r30)
-/* 8005949C 28 1D 00 00 */ cmplwi r29, 0
-/* 800594A0 41 82 00 C8 */ beq lbl_80059568
-/* 800594A4 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800594A8 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800594AC 38 63 00 82 */ addi r3, r3, 0x82
-/* 800594B0 38 80 00 53 */ li r4, 0x53
-/* 800594B4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800594B8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800594BC 3C A5 00 02 */ addis r5, r5, 2
-/* 800594C0 38 C0 00 80 */ li r6, 0x80
-/* 800594C4 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 800594C8 4B FE 2E 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800594CC 80 9E 0F 28 */ lwz r4, 0xf28(r30)
-/* 800594D0 90 64 00 10 */ stw r3, 0x10(r4)
-/* 800594D4 48 01 24 11 */ bl dKyr_odour_init__Fv
-/* 800594D8 48 01 24 4D */ bl dKyr_odour_move__Fv
-/* 800594DC 38 00 00 01 */ li r0, 1
-/* 800594E0 98 1F 0F 20 */ stb r0, 0xf20(r31)
-/* 800594E4 48 00 00 84 */ b lbl_80059568
-lbl_800594E8:
-/* 800594E8 88 1F 0F 21 */ lbz r0, 0xf21(r31)
-/* 800594EC 28 00 00 00 */ cmplwi r0, 0
-/* 800594F0 40 82 00 3C */ bne lbl_8005952C
-/* 800594F4 38 00 00 00 */ li r0, 0
-/* 800594F8 98 1F 0F 20 */ stb r0, 0xf20(r31)
-/* 800594FC 80 7F 0F 28 */ lwz r3, 0xf28(r31)
-/* 80059500 28 03 00 00 */ cmplwi r3, 0
-/* 80059504 41 82 00 64 */ beq lbl_80059568
-/* 80059508 41 82 00 18 */ beq lbl_80059520
-/* 8005950C 38 80 00 01 */ li r4, 1
-/* 80059510 81 83 00 00 */ lwz r12, 0(r3)
-/* 80059514 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80059518 7D 89 03 A6 */ mtctr r12
-/* 8005951C 4E 80 04 21 */ bctrl
-lbl_80059520:
-/* 80059520 38 00 00 00 */ li r0, 0
-/* 80059524 90 1F 0F 28 */ stw r0, 0xf28(r31)
-/* 80059528 48 00 00 40 */ b lbl_80059568
-lbl_8005952C:
-/* 8005952C 48 01 23 F9 */ bl dKyr_odour_move__Fv
-/* 80059530 48 00 00 38 */ b lbl_80059568
-lbl_80059534:
-/* 80059534 38 00 00 00 */ li r0, 0
-/* 80059538 98 1F 0F 21 */ stb r0, 0xf21(r31)
-/* 8005953C 98 1F 0F 20 */ stb r0, 0xf20(r31)
-/* 80059540 80 7F 0F 28 */ lwz r3, 0xf28(r31)
-/* 80059544 28 03 00 00 */ cmplwi r3, 0
-/* 80059548 41 82 00 18 */ beq lbl_80059560
-/* 8005954C 38 80 00 01 */ li r4, 1
-/* 80059550 81 83 00 00 */ lwz r12, 0(r3)
-/* 80059554 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80059558 7D 89 03 A6 */ mtctr r12
-/* 8005955C 4E 80 04 21 */ bctrl
-lbl_80059560:
-/* 80059560 38 00 00 00 */ li r0, 0
-/* 80059564 90 1F 0F 28 */ stw r0, 0xf28(r31)
-lbl_80059568:
-/* 80059568 39 61 00 20 */ addi r11, r1, 0x20
-/* 8005956C 48 30 8C BD */ bl _restgpr_29
-/* 80059570 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80059574 7C 08 03 A6 */ mtlr r0
-/* 80059578 38 21 00 20 */ addi r1, r1, 0x20
-/* 8005957C 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_snow__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_snow__Fv.s
deleted file mode 100644
index 7b377a4845..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_snow__Fv.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_80058B00:
-/* 80058B00 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80058B04 7C 08 02 A6 */ mflr r0
-/* 80058B08 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80058B0C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80058B10 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058B14 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058B18 88 1F 0E 88 */ lbz r0, 0xe88(r31)
-/* 80058B1C 2C 00 00 01 */ cmpwi r0, 1
-/* 80058B20 41 82 00 54 */ beq lbl_80058B74
-/* 80058B24 40 80 00 54 */ bge lbl_80058B78
-/* 80058B28 2C 00 00 00 */ cmpwi r0, 0
-/* 80058B2C 40 80 00 08 */ bge lbl_80058B34
-/* 80058B30 48 00 00 48 */ b lbl_80058B78
-lbl_80058B34:
-/* 80058B34 80 1F 0E 8C */ lwz r0, 0xe8c(r31)
-/* 80058B38 2C 00 00 00 */ cmpwi r0, 0
-/* 80058B3C 40 82 00 10 */ bne lbl_80058B4C
-/* 80058B40 88 1F 0E 90 */ lbz r0, 0xe90(r31)
-/* 80058B44 28 00 00 00 */ cmplwi r0, 0
-/* 80058B48 41 82 00 30 */ beq lbl_80058B78
-lbl_80058B4C:
-/* 80058B4C 48 00 70 91 */ bl dKyr_snow_init__Fv
-/* 80058B50 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058B54 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058B58 80 03 0E 94 */ lwz r0, 0xe94(r3)
-/* 80058B5C 28 00 00 00 */ cmplwi r0, 0
-/* 80058B60 41 82 00 18 */ beq lbl_80058B78
-/* 80058B64 48 00 71 E5 */ bl dKyr_snow_move__Fv
-/* 80058B68 38 00 00 01 */ li r0, 1
-/* 80058B6C 98 1F 0E 88 */ stb r0, 0xe88(r31)
-/* 80058B70 48 00 00 08 */ b lbl_80058B78
-lbl_80058B74:
-/* 80058B74 48 00 71 D5 */ bl dKyr_snow_move__Fv
-lbl_80058B78:
-/* 80058B78 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80058B7C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80058B80 7C 08 03 A6 */ mtlr r0
-/* 80058B84 38 21 00 10 */ addi r1, r1, 0x10
-/* 80058B88 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_star__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_star__Fv.s
deleted file mode 100644
index 98175912da..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_star__Fv.s
+++ /dev/null
@@ -1,247 +0,0 @@
-lbl_80058B8C:
-/* 80058B8C 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 80058B90 7C 08 02 A6 */ mflr r0
-/* 80058B94 90 01 00 34 */ stw r0, 0x34(r1)
-/* 80058B98 DB E1 00 20 */ stfd f31, 0x20(r1)
-/* 80058B9C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */
-/* 80058BA0 39 61 00 20 */ addi r11, r1, 0x20
-/* 80058BA4 48 30 96 39 */ bl _savegpr_29
-/* 80058BA8 3B C0 00 00 */ li r30, 0
-/* 80058BAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80058BB0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80058BB4 3B FD 4E 00 */ addi r31, r29, 0x4e00
-/* 80058BB8 7F E3 FB 78 */ mr r3, r31
-/* 80058BBC 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058BC0 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058BC4 38 84 00 17 */ addi r4, r4, 0x17
-/* 80058BC8 48 30 FD CD */ bl strcmp
-/* 80058BCC 2C 03 00 00 */ cmpwi r3, 0
-/* 80058BD0 41 82 03 28 */ beq lbl_80058EF8
-/* 80058BD4 7F E3 FB 78 */ mr r3, r31
-/* 80058BD8 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058BDC 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058BE0 38 84 00 1E */ addi r4, r4, 0x1e
-/* 80058BE4 48 30 FD B1 */ bl strcmp
-/* 80058BE8 2C 03 00 00 */ cmpwi r3, 0
-/* 80058BEC 40 82 00 08 */ bne lbl_80058BF4
-/* 80058BF0 48 00 03 08 */ b lbl_80058EF8
-lbl_80058BF4:
-/* 80058BF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80058BF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80058BFC A0 03 5D 46 */ lhz r0, 0x5d46(r3)
-/* 80058C00 54 00 07 FF */ clrlwi. r0, r0, 0x1f
-/* 80058C04 41 82 00 18 */ beq lbl_80058C1C
-/* 80058C08 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058C0C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058C10 88 03 12 D4 */ lbz r0, 0x12d4(r3)
-/* 80058C14 28 00 00 00 */ cmplwi r0, 0
-/* 80058C18 41 82 00 20 */ beq lbl_80058C38
-lbl_80058C1C:
-/* 80058C1C 7F E3 FB 78 */ mr r3, r31
-/* 80058C20 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058C24 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058C28 38 84 00 0F */ addi r4, r4, 0xf
-/* 80058C2C 48 30 FD 69 */ bl strcmp
-/* 80058C30 2C 03 00 00 */ cmpwi r3, 0
-/* 80058C34 40 82 02 C4 */ bne lbl_80058EF8
-lbl_80058C38:
-/* 80058C38 38 7D 4E 20 */ addi r3, r29, 0x4e20
-/* 80058C3C 81 9D 4E 20 */ lwz r12, 0x4e20(r29)
-/* 80058C40 81 8C 00 30 */ lwz r12, 0x30(r12)
-/* 80058C44 7D 89 03 A6 */ mtctr r12
-/* 80058C48 4E 80 04 21 */ bctrl
-/* 80058C4C 28 03 00 00 */ cmplwi r3, 0
-/* 80058C50 41 82 00 30 */ beq lbl_80058C80
-/* 80058C54 80 03 00 00 */ lwz r0, 0(r3)
-/* 80058C58 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13)
-/* 80058C5C 7C 84 07 74 */ extsb r4, r4
-/* 80058C60 7C 00 20 00 */ cmpw r0, r4
-/* 80058C64 40 81 00 1C */ ble lbl_80058C80
-/* 80058C68 80 63 00 04 */ lwz r3, 4(r3)
-/* 80058C6C 54 80 10 3A */ slwi r0, r4, 2
-/* 80058C70 7C 63 00 2E */ lwzx r3, r3, r0
-/* 80058C74 88 03 00 02 */ lbz r0, 2(r3)
-/* 80058C78 54 00 07 38 */ rlwinm r0, r0, 0, 0x1c, 0x1c
-/* 80058C7C 7C 1E 03 78 */ mr r30, r0
-lbl_80058C80:
-/* 80058C80 7F E3 FB 78 */ mr r3, r31
-/* 80058C84 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058C88 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058C8C 38 84 00 0F */ addi r4, r4, 0xf
-/* 80058C90 48 30 FD 05 */ bl strcmp
-/* 80058C94 2C 03 00 00 */ cmpwi r3, 0
-/* 80058C98 40 82 00 08 */ bne lbl_80058CA0
-/* 80058C9C 3B C0 00 01 */ li r30, 1
-lbl_80058CA0:
-/* 80058CA0 2C 1E 00 00 */ cmpwi r30, 0
-/* 80058CA4 41 82 02 54 */ beq lbl_80058EF8
-/* 80058CA8 48 15 38 D5 */ bl dKy_darkworld_check__Fv
-/* 80058CAC 54 60 06 3E */ clrlwi r0, r3, 0x18
-/* 80058CB0 28 00 00 01 */ cmplwi r0, 1
-/* 80058CB4 41 82 02 44 */ beq lbl_80058EF8
-/* 80058CB8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058CBC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058CC0 48 14 6D 49 */ bl getDaytime__18dScnKy_env_light_cFv
-/* 80058CC4 C0 82 87 00 */ lfs f4, lit_4761(r2)
-/* 80058CC8 FC 01 20 40 */ fcmpo cr0, f1, f4
-/* 80058CCC 4C 41 13 82 */ cror 2, 1, 2
-/* 80058CD0 41 82 00 10 */ beq lbl_80058CE0
-/* 80058CD4 C0 02 87 04 */ lfs f0, lit_4762(r2)
-/* 80058CD8 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80058CDC 40 80 00 0C */ bge lbl_80058CE8
-lbl_80058CE0:
-/* 80058CE0 C3 E2 86 E4 */ lfs f31, lit_4379(r2)
-/* 80058CE4 48 00 00 48 */ b lbl_80058D2C
-lbl_80058CE8:
-/* 80058CE8 C0 02 87 08 */ lfs f0, lit_4763(r2)
-/* 80058CEC FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80058CF0 40 81 00 1C */ ble lbl_80058D0C
-/* 80058CF4 C0 62 86 E4 */ lfs f3, lit_4379(r2)
-/* 80058CF8 C0 42 87 0C */ lfs f2, lit_4764(r2)
-/* 80058CFC EC 04 08 28 */ fsubs f0, f4, f1
-/* 80058D00 EC 02 00 32 */ fmuls f0, f2, f0
-/* 80058D04 EF E3 00 28 */ fsubs f31, f3, f0
-/* 80058D08 48 00 00 24 */ b lbl_80058D2C
-lbl_80058D0C:
-/* 80058D0C C0 02 87 10 */ lfs f0, lit_4765(r2)
-/* 80058D10 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80058D14 40 80 00 14 */ bge lbl_80058D28
-/* 80058D18 C0 42 87 14 */ lfs f2, lit_4766(r2)
-/* 80058D1C EC 00 08 28 */ fsubs f0, f0, f1
-/* 80058D20 EF E2 00 32 */ fmuls f31, f2, f0
-/* 80058D24 48 00 00 08 */ b lbl_80058D2C
-lbl_80058D28:
-/* 80058D28 C3 E2 86 E0 */ lfs f31, lit_4378(r2)
-lbl_80058D2C:
-/* 80058D2C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058D30 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058D34 88 03 12 C8 */ lbz r0, 0x12c8(r3)
-/* 80058D38 28 00 00 00 */ cmplwi r0, 0
-/* 80058D3C 41 82 00 08 */ beq lbl_80058D44
-/* 80058D40 C3 E2 86 E0 */ lfs f31, lit_4378(r2)
-lbl_80058D44:
-/* 80058D44 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058D48 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058D4C 88 03 12 C3 */ lbz r0, 0x12c3(r3)
-/* 80058D50 28 00 00 00 */ cmplwi r0, 0
-/* 80058D54 41 82 00 18 */ beq lbl_80058D6C
-/* 80058D58 C0 23 11 DC */ lfs f1, 0x11dc(r3)
-/* 80058D5C C0 02 87 18 */ lfs f0, lit_4767(r2)
-/* 80058D60 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80058D64 40 81 00 08 */ ble lbl_80058D6C
-/* 80058D68 C3 E2 86 E0 */ lfs f31, lit_4378(r2)
-lbl_80058D6C:
-/* 80058D6C 7F E3 FB 78 */ mr r3, r31
-/* 80058D70 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058D74 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058D78 38 84 00 0F */ addi r4, r4, 0xf
-/* 80058D7C 48 30 FC 19 */ bl strcmp
-/* 80058D80 2C 03 00 00 */ cmpwi r3, 0
-/* 80058D84 40 82 00 08 */ bne lbl_80058D8C
-/* 80058D88 C3 E2 86 E4 */ lfs f31, lit_4379(r2)
-lbl_80058D8C:
-/* 80058D8C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058D90 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058D94 3B C3 0E A0 */ addi r30, r3, 0xea0
-/* 80058D98 7F C3 F3 78 */ mr r3, r30
-/* 80058D9C FC 20 F8 90 */ fmr f1, f31
-/* 80058DA0 C0 42 87 1C */ lfs f2, lit_4768(r2)
-/* 80058DA4 C0 62 87 20 */ lfs f3, lit_4769(r2)
-/* 80058DA8 C0 82 87 24 */ lfs f4, lit_4770(r2)
-/* 80058DAC 48 21 6B D1 */ bl cLib_addCalc__FPfffff
-/* 80058DB0 C0 22 87 28 */ lfs f1, lit_4771(r2)
-/* 80058DB4 C0 1E 00 00 */ lfs f0, 0(r30)
-/* 80058DB8 EC 01 00 32 */ fmuls f0, f1, f0
-/* 80058DBC FC 00 00 1E */ fctiwz f0, f0
-/* 80058DC0 D8 01 00 08 */ stfd f0, 8(r1)
-/* 80058DC4 80 01 00 0C */ lwz r0, 0xc(r1)
-/* 80058DC8 7C 00 07 34 */ extsh r0, r0
-/* 80058DCC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058DD0 3B A3 CA 54 */ addi r29, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058DD4 90 1D 0E 9C */ stw r0, 0xe9c(r29)
-/* 80058DD8 7F E3 FB 78 */ mr r3, r31
-/* 80058DDC 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058DE0 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058DE4 38 84 00 91 */ addi r4, r4, 0x91
-/* 80058DE8 48 30 FB AD */ bl strcmp
-/* 80058DEC 2C 03 00 00 */ cmpwi r3, 0
-/* 80058DF0 41 82 00 3C */ beq lbl_80058E2C
-/* 80058DF4 7F E3 FB 78 */ mr r3, r31
-/* 80058DF8 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058DFC 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058E00 38 84 00 99 */ addi r4, r4, 0x99
-/* 80058E04 48 30 FB 91 */ bl strcmp
-/* 80058E08 2C 03 00 00 */ cmpwi r3, 0
-/* 80058E0C 41 82 00 20 */ beq lbl_80058E2C
-/* 80058E10 7F E3 FB 78 */ mr r3, r31
-/* 80058E14 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058E18 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058E1C 38 84 00 A1 */ addi r4, r4, 0xa1
-/* 80058E20 48 30 FB 75 */ bl strcmp
-/* 80058E24 2C 03 00 00 */ cmpwi r3, 0
-/* 80058E28 40 82 00 24 */ bne lbl_80058E4C
-lbl_80058E2C:
-/* 80058E2C C0 22 87 2C */ lfs f1, lit_4772(r2)
-/* 80058E30 C0 1E 00 00 */ lfs f0, 0(r30)
-/* 80058E34 EC 01 00 32 */ fmuls f0, f1, f0
-/* 80058E38 FC 00 00 1E */ fctiwz f0, f0
-/* 80058E3C D8 01 00 08 */ stfd f0, 8(r1)
-/* 80058E40 80 01 00 0C */ lwz r0, 0xc(r1)
-/* 80058E44 7C 00 07 34 */ extsh r0, r0
-/* 80058E48 90 1D 0E 9C */ stw r0, 0xe9c(r29)
-lbl_80058E4C:
-/* 80058E4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058E50 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058E54 88 1E 0E 98 */ lbz r0, 0xe98(r30)
-/* 80058E58 2C 00 00 01 */ cmpwi r0, 1
-/* 80058E5C 41 82 00 50 */ beq lbl_80058EAC
-/* 80058E60 40 80 00 98 */ bge lbl_80058EF8
-/* 80058E64 2C 00 00 00 */ cmpwi r0, 0
-/* 80058E68 40 80 00 08 */ bge lbl_80058E70
-/* 80058E6C 48 00 00 8C */ b lbl_80058EF8
-lbl_80058E70:
-/* 80058E70 80 1D 0E 9C */ lwz r0, 0xe9c(r29)
-/* 80058E74 2C 00 00 00 */ cmpwi r0, 0
-/* 80058E78 41 82 00 80 */ beq lbl_80058EF8
-/* 80058E7C 48 00 84 A9 */ bl dKyr_star_init__Fv
-/* 80058E80 48 01 2A 5D */ bl dKyr_shstar_init__Fv
-/* 80058E84 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058E88 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058E8C 80 03 0E A4 */ lwz r0, 0xea4(r3)
-/* 80058E90 28 00 00 00 */ cmplwi r0, 0
-/* 80058E94 41 82 00 64 */ beq lbl_80058EF8
-/* 80058E98 48 00 85 75 */ bl dKyr_star_move__Fv
-/* 80058E9C 48 01 2A 45 */ bl dKyr_shstar_move__Fv
-/* 80058EA0 38 00 00 01 */ li r0, 1
-/* 80058EA4 98 1E 0E 98 */ stb r0, 0xe98(r30)
-/* 80058EA8 48 00 00 50 */ b lbl_80058EF8
-lbl_80058EAC:
-/* 80058EAC 48 00 85 61 */ bl dKyr_star_move__Fv
-/* 80058EB0 48 01 2A 31 */ bl dKyr_shstar_move__Fv
-/* 80058EB4 80 1D 0E 9C */ lwz r0, 0xe9c(r29)
-/* 80058EB8 2C 00 00 00 */ cmpwi r0, 0
-/* 80058EBC 40 82 00 3C */ bne lbl_80058EF8
-/* 80058EC0 38 00 00 00 */ li r0, 0
-/* 80058EC4 98 1E 0E 98 */ stb r0, 0xe98(r30)
-/* 80058EC8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058ECC 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058ED0 80 7E 0E A4 */ lwz r3, 0xea4(r30)
-/* 80058ED4 28 03 00 00 */ cmplwi r3, 0
-/* 80058ED8 41 82 00 18 */ beq lbl_80058EF0
-/* 80058EDC 38 80 00 01 */ li r4, 1
-/* 80058EE0 81 83 00 00 */ lwz r12, 0(r3)
-/* 80058EE4 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80058EE8 7D 89 03 A6 */ mtctr r12
-/* 80058EEC 4E 80 04 21 */ bctrl
-lbl_80058EF0:
-/* 80058EF0 38 00 00 00 */ li r0, 0
-/* 80058EF4 90 1E 0E A4 */ stw r0, 0xea4(r30)
-lbl_80058EF8:
-/* 80058EF8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */
-/* 80058EFC CB E1 00 20 */ lfd f31, 0x20(r1)
-/* 80058F00 39 61 00 20 */ addi r11, r1, 0x20
-/* 80058F04 48 30 93 25 */ bl _restgpr_29
-/* 80058F08 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 80058F0C 7C 08 03 A6 */ mtlr r0
-/* 80058F10 38 21 00 30 */ addi r1, r1, 0x30
-/* 80058F14 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_sun__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_sun__Fv.s
deleted file mode 100644
index 60fba7143c..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_sun__Fv.s
+++ /dev/null
@@ -1,367 +0,0 @@
-lbl_80058318:
-/* 80058318 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 8005831C 7C 08 02 A6 */ mflr r0
-/* 80058320 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80058324 39 61 00 20 */ addi r11, r1, 0x20
-/* 80058328 48 30 9E B1 */ bl _savegpr_28
-/* 8005832C 3B 80 00 00 */ li r28, 0
-/* 80058330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80058334 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80058338 A0 1D 5D 46 */ lhz r0, 0x5d46(r29)
-/* 8005833C 54 00 07 FF */ clrlwi. r0, r0, 0x1f
-/* 80058340 41 82 05 3C */ beq lbl_8005887C
-/* 80058344 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058348 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005834C 88 03 12 D4 */ lbz r0, 0x12d4(r3)
-/* 80058350 28 00 00 00 */ cmplwi r0, 0
-/* 80058354 40 82 05 28 */ bne lbl_8005887C
-/* 80058358 38 7D 4E 20 */ addi r3, r29, 0x4e20
-/* 8005835C 81 9D 4E 20 */ lwz r12, 0x4e20(r29)
-/* 80058360 81 8C 00 30 */ lwz r12, 0x30(r12)
-/* 80058364 7D 89 03 A6 */ mtctr r12
-/* 80058368 4E 80 04 21 */ bctrl
-/* 8005836C 28 03 00 00 */ cmplwi r3, 0
-/* 80058370 41 82 00 30 */ beq lbl_800583A0
-/* 80058374 80 03 00 00 */ lwz r0, 0(r3)
-/* 80058378 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13)
-/* 8005837C 7C 84 07 74 */ extsb r4, r4
-/* 80058380 7C 00 20 00 */ cmpw r0, r4
-/* 80058384 40 81 00 1C */ ble lbl_800583A0
-/* 80058388 80 63 00 04 */ lwz r3, 4(r3)
-/* 8005838C 54 80 10 3A */ slwi r0, r4, 2
-/* 80058390 7C 63 00 2E */ lwzx r3, r3, r0
-/* 80058394 88 03 00 02 */ lbz r0, 2(r3)
-/* 80058398 54 00 07 38 */ rlwinm r0, r0, 0, 0x1c, 0x1c
-/* 8005839C 7C 1C 03 78 */ mr r28, r0
-lbl_800583A0:
-/* 800583A0 3B BD 4E 00 */ addi r29, r29, 0x4e00
-/* 800583A4 7F A3 EB 78 */ mr r3, r29
-/* 800583A8 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800583AC 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800583B0 38 84 00 0F */ addi r4, r4, 0xf
-/* 800583B4 48 31 05 E1 */ bl strcmp
-/* 800583B8 2C 03 00 00 */ cmpwi r3, 0
-/* 800583BC 40 82 00 0C */ bne lbl_800583C8
-/* 800583C0 3B 80 00 01 */ li r28, 1
-/* 800583C4 48 00 00 40 */ b lbl_80058404
-lbl_800583C8:
-/* 800583C8 7F A3 EB 78 */ mr r3, r29
-/* 800583CC 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800583D0 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800583D4 38 84 00 17 */ addi r4, r4, 0x17
-/* 800583D8 48 31 05 BD */ bl strcmp
-/* 800583DC 2C 03 00 00 */ cmpwi r3, 0
-/* 800583E0 41 82 00 20 */ beq lbl_80058400
-/* 800583E4 7F A3 EB 78 */ mr r3, r29
-/* 800583E8 3C 80 80 38 */ lis r4, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800583EC 38 84 A3 68 */ addi r4, r4, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800583F0 38 84 00 1E */ addi r4, r4, 0x1e
-/* 800583F4 48 31 05 A1 */ bl strcmp
-/* 800583F8 2C 03 00 00 */ cmpwi r3, 0
-/* 800583FC 40 82 00 08 */ bne lbl_80058404
-lbl_80058400:
-/* 80058400 3B 80 00 00 */ li r28, 0
-lbl_80058404:
-/* 80058404 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058408 3B A3 CA 54 */ addi r29, r3, g_env_light@l /* 0x8042CA54@l */
-/* 8005840C 88 1D 0E 70 */ lbz r0, 0xe70(r29)
-/* 80058410 2C 00 00 01 */ cmpwi r0, 1
-/* 80058414 41 82 03 F8 */ beq lbl_8005880C
-/* 80058418 40 80 04 64 */ bge lbl_8005887C
-/* 8005841C 2C 00 00 00 */ cmpwi r0, 0
-/* 80058420 40 80 00 08 */ bge lbl_80058428
-/* 80058424 48 00 04 58 */ b lbl_8005887C
-lbl_80058428:
-/* 80058428 2C 1C 00 00 */ cmpwi r28, 0
-/* 8005842C 41 82 04 50 */ beq lbl_8005887C
-/* 80058430 48 15 41 4D */ bl dKy_darkworld_check__Fv
-/* 80058434 54 60 06 3E */ clrlwi r0, r3, 0x18
-/* 80058438 28 00 00 01 */ cmplwi r0, 1
-/* 8005843C 41 82 04 40 */ beq lbl_8005887C
-/* 80058440 38 60 00 78 */ li r3, 0x78
-/* 80058444 38 80 00 20 */ li r4, 0x20
-/* 80058448 48 27 68 2D */ bl __nw__FUli
-/* 8005844C 7C 7C 1B 79 */ or. r28, r3, r3
-/* 80058450 41 82 00 50 */ beq lbl_800584A0
-/* 80058454 7F 84 E3 78 */ mr r4, r28
-/* 80058458 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 8005845C 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80058460 90 1C 00 00 */ stw r0, 0(r28)
-/* 80058464 38 00 00 00 */ li r0, 0
-/* 80058468 90 1C 00 04 */ stw r0, 4(r28)
-/* 8005846C 90 1C 00 08 */ stw r0, 8(r28)
-/* 80058470 90 1C 00 0C */ stw r0, 0xc(r28)
-/* 80058474 3C 60 80 3B */ lis r3, __vt__18dKankyo_sun_Packet@ha /* 0x803A9B88@ha */
-/* 80058478 38 03 9B 88 */ addi r0, r3, __vt__18dKankyo_sun_Packet@l /* 0x803A9B88@l */
-/* 8005847C 90 1C 00 00 */ stw r0, 0(r28)
-/* 80058480 38 64 00 10 */ addi r3, r4, 0x10
-/* 80058484 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha /* 0x800125DC@ha */
-/* 80058488 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l /* 0x800125DC@l */
-/* 8005848C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha /* 0x80009184@ha */
-/* 80058490 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80009184@l */
-/* 80058494 38 C0 00 0C */ li r6, 0xc
-/* 80058498 38 E0 00 02 */ li r7, 2
-/* 8005849C 48 30 98 C5 */ bl __construct_array
-lbl_800584A0:
-/* 800584A0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800584A4 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800584A8 93 9E 0E 74 */ stw r28, 0xe74(r30)
-/* 800584AC 38 60 00 A0 */ li r3, 0xa0
-/* 800584B0 38 80 00 20 */ li r4, 0x20
-/* 800584B4 48 27 67 C1 */ bl __nw__FUli
-/* 800584B8 7C 7C 1B 79 */ or. r28, r3, r3
-/* 800584BC 41 82 00 50 */ beq lbl_8005850C
-/* 800584C0 7F 84 E3 78 */ mr r4, r28
-/* 800584C4 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 800584C8 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 800584CC 90 1C 00 00 */ stw r0, 0(r28)
-/* 800584D0 38 00 00 00 */ li r0, 0
-/* 800584D4 90 1C 00 04 */ stw r0, 4(r28)
-/* 800584D8 90 1C 00 08 */ stw r0, 8(r28)
-/* 800584DC 90 1C 00 0C */ stw r0, 0xc(r28)
-/* 800584E0 3C 60 80 3B */ lis r3, __vt__22dKankyo_sunlenz_Packet@ha /* 0x803A9B74@ha */
-/* 800584E4 38 03 9B 74 */ addi r0, r3, __vt__22dKankyo_sunlenz_Packet@l /* 0x803A9B74@l */
-/* 800584E8 90 1C 00 00 */ stw r0, 0(r28)
-/* 800584EC 38 64 00 24 */ addi r3, r4, 0x24
-/* 800584F0 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha /* 0x800125DC@ha */
-/* 800584F4 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l /* 0x800125DC@l */
-/* 800584F8 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha /* 0x80009184@ha */
-/* 800584FC 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80009184@l */
-/* 80058500 38 C0 00 0C */ li r6, 0xc
-/* 80058504 38 E0 00 08 */ li r7, 8
-/* 80058508 48 30 98 59 */ bl __construct_array
-lbl_8005850C:
-/* 8005850C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058510 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058514 93 9F 0E 78 */ stw r28, 0xe78(r31)
-/* 80058518 80 1E 0E 74 */ lwz r0, 0xe74(r30)
-/* 8005851C 28 00 00 00 */ cmplwi r0, 0
-/* 80058520 41 82 03 5C */ beq lbl_8005887C
-/* 80058524 28 1C 00 00 */ cmplwi r28, 0
-/* 80058528 41 82 03 54 */ beq lbl_8005887C
-/* 8005852C 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058530 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058534 38 63 00 26 */ addi r3, r3, 0x26
-/* 80058538 4B FD 6E FD */ bl dComIfG_getStageRes__FPCc
-/* 8005853C 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058540 90 64 00 2C */ stw r3, 0x2c(r4)
-/* 80058544 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058548 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005854C 38 63 00 31 */ addi r3, r3, 0x31
-/* 80058550 4B FD 6E E5 */ bl dComIfG_getStageRes__FPCc
-/* 80058554 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058558 90 64 00 30 */ stw r3, 0x30(r4)
-/* 8005855C 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058560 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058564 38 63 00 3E */ addi r3, r3, 0x3e
-/* 80058568 4B FD 6E CD */ bl dComIfG_getStageRes__FPCc
-/* 8005856C 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058570 90 64 00 34 */ stw r3, 0x34(r4)
-/* 80058574 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058578 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005857C 38 63 00 4F */ addi r3, r3, 0x4f
-/* 80058580 4B FD 6E B5 */ bl dComIfG_getStageRes__FPCc
-/* 80058584 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058588 90 64 00 38 */ stw r3, 0x38(r4)
-/* 8005858C 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058590 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058594 38 63 00 60 */ addi r3, r3, 0x60
-/* 80058598 4B FD 6E 9D */ bl dComIfG_getStageRes__FPCc
-/* 8005859C 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 800585A0 90 64 00 3C */ stw r3, 0x3c(r4)
-/* 800585A4 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800585A8 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800585AC 38 63 00 71 */ addi r3, r3, 0x71
-/* 800585B0 4B FD 6E 85 */ bl dComIfG_getStageRes__FPCc
-/* 800585B4 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 800585B8 90 64 00 40 */ stw r3, 0x40(r4)
-/* 800585BC 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800585C0 80 03 00 2C */ lwz r0, 0x2c(r3)
-/* 800585C4 28 00 00 00 */ cmplwi r0, 0
-/* 800585C8 40 82 00 EC */ bne lbl_800586B4
-/* 800585CC 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800585D0 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800585D4 38 63 00 82 */ addi r3, r3, 0x82
-/* 800585D8 38 80 00 56 */ li r4, 0x56
-/* 800585DC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800585E0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800585E4 3F 85 00 02 */ addis r28, r5, 2
-/* 800585E8 3B 9C C2 F8 */ addi r28, r28, -15624
-/* 800585EC 7F 85 E3 78 */ mr r5, r28
-/* 800585F0 38 C0 00 80 */ li r6, 0x80
-/* 800585F4 4B FE 3C F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800585F8 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 800585FC 90 64 00 2C */ stw r3, 0x2c(r4)
-/* 80058600 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058604 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058608 38 63 00 82 */ addi r3, r3, 0x82
-/* 8005860C 38 80 00 56 */ li r4, 0x56
-/* 80058610 7F 85 E3 78 */ mr r5, r28
-/* 80058614 38 C0 00 80 */ li r6, 0x80
-/* 80058618 4B FE 3C D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 8005861C 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058620 90 64 00 30 */ stw r3, 0x30(r4)
-/* 80058624 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058628 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005862C 38 63 00 82 */ addi r3, r3, 0x82
-/* 80058630 38 80 00 56 */ li r4, 0x56
-/* 80058634 7F 85 E3 78 */ mr r5, r28
-/* 80058638 38 C0 00 80 */ li r6, 0x80
-/* 8005863C 4B FE 3C B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80058640 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058644 90 64 00 34 */ stw r3, 0x34(r4)
-/* 80058648 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 8005864C 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058650 38 63 00 82 */ addi r3, r3, 0x82
-/* 80058654 38 80 00 56 */ li r4, 0x56
-/* 80058658 7F 85 E3 78 */ mr r5, r28
-/* 8005865C 38 C0 00 80 */ li r6, 0x80
-/* 80058660 4B FE 3C 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80058664 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 80058668 90 64 00 38 */ stw r3, 0x38(r4)
-/* 8005866C 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058670 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058674 38 63 00 82 */ addi r3, r3, 0x82
-/* 80058678 38 80 00 56 */ li r4, 0x56
-/* 8005867C 7F 85 E3 78 */ mr r5, r28
-/* 80058680 38 C0 00 80 */ li r6, 0x80
-/* 80058684 4B FE 3C 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80058688 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 8005868C 90 64 00 3C */ stw r3, 0x3c(r4)
-/* 80058690 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058694 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058698 38 63 00 82 */ addi r3, r3, 0x82
-/* 8005869C 38 80 00 56 */ li r4, 0x56
-/* 800586A0 7F 85 E3 78 */ mr r5, r28
-/* 800586A4 38 C0 00 80 */ li r6, 0x80
-/* 800586A8 4B FE 3C 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800586AC 80 9E 0E 74 */ lwz r4, 0xe74(r30)
-/* 800586B0 90 64 00 40 */ stw r3, 0x40(r4)
-lbl_800586B4:
-/* 800586B4 38 00 00 00 */ li r0, 0
-/* 800586B8 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800586BC 98 03 00 28 */ stb r0, 0x28(r3)
-/* 800586C0 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800586C4 98 03 00 29 */ stb r0, 0x29(r3)
-/* 800586C8 C0 42 86 E0 */ lfs f2, lit_4378(r2)
-/* 800586CC 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800586D0 D0 43 00 5C */ stfs f2, 0x5c(r3)
-/* 800586D4 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800586D8 D0 43 00 60 */ stfs f2, 0x60(r3)
-/* 800586DC 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800586E0 D0 43 00 64 */ stfs f2, 0x64(r3)
-/* 800586E4 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 800586E8 D0 43 00 68 */ stfs f2, 0x68(r3)
-/* 800586EC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800586F0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800586F4 C0 23 12 44 */ lfs f1, 0x1244(r3)
-/* 800586F8 C0 02 86 E8 */ lfs f0, lit_4610(r2)
-/* 800586FC FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80058700 40 80 00 14 */ bge lbl_80058714
-/* 80058704 C0 02 86 E4 */ lfs f0, lit_4379(r2)
-/* 80058708 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 8005870C D0 03 00 6C */ stfs f0, 0x6c(r3)
-/* 80058710 48 00 00 0C */ b lbl_8005871C
-lbl_80058714:
-/* 80058714 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 80058718 D0 43 00 6C */ stfs f2, 0x6c(r3)
-lbl_8005871C:
-/* 8005871C 38 00 00 00 */ li r0, 0
-/* 80058720 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 80058724 90 03 00 44 */ stw r0, 0x44(r3)
-/* 80058728 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 8005872C 90 03 00 48 */ stw r0, 0x48(r3)
-/* 80058730 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 80058734 90 03 00 4C */ stw r0, 0x4c(r3)
-/* 80058738 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 8005873C 90 03 00 50 */ stw r0, 0x50(r3)
-/* 80058740 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 80058744 90 03 00 54 */ stw r0, 0x54(r3)
-/* 80058748 80 7E 0E 74 */ lwz r3, 0xe74(r30)
-/* 8005874C 90 03 00 58 */ stw r0, 0x58(r3)
-/* 80058750 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058754 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 80058758 38 63 00 82 */ addi r3, r3, 0x82
-/* 8005875C 38 80 00 4A */ li r4, 0x4a
-/* 80058760 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80058764 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80058768 3F 85 00 02 */ addis r28, r5, 2
-/* 8005876C 3B 9C C2 F8 */ addi r28, r28, -15624
-/* 80058770 7F 85 E3 78 */ mr r5, r28
-/* 80058774 38 C0 00 80 */ li r6, 0x80
-/* 80058778 4B FE 3B 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 8005877C 80 9F 0E 78 */ lwz r4, 0xe78(r31)
-/* 80058780 90 64 00 14 */ stw r3, 0x14(r4)
-/* 80058784 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 80058788 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 8005878C 38 63 00 82 */ addi r3, r3, 0x82
-/* 80058790 38 80 00 57 */ li r4, 0x57
-/* 80058794 7F 85 E3 78 */ mr r5, r28
-/* 80058798 38 C0 00 80 */ li r6, 0x80
-/* 8005879C 4B FE 3B 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800587A0 80 9F 0E 78 */ lwz r4, 0xe78(r31)
-/* 800587A4 90 64 00 1C */ stw r3, 0x1c(r4)
-/* 800587A8 3C 60 80 38 */ lis r3, d_kankyo_d_kankyo_wether__stringBase0@ha /* 0x8037A368@ha */
-/* 800587AC 38 63 A3 68 */ addi r3, r3, d_kankyo_d_kankyo_wether__stringBase0@l /* 0x8037A368@l */
-/* 800587B0 38 63 00 82 */ addi r3, r3, 0x82
-/* 800587B4 38 80 00 5C */ li r4, 0x5c
-/* 800587B8 7F 85 E3 78 */ mr r5, r28
-/* 800587BC 38 C0 00 80 */ li r6, 0x80
-/* 800587C0 4B FE 3B 2D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 800587C4 80 9F 0E 78 */ lwz r4, 0xe78(r31)
-/* 800587C8 90 64 00 20 */ stw r3, 0x20(r4)
-/* 800587CC C0 02 86 EC */ lfs f0, lit_4611(r2)
-/* 800587D0 80 7F 0E 78 */ lwz r3, 0xe78(r31)
-/* 800587D4 D0 03 00 8C */ stfs f0, 0x8c(r3)
-/* 800587D8 C0 02 86 E0 */ lfs f0, lit_4378(r2)
-/* 800587DC 80 7F 0E 78 */ lwz r3, 0xe78(r31)
-/* 800587E0 D0 03 00 90 */ stfs f0, 0x90(r3)
-/* 800587E4 80 7F 0E 78 */ lwz r3, 0xe78(r31)
-/* 800587E8 D0 03 00 98 */ stfs f0, 0x98(r3)
-/* 800587EC 38 00 00 00 */ li r0, 0
-/* 800587F0 80 7F 0E 78 */ lwz r3, 0xe78(r31)
-/* 800587F4 98 03 00 9E */ stb r0, 0x9e(r3)
-/* 800587F8 48 00 37 11 */ bl dKyr_sun_move__Fv
-/* 800587FC 48 00 32 4D */ bl dKyr_lenzflare_move__Fv
-/* 80058800 38 00 00 01 */ li r0, 1
-/* 80058804 98 1D 0E 70 */ stb r0, 0xe70(r29)
-/* 80058808 48 00 00 74 */ b lbl_8005887C
-lbl_8005880C:
-/* 8005880C 2C 1C 00 00 */ cmpwi r28, 0
-/* 80058810 40 82 00 64 */ bne lbl_80058874
-/* 80058814 38 00 00 00 */ li r0, 0
-/* 80058818 98 1D 0E 70 */ stb r0, 0xe70(r29)
-/* 8005881C 80 7D 0E 74 */ lwz r3, 0xe74(r29)
-/* 80058820 28 03 00 00 */ cmplwi r3, 0
-/* 80058824 41 82 00 18 */ beq lbl_8005883C
-/* 80058828 38 80 00 01 */ li r4, 1
-/* 8005882C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80058830 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80058834 7D 89 03 A6 */ mtctr r12
-/* 80058838 4E 80 04 21 */ bctrl
-lbl_8005883C:
-/* 8005883C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80058840 3B 83 CA 54 */ addi r28, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80058844 80 7C 0E 78 */ lwz r3, 0xe78(r28)
-/* 80058848 28 03 00 00 */ cmplwi r3, 0
-/* 8005884C 41 82 00 18 */ beq lbl_80058864
-/* 80058850 38 80 00 01 */ li r4, 1
-/* 80058854 81 83 00 00 */ lwz r12, 0(r3)
-/* 80058858 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 8005885C 7D 89 03 A6 */ mtctr r12
-/* 80058860 4E 80 04 21 */ bctrl
-lbl_80058864:
-/* 80058864 38 00 00 00 */ li r0, 0
-/* 80058868 90 1D 0E 74 */ stw r0, 0xe74(r29)
-/* 8005886C 90 1C 0E 78 */ stw r0, 0xe78(r28)
-/* 80058870 48 00 00 0C */ b lbl_8005887C
-lbl_80058874:
-/* 80058874 48 00 36 95 */ bl dKyr_sun_move__Fv
-/* 80058878 48 00 31 D1 */ bl dKyr_lenzflare_move__Fv
-lbl_8005887C:
-/* 8005887C 39 61 00 20 */ addi r11, r1, 0x20
-/* 80058880 48 30 99 A5 */ bl _restgpr_28
-/* 80058884 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80058888 7C 08 03 A6 */ mtlr r0
-/* 8005888C 38 21 00 20 */ addi r1, r1, 0x20
-/* 80058890 4E 80 00 20 */ blr
diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_thunder__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_thunder__Fv.s
deleted file mode 100644
index c0b03c8e67..0000000000
--- a/asm/d/kankyo/d_kankyo_wether/wether_move_thunder__Fv.s
+++ /dev/null
@@ -1,30 +0,0 @@
-lbl_80058290:
-/* 80058290 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80058294 7C 08 02 A6 */ mflr r0
-/* 80058298 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8005829C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 800582A0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 800582A4 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */
-/* 800582A8 88 1F 0E D4 */ lbz r0, 0xed4(r31)
-/* 800582AC 2C 00 00 01 */ cmpwi r0, 1
-/* 800582B0 41 82 00 30 */ beq lbl_800582E0
-/* 800582B4 40 80 00 30 */ bge lbl_800582E4
-/* 800582B8 2C 00 00 00 */ cmpwi r0, 0
-/* 800582BC 40 80 00 08 */ bge lbl_800582C4
-/* 800582C0 48 00 00 24 */ b lbl_800582E4
-lbl_800582C4:
-/* 800582C4 80 1F 0E D8 */ lwz r0, 0xed8(r31)
-/* 800582C8 2C 00 00 00 */ cmpwi r0, 0
-/* 800582CC 41 82 00 18 */ beq lbl_800582E4
-/* 800582D0 48 01 2E C1 */ bl dKyr_thunder_init__Fv
-/* 800582D4 38 00 00 01 */ li r0, 1
-/* 800582D8 98 1F 0E D4 */ stb r0, 0xed4(r31)
-/* 800582DC 48 00 00 08 */ b lbl_800582E4
-lbl_800582E0:
-/* 800582E0 48 01 2E C9 */ bl dKyr_thunder_move__Fv
-lbl_800582E4:
-/* 800582E4 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 800582E8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800582EC 7C 08 03 A6 */ mtlr r0
-/* 800582F0 38 21 00 10 */ addi r1, r1, 0x10
-/* 800582F4 4E 80 00 20 */ blr
diff --git a/asm/d/map/d_map_path/__dt__Q28dMpath_n18dTexObjAggregate_cFv.s b/asm/d/map/d_map_path/__dt__Q28dMpath_n18dTexObjAggregate_cFv.s
deleted file mode 100644
index f5b400bedd..0000000000
--- a/asm/d/map/d_map_path/__dt__Q28dMpath_n18dTexObjAggregate_cFv.s
+++ /dev/null
@@ -1,22 +0,0 @@
-lbl_8003D740:
-/* 8003D740 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8003D744 7C 08 02 A6 */ mflr r0
-/* 8003D748 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8003D74C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8003D750 93 C1 00 08 */ stw r30, 8(r1)
-/* 8003D754 7C 7E 1B 79 */ or. r30, r3, r3
-/* 8003D758 7C 9F 23 78 */ mr r31, r4
-/* 8003D75C 41 82 00 18 */ beq lbl_8003D774
-/* 8003D760 4B FF F1 95 */ bl remove__Q28dMpath_n18dTexObjAggregate_cFv
-/* 8003D764 7F E0 07 35 */ extsh. r0, r31
-/* 8003D768 40 81 00 0C */ ble lbl_8003D774
-/* 8003D76C 7F C3 F3 78 */ mr r3, r30
-/* 8003D770 48 29 15 CD */ bl __dl__FPv
-lbl_8003D774:
-/* 8003D774 7F C3 F3 78 */ mr r3, r30
-/* 8003D778 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8003D77C 83 C1 00 08 */ lwz r30, 8(r1)
-/* 8003D780 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8003D784 7C 08 03 A6 */ mtlr r0
-/* 8003D788 38 21 00 10 */ addi r1, r1, 0x10
-/* 8003D78C 4E 80 00 20 */ blr
diff --git a/asm/d/map/d_map_path/__sinit_d_map_path_cpp.s b/asm/d/map/d_map_path/__sinit_d_map_path_cpp.s
deleted file mode 100644
index de7aae7f39..0000000000
--- a/asm/d/map/d_map_path/__sinit_d_map_path_cpp.s
+++ /dev/null
@@ -1,25 +0,0 @@
-lbl_8003D6E4:
-/* 8003D6E4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8003D6E8 7C 08 02 A6 */ mflr r0
-/* 8003D6EC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8003D6F0 38 A0 00 00 */ li r5, 0
-/* 8003D6F4 7C A3 2B 78 */ mr r3, r5
-/* 8003D6F8 3C 80 80 42 */ lis r4, m_texObjAgg__8dMpath_n@ha /* 0x80424684@ha */
-/* 8003D6FC 38 84 46 84 */ addi r4, r4, m_texObjAgg__8dMpath_n@l /* 0x80424684@l */
-/* 8003D700 38 00 00 07 */ li r0, 7
-/* 8003D704 7C 09 03 A6 */ mtctr r0
-lbl_8003D708:
-/* 8003D708 7C A4 19 2E */ stwx r5, r4, r3
-/* 8003D70C 38 63 00 04 */ addi r3, r3, 4
-/* 8003D710 42 00 FF F8 */ bdnz lbl_8003D708
-/* 8003D714 3C 60 80 42 */ lis r3, m_texObjAgg__8dMpath_n@ha /* 0x80424684@ha */
-/* 8003D718 38 63 46 84 */ addi r3, r3, m_texObjAgg__8dMpath_n@l /* 0x80424684@l */
-/* 8003D71C 3C 80 80 04 */ lis r4, __dt__Q28dMpath_n18dTexObjAggregate_cFv@ha /* 0x8003D740@ha */
-/* 8003D720 38 84 D7 40 */ addi r4, r4, __dt__Q28dMpath_n18dTexObjAggregate_cFv@l /* 0x8003D740@l */
-/* 8003D724 3C A0 80 42 */ lis r5, lit_3639@ha /* 0x80424678@ha */
-/* 8003D728 38 A5 46 78 */ addi r5, r5, lit_3639@l /* 0x80424678@l */
-/* 8003D72C 48 32 44 F9 */ bl __register_global_object
-/* 8003D730 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8003D734 7C 08 03 A6 */ mtlr r0
-/* 8003D738 38 21 00 10 */ addi r1, r1, 0x10
-/* 8003D73C 4E 80 00 20 */ blr
diff --git a/asm/d/map/d_map_path/drawBack__18dRenderingFDAmap_cCFv.s b/asm/d/map/d_map_path/drawBack__18dRenderingFDAmap_cCFv.s
deleted file mode 100644
index 7e98dd96e7..0000000000
--- a/asm/d/map/d_map_path/drawBack__18dRenderingFDAmap_cCFv.s
+++ /dev/null
@@ -1,56 +0,0 @@
-lbl_8003D0AC:
-/* 8003D0AC 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 8003D0B0 7C 08 02 A6 */ mflr r0
-/* 8003D0B4 90 01 00 24 */ stw r0, 0x24(r1)
-/* 8003D0B8 93 E1 00 1C */ stw r31, 0x1c(r1)
-/* 8003D0BC 7C 7F 1B 78 */ mr r31, r3
-/* 8003D0C0 48 31 E4 CD */ bl GXClearVtxDesc
-/* 8003D0C4 38 60 00 09 */ li r3, 9
-/* 8003D0C8 38 80 00 01 */ li r4, 1
-/* 8003D0CC 48 31 DD ED */ bl GXSetVtxDesc
-/* 8003D0D0 38 60 00 00 */ li r3, 0
-/* 8003D0D4 38 80 00 09 */ li r4, 9
-/* 8003D0D8 38 A0 00 01 */ li r5, 1
-/* 8003D0DC 38 C0 00 04 */ li r6, 4
-/* 8003D0E0 38 E0 00 00 */ li r7, 0
-/* 8003D0E4 48 31 E4 E1 */ bl GXSetVtxAttrFmt
-/* 8003D0E8 7F E3 FB 78 */ mr r3, r31
-/* 8003D0EC 81 9F 00 00 */ lwz r12, 0(r31)
-/* 8003D0F0 81 8C 00 5C */ lwz r12, 0x5c(r12)
-/* 8003D0F4 7D 89 03 A6 */ mtctr r12
-/* 8003D0F8 4E 80 04 21 */ bctrl
-/* 8003D0FC 80 03 00 00 */ lwz r0, 0(r3)
-/* 8003D100 90 01 00 08 */ stw r0, 8(r1)
-/* 8003D104 38 60 00 01 */ li r3, 1
-/* 8003D108 38 81 00 08 */ addi r4, r1, 8
-/* 8003D10C 48 32 22 71 */ bl GXSetTevColor
-/* 8003D110 38 60 00 80 */ li r3, 0x80
-/* 8003D114 38 80 00 00 */ li r4, 0
-/* 8003D118 38 A0 00 04 */ li r5, 4
-/* 8003D11C 48 31 F6 49 */ bl GXBegin
-/* 8003D120 C0 7F 00 0C */ lfs f3, 0xc(r31)
-/* 8003D124 FC 80 18 50 */ fneg f4, f3
-/* 8003D128 C0 5F 00 08 */ lfs f2, 8(r31)
-/* 8003D12C FC 20 10 50 */ fneg f1, f2
-/* 8003D130 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */
-/* 8003D134 D0 23 80 00 */ stfs f1, 0x8000(r3) /* 0xCC008000@l */
-/* 8003D138 D0 83 80 00 */ stfs f4, -0x8000(r3)
-/* 8003D13C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D140 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D144 D0 43 80 00 */ stfs f2, -0x8000(r3)
-/* 8003D148 D0 83 80 00 */ stfs f4, -0x8000(r3)
-/* 8003D14C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D150 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D154 D0 43 80 00 */ stfs f2, -0x8000(r3)
-/* 8003D158 D0 63 80 00 */ stfs f3, -0x8000(r3)
-/* 8003D15C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D160 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D164 D0 23 80 00 */ stfs f1, -0x8000(r3)
-/* 8003D168 D0 63 80 00 */ stfs f3, -0x8000(r3)
-/* 8003D16C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D170 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D174 83 E1 00 1C */ lwz r31, 0x1c(r1)
-/* 8003D178 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8003D17C 7C 08 03 A6 */ mtlr r0
-/* 8003D180 38 21 00 20 */ addi r1, r1, 0x20
-/* 8003D184 4E 80 00 20 */ blr
diff --git a/asm/d/map/d_map_path/preRenderingMap__18dRenderingFDAmap_cFv.s b/asm/d/map/d_map_path/preRenderingMap__18dRenderingFDAmap_cFv.s
deleted file mode 100644
index b3db815d11..0000000000
--- a/asm/d/map/d_map_path/preRenderingMap__18dRenderingFDAmap_cFv.s
+++ /dev/null
@@ -1,103 +0,0 @@
-lbl_8003D188:
-/* 8003D188 94 21 FF 90 */ stwu r1, -0x70(r1)
-/* 8003D18C 7C 08 02 A6 */ mflr r0
-/* 8003D190 90 01 00 74 */ stw r0, 0x74(r1)
-/* 8003D194 93 E1 00 6C */ stw r31, 0x6c(r1)
-/* 8003D198 7C 7F 1B 78 */ mr r31, r3
-/* 8003D19C C0 22 84 08 */ lfs f1, lit_3836(r2)
-/* 8003D1A0 FC 40 08 90 */ fmr f2, f1
-/* 8003D1A4 A0 03 00 1C */ lhz r0, 0x1c(r3)
-/* 8003D1A8 C8 82 84 18 */ lfd f4, lit_3850(r2)
-/* 8003D1AC 90 01 00 54 */ stw r0, 0x54(r1)
-/* 8003D1B0 3C 60 43 30 */ lis r3, 0x4330
-/* 8003D1B4 90 61 00 50 */ stw r3, 0x50(r1)
-/* 8003D1B8 C8 01 00 50 */ lfd f0, 0x50(r1)
-/* 8003D1BC EC 60 20 28 */ fsubs f3, f0, f4
-/* 8003D1C0 A0 1F 00 1E */ lhz r0, 0x1e(r31)
-/* 8003D1C4 90 01 00 5C */ stw r0, 0x5c(r1)
-/* 8003D1C8 90 61 00 58 */ stw r3, 0x58(r1)
-/* 8003D1CC C8 01 00 58 */ lfd f0, 0x58(r1)
-/* 8003D1D0 EC 80 20 28 */ fsubs f4, f0, f4
-/* 8003D1D4 FC A0 08 90 */ fmr f5, f1
-/* 8003D1D8 C0 C2 84 0C */ lfs f6, lit_3846(r2)
-/* 8003D1DC 48 32 32 89 */ bl GXSetViewport
-/* 8003D1E0 38 60 00 00 */ li r3, 0
-/* 8003D1E4 38 80 00 00 */ li r4, 0
-/* 8003D1E8 A0 BF 00 1C */ lhz r5, 0x1c(r31)
-/* 8003D1EC A0 DF 00 1E */ lhz r6, 0x1e(r31)
-/* 8003D1F0 48 32 32 E1 */ bl GXSetScissor
-/* 8003D1F4 38 60 00 01 */ li r3, 1
-/* 8003D1F8 48 32 09 39 */ bl GXSetNumChans
-/* 8003D1FC 38 60 00 01 */ li r3, 1
-/* 8003D200 48 32 26 91 */ bl GXSetNumTevStages
-/* 8003D204 38 60 00 04 */ li r3, 4
-/* 8003D208 38 80 00 00 */ li r4, 0
-/* 8003D20C 38 A0 00 00 */ li r5, 0
-/* 8003D210 38 C0 00 00 */ li r6, 0
-/* 8003D214 38 E0 00 00 */ li r7, 0
-/* 8003D218 39 00 00 00 */ li r8, 0
-/* 8003D21C 39 20 00 02 */ li r9, 2
-/* 8003D220 48 32 09 4D */ bl GXSetChanCtrl
-/* 8003D224 38 60 00 07 */ li r3, 7
-/* 8003D228 38 80 00 00 */ li r4, 0
-/* 8003D22C 38 A0 00 01 */ li r5, 1
-/* 8003D230 38 C0 00 07 */ li r6, 7
-/* 8003D234 38 E0 00 00 */ li r7, 0
-/* 8003D238 48 32 23 ED */ bl GXSetAlphaCompare
-/* 8003D23C 38 60 00 01 */ li r3, 1
-/* 8003D240 48 32 2A 91 */ bl GXSetZCompLoc
-/* 8003D244 38 60 00 00 */ li r3, 0
-/* 8003D248 38 80 00 07 */ li r4, 7
-/* 8003D24C 38 A0 00 00 */ li r5, 0
-/* 8003D250 48 32 2A 4D */ bl GXSetZMode
-/* 8003D254 38 60 00 00 */ li r3, 0
-/* 8003D258 38 80 00 04 */ li r4, 4
-/* 8003D25C 38 A0 00 05 */ li r5, 5
-/* 8003D260 38 C0 00 00 */ li r6, 0
-/* 8003D264 48 32 29 8D */ bl GXSetBlendMode
-/* 8003D268 80 0D 80 80 */ lwz r0, g_clearColor(r13)
-/* 8003D26C 90 01 00 08 */ stw r0, 8(r1)
-/* 8003D270 38 60 00 00 */ li r3, 0
-/* 8003D274 C0 22 84 08 */ lfs f1, lit_3836(r2)
-/* 8003D278 FC 40 08 90 */ fmr f2, f1
-/* 8003D27C FC 60 08 90 */ fmr f3, f1
-/* 8003D280 FC 80 08 90 */ fmr f4, f1
-/* 8003D284 38 81 00 08 */ addi r4, r1, 8
-/* 8003D288 48 32 26 31 */ bl GXSetFog
-/* 8003D28C 38 60 00 00 */ li r3, 0
-/* 8003D290 48 31 F6 F5 */ bl GXSetCullMode
-/* 8003D294 38 60 00 00 */ li r3, 0
-/* 8003D298 48 32 2B 41 */ bl GXSetDither
-/* 8003D29C 38 60 00 00 */ li r3, 0
-/* 8003D2A0 48 32 1E 35 */ bl GXSetNumIndStages
-/* 8003D2A4 38 60 00 00 */ li r3, 0
-/* 8003D2A8 48 32 33 29 */ bl GXSetClipMode
-/* 8003D2AC 7F E3 FB 78 */ mr r3, r31
-/* 8003D2B0 4B FF FB C9 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv
-/* 8003D2B4 C0 22 84 10 */ lfs f1, lit_3847(r2)
-/* 8003D2B8 C0 1F 00 08 */ lfs f0, 8(r31)
-/* 8003D2BC EC 81 00 32 */ fmuls f4, f1, f0
-/* 8003D2C0 C0 1F 00 0C */ lfs f0, 0xc(r31)
-/* 8003D2C4 EC 21 00 32 */ fmuls f1, f1, f0
-/* 8003D2C8 38 61 00 0C */ addi r3, r1, 0xc
-/* 8003D2CC FC 40 08 50 */ fneg f2, f1
-/* 8003D2D0 FC 60 20 50 */ fneg f3, f4
-/* 8003D2D4 C0 A2 84 08 */ lfs f5, lit_3836(r2)
-/* 8003D2D8 C0 C2 84 14 */ lfs f6, lit_3848(r2)
-/* 8003D2DC 48 30 9D 1D */ bl C_MTXOrtho
-/* 8003D2E0 38 61 00 0C */ addi r3, r1, 0xc
-/* 8003D2E4 38 80 00 01 */ li r4, 1
-/* 8003D2E8 48 32 2D ED */ bl GXSetProjection
-/* 8003D2EC 3C 60 80 3A */ lis r3, g_mDoMtx_identity@ha /* 0x803A2FD8@ha */
-/* 8003D2F0 38 63 2F D8 */ addi r3, r3, g_mDoMtx_identity@l /* 0x803A2FD8@l */
-/* 8003D2F4 38 80 00 00 */ li r4, 0
-/* 8003D2F8 48 32 2F 55 */ bl GXLoadPosMtxImm
-/* 8003D2FC 38 60 00 00 */ li r3, 0
-/* 8003D300 48 32 2F ED */ bl GXSetCurrentMtx
-/* 8003D304 7F E3 FB 78 */ mr r3, r31
-/* 8003D308 4B FF FD A5 */ bl drawBack__18dRenderingFDAmap_cCFv
-/* 8003D30C 83 E1 00 6C */ lwz r31, 0x6c(r1)
-/* 8003D310 80 01 00 74 */ lwz r0, 0x74(r1)
-/* 8003D314 7C 08 03 A6 */ mtlr r0
-/* 8003D318 38 21 00 70 */ addi r1, r1, 0x70
-/* 8003D31C 4E 80 00 20 */ blr
diff --git a/asm/d/map/d_map_path/renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class.s b/asm/d/map/d_map_path/renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class.s
deleted file mode 100644
index 268629e656..0000000000
--- a/asm/d/map/d_map_path/renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class.s
+++ /dev/null
@@ -1,184 +0,0 @@
-lbl_8003D3C0:
-/* 8003D3C0 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 8003D3C4 7C 08 02 A6 */ mflr r0
-/* 8003D3C8 90 01 00 34 */ stw r0, 0x34(r1)
-/* 8003D3CC 39 61 00 30 */ addi r11, r1, 0x30
-/* 8003D3D0 48 32 4E 01 */ bl _savegpr_26
-/* 8003D3D4 7C 7F 1B 78 */ mr r31, r3
-/* 8003D3D8 7C 9A 23 78 */ mr r26, r4
-/* 8003D3DC 88 84 00 01 */ lbz r4, 1(r4)
-/* 8003D3E0 81 83 00 00 */ lwz r12, 0(r3)
-/* 8003D3E4 81 8C 00 64 */ lwz r12, 0x64(r12)
-/* 8003D3E8 7D 89 03 A6 */ mtctr r12
-/* 8003D3EC 4E 80 04 21 */ bctrl
-/* 8003D3F0 7C 7D 1B 79 */ or. r29, r3, r3
-/* 8003D3F4 40 81 02 80 */ ble lbl_8003D674
-/* 8003D3F8 7F E3 FB 78 */ mr r3, r31
-/* 8003D3FC 4B FF FB 45 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv
-/* 8003D400 48 31 E1 8D */ bl GXClearVtxDesc
-/* 8003D404 38 60 00 09 */ li r3, 9
-/* 8003D408 38 80 00 03 */ li r4, 3
-/* 8003D40C 48 31 DA AD */ bl GXSetVtxDesc
-/* 8003D410 38 60 00 0D */ li r3, 0xd
-/* 8003D414 38 80 00 01 */ li r4, 1
-/* 8003D418 48 31 DA A1 */ bl GXSetVtxDesc
-/* 8003D41C 38 60 00 00 */ li r3, 0
-/* 8003D420 38 80 00 09 */ li r4, 9
-/* 8003D424 38 A0 00 00 */ li r5, 0
-/* 8003D428 38 C0 00 04 */ li r6, 4
-/* 8003D42C 38 E0 00 00 */ li r7, 0
-/* 8003D430 48 31 E1 95 */ bl GXSetVtxAttrFmt
-/* 8003D434 38 60 00 00 */ li r3, 0
-/* 8003D438 38 80 00 0D */ li r4, 0xd
-/* 8003D43C 38 A0 00 01 */ li r5, 1
-/* 8003D440 38 C0 00 04 */ li r6, 4
-/* 8003D444 38 E0 00 00 */ li r7, 0
-/* 8003D448 48 31 E1 7D */ bl GXSetVtxAttrFmt
-/* 8003D44C 38 60 00 01 */ li r3, 1
-/* 8003D450 48 32 24 41 */ bl GXSetNumTevStages
-/* 8003D454 3C 60 80 42 */ lis r3, m_texObjAgg__8dMpath_n@ha /* 0x80424684@ha */
-/* 8003D458 38 63 46 84 */ addi r3, r3, m_texObjAgg__8dMpath_n@l /* 0x80424684@l */
-/* 8003D45C 80 63 00 18 */ lwz r3, 0x18(r3)
-/* 8003D460 38 80 00 00 */ li r4, 0
-/* 8003D464 48 32 0F B1 */ bl GXLoadTexObj
-/* 8003D468 83 9A 00 04 */ lwz r28, 4(r26)
-/* 8003D46C 8B 7A 00 02 */ lbz r27, 2(r26)
-/* 8003D470 57 A3 06 3E */ clrlwi r3, r29, 0x18
-/* 8003D474 38 80 00 05 */ li r4, 5
-/* 8003D478 48 31 F4 45 */ bl GXSetLineWidth
-/* 8003D47C 57 A3 06 3E */ clrlwi r3, r29, 0x18
-/* 8003D480 38 80 00 05 */ li r4, 5
-/* 8003D484 48 31 F4 79 */ bl GXSetPointSize
-/* 8003D488 7F E3 FB 78 */ mr r3, r31
-/* 8003D48C 88 1A 00 00 */ lbz r0, 0(r26)
-/* 8003D490 54 04 06 BE */ clrlwi r4, r0, 0x1a
-/* 8003D494 88 BA 00 01 */ lbz r5, 1(r26)
-/* 8003D498 81 9F 00 00 */ lwz r12, 0(r31)
-/* 8003D49C 81 8C 00 60 */ lwz r12, 0x60(r12)
-/* 8003D4A0 7D 89 03 A6 */ mtctr r12
-/* 8003D4A4 4E 80 04 21 */ bctrl
-/* 8003D4A8 80 03 00 00 */ lwz r0, 0(r3)
-/* 8003D4AC 90 01 00 10 */ stw r0, 0x10(r1)
-/* 8003D4B0 90 01 00 0C */ stw r0, 0xc(r1)
-/* 8003D4B4 38 60 00 01 */ li r3, 1
-/* 8003D4B8 38 81 00 0C */ addi r4, r1, 0xc
-/* 8003D4BC 48 32 1E C1 */ bl GXSetTevColor
-/* 8003D4C0 88 61 00 10 */ lbz r3, 0x10(r1)
-/* 8003D4C4 38 03 FF FC */ addi r0, r3, -4
-/* 8003D4C8 98 01 00 10 */ stb r0, 0x10(r1)
-/* 8003D4CC 80 01 00 10 */ lwz r0, 0x10(r1)
-/* 8003D4D0 90 01 00 08 */ stw r0, 8(r1)
-/* 8003D4D4 38 60 00 02 */ li r3, 2
-/* 8003D4D8 38 81 00 08 */ addi r4, r1, 8
-/* 8003D4DC 48 32 1E A1 */ bl GXSetTevColor
-/* 8003D4E0 3B 40 00 00 */ li r26, 0
-/* 8003D4E4 3B BB FF FF */ addi r29, r27, -1
-/* 8003D4E8 3F C0 CC 01 */ lis r30, 0xcc01
-/* 8003D4EC 48 00 01 50 */ b lbl_8003D63C
-lbl_8003D4F0:
-/* 8003D4F0 7C 1A E8 00 */ cmpw r26, r29
-/* 8003D4F4 40 80 00 B0 */ bge lbl_8003D5A4
-/* 8003D4F8 38 60 00 00 */ li r3, 0
-/* 8003D4FC 38 80 00 0F */ li r4, 0xf
-/* 8003D500 38 A0 00 0F */ li r5, 0xf
-/* 8003D504 38 C0 00 0F */ li r6, 0xf
-/* 8003D508 38 E0 00 02 */ li r7, 2
-/* 8003D50C 48 32 1D 19 */ bl GXSetTevColorIn
-/* 8003D510 38 60 00 00 */ li r3, 0
-/* 8003D514 38 80 00 00 */ li r4, 0
-/* 8003D518 38 A0 00 00 */ li r5, 0
-/* 8003D51C 38 C0 00 00 */ li r6, 0
-/* 8003D520 38 E0 00 01 */ li r7, 1
-/* 8003D524 39 00 00 00 */ li r8, 0
-/* 8003D528 48 32 1D 85 */ bl GXSetTevColorOp
-/* 8003D52C 38 60 00 00 */ li r3, 0
-/* 8003D530 38 80 00 07 */ li r4, 7
-/* 8003D534 38 A0 00 07 */ li r5, 7
-/* 8003D538 38 C0 00 07 */ li r6, 7
-/* 8003D53C 38 E0 00 06 */ li r7, 6
-/* 8003D540 48 32 1D 29 */ bl GXSetTevAlphaIn
-/* 8003D544 38 60 00 00 */ li r3, 0
-/* 8003D548 38 80 00 00 */ li r4, 0
-/* 8003D54C 38 A0 00 00 */ li r5, 0
-/* 8003D550 38 C0 00 00 */ li r6, 0
-/* 8003D554 38 E0 00 01 */ li r7, 1
-/* 8003D558 39 00 00 00 */ li r8, 0
-/* 8003D55C 48 32 1D B9 */ bl GXSetTevAlphaOp
-/* 8003D560 38 60 00 B0 */ li r3, 0xb0
-/* 8003D564 38 80 00 00 */ li r4, 0
-/* 8003D568 38 A0 00 02 */ li r5, 2
-/* 8003D56C 48 31 F1 F9 */ bl GXBegin
-/* 8003D570 A0 1C 00 00 */ lhz r0, 0(r28)
-/* 8003D574 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */
-/* 8003D578 B0 03 80 00 */ sth r0, 0x8000(r3) /* 0xCC008000@l */
-/* 8003D57C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D580 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D584 C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D588 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D58C A0 1C 00 02 */ lhz r0, 2(r28)
-/* 8003D590 B0 03 80 00 */ sth r0, -0x8000(r3)
-/* 8003D594 C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D598 D0 03 80 00 */ stfs f0, -0x8000(r3)
-/* 8003D59C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D5A0 D0 03 80 00 */ stfs f0, -0x8000(r3)
-lbl_8003D5A4:
-/* 8003D5A4 38 60 00 00 */ li r3, 0
-/* 8003D5A8 38 80 00 0F */ li r4, 0xf
-/* 8003D5AC 38 A0 00 0E */ li r5, 0xe
-/* 8003D5B0 38 C0 00 08 */ li r6, 8
-/* 8003D5B4 38 E0 00 04 */ li r7, 4
-/* 8003D5B8 48 32 1C 6D */ bl GXSetTevColorIn
-/* 8003D5BC 38 60 00 00 */ li r3, 0
-/* 8003D5C0 38 80 00 00 */ li r4, 0
-/* 8003D5C4 38 A0 00 00 */ li r5, 0
-/* 8003D5C8 38 C0 00 00 */ li r6, 0
-/* 8003D5CC 38 E0 00 01 */ li r7, 1
-/* 8003D5D0 39 00 00 00 */ li r8, 0
-/* 8003D5D4 48 32 1C D9 */ bl GXSetTevColorOp
-/* 8003D5D8 38 60 00 00 */ li r3, 0
-/* 8003D5DC 38 80 00 07 */ li r4, 7
-/* 8003D5E0 38 A0 00 07 */ li r5, 7
-/* 8003D5E4 38 C0 00 07 */ li r6, 7
-/* 8003D5E8 38 E0 00 04 */ li r7, 4
-/* 8003D5EC 48 32 1C 7D */ bl GXSetTevAlphaIn
-/* 8003D5F0 38 60 00 00 */ li r3, 0
-/* 8003D5F4 38 80 00 00 */ li r4, 0
-/* 8003D5F8 38 A0 00 00 */ li r5, 0
-/* 8003D5FC 38 C0 00 00 */ li r6, 0
-/* 8003D600 38 E0 00 01 */ li r7, 1
-/* 8003D604 39 00 00 00 */ li r8, 0
-/* 8003D608 48 32 1D 0D */ bl GXSetTevAlphaOp
-/* 8003D60C 38 60 00 B8 */ li r3, 0xb8
-/* 8003D610 38 80 00 00 */ li r4, 0
-/* 8003D614 38 A0 00 01 */ li r5, 1
-/* 8003D618 48 31 F1 4D */ bl GXBegin
-/* 8003D61C A0 1C 00 00 */ lhz r0, 0(r28)
-/* 8003D620 B0 1E 80 00 */ sth r0, -0x8000(r30)
-/* 8003D624 C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D628 D0 1E 80 00 */ stfs f0, -0x8000(r30)
-/* 8003D62C C0 02 84 08 */ lfs f0, lit_3836(r2)
-/* 8003D630 D0 1E 80 00 */ stfs f0, -0x8000(r30)
-/* 8003D634 3B 9C 00 02 */ addi r28, r28, 2
-/* 8003D638 3B 5A 00 01 */ addi r26, r26, 1
-lbl_8003D63C:
-/* 8003D63C 7C 1A D8 00 */ cmpw r26, r27
-/* 8003D640 41 80 FE B0 */ blt lbl_8003D4F0
-/* 8003D644 7F E3 FB 78 */ mr r3, r31
-/* 8003D648 4B FF F8 31 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv
-/* 8003D64C 48 31 DF 41 */ bl GXClearVtxDesc
-/* 8003D650 38 60 00 09 */ li r3, 9
-/* 8003D654 38 80 00 03 */ li r4, 3
-/* 8003D658 48 31 D8 61 */ bl GXSetVtxDesc
-/* 8003D65C 38 60 00 00 */ li r3, 0
-/* 8003D660 38 80 00 09 */ li r4, 9
-/* 8003D664 38 A0 00 00 */ li r5, 0
-/* 8003D668 38 C0 00 04 */ li r6, 4
-/* 8003D66C 38 E0 00 00 */ li r7, 0
-/* 8003D670 48 31 DF 55 */ bl GXSetVtxAttrFmt
-lbl_8003D674:
-/* 8003D674 39 61 00 30 */ addi r11, r1, 0x30
-/* 8003D678 48 32 4B A5 */ bl _restgpr_26
-/* 8003D67C 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 8003D680 7C 08 03 A6 */ mtlr r0
-/* 8003D684 38 21 00 30 */ addi r1, r1, 0x30
-/* 8003D688 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/__dt__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/__dt__13dMeter2Draw_cFv.s
deleted file mode 100644
index e75c82ffa4..0000000000
--- a/asm/d/meter/d_meter2_draw/__dt__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,908 +0,0 @@
-lbl_802102F8:
-/* 802102F8 94 21 FF C0 */ stwu r1, -0x40(r1)
-/* 802102FC 7C 08 02 A6 */ mflr r0
-/* 80210300 90 01 00 44 */ stw r0, 0x44(r1)
-/* 80210304 39 61 00 40 */ addi r11, r1, 0x40
-/* 80210308 48 15 1E B1 */ bl _savegpr_20
-/* 8021030C 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80210310 7C 9E 23 78 */ mr r30, r4
-/* 80210314 41 82 0C 80 */ beq lbl_80210F94
-/* 80210318 3C 60 80 3C */ lis r3, __vt__13dMeter2Draw_c@ha /* 0x803BF750@ha */
-/* 8021031C 38 03 F7 50 */ addi r0, r3, __vt__13dMeter2Draw_c@l /* 0x803BF750@l */
-/* 80210320 90 1F 00 00 */ stw r0, 0(r31)
-/* 80210324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80210328 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8021032C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26)
-/* 80210330 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */
-/* 80210334 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */
-/* 80210338 80 84 00 10 */ lwz r4, 0x10(r4)
-/* 8021033C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210340 81 8C 00 28 */ lwz r12, 0x28(r12)
-/* 80210344 7D 89 03 A6 */ mtctr r12
-/* 80210348 4E 80 04 21 */ bctrl
-/* 8021034C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26)
-/* 80210350 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */
-/* 80210354 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */
-/* 80210358 80 84 00 18 */ lwz r4, 0x18(r4)
-/* 8021035C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210360 81 8C 00 28 */ lwz r12, 0x28(r12)
-/* 80210364 7D 89 03 A6 */ mtctr r12
-/* 80210368 4E 80 04 21 */ bctrl
-/* 8021036C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80210370 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80210374 80 63 5C D0 */ lwz r3, 0x5cd0(r3)
-/* 80210378 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021037C 81 8C 00 24 */ lwz r12, 0x24(r12)
-/* 80210380 7D 89 03 A6 */ mtctr r12
-/* 80210384 4E 80 04 21 */ bctrl
-/* 80210388 80 7F 00 78 */ lwz r3, 0x78(r31)
-/* 8021038C 28 03 00 00 */ cmplwi r3, 0
-/* 80210390 41 82 00 18 */ beq lbl_802103A8
-/* 80210394 38 80 00 01 */ li r4, 1
-/* 80210398 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021039C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802103A0 7D 89 03 A6 */ mtctr r12
-/* 802103A4 4E 80 04 21 */ bctrl
-lbl_802103A8:
-/* 802103A8 38 00 00 00 */ li r0, 0
-/* 802103AC 90 1F 00 78 */ stw r0, 0x78(r31)
-/* 802103B0 80 7F 00 7C */ lwz r3, 0x7c(r31)
-/* 802103B4 28 03 00 00 */ cmplwi r3, 0
-/* 802103B8 41 82 00 18 */ beq lbl_802103D0
-/* 802103BC 38 80 00 01 */ li r4, 1
-/* 802103C0 81 83 00 00 */ lwz r12, 0(r3)
-/* 802103C4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802103C8 7D 89 03 A6 */ mtctr r12
-/* 802103CC 4E 80 04 21 */ bctrl
-lbl_802103D0:
-/* 802103D0 3B 40 00 00 */ li r26, 0
-/* 802103D4 93 5F 00 7C */ stw r26, 0x7c(r31)
-/* 802103D8 3A E0 00 00 */ li r23, 0
-/* 802103DC 7F 5B D3 78 */ mr r27, r26
-lbl_802103E0:
-/* 802103E0 3B 1B 00 AC */ addi r24, r27, 0xac
-/* 802103E4 7C 7F C0 2E */ lwzx r3, r31, r24
-/* 802103E8 28 03 00 00 */ cmplwi r3, 0
-/* 802103EC 41 82 00 18 */ beq lbl_80210404
-/* 802103F0 38 80 00 01 */ li r4, 1
-/* 802103F4 81 83 00 00 */ lwz r12, 0(r3)
-/* 802103F8 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802103FC 7D 89 03 A6 */ mtctr r12
-/* 80210400 4E 80 04 21 */ bctrl
-lbl_80210404:
-/* 80210404 7F 5F C1 2E */ stwx r26, r31, r24
-/* 80210408 3A F7 00 01 */ addi r23, r23, 1
-/* 8021040C 2C 17 00 02 */ cmpwi r23, 2
-/* 80210410 3B 7B 00 04 */ addi r27, r27, 4
-/* 80210414 41 80 FF CC */ blt lbl_802103E0
-/* 80210418 80 7F 00 BC */ lwz r3, 0xbc(r31)
-/* 8021041C 28 03 00 00 */ cmplwi r3, 0
-/* 80210420 41 82 00 18 */ beq lbl_80210438
-/* 80210424 38 80 00 01 */ li r4, 1
-/* 80210428 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021042C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210430 7D 89 03 A6 */ mtctr r12
-/* 80210434 4E 80 04 21 */ bctrl
-lbl_80210438:
-/* 80210438 38 00 00 00 */ li r0, 0
-/* 8021043C 90 1F 00 BC */ stw r0, 0xbc(r31)
-/* 80210440 80 7F 00 80 */ lwz r3, 0x80(r31)
-/* 80210444 28 03 00 00 */ cmplwi r3, 0
-/* 80210448 41 82 00 18 */ beq lbl_80210460
-/* 8021044C 38 80 00 01 */ li r4, 1
-/* 80210450 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210454 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210458 7D 89 03 A6 */ mtctr r12
-/* 8021045C 4E 80 04 21 */ bctrl
-lbl_80210460:
-/* 80210460 38 00 00 00 */ li r0, 0
-/* 80210464 90 1F 00 80 */ stw r0, 0x80(r31)
-/* 80210468 80 7F 03 9C */ lwz r3, 0x39c(r31)
-/* 8021046C 28 03 00 00 */ cmplwi r3, 0
-/* 80210470 41 82 00 18 */ beq lbl_80210488
-/* 80210474 38 80 00 01 */ li r4, 1
-/* 80210478 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021047C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210480 7D 89 03 A6 */ mtctr r12
-/* 80210484 4E 80 04 21 */ bctrl
-lbl_80210488:
-/* 80210488 38 00 00 00 */ li r0, 0
-/* 8021048C 90 1F 03 9C */ stw r0, 0x39c(r31)
-/* 80210490 80 7F 05 34 */ lwz r3, 0x534(r31)
-/* 80210494 28 03 00 00 */ cmplwi r3, 0
-/* 80210498 41 82 00 18 */ beq lbl_802104B0
-/* 8021049C 38 80 00 01 */ li r4, 1
-/* 802104A0 81 83 00 00 */ lwz r12, 0(r3)
-/* 802104A4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802104A8 7D 89 03 A6 */ mtctr r12
-/* 802104AC 4E 80 04 21 */ bctrl
-lbl_802104B0:
-/* 802104B0 38 00 00 00 */ li r0, 0
-/* 802104B4 90 1F 05 34 */ stw r0, 0x534(r31)
-/* 802104B8 80 7F 05 38 */ lwz r3, 0x538(r31)
-/* 802104BC 28 03 00 00 */ cmplwi r3, 0
-/* 802104C0 41 82 00 18 */ beq lbl_802104D8
-/* 802104C4 38 80 00 01 */ li r4, 1
-/* 802104C8 81 83 00 00 */ lwz r12, 0(r3)
-/* 802104CC 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802104D0 7D 89 03 A6 */ mtctr r12
-/* 802104D4 4E 80 04 21 */ bctrl
-lbl_802104D8:
-/* 802104D8 38 00 00 00 */ li r0, 0
-/* 802104DC 90 1F 05 38 */ stw r0, 0x538(r31)
-/* 802104E0 3A E0 00 00 */ li r23, 0
-/* 802104E4 3B 60 00 00 */ li r27, 0
-/* 802104E8 3B 80 00 00 */ li r28, 0
-lbl_802104EC:
-/* 802104EC 7F 1F E2 14 */ add r24, r31, r28
-/* 802104F0 80 78 00 C0 */ lwz r3, 0xc0(r24)
-/* 802104F4 28 03 00 00 */ cmplwi r3, 0
-/* 802104F8 41 82 00 18 */ beq lbl_80210510
-/* 802104FC 38 80 00 01 */ li r4, 1
-/* 80210500 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210504 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210508 7D 89 03 A6 */ mtctr r12
-/* 8021050C 4E 80 04 21 */ bctrl
-lbl_80210510:
-/* 80210510 38 00 00 00 */ li r0, 0
-/* 80210514 90 18 00 C0 */ stw r0, 0xc0(r24)
-/* 80210518 80 78 00 D4 */ lwz r3, 0xd4(r24)
-/* 8021051C 28 03 00 00 */ cmplwi r3, 0
-/* 80210520 41 82 00 18 */ beq lbl_80210538
-/* 80210524 38 80 00 01 */ li r4, 1
-/* 80210528 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021052C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210530 7D 89 03 A6 */ mtctr r12
-/* 80210534 4E 80 04 21 */ bctrl
-lbl_80210538:
-/* 80210538 3B 40 00 00 */ li r26, 0
-/* 8021053C 93 58 00 D4 */ stw r26, 0xd4(r24)
-/* 80210540 3A C0 00 00 */ li r22, 0
-/* 80210544 3B A0 00 00 */ li r29, 0
-/* 80210548 7F 3F DA 14 */ add r25, r31, r27
-lbl_8021054C:
-/* 8021054C 3B 1D 00 E8 */ addi r24, r29, 0xe8
-/* 80210550 7C 79 C0 2E */ lwzx r3, r25, r24
-/* 80210554 28 03 00 00 */ cmplwi r3, 0
-/* 80210558 41 82 00 18 */ beq lbl_80210570
-/* 8021055C 38 80 00 01 */ li r4, 1
-/* 80210560 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210564 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210568 7D 89 03 A6 */ mtctr r12
-/* 8021056C 4E 80 04 21 */ bctrl
-lbl_80210570:
-/* 80210570 7F 59 C1 2E */ stwx r26, r25, r24
-/* 80210574 3A D6 00 01 */ addi r22, r22, 1
-/* 80210578 2C 16 00 03 */ cmpwi r22, 3
-/* 8021057C 3B BD 00 04 */ addi r29, r29, 4
-/* 80210580 41 80 FF CC */ blt lbl_8021054C
-/* 80210584 3A F7 00 01 */ addi r23, r23, 1
-/* 80210588 2C 17 00 05 */ cmpwi r23, 5
-/* 8021058C 3B 7B 00 0C */ addi r27, r27, 0xc
-/* 80210590 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210594 41 80 FF 58 */ blt lbl_802104EC
-/* 80210598 80 7F 01 24 */ lwz r3, 0x124(r31)
-/* 8021059C 28 03 00 00 */ cmplwi r3, 0
-/* 802105A0 41 82 00 18 */ beq lbl_802105B8
-/* 802105A4 38 80 00 01 */ li r4, 1
-/* 802105A8 81 83 00 00 */ lwz r12, 0(r3)
-/* 802105AC 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802105B0 7D 89 03 A6 */ mtctr r12
-/* 802105B4 4E 80 04 21 */ bctrl
-lbl_802105B8:
-/* 802105B8 38 00 00 00 */ li r0, 0
-/* 802105BC 90 1F 01 24 */ stw r0, 0x124(r31)
-/* 802105C0 3A C0 00 00 */ li r22, 0
-/* 802105C4 3B 60 00 00 */ li r27, 0
-/* 802105C8 3B 80 00 00 */ li r28, 0
-lbl_802105CC:
-/* 802105CC 7F 1F E2 14 */ add r24, r31, r28
-/* 802105D0 80 78 01 28 */ lwz r3, 0x128(r24)
-/* 802105D4 28 03 00 00 */ cmplwi r3, 0
-/* 802105D8 41 82 00 18 */ beq lbl_802105F0
-/* 802105DC 38 80 00 01 */ li r4, 1
-/* 802105E0 81 83 00 00 */ lwz r12, 0(r3)
-/* 802105E4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802105E8 7D 89 03 A6 */ mtctr r12
-/* 802105EC 4E 80 04 21 */ bctrl
-lbl_802105F0:
-/* 802105F0 38 00 00 00 */ li r0, 0
-/* 802105F4 90 18 01 28 */ stw r0, 0x128(r24)
-/* 802105F8 80 78 01 78 */ lwz r3, 0x178(r24)
-/* 802105FC 28 03 00 00 */ cmplwi r3, 0
-/* 80210600 41 82 00 18 */ beq lbl_80210618
-/* 80210604 38 80 00 01 */ li r4, 1
-/* 80210608 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021060C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210610 7D 89 03 A6 */ mtctr r12
-/* 80210614 4E 80 04 21 */ bctrl
-lbl_80210618:
-/* 80210618 38 00 00 00 */ li r0, 0
-/* 8021061C 90 18 01 78 */ stw r0, 0x178(r24)
-/* 80210620 80 78 04 40 */ lwz r3, 0x440(r24)
-/* 80210624 28 03 00 00 */ cmplwi r3, 0
-/* 80210628 41 82 00 18 */ beq lbl_80210640
-/* 8021062C 38 80 00 01 */ li r4, 1
-/* 80210630 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210634 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210638 7D 89 03 A6 */ mtctr r12
-/* 8021063C 4E 80 04 21 */ bctrl
-lbl_80210640:
-/* 80210640 38 00 00 00 */ li r0, 0
-/* 80210644 90 18 04 40 */ stw r0, 0x440(r24)
-/* 80210648 7F 1F DA 14 */ add r24, r31, r27
-/* 8021064C 80 78 03 A0 */ lwz r3, 0x3a0(r24)
-/* 80210650 28 03 00 00 */ cmplwi r3, 0
-/* 80210654 41 82 00 18 */ beq lbl_8021066C
-/* 80210658 38 80 00 01 */ li r4, 1
-/* 8021065C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210660 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210664 7D 89 03 A6 */ mtctr r12
-/* 80210668 4E 80 04 21 */ bctrl
-lbl_8021066C:
-/* 8021066C 38 00 00 00 */ li r0, 0
-/* 80210670 90 18 03 A0 */ stw r0, 0x3a0(r24)
-/* 80210674 80 78 03 A4 */ lwz r3, 0x3a4(r24)
-/* 80210678 28 03 00 00 */ cmplwi r3, 0
-/* 8021067C 41 82 00 18 */ beq lbl_80210694
-/* 80210680 38 80 00 01 */ li r4, 1
-/* 80210684 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210688 81 8C 00 08 */ lwz r12, 8(r12)
-/* 8021068C 7D 89 03 A6 */ mtctr r12
-/* 80210690 4E 80 04 21 */ bctrl
-lbl_80210694:
-/* 80210694 38 00 00 00 */ li r0, 0
-/* 80210698 90 18 03 A4 */ stw r0, 0x3a4(r24)
-/* 8021069C 3A D6 00 01 */ addi r22, r22, 1
-/* 802106A0 2C 16 00 14 */ cmpwi r22, 0x14
-/* 802106A4 3B 7B 00 08 */ addi r27, r27, 8
-/* 802106A8 3B 9C 00 04 */ addi r28, r28, 4
-/* 802106AC 41 80 FF 20 */ blt lbl_802105CC
-/* 802106B0 80 7F 01 C8 */ lwz r3, 0x1c8(r31)
-/* 802106B4 28 03 00 00 */ cmplwi r3, 0
-/* 802106B8 41 82 00 18 */ beq lbl_802106D0
-/* 802106BC 38 80 00 01 */ li r4, 1
-/* 802106C0 81 83 00 00 */ lwz r12, 0(r3)
-/* 802106C4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802106C8 7D 89 03 A6 */ mtctr r12
-/* 802106CC 4E 80 04 21 */ bctrl
-lbl_802106D0:
-/* 802106D0 38 00 00 00 */ li r0, 0
-/* 802106D4 90 1F 01 C8 */ stw r0, 0x1c8(r31)
-/* 802106D8 80 7F 01 CC */ lwz r3, 0x1cc(r31)
-/* 802106DC 28 03 00 00 */ cmplwi r3, 0
-/* 802106E0 41 82 00 18 */ beq lbl_802106F8
-/* 802106E4 38 80 00 01 */ li r4, 1
-/* 802106E8 81 83 00 00 */ lwz r12, 0(r3)
-/* 802106EC 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802106F0 7D 89 03 A6 */ mtctr r12
-/* 802106F4 4E 80 04 21 */ bctrl
-lbl_802106F8:
-/* 802106F8 38 00 00 00 */ li r0, 0
-/* 802106FC 90 1F 01 CC */ stw r0, 0x1cc(r31)
-/* 80210700 80 7F 01 D0 */ lwz r3, 0x1d0(r31)
-/* 80210704 28 03 00 00 */ cmplwi r3, 0
-/* 80210708 41 82 00 18 */ beq lbl_80210720
-/* 8021070C 38 80 00 01 */ li r4, 1
-/* 80210710 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210714 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210718 7D 89 03 A6 */ mtctr r12
-/* 8021071C 4E 80 04 21 */ bctrl
-lbl_80210720:
-/* 80210720 38 00 00 00 */ li r0, 0
-/* 80210724 90 1F 01 D0 */ stw r0, 0x1d0(r31)
-/* 80210728 80 7F 01 D4 */ lwz r3, 0x1d4(r31)
-/* 8021072C 28 03 00 00 */ cmplwi r3, 0
-/* 80210730 41 82 00 18 */ beq lbl_80210748
-/* 80210734 38 80 00 01 */ li r4, 1
-/* 80210738 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021073C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210740 7D 89 03 A6 */ mtctr r12
-/* 80210744 4E 80 04 21 */ bctrl
-lbl_80210748:
-/* 80210748 38 00 00 00 */ li r0, 0
-/* 8021074C 90 1F 01 D4 */ stw r0, 0x1d4(r31)
-/* 80210750 80 7F 01 DC */ lwz r3, 0x1dc(r31)
-/* 80210754 28 03 00 00 */ cmplwi r3, 0
-/* 80210758 41 82 00 18 */ beq lbl_80210770
-/* 8021075C 38 80 00 01 */ li r4, 1
-/* 80210760 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210764 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210768 7D 89 03 A6 */ mtctr r12
-/* 8021076C 4E 80 04 21 */ bctrl
-lbl_80210770:
-/* 80210770 3B 40 00 00 */ li r26, 0
-/* 80210774 93 5F 01 DC */ stw r26, 0x1dc(r31)
-/* 80210778 3A C0 00 00 */ li r22, 0
-/* 8021077C 3B 60 00 00 */ li r27, 0
-lbl_80210780:
-/* 80210780 3B 1B 05 3C */ addi r24, r27, 0x53c
-/* 80210784 7C 7F C0 2E */ lwzx r3, r31, r24
-/* 80210788 28 03 00 00 */ cmplwi r3, 0
-/* 8021078C 41 82 00 18 */ beq lbl_802107A4
-/* 80210790 38 80 00 01 */ li r4, 1
-/* 80210794 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210798 81 8C 00 08 */ lwz r12, 8(r12)
-/* 8021079C 7D 89 03 A6 */ mtctr r12
-/* 802107A0 4E 80 04 21 */ bctrl
-lbl_802107A4:
-/* 802107A4 7F 5F C1 2E */ stwx r26, r31, r24
-/* 802107A8 3A D6 00 01 */ addi r22, r22, 1
-/* 802107AC 2C 16 00 03 */ cmpwi r22, 3
-/* 802107B0 3B 7B 00 04 */ addi r27, r27, 4
-/* 802107B4 41 80 FF CC */ blt lbl_80210780
-/* 802107B8 80 7F 01 D8 */ lwz r3, 0x1d8(r31)
-/* 802107BC 28 03 00 00 */ cmplwi r3, 0
-/* 802107C0 41 82 00 18 */ beq lbl_802107D8
-/* 802107C4 38 80 00 01 */ li r4, 1
-/* 802107C8 81 83 00 00 */ lwz r12, 0(r3)
-/* 802107CC 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802107D0 7D 89 03 A6 */ mtctr r12
-/* 802107D4 4E 80 04 21 */ bctrl
-lbl_802107D8:
-/* 802107D8 3B 40 00 00 */ li r26, 0
-/* 802107DC 93 5F 01 D8 */ stw r26, 0x1d8(r31)
-/* 802107E0 3A C0 00 00 */ li r22, 0
-/* 802107E4 3B 60 00 00 */ li r27, 0
-lbl_802107E8:
-/* 802107E8 3B 1B 01 E8 */ addi r24, r27, 0x1e8
-/* 802107EC 7C 7F C0 2E */ lwzx r3, r31, r24
-/* 802107F0 28 03 00 00 */ cmplwi r3, 0
-/* 802107F4 41 82 00 18 */ beq lbl_8021080C
-/* 802107F8 38 80 00 01 */ li r4, 1
-/* 802107FC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210800 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210804 7D 89 03 A6 */ mtctr r12
-/* 80210808 4E 80 04 21 */ bctrl
-lbl_8021080C:
-/* 8021080C 7F 5F C1 2E */ stwx r26, r31, r24
-/* 80210810 3A D6 00 01 */ addi r22, r22, 1
-/* 80210814 2C 16 00 02 */ cmpwi r22, 2
-/* 80210818 3B 7B 00 04 */ addi r27, r27, 4
-/* 8021081C 41 80 FF CC */ blt lbl_802107E8
-/* 80210820 80 7F 01 E0 */ lwz r3, 0x1e0(r31)
-/* 80210824 28 03 00 00 */ cmplwi r3, 0
-/* 80210828 41 82 00 18 */ beq lbl_80210840
-/* 8021082C 38 80 00 01 */ li r4, 1
-/* 80210830 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210834 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210838 7D 89 03 A6 */ mtctr r12
-/* 8021083C 4E 80 04 21 */ bctrl
-lbl_80210840:
-/* 80210840 38 00 00 00 */ li r0, 0
-/* 80210844 90 1F 01 E0 */ stw r0, 0x1e0(r31)
-/* 80210848 3A C0 00 00 */ li r22, 0
-/* 8021084C 3B 60 00 00 */ li r27, 0
-lbl_80210850:
-/* 80210850 3A E0 00 00 */ li r23, 0
-/* 80210854 3B 80 00 00 */ li r28, 0
-/* 80210858 7F 3F DA 14 */ add r25, r31, r27
-/* 8021085C 3B 40 00 00 */ li r26, 0
-lbl_80210860:
-/* 80210860 3B 1C 01 F0 */ addi r24, r28, 0x1f0
-/* 80210864 7C 79 C0 2E */ lwzx r3, r25, r24
-/* 80210868 28 03 00 00 */ cmplwi r3, 0
-/* 8021086C 41 82 00 20 */ beq lbl_8021088C
-/* 80210870 41 82 00 18 */ beq lbl_80210888
-/* 80210874 38 80 00 01 */ li r4, 1
-/* 80210878 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021087C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210880 7D 89 03 A6 */ mtctr r12
-/* 80210884 4E 80 04 21 */ bctrl
-lbl_80210888:
-/* 80210888 7F 59 C1 2E */ stwx r26, r25, r24
-lbl_8021088C:
-/* 8021088C 3A F7 00 01 */ addi r23, r23, 1
-/* 80210890 2C 17 00 03 */ cmpwi r23, 3
-/* 80210894 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210898 41 80 FF C8 */ blt lbl_80210860
-/* 8021089C 3A D6 00 01 */ addi r22, r22, 1
-/* 802108A0 2C 16 00 10 */ cmpwi r22, 0x10
-/* 802108A4 3B 7B 00 0C */ addi r27, r27, 0xc
-/* 802108A8 41 80 FF A8 */ blt lbl_80210850
-/* 802108AC 80 7F 02 B0 */ lwz r3, 0x2b0(r31)
-/* 802108B0 28 03 00 00 */ cmplwi r3, 0
-/* 802108B4 41 82 00 18 */ beq lbl_802108CC
-/* 802108B8 38 80 00 01 */ li r4, 1
-/* 802108BC 81 83 00 00 */ lwz r12, 0(r3)
-/* 802108C0 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802108C4 7D 89 03 A6 */ mtctr r12
-/* 802108C8 4E 80 04 21 */ bctrl
-lbl_802108CC:
-/* 802108CC 38 00 00 00 */ li r0, 0
-/* 802108D0 90 1F 02 B0 */ stw r0, 0x2b0(r31)
-/* 802108D4 3A C0 00 00 */ li r22, 0
-/* 802108D8 3B 60 00 00 */ li r27, 0
-lbl_802108DC:
-/* 802108DC 7F 1F DA 14 */ add r24, r31, r27
-/* 802108E0 80 78 02 C0 */ lwz r3, 0x2c0(r24)
-/* 802108E4 28 03 00 00 */ cmplwi r3, 0
-/* 802108E8 41 82 00 18 */ beq lbl_80210900
-/* 802108EC 38 80 00 01 */ li r4, 1
-/* 802108F0 81 83 00 00 */ lwz r12, 0(r3)
-/* 802108F4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802108F8 7D 89 03 A6 */ mtctr r12
-/* 802108FC 4E 80 04 21 */ bctrl
-lbl_80210900:
-/* 80210900 38 00 00 00 */ li r0, 0
-/* 80210904 90 18 02 C0 */ stw r0, 0x2c0(r24)
-/* 80210908 80 78 02 C4 */ lwz r3, 0x2c4(r24)
-/* 8021090C 28 03 00 00 */ cmplwi r3, 0
-/* 80210910 41 82 00 18 */ beq lbl_80210928
-/* 80210914 38 80 00 01 */ li r4, 1
-/* 80210918 81 83 00 00 */ lwz r12, 0(r3)
-/* 8021091C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210920 7D 89 03 A6 */ mtctr r12
-/* 80210924 4E 80 04 21 */ bctrl
-lbl_80210928:
-/* 80210928 3B 40 00 00 */ li r26, 0
-/* 8021092C 93 58 02 C4 */ stw r26, 0x2c4(r24)
-/* 80210930 3A D6 00 01 */ addi r22, r22, 1
-/* 80210934 2C 16 00 04 */ cmpwi r22, 4
-/* 80210938 3B 7B 00 08 */ addi r27, r27, 8
-/* 8021093C 41 80 FF A0 */ blt lbl_802108DC
-/* 80210940 3A C0 00 00 */ li r22, 0
-/* 80210944 3B 60 00 00 */ li r27, 0
-lbl_80210948:
-/* 80210948 3B 1B 02 B4 */ addi r24, r27, 0x2b4
-/* 8021094C 7C 7F C0 2E */ lwzx r3, r31, r24
-/* 80210950 28 03 00 00 */ cmplwi r3, 0
-/* 80210954 41 82 00 18 */ beq lbl_8021096C
-/* 80210958 38 80 00 01 */ li r4, 1
-/* 8021095C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210960 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210964 7D 89 03 A6 */ mtctr r12
-/* 80210968 4E 80 04 21 */ bctrl
-lbl_8021096C:
-/* 8021096C 7F 5F C1 2E */ stwx r26, r31, r24
-/* 80210970 3A D6 00 01 */ addi r22, r22, 1
-/* 80210974 2C 16 00 03 */ cmpwi r22, 3
-/* 80210978 3B 7B 00 04 */ addi r27, r27, 4
-/* 8021097C 41 80 FF CC */ blt lbl_80210948
-/* 80210980 3A C0 00 00 */ li r22, 0
-/* 80210984 3B 60 00 00 */ li r27, 0
-/* 80210988 3B 40 00 00 */ li r26, 0
-lbl_8021098C:
-/* 8021098C 3B 1B 02 E4 */ addi r24, r27, 0x2e4
-/* 80210990 7C 7F C0 2E */ lwzx r3, r31, r24
-/* 80210994 28 03 00 00 */ cmplwi r3, 0
-/* 80210998 41 82 00 18 */ beq lbl_802109B0
-/* 8021099C 38 80 00 01 */ li r4, 1
-/* 802109A0 81 83 00 00 */ lwz r12, 0(r3)
-/* 802109A4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802109A8 7D 89 03 A6 */ mtctr r12
-/* 802109AC 4E 80 04 21 */ bctrl
-lbl_802109B0:
-/* 802109B0 7F 5F C1 2E */ stwx r26, r31, r24
-/* 802109B4 3A D6 00 01 */ addi r22, r22, 1
-/* 802109B8 2C 16 00 05 */ cmpwi r22, 5
-/* 802109BC 3B 7B 00 04 */ addi r27, r27, 4
-/* 802109C0 41 80 FF CC */ blt lbl_8021098C
-/* 802109C4 80 7F 02 E0 */ lwz r3, 0x2e0(r31)
-/* 802109C8 28 03 00 00 */ cmplwi r3, 0
-/* 802109CC 41 82 00 18 */ beq lbl_802109E4
-/* 802109D0 38 80 00 01 */ li r4, 1
-/* 802109D4 81 83 00 00 */ lwz r12, 0(r3)
-/* 802109D8 81 8C 00 08 */ lwz r12, 8(r12)
-/* 802109DC 7D 89 03 A6 */ mtctr r12
-/* 802109E0 4E 80 04 21 */ bctrl
-lbl_802109E4:
-/* 802109E4 3B 40 00 00 */ li r26, 0
-/* 802109E8 93 5F 02 E0 */ stw r26, 0x2e0(r31)
-/* 802109EC 3A C0 00 00 */ li r22, 0
-/* 802109F0 3B 60 00 00 */ li r27, 0
-lbl_802109F4:
-/* 802109F4 3A E0 00 00 */ li r23, 0
-/* 802109F8 3B 80 00 00 */ li r28, 0
-/* 802109FC 7F 3F DA 14 */ add r25, r31, r27
-lbl_80210A00:
-/* 80210A00 80 7F 00 74 */ lwz r3, 0x74(r31)
-/* 80210A04 3B 1C 04 E4 */ addi r24, r28, 0x4e4
-/* 80210A08 7C 99 C0 2E */ lwzx r4, r25, r24
-/* 80210A0C 48 0B DB 3D */ bl free__7JKRHeapFPv
-/* 80210A10 7F 59 C1 2E */ stwx r26, r25, r24
-/* 80210A14 3A F7 00 01 */ addi r23, r23, 1
-/* 80210A18 2C 17 00 02 */ cmpwi r23, 2
-/* 80210A1C 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210A20 41 80 FF E0 */ blt lbl_80210A00
-/* 80210A24 3A D6 00 01 */ addi r22, r22, 1
-/* 80210A28 2C 16 00 02 */ cmpwi r22, 2
-/* 80210A2C 3B 7B 00 08 */ addi r27, r27, 8
-/* 80210A30 41 80 FF C4 */ blt lbl_802109F4
-/* 80210A34 3A C0 00 00 */ li r22, 0
-/* 80210A38 3B 80 00 00 */ li r28, 0
-lbl_80210A3C:
-/* 80210A3C 3A A0 00 00 */ li r21, 0
-/* 80210A40 3B A0 00 00 */ li r29, 0
-/* 80210A44 7F 1F E2 14 */ add r24, r31, r28
-/* 80210A48 3B 40 00 00 */ li r26, 0
-lbl_80210A4C:
-/* 80210A4C 3A 80 00 00 */ li r20, 0
-/* 80210A50 3B 60 00 00 */ li r27, 0
-/* 80210A54 7F 38 EA 14 */ add r25, r24, r29
-lbl_80210A58:
-/* 80210A58 80 7F 00 74 */ lwz r3, 0x74(r31)
-/* 80210A5C 3A FB 04 F4 */ addi r23, r27, 0x4f4
-/* 80210A60 7C 99 B8 2E */ lwzx r4, r25, r23
-/* 80210A64 48 0B DA E5 */ bl free__7JKRHeapFPv
-/* 80210A68 7F 59 B9 2E */ stwx r26, r25, r23
-/* 80210A6C 3A 94 00 01 */ addi r20, r20, 1
-/* 80210A70 2C 14 00 02 */ cmpwi r20, 2
-/* 80210A74 3B 7B 00 04 */ addi r27, r27, 4
-/* 80210A78 41 80 FF E0 */ blt lbl_80210A58
-/* 80210A7C 3A B5 00 01 */ addi r21, r21, 1
-/* 80210A80 2C 15 00 02 */ cmpwi r21, 2
-/* 80210A84 3B BD 00 08 */ addi r29, r29, 8
-/* 80210A88 41 80 FF C4 */ blt lbl_80210A4C
-/* 80210A8C 3A D6 00 01 */ addi r22, r22, 1
-/* 80210A90 2C 16 00 02 */ cmpwi r22, 2
-/* 80210A94 3B 9C 00 10 */ addi r28, r28, 0x10
-/* 80210A98 41 80 FF A4 */ blt lbl_80210A3C
-/* 80210A9C 80 7F 03 28 */ lwz r3, 0x328(r31)
-/* 80210AA0 28 03 00 00 */ cmplwi r3, 0
-/* 80210AA4 41 82 00 18 */ beq lbl_80210ABC
-/* 80210AA8 38 80 00 01 */ li r4, 1
-/* 80210AAC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210AB0 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210AB4 7D 89 03 A6 */ mtctr r12
-/* 80210AB8 4E 80 04 21 */ bctrl
-lbl_80210ABC:
-/* 80210ABC 3B 60 00 00 */ li r27, 0
-/* 80210AC0 93 7F 03 28 */ stw r27, 0x328(r31)
-/* 80210AC4 93 7F 05 14 */ stw r27, 0x514(r31)
-/* 80210AC8 3A 80 00 00 */ li r20, 0
-/* 80210ACC 3B 80 00 00 */ li r28, 0
-lbl_80210AD0:
-/* 80210AD0 3A FC 03 2C */ addi r23, r28, 0x32c
-/* 80210AD4 7C 7F B8 2E */ lwzx r3, r31, r23
-/* 80210AD8 28 03 00 00 */ cmplwi r3, 0
-/* 80210ADC 41 82 00 20 */ beq lbl_80210AFC
-/* 80210AE0 41 82 00 18 */ beq lbl_80210AF8
-/* 80210AE4 38 80 00 01 */ li r4, 1
-/* 80210AE8 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210AEC 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210AF0 7D 89 03 A6 */ mtctr r12
-/* 80210AF4 4E 80 04 21 */ bctrl
-lbl_80210AF8:
-/* 80210AF8 7F 7F B9 2E */ stwx r27, r31, r23
-lbl_80210AFC:
-/* 80210AFC 3A 94 00 01 */ addi r20, r20, 1
-/* 80210B00 2C 14 00 02 */ cmpwi r20, 2
-/* 80210B04 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210B08 41 80 FF C8 */ blt lbl_80210AD0
-/* 80210B0C 80 7F 03 34 */ lwz r3, 0x334(r31)
-/* 80210B10 28 03 00 00 */ cmplwi r3, 0
-/* 80210B14 41 82 00 18 */ beq lbl_80210B2C
-/* 80210B18 38 80 00 01 */ li r4, 1
-/* 80210B1C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210B20 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210B24 7D 89 03 A6 */ mtctr r12
-/* 80210B28 4E 80 04 21 */ bctrl
-lbl_80210B2C:
-/* 80210B2C 38 80 00 00 */ li r4, 0
-/* 80210B30 90 9F 03 34 */ stw r4, 0x334(r31)
-/* 80210B34 38 60 00 00 */ li r3, 0
-/* 80210B38 38 00 00 03 */ li r0, 3
-/* 80210B3C 7C 09 03 A6 */ mtctr r0
-lbl_80210B40:
-/* 80210B40 38 03 05 18 */ addi r0, r3, 0x518
-/* 80210B44 7C 9F 01 2E */ stwx r4, r31, r0
-/* 80210B48 38 63 00 04 */ addi r3, r3, 4
-/* 80210B4C 42 00 FF F4 */ bdnz lbl_80210B40
-/* 80210B50 80 7F 03 18 */ lwz r3, 0x318(r31)
-/* 80210B54 28 03 00 00 */ cmplwi r3, 0
-/* 80210B58 41 82 00 18 */ beq lbl_80210B70
-/* 80210B5C 38 80 00 01 */ li r4, 1
-/* 80210B60 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210B64 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210B68 7D 89 03 A6 */ mtctr r12
-/* 80210B6C 4E 80 04 21 */ bctrl
-lbl_80210B70:
-/* 80210B70 3B 60 00 00 */ li r27, 0
-/* 80210B74 93 7F 03 18 */ stw r27, 0x318(r31)
-/* 80210B78 3A 80 00 00 */ li r20, 0
-/* 80210B7C 3B 80 00 00 */ li r28, 0
-lbl_80210B80:
-/* 80210B80 3A FC 03 1C */ addi r23, r28, 0x31c
-/* 80210B84 7C 7F B8 2E */ lwzx r3, r31, r23
-/* 80210B88 28 03 00 00 */ cmplwi r3, 0
-/* 80210B8C 41 82 00 20 */ beq lbl_80210BAC
-/* 80210B90 41 82 00 18 */ beq lbl_80210BA8
-/* 80210B94 38 80 00 01 */ li r4, 1
-/* 80210B98 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210B9C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210BA0 7D 89 03 A6 */ mtctr r12
-/* 80210BA4 4E 80 04 21 */ bctrl
-lbl_80210BA8:
-/* 80210BA8 7F 7F B9 2E */ stwx r27, r31, r23
-lbl_80210BAC:
-/* 80210BAC 3A 94 00 01 */ addi r20, r20, 1
-/* 80210BB0 2C 14 00 03 */ cmpwi r20, 3
-/* 80210BB4 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210BB8 41 80 FF C8 */ blt lbl_80210B80
-/* 80210BBC 80 7F 03 38 */ lwz r3, 0x338(r31)
-/* 80210BC0 28 03 00 00 */ cmplwi r3, 0
-/* 80210BC4 41 82 00 18 */ beq lbl_80210BDC
-/* 80210BC8 38 80 00 01 */ li r4, 1
-/* 80210BCC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210BD0 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210BD4 7D 89 03 A6 */ mtctr r12
-/* 80210BD8 4E 80 04 21 */ bctrl
-lbl_80210BDC:
-/* 80210BDC 38 00 00 00 */ li r0, 0
-/* 80210BE0 90 1F 03 38 */ stw r0, 0x338(r31)
-/* 80210BE4 80 7F 03 3C */ lwz r3, 0x33c(r31)
-/* 80210BE8 28 03 00 00 */ cmplwi r3, 0
-/* 80210BEC 41 82 00 18 */ beq lbl_80210C04
-/* 80210BF0 38 80 00 01 */ li r4, 1
-/* 80210BF4 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210BF8 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210BFC 7D 89 03 A6 */ mtctr r12
-/* 80210C00 4E 80 04 21 */ bctrl
-lbl_80210C04:
-/* 80210C04 3B 60 00 00 */ li r27, 0
-/* 80210C08 93 7F 03 3C */ stw r27, 0x33c(r31)
-/* 80210C0C 3A 80 00 00 */ li r20, 0
-/* 80210C10 3B 80 00 00 */ li r28, 0
-lbl_80210C14:
-/* 80210C14 3A FC 03 40 */ addi r23, r28, 0x340
-/* 80210C18 7C 7F B8 2E */ lwzx r3, r31, r23
-/* 80210C1C 28 03 00 00 */ cmplwi r3, 0
-/* 80210C20 41 82 00 20 */ beq lbl_80210C40
-/* 80210C24 41 82 00 18 */ beq lbl_80210C3C
-/* 80210C28 38 80 00 01 */ li r4, 1
-/* 80210C2C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210C30 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210C34 7D 89 03 A6 */ mtctr r12
-/* 80210C38 4E 80 04 21 */ bctrl
-lbl_80210C3C:
-/* 80210C3C 7F 7F B9 2E */ stwx r27, r31, r23
-lbl_80210C40:
-/* 80210C40 3A 94 00 01 */ addi r20, r20, 1
-/* 80210C44 2C 14 00 03 */ cmpwi r20, 3
-/* 80210C48 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210C4C 41 80 FF C8 */ blt lbl_80210C14
-/* 80210C50 80 7F 03 4C */ lwz r3, 0x34c(r31)
-/* 80210C54 28 03 00 00 */ cmplwi r3, 0
-/* 80210C58 41 82 00 18 */ beq lbl_80210C70
-/* 80210C5C 38 80 00 01 */ li r4, 1
-/* 80210C60 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210C64 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210C68 7D 89 03 A6 */ mtctr r12
-/* 80210C6C 4E 80 04 21 */ bctrl
-lbl_80210C70:
-/* 80210C70 38 00 00 00 */ li r0, 0
-/* 80210C74 90 1F 03 4C */ stw r0, 0x34c(r31)
-/* 80210C78 80 7F 03 50 */ lwz r3, 0x350(r31)
-/* 80210C7C 28 03 00 00 */ cmplwi r3, 0
-/* 80210C80 41 82 00 18 */ beq lbl_80210C98
-/* 80210C84 38 80 00 01 */ li r4, 1
-/* 80210C88 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210C8C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210C90 7D 89 03 A6 */ mtctr r12
-/* 80210C94 4E 80 04 21 */ bctrl
-lbl_80210C98:
-/* 80210C98 3B 60 00 00 */ li r27, 0
-/* 80210C9C 93 7F 03 50 */ stw r27, 0x350(r31)
-/* 80210CA0 3A 80 00 00 */ li r20, 0
-/* 80210CA4 3B 80 00 00 */ li r28, 0
-lbl_80210CA8:
-/* 80210CA8 3A FC 03 54 */ addi r23, r28, 0x354
-/* 80210CAC 7C 7F B8 2E */ lwzx r3, r31, r23
-/* 80210CB0 28 03 00 00 */ cmplwi r3, 0
-/* 80210CB4 41 82 00 18 */ beq lbl_80210CCC
-/* 80210CB8 38 80 00 01 */ li r4, 1
-/* 80210CBC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210CC0 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210CC4 7D 89 03 A6 */ mtctr r12
-/* 80210CC8 4E 80 04 21 */ bctrl
-lbl_80210CCC:
-/* 80210CCC 7F 7F B9 2E */ stwx r27, r31, r23
-/* 80210CD0 3A 94 00 01 */ addi r20, r20, 1
-/* 80210CD4 2C 14 00 03 */ cmpwi r20, 3
-/* 80210CD8 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210CDC 41 80 FF CC */ blt lbl_80210CA8
-/* 80210CE0 80 7F 03 60 */ lwz r3, 0x360(r31)
-/* 80210CE4 28 03 00 00 */ cmplwi r3, 0
-/* 80210CE8 41 82 00 18 */ beq lbl_80210D00
-/* 80210CEC 38 80 00 01 */ li r4, 1
-/* 80210CF0 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210CF4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210CF8 7D 89 03 A6 */ mtctr r12
-/* 80210CFC 4E 80 04 21 */ bctrl
-lbl_80210D00:
-/* 80210D00 38 00 00 00 */ li r0, 0
-/* 80210D04 90 1F 03 60 */ stw r0, 0x360(r31)
-/* 80210D08 80 7F 03 64 */ lwz r3, 0x364(r31)
-/* 80210D0C 28 03 00 00 */ cmplwi r3, 0
-/* 80210D10 41 82 00 18 */ beq lbl_80210D28
-/* 80210D14 38 80 00 01 */ li r4, 1
-/* 80210D18 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210D1C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210D20 7D 89 03 A6 */ mtctr r12
-/* 80210D24 4E 80 04 21 */ bctrl
-lbl_80210D28:
-/* 80210D28 38 00 00 00 */ li r0, 0
-/* 80210D2C 90 1F 03 64 */ stw r0, 0x364(r31)
-/* 80210D30 3A 80 00 00 */ li r20, 0
-/* 80210D34 3B 80 00 00 */ li r28, 0
-lbl_80210D38:
-/* 80210D38 7E FF E2 14 */ add r23, r31, r28
-/* 80210D3C 80 77 04 90 */ lwz r3, 0x490(r23)
-/* 80210D40 28 03 00 00 */ cmplwi r3, 0
-/* 80210D44 41 82 00 24 */ beq lbl_80210D68
-/* 80210D48 41 82 00 18 */ beq lbl_80210D60
-/* 80210D4C 38 80 00 01 */ li r4, 1
-/* 80210D50 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210D54 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210D58 7D 89 03 A6 */ mtctr r12
-/* 80210D5C 4E 80 04 21 */ bctrl
-lbl_80210D60:
-/* 80210D60 38 00 00 00 */ li r0, 0
-/* 80210D64 90 17 04 90 */ stw r0, 0x490(r23)
-lbl_80210D68:
-/* 80210D68 80 77 04 A4 */ lwz r3, 0x4a4(r23)
-/* 80210D6C 28 03 00 00 */ cmplwi r3, 0
-/* 80210D70 41 82 00 24 */ beq lbl_80210D94
-/* 80210D74 41 82 00 18 */ beq lbl_80210D8C
-/* 80210D78 38 80 00 01 */ li r4, 1
-/* 80210D7C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210D80 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210D84 7D 89 03 A6 */ mtctr r12
-/* 80210D88 4E 80 04 21 */ bctrl
-lbl_80210D8C:
-/* 80210D8C 38 00 00 00 */ li r0, 0
-/* 80210D90 90 17 04 A4 */ stw r0, 0x4a4(r23)
-lbl_80210D94:
-/* 80210D94 3A 94 00 01 */ addi r20, r20, 1
-/* 80210D98 2C 14 00 05 */ cmpwi r20, 5
-/* 80210D9C 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210DA0 41 80 FF 98 */ blt lbl_80210D38
-/* 80210DA4 80 7F 02 F8 */ lwz r3, 0x2f8(r31)
-/* 80210DA8 28 03 00 00 */ cmplwi r3, 0
-/* 80210DAC 41 82 00 18 */ beq lbl_80210DC4
-/* 80210DB0 38 80 00 01 */ li r4, 1
-/* 80210DB4 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210DB8 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210DBC 7D 89 03 A6 */ mtctr r12
-/* 80210DC0 4E 80 04 21 */ bctrl
-lbl_80210DC4:
-/* 80210DC4 38 00 00 00 */ li r0, 0
-/* 80210DC8 90 1F 02 F8 */ stw r0, 0x2f8(r31)
-/* 80210DCC 80 7F 03 00 */ lwz r3, 0x300(r31)
-/* 80210DD0 28 03 00 00 */ cmplwi r3, 0
-/* 80210DD4 41 82 00 18 */ beq lbl_80210DEC
-/* 80210DD8 38 80 00 01 */ li r4, 1
-/* 80210DDC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210DE0 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210DE4 7D 89 03 A6 */ mtctr r12
-/* 80210DE8 4E 80 04 21 */ bctrl
-lbl_80210DEC:
-/* 80210DEC 38 00 00 00 */ li r0, 0
-/* 80210DF0 90 1F 03 00 */ stw r0, 0x300(r31)
-/* 80210DF4 80 7F 03 04 */ lwz r3, 0x304(r31)
-/* 80210DF8 28 03 00 00 */ cmplwi r3, 0
-/* 80210DFC 41 82 00 18 */ beq lbl_80210E14
-/* 80210E00 38 80 00 01 */ li r4, 1
-/* 80210E04 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210E08 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210E0C 7D 89 03 A6 */ mtctr r12
-/* 80210E10 4E 80 04 21 */ bctrl
-lbl_80210E14:
-/* 80210E14 38 00 00 00 */ li r0, 0
-/* 80210E18 90 1F 03 04 */ stw r0, 0x304(r31)
-/* 80210E1C 80 7F 03 08 */ lwz r3, 0x308(r31)
-/* 80210E20 28 03 00 00 */ cmplwi r3, 0
-/* 80210E24 41 82 00 18 */ beq lbl_80210E3C
-/* 80210E28 38 80 00 01 */ li r4, 1
-/* 80210E2C 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210E30 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210E34 7D 89 03 A6 */ mtctr r12
-/* 80210E38 4E 80 04 21 */ bctrl
-lbl_80210E3C:
-/* 80210E3C 3B 60 00 00 */ li r27, 0
-/* 80210E40 93 7F 03 08 */ stw r27, 0x308(r31)
-/* 80210E44 3A 80 00 00 */ li r20, 0
-/* 80210E48 3B 80 00 00 */ li r28, 0
-lbl_80210E4C:
-/* 80210E4C 3A FC 03 0C */ addi r23, r28, 0x30c
-/* 80210E50 7C 7F B8 2E */ lwzx r3, r31, r23
-/* 80210E54 28 03 00 00 */ cmplwi r3, 0
-/* 80210E58 41 82 00 18 */ beq lbl_80210E70
-/* 80210E5C 38 80 00 01 */ li r4, 1
-/* 80210E60 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210E64 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210E68 7D 89 03 A6 */ mtctr r12
-/* 80210E6C 4E 80 04 21 */ bctrl
-lbl_80210E70:
-/* 80210E70 7F 7F B9 2E */ stwx r27, r31, r23
-/* 80210E74 3A 94 00 01 */ addi r20, r20, 1
-/* 80210E78 2C 14 00 03 */ cmpwi r20, 3
-/* 80210E7C 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210E80 41 80 FF CC */ blt lbl_80210E4C
-/* 80210E84 80 7F 04 B8 */ lwz r3, 0x4b8(r31)
-/* 80210E88 28 03 00 00 */ cmplwi r3, 0
-/* 80210E8C 41 82 00 24 */ beq lbl_80210EB0
-/* 80210E90 41 82 00 18 */ beq lbl_80210EA8
-/* 80210E94 38 80 00 01 */ li r4, 1
-/* 80210E98 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210E9C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210EA0 7D 89 03 A6 */ mtctr r12
-/* 80210EA4 4E 80 04 21 */ bctrl
-lbl_80210EA8:
-/* 80210EA8 38 00 00 00 */ li r0, 0
-/* 80210EAC 90 1F 04 B8 */ stw r0, 0x4b8(r31)
-lbl_80210EB0:
-/* 80210EB0 80 7F 03 68 */ lwz r3, 0x368(r31)
-/* 80210EB4 28 03 00 00 */ cmplwi r3, 0
-/* 80210EB8 41 82 00 18 */ beq lbl_80210ED0
-/* 80210EBC 38 80 00 01 */ li r4, 1
-/* 80210EC0 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210EC4 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210EC8 7D 89 03 A6 */ mtctr r12
-/* 80210ECC 4E 80 04 21 */ bctrl
-lbl_80210ED0:
-/* 80210ED0 38 00 00 00 */ li r0, 0
-/* 80210ED4 90 1F 03 68 */ stw r0, 0x368(r31)
-/* 80210ED8 3A 80 00 00 */ li r20, 0
-/* 80210EDC 3B A0 00 00 */ li r29, 0
-lbl_80210EE0:
-/* 80210EE0 3A A0 00 00 */ li r21, 0
-/* 80210EE4 3B 80 00 00 */ li r28, 0
-/* 80210EE8 7F 1F EA 14 */ add r24, r31, r29
-/* 80210EEC 3B 60 00 00 */ li r27, 0
-lbl_80210EF0:
-/* 80210EF0 3A FC 00 84 */ addi r23, r28, 0x84
-/* 80210EF4 7C 78 B8 2E */ lwzx r3, r24, r23
-/* 80210EF8 28 03 00 00 */ cmplwi r3, 0
-/* 80210EFC 41 82 00 20 */ beq lbl_80210F1C
-/* 80210F00 41 82 00 18 */ beq lbl_80210F18
-/* 80210F04 38 80 00 01 */ li r4, 1
-/* 80210F08 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210F0C 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210F10 7D 89 03 A6 */ mtctr r12
-/* 80210F14 4E 80 04 21 */ bctrl
-lbl_80210F18:
-/* 80210F18 7F 78 B9 2E */ stwx r27, r24, r23
-lbl_80210F1C:
-/* 80210F1C 3A B5 00 01 */ addi r21, r21, 1
-/* 80210F20 2C 15 00 03 */ cmpwi r21, 3
-/* 80210F24 3B 9C 00 04 */ addi r28, r28, 4
-/* 80210F28 41 80 FF C8 */ blt lbl_80210EF0
-/* 80210F2C 3A 94 00 01 */ addi r20, r20, 1
-/* 80210F30 2C 14 00 02 */ cmpwi r20, 2
-/* 80210F34 3B BD 00 0C */ addi r29, r29, 0xc
-/* 80210F38 41 80 FF A8 */ blt lbl_80210EE0
-/* 80210F3C 3A 80 00 00 */ li r20, 0
-/* 80210F40 3B A0 00 00 */ li r29, 0
-/* 80210F44 3B 60 00 00 */ li r27, 0
-lbl_80210F48:
-/* 80210F48 3A FD 00 9C */ addi r23, r29, 0x9c
-/* 80210F4C 7C 7F B8 2E */ lwzx r3, r31, r23
-/* 80210F50 28 03 00 00 */ cmplwi r3, 0
-/* 80210F54 41 82 00 20 */ beq lbl_80210F74
-/* 80210F58 41 82 00 18 */ beq lbl_80210F70
-/* 80210F5C 38 80 00 01 */ li r4, 1
-/* 80210F60 81 83 00 00 */ lwz r12, 0(r3)
-/* 80210F64 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80210F68 7D 89 03 A6 */ mtctr r12
-/* 80210F6C 4E 80 04 21 */ bctrl
-lbl_80210F70:
-/* 80210F70 7F 7F B9 2E */ stwx r27, r31, r23
-lbl_80210F74:
-/* 80210F74 3A 94 00 01 */ addi r20, r20, 1
-/* 80210F78 2C 14 00 03 */ cmpwi r20, 3
-/* 80210F7C 3B BD 00 04 */ addi r29, r29, 4
-/* 80210F80 41 80 FF C8 */ blt lbl_80210F48
-/* 80210F84 7F C0 07 35 */ extsh. r0, r30
-/* 80210F88 40 81 00 0C */ ble lbl_80210F94
-/* 80210F8C 7F E3 FB 78 */ mr r3, r31
-/* 80210F90 48 0B DD AD */ bl __dl__FPv
-lbl_80210F94:
-/* 80210F94 7F E3 FB 78 */ mr r3, r31
-/* 80210F98 39 61 00 40 */ addi r11, r1, 0x40
-/* 80210F9C 48 15 12 69 */ bl _restgpr_20
-/* 80210FA0 80 01 00 44 */ lwz r0, 0x44(r1)
-/* 80210FA4 7C 08 03 A6 */ mtlr r0
-/* 80210FA8 38 21 00 40 */ addi r1, r1, 0x40
-/* 80210FAC 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/drawButtonS__13dMeter2Draw_cFUc.s b/asm/d/meter/d_meter2_draw/drawButtonS__13dMeter2Draw_cFUc.s
deleted file mode 100644
index c45f9597bf..0000000000
--- a/asm/d/meter/d_meter2_draw/drawButtonS__13dMeter2Draw_cFUc.s
+++ /dev/null
@@ -1,22 +0,0 @@
-lbl_802179C0:
-/* 802179C0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 802179C4 7C 08 02 A6 */ mflr r0
-/* 802179C8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 802179CC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 802179D0 93 C1 00 08 */ stw r30, 8(r1)
-/* 802179D4 7C 7E 1B 78 */ mr r30, r3
-/* 802179D8 7C 9F 23 78 */ mr r31, r4
-/* 802179DC 38 A0 00 01 */ li r5, 1
-/* 802179E0 38 DE 07 67 */ addi r6, r30, 0x767
-/* 802179E4 48 00 29 11 */ bl getActionString__13dMeter2Draw_cFUcUcPUc
-/* 802179E8 57 E0 06 3F */ clrlwi. r0, r31, 0x18
-/* 802179EC 41 82 00 0C */ beq lbl_802179F8
-/* 802179F0 38 00 00 07 */ li r0, 7
-/* 802179F4 98 1E 07 67 */ stb r0, 0x767(r30)
-lbl_802179F8:
-/* 802179F8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 802179FC 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80217A00 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80217A04 7C 08 03 A6 */ mtlr r0
-/* 80217A08 38 21 00 10 */ addi r1, r1, 0x10
-/* 80217A0C 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/exec__13dMeter2Draw_cFUl.s b/asm/d/meter/d_meter2_draw/exec__13dMeter2Draw_cFUl.s
deleted file mode 100644
index 0c8ae091ae..0000000000
--- a/asm/d/meter/d_meter2_draw/exec__13dMeter2Draw_cFUl.s
+++ /dev/null
@@ -1,121 +0,0 @@
-lbl_8021135C:
-/* 8021135C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80211360 7C 08 02 A6 */ mflr r0
-/* 80211364 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80211368 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8021136C 93 C1 00 08 */ stw r30, 8(r1)
-/* 80211370 7C 7F 1B 78 */ mr r31, r3
-/* 80211374 7C 9E 23 78 */ mr r30, r4
-/* 80211378 C0 03 07 78 */ lfs f0, 0x778(r3)
-/* 8021137C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 80211380 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 80211384 C0 23 00 14 */ lfs f1, 0x14(r3)
-/* 80211388 FC 00 08 00 */ fcmpu cr0, f0, f1
-/* 8021138C 41 82 00 2C */ beq lbl_802113B8
-/* 80211390 D0 3F 07 78 */ stfs f1, 0x778(r31)
-/* 80211394 C0 03 00 14 */ lfs f0, 0x14(r3)
-/* 80211398 80 7F 00 BC */ lwz r3, 0xbc(r31)
-/* 8021139C 80 63 00 04 */ lwz r3, 4(r3)
-/* 802113A0 D0 03 00 CC */ stfs f0, 0xcc(r3)
-/* 802113A4 D0 03 00 D0 */ stfs f0, 0xd0(r3)
-/* 802113A8 81 83 00 00 */ lwz r12, 0(r3)
-/* 802113AC 81 8C 00 2C */ lwz r12, 0x2c(r12)
-/* 802113B0 7D 89 03 A6 */ mtctr r12
-/* 802113B4 4E 80 04 21 */ bctrl
-lbl_802113B8:
-/* 802113B8 C0 1F 07 7C */ lfs f0, 0x77c(r31)
-/* 802113BC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 802113C0 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 802113C4 C0 24 00 18 */ lfs f1, 0x18(r4)
-/* 802113C8 FC 00 08 00 */ fcmpu cr0, f0, f1
-/* 802113CC 41 82 00 14 */ beq lbl_802113E0
-/* 802113D0 D0 3F 07 7C */ stfs f1, 0x77c(r31)
-/* 802113D4 80 7F 00 BC */ lwz r3, 0xbc(r31)
-/* 802113D8 C0 24 00 18 */ lfs f1, 0x18(r4)
-/* 802113DC 48 04 43 F5 */ bl setAlphaRate__13CPaneMgrAlphaFf
-lbl_802113E0:
-/* 802113E0 57 C0 01 CF */ rlwinm. r0, r30, 0, 7, 7
-/* 802113E4 41 82 00 94 */ beq lbl_80211478
-/* 802113E8 C0 1F 07 80 */ lfs f0, 0x780(r31)
-/* 802113EC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 802113F0 38 A3 EB C8 */ addi r5, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 802113F4 C0 45 00 90 */ lfs f2, 0x90(r5)
-/* 802113F8 FC 00 10 00 */ fcmpu cr0, f0, f2
-/* 802113FC 40 82 00 14 */ bne lbl_80211410
-/* 80211400 C0 3F 07 84 */ lfs f1, 0x784(r31)
-/* 80211404 C0 05 00 98 */ lfs f0, 0x98(r5)
-/* 80211408 FC 01 00 00 */ fcmpu cr0, f1, f0
-/* 8021140C 41 82 00 28 */ beq lbl_80211434
-lbl_80211410:
-/* 80211410 D0 5F 07 80 */ stfs f2, 0x780(r31)
-/* 80211414 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 80211418 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 8021141C C0 04 00 98 */ lfs f0, 0x98(r4)
-/* 80211420 D0 1F 07 84 */ stfs f0, 0x784(r31)
-/* 80211424 80 7F 02 F8 */ lwz r3, 0x2f8(r31)
-/* 80211428 C0 25 00 90 */ lfs f1, 0x90(r5)
-/* 8021142C C0 44 00 98 */ lfs f2, 0x98(r4)
-/* 80211430 48 04 31 81 */ bl paneTrans__8CPaneMgrFff
-lbl_80211434:
-/* 80211434 C0 1F 07 88 */ lfs f0, 0x788(r31)
-/* 80211438 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 8021143C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 80211440 C0 23 00 80 */ lfs f1, 0x80(r3)
-/* 80211444 FC 00 08 00 */ fcmpu cr0, f0, f1
-/* 80211448 41 82 00 BC */ beq lbl_80211504
-/* 8021144C D0 3F 07 88 */ stfs f1, 0x788(r31)
-/* 80211450 C0 03 00 80 */ lfs f0, 0x80(r3)
-/* 80211454 80 7F 02 F8 */ lwz r3, 0x2f8(r31)
-/* 80211458 80 63 00 04 */ lwz r3, 4(r3)
-/* 8021145C D0 03 00 CC */ stfs f0, 0xcc(r3)
-/* 80211460 D0 03 00 D0 */ stfs f0, 0xd0(r3)
-/* 80211464 81 83 00 00 */ lwz r12, 0(r3)
-/* 80211468 81 8C 00 2C */ lwz r12, 0x2c(r12)
-/* 8021146C 7D 89 03 A6 */ mtctr r12
-/* 80211470 4E 80 04 21 */ bctrl
-/* 80211474 48 00 00 90 */ b lbl_80211504
-lbl_80211478:
-/* 80211478 C0 1F 07 80 */ lfs f0, 0x780(r31)
-/* 8021147C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 80211480 38 A3 EB C8 */ addi r5, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 80211484 C0 45 00 8C */ lfs f2, 0x8c(r5)
-/* 80211488 FC 00 10 00 */ fcmpu cr0, f0, f2
-/* 8021148C 40 82 00 14 */ bne lbl_802114A0
-/* 80211490 C0 3F 07 84 */ lfs f1, 0x784(r31)
-/* 80211494 C0 05 00 94 */ lfs f0, 0x94(r5)
-/* 80211498 FC 01 00 00 */ fcmpu cr0, f1, f0
-/* 8021149C 41 82 00 28 */ beq lbl_802114C4
-lbl_802114A0:
-/* 802114A0 D0 5F 07 80 */ stfs f2, 0x780(r31)
-/* 802114A4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 802114A8 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 802114AC C0 04 00 94 */ lfs f0, 0x94(r4)
-/* 802114B0 D0 1F 07 84 */ stfs f0, 0x784(r31)
-/* 802114B4 80 7F 02 F8 */ lwz r3, 0x2f8(r31)
-/* 802114B8 C0 25 00 8C */ lfs f1, 0x8c(r5)
-/* 802114BC C0 44 00 94 */ lfs f2, 0x94(r4)
-/* 802114C0 48 04 30 F1 */ bl paneTrans__8CPaneMgrFff
-lbl_802114C4:
-/* 802114C4 C0 1F 07 88 */ lfs f0, 0x788(r31)
-/* 802114C8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 802114CC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 802114D0 C0 23 00 7C */ lfs f1, 0x7c(r3)
-/* 802114D4 FC 00 08 00 */ fcmpu cr0, f0, f1
-/* 802114D8 41 82 00 2C */ beq lbl_80211504
-/* 802114DC D0 3F 07 88 */ stfs f1, 0x788(r31)
-/* 802114E0 C0 03 00 7C */ lfs f0, 0x7c(r3)
-/* 802114E4 80 7F 02 F8 */ lwz r3, 0x2f8(r31)
-/* 802114E8 80 63 00 04 */ lwz r3, 4(r3)
-/* 802114EC D0 03 00 CC */ stfs f0, 0xcc(r3)
-/* 802114F0 D0 03 00 D0 */ stfs f0, 0xd0(r3)
-/* 802114F4 81 83 00 00 */ lwz r12, 0(r3)
-/* 802114F8 81 8C 00 2C */ lwz r12, 0x2c(r12)
-/* 802114FC 7D 89 03 A6 */ mtctr r12
-/* 80211500 4E 80 04 21 */ bctrl
-lbl_80211504:
-/* 80211504 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80211508 83 C1 00 08 */ lwz r30, 8(r1)
-/* 8021150C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80211510 7C 08 03 A6 */ mtlr r0
-/* 80211514 38 21 00 10 */ addi r1, r1, 0x10
-/* 80211518 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/getButtonTimer__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getButtonTimer__13dMeter2Draw_cFv.s
deleted file mode 100644
index 17ef85452f..0000000000
--- a/asm/d/meter/d_meter2_draw/getButtonTimer__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_8021BDD0:
-/* 8021BDD0 80 63 02 F8 */ lwz r3, 0x2f8(r3)
-/* 8021BDD4 A8 63 00 16 */ lha r3, 0x16(r3)
-/* 8021BDD8 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/getCanoeFishing__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getCanoeFishing__13dMeter2Draw_cFv.s
deleted file mode 100644
index 486eb77ec1..0000000000
--- a/asm/d/meter/d_meter2_draw/getCanoeFishing__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,31 +0,0 @@
-lbl_8021BBB4:
-/* 8021BBB4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8021BBB8 7C 08 02 A6 */ mflr r0
-/* 8021BBBC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8021BBC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8021BBC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8021BBC8 38 63 4E 00 */ addi r3, r3, 0x4e00
-/* 8021BBCC 3C 80 80 3A */ lis r4, d_meter_d_meter2_draw__stringBase0@ha /* 0x803988D0@ha */
-/* 8021BBD0 38 84 88 D0 */ addi r4, r4, d_meter_d_meter2_draw__stringBase0@l /* 0x803988D0@l */
-/* 8021BBD4 38 84 01 9F */ addi r4, r4, 0x19f
-/* 8021BBD8 48 14 CD BD */ bl strcmp
-/* 8021BBDC 2C 03 00 00 */ cmpwi r3, 0
-/* 8021BBE0 40 82 00 30 */ bne lbl_8021BC10
-/* 8021BBE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8021BBE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8021BBEC 80 63 5D AC */ lwz r3, 0x5dac(r3)
-/* 8021BBF0 81 83 06 28 */ lwz r12, 0x628(r3)
-/* 8021BBF4 81 8C 01 90 */ lwz r12, 0x190(r12)
-/* 8021BBF8 7D 89 03 A6 */ mtctr r12
-/* 8021BBFC 4E 80 04 21 */ bctrl
-/* 8021BC00 28 03 00 00 */ cmplwi r3, 0
-/* 8021BC04 41 82 00 0C */ beq lbl_8021BC10
-/* 8021BC08 38 60 00 01 */ li r3, 1
-/* 8021BC0C 48 00 00 08 */ b lbl_8021BC14
-lbl_8021BC10:
-/* 8021BC10 38 60 00 00 */ li r3, 0
-lbl_8021BC14:
-/* 8021BC14 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8021BC18 7C 08 03 A6 */ mtlr r0
-/* 8021BC1C 38 21 00 10 */ addi r1, r1, 0x10
-/* 8021BC20 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/getFishingType__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getFishingType__13dMeter2Draw_cFv.s
deleted file mode 100644
index e2e4b901c7..0000000000
--- a/asm/d/meter/d_meter2_draw/getFishingType__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,21 +0,0 @@
-lbl_8021BB6C:
-/* 8021BB6C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8021BB70 7C 08 02 A6 */ mflr r0
-/* 8021BB74 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8021BB78 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */
-/* 8021BB7C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */
-/* 8021BB80 A0 04 00 B0 */ lhz r0, 0xb0(r4)
-/* 8021BB84 54 00 07 FF */ clrlwi. r0, r0, 0x1f
-/* 8021BB88 41 82 00 18 */ beq lbl_8021BBA0
-/* 8021BB8C 48 00 00 29 */ bl getCanoeFishing__13dMeter2Draw_cFv
-/* 8021BB90 54 60 06 3F */ clrlwi. r0, r3, 0x18
-/* 8021BB94 41 82 00 0C */ beq lbl_8021BBA0
-/* 8021BB98 38 60 00 01 */ li r3, 1
-/* 8021BB9C 48 00 00 08 */ b lbl_8021BBA4
-lbl_8021BBA0:
-/* 8021BBA0 38 60 00 00 */ li r3, 0
-lbl_8021BBA4:
-/* 8021BBA4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8021BBA8 7C 08 03 A6 */ mtlr r0
-/* 8021BBAC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8021BBB0 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/getNumberTexture__13dMeter2Draw_cFi.s b/asm/d/meter/d_meter2_draw/getNumberTexture__13dMeter2Draw_cFi.s
deleted file mode 100644
index 9a2bf93066..0000000000
--- a/asm/d/meter/d_meter2_draw/getNumberTexture__13dMeter2Draw_cFi.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_8021A29C:
-/* 8021A29C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8021A2A0 7C 08 02 A6 */ mflr r0
-/* 8021A2A4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8021A2A8 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8021A2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8021A2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8021A2B4 83 E3 5D 30 */ lwz r31, 0x5d30(r3)
-/* 8021A2B8 7C 83 23 78 */ mr r3, r4
-/* 8021A2BC 48 00 40 0D */ bl dMeter2Info_getNumberTextureName__Fi
-/* 8021A2C0 7C 65 1B 78 */ mr r5, r3
-/* 8021A2C4 7F E3 FB 78 */ mr r3, r31
-/* 8021A2C8 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */
-/* 8021A2CC 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */
-/* 8021A2D0 81 9F 00 00 */ lwz r12, 0(r31)
-/* 8021A2D4 81 8C 00 18 */ lwz r12, 0x18(r12)
-/* 8021A2D8 7D 89 03 A6 */ mtctr r12
-/* 8021A2DC 4E 80 04 21 */ bctrl
-/* 8021A2E0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8021A2E4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8021A2E8 7C 08 03 A6 */ mtlr r0
-/* 8021A2EC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8021A2F0 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/getPlayerSubject__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/getPlayerSubject__13dMeter2Draw_cFv.s
deleted file mode 100644
index 4622b62ebc..0000000000
--- a/asm/d/meter/d_meter2_draw/getPlayerSubject__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_8021BCAC:
-/* 8021BCAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8021BCB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8021BCB4 80 03 5F 18 */ lwz r0, 0x5f18(r3)
-/* 8021BCB8 54 03 2F FE */ rlwinm r3, r0, 5, 0x1f, 0x1f
-/* 8021BCBC 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/init__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/init__13dMeter2Draw_cFv.s
deleted file mode 100644
index 76db2e7adc..0000000000
--- a/asm/d/meter/d_meter2_draw/init__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,241 +0,0 @@
-lbl_80210FB0:
-/* 80210FB0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80210FB4 7C 08 02 A6 */ mflr r0
-/* 80210FB8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80210FBC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80210FC0 7C 7F 1B 78 */ mr r31, r3
-/* 80210FC4 C0 02 AE 80 */ lfs f0, lit_4182(r2)
-/* 80210FC8 D0 03 06 08 */ stfs f0, 0x608(r3)
-/* 80210FCC D0 03 06 0C */ stfs f0, 0x60c(r3)
-/* 80210FD0 38 60 00 00 */ li r3, 0
-/* 80210FD4 38 00 00 03 */ li r0, 3
-/* 80210FD8 7C 09 03 A6 */ mtctr r0
-lbl_80210FDC:
-/* 80210FDC 7C 9F 1A 14 */ add r4, r31, r3
-/* 80210FE0 D0 04 06 20 */ stfs f0, 0x620(r4)
-/* 80210FE4 D0 04 06 10 */ stfs f0, 0x610(r4)
-/* 80210FE8 38 63 00 04 */ addi r3, r3, 4
-/* 80210FEC 42 00 FF F0 */ bdnz lbl_80210FDC
-/* 80210FF0 C0 02 AE 80 */ lfs f0, lit_4182(r2)
-/* 80210FF4 D0 1F 06 1C */ stfs f0, 0x61c(r31)
-/* 80210FF8 38 60 00 00 */ li r3, 0
-/* 80210FFC 38 00 00 10 */ li r0, 0x10
-/* 80211000 7C 09 03 A6 */ mtctr r0
-lbl_80211004:
-/* 80211004 7C 9F 1A 14 */ add r4, r31, r3
-/* 80211008 D0 04 06 2C */ stfs f0, 0x62c(r4)
-/* 8021100C D0 04 06 6C */ stfs f0, 0x66c(r4)
-/* 80211010 38 63 00 04 */ addi r3, r3, 4
-/* 80211014 42 00 FF F0 */ bdnz lbl_80211004
-/* 80211018 38 60 00 00 */ li r3, 0
-/* 8021101C 98 7F 07 59 */ stb r3, 0x759(r31)
-/* 80211020 98 7F 07 5A */ stb r3, 0x75a(r31)
-/* 80211024 38 80 00 00 */ li r4, 0
-/* 80211028 38 00 00 03 */ li r0, 3
-/* 8021102C 7C 09 03 A6 */ mtctr r0
-lbl_80211030:
-/* 80211030 38 04 07 5C */ addi r0, r4, 0x75c
-/* 80211034 7C 7F 01 AE */ stbx r3, r31, r0
-/* 80211038 38 84 00 01 */ addi r4, r4, 1
-/* 8021103C 42 00 FF F4 */ bdnz lbl_80211030
-/* 80211040 38 60 00 00 */ li r3, 0
-/* 80211044 98 7F 07 5F */ stb r3, 0x75f(r31)
-/* 80211048 38 00 FF FF */ li r0, -1
-/* 8021104C B0 1F 07 56 */ sth r0, 0x756(r31)
-/* 80211050 98 7F 07 60 */ stb r3, 0x760(r31)
-/* 80211054 38 60 00 00 */ li r3, 0
-/* 80211058 C0 02 AE 80 */ lfs f0, lit_4182(r2)
-/* 8021105C 38 00 00 03 */ li r0, 3
-/* 80211060 7C 09 03 A6 */ mtctr r0
-lbl_80211064:
-/* 80211064 7C 9F 1A 14 */ add r4, r31, r3
-/* 80211068 D0 04 06 AC */ stfs f0, 0x6ac(r4)
-/* 8021106C D0 04 06 B8 */ stfs f0, 0x6b8(r4)
-/* 80211070 D0 04 06 C4 */ stfs f0, 0x6c4(r4)
-/* 80211074 D0 04 06 D0 */ stfs f0, 0x6d0(r4)
-/* 80211078 38 63 00 04 */ addi r3, r3, 4
-/* 8021107C 42 00 FF E8 */ bdnz lbl_80211064
-/* 80211080 C0 22 AE 80 */ lfs f1, lit_4182(r2)
-/* 80211084 D0 3F 06 DC */ stfs f1, 0x6dc(r31)
-/* 80211088 D0 3F 06 E0 */ stfs f1, 0x6e0(r31)
-/* 8021108C D0 3F 06 E4 */ stfs f1, 0x6e4(r31)
-/* 80211090 D0 3F 06 E8 */ stfs f1, 0x6e8(r31)
-/* 80211094 D0 3F 06 EC */ stfs f1, 0x6ec(r31)
-/* 80211098 D0 3F 06 F0 */ stfs f1, 0x6f0(r31)
-/* 8021109C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 802110A0 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 802110A4 C0 04 00 14 */ lfs f0, 0x14(r4)
-/* 802110A8 D0 1F 07 78 */ stfs f0, 0x778(r31)
-/* 802110AC C0 04 00 18 */ lfs f0, 0x18(r4)
-/* 802110B0 D0 1F 07 7C */ stfs f0, 0x77c(r31)
-/* 802110B4 D0 3F 07 80 */ stfs f1, 0x780(r31)
-/* 802110B8 D0 3F 07 84 */ stfs f1, 0x784(r31)
-/* 802110BC C0 02 AE 84 */ lfs f0, lit_4183(r2)
-/* 802110C0 D0 1F 07 88 */ stfs f0, 0x788(r31)
-/* 802110C4 C0 04 00 9C */ lfs f0, 0x9c(r4)
-/* 802110C8 D0 1F 07 8C */ stfs f0, 0x78c(r31)
-/* 802110CC D0 3F 07 90 */ stfs f1, 0x790(r31)
-/* 802110D0 C0 04 00 20 */ lfs f0, 0x20(r4)
-/* 802110D4 D0 1F 07 94 */ stfs f0, 0x794(r31)
-/* 802110D8 C0 04 00 24 */ lfs f0, 0x24(r4)
-/* 802110DC D0 1F 07 98 */ stfs f0, 0x798(r31)
-/* 802110E0 C0 04 00 34 */ lfs f0, 0x34(r4)
-/* 802110E4 D0 1F 07 9C */ stfs f0, 0x79c(r31)
-/* 802110E8 C0 04 00 3C */ lfs f0, 0x3c(r4)
-/* 802110EC D0 1F 07 A0 */ stfs f0, 0x7a0(r31)
-/* 802110F0 D0 3F 07 A4 */ stfs f1, 0x7a4(r31)
-/* 802110F4 C0 04 00 44 */ lfs f0, 0x44(r4)
-/* 802110F8 D0 1F 07 A8 */ stfs f0, 0x7a8(r31)
-/* 802110FC C0 04 00 48 */ lfs f0, 0x48(r4)
-/* 80211100 D0 1F 07 AC */ stfs f0, 0x7ac(r31)
-/* 80211104 D0 3F 07 B0 */ stfs f1, 0x7b0(r31)
-/* 80211108 C0 04 00 58 */ lfs f0, 0x58(r4)
-/* 8021110C D0 1F 07 B4 */ stfs f0, 0x7b4(r31)
-/* 80211110 C0 04 00 5C */ lfs f0, 0x5c(r4)
-/* 80211114 D0 1F 07 B8 */ stfs f0, 0x7b8(r31)
-/* 80211118 D0 3F 07 BC */ stfs f1, 0x7bc(r31)
-/* 8021111C C0 04 00 6C */ lfs f0, 0x6c(r4)
-/* 80211120 D0 1F 07 C0 */ stfs f0, 0x7c0(r31)
-/* 80211124 C0 04 00 70 */ lfs f0, 0x70(r4)
-/* 80211128 D0 1F 07 C4 */ stfs f0, 0x7c4(r31)
-/* 8021112C D0 3F 07 C8 */ stfs f1, 0x7c8(r31)
-/* 80211130 38 00 00 00 */ li r0, 0
-/* 80211134 98 1F 08 61 */ stb r0, 0x861(r31)
-/* 80211138 98 1F 08 60 */ stb r0, 0x860(r31)
-/* 8021113C C0 04 00 18 */ lfs f0, 0x18(r4)
-/* 80211140 D0 1F 07 CC */ stfs f0, 0x7cc(r31)
-/* 80211144 C0 04 03 48 */ lfs f0, 0x348(r4)
-/* 80211148 D0 1F 07 D0 */ stfs f0, 0x7d0(r31)
-/* 8021114C C0 04 03 58 */ lfs f0, 0x358(r4)
-/* 80211150 D0 1F 07 D4 */ stfs f0, 0x7d4(r31)
-/* 80211154 C0 04 03 78 */ lfs f0, 0x378(r4)
-/* 80211158 D0 1F 07 D8 */ stfs f0, 0x7d8(r31)
-/* 8021115C C0 04 03 88 */ lfs f0, 0x388(r4)
-/* 80211160 D0 1F 07 DC */ stfs f0, 0x7dc(r31)
-/* 80211164 C0 04 00 18 */ lfs f0, 0x18(r4)
-/* 80211168 D0 1F 07 E0 */ stfs f0, 0x7e0(r31)
-/* 8021116C C0 04 03 48 */ lfs f0, 0x348(r4)
-/* 80211170 D0 1F 07 E4 */ stfs f0, 0x7e4(r31)
-/* 80211174 C0 04 03 68 */ lfs f0, 0x368(r4)
-/* 80211178 D0 1F 07 E8 */ stfs f0, 0x7e8(r31)
-/* 8021117C C0 04 03 98 */ lfs f0, 0x398(r4)
-/* 80211180 D0 1F 07 EC */ stfs f0, 0x7ec(r31)
-/* 80211184 C0 04 00 18 */ lfs f0, 0x18(r4)
-/* 80211188 D0 1F 07 F0 */ stfs f0, 0x7f0(r31)
-/* 8021118C C0 04 00 84 */ lfs f0, 0x84(r4)
-/* 80211190 D0 1F 07 F4 */ stfs f0, 0x7f4(r31)
-/* 80211194 C0 04 00 A0 */ lfs f0, 0xa0(r4)
-/* 80211198 D0 1F 07 F8 */ stfs f0, 0x7f8(r31)
-/* 8021119C C0 04 00 A8 */ lfs f0, 0xa8(r4)
-/* 802111A0 D0 1F 07 FC */ stfs f0, 0x7fc(r31)
-/* 802111A4 C0 04 00 F0 */ lfs f0, 0xf0(r4)
-/* 802111A8 D0 1F 08 00 */ stfs f0, 0x800(r31)
-/* 802111AC C0 04 01 48 */ lfs f0, 0x148(r4)
-/* 802111B0 D0 1F 08 04 */ stfs f0, 0x804(r31)
-/* 802111B4 C0 04 01 58 */ lfs f0, 0x158(r4)
-/* 802111B8 D0 1F 08 08 */ stfs f0, 0x808(r31)
-/* 802111BC C0 04 01 68 */ lfs f0, 0x168(r4)
-/* 802111C0 D0 1F 08 0C */ stfs f0, 0x80c(r31)
-/* 802111C4 C0 04 01 78 */ lfs f0, 0x178(r4)
-/* 802111C8 D0 1F 08 10 */ stfs f0, 0x810(r31)
-/* 802111CC 38 60 00 00 */ li r3, 0
-/* 802111D0 38 00 00 02 */ li r0, 2
-/* 802111D4 7C 09 03 A6 */ mtctr r0
-lbl_802111D8:
-/* 802111D8 7C A4 1A 14 */ add r5, r4, r3
-/* 802111DC C0 05 02 38 */ lfs f0, 0x238(r5)
-/* 802111E0 7C DF 1A 14 */ add r6, r31, r3
-/* 802111E4 D0 06 08 14 */ stfs f0, 0x814(r6)
-/* 802111E8 C0 05 02 58 */ lfs f0, 0x258(r5)
-/* 802111EC D0 06 08 1C */ stfs f0, 0x81c(r6)
-/* 802111F0 C0 05 02 78 */ lfs f0, 0x278(r5)
-/* 802111F4 D0 06 08 24 */ stfs f0, 0x824(r6)
-/* 802111F8 C0 05 02 98 */ lfs f0, 0x298(r5)
-/* 802111FC D0 06 08 2C */ stfs f0, 0x82c(r6)
-/* 80211200 38 63 00 04 */ addi r3, r3, 4
-/* 80211204 42 00 FF D4 */ bdnz lbl_802111D8
-/* 80211208 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
-/* 8021120C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
-/* 80211210 C0 03 02 AC */ lfs f0, 0x2ac(r3)
-/* 80211214 D0 1F 08 34 */ stfs f0, 0x834(r31)
-/* 80211218 C0 03 02 B0 */ lfs f0, 0x2b0(r3)
-/* 8021121C D0 1F 08 38 */ stfs f0, 0x838(r31)
-/* 80211220 C0 03 02 C4 */ lfs f0, 0x2c4(r3)
-/* 80211224 D0 1F 08 3C */ stfs f0, 0x83c(r31)
-/* 80211228 C0 03 04 14 */ lfs f0, 0x414(r3)
-/* 8021122C D0 1F 08 40 */ stfs f0, 0x840(r31)
-/* 80211230 C0 03 04 18 */ lfs f0, 0x418(r3)
-/* 80211234 D0 1F 08 44 */ stfs f0, 0x844(r31)
-/* 80211238 C0 03 04 1C */ lfs f0, 0x41c(r3)
-/* 8021123C D0 1F 08 48 */ stfs f0, 0x848(r31)
-/* 80211240 88 03 02 C0 */ lbz r0, 0x2c0(r3)
-/* 80211244 98 1F 08 4C */ stb r0, 0x84c(r31)
-/* 80211248 88 03 02 C1 */ lbz r0, 0x2c1(r3)
-/* 8021124C 98 1F 08 4D */ stb r0, 0x84d(r31)
-/* 80211250 88 03 02 C2 */ lbz r0, 0x2c2(r3)
-/* 80211254 98 1F 08 4E */ stb r0, 0x84e(r31)
-/* 80211258 88 03 02 C3 */ lbz r0, 0x2c3(r3)
-/* 8021125C 98 1F 08 4F */ stb r0, 0x84f(r31)
-/* 80211260 88 03 02 E0 */ lbz r0, 0x2e0(r3)
-/* 80211264 98 1F 08 50 */ stb r0, 0x850(r31)
-/* 80211268 88 03 02 E1 */ lbz r0, 0x2e1(r3)
-/* 8021126C 98 1F 08 51 */ stb r0, 0x851(r31)
-/* 80211270 88 03 02 E2 */ lbz r0, 0x2e2(r3)
-/* 80211274 98 1F 08 52 */ stb r0, 0x852(r31)
-/* 80211278 88 03 02 E3 */ lbz r0, 0x2e3(r3)
-/* 8021127C 98 1F 08 53 */ stb r0, 0x853(r31)
-/* 80211280 88 03 02 F0 */ lbz r0, 0x2f0(r3)
-/* 80211284 98 1F 08 54 */ stb r0, 0x854(r31)
-/* 80211288 88 03 02 F1 */ lbz r0, 0x2f1(r3)
-/* 8021128C 98 1F 08 55 */ stb r0, 0x855(r31)
-/* 80211290 88 03 02 F2 */ lbz r0, 0x2f2(r3)
-/* 80211294 98 1F 08 56 */ stb r0, 0x856(r31)
-/* 80211298 88 03 02 F3 */ lbz r0, 0x2f3(r3)
-/* 8021129C 98 1F 08 57 */ stb r0, 0x857(r31)
-/* 802112A0 88 03 03 38 */ lbz r0, 0x338(r3)
-/* 802112A4 98 1F 08 58 */ stb r0, 0x858(r31)
-/* 802112A8 88 03 03 39 */ lbz r0, 0x339(r3)
-/* 802112AC 98 1F 08 59 */ stb r0, 0x859(r31)
-/* 802112B0 88 03 03 3A */ lbz r0, 0x33a(r3)
-/* 802112B4 98 1F 08 5A */ stb r0, 0x85a(r31)
-/* 802112B8 88 03 03 3B */ lbz r0, 0x33b(r3)
-/* 802112BC 98 1F 08 5B */ stb r0, 0x85b(r31)
-/* 802112C0 88 03 03 00 */ lbz r0, 0x300(r3)
-/* 802112C4 98 1F 08 5C */ stb r0, 0x85c(r31)
-/* 802112C8 88 03 03 01 */ lbz r0, 0x301(r3)
-/* 802112CC 98 1F 08 5D */ stb r0, 0x85d(r31)
-/* 802112D0 88 03 03 02 */ lbz r0, 0x302(r3)
-/* 802112D4 98 1F 08 5E */ stb r0, 0x85e(r31)
-/* 802112D8 88 03 03 03 */ lbz r0, 0x303(r3)
-/* 802112DC 98 1F 08 5F */ stb r0, 0x85f(r31)
-/* 802112E0 7F E3 FB 78 */ mr r3, r31
-/* 802112E4 38 80 00 00 */ li r4, 0
-/* 802112E8 48 00 9E 1D */ bl setItemParamX__13dMeter2Draw_cFUc
-/* 802112EC 7F E3 FB 78 */ mr r3, r31
-/* 802112F0 38 80 00 00 */ li r4, 0
-/* 802112F4 48 00 A0 71 */ bl setItemParamY__13dMeter2Draw_cFUc
-/* 802112F8 7F E3 FB 78 */ mr r3, r31
-/* 802112FC 38 80 00 00 */ li r4, 0
-/* 80211300 48 00 A2 B1 */ bl setItemParamZ__13dMeter2Draw_cFUc
-/* 80211304 7F E3 FB 78 */ mr r3, r31
-/* 80211308 38 80 00 00 */ li r4, 0
-/* 8021130C 48 00 A5 05 */ bl setItemParamB__13dMeter2Draw_cFUc
-/* 80211310 7F E3 FB 78 */ mr r3, r31
-/* 80211314 48 00 08 D9 */ bl initLife__13dMeter2Draw_cFv
-/* 80211318 7F E3 FB 78 */ mr r3, r31
-/* 8021131C 48 00 0B 49 */ bl initMagic__13dMeter2Draw_cFv
-/* 80211320 7F E3 FB 78 */ mr r3, r31
-/* 80211324 48 00 0E 6D */ bl initLightDrop__13dMeter2Draw_cFv
-/* 80211328 7F E3 FB 78 */ mr r3, r31
-/* 8021132C 48 00 10 D9 */ bl initRupeeKey__13dMeter2Draw_cFv
-/* 80211330 7F E3 FB 78 */ mr r3, r31
-/* 80211334 48 00 13 B1 */ bl initButton__13dMeter2Draw_cFv
-/* 80211338 7F E3 FB 78 */ mr r3, r31
-/* 8021133C 48 00 21 D1 */ bl initButtonCross__13dMeter2Draw_cFv
-/* 80211340 38 00 00 00 */ li r0, 0
-/* 80211344 98 1F 07 72 */ stb r0, 0x772(r31)
-/* 80211348 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8021134C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80211350 7C 08 03 A6 */ mtlr r0
-/* 80211354 38 21 00 10 */ addi r1, r1, 0x10
-/* 80211358 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/isButtonVisible__13dMeter2Draw_cFv.s b/asm/d/meter/d_meter2_draw/isButtonVisible__13dMeter2Draw_cFv.s
deleted file mode 100644
index b0e91ea890..0000000000
--- a/asm/d/meter/d_meter2_draw/isButtonVisible__13dMeter2Draw_cFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_8021B0C8:
-/* 8021B0C8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8021B0CC 7C 08 02 A6 */ mflr r0
-/* 8021B0D0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8021B0D4 80 63 02 F8 */ lwz r3, 0x2f8(r3)
-/* 8021B0D8 48 03 A7 51 */ bl getAlphaRate__13CPaneMgrAlphaFv
-/* 8021B0DC C0 02 AE 80 */ lfs f0, lit_4182(r2)
-/* 8021B0E0 FC 00 08 00 */ fcmpu cr0, f0, f1
-/* 8021B0E4 7C 00 00 26 */ mfcr r0
-/* 8021B0E8 54 00 1F FE */ rlwinm r0, r0, 3, 0x1f, 0x1f
-/* 8021B0EC 68 00 00 01 */ xori r0, r0, 1
-/* 8021B0F0 54 03 06 3E */ clrlwi r3, r0, 0x18
-/* 8021B0F4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8021B0F8 7C 08 03 A6 */ mtlr r0
-/* 8021B0FC 38 21 00 10 */ addi r1, r1, 0x10
-/* 8021B100 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/playPikariBckAnimation__13dMeter2Draw_cFf.s b/asm/d/meter/d_meter2_draw/playPikariBckAnimation__13dMeter2Draw_cFf.s
deleted file mode 100644
index 0ffd61be1d..0000000000
--- a/asm/d/meter/d_meter2_draw/playPikariBckAnimation__13dMeter2Draw_cFf.s
+++ /dev/null
@@ -1,33 +0,0 @@
-lbl_80213CEC:
-/* 80213CEC 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80213CF0 7C 08 02 A6 */ mflr r0
-/* 80213CF4 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80213CF8 DB E1 00 18 */ stfd f31, 0x18(r1)
-/* 80213CFC 93 E1 00 14 */ stw r31, 0x14(r1)
-/* 80213D00 7C 7F 1B 78 */ mr r31, r3
-/* 80213D04 FF E0 08 90 */ fmr f31, f1
-/* 80213D08 80 63 03 9C */ lwz r3, 0x39c(r3)
-/* 80213D0C 80 63 00 04 */ lwz r3, 4(r3)
-/* 80213D10 80 9F 05 34 */ lwz r4, 0x534(r31)
-/* 80213D14 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213D18 81 8C 00 60 */ lwz r12, 0x60(r12)
-/* 80213D1C 7D 89 03 A6 */ mtctr r12
-/* 80213D20 4E 80 04 21 */ bctrl
-/* 80213D24 80 7F 05 34 */ lwz r3, 0x534(r31)
-/* 80213D28 D3 E3 00 08 */ stfs f31, 8(r3)
-/* 80213D2C 80 7F 03 9C */ lwz r3, 0x39c(r31)
-/* 80213D30 80 63 00 04 */ lwz r3, 4(r3)
-/* 80213D34 48 0E 42 99 */ bl animationTransform__7J2DPaneFv
-/* 80213D38 80 7F 03 9C */ lwz r3, 0x39c(r31)
-/* 80213D3C 80 63 00 04 */ lwz r3, 4(r3)
-/* 80213D40 38 80 00 00 */ li r4, 0
-/* 80213D44 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213D48 81 8C 00 60 */ lwz r12, 0x60(r12)
-/* 80213D4C 7D 89 03 A6 */ mtctr r12
-/* 80213D50 4E 80 04 21 */ bctrl
-/* 80213D54 CB E1 00 18 */ lfd f31, 0x18(r1)
-/* 80213D58 83 E1 00 14 */ lwz r31, 0x14(r1)
-/* 80213D5C 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80213D60 7C 08 03 A6 */ mtlr r0
-/* 80213D64 38 21 00 20 */ addi r1, r1, 0x20
-/* 80213D68 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/playPikariBpkAnimation__13dMeter2Draw_cFf.s b/asm/d/meter/d_meter2_draw/playPikariBpkAnimation__13dMeter2Draw_cFf.s
deleted file mode 100644
index af212ac197..0000000000
--- a/asm/d/meter/d_meter2_draw/playPikariBpkAnimation__13dMeter2Draw_cFf.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80213E3C:
-/* 80213E3C 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80213E40 7C 08 02 A6 */ mflr r0
-/* 80213E44 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80213E48 DB E1 00 18 */ stfd f31, 0x18(r1)
-/* 80213E4C 93 E1 00 14 */ stw r31, 0x14(r1)
-/* 80213E50 7C 7F 1B 78 */ mr r31, r3
-/* 80213E54 FF E0 08 90 */ fmr f31, f1
-/* 80213E58 80 83 05 38 */ lwz r4, 0x538(r3)
-/* 80213E5C 4B FF FF 11 */ bl setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor
-/* 80213E60 80 7F 05 38 */ lwz r3, 0x538(r31)
-/* 80213E64 D3 E3 00 08 */ stfs f31, 8(r3)
-/* 80213E68 80 7F 00 80 */ lwz r3, 0x80(r31)
-/* 80213E6C 48 0E 58 25 */ bl animation__9J2DScreenFv
-/* 80213E70 7F E3 FB 78 */ mr r3, r31
-/* 80213E74 38 80 00 00 */ li r4, 0
-/* 80213E78 4B FF FE F5 */ bl setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor
-/* 80213E7C CB E1 00 18 */ lfd f31, 0x18(r1)
-/* 80213E80 83 E1 00 14 */ lwz r31, 0x14(r1)
-/* 80213E84 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80213E88 7C 08 03 A6 */ mtlr r0
-/* 80213E8C 38 21 00 20 */ addi r1, r1, 0x20
-/* 80213E90 4E 80 00 20 */ blr
diff --git a/asm/d/meter/d_meter2_draw/setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s b/asm/d/meter/d_meter2_draw/setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s
deleted file mode 100644
index b67ee0e6ba..0000000000
--- a/asm/d/meter/d_meter2_draw/setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor.s
+++ /dev/null
@@ -1,53 +0,0 @@
-lbl_80213D6C:
-/* 80213D6C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80213D70 7C 08 02 A6 */ mflr r0
-/* 80213D74 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80213D78 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80213D7C 93 C1 00 08 */ stw r30, 8(r1)
-/* 80213D80 7C 7E 1B 78 */ mr r30, r3
-/* 80213D84 7C 9F 23 78 */ mr r31, r4
-/* 80213D88 80 63 00 80 */ lwz r3, 0x80(r3)
-/* 80213D8C 3C 80 6B 61 */ lis r4, 0x6B61 /* 0x6B613030@ha */
-/* 80213D90 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6B613030@l */
-/* 80213D94 38 A0 70 69 */ li r5, 0x7069
-/* 80213D98 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213D9C 81 8C 00 3C */ lwz r12, 0x3c(r12)
-/* 80213DA0 7D 89 03 A6 */ mtctr r12
-/* 80213DA4 4E 80 04 21 */ bctrl
-/* 80213DA8 7F E4 FB 78 */ mr r4, r31
-/* 80213DAC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213DB0 81 8C 00 64 */ lwz r12, 0x64(r12)
-/* 80213DB4 7D 89 03 A6 */ mtctr r12
-/* 80213DB8 4E 80 04 21 */ bctrl
-/* 80213DBC 80 7E 00 80 */ lwz r3, 0x80(r30)
-/* 80213DC0 3C 80 79 61 */ lis r4, 0x7961 /* 0x79613030@ha */
-/* 80213DC4 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x79613030@l */
-/* 80213DC8 38 A0 6D 6F */ li r5, 0x6d6f
-/* 80213DCC 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213DD0 81 8C 00 3C */ lwz r12, 0x3c(r12)
-/* 80213DD4 7D 89 03 A6 */ mtctr r12
-/* 80213DD8 4E 80 04 21 */ bctrl
-/* 80213DDC 7F E4 FB 78 */ mr r4, r31
-/* 80213DE0 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213DE4 81 8C 00 64 */ lwz r12, 0x64(r12)
-/* 80213DE8 7D 89 03 A6 */ mtctr r12
-/* 80213DEC 4E 80 04 21 */ bctrl
-/* 80213DF0 80 7E 00 80 */ lwz r3, 0x80(r30)
-/* 80213DF4 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616273@ha */
-/* 80213DF8 38 C4 62 73 */ addi r6, r4, 0x6273 /* 0x79616273@l */
-/* 80213DFC 38 A0 6D 6F */ li r5, 0x6d6f
-/* 80213E00 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213E04 81 8C 00 3C */ lwz r12, 0x3c(r12)
-/* 80213E08 7D 89 03 A6 */ mtctr r12
-/* 80213E0C 4E 80 04 21 */ bctrl
-/* 80213E10 7F E4 FB 78 */ mr r4, r31
-/* 80213E14 81 83 00 00 */ lwz r12, 0(r3)
-/* 80213E18 81 8C 00 64 */ lwz r12, 0x64(r12)
-/* 80213E1C 7D 89 03 A6 */ mtctr r12
-/* 80213E20 4E 80 04 21 */ bctrl
-/* 80213E24 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80213E28 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80213E2C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80213E30 7C 08 03 A6 */ mtlr r0
-/* 80213E34 38 21 00 10 */ addi r1, r1, 0x10
-/* 80213E38 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/beginRender__13mDoGph_gInf_cFv.s b/asm/m_Do/m_Do_graphic/beginRender__13mDoGph_gInf_cFv.s
deleted file mode 100644
index e9e5ab3394..0000000000
--- a/asm/m_Do/m_Do_graphic/beginRender__13mDoGph_gInf_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80007F90:
-/* 80007F90 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80007F94 7C 08 02 A6 */ mflr r0
-/* 80007F98 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80007F9C 88 0D 86 68 */ lbz r0, data_80450BE8(r13)
-/* 80007FA0 28 00 00 00 */ cmplwi r0, 0
-/* 80007FA4 41 82 00 10 */ beq lbl_80007FB4
-/* 80007FA8 38 00 FF FF */ li r0, -1
-/* 80007FAC 80 6D 8F D0 */ lwz r3, sManager__6JUTXfb(r13)
-/* 80007FB0 B0 03 00 14 */ sth r0, 0x14(r3)
-lbl_80007FB4:
-/* 80007FB4 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13)
-/* 80007FB8 81 83 00 00 */ lwz r12, 0(r3)
-/* 80007FBC 81 8C 00 08 */ lwz r12, 8(r12)
-/* 80007FC0 7D 89 03 A6 */ mtctr r12
-/* 80007FC4 4E 80 04 21 */ bctrl
-/* 80007FC8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80007FCC 7C 08 03 A6 */ mtlr r0
-/* 80007FD0 38 21 00 10 */ addi r1, r1, 0x10
-/* 80007FD4 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/create__Q213mDoGph_gInf_c7bloom_cFv.s b/asm/m_Do/m_Do_graphic/create__Q213mDoGph_gInf_c7bloom_cFv.s
deleted file mode 100644
index 73c1c0498b..0000000000
--- a/asm/m_Do/m_Do_graphic/create__Q213mDoGph_gInf_c7bloom_cFv.s
+++ /dev/null
@@ -1,47 +0,0 @@
-lbl_80009544:
-/* 80009544 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80009548 7C 08 02 A6 */ mflr r0
-/* 8000954C 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80009550 93 E1 00 1C */ stw r31, 0x1c(r1)
-/* 80009554 93 C1 00 18 */ stw r30, 0x18(r1)
-/* 80009558 7C 7E 1B 78 */ mr r30, r3
-/* 8000955C 80 03 00 10 */ lwz r0, 0x10(r3)
-/* 80009560 28 00 00 00 */ cmplwi r0, 0
-/* 80009564 40 82 00 7C */ bne lbl_800095E0
-/* 80009568 38 60 01 30 */ li r3, 0x130
-/* 8000956C 38 80 00 E0 */ li r4, 0xe0
-/* 80009570 38 A0 00 06 */ li r5, 6
-/* 80009574 38 C0 00 00 */ li r6, 0
-/* 80009578 38 E0 00 00 */ li r7, 0
-/* 8000957C 48 35 46 A1 */ bl GXGetTexBufferSize
-/* 80009580 7C 7F 1B 78 */ mr r31, r3
-/* 80009584 48 00 58 69 */ bl mDoExt_getArchiveHeap__Fv
-/* 80009588 7F E4 FB 78 */ mr r4, r31
-/* 8000958C 38 A0 FF E0 */ li r5, -32
-/* 80009590 48 2C 4F 45 */ bl alloc__7JKRHeapFUli
-/* 80009594 90 7E 00 10 */ stw r3, 0x10(r30)
-/* 80009598 38 00 00 00 */ li r0, 0
-/* 8000959C 98 1E 00 08 */ stb r0, 8(r30)
-/* 800095A0 98 1E 00 09 */ stb r0, 9(r30)
-/* 800095A4 38 60 00 80 */ li r3, 0x80
-/* 800095A8 98 7E 00 0A */ stb r3, 0xa(r30)
-/* 800095AC 38 00 00 40 */ li r0, 0x40
-/* 800095B0 98 1E 00 0B */ stb r0, 0xb(r30)
-/* 800095B4 98 7E 00 0C */ stb r3, 0xc(r30)
-/* 800095B8 80 02 80 B0 */ lwz r0, lit_4505(r2)
-/* 800095BC 90 01 00 08 */ stw r0, 8(r1)
-/* 800095C0 88 01 00 08 */ lbz r0, 8(r1)
-/* 800095C4 98 1E 00 00 */ stb r0, 0(r30)
-/* 800095C8 88 01 00 09 */ lbz r0, 9(r1)
-/* 800095CC 98 1E 00 01 */ stb r0, 1(r30)
-/* 800095D0 88 01 00 0A */ lbz r0, 0xa(r1)
-/* 800095D4 98 1E 00 02 */ stb r0, 2(r30)
-/* 800095D8 88 01 00 0B */ lbz r0, 0xb(r1)
-/* 800095DC 98 1E 00 03 */ stb r0, 3(r30)
-lbl_800095E0:
-/* 800095E0 83 E1 00 1C */ lwz r31, 0x1c(r1)
-/* 800095E4 83 C1 00 18 */ lwz r30, 0x18(r1)
-/* 800095E8 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 800095EC 7C 08 03 A6 */ mtlr r0
-/* 800095F0 38 21 00 20 */ addi r1, r1, 0x20
-/* 800095F4 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/dScnPly_BeforeOfPaint__Fv.s b/asm/m_Do/m_Do_graphic/dScnPly_BeforeOfPaint__Fv.s
deleted file mode 100644
index a3245188b1..0000000000
--- a/asm/m_Do/m_Do_graphic/dScnPly_BeforeOfPaint__Fv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80008424:
-/* 80008424 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80008428 7C 08 02 A6 */ mflr r0
-/* 8000842C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80008430 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80008434 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80008438 38 63 5F 64 */ addi r3, r3, 0x5f64
-/* 8000843C 48 04 E0 FD */ bl reset__12dDlst_list_cFv
-/* 80008440 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80008444 7C 08 03 A6 */ mtlr r0
-/* 80008448 38 21 00 10 */ addi r1, r1, 0x10
-/* 8000844C 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/drawItem3D__Fv.s b/asm/m_Do/m_Do_graphic/drawItem3D__Fv.s
deleted file mode 100644
index 438907546d..0000000000
--- a/asm/m_Do/m_Do_graphic/drawItem3D__Fv.s
+++ /dev/null
@@ -1,31 +0,0 @@
-lbl_8000A58C:
-/* 8000A58C 94 21 FF C0 */ stwu r1, -0x40(r1)
-/* 8000A590 7C 08 02 A6 */ mflr r0
-/* 8000A594 90 01 00 44 */ stw r0, 0x44(r1)
-/* 8000A598 93 E1 00 3C */ stw r31, 0x3c(r1)
-/* 8000A59C 38 61 00 08 */ addi r3, r1, 8
-/* 8000A5A0 48 1A D0 49 */ bl setupItem3D__17dMenu_Collect3D_cFPA4_f
-/* 8000A5A4 4B FF FF 61 */ bl setLight__Fv
-/* 8000A5A8 38 61 00 08 */ addi r3, r1, 8
-/* 8000A5AC 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */
-/* 8000A5B0 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */
-/* 8000A5B4 48 33 BE FD */ bl PSMTXCopy
-/* 8000A5B8 38 60 00 01 */ li r3, 1
-/* 8000A5BC 48 35 60 15 */ bl GXSetClipMode
-/* 8000A5C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8000A5C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8000A5C8 3B E3 5F 64 */ addi r31, r3, 0x5f64
-/* 8000A5CC 7F E3 FB 78 */ mr r3, r31
-/* 8000A5D0 48 04 C1 7D */ bl drawOpaListItem3d__12dDlst_list_cFv
-/* 8000A5D4 7F E3 FB 78 */ mr r3, r31
-/* 8000A5D8 48 04 C1 99 */ bl drawXluListItem3d__12dDlst_list_cFv
-/* 8000A5DC 38 60 00 00 */ li r3, 0
-/* 8000A5E0 48 35 5F F1 */ bl GXSetClipMode
-/* 8000A5E4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 8000A5E8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
-/* 8000A5EC 48 30 61 51 */ bl reinitGX__6J3DSysFv
-/* 8000A5F0 83 E1 00 3C */ lwz r31, 0x3c(r1)
-/* 8000A5F4 80 01 00 44 */ lwz r0, 0x44(r1)
-/* 8000A5F8 7C 08 03 A6 */ mtlr r0
-/* 8000A5FC 38 21 00 40 */ addi r1, r1, 0x40
-/* 8000A600 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFf.s b/asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFf.s
deleted file mode 100644
index db8515dd39..0000000000
--- a/asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFf.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_800080D0:
-/* 800080D0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800080D4 7C 08 02 A6 */ mflr r0
-/* 800080D8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800080DC 38 6D 80 80 */ la r3, g_clearColor(r13) /* 80450600-_SDA_BASE_ */
-/* 800080E0 4B FF FE F9 */ bl fadeOut__13mDoGph_gInf_cFfR8_GXColor
-/* 800080E4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800080E8 7C 08 03 A6 */ mtlr r0
-/* 800080EC 38 21 00 10 */ addi r1, r1, 0x10
-/* 800080F0 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFfR8_GXColor.s b/asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFfR8_GXColor.s
deleted file mode 100644
index dd9ed8c2df..0000000000
--- a/asm/m_Do/m_Do_graphic/fadeOut__13mDoGph_gInf_cFfR8_GXColor.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80007FD8:
-/* 80007FD8 38 00 00 01 */ li r0, 1
-/* 80007FDC 98 0D 86 66 */ stb r0, struct_80450BE4+0x2(r13)
-/* 80007FE0 D0 2D 86 60 */ stfs f1, mFadeSpeed__13mDoGph_gInf_c(r13)
-/* 80007FE4 88 03 00 00 */ lbz r0, 0(r3)
-/* 80007FE8 98 0D 80 14 */ stb r0, mFadeColor__13mDoGph_gInf_c(r13)
-/* 80007FEC 88 03 00 01 */ lbz r0, 1(r3)
-/* 80007FF0 38 8D 80 14 */ la r4, mFadeColor__13mDoGph_gInf_c(r13) /* 80450594-_SDA_BASE_ */
-/* 80007FF4 98 04 00 01 */ stb r0, 1(r4)
-/* 80007FF8 88 03 00 02 */ lbz r0, 2(r3)
-/* 80007FFC 98 04 00 02 */ stb r0, 2(r4)
-/* 80008000 88 03 00 03 */ lbz r0, 3(r3)
-/* 80008004 98 04 00 03 */ stb r0, 3(r4)
-/* 80008008 C0 02 80 38 */ lfs f0, lit_4062(r2)
-/* 8000800C FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80008010 4C 41 13 82 */ cror 2, 1, 2
-/* 80008014 40 82 00 08 */ bne lbl_8000801C
-/* 80008018 48 00 00 08 */ b lbl_80008020
-lbl_8000801C:
-/* 8000801C C0 02 80 3C */ lfs f0, lit_4063(r2)
-lbl_80008020:
-/* 80008020 D0 0D 86 5C */ stfs f0, mFadeRate__13mDoGph_gInf_c(r13)
-/* 80008024 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/fadeOut_f__13mDoGph_gInf_cFfR8_GXColor.s b/asm/m_Do/m_Do_graphic/fadeOut_f__13mDoGph_gInf_cFfR8_GXColor.s
deleted file mode 100644
index d23fc52611..0000000000
--- a/asm/m_Do/m_Do_graphic/fadeOut_f__13mDoGph_gInf_cFfR8_GXColor.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80008028:
-/* 80008028 38 00 00 81 */ li r0, 0x81
-/* 8000802C 98 0D 86 66 */ stb r0, struct_80450BE4+0x2(r13)
-/* 80008030 D0 2D 86 60 */ stfs f1, mFadeSpeed__13mDoGph_gInf_c(r13)
-/* 80008034 88 03 00 00 */ lbz r0, 0(r3)
-/* 80008038 98 0D 80 14 */ stb r0, mFadeColor__13mDoGph_gInf_c(r13)
-/* 8000803C 88 03 00 01 */ lbz r0, 1(r3)
-/* 80008040 38 8D 80 14 */ la r4, mFadeColor__13mDoGph_gInf_c(r13) /* 80450594-_SDA_BASE_ */
-/* 80008044 98 04 00 01 */ stb r0, 1(r4)
-/* 80008048 88 03 00 02 */ lbz r0, 2(r3)
-/* 8000804C 98 04 00 02 */ stb r0, 2(r4)
-/* 80008050 88 03 00 03 */ lbz r0, 3(r3)
-/* 80008054 98 04 00 03 */ stb r0, 3(r4)
-/* 80008058 C0 02 80 38 */ lfs f0, lit_4062(r2)
-/* 8000805C FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80008060 4C 41 13 82 */ cror 2, 1, 2
-/* 80008064 40 82 00 08 */ bne lbl_8000806C
-/* 80008068 48 00 00 08 */ b lbl_80008070
-lbl_8000806C:
-/* 8000806C C0 02 80 3C */ lfs f0, lit_4063(r2)
-lbl_80008070:
-/* 80008070 D0 0D 86 5C */ stfs f0, mFadeRate__13mDoGph_gInf_c(r13)
-/* 80008074 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/mDoGph_BeforeOfDraw__Fv.s b/asm/m_Do/m_Do_graphic/mDoGph_BeforeOfDraw__Fv.s
deleted file mode 100644
index c6161d8c9b..0000000000
--- a/asm/m_Do/m_Do_graphic/mDoGph_BeforeOfDraw__Fv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80008450:
-/* 80008450 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80008454 7C 08 02 A6 */ mflr r0
-/* 80008458 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8000845C 4B FF FF C9 */ bl dScnPly_BeforeOfPaint__Fv
-/* 80008460 38 60 00 01 */ li r3, 1
-/* 80008464 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80008468 7C 08 03 A6 */ mtlr r0
-/* 8000846C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80008470 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/mDoGph_Create__Fv.s b/asm/m_Do/m_Do_graphic/mDoGph_Create__Fv.s
deleted file mode 100644
index 105142895f..0000000000
--- a/asm/m_Do/m_Do_graphic/mDoGph_Create__Fv.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_8000B174:
-/* 8000B174 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8000B178 7C 08 02 A6 */ mflr r0
-/* 8000B17C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8000B180 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 8000B184 38 60 00 00 */ li r3, 0
-/* 8000B188 38 80 00 00 */ li r4, 0
-/* 8000B18C 38 A0 00 00 */ li r5, 0
-/* 8000B190 48 00 3E 2D */ bl mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl
-/* 8000B194 7C 7F 1B 78 */ mr r31, r3
-/* 8000B198 4B FF CC AD */ bl create__13mDoGph_gInf_cFv
-/* 8000B19C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8000B1A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8000B1A4 38 63 5F 64 */ addi r3, r3, 0x5f64
-/* 8000B1A8 48 04 B1 E9 */ bl init__12dDlst_list_cFv
-/* 8000B1AC 7F E3 FB 78 */ mr r3, r31
-/* 8000B1B0 48 00 3E DD */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap
-/* 8000B1B4 48 00 40 41 */ bl mDoExt_restoreCurrentHeap__Fv
-/* 8000B1B8 38 60 00 01 */ li r3, 1
-/* 8000B1BC 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8000B1C0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8000B1C4 7C 08 03 A6 */ mtlr r0
-/* 8000B1C8 38 21 00 10 */ addi r1, r1, 0x10
-/* 8000B1CC 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/mDoGph_drawFilterQuad__FScSc.s b/asm/m_Do/m_Do_graphic/mDoGph_drawFilterQuad__FScSc.s
deleted file mode 100644
index 941e6e8856..0000000000
--- a/asm/m_Do/m_Do_graphic/mDoGph_drawFilterQuad__FScSc.s
+++ /dev/null
@@ -1,37 +0,0 @@
-lbl_800094B4:
-/* 800094B4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800094B8 7C 08 02 A6 */ mflr r0
-/* 800094BC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800094C0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 800094C4 93 C1 00 08 */ stw r30, 8(r1)
-/* 800094C8 7C 7E 1B 78 */ mr r30, r3
-/* 800094CC 7C 9F 23 78 */ mr r31, r4
-/* 800094D0 38 60 00 80 */ li r3, 0x80
-/* 800094D4 38 80 00 00 */ li r4, 0
-/* 800094D8 38 A0 00 04 */ li r5, 4
-/* 800094DC 48 35 32 89 */ bl GXBegin
-/* 800094E0 38 80 00 00 */ li r4, 0
-/* 800094E4 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */
-/* 800094E8 98 83 80 00 */ stb r4, 0x8000(r3) /* 0xCC008000@l */
-/* 800094EC 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 800094F0 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 800094F4 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 800094F8 9B C3 80 00 */ stb r30, -0x8000(r3)
-/* 800094FC 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 80009500 38 00 00 01 */ li r0, 1
-/* 80009504 98 03 80 00 */ stb r0, -0x8000(r3)
-/* 80009508 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 8000950C 9B C3 80 00 */ stb r30, -0x8000(r3)
-/* 80009510 9B E3 80 00 */ stb r31, -0x8000(r3)
-/* 80009514 98 03 80 00 */ stb r0, -0x8000(r3)
-/* 80009518 98 03 80 00 */ stb r0, -0x8000(r3)
-/* 8000951C 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 80009520 9B E3 80 00 */ stb r31, -0x8000(r3)
-/* 80009524 98 83 80 00 */ stb r4, -0x8000(r3)
-/* 80009528 98 03 80 00 */ stb r0, -0x8000(r3)
-/* 8000952C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80009530 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80009534 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80009538 7C 08 03 A6 */ mtlr r0
-/* 8000953C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80009540 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFPA4_Cf.s b/asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFPA4_Cf.s
deleted file mode 100644
index f5b8edb8f1..0000000000
--- a/asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFPA4_Cf.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_800080A0:
-/* 800080A0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800080A4 7C 08 02 A6 */ mflr r0
-/* 800080A8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800080AC 38 00 00 01 */ li r0, 1
-/* 800080B0 98 0D 86 64 */ stb r0, struct_80450BE4+0x0(r13)
-/* 800080B4 3C 80 80 3E */ lis r4, mBlureMtx__13mDoGph_gInf_c@ha /* 0x803DD43C@ha */
-/* 800080B8 38 84 D4 3C */ addi r4, r4, mBlureMtx__13mDoGph_gInf_c@l /* 0x803DD43C@l */
-/* 800080BC 48 33 E3 F5 */ bl PSMTXCopy
-/* 800080C0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800080C4 7C 08 03 A6 */ mtlr r0
-/* 800080C8 38 21 00 10 */ addi r1, r1, 0x10
-/* 800080CC 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFv.s b/asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFv.s
deleted file mode 100644
index 2f250a1eb9..0000000000
--- a/asm/m_Do/m_Do_graphic/onBlure__13mDoGph_gInf_cFv.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80008078:
-/* 80008078 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8000807C 7C 08 02 A6 */ mflr r0
-/* 80008080 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80008084 3C 60 80 3A */ lis r3, g_mDoMtx_identity@ha /* 0x803A2FD8@ha */
-/* 80008088 38 63 2F D8 */ addi r3, r3, g_mDoMtx_identity@l /* 0x803A2FD8@l */
-/* 8000808C 48 00 00 15 */ bl onBlure__13mDoGph_gInf_cFPA4_Cf
-/* 80008090 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80008094 7C 08 03 A6 */ mtlr r0
-/* 80008098 38 21 00 10 */ addi r1, r1, 0x10
-/* 8000809C 4E 80 00 20 */ blr
diff --git a/asm/m_Do/m_Do_graphic/remove__Q213mDoGph_gInf_c7bloom_cFv.s b/asm/m_Do/m_Do_graphic/remove__Q213mDoGph_gInf_c7bloom_cFv.s
deleted file mode 100644
index cf1a9fde65..0000000000
--- a/asm/m_Do/m_Do_graphic/remove__Q213mDoGph_gInf_c7bloom_cFv.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_800095F8:
-/* 800095F8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800095FC 7C 08 02 A6 */ mflr r0
-/* 80009600 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80009604 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80009608 93 C1 00 08 */ stw r30, 8(r1)
-/* 8000960C 7C 7E 1B 78 */ mr r30, r3
-/* 80009610 83 E3 00 10 */ lwz r31, 0x10(r3)
-/* 80009614 28 1F 00 00 */ cmplwi r31, 0
-/* 80009618 41 82 00 18 */ beq lbl_80009630
-/* 8000961C 48 00 57 D1 */ bl mDoExt_getArchiveHeap__Fv
-/* 80009620 7F E4 FB 78 */ mr r4, r31
-/* 80009624 48 2C 4F 25 */ bl free__7JKRHeapFPv
-/* 80009628 38 00 00 00 */ li r0, 0
-/* 8000962C 90 1E 00 10 */ stw r0, 0x10(r30)
-lbl_80009630:
-/* 80009630 38 00 00 00 */ li r0, 0
-/* 80009634 98 1E 00 07 */ stb r0, 7(r30)
-/* 80009638 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 8000963C 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80009640 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80009644 7C 08 03 A6 */ mtlr r0
-/* 80009648 38 21 00 10 */ addi r1, r1, 0x10
-/* 8000964C 4E 80 00 20 */ blr