From 045a92d7c31f4476ae9cff6910fb5a222b71f04f Mon Sep 17 00:00:00 2001 From: Lucas Shaw <49287729+shawlucas@users.noreply.github.com> Date: Tue, 14 Apr 2020 11:16:34 -0700 Subject: [PATCH] Big actor cleanup (fixed) (#69) * Started doing cleanup * did more work * did more migration * migrated more rodata and worked on some structs * did more work * Removal of ROOM field from initvars, some rodata migration, some string decompilation * General update * Decompiled vt strings * Tool work * Tool improvements * 270 overlay rodata files remaining * better float handling * floats * Many more floats * migrated boss_mo * assorted fixes * Migrated 10 * tool improvements * migrated 10 * 10 more * 1 more * did a few more * fixes * 10 more * more floats * Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed. * removed changes made to script by accident * migrated largest rodata - ovl_fishing * Did some more * 114 remaining * 99 left ! * almost done migrating rodata * did some more, done for tonight * almost done, tried add support to the script for z_player * All possible rodata migrated in actor overlays * update * removed static from all overlays, ran format.sh * Removed unknown actor structs * converted a few floats * Added new lines to header files that were missing them. Removed unused asm files * Removed unused asm files * Formatting newlines Further formatting spacing .float spacing More space formatting More spacing formatting Removing .balign 4 after floats Co-authored-by: Ethan Roseman --- .../code/fault/Fault_AddAddrConvClient.s | 1 - .../code/fault/Fault_DrawStackTrace.s | 1 - .../code/fault/Fault_LogStackTrace.s | 3 - .../code/fault/Fault_ThreadEntry.s | 1 - .../code/fault/Fault_WaitForButtonCombo.s | 1 - asm/non_matchings/code/graph/Graph_Update.s | 1 - .../code/z_camera/func_80046CB4.s | 2 +- .../actors/ovl_Arms_Hook/ArmsHook_Destroy.s | 2 - .../actors/ovl_Arms_Hook/ArmsHook_Draw.s | 26 +- .../actors/ovl_Arms_Hook/ArmsHook_Init.s | 4 +- ...func_80864F00.s => ArmsHook_SetupAction.s} | 4 +- .../actors/ovl_Arms_Hook/ArmsHook_Update.s | 2 - .../actors/ovl_Arms_Hook/func_80864FC4.s | 4 +- .../actors/ovl_Arms_Hook/func_80865044.s | 2 - .../actors/ovl_Arms_Hook/func_80865054.s | 2 - .../actors/ovl_Arms_Hook/func_80865084.s | 2 - .../actors/ovl_Arms_Hook/func_808650AC.s | 2 - .../actors/ovl_Arms_Hook/func_80865148.s | 2 - .../actors/ovl_Arms_Hook/func_8086518C.s | 9 +- .../ovl_Bg_Bombwall/BgBombwall_Destroy.s | 2 - .../actors/ovl_Bg_Bombwall/BgBombwall_Draw.s | 1 - .../actors/ovl_Bg_Bombwall/BgBombwall_Init.s | 8 +- .../ovl_Bg_Bombwall/BgBombwall_Update.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086E7D0.s | 12 +- .../actors/ovl_Bg_Bombwall/func_8086E850.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086EAC0.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086EB5C.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086ED50.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086ED70.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086EDFC.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086EE40.s | 2 - .../actors/ovl_Bg_Bombwall/func_8086EE94.s | 2 - .../ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s | 2 - .../actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s | 15 +- .../actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s | 12 +- .../ovl_Bg_Bowl_Wall/BgBowlWall_Update.s | 2 - .../actors/ovl_Bg_Bowl_Wall/func_8086F260.s | 12 +- .../actors/ovl_Bg_Bowl_Wall/func_8086F440.s | 2 - .../actors/ovl_Bg_Bowl_Wall/func_8086F464.s | 2 - .../actors/ovl_Bg_Bowl_Wall/func_8086F718.s | 2 - .../actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s | 2 - .../ovl_Bg_Breakwall/BgBreakwall_Destroy.s | 2 - .../ovl_Bg_Breakwall/BgBreakwall_Init.s | 4 +- ...c_8086FBE0.s => BgBreakwall_SetupAction.s} | 4 +- .../ovl_Bg_Breakwall/BgBreakwall_Update.s | 2 - .../actors/ovl_Bg_Breakwall/func_8086FDC0.s | 16 +- .../actors/ovl_Bg_Breakwall/func_80870290.s | 6 +- .../actors/ovl_Bg_Breakwall/func_80870394.s | 7 +- .../actors/ovl_Bg_Breakwall/func_80870564.s | 2 - .../actors/ovl_Bg_Breakwall/func_808705D8.s | 15 +- .../actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s | 2 - .../actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s | 1 - .../actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s | 2 - .../actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s | 2 - .../actors/ovl_Bg_Ddan_Jd/func_80870B88.s | 2 - .../actors/ovl_Bg_Ddan_Jd/func_80870D2C.s | 2 - .../actors/ovl_Bg_Ddan_Jd/func_80870F00.s | 2 - .../actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s | 2 - .../actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s | 1 - .../actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s | 6 +- ...func_808710F0.s => BgDdanKd_SetupAction.s} | 4 +- .../actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s | 2 - .../actors/ovl_Bg_Ddan_Kd/func_80871234.s | 10 +- .../actors/ovl_Bg_Ddan_Kd/func_80871364.s | 12 +- .../actors/ovl_Bg_Ddan_Kd/func_80871838.s | 2 - .../actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s | 2 - .../actors/ovl_Bg_Dodoago/BgDodoago_Draw.s | 15 +- .../actors/ovl_Bg_Dodoago/BgDodoago_Init.s | 6 +- ...unc_80871A00.s => BgDodoago_SetupAction.s} | 4 +- .../actors/ovl_Bg_Dodoago/BgDodoago_Update.s | 2 - .../actors/ovl_Bg_Dodoago/func_80871A08.s | 2 - .../actors/ovl_Bg_Dodoago/func_80871CF4.s | 6 +- .../actors/ovl_Bg_Dodoago/func_80871FB8.s | 4 +- .../actors/ovl_Bg_Dodoago/func_8087227C.s | 2 - .../actors/ovl_Bg_Dodoago/func_80872288.s | 4 +- .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s | 2 - .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s | 12 +- .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80872960.s | 19 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s | 21 +- .../actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873380.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80873780.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873868.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874304.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s | 2 - .../actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s | 12 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s | 7 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s | 19 +- .../actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s | 15 +- .../BgGanonOtyuka_Destroy.s | 16 +- .../ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s | 33 +- .../ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Init.s | 2 - .../BgGanonOtyuka_Update.s | 2 - .../ovl_Bg_Ganon_Otyuka/func_80875A0C.s | 20 +- .../ovl_Bg_Ganon_Otyuka/func_80875C88.s | 22 +- .../ovl_Bg_Ganon_Otyuka/func_808760DC.s | 2 - .../BgGndDarkmeiro_Destroy.s | 2 - .../BgGndDarkmeiro_Init.s | 2 - .../BgGndDarkmeiro_Update.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_80878C30.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_80878F28.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_80878F34.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_80879128.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_80879134.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_808791BC.s | 2 - .../ovl_Bg_Gnd_Darkmeiro/func_808791E8.s | 12 +- .../ovl_Bg_Gnd_Darkmeiro/func_80879334.s | 11 +- .../BgGndFiremeiro_Destroy.s | 2 - .../BgGndFiremeiro_Draw.s | 15 +- .../BgGndFiremeiro_Init.s | 2 - .../BgGndFiremeiro_Update.s | 2 - .../ovl_Bg_Gnd_Firemeiro/func_808795AC.s | 2 - .../ovl_Bg_Gnd_Firemeiro/func_80879668.s | 2 - .../ovl_Bg_Gnd_Firemeiro/func_80879808.s | 2 - .../BgGndIceblock_Destroy.s | 2 - .../ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s | 1 - .../ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s | 2 - .../BgGndIceblock_Update.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_80879C04.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_80879D10.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_80879D4C.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_80879D98.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_8087A0C8.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_8087A184.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_8087A248.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_8087A300.s | 2 - .../ovl_Bg_Gnd_Iceblock/func_8087A39C.s | 2 - .../BgGndSoulmeiro_Destroy.s | 2 - .../BgGndSoulmeiro_Draw.s | 23 +- .../BgGndSoulmeiro_Init.s | 2 - .../BgGndSoulmeiro_Update.s | 2 - .../ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s | 2 - .../ovl_Bg_Gnd_Soulmeiro/func_8087B284.s | 2 - .../ovl_Bg_Gnd_Soulmeiro/func_8087B350.s | 2 - .../actors/ovl_Bg_Haka/BgHaka_Destroy.s | 2 - .../overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s | 27 +- .../overlays/actors/ovl_Bg_Haka/BgHaka_Init.s | 2 - .../actors/ovl_Bg_Haka/BgHaka_Update.s | 2 - .../actors/ovl_Bg_Haka/func_8087B758.s | 2 - .../actors/ovl_Bg_Haka/func_8087B7E8.s | 2 - .../actors/ovl_Bg_Haka/func_8087B938.s | 2 - .../actors/ovl_Bg_Haka/func_8087BAAC.s | 2 - .../actors/ovl_Bg_Haka/func_8087BAE4.s | 2 - .../ovl_Bg_Haka_Gate/BgHakaGate_Destroy.s | 2 - .../actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s | 26 +- .../actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s | 2 - .../ovl_Bg_Haka_Gate/BgHakaGate_Update.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C114.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C120.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C158.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C270.s | 10 +- .../actors/ovl_Bg_Haka_Gate/func_8087C454.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C5D0.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C65C.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C6AC.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C73C.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C794.s | 2 - .../actors/ovl_Bg_Haka_Gate/func_8087C85C.s | 23 +- .../ovl_Bg_Haka_Huta/BgHakaHuta_Destroy.s | 2 - .../actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s | 1 - .../actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s | 2 - .../ovl_Bg_Haka_Huta/BgHakaHuta_Update.s | 2 - .../actors/ovl_Bg_Haka_Huta/func_8087D0AC.s | 2 - .../actors/ovl_Bg_Haka_Huta/func_8087D268.s | 2 - .../actors/ovl_Bg_Haka_Huta/func_8087D2F0.s | 2 - .../actors/ovl_Bg_Haka_Huta/func_8087D5B8.s | 2 - .../actors/ovl_Bg_Haka_Huta/func_8087D66C.s | 2 - .../actors/ovl_Bg_Haka_Huta/func_8087D720.s | 10 +- .../actors/ovl_Bg_Haka_Huta/func_8087D8C0.s | 2 - .../BgHakaMeganeBG_Destroy.s | 2 - .../BgHakaMeganeBG_Draw.s | 1 - .../BgHakaMeganeBG_Init.s | 7 +- .../BgHakaMeganeBG_Update.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087DFF8.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087E040.s | 10 +- .../ovl_Bg_Haka_MeganeBG/func_8087E10C.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087E1E0.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087E258.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087E288.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087E2D8.s | 2 - .../ovl_Bg_Haka_MeganeBG/func_8087E34C.s | 2 - .../ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s | 2 - .../ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s | 2 - .../ovl_Bg_Haka_Sgami/BgHakaSgami_Update.s | 2 - .../actors/ovl_Bg_Haka_Sgami/func_8087E7E4.s | 2 - .../actors/ovl_Bg_Haka_Sgami/func_8087E858.s | 7 +- .../actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s | 1 - .../ovl_Bg_Haka_Ship/BgHakaShip_Destroy.s | 2 - .../actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s | 35 +- .../actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s | 2 - .../ovl_Bg_Haka_Ship/BgHakaShip_Update.s | 2 - .../actors/ovl_Bg_Haka_Ship/func_8087F27C.s | 2 - .../actors/ovl_Bg_Haka_Ship/func_8087F2D8.s | 8 +- .../actors/ovl_Bg_Haka_Ship/func_8087F364.s | 7 +- .../actors/ovl_Bg_Haka_Ship/func_8087F400.s | 19 +- .../actors/ovl_Bg_Haka_Ship/func_8087F5C8.s | 2 - .../actors/ovl_Bg_Haka_Ship/func_8087F624.s | 2 - .../actors/ovl_Bg_Haka_Ship/func_8087F6B4.s | 2 - .../ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s | 2 - .../actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s | 1 - .../actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s | 7 +- .../ovl_Bg_Haka_Trap/BgHakaTrap_Update.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_8087FFC0.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_808801B8.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_808802D8.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_80880484.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_808805C0.s | 7 +- .../actors/ovl_Bg_Haka_Trap/func_808806BC.s | 11 +- .../actors/ovl_Bg_Haka_Trap/func_808808F4.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_808809B0.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_808809E4.s | 11 +- .../actors/ovl_Bg_Haka_Trap/func_80880AE8.s | 9 +- .../actors/ovl_Bg_Haka_Trap/func_80880C0C.s | 2 - .../actors/ovl_Bg_Haka_Trap/func_80880D68.s | 2 - .../ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s | 2 - .../actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s | 1 - .../actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s | 2 - .../ovl_Bg_Haka_Tubo/BgHakaTubo_Update.s | 2 - .../actors/ovl_Bg_Haka_Tubo/func_808813A0.s | 9 +- .../actors/ovl_Bg_Haka_Tubo/func_80881608.s | 13 +- .../actors/ovl_Bg_Haka_Tubo/func_80881904.s | 24 +- .../ovl_Bg_Haka_Water/BgHakaWater_Destroy.s | 2 - .../ovl_Bg_Haka_Water/BgHakaWater_Draw.s | 27 +- .../ovl_Bg_Haka_Water/BgHakaWater_Init.s | 2 - .../ovl_Bg_Haka_Water/BgHakaWater_Update.s | 2 - .../actors/ovl_Bg_Haka_Water/func_80881D94.s | 2 - .../actors/ovl_Bg_Haka_Water/func_80881EDC.s | 2 - .../actors/ovl_Bg_Haka_Water/func_80881F98.s | 2 - .../ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s | 2 - .../actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s | 11 +- .../actors/ovl_Bg_Haka_Zou/BgHakaZou_Update.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_808828F4.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80882A70.s | 7 +- .../actors/ovl_Bg_Haka_Zou/func_80882BDC.s | 7 +- .../actors/ovl_Bg_Haka_Zou/func_80882CC4.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80882E54.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80883000.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80883104.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80883144.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80883254.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_80883328.s | 7 +- .../actors/ovl_Bg_Haka_Zou/func_808834D8.s | 7 +- .../actors/ovl_Bg_Haka_Zou/func_80883568.s | 2 - .../actors/ovl_Bg_Haka_Zou/func_808835B8.s | 1 - .../ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s | 2 - .../ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s | 16 +- .../ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s | 16 +- .../ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_80883790.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_80883820.s | 10 +- .../actors/ovl_Bg_Heavy_Block/func_80883998.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_80883C90.s | 7 +- .../actors/ovl_Bg_Heavy_Block/func_80883E54.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_808841B8.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_808843B0.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_808844D0.s | 16 +- .../actors/ovl_Bg_Heavy_Block/func_80884658.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_8088496C.s | 2 - .../actors/ovl_Bg_Heavy_Block/func_80884978.s | 17 +- .../actors/ovl_Bg_Heavy_Block/func_80884DB4.s | 1 - .../BgHidanCurtain_Destroy.s | 2 - .../BgHidanCurtain_Draw.s | 15 +- .../BgHidanCurtain_Init.s | 24 +- .../BgHidanCurtain_Update.s | 2 - .../ovl_Bg_Hidan_Curtain/func_80885434.s | 2 - .../ovl_Bg_Hidan_Curtain/func_808854E8.s | 2 - .../ovl_Bg_Hidan_Curtain/func_80885514.s | 2 - .../ovl_Bg_Hidan_Curtain/func_80885554.s | 2 - .../ovl_Bg_Hidan_Curtain/func_80885594.s | 2 - .../ovl_Bg_Hidan_Curtain/func_80885604.s | 2 - .../ovl_Bg_Hidan_Curtain/func_808856F4.s | 2 - .../ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s | 2 - .../ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s | 1 - .../ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s | 2 - .../ovl_Bg_Hidan_Dalm/BgHidanDalm_Update.s | 2 - .../actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s | 2 - .../actors/ovl_Bg_Hidan_Dalm/func_808860CC.s | 2 - .../actors/ovl_Bg_Hidan_Dalm/func_808862D8.s | 2 - .../ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s | 2 - .../ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s | 15 +- .../ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s | 2 - .../ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s | 9 +- .../actors/ovl_Bg_Hidan_Fwbig/func_80887534.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_80887598.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_80887638.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_80887718.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_80887768.s | 7 +- .../actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s | 2 - .../actors/ovl_Bg_Hidan_Fwbig/func_80887864.s | 2 - .../BgHidanHamstep_Destroy.s | 2 - .../BgHidanHamstep_Draw.s | 15 +- .../BgHidanHamstep_Init.s | 24 +- .../BgHidanHamstep_Update.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_80888040.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_8088805C.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_808884C8.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_80888638.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_80888694.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_80888734.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_808887C4.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_80888860.s | 12 +- .../ovl_Bg_Hidan_Hamstep/func_808889B8.s | 2 - .../ovl_Bg_Hidan_Hamstep/func_80888A58.s | 26 +- .../ovl_Bg_Hidan_Hamstep/func_80888C38.s | 2 - .../ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s | 2 - .../ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s | 1 - .../ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s | 9 +- .../ovl_Bg_Hidan_Hrock/BgHidanHrock_Update.s | 2 - .../actors/ovl_Bg_Hidan_Hrock/func_808894A4.s | 2 - .../actors/ovl_Bg_Hidan_Hrock/func_808894B0.s | 2 - .../actors/ovl_Bg_Hidan_Hrock/func_8088960C.s | 2 - .../actors/ovl_Bg_Hidan_Hrock/func_808896B8.s | 2 - .../ovl_Bg_Hidan_Kousi/BgHidanKousi_Destroy.s | 2 - .../ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s | 15 +- .../ovl_Bg_Hidan_Kousi/BgHidanKousi_Init.s | 16 +- ..._80889960.s => BgHidanKousi_SetupAction.s} | 4 +- .../ovl_Bg_Hidan_Kousi/BgHidanKousi_Update.s | 2 - .../actors/ovl_Bg_Hidan_Kousi/func_80889ACC.s | 2 - .../actors/ovl_Bg_Hidan_Kousi/func_80889B5C.s | 4 +- .../actors/ovl_Bg_Hidan_Kousi/func_80889BC0.s | 4 +- .../actors/ovl_Bg_Hidan_Kousi/func_80889C18.s | 9 +- .../actors/ovl_Bg_Hidan_Kousi/func_80889C90.s | 4 +- .../actors/ovl_Bg_Hidan_Kousi/func_80889D28.s | 2 - .../BgHidanKowarerukabe_Destroy.s | 2 - .../BgHidanKowarerukabe_Draw.s | 15 +- .../BgHidanKowarerukabe_Init.s | 16 +- .../BgHidanKowarerukabe_Update.s | 2 - .../ovl_Bg_Hidan_Kowarerukabe/func_8088A020.s | 2 - .../ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s | 2 - .../ovl_Bg_Hidan_Kowarerukabe/func_8088A150.s | 2 - .../ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s | 2 - .../ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s | 7 +- .../ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s | 7 +- .../ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s | 7 +- .../ovl_Bg_Hidan_Kowarerukabe/func_8088ABA0.s | 2 - .../ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s | 2 - .../ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s | 1 - .../ovl_Bg_Hidan_Rock/BgHidanRock_Init.s | 2 - .../ovl_Bg_Hidan_Rock/BgHidanRock_Update.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B24C.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B268.s | 16 +- .../actors/ovl_Bg_Hidan_Rock/func_8088B5F4.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B634.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B69C.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B79C.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B90C.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B954.s | 2 - .../actors/ovl_Bg_Hidan_Rock/func_8088B990.s | 12 +- .../actors/ovl_Bg_Hidan_Rock/func_8088BC40.s | 16 +- .../BgHidanRsekizou_Destroy.s | 2 - .../BgHidanRsekizou_Draw.s | 15 +- .../BgHidanRsekizou_Init.s | 2 - .../BgHidanRsekizou_Update.s | 2 - .../ovl_Bg_Hidan_Rsekizou/func_8088C70C.s | 19 +- .../BgHidanSekizou_Destroy.s | 2 - .../BgHidanSekizou_Draw.s | 15 +- .../BgHidanSekizou_Init.s | 2 - .../BgHidanSekizou_Update.s | 2 - .../ovl_Bg_Hidan_Sekizou/func_8088CEC0.s | 2 - .../ovl_Bg_Hidan_Sekizou/func_8088D434.s | 2 - .../ovl_Bg_Hidan_Sekizou/func_8088D720.s | 2 - .../ovl_Bg_Hidan_Sekizou/func_8088D750.s | 2 - .../ovl_Bg_Hidan_Sekizou/func_8088D9F4.s | 17 +- .../ovl_Bg_Hidan_Sekizou/func_8088DC50.s | 2 - .../ovl_Bg_Hidan_Sekizou/func_8088DE08.s | 2 - .../ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s | 2 - .../ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s | 15 +- .../ovl_Bg_Hidan_Sima/BgHidanSima_Init.s | 2 - .../ovl_Bg_Hidan_Sima/BgHidanSima_Update.s | 7 +- .../actors/ovl_Bg_Hidan_Sima/func_8088E518.s | 2 - .../actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s | 2 - .../actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s | 2 - .../actors/ovl_Bg_Hidan_Sima/func_8088E760.s | 2 - .../actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s | 13 +- .../actors/ovl_Bg_Hidan_Sima/func_8088E90C.s | 2 - .../actors/ovl_Bg_Hidan_Sima/func_8088EB54.s | 16 +- .../ovl_Bg_Ice_Objects/BgIceObjects_Destroy.s | 2 - .../ovl_Bg_Ice_Objects/BgIceObjects_Draw.s | 1 - .../ovl_Bg_Ice_Objects/BgIceObjects_Init.s | 2 - .../ovl_Bg_Ice_Objects/BgIceObjects_Update.s | 2 - .../actors/ovl_Bg_Ice_Objects/func_8088F8C8.s | 9 +- .../actors/ovl_Bg_Ice_Objects/func_8088FD48.s | 13 +- .../actors/ovl_Bg_Ice_Objects/func_8088FED0.s | 2 - .../actors/ovl_Bg_Ice_Objects/func_8088FFD0.s | 7 +- .../actors/ovl_Bg_Ice_Objects/func_80890360.s | 2 - .../actors/ovl_Bg_Ice_Objects/func_808903FC.s | 2 - .../ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s | 11 +- .../ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s | 24 +- .../ovl_Bg_Ice_Shelter/BgIceShelter_Init.s | 8 +- .../ovl_Bg_Ice_Shelter/BgIceShelter_Update.s | 2 - .../actors/ovl_Bg_Ice_Shelter/func_80890740.s | 2 - .../actors/ovl_Bg_Ice_Shelter/func_80890874.s | 12 +- .../actors/ovl_Bg_Ice_Shelter/func_808908FC.s | 2 - .../actors/ovl_Bg_Ice_Shelter/func_80890B8C.s | 9 +- .../actors/ovl_Bg_Ice_Shelter/func_80890E00.s | 14 +- .../actors/ovl_Bg_Ice_Shelter/func_80891064.s | 2 - .../actors/ovl_Bg_Ice_Shelter/func_8089107C.s | 2 - .../actors/ovl_Bg_Ice_Shelter/func_808911BC.s | 2 - .../actors/ovl_Bg_Ice_Shelter/func_808911D4.s | 7 +- .../ovl_Bg_Ice_Shutter/BgIceShutter_Destroy.s | 2 - .../ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s | 1 - .../ovl_Bg_Ice_Shutter/BgIceShutter_Init.s | 2 - .../ovl_Bg_Ice_Shutter/BgIceShutter_Update.s | 2 - .../actors/ovl_Bg_Ice_Shutter/func_80891AC0.s | 2 - .../actors/ovl_Bg_Ice_Shutter/func_80891CF4.s | 2 - .../actors/ovl_Bg_Ice_Shutter/func_80891D6C.s | 2 - .../actors/ovl_Bg_Ice_Shutter/func_80891DD4.s | 2 - .../ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s | 2 - .../ovl_Bg_Ice_Turara/BgIceTurara_Draw.s | 1 - .../ovl_Bg_Ice_Turara/BgIceTurara_Init.s | 2 - .../ovl_Bg_Ice_Turara/BgIceTurara_Update.s | 2 - .../actors/ovl_Bg_Ice_Turara/func_80892040.s | 9 +- .../actors/ovl_Bg_Ice_Turara/func_80892220.s | 2 - .../actors/ovl_Bg_Ice_Turara/func_80892280.s | 2 - .../actors/ovl_Bg_Ice_Turara/func_808922B8.s | 2 - .../actors/ovl_Bg_Ice_Turara/func_80892424.s | 2 - .../actors/ovl_Bg_Ice_Turara/func_80892574.s | 2 - .../actors/ovl_Bg_Ingate/BgIngate_Destroy.s | 2 - .../actors/ovl_Bg_Ingate/BgIngate_Draw.s | 15 +- .../actors/ovl_Bg_Ingate/BgIngate_Init.s | 6 +- ...func_80892740.s => BgIngate_SetupAction.s} | 4 +- .../actors/ovl_Bg_Ingate/BgIngate_Update.s | 2 - .../actors/ovl_Bg_Ingate/func_80892890.s | 4 +- .../actors/ovl_Bg_Ingate/func_80892990.s | 2 - .../ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s | 2 - .../ovl_Bg_Jya_1flift/BgJya1flift_Draw.s | 1 - .../ovl_Bg_Jya_1flift/BgJya1flift_Init.s | 8 +- .../ovl_Bg_Jya_1flift/BgJya1flift_Update.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892B60.s | 12 +- .../actors/ovl_Bg_Jya_1flift/func_80892BE8.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892DB0.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892DCC.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892E0C.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892E28.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892E34.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892E58.s | 7 +- .../actors/ovl_Bg_Jya_1flift/func_80892F3C.s | 2 - .../actors/ovl_Bg_Jya_1flift/func_80892F50.s | 2 - .../BgJyaBigmirror_Destroy.s | 2 - .../BgJyaBigmirror_Draw.s | 1 - .../BgJyaBigmirror_Init.s | 8 +- .../BgJyaBigmirror_Update.s | 2 - .../ovl_Bg_Jya_Bigmirror/func_808936E0.s | 2 - .../ovl_Bg_Jya_Bigmirror/func_80893750.s | 20 +- .../ovl_Bg_Jya_Bigmirror/func_8089394C.s | 2 - .../ovl_Bg_Jya_Bigmirror/func_8089399C.s | 12 +- .../ovl_Bg_Jya_Bigmirror/func_80893C68.s | 31 +- .../ovl_Bg_Jya_Block/BgJyaBlock_Destroy.s | 2 - .../actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s | 15 +- .../actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s | 2 - .../ovl_Bg_Jya_Block/BgJyaBlock_Update.s | 2 - .../BgJyaBombchuiwa_Destroy.s | 2 - .../BgJyaBombchuiwa_Draw.s | 1 - .../BgJyaBombchuiwa_Init.s | 2 - .../BgJyaBombchuiwa_Update.s | 2 - .../ovl_Bg_Jya_Bombchuiwa/func_808944A0.s | 2 - .../ovl_Bg_Jya_Bombchuiwa/func_808944F4.s | 2 - .../ovl_Bg_Jya_Bombchuiwa/func_808945B4.s | 10 +- .../ovl_Bg_Jya_Bombchuiwa/func_80894840.s | 2 - .../ovl_Bg_Jya_Bombchuiwa/func_8089487C.s | 2 - .../ovl_Bg_Jya_Bombchuiwa/func_80894960.s | 7 +- .../ovl_Bg_Jya_Bombchuiwa/func_808949B8.s | 2 - .../ovl_Bg_Jya_Bombchuiwa/func_80894A44.s | 12 +- .../ovl_Bg_Jya_Bombchuiwa/func_80894B04.s | 16 +- .../ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s | 16 +- .../ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s | 2 - .../ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s | 1 - .../ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Init.s | 24 +- .../ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s | 2 - .../actors/ovl_Bg_Jya_Bombiwa/func_808951A0.s | 12 +- .../actors/ovl_Bg_Jya_Bombiwa/func_80895228.s | 2 - .../actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s | 9 +- .../ovl_Bg_Jya_Cobra/BgJyaCobra_Destroy.s | 2 - .../actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s | 1 - .../actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s | 8 +- .../ovl_Bg_Jya_Cobra/BgJyaCobra_Update.s | 2 - .../actors/ovl_Bg_Jya_Cobra/func_808958F0.s | 2 - .../actors/ovl_Bg_Jya_Cobra/func_8089593C.s | 12 +- .../actors/ovl_Bg_Jya_Cobra/func_808959C4.s | 20 +- .../actors/ovl_Bg_Jya_Cobra/func_80895A70.s | 10 +- .../actors/ovl_Bg_Jya_Cobra/func_80895BEC.s | 2 - .../actors/ovl_Bg_Jya_Cobra/func_80895C74.s | 22 +- .../actors/ovl_Bg_Jya_Cobra/func_80895EF0.s | 17 +- .../actors/ovl_Bg_Jya_Cobra/func_80896518.s | 2 - .../actors/ovl_Bg_Jya_Cobra/func_80896918.s | 2 - .../actors/ovl_Bg_Jya_Cobra/func_80896950.s | 10 +- .../actors/ovl_Bg_Jya_Cobra/func_808969F8.s | 2 - .../actors/ovl_Bg_Jya_Cobra/func_80896ABC.s | 7 +- .../actors/ovl_Bg_Jya_Cobra/func_80896CB4.s | 16 +- .../actors/ovl_Bg_Jya_Cobra/func_80896D78.s | 20 +- .../actors/ovl_Bg_Jya_Cobra/func_80896EE4.s | 16 +- .../ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s | 2 - .../ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s | 1 - .../ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s | 2 - .../ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s | 2 - .../actors/ovl_Bg_Jya_Goroiwa/func_80897970.s | 2 - .../actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s | 2 - .../actors/ovl_Bg_Jya_Goroiwa/func_80897A2C.s | 7 +- .../actors/ovl_Bg_Jya_Goroiwa/func_80897B1C.s | 2 - .../actors/ovl_Bg_Jya_Goroiwa/func_80897B48.s | 26 +- .../actors/ovl_Bg_Jya_Goroiwa/func_80897DDC.s | 2 - .../actors/ovl_Bg_Jya_Goroiwa/func_80897DF0.s | 7 +- .../BgJyaHaheniron_Destroy.s | 2 - .../BgJyaHaheniron_Draw.s | 1 - .../BgJyaHaheniron_Init.s | 7 +- .../BgJyaHaheniron_Update.s | 2 - .../ovl_Bg_Jya_Haheniron/func_808980C0.s | 2 - .../ovl_Bg_Jya_Haheniron/func_80898114.s | 9 +- .../ovl_Bg_Jya_Haheniron/func_8089843C.s | 2 - .../ovl_Bg_Jya_Haheniron/func_8089844C.s | 2 - .../ovl_Bg_Jya_Haheniron/func_80898588.s | 2 - .../ovl_Bg_Jya_Haheniron/func_80898598.s | 2 - .../ovl_Bg_Jya_Haheniron/func_8089861C.s | 2 - .../ovl_Bg_Jya_Haheniron/func_8089862C.s | 2 - .../ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s | 2 - .../ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s | 1 - .../ovl_Bg_Jya_Ironobj/BgJyaIronobj_Init.s | 2 - .../ovl_Bg_Jya_Ironobj/BgJyaIronobj_Update.s | 2 - .../actors/ovl_Bg_Jya_Ironobj/func_808988A0.s | 2 - .../actors/ovl_Bg_Jya_Ironobj/func_80898920.s | 28 +- .../actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s | 28 +- .../actors/ovl_Bg_Jya_Ironobj/func_808992D8.s | 2 - .../actors/ovl_Bg_Jya_Ironobj/func_808992E8.s | 2 - .../ovl_Bg_Jya_Lift/BgJyaLift_Destroy.s | 8 +- .../actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s | 1 - .../actors/ovl_Bg_Jya_Lift/BgJyaLift_Init.s | 8 +- .../actors/ovl_Bg_Jya_Lift/BgJyaLift_Update.s | 2 - .../actors/ovl_Bg_Jya_Lift/func_80899BA0.s | 2 - .../actors/ovl_Bg_Jya_Lift/func_80899D18.s | 7 +- .../actors/ovl_Bg_Jya_Lift/func_80899D38.s | 2 - .../actors/ovl_Bg_Jya_Lift/func_80899DBC.s | 2 - .../actors/ovl_Bg_Jya_Lift/func_80899DCC.s | 10 +- .../actors/ovl_Bg_Jya_Lift/func_80899EF0.s | 7 +- .../ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s | 2 - .../ovl_Bg_Jya_Megami/BgJyaMegami_Draw.s | 1 - .../ovl_Bg_Jya_Megami/BgJyaMegami_Init.s | 2 - .../ovl_Bg_Jya_Megami/BgJyaMegami_Update.s | 2 - .../actors/ovl_Bg_Jya_Megami/func_8089A130.s | 2 - .../actors/ovl_Bg_Jya_Megami/func_8089A188.s | 2 - .../actors/ovl_Bg_Jya_Megami/func_8089A1DC.s | 9 +- .../actors/ovl_Bg_Jya_Megami/func_8089A41C.s | 2 - .../actors/ovl_Bg_Jya_Megami/func_8089A5EC.s | 2 - .../actors/ovl_Bg_Jya_Megami/func_8089A604.s | 10 +- .../actors/ovl_Bg_Jya_Megami/func_8089A78C.s | 2 - .../actors/ovl_Bg_Jya_Megami/func_8089A820.s | 11 +- .../actors/ovl_Bg_Jya_Megami/func_8089ABC8.s | 16 +- .../actors/ovl_Bg_Jya_Megami/func_8089AD48.s | 23 +- .../BgJyaZurerukabe_Destroy.s | 2 - .../BgJyaZurerukabe_Draw.s | 1 - .../BgJyaZurerukabe_Init.s | 28 +- .../BgJyaZurerukabe_Update.s | 2 - .../ovl_Bg_Jya_Zurerukabe/func_8089B440.s | 14 +- .../ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s | 13 +- .../ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s | 2 - .../ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s | 2 - .../ovl_Bg_Jya_Zurerukabe/func_8089B80C.s | 2 - .../ovl_Bg_Jya_Zurerukabe/func_8089B870.s | 2 - .../ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s | 2 - .../ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s | 15 +- .../ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s | 2 - .../ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s | 2 - .../ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s | 2 - .../ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s | 15 +- .../ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s | 52 +- .../ovl_Bg_Mizu_Bwall/BgMizuBwall_Update.s | 2 - .../actors/ovl_Bg_Mizu_Bwall/func_8089C480.s | 2 - .../actors/ovl_Bg_Mizu_Bwall/func_8089CE04.s | 13 +- .../actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s | 2 - .../actors/ovl_Bg_Mizu_Bwall/func_8089D258.s | 2 - .../actors/ovl_Bg_Mizu_Bwall/func_8089D350.s | 2 - .../actors/ovl_Bg_Mizu_Bwall/func_8089D37C.s | 2 - .../ovl_Bg_Mizu_Movebg/BgMizuMovebg_Destroy.s | 11 +- .../ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s | 15 +- .../ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s | 20 +- .../ovl_Bg_Mizu_Movebg/BgMizuMovebg_Update.s | 2 - .../actors/ovl_Bg_Mizu_Movebg/func_8089DC30.s | 2 - .../actors/ovl_Bg_Mizu_Movebg/func_8089E108.s | 2 - .../actors/ovl_Bg_Mizu_Movebg/func_8089E198.s | 13 +- .../actors/ovl_Bg_Mizu_Movebg/func_8089E318.s | 19 +- .../actors/ovl_Bg_Mizu_Movebg/func_8089E650.s | 7 +- .../BgMizuShutter_Destroy.s | 2 - .../ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s | 15 +- .../ovl_Bg_Mizu_Shutter/BgMizuShutter_Init.s | 13 +- .../BgMizuShutter_Update.s | 2 - .../ovl_Bg_Mizu_Shutter/func_8089F0DC.s | 2 - .../ovl_Bg_Mizu_Shutter/func_8089F170.s | 2 - .../ovl_Bg_Mizu_Shutter/func_8089F1BC.s | 25 +- .../ovl_Bg_Mizu_Shutter/func_8089F3A4.s | 2 - .../ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s | 2 - .../ovl_Bg_Mizu_Water/BgMizuWater_Draw.s | 15 +- .../ovl_Bg_Mizu_Water/BgMizuWater_Init.s | 16 +- .../ovl_Bg_Mizu_Water/BgMizuWater_Update.s | 16 +- .../actors/ovl_Bg_Mizu_Water/func_8089F8B0.s | 2 - .../actors/ovl_Bg_Mizu_Water/func_8089F9D0.s | 2 - .../actors/ovl_Bg_Mizu_Water/func_8089FCF8.s | 11 +- .../actors/ovl_Bg_Mizu_Water/func_8089FEC4.s | 11 +- .../ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s | 2 - .../ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s | 20 +- .../ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s | 12 +- .../actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A0E04.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s | 14 +- .../actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A1024.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A104C.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A10D4.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A1164.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A1190.s | 22 +- .../actors/ovl_Bg_Mori_Bigst/func_808A12C4.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A1320.s | 2 - .../actors/ovl_Bg_Mori_Bigst/func_808A13B4.s | 15 +- .../BgMoriElevator_Destroy.s | 8 +- .../BgMoriElevator_Init.s | 16 +- .../BgMoriElevator_Update.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A1800.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A18FC.s | 7 +- .../ovl_Bg_Mori_Elevator/func_808A1B00.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A1B60.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A1B70.s | 12 +- .../ovl_Bg_Mori_Elevator/func_808A1C30.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A1C40.s | 7 +- .../ovl_Bg_Mori_Elevator/func_808A1CF4.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A1D50.s | 7 +- .../ovl_Bg_Mori_Elevator/func_808A1E04.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A1E14.s | 22 +- .../ovl_Bg_Mori_Elevator/func_808A1FF0.s | 2 - .../ovl_Bg_Mori_Elevator/func_808A2008.s | 10 +- .../ovl_Bg_Mori_Elevator/func_808A210C.s | 15 +- .../BgMoriHashigo_Destroy.s | 2 - .../ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s | 16 +- .../BgMoriHashigo_Update.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2560.s | 12 +- .../ovl_Bg_Mori_Hashigo/func_808A25E8.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2698.s | 12 +- .../ovl_Bg_Mori_Hashigo/func_808A2770.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A27F8.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2978.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2988.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2A04.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2A14.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2A78.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2A88.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2ABC.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2AF4.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2BD0.s | 2 - .../ovl_Bg_Mori_Hashigo/func_808A2C28.s | 15 +- .../BgMoriHashira4_Destroy.s | 2 - .../BgMoriHashira4_Init.s | 16 +- .../BgMoriHashira4_Update.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A3060.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A3068.s | 14 +- .../ovl_Bg_Mori_Hashira4/func_808A325C.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A3280.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A32F8.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A331C.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A3354.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A3400.s | 2 - .../ovl_Bg_Mori_Hashira4/func_808A3484.s | 15 +- .../ovl_Bg_Mori_Hineri/BgMoriHineri_Destroy.s | 2 - .../ovl_Bg_Mori_Hineri/BgMoriHineri_Init.s | 2 - .../ovl_Bg_Mori_Hineri/BgMoriHineri_Update.s | 2 - .../actors/ovl_Bg_Mori_Hineri/func_808A39FC.s | 2 - .../actors/ovl_Bg_Mori_Hineri/func_808A3BF0.s | 2 - .../actors/ovl_Bg_Mori_Hineri/func_808A3BFC.s | 7 +- .../actors/ovl_Bg_Mori_Hineri/func_808A3C8C.s | 10 +- .../actors/ovl_Bg_Mori_Hineri/func_808A3D58.s | 2 - .../actors/ovl_Bg_Mori_Hineri/func_808A3E54.s | 7 +- .../actors/ovl_Bg_Mori_Hineri/func_808A3F58.s | 47 +- .../BgMoriIdomizu_Destroy.s | 2 - .../ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s | 23 +- .../BgMoriIdomizu_Update.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A4640.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A4648.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A47D8.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A47FC.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A4850.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A4874.s | 2 - .../ovl_Bg_Mori_Idomizu/func_808A4A64.s | 15 +- .../BgMoriKaitenkabe_Destroy.s | 2 - .../BgMoriKaitenkabe_Init.s | 16 +- .../BgMoriKaitenkabe_Update.s | 2 - .../ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s | 2 - .../ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s | 2 - .../ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s | 2 - .../ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s | 10 +- .../ovl_Bg_Mori_Kaitenkabe/func_808A5104.s | 2 - .../ovl_Bg_Mori_Kaitenkabe/func_808A5120.s | 9 +- .../ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s | 15 +- .../BgMoriRakkatenjo_Destroy.s | 2 - .../BgMoriRakkatenjo_Init.s | 35 +- .../BgMoriRakkatenjo_Update.s | 12 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5724.s | 11 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s | 9 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5884.s | 2 - .../ovl_Bg_Mori_Rakkatenjo/func_808A5894.s | 2 - .../ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s | 7 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5920.s | 2 - .../ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s | 2 - .../ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s | 9 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s | 7 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s | 2 - .../ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s | 7 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s | 7 +- .../ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s | 15 +- .../ovl_Bg_Po_Event/BgPoEvent_Destroy.s | 2 - .../actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s | 27 +- .../actors/ovl_Bg_Po_Event/BgPoEvent_Init.s | 2 - .../actors/ovl_Bg_Po_Event/BgPoEvent_Update.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A6210.s | 9 +- .../actors/ovl_Bg_Po_Event/func_808A658C.s | 7 +- .../actors/ovl_Bg_Po_Event/func_808A68D0.s | 7 +- .../actors/ovl_Bg_Po_Event/func_808A69DC.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A6A94.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A6BC8.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A6CCC.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A6F7C.s | 7 +- .../actors/ovl_Bg_Po_Event/func_808A7138.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A7238.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A72AC.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A7328.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A7444.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A7500.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A7530.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A7568.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A75B8.s | 2 - .../actors/ovl_Bg_Po_Event/func_808A780C.s | 2 - .../ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s | 2 - .../ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s | 32 +- .../ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s | 7 +- .../ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s | 2 - .../BgRelayObjects_Destroy.s | 2 - .../BgRelayObjects_Draw.s | 1 - .../BgRelayObjects_Init.s | 2 - .../BgRelayObjects_Update.s | 2 - .../ovl_Bg_Relay_Objects/func_808A90F4.s | 2 - .../ovl_Bg_Relay_Objects/func_808A91AC.s | 2 - .../ovl_Bg_Relay_Objects/func_808A9234.s | 2 - .../ovl_Bg_Relay_Objects/func_808A9320.s | 2 - .../ovl_Bg_Relay_Objects/func_808A932C.s | 2 - .../ovl_Bg_Relay_Objects/func_808A939C.s | 7 +- .../BgSpot00Hanebasi_Destroy.s | 2 - .../BgSpot00Hanebasi_Draw.s | 15 +- .../BgSpot00Hanebasi_Init.s | 2 - .../BgSpot00Hanebasi_Update.s | 9 +- .../ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s | 2 - .../ovl_Bg_Spot00_Hanebasi/func_808A9D18.s | 2 - .../ovl_Bg_Spot00_Hanebasi/func_808A9D24.s | 7 +- .../ovl_Bg_Spot00_Hanebasi/func_808A9E58.s | 10 +- .../ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s | 28 +- .../BgSpot01Idohashira_Destroy.s | 2 - .../BgSpot01Idohashira_Draw.s | 7 +- .../BgSpot01Idohashira_Init.s | 7 +- .../BgSpot01Idohashira_Update.s | 8 +- .../ovl_Bg_Spot01_Idohashira/func_808AACE0.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AAD04.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AAD3C.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AAE6C.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AAF34.s | 10 +- .../ovl_Bg_Spot01_Idohashira/func_808AB124.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB144.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB18C.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB1DC.s | 8 +- .../ovl_Bg_Spot01_Idohashira/func_808AB29C.s | 7 +- .../ovl_Bg_Spot01_Idohashira/func_808AB3E8.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB3F8.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB414.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB444.s | 8 +- .../ovl_Bg_Spot01_Idohashira/func_808AB504.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB510.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB530.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB570.s | 2 - .../ovl_Bg_Spot01_Idohashira/func_808AB700.s | 16 +- .../BgSpot01Idomizu_Destroy.s | 2 - .../BgSpot01Idomizu_Draw.s | 15 +- .../BgSpot01Idomizu_Init.s | 7 +- .../BgSpot01Idomizu_Update.s | 2 - .../ovl_Bg_Spot01_Idomizu/func_808ABB84.s | 7 +- .../BgSpot01Objects2_Destroy.s | 2 - .../BgSpot01Objects2_Init.s | 25 +- .../BgSpot01Objects2_Update.s | 2 - .../ovl_Bg_Spot01_Objects2/func_808AC22C.s | 2 - .../ovl_Bg_Spot01_Objects2/func_808AC2BC.s | 8 +- .../ovl_Bg_Spot01_Objects2/func_808AC474.s | 2 - .../ovl_Bg_Spot01_Objects2/func_808AC4A4.s | 1 - .../BgSpot02Objects_Destroy.s | 2 - .../BgSpot02Objects_Draw.s | 2 - .../BgSpot02Objects_Init.s | 11 +- .../BgSpot02Objects_Update.s | 2 - .../ovl_Bg_Spot02_Objects/func_808AC8FC.s | 2 - .../ovl_Bg_Spot02_Objects/func_808AC908.s | 2 - .../ovl_Bg_Spot02_Objects/func_808ACA08.s | 2 - .../ovl_Bg_Spot02_Objects/func_808ACAFC.s | 2 - .../ovl_Bg_Spot02_Objects/func_808ACB58.s | 2 - .../ovl_Bg_Spot02_Objects/func_808ACC34.s | 2 - .../ovl_Bg_Spot02_Objects/func_808ACCB8.s | 26 +- .../ovl_Bg_Spot02_Objects/func_808AD3D4.s | 2 - .../ovl_Bg_Spot02_Objects/func_808AD450.s | 30 +- .../ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s | 2 - .../ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s | 15 +- .../ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s | 2 - .../ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s | 2 - .../actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s | 2 - .../actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s | 2 - .../BgSpot06Objects_Destroy.s | 2 - .../BgSpot06Objects_Draw.s | 2 - .../BgSpot06Objects_Init.s | 20 +- .../BgSpot06Objects_Update.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AEBC0.s | 10 +- .../ovl_Bg_Spot06_Objects/func_808AECB4.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AED48.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AED7C.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AEE00.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AEE0C.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AEE6C.s | 10 +- .../ovl_Bg_Spot06_Objects/func_808AEEFC.s | 10 +- .../ovl_Bg_Spot06_Objects/func_808AF120.s | 10 +- .../ovl_Bg_Spot06_Objects/func_808AF1D8.s | 19 +- .../ovl_Bg_Spot06_Objects/func_808AF450.s | 7 +- .../ovl_Bg_Spot06_Objects/func_808AF524.s | 16 +- .../ovl_Bg_Spot06_Objects/func_808AF7FC.s | 2 - .../ovl_Bg_Spot06_Objects/func_808AF824.s | 10 +- .../ovl_Bg_Spot07_Taki/BgSpot07Taki_Destroy.s | 2 - .../ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s | 19 +- .../ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s | 2 - .../ovl_Bg_Spot07_Taki/BgSpot07Taki_Update.s | 2 - .../actors/ovl_Bg_Spot07_Taki/func_808AFD08.s | 2 - .../BgSpot08Bakudankabe_Destroy.s | 2 - .../BgSpot08Bakudankabe_Draw.s | 1 - .../BgSpot08Bakudankabe_Init.s | 2 - .../BgSpot08Bakudankabe_Update.s | 2 - .../ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s | 2 - .../ovl_Bg_Spot08_Bakudankabe/func_808B0324.s | 11 +- .../BgSpot08Iceblock_Destroy.s | 2 - .../BgSpot08Iceblock_Draw.s | 1 - .../BgSpot08Iceblock_Init.s | 2 - .../BgSpot08Iceblock_Update.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0960.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0968.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B09F0.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0A84.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0AE0.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0B8C.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0BA8.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0BD4.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0C44.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B0CE0.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B1054.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B1388.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B13AC.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B13FC.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B1420.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B147C.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B14A0.s | 2 - .../ovl_Bg_Spot08_Iceblock/func_808B1574.s | 2 - .../BgSpot11Bakudankabe_Destroy.s | 2 - .../BgSpot11Bakudankabe_Draw.s | 1 - .../BgSpot11Bakudankabe_Init.s | 8 +- .../BgSpot11Bakudankabe_Update.s | 2 - .../ovl_Bg_Spot11_Bakudankabe/func_808B2180.s | 2 - .../ovl_Bg_Spot11_Bakudankabe/func_808B2218.s | 9 +- .../ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s | 2 - .../BgSpot11Oasis_Update.s | 16 +- .../ovl_Bg_Spot11_Oasis/func_808B27F0.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B280C.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B2970.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B2980.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B29E0.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B29F0.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B2AA8.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B2AB8.s | 2 - .../ovl_Bg_Spot11_Oasis/func_808B2CA8.s | 15 +- .../BgSpot15Rrbox_Destroy.s | 2 - .../ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s | 1 - .../ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s | 8 +- .../BgSpot15Rrbox_Update.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B3960.s | 14 +- .../ovl_Bg_Spot15_Rrbox/func_808B39E8.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B3A34.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B3A40.s | 7 +- .../ovl_Bg_Spot15_Rrbox/func_808B3AAC.s | 7 +- .../ovl_Bg_Spot15_Rrbox/func_808B3CA0.s | 7 +- .../ovl_Bg_Spot15_Rrbox/func_808B3DDC.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B3F58.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B4010.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B4084.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B40AC.s | 7 +- .../ovl_Bg_Spot15_Rrbox/func_808B4178.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B4194.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B4380.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B43D0.s | 21 +- .../ovl_Bg_Spot15_Rrbox/func_808B44B8.s | 2 - .../ovl_Bg_Spot15_Rrbox/func_808B44CC.s | 2 - .../BgSpot16Bombstone_Destroy.s | 2 - .../BgSpot16Bombstone_Draw.s | 15 +- .../BgSpot16Bombstone_Init.s | 25 +- .../BgSpot16Bombstone_Update.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B4C30.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B4C4C.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B4D04.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B4D9C.s | 8 +- .../ovl_Bg_Spot16_Bombstone/func_808B4E58.s | 16 +- .../ovl_Bg_Spot16_Bombstone/func_808B51A8.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5240.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B53A8.s | 7 +- .../ovl_Bg_Spot16_Bombstone/func_808B561C.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B56BC.s | 12 +- .../ovl_Bg_Spot16_Bombstone/func_808B57E0.s | 11 +- .../ovl_Bg_Spot16_Bombstone/func_808B5934.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5950.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5A78.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5A94.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5AF0.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5B04.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5B58.s | 2 - .../ovl_Bg_Spot16_Bombstone/func_808B5B6C.s | 2 - .../BgSpot16Doughnut_Destroy.s | 2 - .../BgSpot16Doughnut_Draw.s | 16 +- .../BgSpot16Doughnut_Init.s | 16 +- .../BgSpot16Doughnut_Update.s | 2 - .../ovl_Bg_Spot16_Doughnut/func_808B6680.s | 7 +- .../ovl_Bg_Spot16_Doughnut/func_808B68D8.s | 15 +- .../BgSpot17Bakudankabe_Destroy.s | 2 - .../BgSpot17Bakudankabe_Draw.s | 27 +- .../BgSpot17Bakudankabe_Init.s | 2 - .../BgSpot17Bakudankabe_Update.s | 7 +- .../ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s | 10 +- .../BgSpot17Funen_Destroy.s | 4 + .../ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s | 25 + .../BgSpot17Funen_Update.s | 9 + .../ovl_Bg_Spot17_Funen/func_808B746C.s | 4 + .../ovl_Bg_Spot17_Funen/func_808B7478.s | 117 +++ .../BgSpot18Basket_Destroy.s | 2 - .../BgSpot18Basket_Draw.s | 1 - .../BgSpot18Basket_Init.s | 24 +- .../BgSpot18Basket_Update.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7710.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7770.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7AEC.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7AFC.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7B58.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7B6C.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7BB0.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7BCC.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7D38.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7D50.s | 7 +- .../ovl_Bg_Spot18_Basket/func_808B7F74.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B7FC0.s | 7 +- .../ovl_Bg_Spot18_Basket/func_808B818C.s | 2 - .../ovl_Bg_Spot18_Basket/func_808B81A0.s | 2 - .../ovl_Bg_Spot18_Obj/BgSpot18Obj_Destroy.s | 2 - .../ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s | 1 - .../ovl_Bg_Spot18_Obj/BgSpot18Obj_Init.s | 8 +- .../ovl_Bg_Spot18_Obj/BgSpot18Obj_Update.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8910.s | 32 +- .../actors/ovl_Bg_Spot18_Obj/func_808B8A5C.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8A98.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8B08.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8B38.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8C90.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8CC8.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8DC0.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8DD0.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8DDC.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8E20.s | 7 +- .../actors/ovl_Bg_Spot18_Obj/func_808B8E64.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8E7C.s | 7 +- .../actors/ovl_Bg_Spot18_Obj/func_808B8EE0.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B8F08.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B9030.s | 2 - .../actors/ovl_Bg_Spot18_Obj/func_808B9040.s | 2 - .../BgSpot18Shutter_Destroy.s | 2 - .../BgSpot18Shutter_Draw.s | 1 - .../BgSpot18Shutter_Init.s | 2 - .../BgSpot18Shutter_Update.s | 2 - .../ovl_Bg_Spot18_Shutter/func_808B95AC.s | 2 - .../ovl_Bg_Spot18_Shutter/func_808B95B8.s | 2 - .../ovl_Bg_Spot18_Shutter/func_808B9618.s | 2 - .../ovl_Bg_Spot18_Shutter/func_808B9698.s | 2 - .../ovl_Bg_Spot18_Shutter/func_808B971C.s | 2 - .../ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s | 2 - .../actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s | 19 +- .../actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s | 2 - .../ovl_Bg_Sst_Floor/BgSstFloor_Update.s | 11 +- .../ovl_Bg_Toki_Hikari/BgTokiHikari_Destroy.s | 2 - .../ovl_Bg_Toki_Hikari/BgTokiHikari_Draw.s | 2 - .../ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s | 2 - .../ovl_Bg_Toki_Hikari/BgTokiHikari_Update.s | 2 - .../actors/ovl_Bg_Toki_Hikari/func_808B9F98.s | 2 - .../actors/ovl_Bg_Toki_Hikari/func_808BA018.s | 20 +- .../actors/ovl_Bg_Toki_Hikari/func_808BA204.s | 2 - .../actors/ovl_Bg_Toki_Hikari/func_808BA22C.s | 7 +- .../actors/ovl_Bg_Toki_Hikari/func_808BA274.s | 10 +- .../actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s | 29 +- .../ovl_Bg_Treemouth/BgTreemouth_Destroy.s | 2 - .../ovl_Bg_Treemouth/BgTreemouth_Draw.s | 19 +- .../ovl_Bg_Treemouth/BgTreemouth_Init.s | 2 - .../ovl_Bg_Treemouth/BgTreemouth_Update.s | 11 +- .../actors/ovl_Bg_Treemouth/func_808BC500.s | 2 - .../actors/ovl_Bg_Treemouth/func_808BC65C.s | 2 - .../actors/ovl_Bg_Treemouth/func_808BC6F8.s | 18 +- .../actors/ovl_Bg_Treemouth/func_808BC80C.s | 10 +- .../actors/ovl_Bg_Treemouth/func_808BC864.s | 7 +- .../actors/ovl_Bg_Treemouth/func_808BC8B8.s | 2 - .../actors/ovl_Bg_Treemouth/func_808BC9EC.s | 9 +- .../actors/ovl_Bg_Treemouth/func_808BCAF0.s | 2 - .../actors/ovl_Bg_Treemouth/func_808BCB8C.s | 2 - .../actors/ovl_Bg_Vb_Sima/BgVbSima_Destroy.s | 2 - .../actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s | 15 +- .../actors/ovl_Bg_Vb_Sima/BgVbSima_Init.s | 2 - .../actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s | 18 +- .../actors/ovl_Bg_Vb_Sima/func_808BDDF8.s | 2 - .../ovl_Bg_Ydan_Hasi/BgYdanHasi_Destroy.s | 2 - .../actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s | 15 +- .../actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Init.s | 7 +- .../ovl_Bg_Ydan_Hasi/BgYdanHasi_Update.s | 2 - .../actors/ovl_Bg_Ydan_Hasi/func_808BE690.s | 9 +- .../actors/ovl_Bg_Ydan_Hasi/func_808BE7C8.s | 2 - .../actors/ovl_Bg_Ydan_Hasi/func_808BE810.s | 2 - .../actors/ovl_Bg_Ydan_Hasi/func_808BE8DC.s | 2 - .../actors/ovl_Bg_Ydan_Hasi/func_808BE930.s | 2 - .../actors/ovl_Bg_Ydan_Hasi/func_808BE99C.s | 2 - .../ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s | 2 - .../ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s | 1 - .../ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s | 2 - .../ovl_Bg_Ydan_Maruta/BgYdanMaruta_Update.s | 2 - .../actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s | 2 - .../actors/ovl_Bg_Ydan_Maruta/func_808BF078.s | 2 - .../actors/ovl_Bg_Ydan_Maruta/func_808BF108.s | 2 - .../actors/ovl_Bg_Ydan_Maruta/func_808BF1EC.s | 2 - .../actors/ovl_Bg_Ydan_Maruta/func_808BF25C.s | 2 - .../actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s | 2 - .../actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s | 34 +- .../actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s | 2 - .../actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s | 2 - .../actors/ovl_Bg_Ydan_Sp/func_808BF83C.s | 2 - .../actors/ovl_Bg_Ydan_Sp/func_808BF90C.s | 2 - .../actors/ovl_Bg_Ydan_Sp/func_808BF97C.s | 11 +- .../actors/ovl_Bg_Ydan_Sp/func_808BFC50.s | 2 - .../actors/ovl_Bg_Ydan_Sp/func_808BFC90.s | 7 +- .../actors/ovl_Bg_Ydan_Sp/func_808BFE50.s | 12 +- .../actors/ovl_Bg_Ydan_Sp/func_808C012C.s | 11 +- .../actors/ovl_Bg_Ydan_Sp/func_808C0464.s | 2 - .../ovl_Boss_Dodongo/BossDodongo_Destroy.s | 2 - .../ovl_Boss_Dodongo/BossDodongo_Draw.s | 16 +- .../ovl_Boss_Dodongo/BossDodongo_Init.s | 23 +- .../ovl_Boss_Dodongo/BossDodongo_Update.s | 56 +- .../actors/ovl_Boss_Dodongo/func_808C1190.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C11D0.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C1200.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C1230.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C1278.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C12C4.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C1554.s | 7 +- .../actors/ovl_Boss_Dodongo/func_808C17C8.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C18B0.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C1C80.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C1D00.s | 42 +- .../actors/ovl_Boss_Dodongo/func_808C287C.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C290C.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C29B0.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C2A40.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C2AB0.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C2B38.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C2BC8.s | 7 +- .../actors/ovl_Boss_Dodongo/func_808C2C78.s | 7 +- .../actors/ovl_Boss_Dodongo/func_808C2ECC.s | 7 +- .../actors/ovl_Boss_Dodongo/func_808C2FAC.s | 7 +- .../actors/ovl_Boss_Dodongo/func_808C3094.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C30F4.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C3224.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C32F4.s | 10 +- .../actors/ovl_Boss_Dodongo/func_808C3704.s | 11 +- .../actors/ovl_Boss_Dodongo/func_808C4940.s | 32 +- .../actors/ovl_Boss_Dodongo/func_808C4B90.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C4F6C.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C50A8.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C51F4.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C524C.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C52E0.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C5354.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C54C0.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C5578.s | 88 +- .../actors/ovl_Boss_Dodongo/func_808C6CB4.s | 2 - .../actors/ovl_Boss_Dodongo/func_808C6DE8.s | 15 +- .../actors/ovl_Boss_Fd/BossFd_Destroy.s | 2 - .../overlays/actors/ovl_Boss_Fd/BossFd_Draw.s | 24 +- .../overlays/actors/ovl_Boss_Fd/BossFd_Init.s | 2 - .../actors/ovl_Boss_Fd/BossFd_Update.s | 27 +- .../actors/ovl_Boss_Fd/func_808CADC0.s | 2 - .../actors/ovl_Boss_Fd/func_808CAE8C.s | 2 - .../actors/ovl_Boss_Fd/func_808CAF5C.s | 2 - .../actors/ovl_Boss_Fd/func_808CAFF4.s | 2 - .../actors/ovl_Boss_Fd/func_808CB100.s | 2 - .../actors/ovl_Boss_Fd/func_808CB198.s | 2 - .../actors/ovl_Boss_Fd/func_808CB67C.s | 2 - .../actors/ovl_Boss_Fd/func_808CB6A8.s | 2 - .../actors/ovl_Boss_Fd/func_808CB718.s | 173 +++- .../actors/ovl_Boss_Fd/func_808CDE30.s | 7 +- .../actors/ovl_Boss_Fd/func_808CE01C.s | 44 +- .../actors/ovl_Boss_Fd/func_808CEC34.s | 2 - .../actors/ovl_Boss_Fd/func_808CF448.s | 15 +- .../actors/ovl_Boss_Fd/func_808CF898.s | 32 +- .../actors/ovl_Boss_Fd/func_808D00A4.s | 2 - .../actors/ovl_Boss_Fd/func_808D01C0.s | 2 - .../actors/ovl_Boss_Fd/func_808D02DC.s | 31 +- .../actors/ovl_Boss_Fd/func_808D07A4.s | 7 +- .../actors/ovl_Boss_Fd/func_808D08A4.s | 2 - .../actors/ovl_Boss_Fd/func_808D08F8.s | 75 +- .../actors/ovl_Boss_Fd2/BossFd2_Destroy.s | 2 - .../actors/ovl_Boss_Fd2/BossFd2_Draw.s | 15 +- .../actors/ovl_Boss_Fd2/BossFd2_Init.s | 7 +- .../actors/ovl_Boss_Fd2/BossFd2_Update.s | 8 +- .../actors/ovl_Boss_Fd2/func_808D2670.s | 2 - .../actors/ovl_Boss_Fd2/func_808D2748.s | 2 - .../actors/ovl_Boss_Fd2/func_808D285C.s | 2 - .../actors/ovl_Boss_Fd2/func_808D2930.s | 2 - .../actors/ovl_Boss_Fd2/func_808D2A08.s | 2 - .../actors/ovl_Boss_Fd2/func_808D2BD0.s | 16 +- .../actors/ovl_Boss_Fd2/func_808D2CE0.s | 40 +- .../actors/ovl_Boss_Fd2/func_808D308C.s | 8 +- .../actors/ovl_Boss_Fd2/func_808D3140.s | 12 +- .../actors/ovl_Boss_Fd2/func_808D32B4.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3330.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3400.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3464.s | 10 +- .../actors/ovl_Boss_Fd2/func_808D39A8.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3A08.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3A80.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3AE0.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3D38.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3D98.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3EC8.s | 2 - .../actors/ovl_Boss_Fd2/func_808D3F58.s | 2 - .../actors/ovl_Boss_Fd2/func_808D40C8.s | 29 +- .../actors/ovl_Boss_Fd2/func_808D4748.s | 2 - .../actors/ovl_Boss_Fd2/func_808D4790.s | 20 +- .../actors/ovl_Boss_Fd2/func_808D4C68.s | 13 +- .../actors/ovl_Boss_Fd2/func_808D4F94.s | 24 +- .../actors/ovl_Boss_Fd2/func_808D5228.s | 2 - .../actors/ovl_Boss_Fd2/func_808D52CC.s | 27 +- .../actors/ovl_Boss_Fd2/func_808D58E0.s | 20 +- .../actors/ovl_Boss_Ganon/BossGanon_Destroy.s | 2 - .../actors/ovl_Boss_Ganon/BossGanon_Draw.s | 2 - .../actors/ovl_Boss_Ganon/BossGanon_Init.s | 2 - .../actors/ovl_Boss_Ganon/BossGanon_Update.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6870.s | 2 - .../actors/ovl_Boss_Ganon/func_808D69B0.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6AAC.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6BF0.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6CBC.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6D60.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6E54.s | 2 - .../actors/ovl_Boss_Ganon/func_808D6F3C.s | 2 - .../actors/ovl_Boss_Ganon/func_808D7034.s | 2 - .../actors/ovl_Boss_Ganon/func_808D70F0.s | 2 - .../actors/ovl_Boss_Ganon/func_808D712C.s | 2 - .../actors/ovl_Boss_Ganon/func_808D779C.s | 2 - .../actors/ovl_Boss_Ganon/func_808D787C.s | 2 - .../actors/ovl_Boss_Ganon/func_808D7918.s | 2 - .../actors/ovl_Boss_Ganon/func_808D9018.s | 2 - .../actors/ovl_Boss_Ganon/func_808D90F8.s | 2 - .../actors/ovl_Boss_Ganon/func_808D91F8.s | 2 - .../actors/ovl_Boss_Ganon/func_808D933C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DACE8.s | 2 - .../actors/ovl_Boss_Ganon/func_808DAD20.s | 2 - .../actors/ovl_Boss_Ganon/func_808DB278.s | 2 - .../actors/ovl_Boss_Ganon/func_808DB2E8.s | 2 - .../actors/ovl_Boss_Ganon/func_808DBAF0.s | 2 - .../actors/ovl_Boss_Ganon/func_808DBB78.s | 2 - .../actors/ovl_Boss_Ganon/func_808DBEC4.s | 2 - .../actors/ovl_Boss_Ganon/func_808DBF30.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC0E8.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC14C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC420.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC4DC.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC66C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC75C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DC9B4.s | 2 - .../actors/ovl_Boss_Ganon/func_808DCB7C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DD0E8.s | 2 - .../actors/ovl_Boss_Ganon/func_808DD14C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DD20C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE734.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE784.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE7E0.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE828.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE884.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE8E0.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE928.s | 2 - .../actors/ovl_Boss_Ganon/func_808DE988.s | 2 - .../actors/ovl_Boss_Ganon/func_808DED30.s | 2 - .../actors/ovl_Boss_Ganon/func_808DED4C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DEE70.s | 2 - .../actors/ovl_Boss_Ganon/func_808DF25C.s | 2 - .../actors/ovl_Boss_Ganon/func_808DF4F0.s | 2 - .../actors/ovl_Boss_Ganon/func_808DFBD0.s | 2 - .../actors/ovl_Boss_Ganon/func_808DFFC8.s | 2 - .../actors/ovl_Boss_Ganon/func_808E0254.s | 2 - .../actors/ovl_Boss_Ganon/func_808E06FC.s | 2 - .../actors/ovl_Boss_Ganon/func_808E0A3C.s | 2 - .../actors/ovl_Boss_Ganon/func_808E0F4C.s | 2 - .../actors/ovl_Boss_Ganon/func_808E1034.s | 2 - .../actors/ovl_Boss_Ganon/func_808E1B54.s | 2 - .../actors/ovl_Boss_Ganon/func_808E1EB4.s | 2 - .../actors/ovl_Boss_Ganon/func_808E229C.s | 2 - .../actors/ovl_Boss_Ganon/func_808E2544.s | 2 - .../actors/ovl_Boss_Ganon/func_808E324C.s | 2 - .../actors/ovl_Boss_Ganon/func_808E3564.s | 2 - .../actors/ovl_Boss_Ganon/func_808E3D84.s | 1 - .../ovl_Boss_Ganon2/BossGanon2_Destroy.s | 2 - .../actors/ovl_Boss_Ganon2/BossGanon2_Draw.s | 16 +- .../actors/ovl_Boss_Ganon2/BossGanon2_Init.s | 2 - .../ovl_Boss_Ganon2/BossGanon2_Update.s | 74 +- .../actors/ovl_Boss_Ganon2/func_808FCF40.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FCF5C.s | 13 +- .../actors/ovl_Boss_Ganon2/func_808FD080.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FD108.s | 12 +- .../actors/ovl_Boss_Ganon2/func_808FD210.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FD27C.s | 13 +- .../actors/ovl_Boss_Ganon2/func_808FD4D4.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FD5C4.s | 7 +- .../actors/ovl_Boss_Ganon2/func_808FD5F4.s | 99 +- .../actors/ovl_Boss_Ganon2/func_808FF898.s | 10 +- .../actors/ovl_Boss_Ganon2/func_808FFA24.s | 7 +- .../actors/ovl_Boss_Ganon2/func_808FFAC8.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FFBBC.s | 10 +- .../actors/ovl_Boss_Ganon2/func_808FFC84.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FFCFC.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FFDB0.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FFEBC.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FFF90.s | 2 - .../actors/ovl_Boss_Ganon2/func_808FFFE0.s | 2 - .../actors/ovl_Boss_Ganon2/func_809000A0.s | 2 - .../actors/ovl_Boss_Ganon2/func_80900104.s | 2 - .../actors/ovl_Boss_Ganon2/func_80900210.s | 2 - .../actors/ovl_Boss_Ganon2/func_8090026C.s | 2 - .../actors/ovl_Boss_Ganon2/func_809002CC.s | 2 - .../actors/ovl_Boss_Ganon2/func_80900344.s | 7 +- .../actors/ovl_Boss_Ganon2/func_80900580.s | 2 - .../actors/ovl_Boss_Ganon2/func_80900650.s | 2 - .../actors/ovl_Boss_Ganon2/func_80900818.s | 2 - .../actors/ovl_Boss_Ganon2/func_80900890.s | 23 +- .../actors/ovl_Boss_Ganon2/func_80901020.s | 2 - .../actors/ovl_Boss_Ganon2/func_8090109C.s | 2 - .../actors/ovl_Boss_Ganon2/func_8090120C.s | 44 +- .../actors/ovl_Boss_Ganon2/func_80902348.s | 2 - .../actors/ovl_Boss_Ganon2/func_80902524.s | 12 +- .../actors/ovl_Boss_Ganon2/func_809034E4.s | 9 +- .../actors/ovl_Boss_Ganon2/func_80903F38.s | 16 +- .../actors/ovl_Boss_Ganon2/func_80904108.s | 24 +- .../actors/ovl_Boss_Ganon2/func_80904340.s | 33 +- .../actors/ovl_Boss_Ganon2/func_8090464C.s | 22 +- .../actors/ovl_Boss_Ganon2/func_80904818.s | 12 +- .../actors/ovl_Boss_Ganon2/func_809049A0.s | 26 +- .../actors/ovl_Boss_Ganon2/func_80904D88.s | 20 +- .../actors/ovl_Boss_Ganon2/func_80904FC8.s | 20 +- .../actors/ovl_Boss_Ganon2/func_8090523C.s | 22 +- .../actors/ovl_Boss_Ganon2/func_80905508.s | 16 +- .../actors/ovl_Boss_Ganon2/func_80905674.s | 24 +- .../actors/ovl_Boss_Ganon2/func_80905DA8.s | 26 +- .../actors/ovl_Boss_Ganon2/func_809060E8.s | 38 +- .../actors/ovl_Boss_Ganon2/func_80906538.s | 7 +- .../actors/ovl_Boss_Ganon2/func_809069F8.s | 2 - .../actors/ovl_Boss_Ganon2/func_80906AB0.s | 19 +- .../BossGanondrof_Destroy.s | 2 - .../ovl_Boss_Ganondrof/BossGanondrof_Draw.s | 1 - .../ovl_Boss_Ganondrof/BossGanondrof_Init.s | 2 - .../ovl_Boss_Ganondrof/BossGanondrof_Update.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910640.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910680.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809106C0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809106F0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910738.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910784.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910A34.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910D80.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80910DCC.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80911294.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809112D4.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809114E8.s | 2 - .../actors/ovl_Boss_Ganondrof/func_8091156C.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80911CB0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80911DD8.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80912020.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809120BC.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809121E0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809122A4.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809123D4.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80912448.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80912524.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80912594.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80912C94.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80912D2C.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80913C54.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809142E0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80914394.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809143F0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_8091444C.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809144A8.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80914504.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80914560.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809145BC.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80914610.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80914664.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809146DC.s | 2 - .../actors/ovl_Boss_Ganondrof/func_809147A0.s | 2 - .../actors/ovl_Boss_Ganondrof/func_80914818.s | 2 - .../actors/ovl_Boss_Goma/BossGoma_Destroy.s | 2 - .../actors/ovl_Boss_Goma/BossGoma_Draw.s | 12 +- .../actors/ovl_Boss_Goma/BossGoma_Init.s | 2 - .../actors/ovl_Boss_Goma/BossGoma_Update.s | 2 - .../actors/ovl_Boss_Goma/func_80915A10.s | 2 - .../actors/ovl_Boss_Goma/func_80915A40.s | 2 - .../actors/ovl_Boss_Goma/func_80915A94.s | 2 - .../actors/ovl_Boss_Goma/func_80915DF8.s | 2 - .../actors/ovl_Boss_Goma/func_80915F38.s | 2 - .../actors/ovl_Boss_Goma/func_80916000.s | 2 - .../actors/ovl_Boss_Goma/func_809160A4.s | 2 - .../actors/ovl_Boss_Goma/func_8091612C.s | 2 - .../actors/ovl_Boss_Goma/func_809161B0.s | 2 - .../actors/ovl_Boss_Goma/func_8091622C.s | 2 - .../actors/ovl_Boss_Goma/func_809162A8.s | 2 - .../actors/ovl_Boss_Goma/func_8091631C.s | 2 - .../actors/ovl_Boss_Goma/func_80916394.s | 2 - .../actors/ovl_Boss_Goma/func_80916418.s | 2 - .../actors/ovl_Boss_Goma/func_809164AC.s | 2 - .../actors/ovl_Boss_Goma/func_80916530.s | 2 - .../actors/ovl_Boss_Goma/func_809165C0.s | 2 - .../actors/ovl_Boss_Goma/func_80916668.s | 2 - .../actors/ovl_Boss_Goma/func_809166D8.s | 2 - .../actors/ovl_Boss_Goma/func_8091674C.s | 2 - .../actors/ovl_Boss_Goma/func_809167C0.s | 2 - .../actors/ovl_Boss_Goma/func_8091683C.s | 2 - .../actors/ovl_Boss_Goma/func_809168B0.s | 2 - .../actors/ovl_Boss_Goma/func_80916AEC.s | 2 - .../actors/ovl_Boss_Goma/func_80916C9C.s | 44 +- .../actors/ovl_Boss_Goma/func_80917D98.s | 51 +- .../actors/ovl_Boss_Goma/func_80918C08.s | 7 +- .../actors/ovl_Boss_Goma/func_80918D10.s | 2 - .../actors/ovl_Boss_Goma/func_80918D6C.s | 2 - .../actors/ovl_Boss_Goma/func_80918FBC.s | 2 - .../actors/ovl_Boss_Goma/func_80919054.s | 2 - .../actors/ovl_Boss_Goma/func_809190F8.s | 2 - .../actors/ovl_Boss_Goma/func_80919150.s | 2 - .../actors/ovl_Boss_Goma/func_80919278.s | 2 - .../actors/ovl_Boss_Goma/func_8091932C.s | 2 - .../actors/ovl_Boss_Goma/func_809193EC.s | 2 - .../actors/ovl_Boss_Goma/func_80919548.s | 2 - .../actors/ovl_Boss_Goma/func_809195A4.s | 2 - .../actors/ovl_Boss_Goma/func_8091960C.s | 2 - .../actors/ovl_Boss_Goma/func_80919704.s | 2 - .../actors/ovl_Boss_Goma/func_80919974.s | 2 - .../actors/ovl_Boss_Goma/func_80919A40.s | 2 - .../actors/ovl_Boss_Goma/func_80919C38.s | 7 +- .../actors/ovl_Boss_Goma/func_80919E80.s | 10 +- .../actors/ovl_Boss_Goma/func_80919F8C.s | 2 - .../actors/ovl_Boss_Goma/func_8091A16C.s | 2 - .../actors/ovl_Boss_Goma/func_8091A2E8.s | 2 - .../actors/ovl_Boss_Goma/func_8091A560.s | 58 +- .../actors/ovl_Boss_Goma/func_8091A9E8.s | 7 +- .../actors/ovl_Boss_Goma/func_8091ABEC.s | 2 - .../actors/ovl_Boss_Goma/func_8091AC18.s | 2 - .../actors/ovl_Boss_Goma/func_8091ADA8.s | 1 - .../actors/ovl_Boss_Mo/BossMo_Destroy.s | 2 - .../overlays/actors/ovl_Boss_Mo/BossMo_Draw.s | 12 +- .../overlays/actors/ovl_Boss_Mo/BossMo_Init.s | 2 - .../actors/ovl_Boss_Mo/BossMo_Update.s | 24 +- .../actors/ovl_Boss_Mo/func_8091BB00.s | 2 - .../actors/ovl_Boss_Mo/func_8091BB1C.s | 13 +- .../actors/ovl_Boss_Mo/func_8091BC40.s | 2 - .../actors/ovl_Boss_Mo/func_8091BD38.s | 13 +- .../actors/ovl_Boss_Mo/func_8091BE5C.s | 2 - .../actors/ovl_Boss_Mo/func_8091BF38.s | 2 - .../actors/ovl_Boss_Mo/func_8091BFFC.s | 2 - .../actors/ovl_Boss_Mo/func_8091C4E0.s | 2 - .../actors/ovl_Boss_Mo/func_8091C538.s | 230 ++++- .../actors/ovl_Boss_Mo/func_8091F2FC.s | 12 +- .../actors/ovl_Boss_Mo/func_8091F5A8.s | 66 +- .../actors/ovl_Boss_Mo/func_809206C4.s | 52 +- .../actors/ovl_Boss_Mo/func_80921280.s | 39 +- .../actors/ovl_Boss_Mo/func_809216D0.s | 92 +- .../actors/ovl_Boss_Mo/func_80922D30.s | 8 +- .../actors/ovl_Boss_Mo/func_809237C4.s | 2 - .../actors/ovl_Boss_Mo/func_80923870.s | 50 +- .../actors/ovl_Boss_Mo/func_80923FDC.s | 16 +- .../actors/ovl_Boss_Mo/func_80924228.s | 49 +- .../actors/ovl_Boss_Mo/func_80924D70.s | 7 +- .../actors/ovl_Boss_Mo/func_80925480.s | 32 +- .../actors/ovl_Boss_Mo/func_80925C18.s | 1 - .../actors/ovl_Boss_Sst/BossSst_Destroy.s | 2 - .../actors/ovl_Boss_Sst/BossSst_Draw.s | 16 +- .../actors/ovl_Boss_Sst/BossSst_Init.s | 11 +- .../actors/ovl_Boss_Sst/BossSst_Update.s | 7 +- .../actors/ovl_Boss_Sst/func_8092CAA0.s | 2 - .../actors/ovl_Boss_Sst/func_8092CAD0.s | 2 - .../actors/ovl_Boss_Sst/func_8092CB0C.s | 2 - .../actors/ovl_Boss_Sst/func_8092CC58.s | 11 +- .../actors/ovl_Boss_Sst/func_8092DA6C.s | 2 - .../actors/ovl_Boss_Sst/func_8092DAB8.s | 2 - .../actors/ovl_Boss_Sst/func_8092DB30.s | 2 - .../actors/ovl_Boss_Sst/func_8092DB4C.s | 2 - .../actors/ovl_Boss_Sst/func_8092DCEC.s | 2 - .../actors/ovl_Boss_Sst/func_8092DD50.s | 2 - .../actors/ovl_Boss_Sst/func_8092DE48.s | 2 - .../actors/ovl_Boss_Sst/func_8092DEA0.s | 2 - .../actors/ovl_Boss_Sst/func_8092DF40.s | 7 +- .../actors/ovl_Boss_Sst/func_8092DFFC.s | 10 +- .../actors/ovl_Boss_Sst/func_8092E25C.s | 2 - .../actors/ovl_Boss_Sst/func_8092E2E0.s | 2 - .../actors/ovl_Boss_Sst/func_8092E34C.s | 2 - .../actors/ovl_Boss_Sst/func_8092E3A0.s | 2 - .../actors/ovl_Boss_Sst/func_8092E3E8.s | 2 - .../actors/ovl_Boss_Sst/func_8092E438.s | 2 - .../actors/ovl_Boss_Sst/func_8092E470.s | 2 - .../actors/ovl_Boss_Sst/func_8092E510.s | 11 +- .../actors/ovl_Boss_Sst/func_8092E790.s | 2 - .../actors/ovl_Boss_Sst/func_8092E830.s | 2 - .../actors/ovl_Boss_Sst/func_8092E930.s | 2 - .../actors/ovl_Boss_Sst/func_8092EA00.s | 2 - .../actors/ovl_Boss_Sst/func_8092EA50.s | 2 - .../actors/ovl_Boss_Sst/func_8092EAE0.s | 7 +- .../actors/ovl_Boss_Sst/func_8092EC74.s | 2 - .../actors/ovl_Boss_Sst/func_8092ED9C.s | 2 - .../actors/ovl_Boss_Sst/func_8092EF28.s | 2 - .../actors/ovl_Boss_Sst/func_8092F0BC.s | 7 +- .../actors/ovl_Boss_Sst/func_8092F30C.s | 7 +- .../actors/ovl_Boss_Sst/func_8092F374.s | 2 - .../actors/ovl_Boss_Sst/func_8092F3F0.s | 7 +- .../actors/ovl_Boss_Sst/func_8092F434.s | 7 +- .../actors/ovl_Boss_Sst/func_8092F65C.s | 2 - .../actors/ovl_Boss_Sst/func_8092F6F0.s | 2 - .../actors/ovl_Boss_Sst/func_8092F790.s | 7 +- .../actors/ovl_Boss_Sst/func_8092F7DC.s | 11 +- .../actors/ovl_Boss_Sst/func_8092F894.s | 7 +- .../actors/ovl_Boss_Sst/func_8092F8F0.s | 2 - .../actors/ovl_Boss_Sst/func_8092FBE4.s | 2 - .../actors/ovl_Boss_Sst/func_8092FC60.s | 2 - .../actors/ovl_Boss_Sst/func_8092FDD0.s | 2 - .../actors/ovl_Boss_Sst/func_8092FE44.s | 2 - .../actors/ovl_Boss_Sst/func_8092FF94.s | 2 - .../actors/ovl_Boss_Sst/func_8092FFF0.s | 2 - .../actors/ovl_Boss_Sst/func_809300E4.s | 2 - .../actors/ovl_Boss_Sst/func_80930158.s | 2 - .../actors/ovl_Boss_Sst/func_80930238.s | 2 - .../actors/ovl_Boss_Sst/func_80930284.s | 2 - .../actors/ovl_Boss_Sst/func_809303C8.s | 2 - .../actors/ovl_Boss_Sst/func_8093043C.s | 2 - .../actors/ovl_Boss_Sst/func_80930474.s | 2 - .../actors/ovl_Boss_Sst/func_8093051C.s | 10 +- .../actors/ovl_Boss_Sst/func_80930748.s | 2 - .../actors/ovl_Boss_Sst/func_809307B4.s | 2 - .../actors/ovl_Boss_Sst/func_809308A4.s | 2 - .../actors/ovl_Boss_Sst/func_80930934.s | 2 - .../actors/ovl_Boss_Sst/func_80930B18.s | 2 - .../actors/ovl_Boss_Sst/func_80930BC0.s | 2 - .../actors/ovl_Boss_Sst/func_80930CE4.s | 2 - .../actors/ovl_Boss_Sst/func_80930D70.s | 2 - .../actors/ovl_Boss_Sst/func_80930F80.s | 2 - .../actors/ovl_Boss_Sst/func_80930FE8.s | 2 - .../actors/ovl_Boss_Sst/func_80931044.s | 2 - .../actors/ovl_Boss_Sst/func_809310CC.s | 2 - .../actors/ovl_Boss_Sst/func_80931210.s | 2 - .../actors/ovl_Boss_Sst/func_80931300.s | 2 - .../actors/ovl_Boss_Sst/func_809314F0.s | 2 - .../actors/ovl_Boss_Sst/func_80931560.s | 2 - .../actors/ovl_Boss_Sst/func_80931788.s | 2 - .../actors/ovl_Boss_Sst/func_809317F8.s | 2 - .../actors/ovl_Boss_Sst/func_809318A0.s | 2 - .../actors/ovl_Boss_Sst/func_80931928.s | 2 - .../actors/ovl_Boss_Sst/func_809319D0.s | 2 - .../actors/ovl_Boss_Sst/func_80931A5C.s | 9 +- .../actors/ovl_Boss_Sst/func_80931D04.s | 2 - .../actors/ovl_Boss_Sst/func_80931D5C.s | 2 - .../actors/ovl_Boss_Sst/func_80931E70.s | 2 - .../actors/ovl_Boss_Sst/func_80931EC0.s | 2 - .../actors/ovl_Boss_Sst/func_80931EF8.s | 2 - .../actors/ovl_Boss_Sst/func_80931F84.s | 2 - .../actors/ovl_Boss_Sst/func_809322B4.s | 2 - .../actors/ovl_Boss_Sst/func_8093234C.s | 2 - .../actors/ovl_Boss_Sst/func_809324A4.s | 2 - .../actors/ovl_Boss_Sst/func_809324F4.s | 2 - .../actors/ovl_Boss_Sst/func_8093265C.s | 2 - .../actors/ovl_Boss_Sst/func_80932674.s | 9 +- .../actors/ovl_Boss_Sst/func_80932808.s | 2 - .../actors/ovl_Boss_Sst/func_8093285C.s | 2 - .../actors/ovl_Boss_Sst/func_809329D4.s | 2 - .../actors/ovl_Boss_Sst/func_80932A80.s | 2 - .../actors/ovl_Boss_Sst/func_80932BDC.s | 2 - .../actors/ovl_Boss_Sst/func_80932C38.s | 2 - .../actors/ovl_Boss_Sst/func_80932D10.s | 2 - .../actors/ovl_Boss_Sst/func_80932DAC.s | 2 - .../actors/ovl_Boss_Sst/func_80932FA0.s | 2 - .../actors/ovl_Boss_Sst/func_80932FF0.s | 2 - .../actors/ovl_Boss_Sst/func_80933064.s | 2 - .../actors/ovl_Boss_Sst/func_809330B4.s | 2 - .../actors/ovl_Boss_Sst/func_80933134.s | 2 - .../actors/ovl_Boss_Sst/func_80933170.s | 9 +- .../actors/ovl_Boss_Sst/func_809331E8.s | 2 - .../actors/ovl_Boss_Sst/func_80933210.s | 2 - .../actors/ovl_Boss_Sst/func_8093323C.s | 2 - .../actors/ovl_Boss_Sst/func_80933290.s | 2 - .../actors/ovl_Boss_Sst/func_80933328.s | 2 - .../actors/ovl_Boss_Sst/func_809333F4.s | 2 - .../actors/ovl_Boss_Sst/func_80933554.s | 2 - .../actors/ovl_Boss_Sst/func_80933608.s | 2 - .../actors/ovl_Boss_Sst/func_80933724.s | 2 - .../actors/ovl_Boss_Sst/func_80933748.s | 10 +- .../actors/ovl_Boss_Sst/func_809338DC.s | 2 - .../actors/ovl_Boss_Sst/func_80933978.s | 2 - .../actors/ovl_Boss_Sst/func_809339F8.s | 2 - .../actors/ovl_Boss_Sst/func_80933B84.s | 7 +- .../actors/ovl_Boss_Sst/func_80933C80.s | 2 - .../actors/ovl_Boss_Sst/func_80933CEC.s | 2 - .../actors/ovl_Boss_Sst/func_80933D2C.s | 2 - .../actors/ovl_Boss_Sst/func_80933D54.s | 2 - .../actors/ovl_Boss_Sst/func_80933EE0.s | 2 - .../actors/ovl_Boss_Sst/func_80934338.s | 2 - .../actors/ovl_Boss_Sst/func_809345A4.s | 2 - .../actors/ovl_Boss_Sst/func_809345F0.s | 2 - .../actors/ovl_Boss_Sst/func_80934628.s | 2 - .../actors/ovl_Boss_Sst/func_80934A44.s | 29 +- .../actors/ovl_Boss_Sst/func_80935238.s | 2 - .../actors/ovl_Boss_Sst/func_809352DC.s | 28 +- .../actors/ovl_Boss_Sst/func_80935764.s | 2 - .../actors/ovl_Boss_Sst/func_80935890.s | 2 - .../actors/ovl_Boss_Sst/func_80935948.s | 2 - .../actors/ovl_Boss_Sst/func_80935A20.s | 14 +- .../actors/ovl_Boss_Sst/func_80935CDC.s | 2 - .../actors/ovl_Boss_Sst/func_80935F30.s | 2 - .../actors/ovl_Boss_Sst/func_809360FC.s | 2 - .../actors/ovl_Boss_Sst/func_8093639C.s | 36 +- .../actors/ovl_Boss_Tw/BossTw_Destroy.s | 2 - .../overlays/actors/ovl_Boss_Tw/BossTw_Draw.s | 16 +- .../overlays/actors/ovl_Boss_Tw/BossTw_Init.s | 7 +- .../actors/ovl_Boss_Tw/BossTw_Update.s | 13 +- .../actors/ovl_Boss_Tw/func_80938CD0.s | 2 - .../actors/ovl_Boss_Tw/func_80938DC4.s | 2 - .../actors/ovl_Boss_Tw/func_80938EC0.s | 10 +- .../actors/ovl_Boss_Tw/func_80938FC4.s | 2 - .../actors/ovl_Boss_Tw/func_80939070.s | 2 - .../actors/ovl_Boss_Tw/func_80939148.s | 7 +- .../actors/ovl_Boss_Tw/func_80939250.s | 2 - .../actors/ovl_Boss_Tw/func_80939338.s | 10 +- .../actors/ovl_Boss_Tw/func_809394FC.s | 10 +- .../actors/ovl_Boss_Tw/func_80939F40.s | 2 - .../actors/ovl_Boss_Tw/func_80939F88.s | 2 - .../actors/ovl_Boss_Tw/func_8093A0A8.s | 7 +- .../actors/ovl_Boss_Tw/func_8093A2AC.s | 9 +- .../actors/ovl_Boss_Tw/func_8093A4DC.s | 7 +- .../actors/ovl_Boss_Tw/func_8093A5C4.s | 13 +- .../actors/ovl_Boss_Tw/func_8093A940.s | 2 - .../actors/ovl_Boss_Tw/func_8093AB30.s | 7 +- .../actors/ovl_Boss_Tw/func_8093ADB4.s | 7 +- .../actors/ovl_Boss_Tw/func_8093AED8.s | 9 +- .../actors/ovl_Boss_Tw/func_8093B1AC.s | 21 +- .../actors/ovl_Boss_Tw/func_8093C164.s | 2 - .../actors/ovl_Boss_Tw/func_8093C1C4.s | 2 - .../actors/ovl_Boss_Tw/func_8093C25C.s | 2 - .../actors/ovl_Boss_Tw/func_8093C2C4.s | 7 +- .../actors/ovl_Boss_Tw/func_8093C58C.s | 2 - .../actors/ovl_Boss_Tw/func_8093C5F4.s | 2 - .../actors/ovl_Boss_Tw/func_8093C684.s | 2 - .../actors/ovl_Boss_Tw/func_8093C700.s | 2 - .../actors/ovl_Boss_Tw/func_8093C79C.s | 2 - .../actors/ovl_Boss_Tw/func_8093C7E4.s | 2 - .../actors/ovl_Boss_Tw/func_8093C824.s | 2 - .../actors/ovl_Boss_Tw/func_8093C858.s | 2 - .../actors/ovl_Boss_Tw/func_8093C8F4.s | 2 - .../actors/ovl_Boss_Tw/func_8093C910.s | 25 +- .../actors/ovl_Boss_Tw/func_8093D3D8.s | 2 - .../actors/ovl_Boss_Tw/func_8093D444.s | 2 - .../actors/ovl_Boss_Tw/func_8093D54C.s | 2 - .../actors/ovl_Boss_Tw/func_8093D580.s | 2 - .../actors/ovl_Boss_Tw/func_8093D58C.s | 2 - .../actors/ovl_Boss_Tw/func_8093D5C0.s | 78 +- .../actors/ovl_Boss_Tw/func_8093EE10.s | 13 +- .../actors/ovl_Boss_Tw/func_8093F108.s | 2 - .../actors/ovl_Boss_Tw/func_8093F1C4.s | 21 +- .../actors/ovl_Boss_Tw/func_8093F9E4.s | 16 +- .../actors/ovl_Boss_Tw/func_80940D48.s | 32 +- .../actors/ovl_Boss_Tw/func_809416D0.s | 2 - .../actors/ovl_Boss_Tw/func_80941788.s | 20 +- .../actors/ovl_Boss_Tw/func_80941BC0.s | 24 +- .../actors/ovl_Boss_Tw/func_80942180.s | 28 +- .../actors/ovl_Boss_Tw/func_809426F0.s | 27 +- .../actors/ovl_Boss_Tw/func_80942C70.s | 32 +- .../actors/ovl_Boss_Tw/func_80943028.s | 20 +- .../actors/ovl_Boss_Tw/func_80943950.s | 43 +- .../actors/ovl_Boss_Tw/func_80943D90.s | 47 +- .../actors/ovl_Boss_Tw/func_80943F08.s | 30 +- .../actors/ovl_Boss_Tw/func_809447BC.s | 35 +- .../actors/ovl_Boss_Tw/func_80944C50.s | 32 +- .../actors/ovl_Boss_Tw/func_80945084.s | 12 +- .../actors/ovl_Boss_Tw/func_809453EC.s | 26 +- .../actors/ovl_Boss_Tw/func_80945D14.s | 32 +- .../actors/ovl_Boss_Tw/func_8094687C.s | 2 - .../actors/ovl_Boss_Tw/func_80946B00.s | 2 - .../actors/ovl_Boss_Tw/func_80946C7C.s | 26 +- .../actors/ovl_Boss_Tw/func_80947240.s | 26 +- .../actors/ovl_Boss_Tw/func_809477E0.s | 30 +- .../actors/ovl_Boss_Tw/func_80948528.s | 2 - .../actors/ovl_Boss_Tw/func_80948544.s | 13 +- .../actors/ovl_Boss_Tw/func_80948668.s | 43 +- .../actors/ovl_Boss_Tw/func_80949530.s | 2 - .../actors/ovl_Boss_Tw/func_809495A4.s | 2 - .../actors/ovl_Boss_Tw/func_809496D0.s | 2 - .../actors/ovl_Boss_Tw/func_80949734.s | 7 +- .../actors/ovl_Boss_Tw/func_80949920.s | 2 - .../actors/ovl_Boss_Tw/func_809499AC.s | 2 - .../actors/ovl_Boss_Tw/func_80949BFC.s | 2 - .../actors/ovl_Boss_Tw/func_80949C4C.s | 2 - .../actors/ovl_Boss_Tw/func_80949CE4.s | 2 - .../actors/ovl_Boss_Tw/func_80949E10.s | 7 +- .../actors/ovl_Boss_Tw/func_8094A0C4.s | 2 - .../actors/ovl_Boss_Tw/func_8094A12C.s | 2 - .../actors/ovl_Boss_Tw/func_8094A1C0.s | 11 +- .../actors/ovl_Boss_Tw/func_8094A398.s | 9 +- .../actors/ovl_Boss_Tw/func_8094A608.s | 2 - .../actors/ovl_Boss_Tw/func_8094A660.s | 2 - .../actors/ovl_Boss_Tw/func_8094A6D8.s | 2 - .../actors/ovl_Boss_Tw/func_8094A740.s | 1 - .../actors/ovl_Boss_Va/BossVa_Destroy.s | 2 - .../overlays/actors/ovl_Boss_Va/BossVa_Draw.s | 36 +- .../overlays/actors/ovl_Boss_Va/BossVa_Init.s | 49 +- .../actors/ovl_Boss_Va/BossVa_Update.s | 33 +- .../actors/ovl_Boss_Va/func_8094F2C0.s | 2 - .../actors/ovl_Boss_Va/func_8094F2C8.s | 12 +- .../actors/ovl_Boss_Va/func_8094F50C.s | 2 - .../actors/ovl_Boss_Va/func_8094F60C.s | 7 +- .../actors/ovl_Boss_Va/func_8094F734.s | 7 +- .../actors/ovl_Boss_Va/func_8094F864.s | 7 +- .../actors/ovl_Boss_Va/func_8094F9E8.s | 7 +- .../actors/ovl_Boss_Va/func_8094FB6C.s | 2 - .../actors/ovl_Boss_Va/func_8094FBB4.s | 2 - .../actors/ovl_Boss_Va/func_8094FC30.s | 2 - .../actors/ovl_Boss_Va/func_8094FC70.s | 7 +- .../actors/ovl_Boss_Va/func_809506F0.s | 2 - .../actors/ovl_Boss_Va/func_80950780.s | 62 +- .../actors/ovl_Boss_Va/func_809517A0.s | 2 - .../actors/ovl_Boss_Va/func_80951844.s | 13 +- .../actors/ovl_Boss_Va/func_80951AD8.s | 2 - .../actors/ovl_Boss_Va/func_80951C04.s | 16 +- .../actors/ovl_Boss_Va/func_80952100.s | 2 - .../actors/ovl_Boss_Va/func_8095213C.s | 18 +- .../actors/ovl_Boss_Va/func_809527A4.s | 2 - .../actors/ovl_Boss_Va/func_80952858.s | 20 +- .../actors/ovl_Boss_Va/func_8095335C.s | 2 - .../actors/ovl_Boss_Va/func_809533F4.s | 51 +- .../actors/ovl_Boss_Va/func_80953F4C.s | 2 - .../actors/ovl_Boss_Va/func_80953FC4.s | 7 +- .../actors/ovl_Boss_Va/func_809540E4.s | 2 - .../actors/ovl_Boss_Va/func_80954168.s | 7 +- .../actors/ovl_Boss_Va/func_8095438C.s | 2 - .../actors/ovl_Boss_Va/func_80954454.s | 2 - .../actors/ovl_Boss_Va/func_80954924.s | 2 - .../actors/ovl_Boss_Va/func_809549A8.s | 7 +- .../actors/ovl_Boss_Va/func_80954A3C.s | 2 - .../actors/ovl_Boss_Va/func_80954AD0.s | 2 - .../actors/ovl_Boss_Va/func_80954B8C.s | 2 - .../actors/ovl_Boss_Va/func_80954C20.s | 13 +- .../actors/ovl_Boss_Va/func_80955658.s | 2 - .../actors/ovl_Boss_Va/func_8095575C.s | 2 - .../actors/ovl_Boss_Va/func_8095586C.s | 2 - .../actors/ovl_Boss_Va/func_80955940.s | 7 +- .../actors/ovl_Boss_Va/func_80955E64.s | 2 - .../actors/ovl_Boss_Va/func_80955EEC.s | 7 +- .../actors/ovl_Boss_Va/func_80956644.s | 2 - .../actors/ovl_Boss_Va/func_809566C4.s | 2 - .../actors/ovl_Boss_Va/func_809567D0.s | 2 - .../actors/ovl_Boss_Va/func_809568E0.s | 29 +- .../actors/ovl_Boss_Va/func_80956E38.s | 2 - .../actors/ovl_Boss_Va/func_80956EE0.s | 7 +- .../actors/ovl_Boss_Va/func_809572DC.s | 2 - .../actors/ovl_Boss_Va/func_80957384.s | 7 +- .../actors/ovl_Boss_Va/func_80957998.s | 2 - .../actors/ovl_Boss_Va/func_809579F4.s | 2 - .../actors/ovl_Boss_Va/func_80957C10.s | 2 - .../actors/ovl_Boss_Va/func_80957C68.s | 2 - .../actors/ovl_Boss_Va/func_80957C9C.s | 2 - .../actors/ovl_Boss_Va/func_80957CEC.s | 2 - .../actors/ovl_Boss_Va/func_80957F60.s | 16 +- .../actors/ovl_Boss_Va/func_80958150.s | 34 +- .../actors/ovl_Boss_Va/func_809586A4.s | 2 - .../actors/ovl_Boss_Va/func_809586E4.s | 2 - .../actors/ovl_Boss_Va/func_80958934.s | 19 +- .../actors/ovl_Boss_Va/func_80958B0C.s | 2 - .../actors/ovl_Boss_Va/func_80958F6C.s | 2 - .../actors/ovl_Boss_Va/func_80958FFC.s | 20 +- .../actors/ovl_Boss_Va/func_809597F4.s | 33 +- .../actors/ovl_Boss_Va/func_8095A188.s | 78 +- .../actors/ovl_Boss_Va/func_8095B028.s | 16 +- .../actors/ovl_Boss_Va/func_8095B318.s | 7 +- .../actors/ovl_Boss_Va/func_8095B4A4.s | 10 +- .../actors/ovl_Boss_Va/func_8095B670.s | 10 +- .../actors/ovl_Boss_Va/func_8095B80C.s | 7 +- .../actors/ovl_Boss_Va/func_8095B9B0.s | 13 +- .../actors/ovl_Boss_Va/func_8095BBD0.s | 7 +- .../actors/ovl_Boss_Va/func_8095BD24.s | 31 +- .../actors/ovl_Demo_6K/Demo6K_Destroy.s | 2 - .../overlays/actors/ovl_Demo_6K/Demo6K_Init.s | 51 +- .../actors/ovl_Demo_6K/Demo6K_Update.s | 2 - .../actors/ovl_Demo_6K/func_80966950.s | 2 - .../actors/ovl_Demo_6K/func_80966DB0.s | 2 - .../actors/ovl_Demo_6K/func_80966E04.s | 2 - .../actors/ovl_Demo_6K/func_80966E98.s | 2 - .../actors/ovl_Demo_6K/func_80966F84.s | 7 +- .../actors/ovl_Demo_6K/func_809670AC.s | 7 +- .../actors/ovl_Demo_6K/func_8096712C.s | 16 +- .../actors/ovl_Demo_6K/func_80967244.s | 10 +- .../actors/ovl_Demo_6K/func_80967410.s | 2 - .../actors/ovl_Demo_6K/func_809674E0.s | 18 +- .../actors/ovl_Demo_6K/func_809676A4.s | 7 +- .../actors/ovl_Demo_6K/func_8096784C.s | 22 +- .../actors/ovl_Demo_6K/func_80967A04.s | 10 +- .../actors/ovl_Demo_6K/func_80967AD0.s | 2 - .../actors/ovl_Demo_6K/func_80967BF8.s | 2 - .../actors/ovl_Demo_6K/func_80967DBC.s | 12 +- .../actors/ovl_Demo_6K/func_80967F10.s | 9 +- .../actors/ovl_Demo_6K/func_80967FFC.s | 23 +- .../actors/ovl_Demo_6K/func_80968298.s | 24 +- .../actors/ovl_Demo_6K/func_8096865C.s | 27 +- .../actors/ovl_Demo_6K/func_809688C4.s | 20 +- .../actors/ovl_Demo_6K/func_80968B70.s | 20 +- .../actors/ovl_Demo_6K/func_80968FB0.s | 20 +- .../actors/ovl_Demo_6K/func_809691BC.s | 1 - .../actors/ovl_Demo_Du/DemoDu_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Du/DemoDu_Draw.s | 7 +- .../overlays/actors/ovl_Demo_Du/DemoDu_Init.s | 2 - .../actors/ovl_Demo_Du/DemoDu_Update.s | 8 +- .../actors/ovl_Demo_Du/func_80969AF0.s | 2 - .../actors/ovl_Demo_Du/func_80969B78.s | 2 - .../actors/ovl_Demo_Du/func_80969B8C.s | 2 - .../actors/ovl_Demo_Du/func_80969BA0.s | 2 - .../actors/ovl_Demo_Du/func_80969BC4.s | 2 - .../actors/ovl_Demo_Du/func_80969C38.s | 2 - .../actors/ovl_Demo_Du/func_80969C58.s | 2 - .../actors/ovl_Demo_Du/func_80969CA0.s | 2 - .../actors/ovl_Demo_Du/func_80969CC4.s | 2 - .../actors/ovl_Demo_Du/func_80969D10.s | 2 - .../actors/ovl_Demo_Du/func_80969D5C.s | 2 - .../actors/ovl_Demo_Du/func_80969DDC.s | 2 - .../actors/ovl_Demo_Du/func_80969E6C.s | 7 +- .../actors/ovl_Demo_Du/func_80969EDC.s | 2 - .../actors/ovl_Demo_Du/func_80969F38.s | 2 - .../actors/ovl_Demo_Du/func_80969FB4.s | 7 +- .../actors/ovl_Demo_Du/func_80969FD0.s | 2 - .../actors/ovl_Demo_Du/func_8096A05C.s | 2 - .../actors/ovl_Demo_Du/func_8096A0AC.s | 2 - .../actors/ovl_Demo_Du/func_8096A0D8.s | 2 - .../actors/ovl_Demo_Du/func_8096A16C.s | 2 - .../actors/ovl_Demo_Du/func_8096A1D8.s | 2 - .../actors/ovl_Demo_Du/func_8096A224.s | 2 - .../actors/ovl_Demo_Du/func_8096A244.s | 2 - .../actors/ovl_Demo_Du/func_8096A264.s | 2 - .../actors/ovl_Demo_Du/func_8096A294.s | 2 - .../actors/ovl_Demo_Du/func_8096A2CC.s | 2 - .../actors/ovl_Demo_Du/func_8096A300.s | 2 - .../actors/ovl_Demo_Du/func_8096A338.s | 2 - .../actors/ovl_Demo_Du/func_8096A360.s | 2 - .../actors/ovl_Demo_Du/func_8096A3B4.s | 2 - .../actors/ovl_Demo_Du/func_8096A3D8.s | 2 - .../actors/ovl_Demo_Du/func_8096A408.s | 2 - .../actors/ovl_Demo_Du/func_8096A45C.s | 2 - .../actors/ovl_Demo_Du/func_8096A480.s | 2 - .../actors/ovl_Demo_Du/func_8096A4D4.s | 2 - .../actors/ovl_Demo_Du/func_8096A528.s | 2 - .../actors/ovl_Demo_Du/func_8096A630.s | 2 - .../actors/ovl_Demo_Du/func_8096A6E0.s | 2 - .../actors/ovl_Demo_Du/func_8096A970.s | 2 - .../actors/ovl_Demo_Du/func_8096AA4C.s | 2 - .../actors/ovl_Demo_Du/func_8096AA5C.s | 2 - .../actors/ovl_Demo_Du/func_8096AB00.s | 2 - .../actors/ovl_Demo_Du/func_8096AB54.s | 2 - .../actors/ovl_Demo_Du/func_8096AB8C.s | 2 - .../actors/ovl_Demo_Du/func_8096ABF8.s | 2 - .../actors/ovl_Demo_Du/func_8096AC90.s | 2 - .../actors/ovl_Demo_Du/func_8096ACFC.s | 2 - .../actors/ovl_Demo_Du/func_8096AD90.s | 2 - .../actors/ovl_Demo_Du/func_8096AE00.s | 2 - .../actors/ovl_Demo_Du/func_8096AE6C.s | 2 - .../actors/ovl_Demo_Du/func_8096AF00.s | 2 - .../actors/ovl_Demo_Du/func_8096AF6C.s | 2 - .../actors/ovl_Demo_Du/func_8096AFFC.s | 2 - .../actors/ovl_Demo_Du/func_8096B030.s | 2 - .../actors/ovl_Demo_Du/func_8096B06C.s | 2 - .../actors/ovl_Demo_Du/func_8096B0C0.s | 2 - .../actors/ovl_Demo_Du/func_8096B0F8.s | 2 - .../actors/ovl_Demo_Du/func_8096B140.s | 2 - .../actors/ovl_Demo_Du/func_8096B184.s | 2 - .../actors/ovl_Demo_Du/func_8096B1DC.s | 2 - .../actors/ovl_Demo_Du/func_8096B220.s | 2 - .../actors/ovl_Demo_Du/func_8096B27C.s | 2 - .../actors/ovl_Demo_Du/func_8096B2D4.s | 2 - .../actors/ovl_Demo_Du/func_8096B318.s | 2 - .../actors/ovl_Demo_Du/func_8096B360.s | 2 - .../actors/ovl_Demo_Du/func_8096B3A4.s | 2 - .../actors/ovl_Demo_Du/func_8096B3E4.s | 2 - .../actors/ovl_Demo_Du/func_8096B488.s | 2 - .../actors/ovl_Demo_Du/func_8096B4A8.s | 2 - .../actors/ovl_Demo_Du/func_8096B528.s | 2 - .../actors/ovl_Demo_Du/func_8096B57C.s | 2 - .../actors/ovl_Demo_Du/func_8096B6D0.s | 2 - .../actors/ovl_Demo_Du/func_8096B768.s | 2 - .../actors/ovl_Demo_Du/func_8096B798.s | 2 - .../actors/ovl_Demo_Du/func_8096B7EC.s | 2 - .../actors/ovl_Demo_Du/func_8096B840.s | 12 +- .../actors/ovl_Demo_Du/func_8096BA2C.s | 2 - .../actors/ovl_Demo_Du/func_8096BA98.s | 2 - .../actors/ovl_Demo_Du/func_8096BB24.s | 2 - .../actors/ovl_Demo_Du/func_8096BB5C.s | 2 - .../actors/ovl_Demo_Du/func_8096BBA8.s | 2 - .../actors/ovl_Demo_Du/func_8096BBE8.s | 2 - .../actors/ovl_Demo_Du/func_8096BC28.s | 2 - .../actors/ovl_Demo_Du/func_8096BC6C.s | 8 +- .../actors/ovl_Demo_Du/func_8096BD2C.s | 2 - .../actors/ovl_Demo_Du/func_8096BD4C.s | 2 - .../actors/ovl_Demo_Du/func_8096BD94.s | 2 - .../actors/ovl_Demo_Du/func_8096BDD4.s | 2 - .../actors/ovl_Demo_Du/func_8096BE14.s | 2 - .../actors/ovl_Demo_Du/func_8096BF54.s | 2 - .../actors/ovl_Demo_Du/func_8096BF60.s | 12 +- .../actors/ovl_Demo_Ec/DemoEc_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s | 7 +- .../overlays/actors/ovl_Demo_Ec/DemoEc_Init.s | 8 +- .../actors/ovl_Demo_Ec/DemoEc_Update.s | 8 +- .../actors/ovl_Demo_Ec/func_8096D52C.s | 2 - .../actors/ovl_Demo_Ec/func_8096D54C.s | 2 - .../actors/ovl_Demo_Ec/func_8096D594.s | 2 - .../actors/ovl_Demo_Ec/func_8096D5D4.s | 2 - .../actors/ovl_Demo_Ec/func_8096D64C.s | 2 - .../actors/ovl_Demo_Ec/func_8096D68C.s | 2 - .../actors/ovl_Demo_Ec/func_8096D714.s | 2 - .../actors/ovl_Demo_Ec/func_8096D728.s | 2 - .../actors/ovl_Demo_Ec/func_8096D79C.s | 2 - .../actors/ovl_Demo_Ec/func_8096D858.s | 2 - .../actors/ovl_Demo_Ec/func_8096D8C4.s | 12 +- .../actors/ovl_Demo_Ec/func_8096DA80.s | 12 +- .../actors/ovl_Demo_Ec/func_8096DD0C.s | 12 +- .../actors/ovl_Demo_Ec/func_8096DDBC.s | 2 - .../actors/ovl_Demo_Ec/func_8096DDF0.s | 2 - .../actors/ovl_Demo_Ec/func_8096DE14.s | 2 - .../actors/ovl_Demo_Ec/func_8096DE94.s | 2 - .../actors/ovl_Demo_Ec/func_8096DF2C.s | 2 - .../actors/ovl_Demo_Ec/func_8096DF68.s | 2 - .../actors/ovl_Demo_Ec/func_8096DF9C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E034.s | 2 - .../actors/ovl_Demo_Ec/func_8096E070.s | 2 - .../actors/ovl_Demo_Ec/func_8096E0A4.s | 2 - .../actors/ovl_Demo_Ec/func_8096E13C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E178.s | 2 - .../actors/ovl_Demo_Ec/func_8096E1AC.s | 2 - .../actors/ovl_Demo_Ec/func_8096E244.s | 2 - .../actors/ovl_Demo_Ec/func_8096E2E0.s | 2 - .../actors/ovl_Demo_Ec/func_8096E31C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E33C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E380.s | 2 - .../actors/ovl_Demo_Ec/func_8096E418.s | 2 - .../actors/ovl_Demo_Ec/func_8096E4B4.s | 2 - .../actors/ovl_Demo_Ec/func_8096E4F8.s | 2 - .../actors/ovl_Demo_Ec/func_8096E518.s | 2 - .../actors/ovl_Demo_Ec/func_8096E56C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E604.s | 2 - .../actors/ovl_Demo_Ec/func_8096E648.s | 2 - .../actors/ovl_Demo_Ec/func_8096E69C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E734.s | 2 - .../actors/ovl_Demo_Ec/func_8096E778.s | 2 - .../actors/ovl_Demo_Ec/func_8096E7CC.s | 2 - .../actors/ovl_Demo_Ec/func_8096E864.s | 2 - .../actors/ovl_Demo_Ec/func_8096E8A8.s | 2 - .../actors/ovl_Demo_Ec/func_8096E8E4.s | 2 - .../actors/ovl_Demo_Ec/func_8096E97C.s | 2 - .../actors/ovl_Demo_Ec/func_8096E9B8.s | 2 - .../actors/ovl_Demo_Ec/func_8096E9E8.s | 2 - .../actors/ovl_Demo_Ec/func_8096EA80.s | 2 - .../actors/ovl_Demo_Ec/func_8096EABC.s | 2 - .../actors/ovl_Demo_Ec/func_8096EAE8.s | 2 - .../actors/ovl_Demo_Ec/func_8096EB80.s | 2 - .../actors/ovl_Demo_Ec/func_8096EBBC.s | 2 - .../actors/ovl_Demo_Ec/func_8096ECBC.s | 8 +- .../actors/ovl_Demo_Ec/func_8096ED40.s | 2 - .../actors/ovl_Demo_Ec/func_8096EDC0.s | 2 - .../actors/ovl_Demo_Ec/func_8096EDFC.s | 2 - .../actors/ovl_Demo_Ec/func_8096EE98.s | 2 - .../actors/ovl_Demo_Ec/func_8096EEDC.s | 8 +- .../actors/ovl_Demo_Ec/func_8096EF4C.s | 2 - .../actors/ovl_Demo_Ec/func_8096EFCC.s | 2 - .../actors/ovl_Demo_Ec/func_8096F010.s | 2 - .../actors/ovl_Demo_Ec/func_8096F0AC.s | 2 - .../actors/ovl_Demo_Ec/func_8096F0F0.s | 2 - .../actors/ovl_Demo_Ec/func_8096F12C.s | 2 - .../actors/ovl_Demo_Ec/func_8096F1D4.s | 2 - .../actors/ovl_Demo_Ec/func_8096F224.s | 2 - .../actors/ovl_Demo_Ec/func_8096F26C.s | 2 - .../actors/ovl_Demo_Ec/func_8096F2B0.s | 2 - .../actors/ovl_Demo_Ec/func_8096F314.s | 2 - .../actors/ovl_Demo_Ec/func_8096F378.s | 2 - .../actors/ovl_Demo_Ec/func_8096F3D4.s | 2 - .../actors/ovl_Demo_Ec/func_8096F418.s | 2 - .../actors/ovl_Demo_Ec/func_8096F454.s | 2 - .../actors/ovl_Demo_Ec/func_8096F4FC.s | 2 - .../actors/ovl_Demo_Ec/func_8096F544.s | 2 - .../actors/ovl_Demo_Ec/func_8096F578.s | 2 - .../actors/ovl_Demo_Ec/func_8096F5DC.s | 2 - .../actors/ovl_Demo_Ec/func_8096F640.s | 2 - .../actors/ovl_Demo_Ec/func_8096F69C.s | 2 - .../actors/ovl_Demo_Ec/func_8096F6D8.s | 2 - .../actors/ovl_Demo_Ec/func_8096F7A0.s | 2 - .../actors/ovl_Demo_Ec/func_8096F7DC.s | 2 - .../actors/ovl_Demo_Ec/func_8096F808.s | 2 - .../actors/ovl_Demo_Ec/func_8096F8A4.s | 2 - .../actors/ovl_Demo_Ec/func_8096F8E8.s | 2 - .../actors/ovl_Demo_Ec/func_8096F924.s | 2 - .../actors/ovl_Demo_Ec/func_8096F9C0.s | 2 - .../actors/ovl_Demo_Ec/func_8096FA04.s | 2 - .../actors/ovl_Demo_Ec/func_8096FA40.s | 2 - .../actors/ovl_Demo_Ec/func_8096FADC.s | 2 - .../actors/ovl_Demo_Ec/func_8096FB18.s | 2 - .../actors/ovl_Demo_Ec/func_8096FB48.s | 2 - .../actors/ovl_Demo_Ec/func_8096FBE4.s | 2 - .../actors/ovl_Demo_Ec/func_8096FC28.s | 2 - .../actors/ovl_Demo_Ec/func_8096FCA8.s | 2 - .../actors/ovl_Demo_Ec/func_8096FCEC.s | 2 - .../actors/ovl_Demo_Ec/func_8096FD88.s | 2 - .../actors/ovl_Demo_Ec/func_8096FDCC.s | 2 - .../actors/ovl_Demo_Ec/func_8096FE08.s | 2 - .../actors/ovl_Demo_Ec/func_8096FF38.s | 2 - .../actors/ovl_Demo_Ec/func_8096FF7C.s | 2 - .../actors/ovl_Demo_Ec/func_8096FFBC.s | 2 - .../actors/ovl_Demo_Ec/func_80970058.s | 2 - .../actors/ovl_Demo_Ec/func_8097009C.s | 2 - .../actors/ovl_Demo_Ec/func_809700DC.s | 8 +- .../actors/ovl_Demo_Ec/func_80970140.s | 8 +- .../actors/ovl_Demo_Ec/func_809702B0.s | 2 - .../ovl_Demo_Effect/DemoEffect_Destroy.s | 2 - .../actors/ovl_Demo_Effect/DemoEffect_Init.s | 65 +- .../ovl_Demo_Effect/DemoEffect_Update.s | 2 - .../actors/ovl_Demo_Effect/func_80970F50.s | 2 - .../actors/ovl_Demo_Effect/func_80970F58.s | 2 - .../actors/ovl_Demo_Effect/func_80970FB4.s | 2 - .../actors/ovl_Demo_Effect/func_80971070.s | 2 - .../actors/ovl_Demo_Effect/func_80971960.s | 8 +- .../actors/ovl_Demo_Effect/func_809719C0.s | 2 - .../actors/ovl_Demo_Effect/func_809719F0.s | 2 - .../actors/ovl_Demo_Effect/func_80971A28.s | 7 +- .../actors/ovl_Demo_Effect/func_80971BBC.s | 7 +- .../actors/ovl_Demo_Effect/func_80971DFC.s | 24 +- .../actors/ovl_Demo_Effect/func_80972008.s | 2 - .../actors/ovl_Demo_Effect/func_809720AC.s | 2 - .../actors/ovl_Demo_Effect/func_809721D0.s | 7 +- .../actors/ovl_Demo_Effect/func_80972288.s | 13 +- .../actors/ovl_Demo_Effect/func_80972344.s | 2 - .../actors/ovl_Demo_Effect/func_809723C4.s | 2 - .../actors/ovl_Demo_Effect/func_809726AC.s | 2 - .../actors/ovl_Demo_Effect/func_8097273C.s | 2 - .../actors/ovl_Demo_Effect/func_809727B0.s | 2 - .../actors/ovl_Demo_Effect/func_80972868.s | 2 - .../actors/ovl_Demo_Effect/func_809729B8.s | 7 +- .../actors/ovl_Demo_Effect/func_80972A04.s | 7 +- .../actors/ovl_Demo_Effect/func_80972A6C.s | 10 +- .../actors/ovl_Demo_Effect/func_80972B4C.s | 22 +- .../actors/ovl_Demo_Effect/func_80972E3C.s | 7 +- .../actors/ovl_Demo_Effect/func_80972EA8.s | 2 - .../actors/ovl_Demo_Effect/func_8097303C.s | 2 - .../actors/ovl_Demo_Effect/func_8097322C.s | 10 +- .../actors/ovl_Demo_Effect/func_809733C8.s | 2 - .../actors/ovl_Demo_Effect/func_80973424.s | 2 - .../actors/ovl_Demo_Effect/func_80973524.s | 2 - .../actors/ovl_Demo_Effect/func_80973CA0.s | 2 - .../actors/ovl_Demo_Effect/func_80973CFC.s | 13 +- .../actors/ovl_Demo_Effect/func_80973EE0.s | 7 +- .../actors/ovl_Demo_Effect/func_8097414C.s | 7 +- .../actors/ovl_Demo_Effect/func_809742B0.s | 2 - .../actors/ovl_Demo_Effect/func_80974314.s | 2 - .../actors/ovl_Demo_Effect/func_80974358.s | 2 - .../actors/ovl_Demo_Effect/func_8097456C.s | 7 +- .../actors/ovl_Demo_Effect/func_809746B4.s | 2 - .../actors/ovl_Demo_Effect/func_809746F8.s | 20 +- .../actors/ovl_Demo_Effect/func_80974B80.s | 40 +- .../actors/ovl_Demo_Effect/func_80974EB4.s | 16 +- .../actors/ovl_Demo_Effect/func_80975074.s | 30 +- .../actors/ovl_Demo_Effect/func_80975494.s | 30 +- .../actors/ovl_Demo_Effect/func_8097571C.s | 20 +- .../actors/ovl_Demo_Effect/func_8097587C.s | 16 +- .../actors/ovl_Demo_Effect/func_80975A3C.s | 16 +- .../actors/ovl_Demo_Effect/func_80975BD4.s | 38 +- .../actors/ovl_Demo_Effect/func_809761C4.s | 2 - .../actors/ovl_Demo_Effect/func_80976254.s | 12 +- .../actors/ovl_Demo_Effect/func_80976404.s | 12 +- .../actors/ovl_Demo_Effect/func_809764FC.s | 10 +- .../actors/ovl_Demo_Effect/func_809765AC.s | 2 - .../actors/ovl_Demo_Effect/func_8097670C.s | 2 - .../actors/ovl_Demo_Effect/func_809767B0.s | 1 - .../actors/ovl_Demo_Ext/DemoExt_Destroy.s | 2 - .../actors/ovl_Demo_Ext/DemoExt_Draw.s | 7 +- .../actors/ovl_Demo_Ext/DemoExt_Init.s | 2 - .../actors/ovl_Demo_Ext/DemoExt_Update.s | 8 +- .../actors/ovl_Demo_Ext/func_80977450.s | 2 - .../actors/ovl_Demo_Ext/func_809774D8.s | 2 - .../actors/ovl_Demo_Ext/func_809774FC.s | 2 - .../actors/ovl_Demo_Ext/func_80977508.s | 2 - .../actors/ovl_Demo_Ext/func_80977590.s | 2 - .../actors/ovl_Demo_Ext/func_809775A4.s | 2 - .../actors/ovl_Demo_Ext/func_80977610.s | 8 +- .../actors/ovl_Demo_Ext/func_809776D0.s | 2 - .../actors/ovl_Demo_Ext/func_8097771C.s | 2 - .../actors/ovl_Demo_Ext/func_80977854.s | 2 - .../actors/ovl_Demo_Ext/func_80977874.s | 2 - .../actors/ovl_Demo_Ext/func_809778AC.s | 2 - .../actors/ovl_Demo_Ext/func_80977944.s | 2 - .../actors/ovl_Demo_Ext/func_80977950.s | 16 +- .../actors/ovl_Demo_Gj/DemoGj_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s | 7 +- .../overlays/actors/ovl_Demo_Gj/DemoGj_Init.s | 30 +- .../actors/ovl_Demo_Gj/DemoGj_Update.s | 8 +- .../actors/ovl_Demo_Gj/func_80978930.s | 2 - .../actors/ovl_Demo_Gj/func_80978940.s | 2 - .../actors/ovl_Demo_Gj/func_80978950.s | 2 - .../actors/ovl_Demo_Gj/func_8097895C.s | 2 - .../actors/ovl_Demo_Gj/func_809789A4.s | 2 - .../actors/ovl_Demo_Gj/func_809789D8.s | 2 - .../actors/ovl_Demo_Gj/func_80978AC4.s | 2 - .../actors/ovl_Demo_Gj/func_80978AFC.s | 7 +- .../actors/ovl_Demo_Gj/func_80978B90.s | 2 - .../actors/ovl_Demo_Gj/func_80978C20.s | 13 +- .../actors/ovl_Demo_Gj/func_80978EBC.s | 2 - .../actors/ovl_Demo_Gj/func_80978EE4.s | 12 +- .../actors/ovl_Demo_Gj/func_80978F60.s | 2 - .../actors/ovl_Demo_Gj/func_80978FCC.s | 2 - .../actors/ovl_Demo_Gj/func_80979030.s | 16 +- .../actors/ovl_Demo_Gj/func_8097911C.s | 16 +- .../actors/ovl_Demo_Gj/func_8097923C.s | 41 +- .../actors/ovl_Demo_Gj/func_809797E4.s | 2 - .../actors/ovl_Demo_Gj/func_80979818.s | 2 - .../actors/ovl_Demo_Gj/func_8097983C.s | 2 - .../actors/ovl_Demo_Gj/func_80979860.s | 43 +- .../actors/ovl_Demo_Gj/func_80979F9C.s | 2 - .../actors/ovl_Demo_Gj/func_80979FD0.s | 2 - .../actors/ovl_Demo_Gj/func_8097A000.s | 2 - .../actors/ovl_Demo_Gj/func_8097A07C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A0E4.s | 2 - .../actors/ovl_Demo_Gj/func_8097A130.s | 2 - .../actors/ovl_Demo_Gj/func_8097A160.s | 2 - .../actors/ovl_Demo_Gj/func_8097A190.s | 2 - .../actors/ovl_Demo_Gj/func_8097A1C0.s | 2 - .../actors/ovl_Demo_Gj/func_8097A1E4.s | 2 - .../actors/ovl_Demo_Gj/func_8097A208.s | 2 - .../actors/ovl_Demo_Gj/func_8097A238.s | 2 - .../actors/ovl_Demo_Gj/func_8097A2B4.s | 2 - .../actors/ovl_Demo_Gj/func_8097A320.s | 2 - .../actors/ovl_Demo_Gj/func_8097A36C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A39C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A3CC.s | 2 - .../actors/ovl_Demo_Gj/func_8097A3FC.s | 2 - .../actors/ovl_Demo_Gj/func_8097A420.s | 2 - .../actors/ovl_Demo_Gj/func_8097A444.s | 2 - .../actors/ovl_Demo_Gj/func_8097A474.s | 2 - .../actors/ovl_Demo_Gj/func_8097A4F0.s | 2 - .../actors/ovl_Demo_Gj/func_8097A53C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A56C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A59C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A5CC.s | 2 - .../actors/ovl_Demo_Gj/func_8097A5F0.s | 2 - .../actors/ovl_Demo_Gj/func_8097A614.s | 2 - .../actors/ovl_Demo_Gj/func_8097A644.s | 2 - .../actors/ovl_Demo_Gj/func_8097A6C0.s | 2 - .../actors/ovl_Demo_Gj/func_8097A70C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A73C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A76C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A79C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A7C0.s | 2 - .../actors/ovl_Demo_Gj/func_8097A7E4.s | 2 - .../actors/ovl_Demo_Gj/func_8097A814.s | 2 - .../actors/ovl_Demo_Gj/func_8097A890.s | 2 - .../actors/ovl_Demo_Gj/func_8097A8DC.s | 2 - .../actors/ovl_Demo_Gj/func_8097A90C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A93C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A96C.s | 2 - .../actors/ovl_Demo_Gj/func_8097A990.s | 2 - .../actors/ovl_Demo_Gj/func_8097A9B4.s | 2 - .../actors/ovl_Demo_Gj/func_8097A9E4.s | 2 - .../actors/ovl_Demo_Gj/func_8097AA60.s | 2 - .../actors/ovl_Demo_Gj/func_8097AAAC.s | 2 - .../actors/ovl_Demo_Gj/func_8097AADC.s | 2 - .../actors/ovl_Demo_Gj/func_8097AB0C.s | 2 - .../actors/ovl_Demo_Gj/func_8097AB3C.s | 2 - .../actors/ovl_Demo_Gj/func_8097AB60.s | 2 - .../actors/ovl_Demo_Gj/func_8097AB84.s | 2 - .../actors/ovl_Demo_Gj/func_8097ABB4.s | 2 - .../actors/ovl_Demo_Gj/func_8097AC30.s | 2 - .../actors/ovl_Demo_Gj/func_8097AC9C.s | 2 - .../actors/ovl_Demo_Gj/func_8097ACE8.s | 2 - .../actors/ovl_Demo_Gj/func_8097AD18.s | 2 - .../actors/ovl_Demo_Gj/func_8097AD48.s | 2 - .../actors/ovl_Demo_Gj/func_8097AD78.s | 2 - .../actors/ovl_Demo_Gj/func_8097AD9C.s | 2 - .../actors/ovl_Demo_Gj/func_8097ADC0.s | 2 - .../actors/ovl_Demo_Gj/func_8097ADF0.s | 2 - .../actors/ovl_Demo_Gj/func_8097AE38.s | 2 - .../actors/ovl_Demo_Gj/func_8097AE5C.s | 2 - .../actors/ovl_Demo_Gj/func_8097AEDC.s | 2 - .../actors/ovl_Demo_Gj/func_8097AEE8.s | 2 - .../actors/ovl_Demo_Gj/func_8097B080.s | 2 - .../actors/ovl_Demo_Gj/func_8097B0EC.s | 2 - .../actors/ovl_Demo_Gj/func_8097B128.s | 7 +- .../actors/ovl_Demo_Gj/func_8097B1B4.s | 2 - .../actors/ovl_Demo_Gj/func_8097B22C.s | 2 - .../actors/ovl_Demo_Gj/func_8097B340.s | 2 - .../actors/ovl_Demo_Gj/func_8097B370.s | 2 - .../actors/ovl_Demo_Gj/func_8097B3A0.s | 2 - .../actors/ovl_Demo_Gj/func_8097B3C4.s | 2 - .../actors/ovl_Demo_Gj/func_8097B444.s | 2 - .../actors/ovl_Demo_Gj/func_8097B450.s | 2 - .../actors/ovl_Demo_Gj/func_8097B5A4.s | 2 - .../actors/ovl_Demo_Gj/func_8097B610.s | 2 - .../actors/ovl_Demo_Gj/func_8097B688.s | 2 - .../actors/ovl_Demo_Gj/func_8097B6C4.s | 7 +- .../actors/ovl_Demo_Gj/func_8097B750.s | 2 - .../actors/ovl_Demo_Gj/func_8097B864.s | 2 - .../actors/ovl_Demo_Gj/func_8097B894.s | 2 - .../actors/ovl_Demo_Gj/func_8097B8C4.s | 2 - .../actors/ovl_Demo_Gj/func_8097B8E8.s | 2 - .../actors/ovl_Demo_Gj/func_8097B930.s | 2 - .../actors/ovl_Demo_Gj/func_8097B93C.s | 2 - .../actors/ovl_Demo_Gj/func_8097B9BC.s | 7 +- .../actors/ovl_Demo_Gj/func_8097BA48.s | 2 - .../actors/ovl_Demo_Gj/func_8097BB78.s | 2 - .../actors/ovl_Demo_Gj/func_8097BBA8.s | 2 - .../actors/ovl_Demo_Gj/func_8097BBD8.s | 2 - .../actors/ovl_Demo_Gj/func_8097BD70.s | 2 - .../actors/ovl_Demo_Go/func_8097CDB0.s | 2 - .../actors/ovl_Demo_Gt/DemoGt_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s | 7 +- .../overlays/actors/ovl_Demo_Gt/DemoGt_Init.s | 37 +- .../actors/ovl_Demo_Gt/DemoGt_Update.s | 10 +- .../actors/ovl_Demo_Gt/func_8097D6B4.s | 2 - .../actors/ovl_Demo_Gt/func_8097D6D4.s | 2 - .../actors/ovl_Demo_Gt/func_8097D6F8.s | 2 - .../actors/ovl_Demo_Gt/func_8097D71C.s | 2 - .../actors/ovl_Demo_Gt/func_8097D74C.s | 7 +- .../actors/ovl_Demo_Gt/func_8097D7D8.s | 2 - .../actors/ovl_Demo_Gt/func_8097D964.s | 2 - .../actors/ovl_Demo_Gt/func_8097D9C4.s | 2 - .../actors/ovl_Demo_Gt/func_8097DA78.s | 2 - .../actors/ovl_Demo_Gt/func_8097DAC8.s | 10 +- .../actors/ovl_Demo_Gt/func_8097DD28.s | 10 +- .../actors/ovl_Demo_Gt/func_8097DF70.s | 13 +- .../actors/ovl_Demo_Gt/func_8097E1D4.s | 10 +- .../actors/ovl_Demo_Gt/func_8097E454.s | 7 +- .../actors/ovl_Demo_Gt/func_8097E69C.s | 2 - .../actors/ovl_Demo_Gt/func_8097E6BC.s | 2 - .../actors/ovl_Demo_Gt/func_8097E704.s | 2 - .../actors/ovl_Demo_Gt/func_8097E744.s | 2 - .../actors/ovl_Demo_Gt/func_8097E824.s | 28 +- .../actors/ovl_Demo_Gt/func_8097ED64.s | 2 - .../actors/ovl_Demo_Gt/func_8097ED94.s | 2 - .../actors/ovl_Demo_Gt/func_8097EDD8.s | 2 - .../actors/ovl_Demo_Gt/func_8097EE44.s | 2 - .../actors/ovl_Demo_Gt/func_8097EEA8.s | 2 - .../actors/ovl_Demo_Gt/func_8097EF00.s | 2 - .../actors/ovl_Demo_Gt/func_8097EF34.s | 2 - .../actors/ovl_Demo_Gt/func_8097EF40.s | 16 +- .../actors/ovl_Demo_Gt/func_8097F0AC.s | 2 - .../actors/ovl_Demo_Gt/func_8097F19C.s | 2 - .../actors/ovl_Demo_Gt/func_8097F1D8.s | 10 +- .../actors/ovl_Demo_Gt/func_8097F280.s | 2 - .../actors/ovl_Demo_Gt/func_8097F3EC.s | 2 - .../actors/ovl_Demo_Gt/func_8097F428.s | 2 - .../actors/ovl_Demo_Gt/func_8097F498.s | 2 - .../actors/ovl_Demo_Gt/func_8097F508.s | 20 +- .../actors/ovl_Demo_Gt/func_8097F904.s | 2 - .../actors/ovl_Demo_Gt/func_8097F960.s | 2 - .../actors/ovl_Demo_Gt/func_8097F96C.s | 2 - .../actors/ovl_Demo_Gt/func_8097FA1C.s | 7 +- .../actors/ovl_Demo_Gt/func_8097FAFC.s | 2 - .../actors/ovl_Demo_Gt/func_8097FC1C.s | 2 - .../actors/ovl_Demo_Gt/func_8097FCE4.s | 7 +- .../actors/ovl_Demo_Gt/func_8097FD70.s | 2 - .../actors/ovl_Demo_Gt/func_8097FDDC.s | 2 - .../actors/ovl_Demo_Gt/func_8097FED8.s | 2 - .../actors/ovl_Demo_Gt/func_8097FF14.s | 2 - .../actors/ovl_Demo_Gt/func_8097FF5C.s | 2 - .../actors/ovl_Demo_Gt/func_8097FF9C.s | 16 +- .../actors/ovl_Demo_Gt/func_80980110.s | 2 - .../actors/ovl_Demo_Gt/func_8098016C.s | 2 - .../actors/ovl_Demo_Gt/func_80980178.s | 2 - .../actors/ovl_Demo_Gt/func_80980184.s | 2 - .../actors/ovl_Demo_Gt/func_80980218.s | 2 - .../actors/ovl_Demo_Gt/func_809802AC.s | 10 +- .../actors/ovl_Demo_Gt/func_8098036C.s | 2 - .../actors/ovl_Demo_Gt/func_80980430.s | 2 - .../actors/ovl_Demo_Gt/func_80980504.s | 7 +- .../actors/ovl_Demo_Gt/func_809805D8.s | 7 +- .../actors/ovl_Demo_Gt/func_809806B8.s | 2 - .../actors/ovl_Demo_Gt/func_8098078C.s | 2 - .../actors/ovl_Demo_Gt/func_8098085C.s | 13 +- .../actors/ovl_Demo_Gt/func_809809C0.s | 7 +- .../actors/ovl_Demo_Gt/func_80980AD4.s | 7 +- .../actors/ovl_Demo_Gt/func_80980B68.s | 2 - .../actors/ovl_Demo_Gt/func_80980BFC.s | 7 +- .../actors/ovl_Demo_Gt/func_80980C90.s | 2 - .../actors/ovl_Demo_Gt/func_80980D74.s | 2 - .../actors/ovl_Demo_Gt/func_80980DB0.s | 2 - .../actors/ovl_Demo_Gt/func_80980DF0.s | 2 - .../actors/ovl_Demo_Gt/func_80980E24.s | 16 +- .../actors/ovl_Demo_Gt/func_80980F00.s | 2 - .../actors/ovl_Demo_Gt/func_80980F58.s | 2 - .../actors/ovl_Demo_Gt/func_80980F8C.s | 7 +- .../actors/ovl_Demo_Gt/func_8098103C.s | 2 - .../actors/ovl_Demo_Gt/func_809810A0.s | 2 - .../actors/ovl_Demo_Gt/func_809810E0.s | 2 - .../actors/ovl_Demo_Gt/func_80981114.s | 10 +- .../actors/ovl_Demo_Gt/func_809811AC.s | 20 +- .../actors/ovl_Demo_Gt/func_809813CC.s | 2 - .../actors/ovl_Demo_Gt/func_80981424.s | 2 - .../actors/ovl_Demo_Gt/func_80981458.s | 10 +- .../actors/ovl_Demo_Gt/func_80981524.s | 2 - .../actors/ovl_Demo_Gt/func_80981588.s | 2 - .../actors/ovl_Demo_Gt/func_809815C8.s | 2 - .../actors/ovl_Demo_Gt/func_809815FC.s | 10 +- .../actors/ovl_Demo_Gt/func_80981694.s | 20 +- .../actors/ovl_Demo_Gt/func_809818A4.s | 2 - .../actors/ovl_Demo_Gt/func_809818FC.s | 2 - .../actors/ovl_Demo_Gt/func_80981930.s | 2 - .../actors/ovl_Demo_Gt/func_80981994.s | 2 - .../actors/ovl_Demo_Gt/func_809819D4.s | 2 - .../actors/ovl_Demo_Gt/func_80981A08.s | 10 +- .../actors/ovl_Demo_Gt/func_80981AA0.s | 20 +- .../actors/ovl_Demo_Gt/func_80981C94.s | 2 - .../actors/ovl_Demo_Gt/func_80981CEC.s | 2 - .../actors/ovl_Demo_Gt/func_80981D20.s | 10 +- .../actors/ovl_Demo_Gt/func_80981DC8.s | 2 - .../actors/ovl_Demo_Gt/func_80981E04.s | 2 - .../actors/ovl_Demo_Gt/func_80981E44.s | 2 - .../actors/ovl_Demo_Gt/func_80981E84.s | 20 +- .../actors/ovl_Demo_Gt/func_80982054.s | 2 - .../actors/ovl_Demo_Gt/func_809820AC.s | 2 - .../actors/ovl_Demo_Gt/func_809820E0.s | 10 +- .../actors/ovl_Demo_Gt/func_80982188.s | 2 - .../actors/ovl_Demo_Gt/func_809821C4.s | 2 - .../actors/ovl_Demo_Gt/func_80982204.s | 2 - .../actors/ovl_Demo_Gt/func_80982244.s | 20 +- .../actors/ovl_Demo_Gt/func_8098254C.s | 2 - .../actors/ovl_Demo_Ik/DemoIk_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s | 8 +- .../overlays/actors/ovl_Demo_Ik/DemoIk_Init.s | 1 - .../actors/ovl_Demo_Ik/DemoIk_Update.s | 10 +- .../actors/ovl_Demo_Ik/func_8098330C.s | 2 - .../actors/ovl_Demo_Ik/func_80983354.s | 2 - .../actors/ovl_Demo_Ik/func_80983374.s | 2 - .../actors/ovl_Demo_Ik/func_80983398.s | 2 - .../actors/ovl_Demo_Ik/func_809833D8.s | 2 - .../actors/ovl_Demo_Ik/func_80983418.s | 2 - .../actors/ovl_Demo_Ik/func_80983428.s | 2 - .../actors/ovl_Demo_Ik/func_80983430.s | 2 - .../actors/ovl_Demo_Ik/func_809834D8.s | 2 - .../actors/ovl_Demo_Ik/func_80983500.s | 2 - .../actors/ovl_Demo_Ik/func_809835FC.s | 2 - .../actors/ovl_Demo_Ik/func_809837A0.s | 2 - .../actors/ovl_Demo_Ik/func_80983820.s | 2 - .../actors/ovl_Demo_Ik/func_8098393C.s | 2 - .../actors/ovl_Demo_Ik/func_8098394C.s | 2 - .../actors/ovl_Demo_Ik/func_809839AC.s | 2 - .../actors/ovl_Demo_Ik/func_809839D0.s | 20 +- .../actors/ovl_Demo_Ik/func_80983AA4.s | 2 - .../actors/ovl_Demo_Ik/func_80983AC4.s | 2 - .../actors/ovl_Demo_Ik/func_80983AF4.s | 2 - .../actors/ovl_Demo_Ik/func_80983B58.s | 20 +- .../actors/ovl_Demo_Ik/func_80983C9C.s | 12 +- .../actors/ovl_Demo_Ik/func_80983E28.s | 2 - .../actors/ovl_Demo_Ik/func_80983F30.s | 2 - .../actors/ovl_Demo_Ik/func_80983F8C.s | 2 - .../actors/ovl_Demo_Ik/func_80983FDC.s | 2 - .../actors/ovl_Demo_Ik/func_80983FEC.s | 2 - .../actors/ovl_Demo_Ik/func_8098402C.s | 2 - .../actors/ovl_Demo_Ik/func_80984048.s | 8 +- .../actors/ovl_Demo_Ik/func_80984124.s | 2 - .../actors/ovl_Demo_Ik/func_80984144.s | 2 - .../actors/ovl_Demo_Ik/func_80984164.s | 2 - .../actors/ovl_Demo_Ik/func_8098419C.s | 2 - .../actors/ovl_Demo_Ik/func_809841F4.s | 28 +- .../actors/ovl_Demo_Ik/func_8098441C.s | 12 +- .../actors/ovl_Demo_Ik/func_80984610.s | 2 - .../actors/ovl_Demo_Im/DemoIm_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Im/DemoIm_Draw.s | 7 +- .../overlays/actors/ovl_Demo_Im/DemoIm_Init.s | 12 +- .../actors/ovl_Demo_Im/DemoIm_Update.s | 8 +- .../actors/ovl_Demo_Im/func_80984BE0.s | 2 - .../actors/ovl_Demo_Im/func_80984C68.s | 2 - .../actors/ovl_Demo_Im/func_80984C8C.s | 2 - .../actors/ovl_Demo_Im/func_80984D00.s | 2 - .../actors/ovl_Demo_Im/func_80984D4C.s | 2 - .../actors/ovl_Demo_Im/func_80984D74.s | 2 - .../actors/ovl_Demo_Im/func_80984DB8.s | 2 - .../actors/ovl_Demo_Im/func_80984E58.s | 2 - .../actors/ovl_Demo_Im/func_80984F10.s | 2 - .../actors/ovl_Demo_Im/func_80984F94.s | 2 - .../actors/ovl_Demo_Im/func_80985018.s | 2 - .../actors/ovl_Demo_Im/func_80985060.s | 2 - .../actors/ovl_Demo_Im/func_80985080.s | 2 - .../actors/ovl_Demo_Im/func_809850A0.s | 2 - .../actors/ovl_Demo_Im/func_809850E8.s | 2 - .../actors/ovl_Demo_Im/func_80985134.s | 2 - .../actors/ovl_Demo_Im/func_80985180.s | 2 - .../actors/ovl_Demo_Im/func_80985200.s | 2 - .../actors/ovl_Demo_Im/func_80985280.s | 2 - .../actors/ovl_Demo_Im/func_80985310.s | 7 +- .../actors/ovl_Demo_Im/func_80985358.s | 2 - .../actors/ovl_Demo_Im/func_809853B4.s | 2 - .../actors/ovl_Demo_Im/func_80985430.s | 7 +- .../actors/ovl_Demo_Im/func_8098544C.s | 2 - .../actors/ovl_Demo_Im/func_809854DC.s | 2 - .../actors/ovl_Demo_Im/func_8098557C.s | 2 - .../actors/ovl_Demo_Im/func_809855A8.s | 2 - .../actors/ovl_Demo_Im/func_80985640.s | 2 - .../actors/ovl_Demo_Im/func_809856AC.s | 2 - .../actors/ovl_Demo_Im/func_809856F8.s | 2 - .../actors/ovl_Demo_Im/func_80985718.s | 2 - .../actors/ovl_Demo_Im/func_80985738.s | 2 - .../actors/ovl_Demo_Im/func_80985770.s | 2 - .../actors/ovl_Demo_Im/func_809857B0.s | 2 - .../actors/ovl_Demo_Im/func_809857F0.s | 2 - .../actors/ovl_Demo_Im/func_80985830.s | 2 - .../actors/ovl_Demo_Im/func_80985860.s | 2 - .../actors/ovl_Demo_Im/func_809858A8.s | 2 - .../actors/ovl_Demo_Im/func_809858C8.s | 2 - .../actors/ovl_Demo_Im/func_80985948.s | 2 - .../actors/ovl_Demo_Im/func_809859E0.s | 2 - .../actors/ovl_Demo_Im/func_80985B34.s | 2 - .../actors/ovl_Demo_Im/func_80985C10.s | 2 - .../actors/ovl_Demo_Im/func_80985C40.s | 2 - .../actors/ovl_Demo_Im/func_80985C94.s | 2 - .../actors/ovl_Demo_Im/func_80985CE8.s | 12 +- .../actors/ovl_Demo_Im/func_80985E60.s | 2 - .../actors/ovl_Demo_Im/func_80985EAC.s | 2 - .../actors/ovl_Demo_Im/func_80985EF4.s | 2 - .../actors/ovl_Demo_Im/func_80985F54.s | 2 - .../actors/ovl_Demo_Im/func_80985F64.s | 2 - .../actors/ovl_Demo_Im/func_80985FE8.s | 2 - .../actors/ovl_Demo_Im/func_8098604C.s | 2 - .../actors/ovl_Demo_Im/func_809860C8.s | 2 - .../actors/ovl_Demo_Im/func_809860DC.s | 2 - .../actors/ovl_Demo_Im/func_80986148.s | 2 - .../actors/ovl_Demo_Im/func_809861C4.s | 8 +- .../actors/ovl_Demo_Im/func_8098629C.s | 2 - .../actors/ovl_Demo_Im/func_809862E0.s | 20 +- .../actors/ovl_Demo_Im/func_809863BC.s | 2 - .../actors/ovl_Demo_Im/func_809863DC.s | 2 - .../actors/ovl_Demo_Im/func_80986430.s | 2 - .../actors/ovl_Demo_Im/func_80986494.s | 2 - .../actors/ovl_Demo_Im/func_809864D4.s | 2 - .../actors/ovl_Demo_Im/func_8098652C.s | 2 - .../actors/ovl_Demo_Im/func_80986570.s | 2 - .../actors/ovl_Demo_Im/func_809865F8.s | 2 - .../actors/ovl_Demo_Im/func_80986700.s | 2 - .../actors/ovl_Demo_Im/func_80986710.s | 2 - .../actors/ovl_Demo_Im/func_80986794.s | 2 - .../actors/ovl_Demo_Im/func_8098680C.s | 8 +- .../actors/ovl_Demo_Im/func_809868E8.s | 2 - .../actors/ovl_Demo_Im/func_80986908.s | 2 - .../actors/ovl_Demo_Im/func_80986948.s | 2 - .../actors/ovl_Demo_Im/func_809869B0.s | 2 - .../actors/ovl_Demo_Im/func_809869F8.s | 2 - .../actors/ovl_Demo_Im/func_80986A5C.s | 2 - .../actors/ovl_Demo_Im/func_80986AD0.s | 2 - .../actors/ovl_Demo_Im/func_80986B2C.s | 2 - .../actors/ovl_Demo_Im/func_80986BA0.s | 2 - .../actors/ovl_Demo_Im/func_80986BE4.s | 2 - .../actors/ovl_Demo_Im/func_80986BF8.s | 2 - .../actors/ovl_Demo_Im/func_80986C30.s | 2 - .../actors/ovl_Demo_Im/func_80986CC8.s | 2 - .../actors/ovl_Demo_Im/func_80986CFC.s | 2 - .../actors/ovl_Demo_Im/func_80986D40.s | 2 - .../actors/ovl_Demo_Im/func_80986DC8.s | 2 - .../actors/ovl_Demo_Im/func_80986E20.s | 2 - .../actors/ovl_Demo_Im/func_80986E40.s | 2 - .../actors/ovl_Demo_Im/func_80986EAC.s | 2 - .../actors/ovl_Demo_Im/func_80986F08.s | 2 - .../actors/ovl_Demo_Im/func_80986F28.s | 2 - .../actors/ovl_Demo_Im/func_80986F88.s | 2 - .../actors/ovl_Demo_Im/func_80986FA8.s | 2 - .../actors/ovl_Demo_Im/func_80987018.s | 2 - .../actors/ovl_Demo_Im/func_80987064.s | 2 - .../actors/ovl_Demo_Im/func_809870F0.s | 2 - .../actors/ovl_Demo_Im/func_80987128.s | 2 - .../actors/ovl_Demo_Im/func_80987174.s | 2 - .../actors/ovl_Demo_Im/func_809871B4.s | 2 - .../actors/ovl_Demo_Im/func_809871E8.s | 8 +- .../actors/ovl_Demo_Im/func_80987288.s | 2 - .../actors/ovl_Demo_Im/func_809872A8.s | 2 - .../actors/ovl_Demo_Im/func_809872F0.s | 2 - .../actors/ovl_Demo_Im/func_80987330.s | 2 - .../actors/ovl_Demo_Im/func_80987514.s | 2 - .../actors/ovl_Demo_Im/func_809875C0.s | 2 - .../actors/ovl_Demo_Im/func_8098764C.s | 2 - .../actors/ovl_Demo_Im/func_80987658.s | 12 +- .../ovl_Demo_Kankyo/DemoKankyo_Destroy.s | 2 - .../actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s | 24 +- .../actors/ovl_Demo_Kankyo/DemoKankyo_Init.s | 39 +- .../ovl_Demo_Kankyo/DemoKankyo_Update.s | 2 - .../actors/ovl_Demo_Kankyo/func_80988E80.s | 2 - .../actors/ovl_Demo_Kankyo/func_809892A4.s | 24 +- .../actors/ovl_Demo_Kankyo/func_809896DC.s | 2 - .../actors/ovl_Demo_Kankyo/func_809896E8.s | 2 - .../actors/ovl_Demo_Kankyo/func_80989710.s | 2 - .../actors/ovl_Demo_Kankyo/func_80989800.s | 2 - .../actors/ovl_Demo_Kankyo/func_8098987C.s | 2 - .../actors/ovl_Demo_Kankyo/func_809898C8.s | 2 - .../actors/ovl_Demo_Kankyo/func_80989960.s | 2 - .../actors/ovl_Demo_Kankyo/func_80989B54.s | 2 - .../actors/ovl_Demo_Kankyo/func_80989D24.s | 26 +- .../actors/ovl_Demo_Kankyo/func_8098A36C.s | 24 +- .../actors/ovl_Demo_Kankyo/func_8098A4F0.s | 16 +- .../actors/ovl_Demo_Kankyo/func_8098A854.s | 20 +- .../actors/ovl_Demo_Kankyo/func_8098A9A4.s | 16 +- .../actors/ovl_Demo_Kankyo/func_8098AAC8.s | 2 - .../actors/ovl_Demo_Kankyo/func_8098AAE4.s | 2 - .../actors/ovl_Demo_Kankyo/func_8098AB68.s | 2 - .../actors/ovl_Demo_Kankyo/func_8098ABC0.s | 28 +- .../actors/ovl_Demo_Kankyo/func_8098B354.s | 25 +- .../ovl_Demo_Kekkai/DemoKekkai_Destroy.s | 2 - .../actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s | 15 +- .../actors/ovl_Demo_Kekkai/DemoKekkai_Init.s | 17 +- .../ovl_Demo_Kekkai/DemoKekkai_Update.s | 7 +- .../actors/ovl_Demo_Kekkai/func_8098CFD0.s | 2 - .../actors/ovl_Demo_Kekkai/func_8098D280.s | 7 +- .../actors/ovl_Demo_Kekkai/func_8098D4D4.s | 10 +- .../actors/ovl_Demo_Kekkai/func_8098D71C.s | 10 +- .../actors/ovl_Demo_Kekkai/func_8098D87C.s | 16 +- .../actors/ovl_Demo_Kekkai/func_8098D9C0.s | 20 +- .../actors/ovl_Demo_Sa/DemoSa_Destroy.s | 2 - .../overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s | 7 +- .../overlays/actors/ovl_Demo_Sa/DemoSa_Init.s | 2 - .../actors/ovl_Demo_Sa/DemoSa_Update.s | 8 +- .../actors/ovl_Demo_Sa/func_8098E480.s | 2 - .../actors/ovl_Demo_Sa/func_8098E508.s | 2 - .../actors/ovl_Demo_Sa/func_8098E51C.s | 2 - .../actors/ovl_Demo_Sa/func_8098E530.s | 2 - .../actors/ovl_Demo_Sa/func_8098E554.s | 2 - .../actors/ovl_Demo_Sa/func_8098E5C8.s | 2 - .../actors/ovl_Demo_Sa/func_8098E610.s | 2 - .../actors/ovl_Demo_Sa/func_8098E630.s | 2 - .../actors/ovl_Demo_Sa/func_8098E654.s | 2 - .../actors/ovl_Demo_Sa/func_8098E6A0.s | 2 - .../actors/ovl_Demo_Sa/func_8098E6EC.s | 2 - .../actors/ovl_Demo_Sa/func_8098E76C.s | 2 - .../actors/ovl_Demo_Sa/func_8098E7FC.s | 7 +- .../actors/ovl_Demo_Sa/func_8098E86C.s | 2 - .../actors/ovl_Demo_Sa/func_8098E8C8.s | 2 - .../actors/ovl_Demo_Sa/func_8098E944.s | 7 +- .../actors/ovl_Demo_Sa/func_8098E960.s | 2 - .../actors/ovl_Demo_Sa/func_8098E9EC.s | 2 - .../actors/ovl_Demo_Sa/func_8098EA3C.s | 2 - .../actors/ovl_Demo_Sa/func_8098EA68.s | 2 - .../actors/ovl_Demo_Sa/func_8098EB00.s | 2 - .../actors/ovl_Demo_Sa/func_8098EB6C.s | 2 - .../actors/ovl_Demo_Sa/func_8098EBB8.s | 2 - .../actors/ovl_Demo_Sa/func_8098EBD8.s | 2 - .../actors/ovl_Demo_Sa/func_8098EBF8.s | 2 - .../actors/ovl_Demo_Sa/func_8098EC28.s | 2 - .../actors/ovl_Demo_Sa/func_8098EC60.s | 2 - .../actors/ovl_Demo_Sa/func_8098EC94.s | 2 - .../actors/ovl_Demo_Sa/func_8098ECCC.s | 2 - .../actors/ovl_Demo_Sa/func_8098ECF4.s | 2 - .../actors/ovl_Demo_Sa/func_8098EDB0.s | 2 - .../actors/ovl_Demo_Sa/func_8098EE08.s | 2 - .../actors/ovl_Demo_Sa/func_8098EE28.s | 2 - .../actors/ovl_Demo_Sa/func_8098EEA8.s | 2 - .../actors/ovl_Demo_Sa/func_8098EEFC.s | 2 - .../actors/ovl_Demo_Sa/func_8098F050.s | 2 - .../actors/ovl_Demo_Sa/func_8098F0E8.s | 2 - .../actors/ovl_Demo_Sa/func_8098F118.s | 2 - .../actors/ovl_Demo_Sa/func_8098F16C.s | 2 - .../actors/ovl_Demo_Sa/func_8098F1C0.s | 12 +- .../actors/ovl_Demo_Sa/func_8098F390.s | 2 - .../actors/ovl_Demo_Sa/func_8098F3F0.s | 2 - .../actors/ovl_Demo_Sa/func_8098F420.s | 2 - .../actors/ovl_Demo_Sa/func_8098F480.s | 2 - .../actors/ovl_Demo_Sa/func_8098F50C.s | 2 - .../actors/ovl_Demo_Sa/func_8098F544.s | 2 - .../actors/ovl_Demo_Sa/func_8098F590.s | 2 - .../actors/ovl_Demo_Sa/func_8098F5D0.s | 2 - .../actors/ovl_Demo_Sa/func_8098F610.s | 2 - .../actors/ovl_Demo_Sa/func_8098F654.s | 8 +- .../actors/ovl_Demo_Sa/func_8098F714.s | 2 - .../actors/ovl_Demo_Sa/func_8098F734.s | 2 - .../actors/ovl_Demo_Sa/func_8098F77C.s | 2 - .../actors/ovl_Demo_Sa/func_8098F7BC.s | 2 - .../actors/ovl_Demo_Sa/func_8098F7FC.s | 2 - .../actors/ovl_Demo_Sa/func_8098F83C.s | 2 - .../actors/ovl_Demo_Sa/func_8098F8F8.s | 2 - .../actors/ovl_Demo_Sa/func_8098F984.s | 2 - .../actors/ovl_Demo_Sa/func_8098F998.s | 2 - .../actors/ovl_Demo_Sa/func_8098FA2C.s | 2 - .../actors/ovl_Demo_Sa/func_8098FA84.s | 2 - .../actors/ovl_Demo_Sa/func_8098FAE0.s | 2 - .../actors/ovl_Demo_Sa/func_8098FB34.s | 2 - .../actors/ovl_Demo_Sa/func_8098FB68.s | 8 +- .../actors/ovl_Demo_Sa/func_8098FC44.s | 2 - .../actors/ovl_Demo_Sa/func_8098FC64.s | 2 - .../actors/ovl_Demo_Sa/func_8098FC9C.s | 2 - .../actors/ovl_Demo_Sa/func_8098FCD4.s | 2 - .../actors/ovl_Demo_Sa/func_8098FD0C.s | 2 - .../actors/ovl_Demo_Sa/func_8098FE74.s | 2 - .../actors/ovl_Demo_Sa/func_8098FEA8.s | 2 - .../actors/ovl_Demo_Sa/func_8098FEB4.s | 12 +- .../actors/ovl_Demo_Shd/DemoShd_Destroy.s | 2 - .../actors/ovl_Demo_Shd/DemoShd_Draw.s | 15 +- .../actors/ovl_Demo_Shd/DemoShd_Init.s | 4 +- ...{func_80991230.s => DemoShd_SetupAction.s} | 4 +- .../actors/ovl_Demo_Shd/DemoShd_Update.s | 2 - .../actors/ovl_Demo_Shd/func_80991298.s | 2 - .../ovl_Demo_Tre_Lgt/DemoTreLgt_Destroy.s | 2 - .../actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s | 1 - .../actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Init.s | 2 - .../ovl_Demo_Tre_Lgt/DemoTreLgt_Update.s | 2 - .../actors/ovl_Demo_Tre_Lgt/func_80993754.s | 2 - .../actors/ovl_Demo_Tre_Lgt/func_8099375C.s | 2 - .../actors/ovl_Demo_Tre_Lgt/func_809937B4.s | 2 - .../actors/ovl_Demo_Tre_Lgt/func_80993848.s | 2 - .../actors/ovl_Demo_Tre_Lgt/func_80993B2C.s | 2 - .../ovl_Door_Gerudo/DoorGerudo_Destroy.s | 2 - .../actors/ovl_Door_Gerudo/DoorGerudo_Draw.s | 19 +- .../actors/ovl_Door_Gerudo/DoorGerudo_Init.s | 2 - .../ovl_Door_Gerudo/DoorGerudo_Update.s | 2 - .../actors/ovl_Door_Gerudo/func_809946BC.s | 7 +- .../actors/ovl_Door_Gerudo/func_80994750.s | 2 - .../actors/ovl_Door_Gerudo/func_8099485C.s | 2 - .../actors/ovl_Door_Gerudo/func_8099496C.s | 2 - .../actors/ovl_Door_Gerudo/func_809949C8.s | 2 - .../ovl_Door_Killer/DoorKiller_Destroy.s | 2 - .../actors/ovl_Door_Killer/DoorKiller_Init.s | 22 +- .../ovl_Door_Killer/DoorKiller_Update.s | 2 - .../actors/ovl_Door_Killer/func_80995020.s | 17 +- .../actors/ovl_Door_Killer/func_809951C4.s | 7 +- .../actors/ovl_Door_Killer/func_80995284.s | 2 - .../actors/ovl_Door_Killer/func_809952B8.s | 2 - .../actors/ovl_Door_Killer/func_80995318.s | 2 - .../actors/ovl_Door_Killer/func_80995368.s | 2 - .../actors/ovl_Door_Killer/func_80995518.s | 10 +- .../actors/ovl_Door_Killer/func_809958E4.s | 2 - .../actors/ovl_Door_Killer/func_80995A50.s | 2 - .../actors/ovl_Door_Killer/func_80995A84.s | 2 - .../actors/ovl_Door_Killer/func_80995CDC.s | 2 - .../actors/ovl_Door_Killer/func_80995D6C.s | 12 +- .../actors/ovl_Door_Killer/func_80995E40.s | 12 +- .../actors/ovl_Door_Killer/func_80995EC4.s | 2 - .../actors/ovl_Door_Killer/func_80995F1C.s | 1 - .../ovl_Door_Shutter/DoorShutter_Destroy.s | 2 - .../ovl_Door_Shutter/DoorShutter_Draw.s | 40 +- .../ovl_Door_Shutter/DoorShutter_Init.s | 2 - .../ovl_Door_Shutter/DoorShutter_Update.s | 2 - .../actors/ovl_Door_Shutter/func_809962A0.s | 2 - .../actors/ovl_Door_Shutter/func_809962AC.s | 2 - .../actors/ovl_Door_Shutter/func_8099670C.s | 2 - .../actors/ovl_Door_Shutter/func_80996840.s | 7 +- .../actors/ovl_Door_Shutter/func_809968D4.s | 2 - .../actors/ovl_Door_Shutter/func_80996A54.s | 2 - .../actors/ovl_Door_Shutter/func_80996B00.s | 2 - .../actors/ovl_Door_Shutter/func_80996B0C.s | 2 - .../actors/ovl_Door_Shutter/func_80996C60.s | 2 - .../actors/ovl_Door_Shutter/func_80996D14.s | 2 - .../actors/ovl_Door_Shutter/func_80996E08.s | 2 - .../actors/ovl_Door_Shutter/func_80996EE8.s | 2 - .../actors/ovl_Door_Shutter/func_80996F98.s | 2 - .../actors/ovl_Door_Shutter/func_80997004.s | 2 - .../actors/ovl_Door_Shutter/func_80997150.s | 2 - .../actors/ovl_Door_Shutter/func_80997220.s | 2 - .../actors/ovl_Door_Shutter/func_809973E8.s | 2 - .../actors/ovl_Door_Shutter/func_80997528.s | 2 - .../actors/ovl_Door_Shutter/func_80997568.s | 2 - .../actors/ovl_Door_Shutter/func_809975C0.s | 2 - .../actors/ovl_Door_Shutter/func_809976B8.s | 2 - .../actors/ovl_Door_Shutter/func_80997744.s | 12 +- .../actors/ovl_Door_Shutter/func_80997838.s | 19 +- .../actors/ovl_Door_Shutter/func_80997A34.s | 2 - .../actors/ovl_Door_Shutter/func_8099803C.s | 1 - .../actors/ovl_Door_Warp1/DoorWarp1_Destroy.s | 2 - .../actors/ovl_Door_Warp1/DoorWarp1_Draw.s | 1 - .../actors/ovl_Door_Warp1/DoorWarp1_Init.s | 2 - .../actors/ovl_Door_Warp1/DoorWarp1_Update.s | 2 - .../actors/ovl_Door_Warp1/func_80998780.s | 2 - .../actors/ovl_Door_Warp1/func_8099898C.s | 2 - .../actors/ovl_Door_Warp1/func_80998C90.s | 2 - .../actors/ovl_Door_Warp1/func_80998E5C.s | 2 - .../actors/ovl_Door_Warp1/func_80998FF4.s | 2 - .../actors/ovl_Door_Warp1/func_80999194.s | 2 - .../actors/ovl_Door_Warp1/func_809991C8.s | 2 - .../actors/ovl_Door_Warp1/func_80999214.s | 2 - .../actors/ovl_Door_Warp1/func_80999348.s | 2 - .../actors/ovl_Door_Warp1/func_80999410.s | 2 - .../actors/ovl_Door_Warp1/func_80999428.s | 2 - .../actors/ovl_Door_Warp1/func_80999508.s | 2 - .../actors/ovl_Door_Warp1/func_80999580.s | 2 - .../actors/ovl_Door_Warp1/func_809995D4.s | 2 - .../actors/ovl_Door_Warp1/func_80999724.s | 2 - .../actors/ovl_Door_Warp1/func_809998A4.s | 2 - .../actors/ovl_Door_Warp1/func_80999938.s | 2 - .../actors/ovl_Door_Warp1/func_809999A0.s | 2 - .../actors/ovl_Door_Warp1/func_80999A68.s | 2 - .../actors/ovl_Door_Warp1/func_80999E64.s | 2 - .../actors/ovl_Door_Warp1/func_80999EE0.s | 2 - .../actors/ovl_Door_Warp1/func_80999FE4.s | 2 - .../actors/ovl_Door_Warp1/func_8099A098.s | 2 - .../actors/ovl_Door_Warp1/func_8099A3A4.s | 2 - .../actors/ovl_Door_Warp1/func_8099A46C.s | 2 - .../actors/ovl_Door_Warp1/func_8099A508.s | 2 - .../actors/ovl_Door_Warp1/func_8099A5EC.s | 2 - .../actors/ovl_Door_Warp1/func_8099AEE4.s | 2 - .../actors/ovl_Door_Warp1/func_8099B014.s | 2 - .../actors/ovl_Door_Warp1/func_8099B020.s | 2 - .../actors/ovl_Door_Warp1/func_8099B140.s | 2 - .../actors/ovl_Door_Warp1/func_8099B33C.s | 2 - .../actors/ovl_Door_Warp1/func_8099B5EC.s | 2 - .../actors/ovl_Efc_Erupc/EfcErupc_Destroy.s | 2 - .../actors/ovl_Efc_Erupc/EfcErupc_Draw.s | 27 +- .../actors/ovl_Efc_Erupc/EfcErupc_Init.s | 2 - .../actors/ovl_Efc_Erupc/EfcErupc_Update.s | 2 - .../actors/ovl_Efc_Erupc/func_8099CCB0.s | 2 - .../actors/ovl_Efc_Erupc/func_8099CD2C.s | 7 +- .../actors/ovl_Efc_Erupc/func_8099D334.s | 16 +- .../actors/ovl_Efc_Erupc/func_8099D52C.s | 2 - .../actors/ovl_Efc_Erupc/func_8099D650.s | 2 - .../actors/ovl_Efc_Erupc/func_8099D71C.s | 1 - .../actors/ovl_Eff_Dust/EffDust_Destroy.s | 2 - .../actors/ovl_Eff_Dust/EffDust_Draw.s | 1 - .../actors/ovl_Eff_Dust/EffDust_Init.s | 24 +- .../actors/ovl_Eff_Dust/EffDust_Update.s | 2 - .../actors/ovl_Eff_Dust/func_8099D8D0.s | 2 - .../actors/ovl_Eff_Dust/func_8099D8D8.s | 2 - .../actors/ovl_Eff_Dust/func_8099D8E0.s | 2 - .../actors/ovl_Eff_Dust/func_8099DB28.s | 7 +- .../actors/ovl_Eff_Dust/func_8099DD74.s | 7 +- .../actors/ovl_Eff_Dust/func_8099DFC0.s | 26 +- .../actors/ovl_Eff_Dust/func_8099E4F4.s | 16 +- .../actors/ovl_Eff_Dust/func_8099E784.s | 20 +- .../actors/ovl_Elf_Msg/ElfMsg_Destroy.s | 2 - .../overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s | 15 +- .../overlays/actors/ovl_Elf_Msg/ElfMsg_Init.s | 29 +- .../actors/ovl_Elf_Msg/ElfMsg_Update.s | 2 - .../actors/ovl_Elf_Msg/func_809ACB20.s | 2 - .../actors/ovl_Elf_Msg/func_809ACB28.s | 28 +- .../actors/ovl_Elf_Msg/func_809ACDCC.s | 2 - .../actors/ovl_Elf_Msg/func_809ACDF8.s | 2 - .../actors/ovl_Elf_Msg/func_809ACEC8.s | 2 - .../actors/ovl_Elf_Msg/func_809ACF18.s | 2 - .../actors/ovl_Elf_Msg2/ElfMsg2_Destroy.s | 2 - .../actors/ovl_Elf_Msg2/ElfMsg2_Draw.s | 15 +- .../actors/ovl_Elf_Msg2/ElfMsg2_Init.s | 8 +- .../actors/ovl_Elf_Msg2/ElfMsg2_Update.s | 2 - .../actors/ovl_Elf_Msg2/func_809AD700.s | 2 - .../actors/ovl_Elf_Msg2/func_809AD708.s | 40 +- .../actors/ovl_Elf_Msg2/func_809AD968.s | 2 - .../actors/ovl_Elf_Msg2/func_809AD978.s | 2 - .../actors/ovl_Elf_Msg2/func_809AD9F4.s | 2 - .../actors/ovl_Elf_Msg2/func_809ADA28.s | 2 - .../overlays/actors/ovl_En_Am/EnAm_Destroy.s | 2 - .../overlays/actors/ovl_En_Am/EnAm_Draw.s | 15 +- .../overlays/actors/ovl_En_Am/EnAm_Init.s | 2 - .../overlays/actors/ovl_En_Am/EnAm_Update.s | 7 +- .../overlays/actors/ovl_En_Am/func_809ADF20.s | 2 - .../overlays/actors/ovl_En_Am/func_809ADF28.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE270.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE40C.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE4A8.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE538.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE59C.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE608.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE664.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE6C0.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE71C.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE7F4.s | 2 - .../overlays/actors/ovl_En_Am/func_809AE8A8.s | 2 - .../overlays/actors/ovl_En_Am/func_809AEB14.s | 2 - .../overlays/actors/ovl_En_Am/func_809AEC1C.s | 2 - .../overlays/actors/ovl_En_Am/func_809AED8C.s | 2 - .../overlays/actors/ovl_En_Am/func_809AEF00.s | 2 - .../overlays/actors/ovl_En_Am/func_809AEFA4.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF0DC.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF30C.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF558.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF644.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF718.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF7CC.s | 2 - .../overlays/actors/ovl_En_Am/func_809AF864.s | 2 - .../overlays/actors/ovl_En_Am/func_809AFD9C.s | 2 - .../actors/ovl_En_Anubice/EnAnubice_Destroy.s | 2 - .../actors/ovl_En_Anubice/EnAnubice_Draw.s | 1 - .../actors/ovl_En_Anubice/EnAnubice_Init.s | 16 +- .../actors/ovl_En_Anubice/EnAnubice_Update.s | 7 +- .../actors/ovl_En_Anubice/func_809B1120.s | 7 +- .../actors/ovl_En_Anubice/func_809B11C0.s | 9 +- .../actors/ovl_En_Anubice/func_809B142C.s | 12 +- .../actors/ovl_En_Anubice/func_809B1524.s | 2 - .../actors/ovl_En_Anubice/func_809B15CC.s | 2 - .../actors/ovl_En_Anubice/func_809B16AC.s | 9 +- .../actors/ovl_En_Anubice/func_809B17FC.s | 2 - .../actors/ovl_En_Anubice/func_809B1884.s | 2 - .../actors/ovl_En_Anubice/func_809B1984.s | 2 - .../actors/ovl_En_Anubice/func_809B1A54.s | 13 +- .../actors/ovl_En_Anubice/func_809B2104.s | 2 - .../actors/ovl_En_Anubice/func_809B2150.s | 16 +- .../EnAnubiceFire_Destroy.s | 2 - .../ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s | 21 +- .../ovl_En_Anubice_Fire/EnAnubiceFire_Init.s | 2 - .../EnAnubiceFire_Update.s | 7 +- .../ovl_En_Anubice_Fire/func_809B26EC.s | 9 +- .../ovl_En_Anubice_Fire/func_809B27D8.s | 9 +- .../ovl_En_Anubice_Fire/func_809B2B48.s | 2 - .../actors/ovl_En_Arrow/EnArrow_Destroy.s | 2 - .../actors/ovl_En_Arrow/EnArrow_Draw.s | 21 +- .../actors/ovl_En_Arrow/EnArrow_Init.s | 12 +- .../actors/ovl_En_Arrow/EnArrow_Update.s | 2 - .../actors/ovl_En_Arrow/func_809B3920.s | 2 - .../actors/ovl_En_Arrow/func_809B3BD4.s | 16 +- .../actors/ovl_En_Arrow/func_809B3CEC.s | 11 +- .../actors/ovl_En_Arrow/func_809B3DD8.s | 2 - .../actors/ovl_En_Arrow/func_809B3FDC.s | 9 +- .../actors/ovl_En_Arrow/func_809B45E0.s | 2 - .../actors/ovl_En_Arrow/func_809B4640.s | 2 - .../actors/ovl_En_Arrow/func_809B4800.s | 2 - .../ovl_En_Attack_Niw/EnAttackNiw_Destroy.s | 2 - .../ovl_En_Attack_Niw/EnAttackNiw_Draw.s | 1 - .../ovl_En_Attack_Niw/EnAttackNiw_Init.s | 7 +- .../ovl_En_Attack_Niw/EnAttackNiw_Update.s | 7 +- .../actors/ovl_En_Attack_Niw/func_809B5268.s | 34 +- .../actors/ovl_En_Attack_Niw/func_809B55EC.s | 2 - .../actors/ovl_En_Attack_Niw/func_809B5670.s | 15 +- .../actors/ovl_En_Attack_Niw/func_809B59B0.s | 9 +- .../actors/ovl_En_Attack_Niw/func_809B5C18.s | 2 - .../actors/ovl_En_Attack_Niw/func_809B5F98.s | 2 - .../overlays/actors/ovl_En_Ba/EnBa_Destroy.s | 2 - .../overlays/actors/ovl_En_Ba/EnBa_Draw.s | 23 +- .../overlays/actors/ovl_En_Ba/EnBa_Init.s | 2 - .../overlays/actors/ovl_En_Ba/EnBa_Update.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B6350.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B6568.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B65A8.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B69D4.s | 7 +- .../overlays/actors/ovl_En_Ba/func_809B6A44.s | 9 +- .../overlays/actors/ovl_En_Ba/func_809B6B04.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B6B58.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B7174.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B71F0.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B75A0.s | 2 - .../overlays/actors/ovl_En_Ba/func_809B781C.s | 2 - .../overlays/actors/ovl_En_Bb/EnBb_Destroy.s | 2 - .../overlays/actors/ovl_En_Bb/EnBb_Draw.s | 23 +- .../overlays/actors/ovl_En_Bb/EnBb_Init.s | 11 +- .../overlays/actors/ovl_En_Bb/EnBb_Update.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B82E0.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B82E8.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B837C.s | 11 +- .../overlays/actors/ovl_En_Bb/func_809B8518.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B8930.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B8984.s | 9 +- .../overlays/actors/ovl_En_Bb/func_809B8B00.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B8B94.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B8D10.s | 7 +- .../overlays/actors/ovl_En_Bb/func_809B8DCC.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B8E34.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B8EF4.s | 11 +- .../overlays/actors/ovl_En_Bb/func_809B96EC.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B977C.s | 7 +- .../overlays/actors/ovl_En_Bb/func_809B9A54.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B9B64.s | 9 +- .../overlays/actors/ovl_En_Bb/func_809B9F28.s | 2 - .../overlays/actors/ovl_En_Bb/func_809B9F60.s | 2 - .../overlays/actors/ovl_En_Bb/func_809BA028.s | 2 - .../overlays/actors/ovl_En_Bb/func_809BA0D8.s | 11 +- .../overlays/actors/ovl_En_Bb/func_809BA458.s | 2 - .../overlays/actors/ovl_En_Bb/func_809BA590.s | 2 - .../overlays/actors/ovl_En_Bb/func_809BA628.s | 17 +- .../overlays/actors/ovl_En_Bb/func_809BAC90.s | 7 +- .../overlays/actors/ovl_En_Bb/func_809BADA4.s | 7 +- .../overlays/actors/ovl_En_Bb/func_809BAF44.s | 17 +- .../overlays/actors/ovl_En_Bb/func_809BB4F4.s | 2 - .../actors/ovl_En_Bdfire/EnBdfire_Destroy.s | 2 - .../actors/ovl_En_Bdfire/EnBdfire_Draw.s | 1 - .../actors/ovl_En_Bdfire/EnBdfire_Init.s | 17 +- .../actors/ovl_En_Bdfire/EnBdfire_Update.s | 2 - .../actors/ovl_En_Bdfire/func_809BC030.s | 2 - .../actors/ovl_En_Bdfire/func_809BC038.s | 2 - .../actors/ovl_En_Bdfire/func_809BC2A4.s | 2 - .../actors/ovl_En_Bdfire/func_809BC598.s | 18 +- .../actors/ovl_En_Bdfire/func_809BC8C8.s | 16 +- .../ovl_En_Bigokuta/EnBigokuta_Destroy.s | 2 - .../actors/ovl_En_Bigokuta/EnBigokuta_Draw.s | 26 +- .../actors/ovl_En_Bigokuta/EnBigokuta_Init.s | 7 +- .../ovl_En_Bigokuta/EnBigokuta_Update.s | 2 - .../actors/ovl_En_Bigokuta/func_809BCE3C.s | 9 +- .../actors/ovl_En_Bigokuta/func_809BCEBC.s | 2 - .../actors/ovl_En_Bigokuta/func_809BCF68.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD1C8.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD2E4.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD318.s | 7 +- .../actors/ovl_En_Bigokuta/func_809BD370.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD3AC.s | 7 +- .../actors/ovl_En_Bigokuta/func_809BD3E0.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD3F8.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD47C.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD4A4.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD524.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD5E0.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD658.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD6B8.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD768.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD7F0.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD84C.s | 2 - .../actors/ovl_En_Bigokuta/func_809BD8DC.s | 13 +- .../actors/ovl_En_Bigokuta/func_809BDAE8.s | 2 - .../actors/ovl_En_Bigokuta/func_809BDB90.s | 2 - .../actors/ovl_En_Bigokuta/func_809BDC08.s | 14 +- .../actors/ovl_En_Bigokuta/func_809BDF34.s | 7 +- .../actors/ovl_En_Bigokuta/func_809BDFC8.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE058.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE180.s | 7 +- .../actors/ovl_En_Bigokuta/func_809BE26C.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE3E4.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE4A4.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE518.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE568.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE798.s | 2 - .../actors/ovl_En_Bigokuta/func_809BE8DC.s | 2 - .../actors/ovl_En_Bigokuta/func_809BEBBC.s | 37 +- .../actors/ovl_En_Bili/EnBili_Destroy.s | 2 - .../overlays/actors/ovl_En_Bili/EnBili_Draw.s | 11 +- .../overlays/actors/ovl_En_Bili/EnBili_Init.s | 2 - .../actors/ovl_En_Bili/EnBili_Update.s | 2 - .../actors/ovl_En_Bili/func_809BF9BC.s | 7 +- .../actors/ovl_En_Bili/func_809BFA14.s | 7 +- .../actors/ovl_En_Bili/func_809BFA8C.s | 2 - .../actors/ovl_En_Bili/func_809BFAE8.s | 2 - .../actors/ovl_En_Bili/func_809BFB40.s | 7 +- .../actors/ovl_En_Bili/func_809BFB5C.s | 7 +- .../actors/ovl_En_Bili/func_809BFBC4.s | 2 - .../actors/ovl_En_Bili/func_809BFC48.s | 2 - .../actors/ovl_En_Bili/func_809BFCE8.s | 2 - .../actors/ovl_En_Bili/func_809BFD18.s | 2 - .../actors/ovl_En_Bili/func_809BFD94.s | 10 +- .../actors/ovl_En_Bili/func_809BFF6C.s | 2 - .../actors/ovl_En_Bili/func_809C008C.s | 7 +- .../actors/ovl_En_Bili/func_809C0174.s | 7 +- .../actors/ovl_En_Bili/func_809C0260.s | 2 - .../actors/ovl_En_Bili/func_809C02B8.s | 2 - .../actors/ovl_En_Bili/func_809C04B4.s | 2 - .../actors/ovl_En_Bili/func_809C0570.s | 2 - .../actors/ovl_En_Bili/func_809C0600.s | 2 - .../actors/ovl_En_Bili/func_809C067C.s | 2 - .../actors/ovl_En_Bili/func_809C06E0.s | 2 - .../actors/ovl_En_Bili/func_809C0754.s | 7 +- .../actors/ovl_En_Bili/func_809C0980.s | 2 - .../actors/ovl_En_Bili/func_809C09E0.s | 2 - .../actors/ovl_En_Bili/func_809C0A70.s | 2 - .../actors/ovl_En_Bili/func_809C0E08.s | 46 +- .../actors/ovl_En_Bili/func_809C1020.s | 37 +- .../actors/ovl_En_Bili/func_809C1240.s | 30 +- .../actors/ovl_En_Bili/func_809C13A8.s | 2 - .../actors/ovl_En_Blkobj/EnBlkobj_Destroy.s | 2 - .../actors/ovl_En_Blkobj/EnBlkobj_Draw.s | 15 +- .../actors/ovl_En_Blkobj/EnBlkobj_Init.s | 2 - .../actors/ovl_En_Blkobj/EnBlkobj_Update.s | 2 - .../actors/ovl_En_Blkobj/func_809C2060.s | 2 - .../actors/ovl_En_Blkobj/func_809C2148.s | 2 - .../actors/ovl_En_Blkobj/func_809C21A0.s | 2 - .../actors/ovl_En_Blkobj/func_809C2218.s | 2 - .../actors/ovl_En_Blkobj/func_809C22F4.s | 2 - .../actors/ovl_En_Blkobj/func_809C2324.s | 12 +- .../actors/ovl_En_Bom/EnBom_Destroy.s | 2 - .../overlays/actors/ovl_En_Bom/EnBom_Draw.s | 19 +- .../overlays/actors/ovl_En_Bom/EnBom_Init.s | 2 - .../overlays/actors/ovl_En_Bom/EnBom_Update.s | 19 +- .../actors/ovl_En_Bom/func_809C26D0.s | 2 - .../actors/ovl_En_Bom/func_809C282C.s | 10 +- .../actors/ovl_En_Bom/func_809C29F4.s | 2 - .../actors/ovl_En_Bom/func_809C2A38.s | 2 - .../EnBomBowlMan_Destroy.s | 2 - .../ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s | 11 +- .../ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s | 16 +- .../ovl_En_Bom_Bowl_Man/EnBomBowlMan_Update.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3820.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C38A8.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C395C.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C39D0.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3A54.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3B50.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3C7C.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3CD4.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3D40.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C3DC4.s | 32 +- .../ovl_En_Bom_Bowl_Man/func_809C4040.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C41FC.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C4318.s | 2 - .../ovl_En_Bom_Bowl_Man/func_809C441C.s | 12 +- .../ovl_En_Bom_Bowl_Man/func_809C4664.s | 8 +- .../ovl_En_Bom_Bowl_Man/func_809C48A8.s | 2 - .../EnBomBowlPit_Destroy.s | 2 - .../ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Init.s | 2 - .../ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Update.s | 1 - .../ovl_En_Bom_Bowl_Pit/func_809C4E60.s | 2 - .../ovl_En_Bom_Bowl_Pit/func_809C4E8C.s | 13 +- .../ovl_En_Bom_Bowl_Pit/func_809C5184.s | 2 - .../ovl_En_Bom_Bowl_Pit/func_809C5360.s | 2 - .../ovl_En_Bom_Bowl_Pit/func_809C53F0.s | 2 - .../ovl_En_Bom_Bowl_Pit/func_809C54A8.s | 2 - .../ovl_En_Bom_Bowl_Pit/func_809C55B0.s | 2 - .../ovl_En_Bom_Bowl_Pit/func_809C5608.s | 12 +- .../actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s | 2 - .../actors/ovl_En_Bom_Chu/EnBomChu_Draw.s | 15 +- .../actors/ovl_En_Bom_Chu/EnBomChu_Init.s | 2 - .../actors/ovl_En_Bom_Chu/EnBomChu_Update.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C5A1C.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C5B38.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C5BA8.s | 12 +- .../actors/ovl_En_Bom_Chu/func_809C5DDC.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C5F48.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C645C.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C649C.s | 2 - .../actors/ovl_En_Bom_Chu/func_809C6548.s | 2 - .../actors/ovl_En_Bombf/EnBombf_Destroy.s | 2 - .../actors/ovl_En_Bombf/EnBombf_Draw.s | 19 +- .../actors/ovl_En_Bombf/EnBombf_Init.s | 10 +- .../actors/ovl_En_Bombf/EnBombf_Update.s | 16 +- .../actors/ovl_En_Bombf/func_809C6F60.s | 2 - .../actors/ovl_En_Bombf/func_809C7180.s | 2 - .../actors/ovl_En_Bombf/func_809C71A8.s | 7 +- .../actors/ovl_En_Bombf/func_809C74AC.s | 2 - .../actors/ovl_En_Bombf/func_809C75C8.s | 2 - .../actors/ovl_En_Bombf/func_809C7624.s | 2 - .../actors/ovl_En_Bombf/func_809C7F24.s | 8 +- .../actors/ovl_En_Box/EnBox_Destroy.s | 2 - .../overlays/actors/ovl_En_Box/EnBox_Draw.s | 11 +- .../overlays/actors/ovl_En_Box/EnBox_Init.s | 2 - .../overlays/actors/ovl_En_Box/EnBox_Update.s | 2 - .../actors/ovl_En_Box/func_809C8DC0.s | 2 - .../actors/ovl_En_Box/func_809C8DC8.s | 2 - .../actors/ovl_En_Box/func_809C92F4.s | 2 - .../actors/ovl_En_Box/func_809C93F8.s | 2 - .../actors/ovl_En_Box/func_809C94AC.s | 9 +- .../actors/ovl_En_Box/func_809C9630.s | 2 - .../actors/ovl_En_Box/func_809C9700.s | 7 +- .../actors/ovl_En_Box/func_809C988C.s | 2 - .../actors/ovl_En_Box/func_809C990C.s | 2 - .../actors/ovl_En_Box/func_809C99C4.s | 2 - .../actors/ovl_En_Box/func_809C9A7C.s | 2 - .../actors/ovl_En_Box/func_809C9B28.s | 8 +- .../actors/ovl_En_Box/func_809C9D70.s | 7 +- .../actors/ovl_En_Box/func_809C9EF8.s | 18 +- .../actors/ovl_En_Box/func_809CA2D8.s | 12 +- .../actors/ovl_En_Box/func_809CA448.s | 12 +- .../actors/ovl_En_Box/func_809CA4A0.s | 12 +- .../actors/ovl_En_Box/func_809CA518.s | 12 +- .../actors/ovl_En_Brob/EnBrob_Destroy.s | 2 - .../overlays/actors/ovl_En_Brob/EnBrob_Draw.s | 1 - .../overlays/actors/ovl_En_Brob/EnBrob_Init.s | 11 +- .../actors/ovl_En_Brob/EnBrob_Update.s | 2 - .../actors/ovl_En_Brob/func_809CADDC.s | 2 - .../actors/ovl_En_Brob/func_809CAE44.s | 2 - .../actors/ovl_En_Brob/func_809CAEA0.s | 2 - .../actors/ovl_En_Brob/func_809CAEF4.s | 2 - .../actors/ovl_En_Brob/func_809CAF88.s | 2 - .../actors/ovl_En_Brob/func_809CB008.s | 2 - .../actors/ovl_En_Brob/func_809CB054.s | 2 - .../actors/ovl_En_Brob/func_809CB114.s | 2 - .../actors/ovl_En_Brob/func_809CB218.s | 2 - .../actors/ovl_En_Brob/func_809CB2B8.s | 7 +- .../actors/ovl_En_Brob/func_809CB354.s | 2 - .../actors/ovl_En_Brob/func_809CB458.s | 11 +- .../actors/ovl_En_Brob/func_809CB90C.s | 2 - .../actors/ovl_En_Bubble/EnBubble_Destroy.s | 2 - .../actors/ovl_En_Bubble/EnBubble_Draw.s | 23 +- .../actors/ovl_En_Bubble/EnBubble_Init.s | 2 - .../actors/ovl_En_Bubble/EnBubble_Update.s | 2 - .../actors/ovl_En_Bubble/func_809CBC00.s | 7 +- .../actors/ovl_En_Bubble/func_809CBCBC.s | 2 - .../actors/ovl_En_Bubble/func_809CBCEC.s | 2 - .../actors/ovl_En_Bubble/func_809CBD10.s | 2 - .../actors/ovl_En_Bubble/func_809CBD78.s | 7 +- .../actors/ovl_En_Bubble/func_809CBFD4.s | 2 - .../actors/ovl_En_Bubble/func_809CC020.s | 7 +- .../actors/ovl_En_Bubble/func_809CC074.s | 2 - .../actors/ovl_En_Bubble/func_809CC0FC.s | 2 - .../actors/ovl_En_Bubble/func_809CC16C.s | 18 +- .../actors/ovl_En_Bubble/func_809CC648.s | 7 +- .../actors/ovl_En_Bubble/func_809CC6E4.s | 2 - .../actors/ovl_En_Bubble/func_809CC774.s | 2 - .../actors/ovl_En_Bubble/func_809CC9B4.s | 2 - .../actors/ovl_En_Bubble/func_809CCA60.s | 2 - .../actors/ovl_En_Bubble/func_809CCAA8.s | 2 - .../actors/ovl_En_Bubble/func_809CCAF0.s | 2 - .../actors/ovl_En_Butte/EnButte_Destroy.s | 2 - .../actors/ovl_En_Butte/EnButte_Draw.s | 1 - .../actors/ovl_En_Butte/EnButte_Init.s | 16 +- .../actors/ovl_En_Butte/EnButte_Update.s | 7 +- .../actors/ovl_En_Butte/func_809CD070.s | 7 +- .../actors/ovl_En_Butte/func_809CD0F8.s | 2 - .../actors/ovl_En_Butte/func_809CD110.s | 7 +- .../actors/ovl_En_Butte/func_809CD144.s | 26 +- .../actors/ovl_En_Butte/func_809CD56C.s | 2 - .../actors/ovl_En_Butte/func_809CD634.s | 2 - .../actors/ovl_En_Butte/func_809CD6FC.s | 2 - .../actors/ovl_En_Butte/func_809CD79C.s | 2 - .../actors/ovl_En_Butte/func_809CD7E8.s | 24 +- .../actors/ovl_En_Butte/func_809CDBCC.s | 2 - .../actors/ovl_En_Butte/func_809CDC18.s | 19 +- .../actors/ovl_En_Butte/func_809CDFC4.s | 2 - .../actors/ovl_En_Butte/func_809CE014.s | 2 - .../actors/ovl_En_Butte/func_809CE0D0.s | 2 - .../actors/ovl_En_Butte/func_809CE0EC.s | 2 - .../overlays/actors/ovl_En_Bw/EnBw_Destroy.s | 2 - .../overlays/actors/ovl_En_Bw/EnBw_Draw.s | 30 +- .../overlays/actors/ovl_En_Bw/EnBw_Init.s | 7 +- .../overlays/actors/ovl_En_Bw/EnBw_Update.s | 16 +- .../overlays/actors/ovl_En_Bw/func_809CE6E0.s | 2 - .../overlays/actors/ovl_En_Bw/func_809CE884.s | 26 +- .../overlays/actors/ovl_En_Bw/func_809CE9A8.s | 2 - .../overlays/actors/ovl_En_Bw/func_809CEA24.s | 39 +- .../overlays/actors/ovl_En_Bw/func_809CF72C.s | 7 +- .../overlays/actors/ovl_En_Bw/func_809CF7AC.s | 26 +- .../overlays/actors/ovl_En_Bw/func_809CF8F0.s | 2 - .../overlays/actors/ovl_En_Bw/func_809CF984.s | 26 +- .../overlays/actors/ovl_En_Bw/func_809CFBA8.s | 2 - .../overlays/actors/ovl_En_Bw/func_809CFC4C.s | 29 +- .../overlays/actors/ovl_En_Bw/func_809CFF10.s | 2 - .../overlays/actors/ovl_En_Bw/func_809CFF98.s | 2 - .../overlays/actors/ovl_En_Bw/func_809D00F4.s | 2 - .../overlays/actors/ovl_En_Bw/func_809D014C.s | 7 +- .../overlays/actors/ovl_En_Bw/func_809D01CC.s | 2 - .../overlays/actors/ovl_En_Bw/func_809D0268.s | 7 +- .../overlays/actors/ovl_En_Bw/func_809D03CC.s | 2 - .../overlays/actors/ovl_En_Bw/func_809D0424.s | 10 +- .../overlays/actors/ovl_En_Bw/func_809D0584.s | 9 +- .../overlays/actors/ovl_En_Bw/func_809D0D18.s | 24 +- .../overlays/actors/ovl_En_Bx/EnBx_Destroy.s | 2 - .../overlays/actors/ovl_En_Bx/EnBx_Draw.s | 25 +- .../overlays/actors/ovl_En_Bx/EnBx_Init.s | 10 +- .../overlays/actors/ovl_En_Bx/EnBx_Update.s | 2 - .../overlays/actors/ovl_En_Bx/func_809D1D0C.s | 2 - .../actors/ovl_En_Changer/EnChanger_Destroy.s | 2 - .../actors/ovl_En_Changer/EnChanger_Init.s | 80 +- .../actors/ovl_En_Changer/EnChanger_Update.s | 1 - .../actors/ovl_En_Changer/func_809D2CCC.s | 2 - .../actors/ovl_En_Changer/func_809D2D70.s | 12 +- .../actors/ovl_En_Changer/func_809D2F74.s | 2 - .../ovl_En_Clear_Tag/EnClearTag_Destroy.s | 2 - .../actors/ovl_En_Clear_Tag/EnClearTag_Draw.s | 55 +- .../actors/ovl_En_Clear_Tag/EnClearTag_Init.s | 7 +- .../ovl_En_Clear_Tag/EnClearTag_Update.s | 37 +- .../actors/ovl_En_Clear_Tag/func_809D35B0.s | 10 +- .../actors/ovl_En_Clear_Tag/func_809D36A8.s | 7 +- .../actors/ovl_En_Clear_Tag/func_809D3798.s | 2 - .../actors/ovl_En_Clear_Tag/func_809D38BC.s | 2 - .../actors/ovl_En_Clear_Tag/func_809D3B80.s | 7 +- .../actors/ovl_En_Clear_Tag/func_809D5004.s | 7 +- .../actors/ovl_En_Clear_Tag/func_809D53CC.s | 31 +- .../actors/ovl_En_Cow/EnCow_Destroy.s | 2 - .../overlays/actors/ovl_En_Cow/EnCow_Draw.s | 2 - .../overlays/actors/ovl_En_Cow/EnCow_Init.s | 2 - .../overlays/actors/ovl_En_Cow/EnCow_Update.s | 2 - .../actors/ovl_En_Cow/func_809DEE00.s | 2 - .../actors/ovl_En_Cow/func_809DEE9C.s | 2 - .../actors/ovl_En_Cow/func_809DEF94.s | 2 - .../actors/ovl_En_Cow/func_809DF494.s | 15 +- .../actors/ovl_En_Cow/func_809DF6BC.s | 2 - .../actors/ovl_En_Cow/func_809DF730.s | 2 - .../actors/ovl_En_Cow/func_809DF778.s | 2 - .../actors/ovl_En_Cow/func_809DF7D8.s | 2 - .../actors/ovl_En_Cow/func_809DF870.s | 2 - .../actors/ovl_En_Cow/func_809DF8FC.s | 2 - .../actors/ovl_En_Cow/func_809DF96C.s | 2 - .../actors/ovl_En_Cow/func_809DFA84.s | 2 - .../actors/ovl_En_Cow/func_809DFE98.s | 2 - .../actors/ovl_En_Cow/func_809DFF84.s | 2 - .../actors/ovl_En_Cow/func_809DFFD4.s | 2 - .../actors/ovl_En_Cow/func_809E0070.s | 1 - .../actors/ovl_En_Crow/EnCrow_Destroy.s | 2 - .../overlays/actors/ovl_En_Crow/EnCrow_Draw.s | 1 - .../overlays/actors/ovl_En_Crow/EnCrow_Init.s | 2 - .../actors/ovl_En_Crow/EnCrow_Update.s | 2 - .../actors/ovl_En_Crow/func_809E0354.s | 2 - .../actors/ovl_En_Crow/func_809E0384.s | 2 - .../actors/ovl_En_Crow/func_809E03B4.s | 10 +- .../actors/ovl_En_Crow/func_809E06D4.s | 2 - .../actors/ovl_En_Crow/func_809E06E8.s | 2 - .../actors/ovl_En_Crow/func_809E0770.s | 7 +- .../actors/ovl_En_Crow/func_809E0864.s | 10 +- .../actors/ovl_En_Crow/func_809E0C8C.s | 2 - .../actors/ovl_En_Crow/func_809E0E2C.s | 7 +- .../actors/ovl_En_Crow/func_809E0F54.s | 9 +- .../actors/ovl_En_Crow/func_809E1004.s | 2 - .../actors/ovl_En_Crow/func_809E10A8.s | 13 +- .../actors/ovl_En_Crow/func_809E1174.s | 2 - .../actors/ovl_En_Crow/func_809E1434.s | 9 +- .../actors/ovl_En_Crow/func_809E1520.s | 2 - .../overlays/actors/ovl_En_Cs/EnCs_Destroy.s | 2 - .../overlays/actors/ovl_En_Cs/EnCs_Draw.s | 16 +- .../overlays/actors/ovl_En_Cs/EnCs_Init.s | 2 - .../overlays/actors/ovl_En_Cs/EnCs_Update.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E18B0.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E1B8C.s | 13 +- .../overlays/actors/ovl_En_Cs/func_809E1CB8.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E1D38.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E1E80.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E1E90.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E1F20.s | 9 +- .../overlays/actors/ovl_En_Cs/func_809E2134.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E22D4.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E2360.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E2784.s | 2 - .../overlays/actors/ovl_En_Cs/func_809E2814.s | 6 +- .../actors/ovl_En_Daiku/EnDaiku_Destroy.s | 2 - .../actors/ovl_En_Daiku/EnDaiku_Draw.s | 12 +- .../actors/ovl_En_Daiku/EnDaiku_Init.s | 2 - .../actors/ovl_En_Daiku/EnDaiku_Update.s | 2 - .../actors/ovl_En_Daiku/func_809E2B30.s | 2 - .../actors/ovl_En_Daiku/func_809E2F50.s | 2 - .../actors/ovl_En_Daiku/func_809E3068.s | 2 - .../actors/ovl_En_Daiku/func_809E3338.s | 2 - .../actors/ovl_En_Daiku/func_809E336C.s | 2 - .../actors/ovl_En_Daiku/func_809E3438.s | 2 - .../actors/ovl_En_Daiku/func_809E349C.s | 7 +- .../actors/ovl_En_Daiku/func_809E36A4.s | 2 - .../actors/ovl_En_Daiku/func_809E3710.s | 7 +- .../actors/ovl_En_Daiku/func_809E389C.s | 2 - .../actors/ovl_En_Daiku/func_809E3954.s | 10 +- .../actors/ovl_En_Daiku/func_809E3A8C.s | 9 +- .../actors/ovl_En_Daiku/func_809E3EF8.s | 2 - .../actors/ovl_En_Daiku/func_809E3F7C.s | 11 +- .../EnDaikuKakariko_Destroy.s | 2 - .../EnDaikuKakariko_Draw.s | 11 +- .../EnDaikuKakariko_Init.s | 2 - .../EnDaikuKakariko_Update.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E4320.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E474C.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E47EC.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E49A8.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E4A7C.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E4B14.s | 2 - .../ovl_En_Daiku_Kakariko/func_809E4BC4.s | 7 +- .../ovl_En_Daiku_Kakariko/func_809E50B4.s | 27 +- .../ovl_En_Daiku_Kakariko/func_809E5288.s | 12 +- .../ovl_En_Dekubaba/EnDekubaba_Destroy.s | 2 - .../actors/ovl_En_Dekubaba/EnDekubaba_Draw.s | 26 +- .../actors/ovl_En_Dekubaba/EnDekubaba_Init.s | 2 - .../ovl_En_Dekubaba/EnDekubaba_Update.s | 2 - .../actors/ovl_En_Dekubaba/func_809E5A38.s | 2 - .../actors/ovl_En_Dekubaba/func_809E5ABC.s | 7 +- .../actors/ovl_En_Dekubaba/func_809E5D28.s | 7 +- .../actors/ovl_En_Dekubaba/func_809E5E58.s | 2 - .../actors/ovl_En_Dekubaba/func_809E5F44.s | 2 - .../actors/ovl_En_Dekubaba/func_809E5F9C.s | 2 - .../actors/ovl_En_Dekubaba/func_809E5FBC.s | 2 - .../actors/ovl_En_Dekubaba/func_809E6000.s | 2 - .../actors/ovl_En_Dekubaba/func_809E6078.s | 2 - .../actors/ovl_En_Dekubaba/func_809E60A8.s | 7 +- .../actors/ovl_En_Dekubaba/func_809E6170.s | 7 +- .../actors/ovl_En_Dekubaba/func_809E61E0.s | 2 - .../actors/ovl_En_Dekubaba/func_809E6264.s | 2 - .../actors/ovl_En_Dekubaba/func_809E63EC.s | 2 - .../actors/ovl_En_Dekubaba/func_809E645C.s | 2 - .../actors/ovl_En_Dekubaba/func_809E64F4.s | 2 - .../actors/ovl_En_Dekubaba/func_809E65A0.s | 15 +- .../actors/ovl_En_Dekubaba/func_809E6A04.s | 17 +- .../actors/ovl_En_Dekubaba/func_809E6DCC.s | 2 - .../actors/ovl_En_Dekubaba/func_809E6ED4.s | 2 - .../actors/ovl_En_Dekubaba/func_809E7104.s | 2 - .../actors/ovl_En_Dekubaba/func_809E738C.s | 2 - .../actors/ovl_En_Dekubaba/func_809E7458.s | 2 - .../actors/ovl_En_Dekubaba/func_809E77E4.s | 2 - .../actors/ovl_En_Dekubaba/func_809E78DC.s | 2 - .../actors/ovl_En_Dekubaba/func_809E79EC.s | 2 - .../actors/ovl_En_Dekubaba/func_809E7A88.s | 7 +- .../actors/ovl_En_Dekubaba/func_809E7BB0.s | 10 +- .../actors/ovl_En_Dekubaba/func_809E7F14.s | 10 +- .../actors/ovl_En_Dekubaba/func_809E80D8.s | 2 - .../actors/ovl_En_Dekubaba/func_809E8140.s | 2 - .../actors/ovl_En_Dekubaba/func_809E858C.s | 20 +- .../actors/ovl_En_Dekubaba/func_809E86B8.s | 20 +- .../actors/ovl_En_Dekubaba/func_809E89E4.s | 16 +- .../actors/ovl_En_Dekubaba/func_809E8AD8.s | 20 +- .../actors/ovl_En_Dekubaba/func_809E8C0C.s | 2 - .../ovl_En_Dekunuts/EnDekunuts_Destroy.s | 2 - .../actors/ovl_En_Dekunuts/EnDekunuts_Draw.s | 1 - .../actors/ovl_En_Dekunuts/EnDekunuts_Init.s | 2 - .../ovl_En_Dekunuts/EnDekunuts_Update.s | 2 - .../actors/ovl_En_Dekunuts/func_809E96FC.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9770.s | 2 - .../actors/ovl_En_Dekunuts/func_809E97B8.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9800.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9868.s | 2 - .../actors/ovl_En_Dekunuts/func_809E98B4.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9920.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9978.s | 2 - .../actors/ovl_En_Dekunuts/func_809E99D8.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9AB4.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9B48.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9B98.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9DFC.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9E80.s | 2 - .../actors/ovl_En_Dekunuts/func_809E9F6C.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA0C4.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA1D8.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA240.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA480.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA4E8.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA534.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA5B0.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA70C.s | 2 - .../actors/ovl_En_Dekunuts/func_809EA98C.s | 15 +- .../overlays/actors/ovl_En_Dh/EnDh_Destroy.s | 2 - .../overlays/actors/ovl_En_Dh/EnDh_Draw.s | 19 +- .../overlays/actors/ovl_En_Dh/EnDh_Init.s | 2 - .../overlays/actors/ovl_En_Dh/EnDh_Update.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EAD40.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EAEC4.s | 7 +- .../overlays/actors/ovl_En_Dh/func_809EB05C.s | 7 +- .../overlays/actors/ovl_En_Dh/func_809EB110.s | 9 +- .../overlays/actors/ovl_En_Dh/func_809EB334.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EB3D0.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EB4D8.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EB53C.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EB5C4.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EB624.s | 12 +- .../overlays/actors/ovl_En_Dh/func_809EB934.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EB9B8.s | 12 +- .../overlays/actors/ovl_En_Dh/func_809EBB48.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EBBC8.s | 7 +- .../overlays/actors/ovl_En_Dh/func_809EBCF0.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EBD78.s | 7 +- .../overlays/actors/ovl_En_Dh/func_809EBEA8.s | 2 - .../overlays/actors/ovl_En_Dh/func_809EC1A0.s | 2 - .../actors/ovl_En_Dha/EnDha_Destroy.s | 2 - .../overlays/actors/ovl_En_Dha/EnDha_Draw.s | 1 - .../overlays/actors/ovl_En_Dha/EnDha_Init.s | 2 - .../overlays/actors/ovl_En_Dha/EnDha_Update.s | 7 +- .../actors/ovl_En_Dha/func_809EC880.s | 2 - .../actors/ovl_En_Dha/func_809EC9C8.s | 2 - .../actors/ovl_En_Dha/func_809ECA50.s | 7 +- .../actors/ovl_En_Dha/func_809ECF60.s | 2 - .../actors/ovl_En_Dha/func_809ECF8C.s | 2 - .../actors/ovl_En_Dha/func_809ED054.s | 2 - .../actors/ovl_En_Dha/func_809ED0C4.s | 7 +- .../actors/ovl_En_Dha/func_809ED27C.s | 2 - .../actors/ovl_En_Dha/func_809ED414.s | 2 - .../actors/ovl_En_Dha/func_809ED4B8.s | 2 - .../ovl_En_Diving_Game/EnDivingGame_Destroy.s | 2 - .../ovl_En_Diving_Game/EnDivingGame_Draw.s | 11 +- .../ovl_En_Diving_Game/EnDivingGame_Init.s | 25 +- .../ovl_En_Diving_Game/EnDivingGame_Update.s | 2 - .../actors/ovl_En_Diving_Game/func_809ED9E0.s | 7 +- .../actors/ovl_En_Diving_Game/func_809EDB08.s | 2 - .../actors/ovl_En_Diving_Game/func_809EDCB0.s | 2 - .../actors/ovl_En_Diving_Game/func_809EDD4C.s | 2 - .../actors/ovl_En_Diving_Game/func_809EDEDC.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE048.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE0FC.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE194.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE1F4.s | 10 +- .../actors/ovl_En_Diving_Game/func_809EE408.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE6C8.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE780.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE800.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE8F0.s | 2 - .../actors/ovl_En_Diving_Game/func_809EE96C.s | 2 - .../actors/ovl_En_Diving_Game/func_809EEA00.s | 2 - .../actors/ovl_En_Diving_Game/func_809EEA90.s | 2 - .../actors/ovl_En_Diving_Game/func_809EEAF8.s | 10 +- .../actors/ovl_En_Diving_Game/func_809EEDB8.s | 2 - .../actors/ovl_En_Diving_Game/func_809EEDE4.s | 2 - .../actors/ovl_En_Dns/EnDns_Destroy.s | 2 - .../overlays/actors/ovl_En_Dns/EnDns_Draw.s | 1 - .../overlays/actors/ovl_En_Dns/EnDns_Init.s | 56 +- .../overlays/actors/ovl_En_Dns/EnDns_Update.s | 2 - .../actors/ovl_En_Dns/func_809EF51C.s | 2 - .../actors/ovl_En_Dns/func_809EF5A4.s | 2 - .../actors/ovl_En_Dns/func_809EF658.s | 2 - .../actors/ovl_En_Dns/func_809EF70C.s | 2 - .../actors/ovl_En_Dns/func_809EF73C.s | 2 - .../actors/ovl_En_Dns/func_809EF800.s | 2 - .../actors/ovl_En_Dns/func_809EF854.s | 2 - .../actors/ovl_En_Dns/func_809EF8F4.s | 2 - .../actors/ovl_En_Dns/func_809EF9A4.s | 2 - .../actors/ovl_En_Dns/func_809EF9F8.s | 2 - .../actors/ovl_En_Dns/func_809EFA28.s | 2 - .../actors/ovl_En_Dns/func_809EFA58.s | 2 - .../actors/ovl_En_Dns/func_809EFA9C.s | 2 - .../actors/ovl_En_Dns/func_809EFACC.s | 2 - .../actors/ovl_En_Dns/func_809EFAFC.s | 2 - .../actors/ovl_En_Dns/func_809EFB40.s | 2 - .../actors/ovl_En_Dns/func_809EFB84.s | 2 - .../actors/ovl_En_Dns/func_809EFBC8.s | 2 - .../actors/ovl_En_Dns/func_809EFC9C.s | 11 +- .../actors/ovl_En_Dns/func_809EFDD0.s | 2 - .../actors/ovl_En_Dns/func_809EFEE8.s | 2 - .../actors/ovl_En_Dns/func_809EFF50.s | 2 - .../actors/ovl_En_Dns/func_809EFF98.s | 2 - .../actors/ovl_En_Dns/func_809F008C.s | 2 - .../actors/ovl_En_Dns/func_809F0100.s | 2 - .../actors/ovl_En_Dns/func_809F017C.s | 2 - .../ovl_En_Dnt_Demo/EnDntDemo_Destroy.s | 2 - .../actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s | 26 +- .../actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s | 1 - .../actors/ovl_En_Dnt_Demo/func_809F0AA4.s | 75 +- .../actors/ovl_En_Dnt_Demo/func_809F1100.s | 2 - .../actors/ovl_En_Dnt_Demo/func_809F1374.s | 2 - .../ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s | 2 - .../actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s | 18 +- .../actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s | 12 +- .../actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s | 8 +- .../actors/ovl_En_Dnt_Jiji/func_809F1C04.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F1C44.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F1CF4.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F1DA8.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F1E8C.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F1EFC.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F1FE0.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2068.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2118.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2254.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2344.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F236C.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F24AC.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2550.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F25E4.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F26B0.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2720.s | 47 +- .../actors/ovl_En_Dnt_Jiji/func_809F28DC.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2974.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F29E0.s | 2 - .../actors/ovl_En_Dnt_Jiji/func_809F2A90.s | 7 +- .../ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s | 2 - .../actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s | 28 +- .../ovl_En_Dnt_Nomal/EnDntNomal_Update.s | 13 +- .../actors/ovl_En_Dnt_Nomal/func_809F3480.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F35CC.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3624.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F36CC.s | 14 +- .../actors/ovl_En_Dnt_Nomal/func_809F39B8.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3AD4.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3B40.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3BE4.s | 9 +- .../actors/ovl_En_Dnt_Nomal/func_809F3CD0.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3D84.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3E30.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3ED4.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F3F6C.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F40D4.s | 9 +- .../actors/ovl_En_Dnt_Nomal/func_809F42A4.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F4310.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F43C8.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F43F0.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F44FC.s | 7 +- .../actors/ovl_En_Dnt_Nomal/func_809F4730.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F4824.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F48FC.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F49A4.s | 7 +- .../actors/ovl_En_Dnt_Nomal/func_809F4BA4.s | 7 +- .../actors/ovl_En_Dnt_Nomal/func_809F4CB4.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F4E18.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F4EF4.s | 7 +- .../actors/ovl_En_Dnt_Nomal/func_809F50B8.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F50EC.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F51B8.s | 12 +- .../actors/ovl_En_Dnt_Nomal/func_809F5478.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F551C.s | 7 +- .../actors/ovl_En_Dnt_Nomal/func_809F58E4.s | 12 +- .../actors/ovl_En_Dnt_Nomal/func_809F59E4.s | 2 - .../actors/ovl_En_Dnt_Nomal/func_809F5A6C.s | 20 +- .../actors/ovl_En_Dnt_Nomal/func_809F5C98.s | 19 +- .../actors/ovl_En_Dodojr/EnDodojr_Destroy.s | 2 - .../actors/ovl_En_Dodojr/EnDodojr_Draw.s | 1 - .../actors/ovl_En_Dodojr/EnDodojr_Init.s | 2 - .../actors/ovl_En_Dodojr/EnDodojr_Update.s | 2 - .../actors/ovl_En_Dodojr/func_809F64D0.s | 2 - .../actors/ovl_En_Dodojr/func_809F6510.s | 2 - .../actors/ovl_En_Dodojr/func_809F6730.s | 2 - .../actors/ovl_En_Dodojr/func_809F68B0.s | 2 - .../actors/ovl_En_Dodojr/func_809F6994.s | 9 +- .../actors/ovl_En_Dodojr/func_809F6A20.s | 7 +- .../actors/ovl_En_Dodojr/func_809F6AC4.s | 7 +- .../actors/ovl_En_Dodojr/func_809F6B38.s | 7 +- .../actors/ovl_En_Dodojr/func_809F6BBC.s | 7 +- .../actors/ovl_En_Dodojr/func_809F6C24.s | 7 +- .../actors/ovl_En_Dodojr/func_809F6CA4.s | 2 - .../actors/ovl_En_Dodojr/func_809F6DD0.s | 2 - .../actors/ovl_En_Dodojr/func_809F6E54.s | 2 - .../actors/ovl_En_Dodojr/func_809F706C.s | 2 - .../actors/ovl_En_Dodojr/func_809F709C.s | 2 - .../actors/ovl_En_Dodojr/func_809F70E8.s | 2 - .../actors/ovl_En_Dodojr/func_809F72A4.s | 2 - .../actors/ovl_En_Dodojr/func_809F73AC.s | 2 - .../actors/ovl_En_Dodojr/func_809F74C4.s | 7 +- .../actors/ovl_En_Dodojr/func_809F758C.s | 2 - .../actors/ovl_En_Dodojr/func_809F768C.s | 2 - .../actors/ovl_En_Dodojr/func_809F773C.s | 2 - .../actors/ovl_En_Dodojr/func_809F77AC.s | 7 +- .../actors/ovl_En_Dodojr/func_809F784C.s | 2 - .../actors/ovl_En_Dodojr/func_809F786C.s | 2 - .../actors/ovl_En_Dodojr/func_809F78EC.s | 2 - .../actors/ovl_En_Dodojr/func_809F799C.s | 2 - .../actors/ovl_En_Dodojr/func_809F7A00.s | 2 - .../actors/ovl_En_Dodojr/func_809F7AB8.s | 2 - .../actors/ovl_En_Dodojr/func_809F7B3C.s | 2 - .../actors/ovl_En_Dodojr/func_809F7BE4.s | 2 - .../actors/ovl_En_Dodojr/func_809F7C48.s | 2 - .../actors/ovl_En_Dodojr/func_809F7D50.s | 2 - .../actors/ovl_En_Dodojr/func_809F7DFC.s | 2 - .../actors/ovl_En_Dodongo/EnDodongo_Destroy.s | 2 - .../actors/ovl_En_Dodongo/EnDodongo_Draw.s | 7 +- .../actors/ovl_En_Dodongo/EnDodongo_Init.s | 2 - .../actors/ovl_En_Dodongo/EnDodongo_Update.s | 2 - .../actors/ovl_En_Dodongo/func_809F8250.s | 2 - .../actors/ovl_En_Dodongo/func_809F8258.s | 49 +- .../actors/ovl_En_Dodongo/func_809F89CC.s | 2 - .../actors/ovl_En_Dodongo/func_809F8A34.s | 2 - .../actors/ovl_En_Dodongo/func_809F8AD8.s | 2 - .../actors/ovl_En_Dodongo/func_809F8B2C.s | 2 - .../actors/ovl_En_Dodongo/func_809F8B7C.s | 2 - .../actors/ovl_En_Dodongo/func_809F8BFC.s | 2 - .../actors/ovl_En_Dodongo/func_809F8C94.s | 2 - .../actors/ovl_En_Dodongo/func_809F8D0C.s | 2 - .../actors/ovl_En_Dodongo/func_809F8D58.s | 2 - .../actors/ovl_En_Dodongo/func_809F8F2C.s | 7 +- .../actors/ovl_En_Dodongo/func_809F9424.s | 7 +- .../actors/ovl_En_Dodongo/func_809F9760.s | 2 - .../actors/ovl_En_Dodongo/func_809F97C0.s | 2 - .../actors/ovl_En_Dodongo/func_809F9A80.s | 2 - .../actors/ovl_En_Dodongo/func_809F9AF8.s | 2 - .../actors/ovl_En_Dodongo/func_809F9C3C.s | 2 - .../actors/ovl_En_Dodongo/func_809F9CA0.s | 2 - .../actors/ovl_En_Dodongo/func_809F9DC8.s | 10 +- .../actors/ovl_En_Dodongo/func_809FA0F8.s | 2 - .../actors/ovl_En_Dodongo/func_809FA14C.s | 57 +- .../actors/ovl_En_Dodongo/func_809FA674.s | 2 - .../actors/ovl_En_Dodongo/func_809FA6D8.s | 1 - .../actors/ovl_En_Door/EnDoor_Destroy.s | 2 - .../overlays/actors/ovl_En_Door/EnDoor_Draw.s | 11 +- .../overlays/actors/ovl_En_Door/EnDoor_Init.s | 2 - .../actors/ovl_En_Door/EnDoor_Update.s | 2 - .../actors/ovl_En_Door/func_809FC41C.s | 2 - .../actors/ovl_En_Door/func_809FC5D0.s | 2 - .../actors/ovl_En_Door/func_809FC878.s | 2 - .../actors/ovl_En_Door/func_809FC8C0.s | 2 - .../actors/ovl_En_Door/func_809FC8F4.s | 2 - .../actors/ovl_En_Door/func_809FC928.s | 2 - .../actors/ovl_En_Door/func_809FC998.s | 2 - .../actors/ovl_En_Door/func_809FC9DC.s | 7 +- .../actors/ovl_En_Door/func_809FCC3C.s | 2 - .../overlays/actors/ovl_En_Du/EnDu_Destroy.s | 2 - .../overlays/actors/ovl_En_Du/EnDu_Draw.s | 11 +- .../overlays/actors/ovl_En_Du/EnDu_Init.s | 2 - .../overlays/actors/ovl_En_Du/EnDu_Update.s | 2 - .../overlays/actors/ovl_En_Du/func_809FDC30.s | 2 - .../overlays/actors/ovl_En_Du/func_809FDC38.s | 2 - .../overlays/actors/ovl_En_Du/func_809FDCDC.s | 16 +- .../overlays/actors/ovl_En_Du/func_809FDDB4.s | 2 - .../overlays/actors/ovl_En_Du/func_809FDE24.s | 2 - .../overlays/actors/ovl_En_Du/func_809FDE9C.s | 2 - .../overlays/actors/ovl_En_Du/func_809FDFC0.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE000.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE040.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE104.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE3B4.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE3C0.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE4A4.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE638.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE6CC.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE740.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE798.s | 2 - .../overlays/actors/ovl_En_Du/func_809FE890.s | 2 - .../overlays/actors/ovl_En_Du/func_809FEB08.s | 2 - .../overlays/actors/ovl_En_Du/func_809FEC14.s | 2 - .../overlays/actors/ovl_En_Du/func_809FEC70.s | 2 - .../overlays/actors/ovl_En_Du/func_809FECE4.s | 2 - .../overlays/actors/ovl_En_Du/func_809FEEA4.s | 16 +- .../overlays/actors/ovl_En_Du/func_809FF018.s | 2 - .../ovl_En_Dy_Extra/EnDyExtra_Destroy.s | 2 - .../actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s | 15 +- .../actors/ovl_En_Dy_Extra/EnDyExtra_Init.s | 21 +- .../actors/ovl_En_Dy_Extra/EnDyExtra_Update.s | 2 - .../actors/ovl_En_Dy_Extra/func_809FF7AC.s | 2 - .../actors/ovl_En_Dy_Extra/func_809FF840.s | 7 +- .../actors/ovl_En_Eiyer/EnEiyer_Destroy.s | 2 - .../actors/ovl_En_Eiyer/EnEiyer_Draw.s | 11 +- .../actors/ovl_En_Eiyer/EnEiyer_Init.s | 2 - .../actors/ovl_En_Eiyer/EnEiyer_Update.s | 2 - .../actors/ovl_En_Eiyer/func_80A001A4.s | 2 - .../actors/ovl_En_Eiyer/func_80A00218.s | 2 - .../actors/ovl_En_Eiyer/func_80A00358.s | 2 - .../actors/ovl_En_Eiyer/func_80A003B4.s | 2 - .../actors/ovl_En_Eiyer/func_80A003DC.s | 2 - .../actors/ovl_En_Eiyer/func_80A004BC.s | 7 +- .../actors/ovl_En_Eiyer/func_80A00534.s | 2 - .../actors/ovl_En_Eiyer/func_80A00544.s | 2 - .../actors/ovl_En_Eiyer/func_80A00588.s | 2 - .../actors/ovl_En_Eiyer/func_80A00600.s | 2 - .../actors/ovl_En_Eiyer/func_80A006B0.s | 2 - .../actors/ovl_En_Eiyer/func_80A0076C.s | 2 - .../actors/ovl_En_Eiyer/func_80A00794.s | 2 - .../actors/ovl_En_Eiyer/func_80A00858.s | 2 - .../actors/ovl_En_Eiyer/func_80A008A4.s | 2 - .../actors/ovl_En_Eiyer/func_80A008D4.s | 2 - .../actors/ovl_En_Eiyer/func_80A00950.s | 7 +- .../actors/ovl_En_Eiyer/func_80A00A84.s | 2 - .../actors/ovl_En_Eiyer/func_80A00B18.s | 9 +- .../actors/ovl_En_Eiyer/func_80A00C70.s | 9 +- .../actors/ovl_En_Eiyer/func_80A00E8C.s | 2 - .../actors/ovl_En_Eiyer/func_80A00F84.s | 7 +- .../actors/ovl_En_Eiyer/func_80A01010.s | 2 - .../actors/ovl_En_Eiyer/func_80A01104.s | 7 +- .../actors/ovl_En_Eiyer/func_80A01240.s | 2 - .../actors/ovl_En_Eiyer/func_80A012F4.s | 2 - .../actors/ovl_En_Eiyer/func_80A01374.s | 2 - .../actors/ovl_En_Eiyer/func_80A0142C.s | 2 - .../actors/ovl_En_Eiyer/func_80A0178C.s | 7 +- .../actors/ovl_En_Elf/EnElf_Destroy.s | 2 - .../overlays/actors/ovl_En_Elf/EnElf_Draw.s | 2 - .../overlays/actors/ovl_En_Elf/EnElf_Init.s | 2 - .../overlays/actors/ovl_En_Elf/EnElf_Update.s | 2 - .../actors/ovl_En_Elf/func_80A01C30.s | 2 - .../actors/ovl_En_Elf/func_80A01C38.s | 2 - .../actors/ovl_En_Elf/func_80A01CAC.s | 2 - .../actors/ovl_En_Elf/func_80A01CF0.s | 2 - .../actors/ovl_En_Elf/func_80A01D2C.s | 2 - .../actors/ovl_En_Elf/func_80A01D70.s | 2 - .../actors/ovl_En_Elf/func_80A01DA8.s | 2 - .../actors/ovl_En_Elf/func_80A01DE0.s | 2 - .../actors/ovl_En_Elf/func_80A01E24.s | 2 - .../actors/ovl_En_Elf/func_80A01E68.s | 2 - .../actors/ovl_En_Elf/func_80A01E94.s | 2 - .../actors/ovl_En_Elf/func_80A01ED0.s | 2 - .../actors/ovl_En_Elf/func_80A01F04.s | 2 - .../actors/ovl_En_Elf/func_80A01F48.s | 2 - .../actors/ovl_En_Elf/func_80A01F90.s | 2 - .../actors/ovl_En_Elf/func_80A01FE0.s | 2 - .../actors/ovl_En_Elf/func_80A020A4.s | 2 - .../actors/ovl_En_Elf/func_80A0214C.s | 2 - .../actors/ovl_En_Elf/func_80A0232C.s | 2 - .../actors/ovl_En_Elf/func_80A023A4.s | 2 - .../actors/ovl_En_Elf/func_80A0299C.s | 2 - .../actors/ovl_En_Elf/func_80A029A8.s | 2 - .../actors/ovl_En_Elf/func_80A02A20.s | 2 - .../actors/ovl_En_Elf/func_80A02AA4.s | 2 - .../actors/ovl_En_Elf/func_80A02B38.s | 2 - .../actors/ovl_En_Elf/func_80A02BD8.s | 2 - .../actors/ovl_En_Elf/func_80A02C98.s | 2 - .../actors/ovl_En_Elf/func_80A02E30.s | 2 - .../actors/ovl_En_Elf/func_80A02EC0.s | 2 - .../actors/ovl_En_Elf/func_80A02F2C.s | 2 - .../actors/ovl_En_Elf/func_80A03018.s | 2 - .../actors/ovl_En_Elf/func_80A03148.s | 2 - .../actors/ovl_En_Elf/func_80A0329C.s | 2 - .../actors/ovl_En_Elf/func_80A0353C.s | 2 - .../actors/ovl_En_Elf/func_80A03604.s | 2 - .../actors/ovl_En_Elf/func_80A03610.s | 2 - .../actors/ovl_En_Elf/func_80A03814.s | 2 - .../actors/ovl_En_Elf/func_80A03990.s | 2 - .../actors/ovl_En_Elf/func_80A03AB0.s | 2 - .../actors/ovl_En_Elf/func_80A03B28.s | 2 - .../actors/ovl_En_Elf/func_80A03CF8.s | 2 - .../actors/ovl_En_Elf/func_80A0438C.s | 2 - .../actors/ovl_En_Elf/func_80A04414.s | 2 - .../actors/ovl_En_Elf/func_80A0461C.s | 2 - .../actors/ovl_En_Elf/func_80A049B4.s | 2 - .../actors/ovl_En_Elf/func_80A04D90.s | 2 - .../actors/ovl_En_Elf/func_80A04DE4.s | 2 - .../actors/ovl_En_Elf/func_80A04F94.s | 2 - .../actors/ovl_En_Elf/func_80A05040.s | 2 - .../actors/ovl_En_Elf/func_80A05114.s | 2 - .../actors/ovl_En_Elf/func_80A05188.s | 2 - .../actors/ovl_En_Elf/func_80A05208.s | 2 - .../actors/ovl_En_Elf/func_80A052F4.s | 2 - .../actors/ovl_En_Elf/func_80A053F0.s | 2 - .../actors/ovl_En_Elf/func_80A05734.s | 2 - .../actors/ovl_En_Elf/func_80A05F10.s | 1 - .../actors/ovl_En_Encount1/EnEncount1_Init.s | 60 +- .../ovl_En_Encount1/EnEncount1_Update.s | 1 - .../actors/ovl_En_Encount1/func_80A0693C.s | 25 +- .../actors/ovl_En_Encount1/func_80A06CD0.s | 16 +- .../actors/ovl_En_Encount1/func_80A06E88.s | 16 +- .../actors/ovl_En_Encount2/EnEncount2_Draw.s | 2 - .../actors/ovl_En_Encount2/EnEncount2_Init.s | 20 +- .../ovl_En_Encount2/EnEncount2_Update.s | 2 - .../actors/ovl_En_Encount2/func_80A07A4C.s | 10 +- .../actors/ovl_En_Encount2/func_80A07CA4.s | 43 +- .../actors/ovl_En_Encount2/func_80A08694.s | 2 - .../actors/ovl_En_Encount2/func_80A08748.s | 13 +- .../actors/ovl_En_Encount2/func_80A0891C.s | 19 +- .../actors/ovl_En_Ex_Item/EnExItem_Destroy.s | 2 - .../actors/ovl_En_Ex_Item/EnExItem_Draw.s | 27 +- .../actors/ovl_En_Ex_Item/EnExItem_Init.s | 49 +- .../actors/ovl_En_Ex_Item/EnExItem_Update.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09054.s | 51 +- .../actors/ovl_En_Ex_Item/func_80A09434.s | 16 +- .../actors/ovl_En_Ex_Item/func_80A0964C.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09670.s | 2 - .../actors/ovl_En_Ex_Item/func_80A096A8.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09710.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09724.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09978.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09A00.s | 8 +- .../actors/ovl_En_Ex_Item/func_80A09B6C.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09BCC.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09BFC.s | 2 - .../actors/ovl_En_Ex_Item/func_80A09C40.s | 16 +- .../actors/ovl_En_Ex_Item/func_80A09D6C.s | 1 - .../ovl_En_Ex_Ruppy/EnExRuppy_Destroy.s | 2 - .../actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s | 15 +- .../actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s | 44 +- .../actors/ovl_En_Ex_Ruppy/EnExRuppy_Update.s | 2 - .../actors/ovl_En_Ex_Ruppy/func_80A0A820.s | 2 - .../actors/ovl_En_Ex_Ruppy/func_80A0AA3C.s | 2 - .../actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s | 2 - .../actors/ovl_En_Ex_Ruppy/func_80A0AC88.s | 7 +- .../actors/ovl_En_Ex_Ruppy/func_80A0AD88.s | 10 +- .../actors/ovl_En_Ex_Ruppy/func_80A0AEE0.s | 2 - .../actors/ovl_En_Ex_Ruppy/func_80A0AF24.s | 12 +- .../actors/ovl_En_Ex_Ruppy/func_80A0B070.s | 2 - .../actors/ovl_En_Ex_Ruppy/func_80A0B0F4.s | 2 - .../overlays/actors/ovl_En_Fd/EnFd_Destroy.s | 2 - .../overlays/actors/ovl_En_Fd/EnFd_Draw.s | 16 +- .../overlays/actors/ovl_En_Fd/EnFd_Init.s | 2 - .../overlays/actors/ovl_En_Fd/EnFd_Update.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0B6C0.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0B7B8.s | 7 +- .../overlays/actors/ovl_En_Fd/func_80A0B8D8.s | 16 +- .../overlays/actors/ovl_En_Fd/func_80A0BA44.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0BAE0.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0BC70.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0BD78.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0BE34.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0BEA0.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0BF6C.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0C0A0.s | 7 +- .../overlays/actors/ovl_En_Fd/func_80A0C310.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0C3A0.s | 10 +- .../overlays/actors/ovl_En_Fd/func_80A0C474.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0C4F0.s | 7 +- .../overlays/actors/ovl_En_Fd/func_80A0C5D0.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0C7EC.s | 7 +- .../overlays/actors/ovl_En_Fd/func_80A0CA44.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0CCB8.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0CCF0.s | 16 +- .../overlays/actors/ovl_En_Fd/func_80A0D40C.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0D4FC.s | 10 +- .../overlays/actors/ovl_En_Fd/func_80A0D614.s | 2 - .../overlays/actors/ovl_En_Fd/func_80A0D730.s | 16 +- .../overlays/actors/ovl_En_Fd/func_80A0DB44.s | 15 +- .../actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s | 2 - .../actors/ovl_En_Fd_Fire/EnFdFire_Draw.s | 30 +- .../actors/ovl_En_Fd_Fire/EnFdFire_Init.s | 7 +- .../actors/ovl_En_Fd_Fire/EnFdFire_Update.s | 2 - .../actors/ovl_En_Fd_Fire/func_80A0E4B0.s | 2 - .../actors/ovl_En_Fd_Fire/func_80A0E578.s | 2 - .../actors/ovl_En_Fd_Fire/func_80A0E70C.s | 2 - .../actors/ovl_En_Fd_Fire/func_80A0E848.s | 2 - .../actors/ovl_En_Fd_Fire/func_80A0E884.s | 7 +- .../actors/ovl_En_Fd_Fire/func_80A0EA34.s | 7 +- .../ovl_En_Fhg_Fire/EnFhgFire_Destroy.s | 2 - .../actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s | 43 +- .../actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s | 20 +- .../actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s | 2 - .../actors/ovl_En_Fhg_Fire/func_80A0F260.s | 2 - .../actors/ovl_En_Fhg_Fire/func_80A0F6F8.s | 7 +- .../actors/ovl_En_Fhg_Fire/func_80A0FA90.s | 12 +- .../actors/ovl_En_Fhg_Fire/func_80A0FC48.s | 2 - .../actors/ovl_En_Fhg_Fire/func_80A0FD8C.s | 2 - .../actors/ovl_En_Fhg_Fire/func_80A10008.s | 22 +- .../actors/ovl_En_Fhg_Fire/func_80A10220.s | 46 +- .../actors/ovl_En_Fhg_Fire/func_80A10F18.s | 12 +- .../ovl_En_Fire_Rock/EnFireRock_Destroy.s | 16 +- .../actors/ovl_En_Fire_Rock/EnFireRock_Draw.s | 23 +- .../actors/ovl_En_Fire_Rock/EnFireRock_Init.s | 44 +- .../ovl_En_Fire_Rock/EnFireRock_Update.s | 12 +- .../actors/ovl_En_Fire_Rock/func_80A120CC.s | 11 +- .../actors/ovl_En_Fire_Rock/func_80A1241C.s | 12 +- .../actors/ovl_En_Fire_Rock/func_80A125B8.s | 8 +- .../actors/ovl_En_Fire_Rock/func_80A12730.s | 2 - .../actors/ovl_En_Firefly/EnFirefly_Destroy.s | 2 - .../actors/ovl_En_Firefly/EnFirefly_Draw.s | 12 +- .../actors/ovl_En_Firefly/EnFirefly_Init.s | 2 - .../actors/ovl_En_Firefly/EnFirefly_Update.s | 2 - .../actors/ovl_En_Firefly/func_80A13070.s | 2 - .../actors/ovl_En_Firefly/func_80A13098.s | 2 - .../actors/ovl_En_Firefly/func_80A132F4.s | 2 - .../actors/ovl_En_Firefly/func_80A133A0.s | 2 - .../actors/ovl_En_Firefly/func_80A13444.s | 2 - .../actors/ovl_En_Firefly/func_80A13464.s | 2 - .../actors/ovl_En_Firefly/func_80A1349C.s | 2 - .../actors/ovl_En_Firefly/func_80A1350C.s | 2 - .../actors/ovl_En_Firefly/func_80A13538.s | 2 - .../actors/ovl_En_Firefly/func_80A135A8.s | 10 +- .../actors/ovl_En_Firefly/func_80A13744.s | 2 - .../actors/ovl_En_Firefly/func_80A13764.s | 2 - .../actors/ovl_En_Firefly/func_80A1379C.s | 7 +- .../actors/ovl_En_Firefly/func_80A138B8.s | 7 +- .../actors/ovl_En_Firefly/func_80A13A08.s | 10 +- .../actors/ovl_En_Firefly/func_80A13C98.s | 2 - .../actors/ovl_En_Firefly/func_80A13D68.s | 2 - .../actors/ovl_En_Firefly/func_80A13DE4.s | 2 - .../actors/ovl_En_Firefly/func_80A13FF4.s | 2 - .../actors/ovl_En_Firefly/func_80A14088.s | 2 - .../actors/ovl_En_Firefly/func_80A141F0.s | 2 - .../actors/ovl_En_Firefly/func_80A14294.s | 2 - .../actors/ovl_En_Firefly/func_80A142F4.s | 7 +- .../actors/ovl_En_Firefly/func_80A143B4.s | 2 - .../actors/ovl_En_Firefly/func_80A1448C.s | 2 - .../actors/ovl_En_Firefly/func_80A1450C.s | 2 - .../actors/ovl_En_Firefly/func_80A14960.s | 7 +- .../actors/ovl_En_Firefly/func_80A149B4.s | 2 - .../actors/ovl_En_Firefly/func_80A14E28.s | 11 +- .../actors/ovl_En_Fish/EnFish_Destroy.s | 2 - .../overlays/actors/ovl_En_Fish/EnFish_Draw.s | 1 - .../overlays/actors/ovl_En_Fish/EnFish_Init.s | 9 +- .../actors/ovl_En_Fish/EnFish_Update.s | 2 - .../actors/ovl_En_Fish/func_80A15280.s | 2 - .../actors/ovl_En_Fish/func_80A152AC.s | 2 - .../actors/ovl_En_Fish/func_80A15310.s | 2 - .../actors/ovl_En_Fish/func_80A15374.s | 2 - .../actors/ovl_En_Fish/func_80A153AC.s | 2 - .../actors/ovl_En_Fish/func_80A15444.s | 2 - .../actors/ovl_En_Fish/func_80A155D0.s | 2 - .../actors/ovl_En_Fish/func_80A15688.s | 2 - .../actors/ovl_En_Fish/func_80A15774.s | 2 - .../actors/ovl_En_Fish/func_80A157A4.s | 2 - .../actors/ovl_En_Fish/func_80A157FC.s | 10 +- .../actors/ovl_En_Fish/func_80A158EC.s | 2 - .../actors/ovl_En_Fish/func_80A15944.s | 7 +- .../actors/ovl_En_Fish/func_80A15AD4.s | 2 - .../actors/ovl_En_Fish/func_80A15B2C.s | 7 +- .../actors/ovl_En_Fish/func_80A15D18.s | 2 - .../actors/ovl_En_Fish/func_80A15D68.s | 7 +- .../actors/ovl_En_Fish/func_80A15F24.s | 2 - .../actors/ovl_En_Fish/func_80A15F84.s | 26 +- .../actors/ovl_En_Fish/func_80A160BC.s | 19 +- .../actors/ovl_En_Fish/func_80A16200.s | 13 +- .../actors/ovl_En_Fish/func_80A163DC.s | 2 - .../actors/ovl_En_Fish/func_80A16450.s | 7 +- .../actors/ovl_En_Fish/func_80A16618.s | 2 - .../actors/ovl_En_Fish/func_80A16670.s | 10 +- .../actors/ovl_En_Fish/func_80A16898.s | 10 +- .../actors/ovl_En_Fish/func_80A169C8.s | 2 - .../actors/ovl_En_Fish/func_80A16A64.s | 24 +- .../actors/ovl_En_Fish/func_80A16C68.s | 7 +- .../actors/ovl_En_Fish/func_80A16DEC.s | 13 +- .../ovl_En_Floormas/EnFloormas_Destroy.s | 2 - .../actors/ovl_En_Floormas/EnFloormas_Draw.s | 12 +- .../actors/ovl_En_Floormas/EnFloormas_Init.s | 2 - .../ovl_En_Floormas/EnFloormas_Update.s | 10 +- .../actors/ovl_En_Floormas/func_80A17748.s | 2 - .../actors/ovl_En_Floormas/func_80A17768.s | 2 - .../actors/ovl_En_Floormas/func_80A17780.s | 2 - .../actors/ovl_En_Floormas/func_80A177C8.s | 2 - .../actors/ovl_En_Floormas/func_80A17808.s | 2 - .../actors/ovl_En_Floormas/func_80A17894.s | 2 - .../actors/ovl_En_Floormas/func_80A178DC.s | 2 - .../actors/ovl_En_Floormas/func_80A17908.s | 11 +- .../actors/ovl_En_Floormas/func_80A17A38.s | 2 - .../actors/ovl_En_Floormas/func_80A17B10.s | 7 +- .../actors/ovl_En_Floormas/func_80A17B40.s | 2 - .../actors/ovl_En_Floormas/func_80A17BEC.s | 7 +- .../actors/ovl_En_Floormas/func_80A17D4C.s | 2 - .../actors/ovl_En_Floormas/func_80A17D9C.s | 2 - .../actors/ovl_En_Floormas/func_80A17DFC.s | 2 - .../actors/ovl_En_Floormas/func_80A17ED4.s | 2 - .../actors/ovl_En_Floormas/func_80A17F3C.s | 2 - .../actors/ovl_En_Floormas/func_80A17FA4.s | 7 +- .../actors/ovl_En_Floormas/func_80A1817C.s | 2 - .../actors/ovl_En_Floormas/func_80A181D4.s | 2 - .../actors/ovl_En_Floormas/func_80A18254.s | 2 - .../actors/ovl_En_Floormas/func_80A18310.s | 2 - .../actors/ovl_En_Floormas/func_80A18364.s | 7 +- .../actors/ovl_En_Floormas/func_80A18464.s | 7 +- .../actors/ovl_En_Floormas/func_80A18500.s | 2 - .../actors/ovl_En_Floormas/func_80A185C4.s | 7 +- .../actors/ovl_En_Floormas/func_80A18650.s | 2 - .../actors/ovl_En_Floormas/func_80A187AC.s | 2 - .../actors/ovl_En_Floormas/func_80A187E4.s | 2 - .../actors/ovl_En_Floormas/func_80A188F0.s | 11 +- .../actors/ovl_En_Floormas/func_80A18AB4.s | 2 - .../actors/ovl_En_Floormas/func_80A18B38.s | 2 - .../actors/ovl_En_Floormas/func_80A18C78.s | 7 +- .../actors/ovl_En_Floormas/func_80A18D68.s | 7 +- .../actors/ovl_En_Floormas/func_80A18F50.s | 2 - .../actors/ovl_En_Floormas/func_80A18FD8.s | 2 - .../actors/ovl_En_Floormas/func_80A190C8.s | 2 - .../actors/ovl_En_Floormas/func_80A19230.s | 2 - .../actors/ovl_En_Floormas/func_80A1928C.s | 2 - .../actors/ovl_En_Floormas/func_80A193C4.s | 7 +- .../actors/ovl_En_Floormas/func_80A196DC.s | 2 - .../actors/ovl_En_Floormas/func_80A198EC.s | 11 +- .../actors/ovl_En_Floormas/func_80A19B9C.s | 2 - .../actors/ovl_En_Floormas/func_80A19BA8.s | 7 +- .../actors/ovl_En_Floormas/func_80A19C6C.s | 2 - .../actors/ovl_En_Floormas/func_80A19CA4.s | 2 - .../actors/ovl_En_Floormas/func_80A19D18.s | 7 +- .../actors/ovl_En_Floormas/func_80A1A128.s | 2 - .../actors/ovl_En_Floormas/func_80A1A160.s | 14 +- .../actors/ovl_En_Floormas/func_80A1A350.s | 11 +- .../overlays/actors/ovl_En_Fr/EnFr_Destroy.s | 2 - .../overlays/actors/ovl_En_Fr/EnFr_Init.s | 52 +- .../overlays/actors/ovl_En_Fr/EnFr_Update.s | 9 +- .../overlays/actors/ovl_En_Fr/func_80A1A9A0.s | 7 +- .../overlays/actors/ovl_En_Fr/func_80A1AC0C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1AC34.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1AF6C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1AFF0.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B09C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B0F8.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B174.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B19C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B22C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B2C8.s | 7 +- .../overlays/actors/ovl_En_Fr/func_80A1B464.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B524.s | 7 +- .../overlays/actors/ovl_En_Fr/func_80A1B638.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B778.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B8D0.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1B9D8.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1BB34.s | 7 +- .../overlays/actors/ovl_En_Fr/func_80A1BC14.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1BCB4.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1BD94.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1BDFC.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1BE98.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1BF10.s | 22 +- .../overlays/actors/ovl_En_Fr/func_80A1C05C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C18C.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C1E4.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C248.s | 11 +- .../overlays/actors/ovl_En_Fr/func_80A1C344.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C388.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C400.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C474.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C524.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C580.s | 11 +- .../overlays/actors/ovl_En_Fr/func_80A1C718.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C790.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C7CC.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C830.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1C944.s | 36 +- .../overlays/actors/ovl_En_Fr/func_80A1CAAC.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1CB08.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1CB58.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1CC04.s | 2 - .../overlays/actors/ovl_En_Fr/func_80A1CC2C.s | 16 +- .../overlays/actors/ovl_En_Fr/func_80A1CD24.s | 15 +- .../overlays/actors/ovl_En_Fu/EnFu_Destroy.s | 2 - .../overlays/actors/ovl_En_Fu/EnFu_Draw.s | 11 +- .../overlays/actors/ovl_En_Fu/EnFu_Init.s | 2 - .../overlays/actors/ovl_En_Fu/EnFu_Update.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1D94C.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DA04.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DA9C.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DB60.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DBA0.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DBD4.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DD44.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DDA8.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1DE24.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1E110.s | 2 - .../overlays/actors/ovl_En_Fu/func_80A1E26C.s | 2 - .../overlays/actors/ovl_En_Fw/EnFw_Destroy.s | 2 - .../overlays/actors/ovl_En_Fw/EnFw_Draw.s | 2 - .../overlays/actors/ovl_En_Fw/EnFw_Init.s | 2 - .../overlays/actors/ovl_En_Fw/EnFw_Update.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1E5A0.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1E668.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1E760.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1E838.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1E8F8.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1EC70.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1ECD4.s | 17 +- .../overlays/actors/ovl_En_Fw/func_80A1F2A8.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1F39C.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1F52C.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1F544.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1F664.s | 2 - .../overlays/actors/ovl_En_Fw/func_80A1F708.s | 10 +- .../overlays/actors/ovl_En_Fw/func_80A1F814.s | 15 +- .../overlays/actors/ovl_En_Fz/EnFz_Destroy.s | 2 - .../overlays/actors/ovl_En_Fz/EnFz_Draw.s | 16 +- .../overlays/actors/ovl_En_Fz/EnFz_Init.s | 2 - .../overlays/actors/ovl_En_Fz/EnFz_Update.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A1FF8C.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A200B0.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20100.s | 10 +- .../overlays/actors/ovl_En_Fz/func_80A202FC.s | 7 +- .../overlays/actors/ovl_En_Fz/func_80A203DC.s | 7 +- .../overlays/actors/ovl_En_Fz/func_80A204A0.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20704.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20748.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20774.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A207F4.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20830.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20880.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A208A8.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20938.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20978.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A209B4.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A209E4.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20A20.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20A4C.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20A88.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20AC0.s | 10 +- .../overlays/actors/ovl_En_Fz/func_80A20CAC.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20D4C.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20D7C.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20DBC.s | 11 +- .../overlays/actors/ovl_En_Fz/func_80A20E84.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A20EC4.s | 10 +- .../overlays/actors/ovl_En_Fz/func_80A2145C.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A21500.s | 2 - .../overlays/actors/ovl_En_Fz/func_80A215BC.s | 7 +- .../overlays/actors/ovl_En_Fz/func_80A218A8.s | 15 +- .../ovl_En_G_Switch/EnGSwitch_Destroy.s | 2 - .../actors/ovl_En_G_Switch/EnGSwitch_Init.s | 74 +- .../actors/ovl_En_G_Switch/EnGSwitch_Update.s | 2 - .../actors/ovl_En_G_Switch/func_80A22250.s | 2 - .../actors/ovl_En_G_Switch/func_80A223F8.s | 2 - .../actors/ovl_En_G_Switch/func_80A2248C.s | 16 +- .../actors/ovl_En_G_Switch/func_80A22598.s | 2 - .../actors/ovl_En_G_Switch/func_80A22680.s | 7 +- .../actors/ovl_En_G_Switch/func_80A22764.s | 10 +- .../actors/ovl_En_G_Switch/func_80A22B1C.s | 10 +- .../actors/ovl_En_G_Switch/func_80A22E00.s | 2 - .../actors/ovl_En_G_Switch/func_80A22FDC.s | 16 +- .../actors/ovl_En_G_Switch/func_80A230A8.s | 16 +- .../actors/ovl_En_G_Switch/func_80A23204.s | 9 +- .../actors/ovl_En_G_Switch/func_80A23314.s | 7 +- .../actors/ovl_En_G_Switch/func_80A234D4.s | 19 +- .../ovl_En_Ganon_Mant/EnGanonMant_Destroy.s | 2 - .../ovl_En_Ganon_Mant/EnGanonMant_Draw.s | 9 +- .../ovl_En_Ganon_Mant/EnGanonMant_Init.s | 2 - .../ovl_En_Ganon_Mant/EnGanonMant_Update.s | 2 - .../actors/ovl_En_Ganon_Mant/func_80A23D84.s | 12 +- .../actors/ovl_En_Ganon_Mant/func_80A23FE0.s | 16 +- .../actors/ovl_En_Ganon_Mant/func_80A245A4.s | 2 - .../actors/ovl_En_Ganon_Mant/func_80A24884.s | 16 +- .../overlays/actors/ovl_En_Gb/EnGb_Destroy.s | 2 - .../overlays/actors/ovl_En_Gb/EnGb_Draw.s | 2 - .../overlays/actors/ovl_En_Gb/EnGb_Init.s | 2 - .../overlays/actors/ovl_En_Gb/EnGb_Update.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F180.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F608.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F760.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F7C0.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F83C.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F94C.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2F9C0.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2FA50.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2FB40.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2FBB0.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2FC0C.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2FC70.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A2FFFC.s | 2 - .../overlays/actors/ovl_En_Gb/func_80A30350.s | 1 - .../actors/ovl_En_Ge1/EnGe1_Destroy.s | 2 - .../overlays/actors/ovl_En_Ge1/EnGe1_Draw.s | 11 +- .../overlays/actors/ovl_En_Ge1/EnGe1_Init.s | 12 +- .../overlays/actors/ovl_En_Ge1/EnGe1_Update.s | 2 - .../actors/ovl_En_Ge1/func_80A30C70.s | 2 - .../actors/ovl_En_Ge1/func_80A30D48.s | 2 - .../actors/ovl_En_Ge1/func_80A30DCC.s | 2 - .../actors/ovl_En_Ge1/func_80A30E08.s | 2 - .../actors/ovl_En_Ge1/func_80A30EE8.s | 2 - .../actors/ovl_En_Ge1/func_80A30F48.s | 2 - .../actors/ovl_En_Ge1/func_80A31000.s | 2 - .../actors/ovl_En_Ge1/func_80A31094.s | 2 - .../actors/ovl_En_Ge1/func_80A310C4.s | 2 - .../actors/ovl_En_Ge1/func_80A3118C.s | 2 - .../actors/ovl_En_Ge1/func_80A311E0.s | 2 - .../actors/ovl_En_Ge1/func_80A31234.s | 2 - .../actors/ovl_En_Ge1/func_80A312E4.s | 2 - .../actors/ovl_En_Ge1/func_80A313A0.s | 2 - .../actors/ovl_En_Ge1/func_80A313E0.s | 2 - .../actors/ovl_En_Ge1/func_80A314D0.s | 2 - .../actors/ovl_En_Ge1/func_80A31514.s | 2 - .../actors/ovl_En_Ge1/func_80A3157C.s | 2 - .../actors/ovl_En_Ge1/func_80A315F0.s | 2 - .../actors/ovl_En_Ge1/func_80A31644.s | 2 - .../actors/ovl_En_Ge1/func_80A316F4.s | 2 - .../actors/ovl_En_Ge1/func_80A317C0.s | 2 - .../actors/ovl_En_Ge1/func_80A3183C.s | 2 - .../actors/ovl_En_Ge1/func_80A31880.s | 2 - .../actors/ovl_En_Ge1/func_80A31934.s | 2 - .../actors/ovl_En_Ge1/func_80A3196C.s | 2 - .../actors/ovl_En_Ge1/func_80A31A5C.s | 2 - .../actors/ovl_En_Ge1/func_80A31B20.s | 2 - .../actors/ovl_En_Ge1/func_80A31B7C.s | 2 - .../actors/ovl_En_Ge1/func_80A31BDC.s | 2 - .../actors/ovl_En_Ge1/func_80A31BE8.s | 2 - .../actors/ovl_En_Ge1/func_80A31D88.s | 2 - .../actors/ovl_En_Ge1/func_80A31DE4.s | 2 - .../actors/ovl_En_Ge1/func_80A31E2C.s | 20 +- .../actors/ovl_En_Ge1/func_80A31F9C.s | 2 - .../actors/ovl_En_Ge1/func_80A31FE0.s | 2 - .../actors/ovl_En_Ge1/func_80A32078.s | 2 - .../actors/ovl_En_Ge1/func_80A32190.s | 2 - .../actors/ovl_En_Ge1/func_80A323B0.s | 2 - .../actors/ovl_En_Ge1/func_80A323EC.s | 2 - .../actors/ovl_En_Ge1/func_80A32444.s | 2 - .../actors/ovl_En_Ge1/func_80A32598.s | 12 +- .../actors/ovl_En_Ge2/EnGe2_Destroy.s | 2 - .../overlays/actors/ovl_En_Ge2/EnGe2_Draw.s | 11 +- .../overlays/actors/ovl_En_Ge2/EnGe2_Init.s | 12 +- .../overlays/actors/ovl_En_Ge2/EnGe2_Update.s | 12 +- .../actors/ovl_En_Ge2/func_80A32BD0.s | 2 - .../actors/ovl_En_Ge2/func_80A32ECC.s | 2 - .../actors/ovl_En_Ge2/func_80A32F74.s | 2 - .../actors/ovl_En_Ge2/func_80A330A0.s | 2 - .../actors/ovl_En_Ge2/func_80A330CC.s | 2 - .../actors/ovl_En_Ge2/func_80A331A0.s | 2 - .../actors/ovl_En_Ge2/func_80A332D4.s | 2 - .../actors/ovl_En_Ge2/func_80A3334C.s | 2 - .../actors/ovl_En_Ge2/func_80A33444.s | 2 - .../actors/ovl_En_Ge2/func_80A3354C.s | 2 - .../actors/ovl_En_Ge2/func_80A33600.s | 2 - .../actors/ovl_En_Ge2/func_80A336C4.s | 2 - .../actors/ovl_En_Ge2/func_80A33704.s | 2 - .../actors/ovl_En_Ge2/func_80A3381C.s | 2 - .../actors/ovl_En_Ge2/func_80A33930.s | 2 - .../actors/ovl_En_Ge2/func_80A339EC.s | 2 - .../actors/ovl_En_Ge2/func_80A33A0C.s | 2 - .../actors/ovl_En_Ge2/func_80A33A6C.s | 2 - .../actors/ovl_En_Ge2/func_80A33AFC.s | 2 - .../actors/ovl_En_Ge2/func_80A33B7C.s | 2 - .../actors/ovl_En_Ge2/func_80A33BE8.s | 2 - .../actors/ovl_En_Ge2/func_80A33C8C.s | 2 - .../actors/ovl_En_Ge2/func_80A33D10.s | 2 - .../actors/ovl_En_Ge2/func_80A33DE0.s | 2 - .../actors/ovl_En_Ge2/func_80A3402C.s | 2 - .../actors/ovl_En_Ge2/func_80A3415C.s | 2 - .../actors/ovl_En_Ge2/func_80A341A0.s | 2 - .../actors/ovl_En_Ge3/EnGe3_Destroy.s | 2 - .../overlays/actors/ovl_En_Ge3/EnGe3_Draw.s | 11 +- .../overlays/actors/ovl_En_Ge3/EnGe3_Init.s | 2 - .../overlays/actors/ovl_En_Ge3/EnGe3_Update.s | 2 - .../actors/ovl_En_Ge3/func_80A34620.s | 2 - .../actors/ovl_En_Ge3/func_80A347F4.s | 2 - .../actors/ovl_En_Ge3/func_80A3490C.s | 2 - .../actors/ovl_En_Ge3/func_80A34A20.s | 2 - .../actors/ovl_En_Ge3/func_80A34A80.s | 2 - .../actors/ovl_En_Ge3/func_80A34AA0.s | 2 - .../actors/ovl_En_Ge3/func_80A34B00.s | 2 - .../actors/ovl_En_Ge3/func_80A34B90.s | 2 - .../actors/ovl_En_Ge3/func_80A34C40.s | 2 - .../actors/ovl_En_Ge3/func_80A34CE4.s | 2 - .../actors/ovl_En_Ge3/func_80A34D68.s | 2 - .../actors/ovl_En_Ge3/func_80A34E58.s | 12 +- .../actors/ovl_En_Ge3/func_80A35004.s | 2 - .../actors/ovl_En_GeldB/EnGeldB_Destroy.s | 2 - .../actors/ovl_En_GeldB/EnGeldB_Draw.s | 12 +- .../actors/ovl_En_GeldB/EnGeldB_Init.s | 2 - .../actors/ovl_En_GeldB/EnGeldB_Update.s | 7 +- .../actors/ovl_En_GeldB/func_80A35310.s | 2 - .../actors/ovl_En_GeldB/func_80A3559C.s | 2 - .../actors/ovl_En_GeldB/func_80A35974.s | 2 - .../actors/ovl_En_GeldB/func_80A35A08.s | 2 - .../actors/ovl_En_GeldB/func_80A35B8C.s | 2 - .../actors/ovl_En_GeldB/func_80A35C24.s | 2 - .../actors/ovl_En_GeldB/func_80A35D48.s | 2 - .../actors/ovl_En_GeldB/func_80A35DD0.s | 10 +- .../actors/ovl_En_GeldB/func_80A360B0.s | 2 - .../actors/ovl_En_GeldB/func_80A36130.s | 10 +- .../actors/ovl_En_GeldB/func_80A365DC.s | 2 - .../actors/ovl_En_GeldB/func_80A36690.s | 2 - .../actors/ovl_En_GeldB/func_80A367E4.s | 2 - .../actors/ovl_En_GeldB/func_80A36830.s | 7 +- .../actors/ovl_En_GeldB/func_80A36A10.s | 2 - .../actors/ovl_En_GeldB/func_80A36AE4.s | 13 +- .../actors/ovl_En_GeldB/func_80A370BC.s | 2 - .../actors/ovl_En_GeldB/func_80A37224.s | 7 +- .../actors/ovl_En_GeldB/func_80A37670.s | 2 - .../actors/ovl_En_GeldB/func_80A376E0.s | 10 +- .../actors/ovl_En_GeldB/func_80A3792C.s | 2 - .../actors/ovl_En_GeldB/func_80A379C0.s | 10 +- .../actors/ovl_En_GeldB/func_80A37D70.s | 2 - .../actors/ovl_En_GeldB/func_80A37DEC.s | 7 +- .../actors/ovl_En_GeldB/func_80A37EF0.s | 2 - .../actors/ovl_En_GeldB/func_80A37F98.s | 7 +- .../actors/ovl_En_GeldB/func_80A38054.s | 2 - .../actors/ovl_En_GeldB/func_80A380EC.s | 7 +- .../actors/ovl_En_GeldB/func_80A38290.s | 2 - .../actors/ovl_En_GeldB/func_80A38348.s | 2 - .../actors/ovl_En_GeldB/func_80A38430.s | 2 - .../actors/ovl_En_GeldB/func_80A384E8.s | 7 +- .../actors/ovl_En_GeldB/func_80A387D0.s | 2 - .../actors/ovl_En_GeldB/func_80A38960.s | 10 +- .../actors/ovl_En_GeldB/func_80A3907C.s | 2 - .../actors/ovl_En_GeldB/func_80A39120.s | 2 - .../actors/ovl_En_GeldB/func_80A391D8.s | 7 +- .../actors/ovl_En_GeldB/func_80A392D8.s | 2 - .../actors/ovl_En_GeldB/func_80A39688.s | 12 +- .../actors/ovl_En_GeldB/func_80A39824.s | 29 +- .../actors/ovl_En_GeldB/func_80A39E2C.s | 6 +- .../actors/ovl_En_GirlA/EnGirlA_Destroy.s | 2 - .../actors/ovl_En_GirlA/EnGirlA_Init.s | 8 +- .../actors/ovl_En_GirlA/EnGirlA_Update.s | 2 - .../actors/ovl_En_GirlA/func_80A3A750.s | 2 - .../actors/ovl_En_GirlA/func_80A3A758.s | 19 +- .../actors/ovl_En_GirlA/func_80A3A7A4.s | 2 - .../actors/ovl_En_GirlA/func_80A3A7C8.s | 2 - .../actors/ovl_En_GirlA/func_80A3A7EC.s | 2 - .../actors/ovl_En_GirlA/func_80A3A810.s | 2 - .../actors/ovl_En_GirlA/func_80A3A834.s | 2 - .../actors/ovl_En_GirlA/func_80A3A858.s | 2 - .../actors/ovl_En_GirlA/func_80A3A87C.s | 2 - .../actors/ovl_En_GirlA/func_80A3A8A0.s | 2 - .../actors/ovl_En_GirlA/func_80A3A8D0.s | 246 ++++- .../actors/ovl_En_GirlA/func_80A3AAA8.s | 2 - .../actors/ovl_En_GirlA/func_80A3AB58.s | 2 - .../actors/ovl_En_GirlA/func_80A3ABF8.s | 2 - .../actors/ovl_En_GirlA/func_80A3ACAC.s | 2 - .../actors/ovl_En_GirlA/func_80A3AD60.s | 2 - .../actors/ovl_En_GirlA/func_80A3ADD4.s | 2 - .../actors/ovl_En_GirlA/func_80A3AE48.s | 2 - .../actors/ovl_En_GirlA/func_80A3AEBC.s | 2 - .../actors/ovl_En_GirlA/func_80A3AF30.s | 2 - .../actors/ovl_En_GirlA/func_80A3AFC4.s | 2 - .../actors/ovl_En_GirlA/func_80A3B040.s | 2 - .../actors/ovl_En_GirlA/func_80A3B0BC.s | 2 - .../actors/ovl_En_GirlA/func_80A3B160.s | 2 - .../actors/ovl_En_GirlA/func_80A3B204.s | 2 - .../actors/ovl_En_GirlA/func_80A3B250.s | 2 - .../actors/ovl_En_GirlA/func_80A3B2AC.s | 2 - .../actors/ovl_En_GirlA/func_80A3B308.s | 2 - .../actors/ovl_En_GirlA/func_80A3B318.s | 2 - .../actors/ovl_En_GirlA/func_80A3B328.s | 2 - .../actors/ovl_En_GirlA/func_80A3B3A8.s | 2 - .../actors/ovl_En_GirlA/func_80A3B454.s | 2 - .../actors/ovl_En_GirlA/func_80A3B464.s | 2 - .../actors/ovl_En_GirlA/func_80A3B4D8.s | 2 - .../actors/ovl_En_GirlA/func_80A3B54C.s | 2 - .../actors/ovl_En_GirlA/func_80A3B5C0.s | 2 - .../actors/ovl_En_GirlA/func_80A3B634.s | 2 - .../actors/ovl_En_GirlA/func_80A3B678.s | 2 - .../actors/ovl_En_GirlA/func_80A3B714.s | 2 - .../actors/ovl_En_GirlA/func_80A3B780.s | 2 - .../actors/ovl_En_GirlA/func_80A3B7BC.s | 2 - .../actors/ovl_En_GirlA/func_80A3B800.s | 2 - .../actors/ovl_En_GirlA/func_80A3B83C.s | 2 - .../actors/ovl_En_GirlA/func_80A3B878.s | 2 - .../actors/ovl_En_GirlA/func_80A3B8B4.s | 2 - .../actors/ovl_En_GirlA/func_80A3B8F0.s | 2 - .../actors/ovl_En_GirlA/func_80A3B92C.s | 2 - .../actors/ovl_En_GirlA/func_80A3B968.s | 2 - .../actors/ovl_En_GirlA/func_80A3B9A4.s | 2 - .../actors/ovl_En_GirlA/func_80A3B9D4.s | 2 - .../actors/ovl_En_GirlA/func_80A3BA04.s | 2 - .../actors/ovl_En_GirlA/func_80A3BA40.s | 11 +- .../actors/ovl_En_GirlA/func_80A3BB6C.s | 7 +- .../actors/ovl_En_GirlA/func_80A3BC0C.s | 2 - .../actors/ovl_En_GirlA/func_80A3BC3C.s | 2 - .../actors/ovl_En_GirlA/func_80A3BC6C.s | 14 +- .../actors/ovl_En_GirlA/func_80A3BD80.s | 2 - .../actors/ovl_En_GirlA/func_80A3BD8C.s | 11 +- .../actors/ovl_En_GirlA/func_80A3BEAC.s | 2 - .../actors/ovl_En_GirlA/func_80A3BEE0.s | 2 - .../actors/ovl_En_GirlA/func_80A3BF54.s | 2 - .../actors/ovl_En_GirlA/func_80A3BFE4.s | 19 +- .../actors/ovl_En_GirlA/func_80A3C3BC.s | 2 - .../actors/ovl_En_GirlA/func_80A3C498.s | 2 - .../actors/ovl_En_GirlA/func_80A3C4D4.s | 6 +- .../overlays/actors/ovl_En_Gm/EnGm_Destroy.s | 2 - .../overlays/actors/ovl_En_Gm/EnGm_Init.s | 32 +- .../overlays/actors/ovl_En_Gm/EnGm_Update.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3D7C8.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3D838.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3D9D8.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DA50.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DB04.s | 7 +- .../overlays/actors/ovl_En_Gm/func_80A3DBF4.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DC44.s | 7 +- .../overlays/actors/ovl_En_Gm/func_80A3DD7C.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DE10.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DF00.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DF60.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3DFBC.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3E090.s | 2 - .../overlays/actors/ovl_En_Gm/func_80A3E1EC.s | 11 +- .../overlays/actors/ovl_En_Go/EnGo_Destroy.s | 2 - .../overlays/actors/ovl_En_Go/EnGo_Draw.s | 2 - .../overlays/actors/ovl_En_Go/EnGo_Init.s | 2 - .../overlays/actors/ovl_En_Go/EnGo_Update.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3E570.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3E578.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3E908.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3ED24.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3EDE0.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3EE8C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3EFE8.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F02C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F03C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F060.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F0E4.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F15C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F260.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F274.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F300.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F4BC.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F594.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F7C0.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3F908.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3FEB4.s | 2 - .../overlays/actors/ovl_En_Go/func_80A3FEF8.s | 2 - .../overlays/actors/ovl_En_Go/func_80A4008C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A4011C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A4020C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40218.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40318.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40494.s | 2 - .../overlays/actors/ovl_En_Go/func_80A405CC.s | 2 - .../overlays/actors/ovl_En_Go/func_80A406E0.s | 2 - .../overlays/actors/ovl_En_Go/func_80A408D8.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40A54.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40B1C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40B74.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40C78.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40D5C.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40DCC.s | 2 - .../overlays/actors/ovl_En_Go/func_80A40F58.s | 2 - .../overlays/actors/ovl_En_Go/func_80A41068.s | 2 - .../overlays/actors/ovl_En_Go/func_80A411C8.s | 2 - .../overlays/actors/ovl_En_Go/func_80A413DC.s | 2 - .../overlays/actors/ovl_En_Go/func_80A41604.s | 2 - .../overlays/actors/ovl_En_Go/func_80A416A8.s | 2 - .../overlays/actors/ovl_En_Go/func_80A417B4.s | 1 - .../actors/ovl_En_Go2/EnGo2_Destroy.s | 2 - .../overlays/actors/ovl_En_Go2/EnGo2_Draw.s | 1 - .../overlays/actors/ovl_En_Go2/EnGo2_Init.s | 2 - .../overlays/actors/ovl_En_Go2/EnGo2_Update.s | 2 - .../actors/ovl_En_Go2/func_80A42D30.s | 2 - .../actors/ovl_En_Go2/func_80A42DD4.s | 2 - .../actors/ovl_En_Go2/func_80A42EE0.s | 2 - .../actors/ovl_En_Go2/func_80A4320C.s | 2 - .../actors/ovl_En_Go2/func_80A43424.s | 2 - .../actors/ovl_En_Go2/func_80A43468.s | 2 - .../actors/ovl_En_Go2/func_80A434E8.s | 2 - .../actors/ovl_En_Go2/func_80A43564.s | 2 - .../actors/ovl_En_Go2/func_80A435E8.s | 2 - .../actors/ovl_En_Go2/func_80A436DC.s | 2 - .../actors/ovl_En_Go2/func_80A43714.s | 2 - .../actors/ovl_En_Go2/func_80A43824.s | 2 - .../actors/ovl_En_Go2/func_80A4387C.s | 2 - .../actors/ovl_En_Go2/func_80A438B4.s | 2 - .../actors/ovl_En_Go2/func_80A43950.s | 2 - .../actors/ovl_En_Go2/func_80A439AC.s | 2 - .../actors/ovl_En_Go2/func_80A43A2C.s | 2 - .../actors/ovl_En_Go2/func_80A43A88.s | 2 - .../actors/ovl_En_Go2/func_80A43B08.s | 2 - .../actors/ovl_En_Go2/func_80A43B64.s | 2 - .../actors/ovl_En_Go2/func_80A43C40.s | 2 - .../actors/ovl_En_Go2/func_80A43C9C.s | 2 - .../actors/ovl_En_Go2/func_80A43D78.s | 2 - .../actors/ovl_En_Go2/func_80A43F90.s | 2 - .../actors/ovl_En_Go2/func_80A44010.s | 2 - .../actors/ovl_En_Go2/func_80A44224.s | 2 - .../actors/ovl_En_Go2/func_80A44258.s | 2 - .../actors/ovl_En_Go2/func_80A442F0.s | 2 - .../actors/ovl_En_Go2/func_80A4433C.s | 2 - .../actors/ovl_En_Go2/func_80A44398.s | 2 - .../actors/ovl_En_Go2/func_80A443A8.s | 2 - .../actors/ovl_En_Go2/func_80A443E0.s | 2 - .../actors/ovl_En_Go2/func_80A4444C.s | 2 - .../actors/ovl_En_Go2/func_80A444A8.s | 2 - .../actors/ovl_En_Go2/func_80A444FC.s | 2 - .../actors/ovl_En_Go2/func_80A44534.s | 2 - .../actors/ovl_En_Go2/func_80A44678.s | 2 - .../actors/ovl_En_Go2/func_80A44790.s | 2 - .../actors/ovl_En_Go2/func_80A4488C.s | 2 - .../actors/ovl_En_Go2/func_80A448C4.s | 2 - .../actors/ovl_En_Go2/func_80A44940.s | 2 - .../actors/ovl_En_Go2/func_80A44A9C.s | 2 - .../actors/ovl_En_Go2/func_80A44AB0.s | 2 - .../actors/ovl_En_Go2/func_80A44C68.s | 2 - .../actors/ovl_En_Go2/func_80A44CE4.s | 2 - .../actors/ovl_En_Go2/func_80A44D84.s | 2 - .../actors/ovl_En_Go2/func_80A44DC0.s | 2 - .../actors/ovl_En_Go2/func_80A44EF0.s | 2 - .../actors/ovl_En_Go2/func_80A45088.s | 2 - .../actors/ovl_En_Go2/func_80A45288.s | 2 - .../actors/ovl_En_Go2/func_80A45360.s | 2 - .../actors/ovl_En_Go2/func_80A4546C.s | 2 - .../actors/ovl_En_Go2/func_80A454CC.s | 2 - .../actors/ovl_En_Go2/func_80A45578.s | 2 - .../actors/ovl_En_Go2/func_80A4561C.s | 2 - .../actors/ovl_En_Go2/func_80A45734.s | 2 - .../actors/ovl_En_Go2/func_80A4578C.s | 2 - .../actors/ovl_En_Go2/func_80A457F8.s | 2 - .../actors/ovl_En_Go2/func_80A45848.s | 2 - .../actors/ovl_En_Go2/func_80A4592C.s | 2 - .../actors/ovl_En_Go2/func_80A45A00.s | 2 - .../actors/ovl_En_Go2/func_80A45B14.s | 2 - .../actors/ovl_En_Go2/func_80A45B9C.s | 2 - .../actors/ovl_En_Go2/func_80A45C50.s | 2 - .../actors/ovl_En_Go2/func_80A45D40.s | 2 - .../actors/ovl_En_Go2/func_80A45DA4.s | 2 - .../actors/ovl_En_Go2/func_80A45E48.s | 2 - .../actors/ovl_En_Go2/func_80A45F08.s | 2 - .../actors/ovl_En_Go2/func_80A45F9C.s | 2 - .../actors/ovl_En_Go2/func_80A4601C.s | 2 - .../actors/ovl_En_Go2/func_80A4607C.s | 2 - .../actors/ovl_En_Go2/func_80A460B8.s | 2 - .../actors/ovl_En_Go2/func_80A46114.s | 2 - .../actors/ovl_En_Go2/func_80A461A8.s | 2 - .../actors/ovl_En_Go2/func_80A462D8.s | 2 - .../actors/ovl_En_Go2/func_80A463D8.s | 2 - .../actors/ovl_En_Go2/func_80A46418.s | 2 - .../actors/ovl_En_Go2/func_80A4696C.s | 2 - .../actors/ovl_En_Go2/func_80A46B40.s | 2 - .../actors/ovl_En_Go2/func_80A46CD8.s | 2 - .../actors/ovl_En_Go2/func_80A46D5C.s | 2 - .../actors/ovl_En_Go2/func_80A46DBC.s | 2 - .../actors/ovl_En_Go2/func_80A46E54.s | 2 - .../actors/ovl_En_Go2/func_80A46F88.s | 2 - .../actors/ovl_En_Go2/func_80A47024.s | 2 - .../actors/ovl_En_Go2/func_80A470E8.s | 2 - .../actors/ovl_En_Go2/func_80A47158.s | 2 - .../actors/ovl_En_Go2/func_80A4725C.s | 2 - .../actors/ovl_En_Go2/func_80A47490.s | 2 - .../actors/ovl_En_Go2/func_80A47578.s | 2 - .../actors/ovl_En_Go2/func_80A479B0.s | 2 - .../actors/ovl_En_Go2/func_80A47AB0.s | 2 - .../actors/ovl_En_Go2/func_80A47C20.s | 2 - .../actors/ovl_En_Go2/func_80A47E34.s | 2 - .../actors/ovl_En_Goma/EnGoma_Destroy.s | 2 - .../overlays/actors/ovl_En_Goma/EnGoma_Draw.s | 60 +- .../overlays/actors/ovl_En_Goma/EnGoma_Init.s | 32 +- .../actors/ovl_En_Goma/EnGoma_Update.s | 13 +- .../actors/ovl_En_Goma/func_80A49294.s | 2 - .../actors/ovl_En_Goma/func_80A49338.s | 2 - .../actors/ovl_En_Goma/func_80A493D8.s | 12 +- .../actors/ovl_En_Goma/func_80A49668.s | 2 - .../actors/ovl_En_Goma/func_80A498A8.s | 2 - .../actors/ovl_En_Goma/func_80A49974.s | 2 - .../actors/ovl_En_Goma/func_80A499BC.s | 2 - .../actors/ovl_En_Goma/func_80A49AA8.s | 2 - .../actors/ovl_En_Goma/func_80A49B30.s | 2 - .../actors/ovl_En_Goma/func_80A49BF0.s | 2 - .../actors/ovl_En_Goma/func_80A49C94.s | 2 - .../actors/ovl_En_Goma/func_80A49D0C.s | 13 +- .../actors/ovl_En_Goma/func_80A49E80.s | 2 - .../actors/ovl_En_Goma/func_80A49F10.s | 2 - .../actors/ovl_En_Goma/func_80A49F94.s | 2 - .../actors/ovl_En_Goma/func_80A4A010.s | 2 - .../actors/ovl_En_Goma/func_80A4A0A8.s | 2 - .../actors/ovl_En_Goma/func_80A4A120.s | 2 - .../actors/ovl_En_Goma/func_80A4A18C.s | 2 - .../actors/ovl_En_Goma/func_80A4A234.s | 2 - .../actors/ovl_En_Goma/func_80A4A2EC.s | 2 - .../actors/ovl_En_Goma/func_80A4A368.s | 2 - .../actors/ovl_En_Goma/func_80A4A470.s | 2 - .../actors/ovl_En_Goma/func_80A4A50C.s | 2 - .../actors/ovl_En_Goma/func_80A4A608.s | 2 - .../actors/ovl_En_Goma/func_80A4A6AC.s | 7 +- .../actors/ovl_En_Goma/func_80A4A8D4.s | 2 - .../actors/ovl_En_Goma/func_80A4A964.s | 11 +- .../actors/ovl_En_Goma/func_80A4ACC0.s | 12 +- .../actors/ovl_En_Goma/func_80A4AE60.s | 2 - .../actors/ovl_En_Goma/func_80A4B3AC.s | 2 - .../actors/ovl_En_Goma/func_80A4B3F0.s | 7 +- .../actors/ovl_En_Goma/func_80A4B554.s | 6 +- .../actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s | 2 - .../actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s | 1 - .../actors/ovl_En_Goroiwa/EnGoroiwa_Init.s | 24 +- .../actors/ovl_En_Goroiwa/EnGoroiwa_Update.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4BCA0.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4BD04.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4BD70.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4BD8C.s | 7 +- .../actors/ovl_En_Goroiwa/func_80A4BE10.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4BE54.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4BF28.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C080.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C134.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C164.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C188.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C1C4.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C264.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C27C.s | 16 +- .../actors/ovl_En_Goroiwa/func_80A4C3A4.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C594.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4C6C8.s | 7 +- .../actors/ovl_En_Goroiwa/func_80A4C814.s | 7 +- .../actors/ovl_En_Goroiwa/func_80A4CA50.s | 7 +- .../actors/ovl_En_Goroiwa/func_80A4CB78.s | 12 +- .../actors/ovl_En_Goroiwa/func_80A4CED8.s | 15 +- .../actors/ovl_En_Goroiwa/func_80A4D074.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4D0FC.s | 9 +- .../actors/ovl_En_Goroiwa/func_80A4D5E0.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4D624.s | 16 +- .../actors/ovl_En_Goroiwa/func_80A4D8CC.s | 9 +- .../actors/ovl_En_Goroiwa/func_80A4D944.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4D9DC.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4DA3C.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4DA7C.s | 7 +- .../actors/ovl_En_Goroiwa/func_80A4DAD0.s | 2 - .../actors/ovl_En_Goroiwa/func_80A4DB90.s | 10 +- .../actors/ovl_En_Goroiwa/func_80A4DC00.s | 2 - .../overlays/actors/ovl_En_Gs/EnGs_Destroy.s | 2 - .../overlays/actors/ovl_En_Gs/EnGs_Draw.s | 44 +- .../overlays/actors/ovl_En_Gs/EnGs_Init.s | 2 - .../overlays/actors/ovl_En_Gs/EnGs_Update.s | 11 +- .../overlays/actors/ovl_En_Gs/func_80A4E3EC.s | 2 - .../overlays/actors/ovl_En_Gs/func_80A4E470.s | 2 - .../overlays/actors/ovl_En_Gs/func_80A4E648.s | 2 - .../overlays/actors/ovl_En_Gs/func_80A4E754.s | 9 +- .../overlays/actors/ovl_En_Gs/func_80A4E910.s | 12 +- .../overlays/actors/ovl_En_Gs/func_80A4EA08.s | 18 +- .../overlays/actors/ovl_En_Gs/func_80A4EB3C.s | 19 +- .../overlays/actors/ovl_En_Gs/func_80A4ED34.s | 12 +- .../overlays/actors/ovl_En_Gs/func_80A4F13C.s | 54 +- .../overlays/actors/ovl_En_Gs/func_80A4F700.s | 2 - .../overlays/actors/ovl_En_Gs/func_80A4F734.s | 2 - .../overlays/actors/ovl_En_Gs/func_80A4F77C.s | 2 - .../actors/ovl_En_Guest/EnGuest_Destroy.s | 2 - .../actors/ovl_En_Guest/EnGuest_Init.s | 28 +- .../actors/ovl_En_Guest/EnGuest_Update.s | 2 - .../actors/ovl_En_Guest/func_80A5046C.s | 2 - .../actors/ovl_En_Guest/func_80A50518.s | 2 - .../actors/ovl_En_Guest/func_80A5057C.s | 2 - .../actors/ovl_En_Guest/func_80A505CC.s | 2 - .../actors/ovl_En_Guest/func_80A50708.s | 2 - .../actors/ovl_En_Guest/func_80A50774.s | 25 +- .../actors/ovl_En_Guest/func_80A509D4.s | 11 +- .../actors/ovl_En_Hata/EnHata_Destroy.s | 2 - .../overlays/actors/ovl_En_Hata/EnHata_Draw.s | 6 +- .../overlays/actors/ovl_En_Hata/EnHata_Init.s | 11 +- .../actors/ovl_En_Hata/EnHata_Update.s | 2 - .../actors/ovl_En_Hata/func_80A510E4.s | 2 - .../actors/ovl_En_Hata/func_80A51164.s | 2 - .../actors/ovl_En_Heishi1/EnHeishi1_Destroy.s | 2 - .../actors/ovl_En_Heishi1/EnHeishi1_Draw.s | 1 - .../actors/ovl_En_Heishi1/EnHeishi1_Init.s | 56 +- .../actors/ovl_En_Heishi1/EnHeishi1_Update.s | 17 +- .../actors/ovl_En_Heishi1/func_80A5162C.s | 7 +- .../actors/ovl_En_Heishi1/func_80A516E4.s | 34 +- .../actors/ovl_En_Heishi1/func_80A51A98.s | 2 - .../actors/ovl_En_Heishi1/func_80A51B54.s | 2 - .../actors/ovl_En_Heishi1/func_80A51C4C.s | 7 +- .../actors/ovl_En_Heishi1/func_80A51D18.s | 24 +- .../actors/ovl_En_Heishi1/func_80A51F50.s | 2 - .../actors/ovl_En_Heishi1/func_80A51FEC.s | 2 - .../actors/ovl_En_Heishi1/func_80A52098.s | 2 - .../actors/ovl_En_Heishi1/func_80A5212C.s | 2 - .../actors/ovl_En_Heishi1/func_80A521FC.s | 2 - .../actors/ovl_En_Heishi1/func_80A52290.s | 8 +- .../actors/ovl_En_Heishi1/func_80A5263C.s | 2 - .../actors/ovl_En_Heishi2/EnHeishi2_Destroy.s | 2 - .../actors/ovl_En_Heishi2/EnHeishi2_Draw.s | 21 +- .../actors/ovl_En_Heishi2/EnHeishi2_Init.s | 36 +- .../actors/ovl_En_Heishi2/EnHeishi2_Update.s | 2 - .../actors/ovl_En_Heishi2/func_80A531CC.s | 2 - .../actors/ovl_En_Heishi2/func_80A531D8.s | 2 - .../actors/ovl_En_Heishi2/func_80A531E4.s | 2 - .../actors/ovl_En_Heishi2/func_80A53278.s | 28 +- .../actors/ovl_En_Heishi2/func_80A5344C.s | 2 - .../actors/ovl_En_Heishi2/func_80A53538.s | 2 - .../actors/ovl_En_Heishi2/func_80A535BC.s | 2 - .../actors/ovl_En_Heishi2/func_80A53638.s | 8 +- .../actors/ovl_En_Heishi2/func_80A5372C.s | 17 +- .../actors/ovl_En_Heishi2/func_80A53850.s | 2 - .../actors/ovl_En_Heishi2/func_80A53908.s | 2 - .../actors/ovl_En_Heishi2/func_80A5399C.s | 8 +- .../actors/ovl_En_Heishi2/func_80A53AD4.s | 2 - .../actors/ovl_En_Heishi2/func_80A53C0C.s | 2 - .../actors/ovl_En_Heishi2/func_80A53C90.s | 2 - .../actors/ovl_En_Heishi2/func_80A53D0C.s | 8 +- .../actors/ovl_En_Heishi2/func_80A53DF8.s | 13 +- .../actors/ovl_En_Heishi2/func_80A53F30.s | 2 - .../actors/ovl_En_Heishi2/func_80A54038.s | 2 - .../actors/ovl_En_Heishi2/func_80A540C0.s | 2 - .../actors/ovl_En_Heishi2/func_80A541FC.s | 2 - .../actors/ovl_En_Heishi2/func_80A5427C.s | 2 - .../actors/ovl_En_Heishi2/func_80A54320.s | 2 - .../actors/ovl_En_Heishi2/func_80A543A0.s | 2 - .../actors/ovl_En_Heishi2/func_80A544AC.s | 2 - .../actors/ovl_En_Heishi2/func_80A5455C.s | 12 +- .../actors/ovl_En_Heishi2/func_80A546DC.s | 2 - .../actors/ovl_En_Heishi2/func_80A5475C.s | 2 - .../actors/ovl_En_Heishi2/func_80A54954.s | 2 - .../actors/ovl_En_Heishi2/func_80A549E8.s | 2 - .../actors/ovl_En_Heishi2/func_80A54BC0.s | 2 - .../actors/ovl_En_Heishi2/func_80A54C34.s | 2 - .../actors/ovl_En_Heishi2/func_80A54C6C.s | 16 +- .../actors/ovl_En_Heishi3/EnHeishi3_Destroy.s | 2 - .../actors/ovl_En_Heishi3/EnHeishi3_Draw.s | 1 - .../actors/ovl_En_Heishi3/EnHeishi3_Init.s | 8 +- .../actors/ovl_En_Heishi3/EnHeishi3_Update.s | 2 - .../actors/ovl_En_Heishi3/func_80A557A0.s | 2 - .../actors/ovl_En_Heishi3/func_80A55850.s | 8 +- .../actors/ovl_En_Heishi3/func_80A559B4.s | 8 +- .../actors/ovl_En_Heishi3/func_80A55B2C.s | 2 - .../actors/ovl_En_Heishi3/func_80A55BD4.s | 2 - .../actors/ovl_En_Heishi3/func_80A55C6C.s | 2 - .../actors/ovl_En_Heishi3/func_80A55D00.s | 2 - .../actors/ovl_En_Heishi3/func_80A55E88.s | 2 - .../actors/ovl_En_Heishi4/EnHeishi4_Destroy.s | 2 - .../actors/ovl_En_Heishi4/EnHeishi4_Draw.s | 1 - .../actors/ovl_En_Heishi4/EnHeishi4_Init.s | 24 +- .../actors/ovl_En_Heishi4/EnHeishi4_Update.s | 2 - .../actors/ovl_En_Heishi4/func_80A56328.s | 2 - .../actors/ovl_En_Heishi4/func_80A563BC.s | 2 - .../actors/ovl_En_Heishi4/func_80A56544.s | 8 +- .../actors/ovl_En_Heishi4/func_80A56614.s | 2 - .../actors/ovl_En_Heishi4/func_80A5673C.s | 16 +- .../actors/ovl_En_Heishi4/func_80A56874.s | 2 - .../actors/ovl_En_Heishi4/func_80A56900.s | 2 - .../actors/ovl_En_Heishi4/func_80A56994.s | 2 - .../actors/ovl_En_Heishi4/func_80A56A50.s | 2 - .../actors/ovl_En_Heishi4/func_80A56ACC.s | 2 - .../actors/ovl_En_Heishi4/func_80A56B40.s | 2 - .../actors/ovl_En_Heishi4/func_80A56E14.s | 2 - .../ovl_En_Hintnuts/EnHintnuts_Destroy.s | 2 - .../actors/ovl_En_Hintnuts/EnHintnuts_Draw.s | 1 - .../actors/ovl_En_Hintnuts/EnHintnuts_Init.s | 2 - .../ovl_En_Hintnuts/EnHintnuts_Update.s | 2 - .../actors/ovl_En_Hintnuts/func_80A573D0.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57454.s | 2 - .../actors/ovl_En_Hintnuts/func_80A574D4.s | 2 - .../actors/ovl_En_Hintnuts/func_80A5751C.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57558.s | 2 - .../actors/ovl_En_Hintnuts/func_80A575C0.s | 2 - .../actors/ovl_En_Hintnuts/func_80A5760C.s | 2 - .../actors/ovl_En_Hintnuts/func_80A576FC.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57744.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57790.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57850.s | 2 - .../actors/ovl_En_Hintnuts/func_80A578FC.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57B60.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57BE4.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57CA8.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57DE4.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57EF8.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57F5C.s | 2 - .../actors/ovl_En_Hintnuts/func_80A57F94.s | 2 - .../actors/ovl_En_Hintnuts/func_80A58028.s | 2 - .../actors/ovl_En_Hintnuts/func_80A582B8.s | 2 - .../actors/ovl_En_Hintnuts/func_80A58320.s | 2 - .../actors/ovl_En_Hintnuts/func_80A584DC.s | 2 - .../actors/ovl_En_Hintnuts/func_80A58608.s | 2 - .../actors/ovl_En_Hintnuts/func_80A58838.s | 15 +- .../actors/ovl_En_Holl/EnHoll_Destroy.s | 2 - .../overlays/actors/ovl_En_Holl/EnHoll_Draw.s | 19 +- .../overlays/actors/ovl_En_Holl/EnHoll_Init.s | 2 - .../actors/ovl_En_Holl/EnHoll_Update.s | 2 - .../actors/ovl_En_Holl/func_80A58C10.s | 2 - .../actors/ovl_En_Holl/func_80A58C18.s | 2 - .../actors/ovl_En_Holl/func_80A58C48.s | 2 - .../actors/ovl_En_Holl/func_80A58D18.s | 2 - .../actors/ovl_En_Holl/func_80A58DD4.s | 2 - .../actors/ovl_En_Holl/func_80A59014.s | 2 - .../actors/ovl_En_Holl/func_80A591C0.s | 7 +- .../actors/ovl_En_Holl/func_80A593A4.s | 7 +- .../actors/ovl_En_Holl/func_80A59520.s | 2 - .../actors/ovl_En_Holl/func_80A59618.s | 7 +- .../actors/ovl_En_Holl/func_80A59828.s | 2 - .../ovl_En_Honotrap/EnHonotrap_Destroy.s | 2 - .../actors/ovl_En_Honotrap/EnHonotrap_Draw.s | 1 - .../actors/ovl_En_Honotrap/EnHonotrap_Init.s | 2 - .../ovl_En_Honotrap/EnHonotrap_Update.s | 2 - .../actors/ovl_En_Honotrap/func_80A59C30.s | 2 - .../actors/ovl_En_Honotrap/func_80A59CC0.s | 16 +- .../actors/ovl_En_Honotrap/func_80A59D70.s | 2 - .../actors/ovl_En_Honotrap/func_80A59F08.s | 7 +- .../actors/ovl_En_Honotrap/func_80A5A0E4.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A0FC.s | 7 +- .../actors/ovl_En_Honotrap/func_80A5A1B4.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A208.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A2D8.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A2EC.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A31C.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A32C.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A378.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A388.s | 9 +- .../actors/ovl_En_Honotrap/func_80A5A41C.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A484.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A5C8.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A658.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A824.s | 2 - .../actors/ovl_En_Honotrap/func_80A5A860.s | 14 +- .../actors/ovl_En_Honotrap/func_80A5AA14.s | 2 - .../actors/ovl_En_Honotrap/func_80A5AA24.s | 2 - .../actors/ovl_En_Honotrap/func_80A5ABFC.s | 16 +- .../actors/ovl_En_Honotrap/func_80A5AD28.s | 20 +- .../actors/ovl_En_Horse/EnHorse_Destroy.s | 2 - .../actors/ovl_En_Horse/EnHorse_Draw.s | 1 - .../actors/ovl_En_Horse/EnHorse_Init.s | 16 +- .../actors/ovl_En_Horse/EnHorse_Update.s | 7 +- .../actors/ovl_En_Horse/func_80A5B2F0.s | 7 +- .../actors/ovl_En_Horse/func_80A5B450.s | 7 +- .../actors/ovl_En_Horse/func_80A5B590.s | 2 - .../actors/ovl_En_Horse/func_80A5B5E0.s | 2 - .../actors/ovl_En_Horse/func_80A5B61C.s | 19 +- .../actors/ovl_En_Horse/func_80A5B9C8.s | 2 - .../actors/ovl_En_Horse/func_80A5BA84.s | 2 - .../actors/ovl_En_Horse/func_80A5BACC.s | 2 - .../actors/ovl_En_Horse/func_80A5BB14.s | 9 +- .../actors/ovl_En_Horse/func_80A5BB90.s | 2 - .../actors/ovl_En_Horse/func_80A5BBBC.s | 7 +- .../actors/ovl_En_Horse/func_80A5BC68.s | 2 - .../actors/ovl_En_Horse/func_80A5BD94.s | 7 +- .../actors/ovl_En_Horse/func_80A5BFD8.s | 2 - .../actors/ovl_En_Horse/func_80A5BFEC.s | 2 - .../actors/ovl_En_Horse/func_80A5BFF8.s | 2 - .../actors/ovl_En_Horse/func_80A5C0B4.s | 2 - .../actors/ovl_En_Horse/func_80A5C0C8.s | 2 - .../actors/ovl_En_Horse/func_80A5C888.s | 2 - .../actors/ovl_En_Horse/func_80A5C8FC.s | 2 - .../actors/ovl_En_Horse/func_80A5C97C.s | 2 - .../actors/ovl_En_Horse/func_80A5CAEC.s | 16 +- .../actors/ovl_En_Horse/func_80A5CF28.s | 2 - .../actors/ovl_En_Horse/func_80A5CF64.s | 2 - .../actors/ovl_En_Horse/func_80A5D0A0.s | 7 +- .../actors/ovl_En_Horse/func_80A5D1A0.s | 2 - .../actors/ovl_En_Horse/func_80A5D1C4.s | 2 - .../actors/ovl_En_Horse/func_80A5D2C0.s | 7 +- .../actors/ovl_En_Horse/func_80A5D3C0.s | 2 - .../actors/ovl_En_Horse/func_80A5D468.s | 9 +- .../actors/ovl_En_Horse/func_80A5D628.s | 2 - .../actors/ovl_En_Horse/func_80A5D678.s | 2 - .../actors/ovl_En_Horse/func_80A5D69C.s | 2 - .../actors/ovl_En_Horse/func_80A5D748.s | 2 - .../actors/ovl_En_Horse/func_80A5D79C.s | 7 +- .../actors/ovl_En_Horse/func_80A5DA68.s | 2 - .../actors/ovl_En_Horse/func_80A5DB0C.s | 2 - .../actors/ovl_En_Horse/func_80A5DB58.s | 7 +- .../actors/ovl_En_Horse/func_80A5DC8C.s | 2 - .../actors/ovl_En_Horse/func_80A5DCB0.s | 2 - .../actors/ovl_En_Horse/func_80A5DD58.s | 2 - .../actors/ovl_En_Horse/func_80A5DDB0.s | 7 +- .../actors/ovl_En_Horse/func_80A5DE38.s | 9 +- .../actors/ovl_En_Horse/func_80A5E00C.s | 2 - .../actors/ovl_En_Horse/func_80A5E12C.s | 2 - .../actors/ovl_En_Horse/func_80A5E2A8.s | 2 - .../actors/ovl_En_Horse/func_80A5E39C.s | 7 +- .../actors/ovl_En_Horse/func_80A5E588.s | 2 - .../actors/ovl_En_Horse/func_80A5E5AC.s | 2 - .../actors/ovl_En_Horse/func_80A5E650.s | 2 - .../actors/ovl_En_Horse/func_80A5E9F8.s | 2 - .../actors/ovl_En_Horse/func_80A5EA1C.s | 7 +- .../actors/ovl_En_Horse/func_80A5EB4C.s | 2 - .../actors/ovl_En_Horse/func_80A5EB54.s | 7 +- .../actors/ovl_En_Horse/func_80A5ED18.s | 2 - .../actors/ovl_En_Horse/func_80A5ED3C.s | 7 +- .../actors/ovl_En_Horse/func_80A5EE78.s | 2 - .../actors/ovl_En_Horse/func_80A5EE80.s | 7 +- .../actors/ovl_En_Horse/func_80A5F044.s | 2 - .../actors/ovl_En_Horse/func_80A5F08C.s | 2 - .../actors/ovl_En_Horse/func_80A5F1B0.s | 2 - .../actors/ovl_En_Horse/func_80A5F380.s | 2 - .../actors/ovl_En_Horse/func_80A5F3A8.s | 2 - .../actors/ovl_En_Horse/func_80A5F3DC.s | 2 - .../actors/ovl_En_Horse/func_80A5F414.s | 2 - .../actors/ovl_En_Horse/func_80A5F5F8.s | 2 - .../actors/ovl_En_Horse/func_80A5F760.s | 2 - .../actors/ovl_En_Horse/func_80A5F890.s | 15 +- .../actors/ovl_En_Horse/func_80A5FCAC.s | 2 - .../actors/ovl_En_Horse/func_80A5FD30.s | 2 - .../actors/ovl_En_Horse/func_80A5FDD4.s | 7 +- .../actors/ovl_En_Horse/func_80A600E8.s | 7 +- .../actors/ovl_En_Horse/func_80A60294.s | 7 +- .../actors/ovl_En_Horse/func_80A60300.s | 10 +- .../actors/ovl_En_Horse/func_80A6044C.s | 2 - .../actors/ovl_En_Horse/func_80A60470.s | 7 +- .../actors/ovl_En_Horse/func_80A605A4.s | 2 - .../actors/ovl_En_Horse/func_80A605E0.s | 10 +- .../actors/ovl_En_Horse/func_80A60838.s | 2 - .../actors/ovl_En_Horse/func_80A60954.s | 2 - .../actors/ovl_En_Horse/func_80A60AFC.s | 7 +- .../actors/ovl_En_Horse/func_80A60BDC.s | 10 +- .../actors/ovl_En_Horse/func_80A60D28.s | 2 - .../actors/ovl_En_Horse/func_80A60EB0.s | 2 - .../actors/ovl_En_Horse/func_80A61058.s | 2 - .../actors/ovl_En_Horse/func_80A61078.s | 2 - .../actors/ovl_En_Horse/func_80A610C8.s | 2 - .../actors/ovl_En_Horse/func_80A6121C.s | 10 +- .../actors/ovl_En_Horse/func_80A6140C.s | 2 - .../actors/ovl_En_Horse/func_80A61440.s | 7 +- .../actors/ovl_En_Horse/func_80A61778.s | 7 +- .../actors/ovl_En_Horse/func_80A61A04.s | 2 - .../actors/ovl_En_Horse/func_80A61A28.s | 20 +- .../actors/ovl_En_Horse/func_80A62278.s | 10 +- .../actors/ovl_En_Horse/func_80A624AC.s | 2 - .../actors/ovl_En_Horse/func_80A6255C.s | 7 +- .../actors/ovl_En_Horse/func_80A626B8.s | 2 - .../actors/ovl_En_Horse/func_80A627A4.s | 2 - .../actors/ovl_En_Horse/func_80A627E8.s | 2 - .../actors/ovl_En_Horse/func_80A62868.s | 9 +- .../actors/ovl_En_Horse/func_80A629A4.s | 2 - .../actors/ovl_En_Horse/func_80A62ACC.s | 13 +- .../actors/ovl_En_Horse/func_80A6304C.s | 2 - .../actors/ovl_En_Horse/func_80A63148.s | 7 +- .../actors/ovl_En_Horse/func_80A631D4.s | 2 - .../actors/ovl_En_Horse/func_80A63210.s | 11 +- .../actors/ovl_En_Horse/func_80A63364.s | 2 - .../actors/ovl_En_Horse/func_80A634A0.s | 27 +- .../actors/ovl_En_Horse/func_80A63FA8.s | 7 +- .../actors/ovl_En_Horse/func_80A64150.s | 2 - .../actors/ovl_En_Horse/func_80A6437C.s | 9 +- .../actors/ovl_En_Horse/func_80A64480.s | 9 +- .../actors/ovl_En_Horse/func_80A64578.s | 2 - .../actors/ovl_En_Horse/func_80A6467C.s | 2 - .../actors/ovl_En_Horse/func_80A64ED4.s | 2 - .../actors/ovl_En_Horse/func_80A64F14.s | 7 +- .../actors/ovl_En_Horse/func_80A65014.s | 2 - .../actors/ovl_En_Horse/func_80A6506C.s | 2 - .../actors/ovl_En_Horse/func_80A65108.s | 24 +- .../actors/ovl_En_Horse/func_80A65C00.s | 12 +- .../EnHorseGameCheck_Destroy.s | 2 - .../EnHorseGameCheck_Draw.s | 1 - .../EnHorseGameCheck_Init.s | 2 - .../EnHorseGameCheck_Update.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67550.s | 12 +- .../ovl_En_Horse_Game_Check/func_80A67608.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67618.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67764.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67BDC.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67BF8.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67C08.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67C50.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67C68.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67C78.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67C88.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67CD4.s | 2 - .../ovl_En_Horse_Game_Check/func_80A67CE4.s | 8 +- .../ovl_En_Horse_Game_Check/func_80A67DFC.s | 2 - .../ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s | 2 - .../ovl_En_Horse_Ganon/EnHorseGanon_Draw.s | 1 - .../ovl_En_Horse_Ganon/EnHorseGanon_Init.s | 2 - .../ovl_En_Horse_Ganon/EnHorseGanon_Update.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68660.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A686A8.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68870.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68AC4.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68AF0.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68B20.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68DB0.s | 2 - .../actors/ovl_En_Horse_Ganon/func_80A68E14.s | 7 +- .../actors/ovl_En_Horse_Ganon/func_80A68FA8.s | 2 - .../EnHorseLinkChild_Destroy.s | 2 - .../EnHorseLinkChild_Draw.s | 1 - .../EnHorseLinkChild_Init.s | 2 - .../EnHorseLinkChild_Update.s | 7 +- .../ovl_En_Horse_Link_Child/func_80A693D0.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6948C.s | 2 - .../ovl_En_Horse_Link_Child/func_80A695A4.s | 9 +- .../ovl_En_Horse_Link_Child/func_80A6988C.s | 2 - .../ovl_En_Horse_Link_Child/func_80A698F4.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6993C.s | 2 - .../ovl_En_Horse_Link_Child/func_80A699FC.s | 2 - .../ovl_En_Horse_Link_Child/func_80A69B7C.s | 2 - .../ovl_En_Horse_Link_Child/func_80A69C18.s | 2 - .../ovl_En_Horse_Link_Child/func_80A69EC0.s | 2 - .../ovl_En_Horse_Link_Child/func_80A69F5C.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6A068.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6A4DC.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6A5A4.s | 7 +- .../ovl_En_Horse_Link_Child/func_80A6A724.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6A7D0.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6ABF8.s | 2 - .../ovl_En_Horse_Link_Child/func_80A6AD84.s | 12 +- .../EnHorseNormal_Destroy.s | 2 - .../ovl_En_Horse_Normal/EnHorseNormal_Draw.s | 30 +- .../ovl_En_Horse_Normal/EnHorseNormal_Init.s | 17 +- .../EnHorseNormal_Update.s | 2 - .../ovl_En_Horse_Normal/func_80A6B250.s | 2 - .../ovl_En_Horse_Normal/func_80A6B30C.s | 9 +- .../ovl_En_Horse_Normal/func_80A6B91C.s | 2 - .../ovl_En_Horse_Normal/func_80A6B9D0.s | 7 +- .../ovl_En_Horse_Normal/func_80A6BBAC.s | 2 - .../ovl_En_Horse_Normal/func_80A6BC00.s | 2 - .../ovl_En_Horse_Normal/func_80A6BC48.s | 2 - .../ovl_En_Horse_Normal/func_80A6BCEC.s | 2 - .../ovl_En_Horse_Normal/func_80A6BD7C.s | 2 - .../ovl_En_Horse_Normal/func_80A6BE6C.s | 10 +- .../ovl_En_Horse_Normal/func_80A6C4CC.s | 2 - .../ovl_En_Horse_Normal/func_80A6C570.s | 10 +- .../ovl_En_Horse_Normal/func_80A6C6B0.s | 2 - .../ovl_En_Horse_Normal/func_80A6C760.s | 10 +- .../ovl_En_Horse_Normal/func_80A6C8E0.s | 7 +- .../ovl_En_Horse_Normal/func_80A6CAFC.s | 2 - .../ovl_En_Horse_Normal/func_80A6CC88.s | 2 - .../ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s | 2 - .../ovl_En_Horse_Zelda/EnHorseZelda_Draw.s | 1 - .../ovl_En_Horse_Zelda/EnHorseZelda_Init.s | 2 - .../ovl_En_Horse_Zelda/EnHorseZelda_Update.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6D8D0.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6D918.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6DC7C.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6DCCC.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6DD14.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6DDFC.s | 2 - .../actors/ovl_En_Horse_Zelda/func_80A6DE38.s | 7 +- .../actors/ovl_En_Horse_Zelda/func_80A6DFD4.s | 2 - .../overlays/actors/ovl_En_Hs/EnHs_Destroy.s | 2 - .../overlays/actors/ovl_En_Hs/EnHs_Draw.s | 1 - .../overlays/actors/ovl_En_Hs/EnHs_Init.s | 16 +- .../overlays/actors/ovl_En_Hs/EnHs_Update.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E3A0.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E53C.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E5EC.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E630.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E6B0.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E6D8.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E70C.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E740.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E7BC.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E8CC.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6E9AC.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6EC58.s | 12 +- .../overlays/actors/ovl_En_Hs/func_80A6ECBC.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6ECC8.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6ECE8.s | 2 - .../overlays/actors/ovl_En_Hs/func_80A6ED14.s | 2 - .../actors/ovl_En_Hs2/EnHs2_Destroy.s | 2 - .../overlays/actors/ovl_En_Hs2/EnHs2_Draw.s | 1 - .../overlays/actors/ovl_En_Hs2/EnHs2_Init.s | 8 +- .../overlays/actors/ovl_En_Hs2/EnHs2_Update.s | 2 - .../actors/ovl_En_Hs2/func_80A6F0B4.s | 2 - .../actors/ovl_En_Hs2/func_80A6F164.s | 2 - .../actors/ovl_En_Hs2/func_80A6F1A4.s | 2 - .../actors/ovl_En_Hs2/func_80A6F358.s | 14 +- .../actors/ovl_En_Hs2/func_80A6F390.s | 2 - .../actors/ovl_En_Hs2/func_80A6F3C8.s | 2 - .../actors/ovl_En_Hs2/func_80A6F3E0.s | 2 - .../overlays/actors/ovl_En_Hy/EnHy_Destroy.s | 2 - .../overlays/actors/ovl_En_Hy/EnHy_Draw.s | 33 +- .../overlays/actors/ovl_En_Hy/EnHy_Init.s | 2 - .../overlays/actors/ovl_En_Hy/EnHy_Update.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A6F5B0.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A6F6C0.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A6F744.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A6F790.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A6F7CC.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A6F810.s | 27 +- .../overlays/actors/ovl_En_Hy/func_80A70058.s | 56 +- .../overlays/actors/ovl_En_Hy/func_80A705A4.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70660.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70698.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70734.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70834.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70978.s | 25 +- .../overlays/actors/ovl_En_Hy/func_80A70AE4.s | 33 +- .../overlays/actors/ovl_En_Hy/func_80A70BAC.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70C08.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70C44.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70CD8.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A70E34.s | 27 +- .../overlays/actors/ovl_En_Hy/func_80A710F8.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A711B4.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A7127C.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A712B4.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A712C0.s | 7 +- .../overlays/actors/ovl_En_Hy/func_80A7134C.s | 7 +- .../overlays/actors/ovl_En_Hy/func_80A714C4.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A71530.s | 2 - .../overlays/actors/ovl_En_Hy/func_80A716B8.s | 25 +- .../overlays/actors/ovl_En_Hy/func_80A71A64.s | 12 +- .../overlays/actors/ovl_En_Hy/func_80A71BBC.s | 2 - .../ovl_En_Ice_Hono/EnIceHono_Destroy.s | 2 - .../actors/ovl_En_Ice_Hono/EnIceHono_Draw.s | 19 +- .../actors/ovl_En_Ice_Hono/EnIceHono_Init.s | 14 +- .../actors/ovl_En_Ice_Hono/EnIceHono_Update.s | 23 +- .../actors/ovl_En_Ice_Hono/func_80A72FF0.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A7301C.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A730BC.s | 13 +- .../actors/ovl_En_Ice_Hono/func_80A731C0.s | 9 +- .../actors/ovl_En_Ice_Hono/func_80A733E8.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A734D4.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A734F8.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A735A0.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A735C0.s | 9 +- .../actors/ovl_En_Ice_Hono/func_80A73780.s | 2 - .../actors/ovl_En_Ice_Hono/func_80A737A0.s | 11 +- .../actors/ovl_En_Ice_Hono/func_80A739FC.s | 18 +- .../actors/ovl_En_Ice_Hono/func_80A73AD0.s | 7 +- .../overlays/actors/ovl_En_Ik/EnIk_Destroy.s | 2 - .../overlays/actors/ovl_En_Ik/EnIk_Draw.s | 8 +- .../overlays/actors/ovl_En_Ik/EnIk_Init.s | 1 - .../overlays/actors/ovl_En_Ik/EnIk_Update.s | 8 +- .../overlays/actors/ovl_En_Ik/func_80A74390.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A74398.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A745E4.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A74674.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A74714.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A747C0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7489C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7492C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A74AAC.s | 7 +- .../overlays/actors/ovl_En_Ik/func_80A74BA4.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A74E2C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A74EBC.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7506C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7510C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A751C8.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A75260.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A753D0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7545C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A754A0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A75530.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A755F0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7567C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A75790.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A758B0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7598C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A75A38.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A75C38.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A75FA0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A761B0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7626C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A76330.s | 32 +- .../overlays/actors/ovl_En_Ik/func_80A76798.s | 12 +- .../overlays/actors/ovl_En_Ik/func_80A76BF4.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A76C14.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A76DDC.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A76E2C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77034.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7707C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7709C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A770C0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77140.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77148.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77158.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A771E4.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77264.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A772A4.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A772EC.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7735C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77434.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77474.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7748C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A774BC.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A774F8.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77530.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A7759C.s | 50 +- .../overlays/actors/ovl_En_Ik/func_80A77844.s | 12 +- .../overlays/actors/ovl_En_Ik/func_80A779DC.s | 18 +- .../overlays/actors/ovl_En_Ik/func_80A77AEC.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77B0C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77B3C.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77BF8.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77C7C.s | 52 +- .../overlays/actors/ovl_En_Ik/func_80A77ED0.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A77EDC.s | 12 +- .../overlays/actors/ovl_En_Ik/func_80A780D0.s | 8 +- .../overlays/actors/ovl_En_Ik/func_80A78160.s | 2 - .../overlays/actors/ovl_En_Ik/func_80A781CC.s | 2 - .../overlays/actors/ovl_En_In/EnIn_Destroy.s | 2 - .../overlays/actors/ovl_En_In/EnIn_Draw.s | 11 +- .../overlays/actors/ovl_En_In/EnIn_Init.s | 9 +- .../overlays/actors/ovl_En_In/EnIn_Update.s | 2 - .../overlays/actors/ovl_En_In/func_80A78FB0.s | 2 - .../overlays/actors/ovl_En_In/func_80A79010.s | 13 +- .../overlays/actors/ovl_En_In/func_80A79168.s | 2 - .../overlays/actors/ovl_En_In/func_80A791CC.s | 2 - .../overlays/actors/ovl_En_In/func_80A7924C.s | 15 +- .../overlays/actors/ovl_En_In/func_80A7949C.s | 2 - .../overlays/actors/ovl_En_In/func_80A79500.s | 21 +- .../overlays/actors/ovl_En_In/func_80A795C8.s | 2 - .../overlays/actors/ovl_En_In/func_80A79690.s | 2 - .../overlays/actors/ovl_En_In/func_80A796EC.s | 2 - .../overlays/actors/ovl_En_In/func_80A7975C.s | 2 - .../overlays/actors/ovl_En_In/func_80A79830.s | 2 - .../overlays/actors/ovl_En_In/func_80A79A2C.s | 2 - .../overlays/actors/ovl_En_In/func_80A79AB4.s | 2 - .../overlays/actors/ovl_En_In/func_80A79BAC.s | 2 - .../overlays/actors/ovl_En_In/func_80A79C78.s | 2 - .../overlays/actors/ovl_En_In/func_80A79FB0.s | 23 +- .../overlays/actors/ovl_En_In/func_80A7A304.s | 7 +- .../overlays/actors/ovl_En_In/func_80A7A4BC.s | 2 - .../overlays/actors/ovl_En_In/func_80A7A4C8.s | 2 - .../overlays/actors/ovl_En_In/func_80A7A568.s | 2 - .../overlays/actors/ovl_En_In/func_80A7A770.s | 2 - .../overlays/actors/ovl_En_In/func_80A7A848.s | 2 - .../overlays/actors/ovl_En_In/func_80A7A940.s | 2 - .../overlays/actors/ovl_En_In/func_80A7AA40.s | 2 - .../overlays/actors/ovl_En_In/func_80A7ABD4.s | 2 - .../overlays/actors/ovl_En_In/func_80A7AE84.s | 2 - .../overlays/actors/ovl_En_In/func_80A7AEF0.s | 2 - .../overlays/actors/ovl_En_In/func_80A7B018.s | 2 - .../overlays/actors/ovl_En_In/func_80A7B024.s | 2 - .../overlays/actors/ovl_En_In/func_80A7B320.s | 21 +- .../overlays/actors/ovl_En_In/func_80A7B570.s | 12 +- .../actors/ovl_En_Insect/EnInsect_Destroy.s | 2 - .../actors/ovl_En_Insect/EnInsect_Draw.s | 1 - .../actors/ovl_En_Insect/EnInsect_Init.s | 12 +- .../actors/ovl_En_Insect/EnInsect_Update.s | 2 - .../actors/ovl_En_Insect/func_80A7BE20.s | 2 - .../actors/ovl_En_Insect/func_80A7BE40.s | 2 - .../actors/ovl_En_Insect/func_80A7BE6C.s | 2 - .../actors/ovl_En_Insect/func_80A7BF58.s | 2 - .../actors/ovl_En_Insect/func_80A7BFA0.s | 2 - .../actors/ovl_En_Insect/func_80A7C058.s | 7 +- .../actors/ovl_En_Insect/func_80A7C3A0.s | 2 - .../actors/ovl_En_Insect/func_80A7C3F4.s | 13 +- .../actors/ovl_En_Insect/func_80A7C598.s | 2 - .../actors/ovl_En_Insect/func_80A7C5EC.s | 13 +- .../actors/ovl_En_Insect/func_80A7C818.s | 2 - .../actors/ovl_En_Insect/func_80A7C86C.s | 13 +- .../actors/ovl_En_Insect/func_80A7CA64.s | 7 +- .../actors/ovl_En_Insect/func_80A7CAD0.s | 13 +- .../actors/ovl_En_Insect/func_80A7CBC8.s | 7 +- .../actors/ovl_En_Insect/func_80A7CC3C.s | 23 +- .../actors/ovl_En_Insect/func_80A7CE60.s | 2 - .../actors/ovl_En_Insect/func_80A7CEC0.s | 15 +- .../actors/ovl_En_Insect/func_80A7D1F4.s | 10 +- .../actors/ovl_En_Insect/func_80A7D26C.s | 18 +- .../actors/ovl_En_Insect/func_80A7D39C.s | 12 +- .../actors/ovl_En_Insect/func_80A7D460.s | 83 +- .../actors/ovl_En_Ishi/EnIshi_Destroy.s | 2 - .../overlays/actors/ovl_En_Ishi/EnIshi_Draw.s | 1 - .../overlays/actors/ovl_En_Ishi/EnIshi_Init.s | 2 - .../actors/ovl_En_Ishi/EnIshi_Update.s | 2 - .../actors/ovl_En_Ishi/func_80A7E460.s | 2 - .../actors/ovl_En_Ishi/func_80A7E4D8.s | 20 +- .../actors/ovl_En_Ishi/func_80A7E5A8.s | 10 +- .../actors/ovl_En_Ishi/func_80A7E824.s | 19 +- .../actors/ovl_En_Ishi/func_80A7EB10.s | 2 - .../actors/ovl_En_Ishi/func_80A7EC04.s | 2 - .../actors/ovl_En_Ishi/func_80A7ECF8.s | 2 - .../actors/ovl_En_Ishi/func_80A7ED60.s | 2 - .../actors/ovl_En_Ishi/func_80A7ED94.s | 10 +- .../actors/ovl_En_Ishi/func_80A7EE1C.s | 7 +- .../actors/ovl_En_Ishi/func_80A7F098.s | 2 - .../actors/ovl_En_Ishi/func_80A7F0A8.s | 2 - .../actors/ovl_En_Ishi/func_80A7F2F8.s | 2 - .../actors/ovl_En_Ishi/func_80A7F31C.s | 2 - .../actors/ovl_En_Ishi/func_80A7F3E8.s | 2 - .../actors/ovl_En_Ishi/func_80A7F514.s | 2 - .../actors/ovl_En_Ishi/func_80A7F8A0.s | 2 - .../actors/ovl_En_Ishi/func_80A7F8CC.s | 16 +- .../overlays/actors/ovl_En_Jj/EnJj_Destroy.s | 2 - .../overlays/actors/ovl_En_Jj/EnJj_Draw.s | 15 +- .../overlays/actors/ovl_En_Jj/EnJj_Init.s | 2 - .../overlays/actors/ovl_En_Jj/EnJj_Update.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87800.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87B1C.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87B9C.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87BEC.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87C30.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87CEC.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87D94.s | 7 +- .../overlays/actors/ovl_En_Jj/func_80A87EF0.s | 2 - .../overlays/actors/ovl_En_Jj/func_80A87F44.s | 2 - .../overlays/actors/ovl_En_Js/EnJs_Destroy.s | 2 - .../overlays/actors/ovl_En_Js/EnJs_Draw.s | 1 - .../overlays/actors/ovl_En_Js/EnJs_Init.s | 2 - .../overlays/actors/ovl_En_Js/EnJs_Update.s | 2 - .../overlays/actors/ovl_En_Js/func_80A88E10.s | 2 - .../overlays/actors/ovl_En_Js/func_80A88F64.s | 2 - .../overlays/actors/ovl_En_Js/func_80A89008.s | 2 - .../overlays/actors/ovl_En_Js/func_80A89078.s | 2 - .../overlays/actors/ovl_En_Js/func_80A890C0.s | 2 - .../overlays/actors/ovl_En_Js/func_80A8910C.s | 2 - .../overlays/actors/ovl_En_Js/func_80A89160.s | 2 - .../overlays/actors/ovl_En_Js/func_80A891C4.s | 2 - .../overlays/actors/ovl_En_Js/func_80A89294.s | 2 - .../overlays/actors/ovl_En_Js/func_80A89304.s | 2 - .../overlays/actors/ovl_En_Js/func_80A895C0.s | 2 - .../overlays/actors/ovl_En_Js/func_80A895F4.s | 2 - .../actors/ovl_En_Jsjutan/EnJsjutan_Destroy.s | 2 - .../actors/ovl_En_Jsjutan/EnJsjutan_Draw.s | 19 +- .../actors/ovl_En_Jsjutan/EnJsjutan_Init.s | 2 - .../actors/ovl_En_Jsjutan/EnJsjutan_Update.s | 2 - .../actors/ovl_En_Jsjutan/func_80A89860.s | 7 +- .../actors/ovl_En_Jsjutan/func_80A89A6C.s | 32 +- .../actors/ovl_En_Kakasi/EnKakasi_Destroy.s | 2 - .../actors/ovl_En_Kakasi/EnKakasi_Draw.s | 11 +- .../actors/ovl_En_Kakasi/EnKakasi_Init.s | 12 +- .../actors/ovl_En_Kakasi/EnKakasi_Update.s | 2 - .../actors/ovl_En_Kakasi/func_80A8F28C.s | 2 - .../actors/ovl_En_Kakasi/func_80A8F320.s | 18 +- .../actors/ovl_En_Kakasi/func_80A8F660.s | 2 - .../actors/ovl_En_Kakasi/func_80A8F75C.s | 2 - .../actors/ovl_En_Kakasi/func_80A8F8D0.s | 8 +- .../actors/ovl_En_Kakasi/func_80A8F9C8.s | 2 - .../actors/ovl_En_Kakasi/func_80A8FAA4.s | 8 +- .../actors/ovl_En_Kakasi/func_80A8FBB8.s | 2 - .../actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s | 2 - .../actors/ovl_En_Kakasi2/EnKakasi2_Init.s | 40 +- .../actors/ovl_En_Kakasi2/EnKakasi2_Update.s | 16 +- .../actors/ovl_En_Kakasi2/func_80A90264.s | 12 +- .../actors/ovl_En_Kakasi2/func_80A904D8.s | 2 - .../actors/ovl_En_Kakasi2/func_80A90578.s | 2 - .../actors/ovl_En_Kakasi2/func_80A9062C.s | 2 - .../actors/ovl_En_Kakasi2/func_80A906C4.s | 2 - .../actors/ovl_En_Kakasi2/func_80A90948.s | 1 - .../actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s | 2 - .../actors/ovl_En_Kakasi3/EnKakasi3_Draw.s | 1 - .../actors/ovl_En_Kakasi3/EnKakasi3_Init.s | 12 +- .../actors/ovl_En_Kakasi3/EnKakasi3_Update.s | 12 +- .../actors/ovl_En_Kakasi3/func_80A90E28.s | 2 - .../actors/ovl_En_Kakasi3/func_80A90EBC.s | 18 +- .../actors/ovl_En_Kakasi3/func_80A911F0.s | 2 - .../actors/ovl_En_Kakasi3/func_80A91284.s | 2 - .../actors/ovl_En_Kakasi3/func_80A91348.s | 2 - .../actors/ovl_En_Kakasi3/func_80A915B8.s | 2 - .../actors/ovl_En_Kakasi3/func_80A91620.s | 2 - .../actors/ovl_En_Kakasi3/func_80A91760.s | 2 - .../actors/ovl_En_Kakasi3/func_80A917FC.s | 2 - .../actors/ovl_En_Kakasi3/func_80A9187C.s | 2 - .../actors/ovl_En_Kakasi3/func_80A918E4.s | 16 +- .../actors/ovl_En_Kakasi3/func_80A91A90.s | 2 - .../actors/ovl_En_Kanban/EnKanban_Destroy.s | 2 - .../actors/ovl_En_Kanban/EnKanban_Draw.s | 63 +- .../actors/ovl_En_Kanban/EnKanban_Init.s | 8 +- .../actors/ovl_En_Kanban/EnKanban_Update.s | 68 +- .../actors/ovl_En_Kanban/func_80A91FA0.s | 7 +- .../actors/ovl_En_Kanban/func_80A921C0.s | 2 - .../ovl_En_Karebaba/EnKarebaba_Destroy.s | 2 - .../actors/ovl_En_Karebaba/EnKarebaba_Draw.s | 39 +- .../actors/ovl_En_Karebaba/EnKarebaba_Init.s | 2 - .../ovl_En_Karebaba/EnKarebaba_Update.s | 7 +- .../actors/ovl_En_Karebaba/func_80A954C0.s | 2 - .../actors/ovl_En_Karebaba/func_80A954F8.s | 2 - .../actors/ovl_En_Karebaba/func_80A95548.s | 2 - .../actors/ovl_En_Karebaba/func_80A9559C.s | 2 - .../actors/ovl_En_Karebaba/func_80A95618.s | 2 - .../actors/ovl_En_Karebaba/func_80A956B8.s | 2 - .../actors/ovl_En_Karebaba/func_80A956D0.s | 7 +- .../actors/ovl_En_Karebaba/func_80A95748.s | 2 - .../actors/ovl_En_Karebaba/func_80A957E0.s | 2 - .../actors/ovl_En_Karebaba/func_80A95860.s | 2 - .../actors/ovl_En_Karebaba/func_80A958EC.s | 2 - .../actors/ovl_En_Karebaba/func_80A95940.s | 10 +- .../actors/ovl_En_Karebaba/func_80A959D8.s | 2 - .../actors/ovl_En_Karebaba/func_80A95A38.s | 2 - .../actors/ovl_En_Karebaba/func_80A95B0C.s | 2 - .../actors/ovl_En_Karebaba/func_80A95BFC.s | 2 - .../actors/ovl_En_Karebaba/func_80A95D90.s | 7 +- .../actors/ovl_En_Karebaba/func_80A96048.s | 2 - .../actors/ovl_En_Karebaba/func_80A960B0.s | 2 - .../actors/ovl_En_Karebaba/func_80A96184.s | 2 - .../actors/ovl_En_Karebaba/func_80A961DC.s | 10 +- .../actors/ovl_En_Karebaba/func_80A9644C.s | 20 +- .../overlays/actors/ovl_En_Ko/EnKo_Destroy.s | 2 - .../overlays/actors/ovl_En_Ko/EnKo_Draw.s | 1 - .../overlays/actors/ovl_En_Ko/EnKo_Init.s | 2 - .../overlays/actors/ovl_En_Ko/EnKo_Update.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A96DB0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A96EC4.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A96F48.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A96F94.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A96FD0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97068.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A970B0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97110.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97138.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97198.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A971F8.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97258.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A972C8.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A972F8.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97338.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97378.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A973C0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A973F0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97438.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97468.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A974A0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A974E8.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97518.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97560.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97590.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A975C0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97610.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97738.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97B38.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97BC0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97C7C.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97D00.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97D68.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97E18.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97EB0.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97F20.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A97F70.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98034.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98124.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98174.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98254.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A9835C.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98464.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A9856C.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98674.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A9877C.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98934.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A989F4.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98A28.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98AA4.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98B04.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98B5C.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98C18.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98CD8.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98D2C.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98DB4.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A98ECC.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99048.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99384.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99438.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99504.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99560.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A995CC.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99864.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99BC4.s | 2 - .../overlays/actors/ovl_En_Ko/func_80A99C94.s | 2 - .../actors/ovl_En_Kusa/EnKusa_Destroy.s | 2 - .../overlays/actors/ovl_En_Kusa/EnKusa_Init.s | 12 +- .../actors/ovl_En_Kusa/EnKusa_Update.s | 2 - .../actors/ovl_En_Kusa/func_80A9AFA0.s | 2 - .../actors/ovl_En_Kusa/func_80A9AFAC.s | 20 +- .../actors/ovl_En_Kusa/func_80A9B07C.s | 2 - .../actors/ovl_En_Kusa/func_80A9B140.s | 2 - .../actors/ovl_En_Kusa/func_80A9B174.s | 10 +- .../actors/ovl_En_Kusa/func_80A9B1FC.s | 9 +- .../actors/ovl_En_Kusa/func_80A9B21C.s | 7 +- .../actors/ovl_En_Kusa/func_80A9B574.s | 7 +- .../actors/ovl_En_Kusa/func_80A9B630.s | 2 - .../actors/ovl_En_Kusa/func_80A9B7EC.s | 2 - .../actors/ovl_En_Kusa/func_80A9B810.s | 2 - .../actors/ovl_En_Kusa/func_80A9B89C.s | 2 - .../actors/ovl_En_Kusa/func_80A9B8D8.s | 2 - .../actors/ovl_En_Kusa/func_80A9BA98.s | 2 - .../actors/ovl_En_Kusa/func_80A9BAD8.s | 9 +- .../actors/ovl_En_Kusa/func_80A9BBB0.s | 2 - .../actors/ovl_En_Kusa/func_80A9BC1C.s | 2 - .../actors/ovl_En_Kusa/func_80A9BEAC.s | 2 - .../actors/ovl_En_Kusa/func_80A9BEFC.s | 2 - .../actors/ovl_En_Kusa/func_80A9BF30.s | 2 - .../actors/ovl_En_Kusa/func_80A9BF3C.s | 2 - .../actors/ovl_En_Kusa/func_80A9BFA8.s | 2 - .../actors/ovl_En_Kusa/func_80A9C00C.s | 2 - .../actors/ovl_En_Kusa/func_80A9C068.s | 2 - .../actors/ovl_En_Kusa/func_80A9C164.s | 1 - .../overlays/actors/ovl_En_Kz/EnKz_Destroy.s | 2 - .../overlays/actors/ovl_En_Kz/EnKz_Draw.s | 11 +- .../overlays/actors/ovl_En_Kz/EnKz_Init.s | 2 - .../overlays/actors/ovl_En_Kz/EnKz_Update.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9C550.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9C5AC.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9C658.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9C6C0.s | 16 +- .../overlays/actors/ovl_En_Kz/func_80A9C8E4.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9C95C.s | 9 +- .../overlays/actors/ovl_En_Kz/func_80A9CB18.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9CCD8.s | 7 +- .../overlays/actors/ovl_En_Kz/func_80A9CE44.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D0C0.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D130.s | 7 +- .../overlays/actors/ovl_En_Kz/func_80A9D25C.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D3C8.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D42C.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D490.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D520.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D670.s | 2 - .../overlays/actors/ovl_En_Kz/func_80A9D744.s | 2 - .../actors/ovl_En_Light/EnLight_Destroy.s | 2 - .../actors/ovl_En_Light/EnLight_Draw.s | 22 +- .../actors/ovl_En_Light/EnLight_Init.s | 7 +- .../actors/ovl_En_Light/EnLight_Update.s | 2 - .../actors/ovl_En_Light/func_80A9DD50.s | 2 - .../actors/ovl_En_Light/func_80A9E074.s | 15 +- .../ovl_En_M_Thunder/EnMThunder_Destroy.s | 2 - .../actors/ovl_En_M_Thunder/EnMThunder_Draw.s | 37 +- .../actors/ovl_En_M_Thunder/EnMThunder_Init.s | 2 - .../ovl_En_M_Thunder/EnMThunder_Update.s | 2 - .../actors/ovl_En_M_Thunder/func_80A9EFE0.s | 2 - .../actors/ovl_En_M_Thunder/func_80A9F314.s | 2 - .../actors/ovl_En_M_Thunder/func_80A9F350.s | 2 - .../actors/ovl_En_M_Thunder/func_80A9F408.s | 34 +- .../actors/ovl_En_M_Thunder/func_80A9F938.s | 7 +- .../actors/ovl_En_M_Thunder/func_80A9F9B4.s | 10 +- .../actors/ovl_En_Ma1/EnMa1_Destroy.s | 2 - .../overlays/actors/ovl_En_Ma1/EnMa1_Draw.s | 11 +- .../overlays/actors/ovl_En_Ma1/EnMa1_Init.s | 2 - .../overlays/actors/ovl_En_Ma1/EnMa1_Update.s | 2 - .../actors/ovl_En_Ma1/func_80AA0690.s | 2 - .../actors/ovl_En_Ma1/func_80AA0778.s | 51 +- .../actors/ovl_En_Ma1/func_80AA08C4.s | 2 - .../actors/ovl_En_Ma1/func_80AA0A0C.s | 2 - .../actors/ovl_En_Ma1/func_80AA0A84.s | 2 - .../actors/ovl_En_Ma1/func_80AA0AF4.s | 2 - .../actors/ovl_En_Ma1/func_80AA0B74.s | 2 - .../actors/ovl_En_Ma1/func_80AA0D88.s | 2 - .../actors/ovl_En_Ma1/func_80AA0EA0.s | 2 - .../actors/ovl_En_Ma1/func_80AA0EFC.s | 2 - .../actors/ovl_En_Ma1/func_80AA0F44.s | 2 - .../actors/ovl_En_Ma1/func_80AA106C.s | 2 - .../actors/ovl_En_Ma1/func_80AA10EC.s | 2 - .../actors/ovl_En_Ma1/func_80AA1150.s | 2 - .../actors/ovl_En_Ma1/func_80AA11C8.s | 2 - .../actors/ovl_En_Ma1/func_80AA12BC.s | 16 +- .../actors/ovl_En_Ma1/func_80AA1448.s | 2 - .../actors/ovl_En_Ma2/EnMa2_Destroy.s | 2 - .../overlays/actors/ovl_En_Ma2/EnMa2_Draw.s | 11 +- .../overlays/actors/ovl_En_Ma2/EnMa2_Init.s | 2 - .../overlays/actors/ovl_En_Ma2/EnMa2_Update.s | 2 - .../actors/ovl_En_Ma2/func_80AA19A0.s | 2 - .../actors/ovl_En_Ma2/func_80AA1A38.s | 16 +- .../actors/ovl_En_Ma2/func_80AA1AE4.s | 2 - .../actors/ovl_En_Ma2/func_80AA1B58.s | 2 - .../actors/ovl_En_Ma2/func_80AA1C68.s | 2 - .../actors/ovl_En_Ma2/func_80AA1CC0.s | 2 - .../actors/ovl_En_Ma2/func_80AA1D44.s | 2 - .../actors/ovl_En_Ma2/func_80AA1DB4.s | 2 - .../actors/ovl_En_Ma2/func_80AA2018.s | 2 - .../actors/ovl_En_Ma2/func_80AA204C.s | 2 - .../actors/ovl_En_Ma2/func_80AA20E4.s | 2 - .../actors/ovl_En_Ma2/func_80AA21C8.s | 2 - .../actors/ovl_En_Ma2/func_80AA2354.s | 16 +- .../actors/ovl_En_Ma2/func_80AA2590.s | 12 +- .../actors/ovl_En_Ma3/EnMa3_Destroy.s | 2 - .../overlays/actors/ovl_En_Ma3/EnMa3_Draw.s | 11 +- .../overlays/actors/ovl_En_Ma3/EnMa3_Init.s | 2 - .../overlays/actors/ovl_En_Ma3/EnMa3_Update.s | 2 - .../actors/ovl_En_Ma3/func_80AA2AA0.s | 2 - .../actors/ovl_En_Ma3/func_80AA2BD4.s | 36 +- .../actors/ovl_En_Ma3/func_80AA2E54.s | 2 - .../actors/ovl_En_Ma3/func_80AA2EC8.s | 2 - .../actors/ovl_En_Ma3/func_80AA2F28.s | 2 - .../actors/ovl_En_Ma3/func_80AA2F80.s | 2 - .../actors/ovl_En_Ma3/func_80AA3004.s | 2 - .../actors/ovl_En_Ma3/func_80AA3200.s | 2 - .../actors/ovl_En_Ma3/func_80AA3344.s | 16 +- .../actors/ovl_En_Ma3/func_80AA3580.s | 12 +- .../actors/ovl_En_Mag/EnMag_Destroy.s | 2 - .../overlays/actors/ovl_En_Mag/EnMag_Draw.s | 11 +- .../overlays/actors/ovl_En_Mag/EnMag_Init.s | 2 - .../overlays/actors/ovl_En_Mag/EnMag_Update.s | 9 +- .../actors/ovl_En_Mag/func_80AA447C.s | 2 - .../actors/ovl_En_Mag/func_80AA46A0.s | 2 - .../actors/ovl_En_Mag/func_80AA4AD4.s | 2 - .../actors/ovl_En_Mag/func_80AA4EB8.s | 2 - .../actors/ovl_En_Mag/func_80AA507C.s | 2 - .../overlays/actors/ovl_En_Mb/EnMb_Destroy.s | 2 - .../overlays/actors/ovl_En_Mb/EnMb_Draw.s | 1 - .../overlays/actors/ovl_En_Mb/EnMb_Init.s | 11 +- .../overlays/actors/ovl_En_Mb/EnMb_Update.s | 12 +- .../overlays/actors/ovl_En_Mb/func_80AA6050.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6408.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6444.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA652C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA66A0.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6830.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6898.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA68FC.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6974.s | 7 +- .../overlays/actors/ovl_En_Mb/func_80AA6A18.s | 7 +- .../overlays/actors/ovl_En_Mb/func_80AA6AC8.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6B80.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6BF0.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6CC0.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6D20.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6DA4.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6E1C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6E7C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6F04.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA6F8C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA702C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA7134.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA71AC.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA7310.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA7478.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA74BC.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA77D0.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA7938.s | 9 +- .../overlays/actors/ovl_En_Mb/func_80AA7CAC.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA800C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA8378.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA840C.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA8514.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA87D8.s | 7 +- .../overlays/actors/ovl_En_Mb/func_80AA8AEC.s | 7 +- .../overlays/actors/ovl_En_Mb/func_80AA8DD8.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA8E88.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA8F50.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA8FC8.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA90A0.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA92B8.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA9440.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA94D8.s | 2 - .../overlays/actors/ovl_En_Mb/func_80AA9870.s | 29 +- .../overlays/actors/ovl_En_Md/EnMd_Destroy.s | 2 - .../overlays/actors/ovl_En_Md/EnMd_Draw.s | 11 +- .../overlays/actors/ovl_En_Md/EnMd_Init.s | 2 - .../overlays/actors/ovl_En_Md/EnMd_Update.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA250.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA274.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA308.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA39C.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA474.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA508.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA5A4.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA638.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA6D4.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA768.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA7FC.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA890.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA92C.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAA93C.s | 17 +- .../overlays/actors/ovl_En_Md/func_80AAAA24.s | 30 +- .../overlays/actors/ovl_En_Md/func_80AAAC78.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAACF8.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAADE0.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAAE14.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAAE94.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAAF04.s | 16 +- .../overlays/actors/ovl_En_Md/func_80AAB03C.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB0E0.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB158.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB370.s | 7 +- .../overlays/actors/ovl_En_Md/func_80AAB4DC.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB5A4.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB874.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB8F8.s | 2 - .../overlays/actors/ovl_En_Md/func_80AAB948.s | 7 +- .../overlays/actors/ovl_En_Md/func_80AABC10.s | 2 - .../overlays/actors/ovl_En_Md/func_80AABD0C.s | 2 - .../overlays/actors/ovl_En_Md/func_80AABEF0.s | 16 +- .../overlays/actors/ovl_En_Md/func_80AAC104.s | 2 - .../overlays/actors/ovl_En_Mk/EnMk_Destroy.s | 2 - .../overlays/actors/ovl_En_Mk/EnMk_Draw.s | 1 - .../overlays/actors/ovl_En_Mk/EnMk_Init.s | 2 - .../overlays/actors/ovl_En_Mk/EnMk_Update.s | 7 +- .../overlays/actors/ovl_En_Mk/func_80AACA40.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACA94.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACB14.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACB6C.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACBAC.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACC04.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACCA0.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACD48.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACE2C.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACEE8.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AACFA0.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AAD014.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AAD080.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AAD518.s | 2 - .../overlays/actors/ovl_En_Mk/func_80AAD55C.s | 2 - .../overlays/actors/ovl_En_Mm/EnMm_Destroy.s | 2 - .../overlays/actors/ovl_En_Mm/EnMm_Draw.s | 30 +- .../overlays/actors/ovl_En_Mm/EnMm_Init.s | 2 - .../overlays/actors/ovl_En_Mm/EnMm_Update.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AAD770.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AADA70.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AADAA0.s | 13 +- .../overlays/actors/ovl_En_Mm/func_80AADC34.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AADCD0.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AADE50.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AADE60.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AADEF0.s | 13 +- .../overlays/actors/ovl_En_Mm/func_80AAE224.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AAE294.s | 11 +- .../overlays/actors/ovl_En_Mm/func_80AAE50C.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AAE598.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AAE97C.s | 2 - .../overlays/actors/ovl_En_Mm/func_80AAEA10.s | 6 +- .../actors/ovl_En_Mm2/EnMm2_Destroy.s | 2 - .../overlays/actors/ovl_En_Mm2/EnMm2_Draw.s | 12 +- .../overlays/actors/ovl_En_Mm2/EnMm2_Init.s | 8 +- .../overlays/actors/ovl_En_Mm2/EnMm2_Update.s | 2 - .../actors/ovl_En_Mm2/func_80AAEE50.s | 2 - .../actors/ovl_En_Mm2/func_80AAEF70.s | 2 - .../actors/ovl_En_Mm2/func_80AAF224.s | 2 - .../actors/ovl_En_Mm2/func_80AAF2BC.s | 2 - .../actors/ovl_En_Mm2/func_80AAF330.s | 2 - .../actors/ovl_En_Mm2/func_80AAF3C0.s | 2 - .../actors/ovl_En_Mm2/func_80AAF57C.s | 2 - .../actors/ovl_En_Mm2/func_80AAF5EC.s | 2 - .../actors/ovl_En_Mm2/func_80AAF668.s | 12 +- .../actors/ovl_En_Mm2/func_80AAF9D8.s | 2 - .../actors/ovl_En_Mm2/func_80AAFA60.s | 1 - .../overlays/actors/ovl_En_Mu/EnMu_Destroy.s | 2 - .../overlays/actors/ovl_En_Mu/EnMu_Draw.s | 11 +- .../overlays/actors/ovl_En_Mu/EnMu_Init.s | 2 - .../overlays/actors/ovl_En_Mu/EnMu_Update.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB0420.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB0428.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB0584.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB05C4.s | 17 +- .../overlays/actors/ovl_En_Mu/func_80AB0724.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB08A4.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB0994.s | 2 - .../overlays/actors/ovl_En_Mu/func_80AB09A8.s | 2 - .../overlays/actors/ovl_En_Nb/EnNb_Destroy.s | 2 - .../overlays/actors/ovl_En_Nb/EnNb_Draw.s | 7 +- .../overlays/actors/ovl_En_Nb/EnNb_Init.s | 12 +- .../overlays/actors/ovl_En_Nb/EnNb_Update.s | 8 +- .../overlays/actors/ovl_En_Nb/func_80AB0D90.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB0DA0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB0DAC.s | 16 +- .../overlays/actors/ovl_En_Nb/func_80AB0F04.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB0F50.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB0FBC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1040.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB10C4.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1164.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB11EC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1210.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1284.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB12CC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB12EC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1310.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1390.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB13D8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1420.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB14A0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1530.s | 7 +- .../overlays/actors/ovl_En_Nb/func_80AB1578.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB15D4.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1650.s | 7 +- .../overlays/actors/ovl_En_Nb/func_80AB166C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB16FC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB174C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1778.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB180C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1878.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB18C4.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB18E4.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1904.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB193C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB197C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB19BC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB19FC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1A2C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1A74.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1A94.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1B14.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1B68.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1CBC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1D54.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1D84.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1DD8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1E2C.s | 12 +- .../overlays/actors/ovl_En_Nb/func_80AB1FA4.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB1FFC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2030.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2064.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2148.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2180.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB21E0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2254.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB22CC.s | 8 +- .../overlays/actors/ovl_En_Nb/func_80AB23A8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB23D8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB242C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2484.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB24CC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB250C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2570.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB25BC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2610.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2688.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB26C8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB26DC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2774.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB27F0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB285C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB28DC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2948.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB29C8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2A28.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2A68.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2AE8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2AFC.s | 25 +- .../overlays/actors/ovl_En_Nb/func_80AB2BF8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2C18.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2C60.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2CCC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2D38.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2D9C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2E1C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2E70.s | 12 +- .../overlays/actors/ovl_En_Nb/func_80AB2FC0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB2FE4.s | 12 +- .../overlays/actors/ovl_En_Nb/func_80AB3150.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB319C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3228.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3260.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB32AC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB32EC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3320.s | 8 +- .../overlays/actors/ovl_En_Nb/func_80AB33C0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB33E0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3428.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3468.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB34A8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB359C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3660.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3684.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB36DC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB378C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB37E0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3838.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB38AC.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3914.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3A7C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3B04.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3B7C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3BC8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3C1C.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3C74.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3CD4.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3D34.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3DB0.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3E10.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB3FE8.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB4074.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB4100.s | 2 - .../overlays/actors/ovl_En_Nb/func_80AB410C.s | 12 +- .../actors/ovl_En_Niw/EnNiw_Destroy.s | 2 - .../overlays/actors/ovl_En_Niw/EnNiw_Draw.s | 2 - .../overlays/actors/ovl_En_Niw/EnNiw_Init.s | 2 - .../overlays/actors/ovl_En_Niw/EnNiw_Update.s | 2 - .../actors/ovl_En_Niw/func_80AB5BF8.s | 2 - .../actors/ovl_En_Niw/func_80AB5FA0.s | 2 - .../actors/ovl_En_Niw/func_80AB6100.s | 2 - .../actors/ovl_En_Niw/func_80AB627C.s | 2 - .../actors/ovl_En_Niw/func_80AB6324.s | 2 - .../actors/ovl_En_Niw/func_80AB63A8.s | 2 - .../actors/ovl_En_Niw/func_80AB6450.s | 2 - .../actors/ovl_En_Niw/func_80AB6570.s | 2 - .../actors/ovl_En_Niw/func_80AB6A38.s | 2 - .../actors/ovl_En_Niw/func_80AB6BF8.s | 2 - .../actors/ovl_En_Niw/func_80AB6D08.s | 2 - .../actors/ovl_En_Niw/func_80AB6EB4.s | 2 - .../actors/ovl_En_Niw/func_80AB6F04.s | 2 - .../actors/ovl_En_Niw/func_80AB70A0.s | 2 - .../actors/ovl_En_Niw/func_80AB70F8.s | 2 - .../actors/ovl_En_Niw/func_80AB714C.s | 2 - .../actors/ovl_En_Niw/func_80AB7204.s | 2 - .../actors/ovl_En_Niw/func_80AB7290.s | 2 - .../actors/ovl_En_Niw/func_80AB7328.s | 2 - .../actors/ovl_En_Niw/func_80AB7420.s | 2 - .../actors/ovl_En_Niw/func_80AB747C.s | 2 - .../actors/ovl_En_Niw/func_80AB7F60.s | 2 - .../actors/ovl_En_Niw/func_80AB8168.s | 2 - .../actors/ovl_En_Niw/func_80AB8258.s | 2 - .../actors/ovl_En_Niw/func_80AB840C.s | 1 - .../ovl_En_Niw_Girl/EnNiwGirl_Destroy.s | 2 - .../actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s | 11 +- .../actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s | 36 +- .../actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s | 2 - .../actors/ovl_En_Niw_Girl/func_80AB918C.s | 2 - .../actors/ovl_En_Niw_Girl/func_80AB9210.s | 7 +- .../actors/ovl_En_Niw_Girl/func_80AB93C0.s | 15 +- .../actors/ovl_En_Niw_Girl/func_80AB94D0.s | 2 - .../actors/ovl_En_Niw_Girl/func_80AB97E4.s | 2 - .../ovl_En_Niw_Lady/EnNiwLady_Destroy.s | 2 - .../actors/ovl_En_Niw_Lady/EnNiwLady_Init.s | 12 +- .../actors/ovl_En_Niw_Lady/EnNiwLady_Update.s | 2 - .../actors/ovl_En_Niw_Lady/func_80AB9D60.s | 36 +- .../actors/ovl_En_Niw_Lady/func_80AB9F24.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABA21C.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABA244.s | 56 +- .../actors/ovl_En_Niw_Lady/func_80ABA654.s | 16 +- .../actors/ovl_En_Niw_Lady/func_80ABA778.s | 8 +- .../actors/ovl_En_Niw_Lady/func_80ABA878.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABA9B8.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABAA9C.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABAB08.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABAC00.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABAC84.s | 8 +- .../actors/ovl_En_Niw_Lady/func_80ABAD38.s | 8 +- .../actors/ovl_En_Niw_Lady/func_80ABAD7C.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABB0A0.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABB0CC.s | 2 - .../actors/ovl_En_Niw_Lady/func_80ABB228.s | 11 +- .../actors/ovl_En_Nwc/EnNwc_Destroy.s | 2 - .../overlays/actors/ovl_En_Nwc/EnNwc_Draw.s | 1 - .../overlays/actors/ovl_En_Nwc/EnNwc_Init.s | 2 - .../overlays/actors/ovl_En_Nwc/EnNwc_Update.s | 2 - .../actors/ovl_En_Nwc/func_80ABC0E0.s | 2 - .../actors/ovl_En_Nwc/func_80ABC0E8.s | 2 - .../actors/ovl_En_Nwc/func_80ABC0F8.s | 2 - .../actors/ovl_En_Nwc/func_80ABC1F4.s | 7 +- .../actors/ovl_En_Nwc/func_80ABC260.s | 7 +- .../actors/ovl_En_Nwc/func_80ABC460.s | 27 +- .../actors/ovl_En_Nwc/func_80ABC9D0.s | 2 - .../overlays/actors/ovl_En_Ny/EnNy_Destroy.s | 2 - .../overlays/actors/ovl_En_Ny/EnNy_Draw.s | 20 +- .../overlays/actors/ovl_En_Ny/EnNy_Init.s | 20 +- .../overlays/actors/ovl_En_Ny/EnNy_Update.s | 7 +- .../overlays/actors/ovl_En_Ny/func_80ABCD40.s | 10 +- .../overlays/actors/ovl_En_Ny/func_80ABCD84.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCD94.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCDAC.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCDBC.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCDFC.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCE38.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCE50.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCE90.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCEEC.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABCF4C.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABD05C.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABD11C.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABD190.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABD3B8.s | 14 +- .../overlays/actors/ovl_En_Ny/func_80ABD728.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABD9AC.s | 16 +- .../overlays/actors/ovl_En_Ny/func_80ABDBB8.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABDBF8.s | 2 - .../overlays/actors/ovl_En_Ny/func_80ABE040.s | 22 +- .../ovl_En_Okarina_Tag/EnOkarinaTag_Destroy.s | 2 - .../ovl_En_Okarina_Tag/EnOkarinaTag_Init.s | 50 +- .../ovl_En_Okarina_Tag/EnOkarinaTag_Update.s | 1 - .../actors/ovl_En_Okarina_Tag/func_80ABEF2C.s | 8 +- .../actors/ovl_En_Okarina_Tag/func_80ABF0CC.s | 2 - .../actors/ovl_En_Okarina_Tag/func_80ABF28C.s | 8 +- .../actors/ovl_En_Okarina_Tag/func_80ABF4C8.s | 7 +- .../actors/ovl_En_Okarina_Tag/func_80ABF708.s | 2 - .../actors/ovl_En_Okarina_Tag/func_80ABF7CC.s | 8 +- .../actors/ovl_En_Okuta/EnOkuta_Destroy.s | 2 - .../actors/ovl_En_Okuta/EnOkuta_Draw.s | 19 +- .../actors/ovl_En_Okuta/EnOkuta_Init.s | 2 - .../actors/ovl_En_Okuta/EnOkuta_Update.s | 2 - .../actors/ovl_En_Okuta/func_80AC0890.s | 2 - .../actors/ovl_En_Okuta/func_80AC093C.s | 2 - .../actors/ovl_En_Okuta/func_80AC09A4.s | 2 - .../actors/ovl_En_Okuta/func_80AC09E8.s | 2 - .../actors/ovl_En_Okuta/func_80AC0A88.s | 2 - .../actors/ovl_En_Okuta/func_80AC0AB4.s | 2 - .../actors/ovl_En_Okuta/func_80AC0B24.s | 2 - .../actors/ovl_En_Okuta/func_80AC0B60.s | 2 - .../actors/ovl_En_Okuta/func_80AC0BC0.s | 2 - .../actors/ovl_En_Okuta/func_80AC0CAC.s | 2 - .../actors/ovl_En_Okuta/func_80AC0D34.s | 2 - .../actors/ovl_En_Okuta/func_80AC0D7C.s | 2 - .../actors/ovl_En_Okuta/func_80AC0DC8.s | 2 - .../actors/ovl_En_Okuta/func_80AC0F08.s | 2 - .../actors/ovl_En_Okuta/func_80AC0F64.s | 7 +- .../actors/ovl_En_Okuta/func_80AC10A8.s | 7 +- .../actors/ovl_En_Okuta/func_80AC11A8.s | 2 - .../actors/ovl_En_Okuta/func_80AC12D8.s | 7 +- .../actors/ovl_En_Okuta/func_80AC1458.s | 2 - .../actors/ovl_En_Okuta/func_80AC14A8.s | 21 +- .../actors/ovl_En_Okuta/func_80AC17BC.s | 10 +- .../actors/ovl_En_Okuta/func_80AC1938.s | 7 +- .../actors/ovl_En_Okuta/func_80AC1B80.s | 49 +- .../actors/ovl_En_Okuta/func_80AC1F28.s | 2 - .../actors/ovl_En_Okuta/func_80AC2350.s | 16 +- .../actors/ovl_En_Okuta/func_80AC25D8.s | 2 - .../actors/ovl_En_Ossan/EnOssan_Destroy.s | 2 - .../actors/ovl_En_Ossan/EnOssan_Init.s | 108 ++- .../actors/ovl_En_Ossan/EnOssan_Update.s | 2 - .../actors/ovl_En_Ossan/func_80AC2CA0.s | 2 - .../actors/ovl_En_Ossan/func_80AC2CA8.s | 2 - .../actors/ovl_En_Ossan/func_80AC2CB8.s | 2 - .../actors/ovl_En_Ossan/func_80AC2CE8.s | 2 - .../actors/ovl_En_Ossan/func_80AC2D18.s | 2 - .../actors/ovl_En_Ossan/func_80AC2D48.s | 2 - .../actors/ovl_En_Ossan/func_80AC2D78.s | 2 - .../actors/ovl_En_Ossan/func_80AC2DA8.s | 2 - .../actors/ovl_En_Ossan/func_80AC2DD8.s | 2 - .../actors/ovl_En_Ossan/func_80AC2F2C.s | 2 - .../actors/ovl_En_Ossan/func_80AC3098.s | 2 - .../actors/ovl_En_Ossan/func_80AC30B8.s | 2 - .../actors/ovl_En_Ossan/func_80AC30FC.s | 2 - .../actors/ovl_En_Ossan/func_80AC311C.s | 2 - .../actors/ovl_En_Ossan/func_80AC313C.s | 2 - .../actors/ovl_En_Ossan/func_80AC3180.s | 2 - .../actors/ovl_En_Ossan/func_80AC31A0.s | 2 - .../actors/ovl_En_Ossan/func_80AC31F4.s | 2 - .../actors/ovl_En_Ossan/func_80AC32C4.s | 2 - .../actors/ovl_En_Ossan/func_80AC3350.s | 2 - .../actors/ovl_En_Ossan/func_80AC33B0.s | 2 - .../actors/ovl_En_Ossan/func_80AC3744.s | 2 - .../actors/ovl_En_Ossan/func_80AC37A8.s | 12 +- .../actors/ovl_En_Ossan/func_80AC3884.s | 2 - .../actors/ovl_En_Ossan/func_80AC38C8.s | 2 - .../actors/ovl_En_Ossan/func_80AC3928.s | 2 - .../actors/ovl_En_Ossan/func_80AC39AC.s | 2 - .../actors/ovl_En_Ossan/func_80AC3A80.s | 2 - .../actors/ovl_En_Ossan/func_80AC3AE0.s | 2 - .../actors/ovl_En_Ossan/func_80AC3B18.s | 8 +- .../actors/ovl_En_Ossan/func_80AC3BCC.s | 2 - .../actors/ovl_En_Ossan/func_80AC3D18.s | 2 - .../actors/ovl_En_Ossan/func_80AC3E50.s | 2 - .../actors/ovl_En_Ossan/func_80AC3ED8.s | 2 - .../actors/ovl_En_Ossan/func_80AC3F38.s | 2 - .../actors/ovl_En_Ossan/func_80AC4074.s | 18 +- .../actors/ovl_En_Ossan/func_80AC4220.s | 2 - .../actors/ovl_En_Ossan/func_80AC4288.s | 2 - .../actors/ovl_En_Ossan/func_80AC43A0.s | 2 - .../actors/ovl_En_Ossan/func_80AC43F0.s | 2 - .../actors/ovl_En_Ossan/func_80AC44DC.s | 2 - .../actors/ovl_En_Ossan/func_80AC45C8.s | 2 - .../actors/ovl_En_Ossan/func_80AC47DC.s | 52 +- .../actors/ovl_En_Ossan/func_80AC4978.s | 12 +- .../actors/ovl_En_Ossan/func_80AC4B4C.s | 12 +- .../actors/ovl_En_Ossan/func_80AC4D20.s | 2 - .../actors/ovl_En_Ossan/func_80AC4DDC.s | 12 +- .../actors/ovl_En_Ossan/func_80AC4EC8.s | 12 +- .../actors/ovl_En_Ossan/func_80AC4FAC.s | 2 - .../actors/ovl_En_Ossan/func_80AC4FE0.s | 2 - .../actors/ovl_En_Ossan/func_80AC5014.s | 12 +- .../actors/ovl_En_Ossan/func_80AC51B8.s | 2 - .../actors/ovl_En_Ossan/func_80AC52C0.s | 2 - .../actors/ovl_En_Ossan/func_80AC53F4.s | 2 - .../actors/ovl_En_Ossan/func_80AC54F4.s | 2 - .../actors/ovl_En_Ossan/func_80AC5594.s | 12 +- .../actors/ovl_En_Ossan/func_80AC5680.s | 12 +- .../actors/ovl_En_Ossan/func_80AC576C.s | 12 +- .../actors/ovl_En_Ossan/func_80AC5858.s | 12 +- .../actors/ovl_En_Ossan/func_80AC5900.s | 16 +- .../actors/ovl_En_Ossan/func_80AC5A28.s | 23 +- .../actors/ovl_En_Ossan/func_80AC5C24.s | 2 - .../actors/ovl_En_Ossan/func_80AC5C9C.s | 2 - .../actors/ovl_En_Ossan/func_80AC5D40.s | 2 - .../actors/ovl_En_Ossan/func_80AC5DAC.s | 2 - .../actors/ovl_En_Ossan/func_80AC5EF0.s | 12 +- .../actors/ovl_En_Ossan/func_80AC60E4.s | 2 - .../actors/ovl_En_Ossan/func_80AC6148.s | 2 - .../actors/ovl_En_Ossan/func_80AC61B8.s | 2 - .../actors/ovl_En_Ossan/func_80AC6208.s | 2 - .../actors/ovl_En_Ossan/func_80AC6258.s | 2 - .../actors/ovl_En_Ossan/func_80AC62C4.s | 2 - .../actors/ovl_En_Ossan/func_80AC62F4.s | 2 - .../actors/ovl_En_Ossan/func_80AC6384.s | 2 - .../actors/ovl_En_Ossan/func_80AC646C.s | 2 - .../actors/ovl_En_Ossan/func_80AC6490.s | 7 +- .../actors/ovl_En_Ossan/func_80AC652C.s | 7 +- .../actors/ovl_En_Ossan/func_80AC65B8.s | 2 - .../actors/ovl_En_Ossan/func_80AC66F4.s | 10 +- .../actors/ovl_En_Ossan/func_80AC67C4.s | 13 +- .../actors/ovl_En_Ossan/func_80AC6970.s | 2 - .../actors/ovl_En_Ossan/func_80AC69A4.s | 2 - .../actors/ovl_En_Ossan/func_80AC6A44.s | 2 - .../actors/ovl_En_Ossan/func_80AC6ADC.s | 2 - .../actors/ovl_En_Ossan/func_80AC6B3C.s | 2 - .../actors/ovl_En_Ossan/func_80AC6C54.s | 2 - .../actors/ovl_En_Ossan/func_80AC6D30.s | 2 - .../actors/ovl_En_Ossan/func_80AC6E0C.s | 2 - .../actors/ovl_En_Ossan/func_80AC6E6C.s | 2 - .../actors/ovl_En_Ossan/func_80AC6ECC.s | 2 - .../actors/ovl_En_Ossan/func_80AC6F2C.s | 2 - .../actors/ovl_En_Ossan/func_80AC7094.s | 20 +- .../actors/ovl_En_Ossan/func_80AC7380.s | 2 - .../actors/ovl_En_Ossan/func_80AC73B4.s | 2 - .../actors/ovl_En_Ossan/func_80AC74F4.s | 2 - .../actors/ovl_En_Ossan/func_80AC7528.s | 12 +- .../actors/ovl_En_Ossan/func_80AC77CC.s | 12 +- .../actors/ovl_En_Ossan/func_80AC79C8.s | 12 +- .../actors/ovl_En_Ossan/func_80AC7DAC.s | 12 +- .../actors/ovl_En_Ossan/func_80AC7ED0.s | 12 +- .../actors/ovl_En_Ossan/func_80AC801C.s | 2 - .../actors/ovl_En_Ossan/func_80AC8048.s | 2 - .../actors/ovl_En_Ossan/func_80AC80B4.s | 12 +- .../actors/ovl_En_Ossan/func_80AC8244.s | 12 +- .../actors/ovl_En_Ossan/func_80AC83A8.s | 2 - .../actors/ovl_En_Ossan/func_80AC83DC.s | 12 +- .../actors/ovl_En_Ossan/func_80AC854C.s | 12 +- .../actors/ovl_En_Ossan/func_80AC8668.s | 12 +- .../actors/ovl_En_Ossan/func_80AC8784.s | 11 +- .../actors/ovl_En_Owl/EnOwl_Destroy.s | 2 - .../overlays/actors/ovl_En_Owl/EnOwl_Draw.s | 12 +- .../overlays/actors/ovl_En_Owl/EnOwl_Init.s | 64 +- .../overlays/actors/ovl_En_Owl/EnOwl_Update.s | 21 +- .../actors/ovl_En_Owl/func_80ACA3B8.s | 2 - .../actors/ovl_En_Owl/func_80ACA3F4.s | 2 - .../actors/ovl_En_Owl/func_80ACA558.s | 2 - .../actors/ovl_En_Owl/func_80ACA5C8.s | 2 - .../actors/ovl_En_Owl/func_80ACA62C.s | 8 +- .../actors/ovl_En_Owl/func_80ACA690.s | 2 - .../actors/ovl_En_Owl/func_80ACA6C0.s | 2 - .../actors/ovl_En_Owl/func_80ACA71C.s | 2 - .../actors/ovl_En_Owl/func_80ACA76C.s | 2 - .../actors/ovl_En_Owl/func_80ACA7E0.s | 2 - .../actors/ovl_En_Owl/func_80ACA88C.s | 2 - .../actors/ovl_En_Owl/func_80ACA928.s | 2 - .../actors/ovl_En_Owl/func_80ACA998.s | 2 - .../actors/ovl_En_Owl/func_80ACAA54.s | 2 - .../actors/ovl_En_Owl/func_80ACAAC0.s | 2 - .../actors/ovl_En_Owl/func_80ACAB2C.s | 2 - .../actors/ovl_En_Owl/func_80ACAB88.s | 2 - .../actors/ovl_En_Owl/func_80ACAC6C.s | 2 - .../actors/ovl_En_Owl/func_80ACACD8.s | 2 - .../actors/ovl_En_Owl/func_80ACAD34.s | 2 - .../actors/ovl_En_Owl/func_80ACADF0.s | 2 - .../actors/ovl_En_Owl/func_80ACAE5C.s | 2 - .../actors/ovl_En_Owl/func_80ACAEB8.s | 2 - .../actors/ovl_En_Owl/func_80ACAF74.s | 2 - .../actors/ovl_En_Owl/func_80ACAFE0.s | 2 - .../actors/ovl_En_Owl/func_80ACB03C.s | 2 - .../actors/ovl_En_Owl/func_80ACB0B0.s | 2 - .../actors/ovl_En_Owl/func_80ACB148.s | 2 - .../actors/ovl_En_Owl/func_80ACB1A0.s | 2 - .../actors/ovl_En_Owl/func_80ACB22C.s | 2 - .../actors/ovl_En_Owl/func_80ACB274.s | 2 - .../actors/ovl_En_Owl/func_80ACB2B4.s | 2 - .../actors/ovl_En_Owl/func_80ACB344.s | 2 - .../actors/ovl_En_Owl/func_80ACB3E0.s | 2 - .../actors/ovl_En_Owl/func_80ACB440.s | 2 - .../actors/ovl_En_Owl/func_80ACB4FC.s | 2 - .../actors/ovl_En_Owl/func_80ACB568.s | 2 - .../actors/ovl_En_Owl/func_80ACB5C4.s | 2 - .../actors/ovl_En_Owl/func_80ACB680.s | 2 - .../actors/ovl_En_Owl/func_80ACB6EC.s | 2 - .../actors/ovl_En_Owl/func_80ACB748.s | 2 - .../actors/ovl_En_Owl/func_80ACB904.s | 2 - .../actors/ovl_En_Owl/func_80ACB994.s | 2 - .../actors/ovl_En_Owl/func_80ACBA24.s | 2 - .../actors/ovl_En_Owl/func_80ACBAB8.s | 11 +- .../actors/ovl_En_Owl/func_80ACBC0C.s | 13 +- .../actors/ovl_En_Owl/func_80ACBD4C.s | 2 - .../actors/ovl_En_Owl/func_80ACBEA0.s | 2 - .../actors/ovl_En_Owl/func_80ACBF50.s | 2 - .../actors/ovl_En_Owl/func_80ACC00C.s | 36 +- .../actors/ovl_En_Owl/func_80ACC23C.s | 2 - .../actors/ovl_En_Owl/func_80ACC30C.s | 7 +- .../actors/ovl_En_Owl/func_80ACC390.s | 2 - .../actors/ovl_En_Owl/func_80ACC460.s | 2 - .../actors/ovl_En_Owl/func_80ACC540.s | 2 - .../actors/ovl_En_Owl/func_80ACC5CC.s | 2 - .../actors/ovl_En_Owl/func_80ACC624.s | 2 - .../actors/ovl_En_Owl/func_80ACCE00.s | 2 - .../actors/ovl_En_Owl/func_80ACCF34.s | 2 - .../actors/ovl_En_Owl/func_80ACD0B8.s | 2 - .../actors/ovl_En_Owl/func_80ACD130.s | 2 - .../actors/ovl_En_Owl/func_80ACD1C4.s | 2 - .../actors/ovl_En_Owl/func_80ACD220.s | 2 - .../actors/ovl_En_Owl/func_80ACD2CC.s | 2 - .../actors/ovl_En_Owl/func_80ACD4D4.s | 1 - .../actors/ovl_En_Part/EnPart_Destroy.s | 2 - .../overlays/actors/ovl_En_Part/EnPart_Draw.s | 15 +- .../overlays/actors/ovl_En_Part/EnPart_Init.s | 2 - .../actors/ovl_En_Part/EnPart_Update.s | 2 - .../actors/ovl_En_Part/func_80ACDDE8.s | 51 +- .../actors/ovl_En_Part/func_80ACE13C.s | 20 +- .../actors/ovl_En_Part/func_80ACE5B8.s | 2 - .../actors/ovl_En_Part/func_80ACE5C8.s | 9 +- .../actors/ovl_En_Part/func_80ACE7E8.s | 2 - .../actors/ovl_En_Part/func_80ACEAC0.s | 2 - .../actors/ovl_En_Peehat/EnPeehat_Destroy.s | 2 - .../actors/ovl_En_Peehat/EnPeehat_Draw.s | 1 - .../actors/ovl_En_Peehat/EnPeehat_Init.s | 11 +- .../actors/ovl_En_Peehat/EnPeehat_Update.s | 7 +- .../actors/ovl_En_Peehat/func_80ACF4A0.s | 2 - .../actors/ovl_En_Peehat/func_80ACF788.s | 7 +- .../actors/ovl_En_Peehat/func_80ACF920.s | 7 +- .../actors/ovl_En_Peehat/func_80ACFB34.s | 2 - .../actors/ovl_En_Peehat/func_80ACFBCC.s | 2 - .../actors/ovl_En_Peehat/func_80ACFD20.s | 2 - .../actors/ovl_En_Peehat/func_80ACFDAC.s | 2 - .../actors/ovl_En_Peehat/func_80ACFEB0.s | 2 - .../actors/ovl_En_Peehat/func_80ACFEF8.s | 7 +- .../actors/ovl_En_Peehat/func_80AD0070.s | 2 - .../actors/ovl_En_Peehat/func_80AD0118.s | 7 +- .../actors/ovl_En_Peehat/func_80AD02E4.s | 2 - .../actors/ovl_En_Peehat/func_80AD038C.s | 7 +- .../actors/ovl_En_Peehat/func_80AD0558.s | 2 - .../actors/ovl_En_Peehat/func_80AD05A8.s | 2 - .../actors/ovl_En_Peehat/func_80AD0720.s | 2 - .../actors/ovl_En_Peehat/func_80AD076C.s | 9 +- .../actors/ovl_En_Peehat/func_80AD0B3C.s | 2 - .../actors/ovl_En_Peehat/func_80AD0B84.s | 7 +- .../actors/ovl_En_Peehat/func_80AD0D3C.s | 2 - .../actors/ovl_En_Peehat/func_80AD0D84.s | 7 +- .../actors/ovl_En_Peehat/func_80AD0F38.s | 2 - .../actors/ovl_En_Peehat/func_80AD0FC8.s | 12 +- .../actors/ovl_En_Peehat/func_80AD1220.s | 2 - .../actors/ovl_En_Peehat/func_80AD1258.s | 12 +- .../actors/ovl_En_Peehat/func_80AD1440.s | 2 - .../actors/ovl_En_Peehat/func_80AD14A0.s | 2 - .../actors/ovl_En_Peehat/func_80AD167C.s | 2 - .../actors/ovl_En_Peehat/func_80AD1700.s | 2 - .../actors/ovl_En_Peehat/func_80AD177C.s | 2 - .../actors/ovl_En_Peehat/func_80AD17E8.s | 10 +- .../actors/ovl_En_Peehat/func_80AD1AA8.s | 2 - .../actors/ovl_En_Peehat/func_80AD1B00.s | 2 - .../actors/ovl_En_Peehat/func_80AD1BD8.s | 2 - .../actors/ovl_En_Peehat/func_80AD2224.s | 32 +- .../actors/ovl_En_Peehat/func_80AD2438.s | 28 +- .../ovl_En_Po_Desert/EnPoDesert_Destroy.s | 2 - .../actors/ovl_En_Po_Desert/EnPoDesert_Draw.s | 11 +- .../actors/ovl_En_Po_Desert/EnPoDesert_Init.s | 2 - .../ovl_En_Po_Desert/EnPoDesert_Update.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD2E64.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD2FBC.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD2FFC.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD305C.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD30D0.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD3194.s | 9 +- .../actors/ovl_En_Po_Desert/func_80AD3328.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD3504.s | 2 - .../actors/ovl_En_Po_Desert/func_80AD3594.s | 8 +- .../ovl_En_Po_Field/EnPoField_Destroy.s | 2 - .../actors/ovl_En_Po_Field/EnPoField_Draw.s | 16 +- .../actors/ovl_En_Po_Field/EnPoField_Init.s | 2 - .../actors/ovl_En_Po_Field/EnPoField_Update.s | 2 - .../actors/ovl_En_Po_Field/func_80AD3D68.s | 2 - .../actors/ovl_En_Po_Field/func_80AD3E2C.s | 9 +- .../actors/ovl_En_Po_Field/func_80AD3F4C.s | 2 - .../actors/ovl_En_Po_Field/func_80AD3FF0.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4084.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4140.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4190.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4208.s | 7 +- .../actors/ovl_En_Po_Field/func_80AD42B0.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4384.s | 2 - .../actors/ovl_En_Po_Field/func_80AD443C.s | 2 - .../actors/ovl_En_Po_Field/func_80AD444C.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4470.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4554.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4664.s | 7 +- .../actors/ovl_En_Po_Field/func_80AD48CC.s | 10 +- .../actors/ovl_En_Po_Field/func_80AD4A68.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4CA4.s | 13 +- .../actors/ovl_En_Po_Field/func_80AD4E48.s | 2 - .../actors/ovl_En_Po_Field/func_80AD4ED8.s | 7 +- .../actors/ovl_En_Po_Field/func_80AD52F0.s | 2 - .../actors/ovl_En_Po_Field/func_80AD53F0.s | 2 - .../actors/ovl_En_Po_Field/func_80AD54D4.s | 19 +- .../actors/ovl_En_Po_Field/func_80AD587C.s | 2 - .../actors/ovl_En_Po_Field/func_80AD58D4.s | 7 +- .../actors/ovl_En_Po_Field/func_80AD5AD8.s | 2 - .../actors/ovl_En_Po_Field/func_80AD5B18.s | 2 - .../actors/ovl_En_Po_Field/func_80AD5C74.s | 2 - .../actors/ovl_En_Po_Field/func_80AD5D0C.s | 2 - .../actors/ovl_En_Po_Field/func_80AD5D60.s | 2 - .../actors/ovl_En_Po_Field/func_80AD5E8C.s | 30 +- .../actors/ovl_En_Po_Field/func_80AD619C.s | 2 - .../actors/ovl_En_Po_Field/func_80AD6330.s | 9 +- .../actors/ovl_En_Po_Field/func_80AD65C8.s | 2 - .../actors/ovl_En_Po_Field/func_80AD66D0.s | 15 +- .../actors/ovl_En_Po_Field/func_80AD6BF4.s | 2 - .../actors/ovl_En_Po_Field/func_80AD6C4C.s | 23 +- .../ovl_En_Po_Relay/EnPoRelay_Destroy.s | 2 - .../actors/ovl_En_Po_Relay/EnPoRelay_Draw.s | 11 +- .../actors/ovl_En_Po_Relay/EnPoRelay_Init.s | 2 - .../actors/ovl_En_Po_Relay/EnPoRelay_Update.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD790C.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7944.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7984.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7A4C.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7A88.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7B34.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7BF0.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD7C64.s | 28 +- .../actors/ovl_En_Po_Relay/func_80AD8174.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD8234.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD830C.s | 2 - .../actors/ovl_En_Po_Relay/func_80AD88D0.s | 24 +- .../ovl_En_Po_Sisters/EnPoSisters_Destroy.s | 2 - .../ovl_En_Po_Sisters/EnPoSisters_Draw.s | 42 +- .../ovl_En_Po_Sisters/EnPoSisters_Init.s | 2 - .../ovl_En_Po_Sisters/EnPoSisters_Update.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9240.s | 7 +- .../actors/ovl_En_Po_Sisters/func_80AD9368.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD93C4.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD943C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD944C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD94E0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9568.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD95D8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD96A4.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9718.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD97C8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD98F4.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD99D4.s | 7 +- .../actors/ovl_En_Po_Sisters/func_80AD9A54.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9AA8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9C24.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9D44.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9DF0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9E60.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9F1C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80AD9F90.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA028.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA094.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA10C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA1B8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA25C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA2BC.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA35C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA4A8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA530.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA6A0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA7F0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA8C0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADA9E8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADAAA4.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADAC70.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADAD54.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADAE6C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADAFC0.s | 10 +- .../actors/ovl_En_Po_Sisters/func_80ADB17C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADB2B8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADB338.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADB4B0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADB51C.s | 7 +- .../actors/ovl_En_Po_Sisters/func_80ADB770.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADB9F0.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBB6C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBBF4.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBC88.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBD38.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBD8C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBEE8.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADBF58.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADC034.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADC10C.s | 7 +- .../actors/ovl_En_Po_Sisters/func_80ADC55C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADC77C.s | 2 - .../actors/ovl_En_Po_Sisters/func_80ADC970.s | 15 +- .../actors/ovl_En_Poh/EnPoh_Destroy.s | 2 - .../overlays/actors/ovl_En_Poh/EnPoh_Init.s | 2 - .../overlays/actors/ovl_En_Poh/EnPoh_Update.s | 2 - .../actors/ovl_En_Poh/func_80ADE114.s | 2 - .../actors/ovl_En_Poh/func_80ADE16C.s | 2 - .../actors/ovl_En_Poh/func_80ADE1BC.s | 2 - .../actors/ovl_En_Poh/func_80ADE20C.s | 2 - .../actors/ovl_En_Poh/func_80ADE28C.s | 2 - .../actors/ovl_En_Poh/func_80ADE368.s | 2 - .../actors/ovl_En_Poh/func_80ADE3DC.s | 2 - .../actors/ovl_En_Poh/func_80ADE48C.s | 2 - .../actors/ovl_En_Poh/func_80ADE4C8.s | 2 - .../actors/ovl_En_Poh/func_80ADE514.s | 2 - .../actors/ovl_En_Poh/func_80ADE56C.s | 2 - .../actors/ovl_En_Poh/func_80ADE5C4.s | 2 - .../actors/ovl_En_Poh/func_80ADE610.s | 7 +- .../actors/ovl_En_Poh/func_80ADE6D4.s | 2 - .../actors/ovl_En_Poh/func_80ADE7C0.s | 2 - .../actors/ovl_En_Poh/func_80ADE950.s | 2 - .../actors/ovl_En_Poh/func_80ADE998.s | 2 - .../actors/ovl_En_Poh/func_80ADE9BC.s | 2 - .../actors/ovl_En_Poh/func_80ADE9CC.s | 2 - .../actors/ovl_En_Poh/func_80ADEA5C.s | 2 - .../actors/ovl_En_Poh/func_80ADEAC4.s | 2 - .../actors/ovl_En_Poh/func_80ADEB80.s | 7 +- .../actors/ovl_En_Poh/func_80ADEC9C.s | 2 - .../actors/ovl_En_Poh/func_80ADEDFC.s | 2 - .../actors/ovl_En_Poh/func_80ADEECC.s | 2 - .../actors/ovl_En_Poh/func_80ADEF38.s | 7 +- .../actors/ovl_En_Poh/func_80ADF0B8.s | 2 - .../actors/ovl_En_Poh/func_80ADF15C.s | 7 +- .../actors/ovl_En_Poh/func_80ADF574.s | 2 - .../actors/ovl_En_Poh/func_80ADF5E0.s | 2 - .../actors/ovl_En_Poh/func_80ADF660.s | 2 - .../actors/ovl_En_Poh/func_80ADF77C.s | 2 - .../actors/ovl_En_Poh/func_80ADF894.s | 2 - .../actors/ovl_En_Poh/func_80ADF994.s | 2 - .../actors/ovl_En_Poh/func_80ADFA90.s | 19 +- .../actors/ovl_En_Poh/func_80ADFE28.s | 2 - .../actors/ovl_En_Poh/func_80ADFE80.s | 7 +- .../actors/ovl_En_Poh/func_80AE009C.s | 2 - .../actors/ovl_En_Poh/func_80AE00DC.s | 2 - .../actors/ovl_En_Poh/func_80AE0204.s | 2 - .../actors/ovl_En_Poh/func_80AE032C.s | 2 - .../actors/ovl_En_Poh/func_80AE03C4.s | 2 - .../actors/ovl_En_Poh/func_80AE067C.s | 2 - .../actors/ovl_En_Poh/func_80AE089C.s | 9 +- .../actors/ovl_En_Poh/func_80AE0A1C.s | 2 - .../actors/ovl_En_Poh/func_80AE0BF8.s | 2 - .../actors/ovl_En_Poh/func_80AE0CE8.s | 15 +- .../actors/ovl_En_Poh/func_80AE0EE4.s | 16 +- .../actors/ovl_En_Poh/func_80AE1148.s | 16 +- .../actors/ovl_En_Poh/func_80AE1600.s | 2 - .../actors/ovl_En_Poh/func_80AE1654.s | 23 +- .../overlays/actors/ovl_En_Rd/EnRd_Destroy.s | 2 - .../overlays/actors/ovl_En_Rd/EnRd_Draw.s | 11 +- .../overlays/actors/ovl_En_Rd/EnRd_Init.s | 2 - .../overlays/actors/ovl_En_Rd/EnRd_Update.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2400.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2630.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE269C.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2744.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2970.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2A10.s | 13 +- .../overlays/actors/ovl_En_Rd/func_80AE2B90.s | 7 +- .../overlays/actors/ovl_En_Rd/func_80AE2C1C.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2F50.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE2FD0.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE31DC.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3260.s | 7 +- .../overlays/actors/ovl_En_Rd/func_80AE33F0.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3454.s | 11 +- .../overlays/actors/ovl_En_Rd/func_80AE37BC.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3834.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE392C.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3978.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE39D4.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3A54.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3A8C.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3B18.s | 7 +- .../overlays/actors/ovl_En_Rd/func_80AE3C20.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3C98.s | 7 +- .../overlays/actors/ovl_En_Rd/func_80AE3DE4.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3ECC.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE3F9C.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE4114.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE44C4.s | 2 - .../overlays/actors/ovl_En_Rd/func_80AE4520.s | 32 +- .../actors/ovl_En_Reeba/EnReeba_Destroy.s | 2 - .../actors/ovl_En_Reeba/EnReeba_Draw.s | 11 +- .../actors/ovl_En_Reeba/EnReeba_Init.s | 15 +- .../actors/ovl_En_Reeba/EnReeba_Update.s | 2 - .../actors/ovl_En_Reeba/func_80AE4F40.s | 2 - .../actors/ovl_En_Reeba/func_80AE5054.s | 13 +- .../actors/ovl_En_Reeba/func_80AE5270.s | 2 - .../actors/ovl_En_Reeba/func_80AE538C.s | 2 - .../actors/ovl_En_Reeba/func_80AE53AC.s | 7 +- .../actors/ovl_En_Reeba/func_80AE561C.s | 2 - .../actors/ovl_En_Reeba/func_80AE5688.s | 2 - .../actors/ovl_En_Reeba/func_80AE56E0.s | 2 - .../actors/ovl_En_Reeba/func_80AE57F0.s | 2 - .../actors/ovl_En_Reeba/func_80AE5854.s | 2 - .../actors/ovl_En_Reeba/func_80AE58EC.s | 2 - .../actors/ovl_En_Reeba/func_80AE5938.s | 2 - .../actors/ovl_En_Reeba/func_80AE5A9C.s | 2 - .../actors/ovl_En_Reeba/func_80AE5BC4.s | 2 - .../actors/ovl_En_Reeba/func_80AE5C38.s | 20 +- .../actors/ovl_En_Reeba/func_80AE5E48.s | 10 +- .../actors/ovl_En_Reeba/func_80AE5EDC.s | 21 +- .../ovl_En_River_Sound/EnRiverSound_Destroy.s | 2 - .../ovl_En_River_Sound/EnRiverSound_Draw.s | 1 - .../ovl_En_River_Sound/EnRiverSound_Init.s | 2 - .../ovl_En_River_Sound/EnRiverSound_Update.s | 2 - .../actors/ovl_En_River_Sound/func_80AE6A54.s | 2 - .../actors/ovl_En_River_Sound/func_80AE6BC0.s | 9 +- .../overlays/actors/ovl_En_Rl/EnRl_Destroy.s | 2 - .../overlays/actors/ovl_En_Rl/EnRl_Draw.s | 7 +- .../overlays/actors/ovl_En_Rl/EnRl_Init.s | 2 - .../overlays/actors/ovl_En_Rl/EnRl_Update.s | 8 +- .../overlays/actors/ovl_En_Rl/func_80AE72D0.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7358.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE73D8.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE744C.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7494.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE74B4.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE74FC.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7544.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7590.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7668.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7698.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE772C.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7798.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE77B8.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE77F8.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7838.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7878.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE78D4.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7954.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE79A4.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7AF8.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7BF8.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7C64.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7C94.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7CE8.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7D40.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7D94.s | 12 +- .../overlays/actors/ovl_En_Rl/func_80AE7FD0.s | 2 - .../overlays/actors/ovl_En_Rl/func_80AE7FDC.s | 12 +- .../overlays/actors/ovl_En_Rr/EnRr_Destroy.s | 2 - .../overlays/actors/ovl_En_Rr/EnRr_Draw.s | 19 +- .../overlays/actors/ovl_En_Rr/EnRr_Init.s | 11 +- .../overlays/actors/ovl_En_Rr/EnRr_Update.s | 16 +- .../overlays/actors/ovl_En_Rr/func_80AE861C.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE8644.s | 13 +- .../overlays/actors/ovl_En_Rr/func_80AE8744.s | 7 +- .../overlays/actors/ovl_En_Rr/func_80AE8810.s | 10 +- .../overlays/actors/ovl_En_Rr/func_80AE8918.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE8968.s | 36 +- .../overlays/actors/ovl_En_Rr/func_80AE8B78.s | 7 +- .../overlays/actors/ovl_En_Rr/func_80AE8C44.s | 10 +- .../overlays/actors/ovl_En_Rr/func_80AE8CF8.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE8D9C.s | 10 +- .../overlays/actors/ovl_En_Rr/func_80AE8EA4.s | 34 +- .../overlays/actors/ovl_En_Rr/func_80AE926C.s | 10 +- .../overlays/actors/ovl_En_Rr/func_80AE942C.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE95B0.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE9670.s | 13 +- .../overlays/actors/ovl_En_Rr/func_80AE978C.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE9880.s | 10 +- .../overlays/actors/ovl_En_Rr/func_80AE98F8.s | 19 +- .../overlays/actors/ovl_En_Rr/func_80AE9C88.s | 2 - .../overlays/actors/ovl_En_Rr/func_80AE9D1C.s | 2 - .../actors/ovl_En_Ru1/EnRu1_Destroy.s | 2 - .../overlays/actors/ovl_En_Ru1/EnRu1_Draw.s | 7 +- .../overlays/actors/ovl_En_Ru1/EnRu1_Init.s | 22 +- .../overlays/actors/ovl_En_Ru1/EnRu1_Update.s | 8 +- .../actors/ovl_En_Ru1/func_80AEAC10.s | 2 - .../actors/ovl_En_Ru1/func_80AEAC54.s | 2 - .../actors/ovl_En_Ru1/func_80AEACDC.s | 2 - .../actors/ovl_En_Ru1/func_80AEAD20.s | 2 - .../actors/ovl_En_Ru1/func_80AEAD98.s | 2 - .../actors/ovl_En_Ru1/func_80AEADD8.s | 2 - .../actors/ovl_En_Ru1/func_80AEADE0.s | 2 - .../actors/ovl_En_Ru1/func_80AEADF0.s | 2 - .../actors/ovl_En_Ru1/func_80AEAE1C.s | 2 - .../actors/ovl_En_Ru1/func_80AEAEA4.s | 2 - .../actors/ovl_En_Ru1/func_80AEAEB8.s | 2 - .../actors/ovl_En_Ru1/func_80AEAECC.s | 2 - .../actors/ovl_En_Ru1/func_80AEAF38.s | 2 - .../actors/ovl_En_Ru1/func_80AEAF58.s | 2 - .../actors/ovl_En_Ru1/func_80AEAFA0.s | 2 - .../actors/ovl_En_Ru1/func_80AEAFE0.s | 2 - .../actors/ovl_En_Ru1/func_80AEB020.s | 2 - .../actors/ovl_En_Ru1/func_80AEB088.s | 8 +- .../actors/ovl_En_Ru1/func_80AEB0EC.s | 2 - .../actors/ovl_En_Ru1/func_80AEB104.s | 2 - .../actors/ovl_En_Ru1/func_80AEB124.s | 2 - .../actors/ovl_En_Ru1/func_80AEB174.s | 2 - .../actors/ovl_En_Ru1/func_80AEB1B4.s | 2 - .../actors/ovl_En_Ru1/func_80AEB1D8.s | 2 - .../actors/ovl_En_Ru1/func_80AEB220.s | 2 - .../actors/ovl_En_Ru1/func_80AEB264.s | 2 - .../actors/ovl_En_Ru1/func_80AEB320.s | 2 - .../actors/ovl_En_Ru1/func_80AEB364.s | 2 - .../actors/ovl_En_Ru1/func_80AEB3A4.s | 2 - .../actors/ovl_En_Ru1/func_80AEB3CC.s | 2 - .../actors/ovl_En_Ru1/func_80AEB3DC.s | 2 - .../actors/ovl_En_Ru1/func_80AEB438.s | 2 - .../actors/ovl_En_Ru1/func_80AEB458.s | 2 - .../actors/ovl_En_Ru1/func_80AEB480.s | 2 - .../actors/ovl_En_Ru1/func_80AEB4A8.s | 2 - .../actors/ovl_En_Ru1/func_80AEB50C.s | 2 - .../actors/ovl_En_Ru1/func_80AEB59C.s | 2 - .../actors/ovl_En_Ru1/func_80AEB680.s | 2 - .../actors/ovl_En_Ru1/func_80AEB6E0.s | 2 - .../actors/ovl_En_Ru1/func_80AEB738.s | 2 - .../actors/ovl_En_Ru1/func_80AEB7D0.s | 2 - .../actors/ovl_En_Ru1/func_80AEB7E0.s | 2 - .../actors/ovl_En_Ru1/func_80AEB87C.s | 2 - .../actors/ovl_En_Ru1/func_80AEB89C.s | 2 - .../actors/ovl_En_Ru1/func_80AEB914.s | 2 - .../actors/ovl_En_Ru1/func_80AEB934.s | 2 - .../actors/ovl_En_Ru1/func_80AEB954.s | 2 - .../actors/ovl_En_Ru1/func_80AEB974.s | 2 - .../actors/ovl_En_Ru1/func_80AEBA0C.s | 2 - .../actors/ovl_En_Ru1/func_80AEBA2C.s | 2 - .../actors/ovl_En_Ru1/func_80AEBAFC.s | 2 - .../actors/ovl_En_Ru1/func_80AEBB3C.s | 2 - .../actors/ovl_En_Ru1/func_80AEBB78.s | 2 - .../actors/ovl_En_Ru1/func_80AEBBF4.s | 2 - .../actors/ovl_En_Ru1/func_80AEBC30.s | 2 - .../actors/ovl_En_Ru1/func_80AEBC84.s | 2 - .../actors/ovl_En_Ru1/func_80AEBCB8.s | 2 - .../actors/ovl_En_Ru1/func_80AEBD1C.s | 2 - .../actors/ovl_En_Ru1/func_80AEBD94.s | 2 - .../actors/ovl_En_Ru1/func_80AEBE3C.s | 2 - .../actors/ovl_En_Ru1/func_80AEBEC8.s | 2 - .../actors/ovl_En_Ru1/func_80AEBF60.s | 2 - .../actors/ovl_En_Ru1/func_80AEBFD8.s | 2 - .../actors/ovl_En_Ru1/func_80AEC070.s | 2 - .../actors/ovl_En_Ru1/func_80AEC0B4.s | 2 - .../actors/ovl_En_Ru1/func_80AEC100.s | 2 - .../actors/ovl_En_Ru1/func_80AEC130.s | 2 - .../actors/ovl_En_Ru1/func_80AEC17C.s | 2 - .../actors/ovl_En_Ru1/func_80AEC1D4.s | 2 - .../actors/ovl_En_Ru1/func_80AEC244.s | 2 - .../actors/ovl_En_Ru1/func_80AEC2C0.s | 2 - .../actors/ovl_En_Ru1/func_80AEC320.s | 2 - .../actors/ovl_En_Ru1/func_80AEC40C.s | 16 +- .../actors/ovl_En_Ru1/func_80AEC4CC.s | 2 - .../actors/ovl_En_Ru1/func_80AEC4F4.s | 10 +- .../actors/ovl_En_Ru1/func_80AEC5FC.s | 7 +- .../actors/ovl_En_Ru1/func_80AEC650.s | 2 - .../actors/ovl_En_Ru1/func_80AEC6B0.s | 2 - .../actors/ovl_En_Ru1/func_80AEC6E4.s | 2 - .../actors/ovl_En_Ru1/func_80AEC780.s | 2 - .../actors/ovl_En_Ru1/func_80AEC81C.s | 2 - .../actors/ovl_En_Ru1/func_80AEC8B8.s | 2 - .../actors/ovl_En_Ru1/func_80AEC93C.s | 2 - .../actors/ovl_En_Ru1/func_80AEC9C4.s | 2 - .../actors/ovl_En_Ru1/func_80AECA18.s | 2 - .../actors/ovl_En_Ru1/func_80AECA44.s | 2 - .../actors/ovl_En_Ru1/func_80AECA94.s | 2 - .../actors/ovl_En_Ru1/func_80AECAB4.s | 2 - .../actors/ovl_En_Ru1/func_80AECAD4.s | 2 - .../actors/ovl_En_Ru1/func_80AECB18.s | 2 - .../actors/ovl_En_Ru1/func_80AECB60.s | 2 - .../actors/ovl_En_Ru1/func_80AECBB8.s | 2 - .../actors/ovl_En_Ru1/func_80AECC1C.s | 2 - .../actors/ovl_En_Ru1/func_80AECC84.s | 2 - .../actors/ovl_En_Ru1/func_80AECCB0.s | 2 - .../actors/ovl_En_Ru1/func_80AECDA0.s | 7 +- .../actors/ovl_En_Ru1/func_80AECE04.s | 7 +- .../actors/ovl_En_Ru1/func_80AECE20.s | 2 - .../actors/ovl_En_Ru1/func_80AECEB4.s | 2 - .../actors/ovl_En_Ru1/func_80AECF6C.s | 7 +- .../actors/ovl_En_Ru1/func_80AED084.s | 2 - .../actors/ovl_En_Ru1/func_80AED0B0.s | 2 - .../actors/ovl_En_Ru1/func_80AED0C8.s | 2 - .../actors/ovl_En_Ru1/func_80AED0D8.s | 2 - .../actors/ovl_En_Ru1/func_80AED110.s | 2 - .../actors/ovl_En_Ru1/func_80AED154.s | 2 - .../actors/ovl_En_Ru1/func_80AED19C.s | 2 - .../actors/ovl_En_Ru1/func_80AED218.s | 2 - .../actors/ovl_En_Ru1/func_80AED304.s | 2 - .../actors/ovl_En_Ru1/func_80AED324.s | 2 - .../actors/ovl_En_Ru1/func_80AED344.s | 2 - .../actors/ovl_En_Ru1/func_80AED374.s | 2 - .../actors/ovl_En_Ru1/func_80AED3A4.s | 2 - .../actors/ovl_En_Ru1/func_80AED3E0.s | 2 - .../actors/ovl_En_Ru1/func_80AED414.s | 2 - .../actors/ovl_En_Ru1/func_80AED44C.s | 2 - .../actors/ovl_En_Ru1/func_80AED4FC.s | 2 - .../actors/ovl_En_Ru1/func_80AED520.s | 2 - .../actors/ovl_En_Ru1/func_80AED57C.s | 2 - .../actors/ovl_En_Ru1/func_80AED5B8.s | 2 - .../actors/ovl_En_Ru1/func_80AED5DC.s | 2 - .../actors/ovl_En_Ru1/func_80AED600.s | 2 - .../actors/ovl_En_Ru1/func_80AED624.s | 2 - .../actors/ovl_En_Ru1/func_80AED6DC.s | 2 - .../actors/ovl_En_Ru1/func_80AED6F8.s | 2 - .../actors/ovl_En_Ru1/func_80AED738.s | 2 - .../actors/ovl_En_Ru1/func_80AED83C.s | 2 - .../actors/ovl_En_Ru1/func_80AED8DC.s | 2 - .../actors/ovl_En_Ru1/func_80AEDAE0.s | 2 - .../actors/ovl_En_Ru1/func_80AEDB30.s | 34 +- .../actors/ovl_En_Ru1/func_80AEDEF4.s | 13 +- .../actors/ovl_En_Ru1/func_80AEDFF4.s | 2 - .../actors/ovl_En_Ru1/func_80AEE02C.s | 2 - .../actors/ovl_En_Ru1/func_80AEE050.s | 15 +- .../actors/ovl_En_Ru1/func_80AEE264.s | 2 - .../actors/ovl_En_Ru1/func_80AEE2F8.s | 2 - .../actors/ovl_En_Ru1/func_80AEE394.s | 2 - .../actors/ovl_En_Ru1/func_80AEE488.s | 12 +- .../actors/ovl_En_Ru1/func_80AEE568.s | 2 - .../actors/ovl_En_Ru1/func_80AEE628.s | 2 - .../actors/ovl_En_Ru1/func_80AEE6D0.s | 2 - .../actors/ovl_En_Ru1/func_80AEE7C4.s | 13 +- .../actors/ovl_En_Ru1/func_80AEEAC8.s | 2 - .../actors/ovl_En_Ru1/func_80AEEB24.s | 12 +- .../actors/ovl_En_Ru1/func_80AEEBB4.s | 2 - .../actors/ovl_En_Ru1/func_80AEEBD4.s | 2 - .../actors/ovl_En_Ru1/func_80AEEC5C.s | 2 - .../actors/ovl_En_Ru1/func_80AEECF0.s | 2 - .../actors/ovl_En_Ru1/func_80AEED58.s | 2 - .../actors/ovl_En_Ru1/func_80AEEDCC.s | 2 - .../actors/ovl_En_Ru1/func_80AEEE34.s | 2 - .../actors/ovl_En_Ru1/func_80AEEE9C.s | 2 - .../actors/ovl_En_Ru1/func_80AEEF08.s | 2 - .../actors/ovl_En_Ru1/func_80AEEF5C.s | 2 - .../actors/ovl_En_Ru1/func_80AEEF68.s | 2 - .../actors/ovl_En_Ru1/func_80AEEFEC.s | 2 - .../actors/ovl_En_Ru1/func_80AEF080.s | 2 - .../actors/ovl_En_Ru1/func_80AEF0BC.s | 2 - .../actors/ovl_En_Ru1/func_80AEF170.s | 2 - .../actors/ovl_En_Ru1/func_80AEF188.s | 2 - .../actors/ovl_En_Ru1/func_80AEF1F0.s | 2 - .../actors/ovl_En_Ru1/func_80AEF29C.s | 2 - .../actors/ovl_En_Ru1/func_80AEF2AC.s | 2 - .../actors/ovl_En_Ru1/func_80AEF2D0.s | 2 - .../actors/ovl_En_Ru1/func_80AEF354.s | 2 - .../actors/ovl_En_Ru1/func_80AEF3A8.s | 2 - .../actors/ovl_En_Ru1/func_80AEF40C.s | 2 - .../actors/ovl_En_Ru1/func_80AEF4A8.s | 2 - .../actors/ovl_En_Ru1/func_80AEF4E0.s | 2 - .../actors/ovl_En_Ru1/func_80AEF51C.s | 2 - .../actors/ovl_En_Ru1/func_80AEF540.s | 2 - .../actors/ovl_En_Ru1/func_80AEF5B8.s | 2 - .../actors/ovl_En_Ru1/func_80AEF624.s | 2 - .../actors/ovl_En_Ru1/func_80AEF728.s | 2 - .../actors/ovl_En_Ru1/func_80AEF79C.s | 2 - .../actors/ovl_En_Ru1/func_80AEF820.s | 2 - .../actors/ovl_En_Ru1/func_80AEF890.s | 2 - .../actors/ovl_En_Ru1/func_80AEF930.s | 2 - .../actors/ovl_En_Ru1/func_80AEF99C.s | 2 - .../actors/ovl_En_Ru1/func_80AEF9D8.s | 2 - .../actors/ovl_En_Ru1/func_80AEFA2C.s | 2 - .../actors/ovl_En_Ru1/func_80AEFAAC.s | 2 - .../actors/ovl_En_Ru1/func_80AEFB04.s | 2 - .../actors/ovl_En_Ru1/func_80AEFB68.s | 2 - .../actors/ovl_En_Ru1/func_80AEFBC8.s | 2 - .../actors/ovl_En_Ru1/func_80AEFC24.s | 2 - .../actors/ovl_En_Ru1/func_80AEFC54.s | 2 - .../actors/ovl_En_Ru1/func_80AEFCE8.s | 2 - .../actors/ovl_En_Ru1/func_80AEFD38.s | 2 - .../actors/ovl_En_Ru1/func_80AEFDC0.s | 2 - .../actors/ovl_En_Ru1/func_80AEFE38.s | 2 - .../actors/ovl_En_Ru1/func_80AEFE84.s | 2 - .../actors/ovl_En_Ru1/func_80AEFE9C.s | 2 - .../actors/ovl_En_Ru1/func_80AEFECC.s | 2 - .../actors/ovl_En_Ru1/func_80AEFF40.s | 2 - .../actors/ovl_En_Ru1/func_80AEFF94.s | 11 +- .../actors/ovl_En_Ru1/func_80AF0050.s | 2 - .../actors/ovl_En_Ru1/func_80AF0278.s | 2 - .../actors/ovl_En_Ru1/func_80AF02E8.s | 8 +- .../actors/ovl_En_Ru1/func_80AF0368.s | 2 - .../actors/ovl_En_Ru1/func_80AF03F4.s | 2 - .../actors/ovl_En_Ru1/func_80AF0400.s | 12 +- .../actors/ovl_En_Ru1/func_80AF05D4.s | 12 +- .../overlays/actors/ovl_En_Sa/EnSa_Destroy.s | 2 - .../overlays/actors/ovl_En_Sa/EnSa_Draw.s | 11 +- .../overlays/actors/ovl_En_Sa/EnSa_Init.s | 12 +- .../overlays/actors/ovl_En_Sa/EnSa_Update.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5560.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF55E0.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF56F4.s | 16 +- .../overlays/actors/ovl_En_Sa/func_80AF57D8.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5894.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF58B8.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF594C.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF59E0.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5A74.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5B10.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5BA4.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5C40.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5CD4.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5CE4.s | 13 +- .../overlays/actors/ovl_En_Sa/func_80AF5D8C.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5DFC.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF5F34.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF603C.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF609C.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF6130.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF6170.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF6448.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF67D0.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF683C.s | 7 +- .../overlays/actors/ovl_En_Sa/func_80AF68E4.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF6B20.s | 2 - .../overlays/actors/ovl_En_Sa/func_80AF6D6C.s | 16 +- .../overlays/actors/ovl_En_Sa/func_80AF6F0C.s | 2 - .../overlays/actors/ovl_En_Sb/EnSb_Destroy.s | 2 - .../overlays/actors/ovl_En_Sb/EnSb_Draw.s | 1 - .../overlays/actors/ovl_En_Sb/EnSb_Init.s | 7 +- .../overlays/actors/ovl_En_Sb/EnSb_Update.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF790C.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF79BC.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7A34.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7AB0.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7B24.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7BCC.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7C44.s | 10 +- .../overlays/actors/ovl_En_Sb/func_80AF7D48.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7DC8.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7E90.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF7F44.s | 12 +- .../overlays/actors/ovl_En_Sb/func_80AF803C.s | 7 +- .../overlays/actors/ovl_En_Sb/func_80AF80E4.s | 12 +- .../overlays/actors/ovl_En_Sb/func_80AF8224.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF828C.s | 11 +- .../overlays/actors/ovl_En_Sb/func_80AF82F0.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF832C.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF8368.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF8388.s | 2 - .../overlays/actors/ovl_En_Sb/func_80AF83D4.s | 21 +- .../overlays/actors/ovl_En_Sb/func_80AF8828.s | 2 - .../actors/ovl_En_Sda/EnSda_Destroy.s | 2 - .../overlays/actors/ovl_En_Sda/EnSda_Draw.s | 12 +- .../overlays/actors/ovl_En_Sda/EnSda_Init.s | 2 - .../overlays/actors/ovl_En_Sda/EnSda_Update.s | 12 +- .../actors/ovl_En_Sda/func_80AF8F60.s | 2 - .../actors/ovl_En_Sda/func_80AF95C4.s | 33 +- .../actors/ovl_En_Sda/func_80AF9C70.s | 31 +- .../ovl_En_Shopnuts/EnShopnuts_Destroy.s | 2 - .../actors/ovl_En_Shopnuts/EnShopnuts_Draw.s | 1 - .../actors/ovl_En_Shopnuts/EnShopnuts_Init.s | 2 - .../ovl_En_Shopnuts/EnShopnuts_Update.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFA880.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFA8E8.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFA930.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFA96C.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFA9D4.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFAA20.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFAA7C.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFACE0.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFAD64.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFAE28.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFAF64.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFB028.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFB0C4.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFB25C.s | 2 - .../actors/ovl_En_Shopnuts/func_80AFB290.s | 30 +- .../overlays/actors/ovl_En_Si/EnSi_Destroy.s | 2 - .../overlays/actors/ovl_En_Si/EnSi_Draw.s | 1 - .../overlays/actors/ovl_En_Si/EnSi_Init.s | 2 - .../overlays/actors/ovl_En_Si/EnSi_Update.s | 2 - .../overlays/actors/ovl_En_Si/func_80AFB748.s | 2 - .../overlays/actors/ovl_En_Si/func_80AFB768.s | 2 - .../overlays/actors/ovl_En_Si/func_80AFB89C.s | 2 - .../overlays/actors/ovl_En_Si/func_80AFB950.s | 2 - .../actors/ovl_En_Siofuki/EnSiofuki_Destroy.s | 2 - .../actors/ovl_En_Siofuki/EnSiofuki_Draw.s | 15 +- .../actors/ovl_En_Siofuki/EnSiofuki_Init.s | 12 +- .../actors/ovl_En_Siofuki/EnSiofuki_Update.s | 2 - .../actors/ovl_En_Siofuki/func_80AFBDC8.s | 10 +- .../actors/ovl_En_Siofuki/func_80AFBE8C.s | 9 +- .../actors/ovl_En_Siofuki/func_80AFC1D0.s | 7 +- .../actors/ovl_En_Siofuki/func_80AFC218.s | 2 - .../actors/ovl_En_Siofuki/func_80AFC34C.s | 2 - .../actors/ovl_En_Siofuki/func_80AFC3C8.s | 2 - .../actors/ovl_En_Siofuki/func_80AFC478.s | 2 - .../actors/ovl_En_Siofuki/func_80AFC544.s | 2 - .../actors/ovl_En_Skb/EnSkb_Destroy.s | 2 - .../overlays/actors/ovl_En_Skb/EnSkb_Draw.s | 1 - .../overlays/actors/ovl_En_Skb/EnSkb_Init.s | 10 +- .../overlays/actors/ovl_En_Skb/EnSkb_Update.s | 7 +- .../actors/ovl_En_Skb/func_80AFC9A0.s | 2 - .../actors/ovl_En_Skb/func_80AFC9A8.s | 10 +- .../actors/ovl_En_Skb/func_80AFCD60.s | 2 - .../actors/ovl_En_Skb/func_80AFCDF8.s | 2 - .../actors/ovl_En_Skb/func_80AFCE5C.s | 2 - .../actors/ovl_En_Skb/func_80AFCF48.s | 2 - .../actors/ovl_En_Skb/func_80AFCFF0.s | 2 - .../actors/ovl_En_Skb/func_80AFD0A4.s | 2 - .../actors/ovl_En_Skb/func_80AFD13C.s | 7 +- .../actors/ovl_En_Skb/func_80AFD33C.s | 2 - .../actors/ovl_En_Skb/func_80AFD3D4.s | 2 - .../actors/ovl_En_Skb/func_80AFD47C.s | 2 - .../actors/ovl_En_Skb/func_80AFD508.s | 2 - .../actors/ovl_En_Skb/func_80AFD540.s | 2 - .../actors/ovl_En_Skb/func_80AFD59C.s | 7 +- .../actors/ovl_En_Skb/func_80AFD644.s | 2 - .../actors/ovl_En_Skb/func_80AFD6CC.s | 7 +- .../actors/ovl_En_Skb/func_80AFD7B4.s | 2 - .../actors/ovl_En_Skb/func_80AFD880.s | 10 +- .../actors/ovl_En_Skb/func_80AFD968.s | 7 +- .../actors/ovl_En_Skb/func_80AFDD30.s | 12 +- .../actors/ovl_En_Skb/func_80AFDF24.s | 2 - .../actors/ovl_En_Skj/EnSkj_Destroy.s | 2 - .../overlays/actors/ovl_En_Skj/EnSkj_Draw.s | 1 - .../overlays/actors/ovl_En_Skj/EnSkj_Init.s | 2 - .../overlays/actors/ovl_En_Skj/EnSkj_Update.s | 2 - .../actors/ovl_En_Skj/func_80AFE2B0.s | 2 - .../actors/ovl_En_Skj/func_80AFE338.s | 2 - .../actors/ovl_En_Skj/func_80AFE390.s | 2 - .../actors/ovl_En_Skj/func_80AFE428.s | 2 - .../actors/ovl_En_Skj/func_80AFE8EC.s | 2 - .../actors/ovl_En_Skj/func_80AFE968.s | 2 - .../actors/ovl_En_Skj/func_80AFE9AC.s | 2 - .../actors/ovl_En_Skj/func_80AFE9D4.s | 2 - .../actors/ovl_En_Skj/func_80AFEAEC.s | 2 - .../actors/ovl_En_Skj/func_80AFEC3C.s | 2 - .../actors/ovl_En_Skj/func_80AFEDF8.s | 2 - .../actors/ovl_En_Skj/func_80AFEE84.s | 2 - .../actors/ovl_En_Skj/func_80AFEECC.s | 2 - .../actors/ovl_En_Skj/func_80AFEF5C.s | 2 - .../actors/ovl_En_Skj/func_80AFEF98.s | 2 - .../actors/ovl_En_Skj/func_80AFF038.s | 2 - .../actors/ovl_En_Skj/func_80AFF07C.s | 2 - .../actors/ovl_En_Skj/func_80AFF16C.s | 2 - .../actors/ovl_En_Skj/func_80AFF19C.s | 2 - .../actors/ovl_En_Skj/func_80AFF1F0.s | 2 - .../actors/ovl_En_Skj/func_80AFF220.s | 2 - .../actors/ovl_En_Skj/func_80AFF2A0.s | 2 - .../actors/ovl_En_Skj/func_80AFF2E0.s | 2 - .../actors/ovl_En_Skj/func_80AFF334.s | 2 - .../actors/ovl_En_Skj/func_80AFF380.s | 2 - .../actors/ovl_En_Skj/func_80AFF3D0.s | 2 - .../actors/ovl_En_Skj/func_80AFF424.s | 2 - .../actors/ovl_En_Skj/func_80AFF5F0.s | 2 - .../actors/ovl_En_Skj/func_80AFF620.s | 2 - .../actors/ovl_En_Skj/func_80AFF660.s | 2 - .../actors/ovl_En_Skj/func_80AFF688.s | 2 - .../actors/ovl_En_Skj/func_80AFF7A0.s | 2 - .../actors/ovl_En_Skj/func_80AFF7D8.s | 2 - .../actors/ovl_En_Skj/func_80AFF9E8.s | 2 - .../actors/ovl_En_Skj/func_80AFFA0C.s | 2 - .../actors/ovl_En_Skj/func_80AFFCE0.s | 2 - .../actors/ovl_En_Skj/func_80AFFD14.s | 2 - .../actors/ovl_En_Skj/func_80AFFD64.s | 2 - .../actors/ovl_En_Skj/func_80AFFD84.s | 2 - .../actors/ovl_En_Skj/func_80AFFE24.s | 2 - .../actors/ovl_En_Skj/func_80AFFE44.s | 2 - .../actors/ovl_En_Skj/func_80AFFEB4.s | 2 - .../actors/ovl_En_Skj/func_80AFFED4.s | 2 - .../actors/ovl_En_Skj/func_80AFFF38.s | 2 - .../actors/ovl_En_Skj/func_80AFFF58.s | 2 - .../actors/ovl_En_Skj/func_80AFFFBC.s | 2 - .../actors/ovl_En_Skj/func_80B00018.s | 2 - .../actors/ovl_En_Skj/func_80B00068.s | 2 - .../actors/ovl_En_Skj/func_80B00098.s | 2 - .../actors/ovl_En_Skj/func_80B000EC.s | 2 - .../actors/ovl_En_Skj/func_80B00130.s | 2 - .../actors/ovl_En_Skj/func_80B001CC.s | 2 - .../actors/ovl_En_Skj/func_80B00210.s | 2 - .../actors/ovl_En_Skj/func_80B002A4.s | 2 - .../actors/ovl_En_Skj/func_80B002D8.s | 2 - .../actors/ovl_En_Skj/func_80B00370.s | 2 - .../actors/ovl_En_Skj/func_80B00390.s | 2 - .../actors/ovl_En_Skj/func_80B003F4.s | 2 - .../actors/ovl_En_Skj/func_80B0042C.s | 2 - .../actors/ovl_En_Skj/func_80B0047C.s | 2 - .../actors/ovl_En_Skj/func_80B0049C.s | 2 - .../actors/ovl_En_Skj/func_80B00514.s | 2 - .../actors/ovl_En_Skj/func_80B00554.s | 2 - .../actors/ovl_En_Skj/func_80B00590.s | 2 - .../actors/ovl_En_Skj/func_80B005E0.s | 2 - .../actors/ovl_En_Skj/func_80B00610.s | 2 - .../actors/ovl_En_Skj/func_80B00638.s | 2 - .../actors/ovl_En_Skj/func_80B00680.s | 2 - .../actors/ovl_En_Skj/func_80B006B0.s | 2 - .../actors/ovl_En_Skj/func_80B006F8.s | 2 - .../actors/ovl_En_Skj/func_80B00740.s | 2 - .../actors/ovl_En_Skj/func_80B00964.s | 2 - .../actors/ovl_En_Skj/func_80B00A08.s | 2 - .../actors/ovl_En_Skj/func_80B00A54.s | 2 - .../actors/ovl_En_Skj/func_80B00B0C.s | 2 - .../actors/ovl_En_Skj/func_80B00BB0.s | 2 - .../actors/ovl_En_Skj/func_80B00C38.s | 2 - .../actors/ovl_En_Skj/func_80B00EA4.s | 2 - .../actors/ovl_En_Skj/func_80B00EE0.s | 2 - .../actors/ovl_En_Skj/func_80B00F2C.s | 2 - .../actors/ovl_En_Skj/func_80B00F64.s | 2 - .../actors/ovl_En_Skj/func_80B01004.s | 2 - .../actors/ovl_En_Skj/func_80B01040.s | 2 - .../actors/ovl_En_Skj/func_80B010C4.s | 2 - .../actors/ovl_En_Skj/func_80B01134.s | 2 - .../actors/ovl_En_Skj/func_80B011CC.s | 2 - .../actors/ovl_En_Skj/func_80B01244.s | 2 - .../actors/ovl_En_Skj/func_80B01348.s | 2 - .../actors/ovl_En_Skj/func_80B01360.s | 2 - .../actors/ovl_En_Skj/func_80B01474.s | 2 - .../actors/ovl_En_Skj/func_80B014E4.s | 2 - .../ovl_En_Skjneedle/EnSkjneedle_Destroy.s | 2 - .../ovl_En_Skjneedle/EnSkjneedle_Draw.s | 15 +- .../ovl_En_Skjneedle/EnSkjneedle_Init.s | 2 - .../ovl_En_Skjneedle/EnSkjneedle_Update.s | 2 - .../actors/ovl_En_Skjneedle/func_80B01F6C.s | 2 - .../actors/ovl_En_Ssh/EnSsh_Destroy.s | 2 - .../overlays/actors/ovl_En_Ssh/EnSsh_Draw.s | 11 +- .../overlays/actors/ovl_En_Ssh/EnSsh_Init.s | 2 - .../overlays/actors/ovl_En_Ssh/EnSsh_Update.s | 2 - .../actors/ovl_En_Ssh/func_80B02270.s | 2 - .../actors/ovl_En_Ssh/func_80B02278.s | 2 - .../actors/ovl_En_Ssh/func_80B02300.s | 2 - .../actors/ovl_En_Ssh/func_80B023FC.s | 2 - .../actors/ovl_En_Ssh/func_80B02490.s | 2 - .../actors/ovl_En_Ssh/func_80B02598.s | 2 - .../actors/ovl_En_Ssh/func_80B025C0.s | 2 - .../actors/ovl_En_Ssh/func_80B02700.s | 2 - .../actors/ovl_En_Ssh/func_80B02834.s | 2 - .../actors/ovl_En_Ssh/func_80B02854.s | 2 - .../actors/ovl_En_Ssh/func_80B02884.s | 2 - .../actors/ovl_En_Ssh/func_80B028CC.s | 2 - .../actors/ovl_En_Ssh/func_80B02920.s | 2 - .../actors/ovl_En_Ssh/func_80B0294C.s | 7 +- .../actors/ovl_En_Ssh/func_80B02AC4.s | 2 - .../actors/ovl_En_Ssh/func_80B02B9C.s | 7 +- .../actors/ovl_En_Ssh/func_80B02C74.s | 2 - .../actors/ovl_En_Ssh/func_80B02D14.s | 2 - .../actors/ovl_En_Ssh/func_80B02D50.s | 2 - .../actors/ovl_En_Ssh/func_80B02DBC.s | 2 - .../actors/ovl_En_Ssh/func_80B02EA4.s | 2 - .../actors/ovl_En_Ssh/func_80B02EDC.s | 2 - .../actors/ovl_En_Ssh/func_80B02F1C.s | 11 +- .../actors/ovl_En_Ssh/func_80B03060.s | 2 - .../actors/ovl_En_Ssh/func_80B030D4.s | 2 - .../actors/ovl_En_Ssh/func_80B031DC.s | 2 - .../actors/ovl_En_Ssh/func_80B03238.s | 2 - .../actors/ovl_En_Ssh/func_80B0330C.s | 2 - .../actors/ovl_En_Ssh/func_80B033BC.s | 2 - .../actors/ovl_En_Ssh/func_80B03400.s | 2 - .../actors/ovl_En_Ssh/func_80B034B4.s | 7 +- .../actors/ovl_En_Ssh/func_80B0368C.s | 2 - .../actors/ovl_En_Ssh/func_80B03968.s | 2 - .../actors/ovl_En_Ssh/func_80B039BC.s | 2 - .../actors/ovl_En_Ssh/func_80B03A00.s | 2 - .../actors/ovl_En_Ssh/func_80B03C8C.s | 2 - .../actors/ovl_En_Ssh/func_80B03D74.s | 2 - .../actors/ovl_En_Ssh/func_80B03E74.s | 2 - .../actors/ovl_En_Ssh/func_80B03F48.s | 2 - .../actors/ovl_En_Ssh/func_80B03FF0.s | 2 - .../actors/ovl_En_Ssh/func_80B04190.s | 2 - .../actors/ovl_En_Ssh/func_80B04280.s | 2 - .../overlays/actors/ovl_En_St/EnSt_Destroy.s | 2 - .../overlays/actors/ovl_En_St/EnSt_Draw.s | 1 - .../overlays/actors/ovl_En_St/EnSt_Init.s | 2 - .../overlays/actors/ovl_En_St/EnSt_Update.s | 2 - .../overlays/actors/ovl_En_St/func_80B04890.s | 2 - .../overlays/actors/ovl_En_St/func_80B04898.s | 2 - .../overlays/actors/ovl_En_St/func_80B04AB8.s | 2 - .../overlays/actors/ovl_En_St/func_80B04B40.s | 2 - .../overlays/actors/ovl_En_St/func_80B04C7C.s | 2 - .../overlays/actors/ovl_En_St/func_80B04D78.s | 2 - .../overlays/actors/ovl_En_St/func_80B04E44.s | 2 - .../overlays/actors/ovl_En_St/func_80B04F4C.s | 2 - .../overlays/actors/ovl_En_St/func_80B04F74.s | 2 - .../overlays/actors/ovl_En_St/func_80B04FA0.s | 2 - .../overlays/actors/ovl_En_St/func_80B04FDC.s | 2 - .../overlays/actors/ovl_En_St/func_80B0503C.s | 2 - .../overlays/actors/ovl_En_St/func_80B050A0.s | 2 - .../overlays/actors/ovl_En_St/func_80B051E0.s | 2 - .../overlays/actors/ovl_En_St/func_80B05254.s | 2 - .../overlays/actors/ovl_En_St/func_80B05298.s | 2 - .../overlays/actors/ovl_En_St/func_80B0534C.s | 7 +- .../overlays/actors/ovl_En_St/func_80B05524.s | 2 - .../overlays/actors/ovl_En_St/func_80B055E8.s | 2 - .../overlays/actors/ovl_En_St/func_80B056D0.s | 2 - .../overlays/actors/ovl_En_St/func_80B05710.s | 2 - .../overlays/actors/ovl_En_St/func_80B05900.s | 2 - .../overlays/actors/ovl_En_St/func_80B05988.s | 10 +- .../overlays/actors/ovl_En_St/func_80B05AF8.s | 7 +- .../overlays/actors/ovl_En_St/func_80B05C24.s | 2 - .../overlays/actors/ovl_En_St/func_80B05C44.s | 2 - .../overlays/actors/ovl_En_St/func_80B05EE4.s | 2 - .../overlays/actors/ovl_En_St/func_80B05FB0.s | 2 - .../overlays/actors/ovl_En_St/func_80B0601C.s | 2 - .../overlays/actors/ovl_En_St/func_80B060C4.s | 2 - .../overlays/actors/ovl_En_St/func_80B060FC.s | 2 - .../overlays/actors/ovl_En_St/func_80B0613C.s | 11 +- .../overlays/actors/ovl_En_St/func_80B064B0.s | 2 - .../overlays/actors/ovl_En_St/func_80B06504.s | 2 - .../overlays/actors/ovl_En_St/func_80B065FC.s | 2 - .../overlays/actors/ovl_En_St/func_80B06700.s | 2 - .../overlays/actors/ovl_En_St/func_80B067F8.s | 2 - .../overlays/actors/ovl_En_St/func_80B068CC.s | 2 - .../overlays/actors/ovl_En_St/func_80B0699C.s | 2 - .../overlays/actors/ovl_En_St/func_80B06B10.s | 2 - .../overlays/actors/ovl_En_St/func_80B06B88.s | 2 - .../overlays/actors/ovl_En_St/func_80B06D88.s | 12 +- .../overlays/actors/ovl_En_St/func_80B06EAC.s | 2 - .../actors/ovl_En_Sth/EnSth_Destroy.s | 2 - .../overlays/actors/ovl_En_Sth/EnSth_Init.s | 28 +- .../overlays/actors/ovl_En_Sth/EnSth_Update.s | 2 - .../actors/ovl_En_Sth/func_80B07540.s | 2 - .../actors/ovl_En_Sth/func_80B076B0.s | 2 - .../actors/ovl_En_Sth/func_80B07734.s | 2 - .../actors/ovl_En_Sth/func_80B07878.s | 2 - .../actors/ovl_En_Sth/func_80B078C8.s | 2 - .../actors/ovl_En_Sth/func_80B079E0.s | 2 - .../actors/ovl_En_Sth/func_80B07AF4.s | 2 - .../actors/ovl_En_Sth/func_80B07B68.s | 2 - .../actors/ovl_En_Sth/func_80B07BEC.s | 2 - .../actors/ovl_En_Sth/func_80B07C88.s | 2 - .../actors/ovl_En_Sth/func_80B07D00.s | 2 - .../actors/ovl_En_Sth/func_80B07D7C.s | 2 - .../actors/ovl_En_Sth/func_80B07E18.s | 2 - .../actors/ovl_En_Sth/func_80B07EE0.s | 2 - .../actors/ovl_En_Sth/func_80B07FE0.s | 2 - .../actors/ovl_En_Sth/func_80B0813C.s | 12 +- .../actors/ovl_En_Sth/func_80B081EC.s | 2 - .../actors/ovl_En_Sth/func_80B08258.s | 11 +- .../actors/ovl_En_Stream/EnStream_Destroy.s | 2 - .../actors/ovl_En_Stream/EnStream_Draw.s | 15 +- .../actors/ovl_En_Stream/EnStream_Init.s | 7 +- .../actors/ovl_En_Stream/EnStream_Update.s | 2 - .../actors/ovl_En_Stream/func_80B0B7A0.s | 2 - .../actors/ovl_En_Stream/func_80B0B81C.s | 2 - .../actors/ovl_En_Stream/func_80B0B934.s | 7 +- .../actors/ovl_En_Stream/func_80B0BAC8.s | 2 - .../overlays/actors/ovl_En_Sw/EnSw_Destroy.s | 2 - .../overlays/actors/ovl_En_Sw/EnSw_Draw.s | 6 +- .../overlays/actors/ovl_En_Sw/EnSw_Init.s | 7 +- .../overlays/actors/ovl_En_Sw/EnSw_Update.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0BDB0.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0BE20.s | 9 +- .../overlays/actors/ovl_En_Sw/func_80B0C020.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0C0CC.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0C9F0.s | 12 +- .../overlays/actors/ovl_En_Sw/func_80B0CBE8.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0CCF4.s | 9 +- .../overlays/actors/ovl_En_Sw/func_80B0CEA8.s | 7 +- .../overlays/actors/ovl_En_Sw/func_80B0CF44.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0D14C.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0D364.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0D3AC.s | 7 +- .../overlays/actors/ovl_En_Sw/func_80B0D590.s | 15 +- .../overlays/actors/ovl_En_Sw/func_80B0D878.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0DB00.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0DC7C.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0DE34.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0DEA8.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0DFFC.s | 7 +- .../overlays/actors/ovl_En_Sw/func_80B0E314.s | 7 +- .../overlays/actors/ovl_En_Sw/func_80B0E430.s | 10 +- .../overlays/actors/ovl_En_Sw/func_80B0E5E0.s | 7 +- .../overlays/actors/ovl_En_Sw/func_80B0E728.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0E90C.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0E9BC.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0EAC4.s | 41 +- .../overlays/actors/ovl_En_Sw/func_80B0EDA4.s | 2 - .../overlays/actors/ovl_En_Sw/func_80B0EDB8.s | 18 +- .../overlays/actors/ovl_En_Sw/func_80B0EEA4.s | 12 +- .../ovl_En_Syateki_Itm/EnSyatekiItm_Destroy.s | 2 - .../ovl_En_Syateki_Itm/EnSyatekiItm_Init.s | 12 +- .../ovl_En_Syateki_Itm/EnSyatekiItm_Update.s | 1 - .../actors/ovl_En_Syateki_Itm/func_80B0F838.s | 2 - .../actors/ovl_En_Syateki_Itm/func_80B0F944.s | 7 +- .../actors/ovl_En_Syateki_Itm/func_80B0FABC.s | 18 +- .../actors/ovl_En_Syateki_Itm/func_80B0FF44.s | 2 - .../actors/ovl_En_Syateki_Itm/func_80B0FFE8.s | 2 - .../actors/ovl_En_Syateki_Itm/func_80B10070.s | 44 +- .../ovl_En_Syateki_Man/EnSyatekiMan_Destroy.s | 2 - .../ovl_En_Syateki_Man/EnSyatekiMan_Draw.s | 2 - .../ovl_En_Syateki_Man/EnSyatekiMan_Init.s | 12 +- .../ovl_En_Syateki_Man/EnSyatekiMan_Update.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10948.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B109DC.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10A2C.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10A84.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10C2C.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10CD4.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10D94.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B10EB0.s | 12 +- .../actors/ovl_En_Syateki_Man/func_80B11164.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B111D4.s | 8 +- .../actors/ovl_En_Syateki_Man/func_80B112A0.s | 8 +- .../actors/ovl_En_Syateki_Man/func_80B11310.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B11344.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B1148C.s | 2 - .../actors/ovl_En_Syateki_Man/func_80B1156C.s | 1 - .../ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s | 2 - .../ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s | 2 - .../ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s | 20 +- .../ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s | 7 +- .../actors/ovl_En_Syateki_Niw/func_80B11A94.s | 39 +- .../actors/ovl_En_Syateki_Niw/func_80B11DEC.s | 2 - .../actors/ovl_En_Syateki_Niw/func_80B11E78.s | 11 +- .../actors/ovl_En_Syateki_Niw/func_80B123A8.s | 12 +- .../actors/ovl_En_Syateki_Niw/func_80B12460.s | 30 +- .../actors/ovl_En_Syateki_Niw/func_80B128D8.s | 2 - .../actors/ovl_En_Syateki_Niw/func_80B128F8.s | 10 +- .../actors/ovl_En_Syateki_Niw/func_80B129EC.s | 10 +- .../actors/ovl_En_Syateki_Niw/func_80B12BA4.s | 2 - .../actors/ovl_En_Syateki_Niw/func_80B12FE0.s | 2 - .../actors/ovl_En_Syateki_Niw/func_80B131B8.s | 2 - .../actors/ovl_En_Syateki_Niw/func_80B132A8.s | 13 +- .../actors/ovl_En_Syateki_Niw/func_80B13464.s | 15 +- .../overlays/actors/ovl_En_Ta/EnTa_Destroy.s | 2 - .../overlays/actors/ovl_En_Ta/EnTa_Draw.s | 11 +- .../overlays/actors/ovl_En_Ta/EnTa_Init.s | 24 +- .../overlays/actors/ovl_En_Ta/EnTa_Update.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B13AA0.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B13AAC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14248.s | 7 +- .../overlays/actors/ovl_En_Ta/func_80B142F4.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14398.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B143D4.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14410.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B1448C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B144D8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14570.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B145F8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14634.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B146F8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14754.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14818.s | 7 +- .../overlays/actors/ovl_En_Ta/func_80B14898.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B1490C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B1496C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B149F4.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14A54.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14AF4.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14B6C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14C18.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14C60.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14CAC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14D4C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14D98.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14DD8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14E28.s | 7 +- .../overlays/actors/ovl_En_Ta/func_80B14EDC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14F20.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B14FAC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15034.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B150AC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15100.s | 7 +- .../overlays/actors/ovl_En_Ta/func_80B15260.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B152D0.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15308.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B153D4.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15424.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B154FC.s | 7 +- .../overlays/actors/ovl_En_Ta/func_80B1585C.s | 7 +- .../overlays/actors/ovl_En_Ta/func_80B15AD4.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15BF8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15CC8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15D90.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15E28.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15E80.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15F54.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B15FE8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B161C0.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B162E8.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16364.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B1642C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16504.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16608.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B166CC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16700.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B167C0.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B167FC.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16854.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16938.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16B1C.s | 2 - .../overlays/actors/ovl_En_Ta/func_80B16CA0.s | 2 - .../ovl_En_Takara_Man/EnTakaraMan_Destroy.s | 2 - .../ovl_En_Takara_Man/EnTakaraMan_Draw.s | 11 +- .../ovl_En_Takara_Man/EnTakaraMan_Init.s | 16 +- .../ovl_En_Takara_Man/EnTakaraMan_Update.s | 2 - .../actors/ovl_En_Takara_Man/func_80B176E0.s | 2 - .../actors/ovl_En_Takara_Man/func_80B1778C.s | 2 - .../actors/ovl_En_Takara_Man/func_80B17934.s | 2 - .../actors/ovl_En_Takara_Man/func_80B17A6C.s | 2 - .../actors/ovl_En_Takara_Man/func_80B17AC4.s | 2 - .../actors/ovl_En_Takara_Man/func_80B17B14.s | 2 - .../actors/ovl_En_Takara_Man/func_80B17C4C.s | 2 - .../actors/ovl_En_Test/EnTest_Destroy.s | 2 - .../overlays/actors/ovl_En_Test/EnTest_Draw.s | 2 - .../overlays/actors/ovl_En_Test/EnTest_Init.s | 2 - .../{func_8085F650.s => EnTest_SetupAction.s} | 4 +- .../actors/ovl_En_Test/EnTest_Update.s | 11 +- .../actors/ovl_En_Test/func_8085F938.s | 17 +- .../actors/ovl_En_Test/func_8085FAB0.s | 19 +- .../actors/ovl_En_Test/func_8085FDD0.s | 4 +- .../actors/ovl_En_Test/func_8085FE48.s | 4 +- .../actors/ovl_En_Test/func_8085FF28.s | 4 +- .../actors/ovl_En_Test/func_8085FF9C.s | 4 +- .../actors/ovl_En_Test/func_80860068.s | 4 +- .../actors/ovl_En_Test/func_808600EC.s | 14 +- .../actors/ovl_En_Test/func_80860318.s | 9 +- .../actors/ovl_En_Test/func_808603CC.s | 2 - .../actors/ovl_En_Test/func_80860438.s | 4 +- .../actors/ovl_En_Test/func_808604FC.s | 17 +- .../actors/ovl_En_Test/func_80860BDC.s | 4 +- .../actors/ovl_En_Test/func_80860C24.s | 13 +- .../actors/ovl_En_Test/func_80860EC0.s | 4 +- .../actors/ovl_En_Test/func_80860F84.s | 9 +- .../actors/ovl_En_Test/func_80861418.s | 4 +- .../actors/ovl_En_Test/func_8086149C.s | 2 - .../actors/ovl_En_Test/func_808615A4.s | 4 +- .../actors/ovl_En_Test/func_808615F4.s | 9 +- .../actors/ovl_En_Test/func_8086181C.s | 4 +- .../actors/ovl_En_Test/func_80861898.s | 2 - .../actors/ovl_En_Test/func_8086194C.s | 4 +- .../actors/ovl_En_Test/func_808619EC.s | 2 - .../actors/ovl_En_Test/func_80861B94.s | 4 +- .../actors/ovl_En_Test/func_80861C40.s | 2 - .../actors/ovl_En_Test/func_80861D50.s | 4 +- .../actors/ovl_En_Test/func_80861DC8.s | 4 +- .../actors/ovl_En_Test/func_80861EC0.s | 4 +- .../actors/ovl_En_Test/func_80861F80.s | 2 - .../actors/ovl_En_Test/func_80862050.s | 4 +- .../actors/ovl_En_Test/func_8086209C.s | 2 - .../actors/ovl_En_Test/func_80862154.s | 4 +- .../actors/ovl_En_Test/func_808621D4.s | 7 +- .../actors/ovl_En_Test/func_80862398.s | 4 +- .../actors/ovl_En_Test/func_80862418.s | 7 +- .../actors/ovl_En_Test/func_80862578.s | 4 +- .../actors/ovl_En_Test/func_80862650.s | 7 +- .../actors/ovl_En_Test/func_808627C4.s | 4 +- .../actors/ovl_En_Test/func_808628C8.s | 9 +- .../actors/ovl_En_Test/func_80862DBC.s | 4 +- .../actors/ovl_En_Test/func_80862E6C.s | 2 - .../actors/ovl_En_Test/func_80862FA8.s | 4 +- .../actors/ovl_En_Test/func_80863044.s | 4 +- .../actors/ovl_En_Test/func_808630F0.s | 4 +- .../actors/ovl_En_Test/func_8086318C.s | 4 +- .../actors/ovl_En_Test/func_80863240.s | 4 +- .../actors/ovl_En_Test/func_80863294.s | 7 +- .../actors/ovl_En_Test/func_80863360.s | 9 +- .../actors/ovl_En_Test/func_808633E8.s | 2 - .../actors/ovl_En_Test/func_80863460.s | 2 - .../actors/ovl_En_Test/func_808634F8.s | 2 - .../actors/ovl_En_Test/func_80863AB8.s | 12 +- .../actors/ovl_En_Test/func_80863CC4.s | 56 +- .../actors/ovl_En_Test/func_80864158.s | 4 +- .../actors/ovl_En_Test/func_808641E8.s | 1 - .../overlays/actors/ovl_En_Tg/EnTg_Destroy.s | 2 - .../overlays/actors/ovl_En_Tg/EnTg_Draw.s | 11 +- .../overlays/actors/ovl_En_Tg/EnTg_Init.s | 2 - .../overlays/actors/ovl_En_Tg/EnTg_Update.s | 2 - .../overlays/actors/ovl_En_Tg/func_80B18360.s | 2 - .../overlays/actors/ovl_En_Tg/func_80B183F8.s | 17 +- .../overlays/actors/ovl_En_Tg/func_80B185C0.s | 2 - .../overlays/actors/ovl_En_Tg/func_80B18704.s | 2 - .../overlays/actors/ovl_En_Tg/func_80B1871C.s | 2 - .../overlays/actors/ovl_En_Tg/func_80B18778.s | 2 - .../actors/ovl_En_Tite/EnTite_Destroy.s | 16 +- .../overlays/actors/ovl_En_Tite/EnTite_Draw.s | 11 +- .../overlays/actors/ovl_En_Tite/EnTite_Init.s | 2 - .../actors/ovl_En_Tite/EnTite_Update.s | 2 - .../actors/ovl_En_Tite/func_80B18A80.s | 2 - .../actors/ovl_En_Tite/func_80B18C5C.s | 2 - .../actors/ovl_En_Tite/func_80B18CC4.s | 2 - .../actors/ovl_En_Tite/func_80B18E08.s | 2 - .../actors/ovl_En_Tite/func_80B18E7C.s | 2 - .../actors/ovl_En_Tite/func_80B19524.s | 2 - .../actors/ovl_En_Tite/func_80B195C0.s | 10 +- .../actors/ovl_En_Tite/func_80B1985C.s | 2 - .../actors/ovl_En_Tite/func_80B19918.s | 2 - .../actors/ovl_En_Tite/func_80B19E28.s | 2 - .../actors/ovl_En_Tite/func_80B19E94.s | 2 - .../actors/ovl_En_Tite/func_80B1A1EC.s | 2 - .../actors/ovl_En_Tite/func_80B1A2A0.s | 2 - .../actors/ovl_En_Tite/func_80B1A63C.s | 2 - .../actors/ovl_En_Tite/func_80B1A670.s | 2 - .../actors/ovl_En_Tite/func_80B1A6E4.s | 2 - .../actors/ovl_En_Tite/func_80B1A76C.s | 2 - .../actors/ovl_En_Tite/func_80B1A888.s | 2 - .../actors/ovl_En_Tite/func_80B1AA44.s | 2 - .../actors/ovl_En_Tite/func_80B1AA94.s | 2 - .../actors/ovl_En_Tite/func_80B1ABBC.s | 2 - .../actors/ovl_En_Tite/func_80B1B178.s | 2 - .../actors/ovl_En_Torch2/EnTorch2_Destroy.s | 2 - .../actors/ovl_En_Torch2/EnTorch2_Draw.s | 11 +- .../actors/ovl_En_Torch2/EnTorch2_Init.s | 2 - .../actors/ovl_En_Torch2/EnTorch2_Update.s | 21 +- .../actors/ovl_En_Torch2/func_80B1DB98.s | 2 - .../actors/ovl_En_Torch2/func_80B1DBD8.s | 7 +- .../actors/ovl_En_Torch2/func_80B1DD70.s | 2 - .../actors/ovl_En_Torch2/func_80B1F7A8.s | 2 - .../actors/ovl_En_Torch2/func_80B1F7D4.s | 2 - .../actors/ovl_En_Toryo/EnToryo_Destroy.s | 2 - .../actors/ovl_En_Toryo/EnToryo_Draw.s | 2 - .../actors/ovl_En_Toryo/EnToryo_Init.s | 2 - .../actors/ovl_En_Toryo/EnToryo_Update.s | 9 +- .../actors/ovl_En_Toryo/func_80B203D8.s | 20 +- .../actors/ovl_En_Toryo/func_80B205CC.s | 13 +- .../actors/ovl_En_Toryo/func_80B20634.s | 2 - .../actors/ovl_En_Toryo/func_80B206A0.s | 2 - .../actors/ovl_En_Toryo/func_80B20768.s | 2 - .../actors/ovl_En_Toryo/func_80B20914.s | 2 - .../actors/ovl_En_Toryo/func_80B20B04.s | 2 - .../actors/ovl_En_Toryo/func_80B20B94.s | 1 - .../overlays/actors/ovl_En_Tp/EnTp_Destroy.s | 2 - .../overlays/actors/ovl_En_Tp/EnTp_Draw.s | 19 +- .../overlays/actors/ovl_En_Tp/EnTp_Init.s | 7 +- .../overlays/actors/ovl_En_Tp/EnTp_Update.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B20DE0.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B21084.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B210B0.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B2128C.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B212C0.s | 7 +- .../overlays/actors/ovl_En_Tp/func_80B21454.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B214CC.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B217FC.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B21900.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B2194C.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B219A8.s | 7 +- .../overlays/actors/ovl_En_Tp/func_80B21B90.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B21BDC.s | 10 +- .../overlays/actors/ovl_En_Tp/func_80B21EE8.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B21F18.s | 2 - .../overlays/actors/ovl_En_Tp/func_80B221E8.s | 2 - .../overlays/actors/ovl_En_Tr/EnTr_Destroy.s | 2 - .../overlays/actors/ovl_En_Tr/EnTr_Draw.s | 12 +- .../overlays/actors/ovl_En_Tr/EnTr_Init.s | 12 +- .../overlays/actors/ovl_En_Tr/EnTr_Update.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B22CF0.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B22E6C.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B22F1C.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B22F28.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B230D8.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B23254.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B234D4.s | 16 +- .../overlays/actors/ovl_En_Tr/func_80B23690.s | 10 +- .../overlays/actors/ovl_En_Tr/func_80B23820.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B238E0.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B239A8.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B23A88.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B23D74.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B23FDC.s | 2 - .../overlays/actors/ovl_En_Tr/func_80B24038.s | 13 +- .../overlays/actors/ovl_En_Tr/func_80B24230.s | 7 +- .../overlays/actors/ovl_En_Tr/func_80B242B4.s | 1 - .../actors/ovl_En_Trap/EnTrap_Destroy.s | 2 - .../overlays/actors/ovl_En_Trap/EnTrap_Draw.s | 1 - .../overlays/actors/ovl_En_Trap/EnTrap_Init.s | 2 - .../actors/ovl_En_Trap/EnTrap_Update.s | 21 +- .../EnTuboTrap_HandleImpact.s | 2 - .../EnTuboTrap_SpawnFragments.s | 2 - .../EnTuboTrap_SpawnWaterFragments.s | 2 - .../actors/ovl_En_Vali/EnVali_Destroy.s | 2 - .../overlays/actors/ovl_En_Vali/EnVali_Draw.s | 11 +- .../overlays/actors/ovl_En_Vali/EnVali_Init.s | 2 - .../actors/ovl_En_Vali/EnVali_Update.s | 2 - .../actors/ovl_En_Vali/func_80B26878.s | 2 - .../actors/ovl_En_Vali/func_80B268C8.s | 2 - .../actors/ovl_En_Vali/func_80B268FC.s | 2 - .../actors/ovl_En_Vali/func_80B26B18.s | 2 - .../actors/ovl_En_Vali/func_80B26B4C.s | 2 - .../actors/ovl_En_Vali/func_80B26BBC.s | 2 - .../actors/ovl_En_Vali/func_80B26BF8.s | 2 - .../actors/ovl_En_Vali/func_80B26C50.s | 2 - .../actors/ovl_En_Vali/func_80B26D54.s | 2 - .../actors/ovl_En_Vali/func_80B26DE0.s | 2 - .../actors/ovl_En_Vali/func_80B26E40.s | 2 - .../actors/ovl_En_Vali/func_80B26E9C.s | 2 - .../actors/ovl_En_Vali/func_80B27098.s | 2 - .../actors/ovl_En_Vali/func_80B270D8.s | 2 - .../actors/ovl_En_Vali/func_80B2716C.s | 15 +- .../actors/ovl_En_Vali/func_80B27318.s | 2 - .../actors/ovl_En_Vali/func_80B273D0.s | 2 - .../actors/ovl_En_Vali/func_80B2742C.s | 2 - .../actors/ovl_En_Vali/func_80B27464.s | 2 - .../actors/ovl_En_Vali/func_80B274A0.s | 7 +- .../actors/ovl_En_Vali/func_80B27654.s | 2 - .../actors/ovl_En_Vali/func_80B27710.s | 10 +- .../actors/ovl_En_Vali/func_80B278A0.s | 10 +- .../actors/ovl_En_Vali/func_80B2790C.s | 2 - .../actors/ovl_En_Vali/func_80B27C1C.s | 31 +- .../actors/ovl_En_Vali/func_80B27E38.s | 32 +- .../actors/ovl_En_Vali/func_80B28054.s | 19 +- .../actors/ovl_En_Vali/func_80B281F0.s | 2 - .../actors/ovl_En_Vali/func_80B28280.s | 2 - .../actors/ovl_En_Vali/func_80B28344.s | 39 +- .../actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s | 2 - .../actors/ovl_En_Vb_Ball/EnVbBall_Draw.s | 19 +- .../actors/ovl_En_Vb_Ball/EnVbBall_Init.s | 19 +- .../actors/ovl_En_Vb_Ball/EnVbBall_Update.s | 11 +- .../actors/ovl_En_Vb_Ball/func_80B29158.s | 2 - .../actors/ovl_En_Vb_Ball/func_80B29230.s | 2 - .../actors/ovl_En_Vb_Ball/func_80B292D0.s | 7 +- .../actors/ovl_En_Viewer/EnViewer_Destroy.s | 2 - .../actors/ovl_En_Viewer/EnViewer_Draw.s | 12 +- .../actors/ovl_En_Viewer/EnViewer_Init.s | 2 - .../actors/ovl_En_Viewer/EnViewer_Update.s | 2 - .../actors/ovl_En_Viewer/func_80B2A200.s | 2 - .../actors/ovl_En_Viewer/func_80B2A300.s | 2 - .../actors/ovl_En_Viewer/func_80B2A448.s | 2 - .../actors/ovl_En_Viewer/func_80B2A4D8.s | 2 - .../actors/ovl_En_Viewer/func_80B2A570.s | 20 +- .../actors/ovl_En_Viewer/func_80B2A75C.s | 23 +- .../actors/ovl_En_Viewer/func_80B2B2F4.s | 2 - .../actors/ovl_En_Viewer/func_80B2B364.s | 16 +- .../actors/ovl_En_Viewer/func_80B2B468.s | 2 - .../actors/ovl_En_Viewer/func_80B2B4A8.s | 12 +- .../actors/ovl_En_Viewer/func_80B2B8FC.s | 2 - .../actors/ovl_En_Viewer/func_80B2B928.s | 2 - .../actors/ovl_En_Viewer/func_80B2B9A4.s | 12 +- .../actors/ovl_En_Viewer/func_80B2BA38.s | 12 +- .../actors/ovl_En_Viewer/func_80B2C10C.s | 2 - .../actors/ovl_En_Viewer/func_80B2C130.s | 12 +- .../actors/ovl_En_Viewer/func_80B2C398.s | 2 - .../actors/ovl_En_Viewer/func_80B2C768.s | 10 +- .../actors/ovl_En_Viewer/func_80B2C8AC.s | 23 +- .../actors/ovl_En_Viewer/func_80B2CC1C.s | 8 +- .../overlays/actors/ovl_En_Vm/EnVm_Destroy.s | 2 - .../overlays/actors/ovl_En_Vm/EnVm_Draw.s | 35 +- .../overlays/actors/ovl_En_Vm/EnVm_Init.s | 2 - .../overlays/actors/ovl_En_Vm/EnVm_Update.s | 7 +- .../overlays/actors/ovl_En_Vm/func_80B2D460.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2D600.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2D68C.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2D9D8.s | 7 +- .../overlays/actors/ovl_En_Vm/func_80B2DA7C.s | 10 +- .../overlays/actors/ovl_En_Vm/func_80B2DCC8.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2DD70.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2DE7C.s | 12 +- .../overlays/actors/ovl_En_Vm/func_80B2DF84.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2E034.s | 8 +- .../overlays/actors/ovl_En_Vm/func_80B2E2D8.s | 2 - .../overlays/actors/ovl_En_Vm/func_80B2E340.s | 10 +- .../ovl_En_Wall_Tubo/EnWallTubo_Destroy.s | 2 - .../actors/ovl_En_Wall_Tubo/EnWallTubo_Init.s | 12 +- .../ovl_En_Wall_Tubo/EnWallTubo_Update.s | 1 - .../actors/ovl_En_Wall_Tubo/func_80B2EE5C.s | 2 - .../actors/ovl_En_Wall_Tubo/func_80B2EE9C.s | 2 - .../actors/ovl_En_Wall_Tubo/func_80B2F0B8.s | 24 +- .../ovl_En_Weather_Tag/EnWeatherTag_Destroy.s | 2 - .../ovl_En_Weather_Tag/EnWeatherTag_Init.s | 80 +- .../ovl_En_Weather_Tag/EnWeatherTag_Update.s | 1 - .../actors/ovl_En_Weather_Tag/func_80B31020.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B312C8.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B3149C.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31658.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B316B0.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31700.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31758.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B317A8.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31800.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31850.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B318C0.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31924.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B319A0.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31A10.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31AA0.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31B24.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31C20.s | 2 - .../actors/ovl_En_Weather_Tag/func_80B31CC0.s | 2 - .../actors/ovl_En_Weiyer/EnWeiyer_Destroy.s | 2 - .../actors/ovl_En_Weiyer/EnWeiyer_Draw.s | 11 +- .../actors/ovl_En_Weiyer/EnWeiyer_Init.s | 2 - .../actors/ovl_En_Weiyer/EnWeiyer_Update.s | 2 - .../actors/ovl_En_Weiyer/func_80B32384.s | 7 +- .../actors/ovl_En_Weiyer/func_80B32434.s | 2 - .../actors/ovl_En_Weiyer/func_80B32494.s | 2 - .../actors/ovl_En_Weiyer/func_80B32508.s | 2 - .../actors/ovl_En_Weiyer/func_80B32538.s | 2 - .../actors/ovl_En_Weiyer/func_80B325A0.s | 2 - .../actors/ovl_En_Weiyer/func_80B32660.s | 2 - .../actors/ovl_En_Weiyer/func_80B32724.s | 2 - .../actors/ovl_En_Weiyer/func_80B327B0.s | 2 - .../actors/ovl_En_Weiyer/func_80B327D8.s | 2 - .../actors/ovl_En_Weiyer/func_80B32804.s | 2 - .../actors/ovl_En_Weiyer/func_80B328E8.s | 11 +- .../actors/ovl_En_Weiyer/func_80B32C2C.s | 2 - .../actors/ovl_En_Weiyer/func_80B32D30.s | 2 - .../actors/ovl_En_Weiyer/func_80B32DEC.s | 2 - .../actors/ovl_En_Weiyer/func_80B32E34.s | 2 - .../actors/ovl_En_Weiyer/func_80B33018.s | 7 +- .../actors/ovl_En_Weiyer/func_80B331CC.s | 7 +- .../actors/ovl_En_Weiyer/func_80B332B4.s | 2 - .../actors/ovl_En_Weiyer/func_80B33338.s | 2 - .../actors/ovl_En_Weiyer/func_80B333B8.s | 2 - .../actors/ovl_En_Weiyer/func_80B3349C.s | 2 - .../actors/ovl_En_Weiyer/func_80B3368C.s | 2 - .../actors/ovl_En_Weiyer/func_80B338D4.s | 2 - .../overlays/actors/ovl_En_Wf/EnWf_Destroy.s | 16 +- .../overlays/actors/ovl_En_Wf/EnWf_Draw.s | 12 +- .../overlays/actors/ovl_En_Wf/EnWf_Init.s | 2 - .../overlays/actors/ovl_En_Wf/EnWf_Update.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B33CB0.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B33FB0.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B34380.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B34428.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B3455C.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B345E4.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B347FC.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B3487C.s | 12 +- .../overlays/actors/ovl_En_Wf/func_80B34CFC.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B34D48.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B34F28.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B35024.s | 11 +- .../overlays/actors/ovl_En_Wf/func_80B35540.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B355BC.s | 15 +- .../overlays/actors/ovl_En_Wf/func_80B3590C.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B359A8.s | 10 +- .../overlays/actors/ovl_En_Wf/func_80B35B94.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B35C10.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B35D18.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B35D90.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B35E4C.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B35EE4.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B360E8.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B361A0.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B36288.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B36328.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B365A8.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B36740.s | 9 +- .../overlays/actors/ovl_En_Wf/func_80B36C8C.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B36D3C.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B36F40.s | 7 +- .../overlays/actors/ovl_En_Wf/func_80B37038.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B37454.s | 2 - .../overlays/actors/ovl_En_Wf/func_80B37494.s | 40 +- .../overlays/actors/ovl_En_Wf/func_80B37830.s | 1 - .../ovl_En_Wonder_Item/EnWonderItem_Destroy.s | 2 - .../ovl_En_Wonder_Item/EnWonderItem_Init.s | 30 +- .../ovl_En_Wonder_Item/EnWonderItem_Update.s | 1 - .../actors/ovl_En_Wonder_Item/func_80B380A0.s | 2 - .../actors/ovl_En_Wonder_Item/func_80B38570.s | 2 - .../actors/ovl_En_Wonder_Item/func_80B38788.s | 2 - .../actors/ovl_En_Wonder_Item/func_80B387F0.s | 2 - .../actors/ovl_En_Wonder_Item/func_80B38824.s | 2 - .../actors/ovl_En_Wonder_Item/func_80B388AC.s | 2 - .../actors/ovl_En_Wonder_Item/func_80B38AD8.s | 8 +- .../actors/ovl_En_Wonder_Item/func_80B38B78.s | 2 - .../ovl_En_Wonder_Talk/EnWonderTalk_Destroy.s | 2 - .../ovl_En_Wonder_Talk/EnWonderTalk_Init.s | 16 +- .../ovl_En_Wonder_Talk/EnWonderTalk_Update.s | 1 - .../actors/ovl_En_Wonder_Talk/func_80B391CC.s | 57 +- .../actors/ovl_En_Wonder_Talk/func_80B3943C.s | 28 +- .../actors/ovl_En_Wonder_Talk/func_80B395F0.s | 16 +- .../EnWonderTalk2_Destroy.s | 2 - .../ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s | 44 +- .../EnWonderTalk2_Update.s | 1 - .../ovl_En_Wonder_Talk2/func_80B3A10C.s | 2 - .../ovl_En_Wonder_Talk2/func_80B3A15C.s | 48 +- .../ovl_En_Wonder_Talk2/func_80B3A3D4.s | 12 +- .../ovl_En_Wonder_Talk2/func_80B3A4F8.s | 60 +- .../ovl_En_Wonder_Talk2/func_80B3A770.s | 2 - .../actors/ovl_En_Wood02/EnWood02_Destroy.s | 2 - .../actors/ovl_En_Wood02/EnWood02_Draw.s | 19 +- .../actors/ovl_En_Wood02/EnWood02_Init.s | 39 +- .../actors/ovl_En_Wood02/EnWood02_Update.s | 7 +- .../actors/ovl_En_Wood02/func_80B3AF70.s | 2 - .../actors/ovl_En_Wood02/func_80B3B094.s | 2 - .../overlays/actors/ovl_En_Xc/EnXc_Destroy.s | 2 - .../overlays/actors/ovl_En_Xc/EnXc_Draw.s | 7 +- .../overlays/actors/ovl_En_Xc/EnXc_Init.s | 22 +- .../overlays/actors/ovl_En_Xc/EnXc_Update.s | 8 +- .../overlays/actors/ovl_En_Xc/func_80B3C1E0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C22C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C298.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C31C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C3A4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C468.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C4B0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C4D0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C4F0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C53C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C588.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C620.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C700.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C7BC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C7D4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C800.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C820.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C888.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C8CC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C924.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C964.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C9DC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3C9EC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3CA38.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3CA84.s | 7 +- .../overlays/actors/ovl_En_Xc/func_80B3CB58.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3CBA4.s | 9 +- .../overlays/actors/ovl_En_Xc/func_80B3CD00.s | 11 +- .../overlays/actors/ovl_En_Xc/func_80B3CD98.s | 11 +- .../overlays/actors/ovl_En_Xc/func_80B3CE78.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3CE84.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3CF04.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3CF90.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D014.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D118.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D158.s | 17 +- .../overlays/actors/ovl_En_Xc/func_80B3D298.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D338.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D3B0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D3F0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D48C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D4D8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D56C.s | 16 +- .../overlays/actors/ovl_En_Xc/func_80B3D644.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D664.s | 10 +- .../overlays/actors/ovl_En_Xc/func_80B3D6F0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D710.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D730.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D750.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D794.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3D8A4.s | 7 +- .../overlays/actors/ovl_En_Xc/func_80B3D990.s | 10 +- .../overlays/actors/ovl_En_Xc/func_80B3DA00.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DAA8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DAF0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DBAC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DC24.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DCA8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DD3C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DE00.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DE78.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DEF4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3DFA4.s | 10 +- .../overlays/actors/ovl_En_Xc/func_80B3E014.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E0BC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E164.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E1B8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E224.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E25C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E294.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E30C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E368.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E3C4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E420.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E464.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E4AC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E4F8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E53C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E580.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E5C8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E610.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E668.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E6D0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E738.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E7A0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E804.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E85C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E87C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E8AC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E8E4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3E908.s | 12 +- .../overlays/actors/ovl_En_Xc/func_80B3EA7C.s | 12 +- .../overlays/actors/ovl_En_Xc/func_80B3EBF0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EC00.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EC0C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EC90.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3ECD8.s | 10 +- .../overlays/actors/ovl_En_Xc/func_80B3ED48.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3ED68.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3ED88.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EDCC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE28.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE34.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE40.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE4C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE58.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE64.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EE74.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EEA4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EEC8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EEEC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EF10.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EF34.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EF58.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EF80.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EFA4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EFC8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3EFEC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F010.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F0B8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F0DC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F100.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F124.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F144.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F16C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F1A8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F1D0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F1F8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F220.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F248.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F270.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F298.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F2C0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F2E8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F344.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F36C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F394.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F3BC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F3C8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F3D8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F3F8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F44C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F534.s | 9 +- .../overlays/actors/ovl_En_Xc/func_80B3F59C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F620.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F644.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F668.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F6DC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F700.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F754.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F7BC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F7F8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F820.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F848.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F8A0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F8C8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F928.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F988.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3F9E8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3FA08.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3FA2C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3FA4C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3FAE0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3FB24.s | 13 +- .../overlays/actors/ovl_En_Xc/func_80B3FF0C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B3FFB4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40040.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B400AC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B400E4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40104.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4015C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B401CC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40224.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40248.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B402C4.s | 22 +- .../overlays/actors/ovl_En_Xc/func_80B40590.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B405A8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4066C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B406A0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B406F8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4070C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B407A8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40820.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B408FC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B409D8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40A78.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40B18.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40BB4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40C50.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40C74.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40C98.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40CBC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40CE0.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40D08.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40D2C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40D50.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40D74.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40D98.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40E40.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40E64.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40E88.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B40EAC.s | 31 +- .../overlays/actors/ovl_En_Xc/func_80B41000.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41020.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41068.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B410AC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41110.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41174.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B411AC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41204.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41248.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41284.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B412AC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B412D4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B412FC.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41324.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4134C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41374.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4139C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B413C4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41414.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4143C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41464.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B4148C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B414AC.s | 12 +- .../overlays/actors/ovl_En_Xc/func_80B415B8.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41718.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41798.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B417E4.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41844.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41A88.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41B0C.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41B98.s | 2 - .../overlays/actors/ovl_En_Xc/func_80B41BA4.s | 12 +- .../EnYabusameMark_Destroy.s | 2 - .../EnYabusameMark_Init.s | 24 +- .../EnYabusameMark_Update.s | 1 - .../ovl_En_Yabusame_Mark/func_80B42F74.s | 48 +- .../ovl_En_Yukabyun/EnYukabyun_Destroy.s | 2 - .../actors/ovl_En_Yukabyun/EnYukabyun_Draw.s | 15 +- .../actors/ovl_En_Yukabyun/EnYukabyun_Init.s | 2 - .../ovl_En_Yukabyun/EnYukabyun_Update.s | 2 - .../actors/ovl_En_Yukabyun/func_80B43A94.s | 2 - .../actors/ovl_En_Yukabyun/func_80B43AD4.s | 2 - .../actors/ovl_En_Yukabyun/func_80B43B6C.s | 7 +- .../actors/ovl_En_Yukabyun/func_80B43BCC.s | 2 - .../overlays/actors/ovl_En_Zf/EnZf_Destroy.s | 7 +- .../overlays/actors/ovl_En_Zf/EnZf_Draw.s | 16 +- .../overlays/actors/ovl_En_Zf/EnZf_Init.s | 2 - .../overlays/actors/ovl_En_Zf/EnZf_Update.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B44050.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B44058.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B441C4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B446A8.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B44870.s | 11 +- .../overlays/actors/ovl_En_Zf/func_80B44B14.s | 9 +- .../overlays/actors/ovl_En_Zf/func_80B44CF0.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B44DC4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B44E8C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B450AC.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B45174.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B45384.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B4543C.s | 10 +- .../overlays/actors/ovl_En_Zf/func_80B456B4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B45748.s | 19 +- .../overlays/actors/ovl_En_Zf/func_80B45E30.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B45EF0.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B4604C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B46098.s | 7 +- .../overlays/actors/ovl_En_Zf/func_80B462E4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B463E4.s | 13 +- .../overlays/actors/ovl_En_Zf/func_80B46A24.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B46AE0.s | 10 +- .../overlays/actors/ovl_En_Zf/func_80B46D64.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B46DD4.s | 10 +- .../overlays/actors/ovl_En_Zf/func_80B46E8C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B46F2C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B47050.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B47120.s | 7 +- .../overlays/actors/ovl_En_Zf/func_80B47360.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B4743C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B474E4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B47544.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B4779C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B4781C.s | 12 +- .../overlays/actors/ovl_En_Zf/func_80B47C64.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B47CF8.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B47DA8.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B47EB4.s | 7 +- .../overlays/actors/ovl_En_Zf/func_80B48210.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B482B8.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B483E4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B48578.s | 10 +- .../overlays/actors/ovl_En_Zf/func_80B48CEC.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B48E50.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B48F90.s | 7 +- .../overlays/actors/ovl_En_Zf/func_80B490B4.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B495FC.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B49688.s | 46 +- .../overlays/actors/ovl_En_Zf/func_80B49B60.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B49C2C.s | 2 - .../overlays/actors/ovl_En_Zf/func_80B49E4C.s | 1 - .../actors/ovl_En_Zl1/EnZl1_Destroy.s | 2 - .../overlays/actors/ovl_En_Zl1/EnZl1_Draw.s | 11 +- .../overlays/actors/ovl_En_Zl1/EnZl1_Init.s | 2 - .../overlays/actors/ovl_En_Zl1/EnZl1_Update.s | 2 - .../actors/ovl_En_Zl1/func_80B4AB40.s | 2 - .../actors/ovl_En_Zl1/func_80B4AE18.s | 2 - .../actors/ovl_En_Zl1/func_80B4AF18.s | 2 - .../actors/ovl_En_Zl1/func_80B4B010.s | 2 - .../actors/ovl_En_Zl1/func_80B4B240.s | 16 +- .../actors/ovl_En_Zl1/func_80B4B7F4.s | 2 - .../actors/ovl_En_Zl1/func_80B4B834.s | 2 - .../actors/ovl_En_Zl1/func_80B4B874.s | 2 - .../actors/ovl_En_Zl1/func_80B4B8B4.s | 2 - .../actors/ovl_En_Zl1/func_80B4BBC4.s | 2 - .../actors/ovl_En_Zl1/func_80B4BC78.s | 2 - .../actors/ovl_En_Zl1/func_80B4BF2C.s | 14 +- .../actors/ovl_En_Zl1/func_80B4C340.s | 2 - .../actors/ovl_En_Zl1/func_80B4C400.s | 2 - .../actors/ovl_En_Zl2/EnZl2_Destroy.s | 2 - .../overlays/actors/ovl_En_Zl2/EnZl2_Draw.s | 7 +- .../overlays/actors/ovl_En_Zl2/EnZl2_Init.s | 2 - .../overlays/actors/ovl_En_Zl2/EnZl2_Update.s | 8 +- .../actors/ovl_En_Zl2/func_80B4E9B0.s | 2 - .../actors/ovl_En_Zl2/func_80B4EA40.s | 2 - .../actors/ovl_En_Zl2/func_80B4EAF4.s | 2 - .../actors/ovl_En_Zl2/func_80B4EBB8.s | 2 - .../actors/ovl_En_Zl2/func_80B4EC48.s | 2 - .../actors/ovl_En_Zl2/func_80B4ECE8.s | 2 - .../actors/ovl_En_Zl2/func_80B4ED04.s | 2 - .../actors/ovl_En_Zl2/func_80B4ED18.s | 2 - .../actors/ovl_En_Zl2/func_80B4ED2C.s | 2 - .../actors/ovl_En_Zl2/func_80B4ED74.s | 2 - .../actors/ovl_En_Zl2/func_80B4ED94.s | 2 - .../actors/ovl_En_Zl2/func_80B4EDB8.s | 2 - .../actors/ovl_En_Zl2/func_80B4EE38.s | 2 - .../actors/ovl_En_Zl2/func_80B4EF64.s | 7 +- .../actors/ovl_En_Zl2/func_80B4F230.s | 2 - .../actors/ovl_En_Zl2/func_80B4F45C.s | 48 +- .../actors/ovl_En_Zl2/func_80B4FB74.s | 14 +- .../actors/ovl_En_Zl2/func_80B4FCCC.s | 2 - .../actors/ovl_En_Zl2/func_80B4FD00.s | 2 - .../actors/ovl_En_Zl2/func_80B4FD90.s | 2 - .../actors/ovl_En_Zl2/func_80B4FDD4.s | 2 - .../actors/ovl_En_Zl2/func_80B4FE10.s | 2 - .../actors/ovl_En_Zl2/func_80B4FE48.s | 2 - .../actors/ovl_En_Zl2/func_80B4FE6C.s | 2 - .../actors/ovl_En_Zl2/func_80B4FE90.s | 2 - .../actors/ovl_En_Zl2/func_80B4FEB4.s | 2 - .../actors/ovl_En_Zl2/func_80B4FED8.s | 2 - .../actors/ovl_En_Zl2/func_80B4FEFC.s | 2 - .../actors/ovl_En_Zl2/func_80B4FF84.s | 2 - .../actors/ovl_En_Zl2/func_80B4FFF0.s | 2 - .../actors/ovl_En_Zl2/func_80B5008C.s | 2 - .../actors/ovl_En_Zl2/func_80B500E0.s | 2 - .../actors/ovl_En_Zl2/func_80B501C4.s | 2 - .../actors/ovl_En_Zl2/func_80B501E8.s | 2 - .../actors/ovl_En_Zl2/func_80B50260.s | 2 - .../actors/ovl_En_Zl2/func_80B50278.s | 2 - .../actors/ovl_En_Zl2/func_80B50304.s | 7 +- .../actors/ovl_En_Zl2/func_80B503DC.s | 2 - .../actors/ovl_En_Zl2/func_80B5042C.s | 2 - .../actors/ovl_En_Zl2/func_80B50488.s | 2 - .../actors/ovl_En_Zl2/func_80B504D4.s | 2 - .../actors/ovl_En_Zl2/func_80B5053C.s | 2 - .../actors/ovl_En_Zl2/func_80B50580.s | 2 - .../actors/ovl_En_Zl2/func_80B505D4.s | 2 - .../actors/ovl_En_Zl2/func_80B50618.s | 2 - .../actors/ovl_En_Zl2/func_80B50644.s | 2 - .../actors/ovl_En_Zl2/func_80B50670.s | 2 - .../actors/ovl_En_Zl2/func_80B506C4.s | 2 - .../actors/ovl_En_Zl2/func_80B5073C.s | 2 - .../actors/ovl_En_Zl2/func_80B50780.s | 2 - .../actors/ovl_En_Zl2/func_80B507E8.s | 2 - .../actors/ovl_En_Zl2/func_80B5082C.s | 2 - .../actors/ovl_En_Zl2/func_80B50880.s | 2 - .../actors/ovl_En_Zl2/func_80B508C8.s | 2 - .../actors/ovl_En_Zl2/func_80B50928.s | 2 - .../actors/ovl_En_Zl2/func_80B50970.s | 2 - .../actors/ovl_En_Zl2/func_80B50980.s | 2 - .../actors/ovl_En_Zl2/func_80B509A0.s | 2 - .../actors/ovl_En_Zl2/func_80B50A04.s | 26 +- .../actors/ovl_En_Zl2/func_80B50BBC.s | 2 - .../actors/ovl_En_Zl2/func_80B50BEC.s | 2 - .../actors/ovl_En_Zl2/func_80B50C40.s | 2 - .../actors/ovl_En_Zl2/func_80B50CA8.s | 2 - .../actors/ovl_En_Zl2/func_80B50CFC.s | 2 - .../actors/ovl_En_Zl2/func_80B50D50.s | 2 - .../actors/ovl_En_Zl2/func_80B50D94.s | 2 - .../actors/ovl_En_Zl2/func_80B50DE8.s | 2 - .../actors/ovl_En_Zl2/func_80B50E3C.s | 2 - .../actors/ovl_En_Zl2/func_80B50E90.s | 2 - .../actors/ovl_En_Zl2/func_80B50EE4.s | 2 - .../actors/ovl_En_Zl2/func_80B50F38.s | 2 - .../actors/ovl_En_Zl2/func_80B50F8C.s | 2 - .../actors/ovl_En_Zl2/func_80B50FE8.s | 2 - .../actors/ovl_En_Zl2/func_80B51034.s | 2 - .../actors/ovl_En_Zl2/func_80B51080.s | 2 - .../actors/ovl_En_Zl2/func_80B510CC.s | 2 - .../actors/ovl_En_Zl2/func_80B51118.s | 2 - .../actors/ovl_En_Zl2/func_80B51164.s | 2 - .../actors/ovl_En_Zl2/func_80B511B0.s | 2 - .../actors/ovl_En_Zl2/func_80B511FC.s | 2 - .../actors/ovl_En_Zl2/func_80B51250.s | 2 - .../actors/ovl_En_Zl2/func_80B512B8.s | 2 - .../actors/ovl_En_Zl2/func_80B51310.s | 2 - .../actors/ovl_En_Zl2/func_80B5135C.s | 2 - .../actors/ovl_En_Zl2/func_80B513A8.s | 2 - .../actors/ovl_En_Zl2/func_80B51418.s | 2 - .../actors/ovl_En_Zl2/func_80B5146C.s | 2 - .../actors/ovl_En_Zl2/func_80B5149C.s | 2 - .../actors/ovl_En_Zl2/func_80B514F8.s | 2 - .../actors/ovl_En_Zl2/func_80B5154C.s | 2 - .../actors/ovl_En_Zl2/func_80B515C4.s | 2 - .../actors/ovl_En_Zl2/func_80B515D8.s | 2 - .../actors/ovl_En_Zl2/func_80B51644.s | 2 - .../actors/ovl_En_Zl2/func_80B51678.s | 2 - .../actors/ovl_En_Zl2/func_80B516D0.s | 2 - .../actors/ovl_En_Zl2/func_80B51704.s | 2 - .../actors/ovl_En_Zl2/func_80B5175C.s | 2 - .../actors/ovl_En_Zl2/func_80B51790.s | 2 - .../actors/ovl_En_Zl2/func_80B517E0.s | 2 - .../actors/ovl_En_Zl2/func_80B51824.s | 2 - .../actors/ovl_En_Zl2/func_80B5187C.s | 2 - .../actors/ovl_En_Zl2/func_80B518C0.s | 2 - .../actors/ovl_En_Zl2/func_80B51948.s | 33 +- .../actors/ovl_En_Zl2/func_80B51A5C.s | 2 - .../actors/ovl_En_Zl2/func_80B51A8C.s | 2 - .../actors/ovl_En_Zl2/func_80B51AE4.s | 2 - .../actors/ovl_En_Zl2/func_80B51B44.s | 2 - .../actors/ovl_En_Zl2/func_80B51BA8.s | 2 - .../actors/ovl_En_Zl2/func_80B51C0C.s | 2 - .../actors/ovl_En_Zl2/func_80B51C64.s | 2 - .../actors/ovl_En_Zl2/func_80B51CA8.s | 2 - .../actors/ovl_En_Zl2/func_80B51D0C.s | 2 - .../actors/ovl_En_Zl2/func_80B51D24.s | 2 - .../actors/ovl_En_Zl2/func_80B51DA4.s | 2 - .../actors/ovl_En_Zl2/func_80B51EA8.s | 2 - .../actors/ovl_En_Zl2/func_80B51EBC.s | 2 - .../actors/ovl_En_Zl2/func_80B51F38.s | 2 - .../actors/ovl_En_Zl2/func_80B51FA8.s | 8 +- .../actors/ovl_En_Zl2/func_80B52068.s | 2 - .../actors/ovl_En_Zl2/func_80B52098.s | 2 - .../actors/ovl_En_Zl2/func_80B52108.s | 2 - .../actors/ovl_En_Zl2/func_80B52114.s | 8 +- .../actors/ovl_En_Zl2/func_80B521A0.s | 8 +- .../actors/ovl_En_Zl2/func_80B52348.s | 8 +- .../actors/ovl_En_Zl2/func_80B523BC.s | 2 - .../actors/ovl_En_Zl2/func_80B523C8.s | 12 +- .../actors/ovl_En_Zl2/func_80B525D4.s | 12 +- .../actors/ovl_En_Zl3/EnZl3_Destroy.s | 2 - .../overlays/actors/ovl_En_Zl3/EnZl3_Draw.s | 7 +- .../overlays/actors/ovl_En_Zl3/EnZl3_Init.s | 12 +- .../overlays/actors/ovl_En_Zl3/EnZl3_Update.s | 8 +- .../actors/ovl_En_Zl3/func_80B533B0.s | 2 - .../actors/ovl_En_Zl3/func_80B533FC.s | 2 - .../actors/ovl_En_Zl3/func_80B53468.s | 2 - .../actors/ovl_En_Zl3/func_80B53488.s | 2 - .../actors/ovl_En_Zl3/func_80B534CC.s | 2 - .../actors/ovl_En_Zl3/func_80B53554.s | 2 - .../actors/ovl_En_Zl3/func_80B53568.s | 2 - .../actors/ovl_En_Zl3/func_80B5357C.s | 2 - .../actors/ovl_En_Zl3/func_80B53614.s | 9 +- .../actors/ovl_En_Zl3/func_80B5366C.s | 2 - .../actors/ovl_En_Zl3/func_80B536B4.s | 2 - .../actors/ovl_En_Zl3/func_80B536C4.s | 2 - .../actors/ovl_En_Zl3/func_80B53764.s | 2 - .../actors/ovl_En_Zl3/func_80B537E8.s | 2 - .../actors/ovl_En_Zl3/func_80B538B0.s | 2 - .../actors/ovl_En_Zl3/func_80B5394C.s | 2 - .../actors/ovl_En_Zl3/func_80B5396C.s | 2 - .../actors/ovl_En_Zl3/func_80B53974.s | 2 - .../actors/ovl_En_Zl3/func_80B53980.s | 7 +- .../actors/ovl_En_Zl3/func_80B53B64.s | 19 +- .../actors/ovl_En_Zl3/func_80B54360.s | 2 - .../actors/ovl_En_Zl3/func_80B5458C.s | 48 +- .../actors/ovl_En_Zl3/func_80B54CE8.s | 2 - .../actors/ovl_En_Zl3/func_80B54DB4.s | 2 - .../actors/ovl_En_Zl3/func_80B54DC4.s | 2 - .../actors/ovl_En_Zl3/func_80B54DD4.s | 2 - .../actors/ovl_En_Zl3/func_80B54DE0.s | 2 - .../actors/ovl_En_Zl3/func_80B54E14.s | 2 - .../actors/ovl_En_Zl3/func_80B54EA4.s | 2 - .../actors/ovl_En_Zl3/func_80B54EF4.s | 2 - .../actors/ovl_En_Zl3/func_80B54F18.s | 2 - .../actors/ovl_En_Zl3/func_80B54FB4.s | 12 +- .../actors/ovl_En_Zl3/func_80B55054.s | 2 - .../actors/ovl_En_Zl3/func_80B550F0.s | 2 - .../actors/ovl_En_Zl3/func_80B55144.s | 2 - .../actors/ovl_En_Zl3/func_80B551E0.s | 2 - .../actors/ovl_En_Zl3/func_80B55220.s | 2 - .../actors/ovl_En_Zl3/func_80B55268.s | 2 - .../actors/ovl_En_Zl3/func_80B552A8.s | 2 - .../actors/ovl_En_Zl3/func_80B552DC.s | 2 - .../actors/ovl_En_Zl3/func_80B55334.s | 2 - .../actors/ovl_En_Zl3/func_80B55368.s | 2 - .../actors/ovl_En_Zl3/func_80B553B4.s | 2 - .../actors/ovl_En_Zl3/func_80B553E8.s | 2 - .../actors/ovl_En_Zl3/func_80B55408.s | 2 - .../actors/ovl_En_Zl3/func_80B55444.s | 20 +- .../actors/ovl_En_Zl3/func_80B55550.s | 2 - .../actors/ovl_En_Zl3/func_80B555A4.s | 2 - .../actors/ovl_En_Zl3/func_80B55604.s | 2 - .../actors/ovl_En_Zl3/func_80B5566C.s | 2 - .../actors/ovl_En_Zl3/func_80B556CC.s | 2 - .../actors/ovl_En_Zl3/func_80B5572C.s | 2 - .../actors/ovl_En_Zl3/func_80B55780.s | 12 +- .../actors/ovl_En_Zl3/func_80B55808.s | 2 - .../actors/ovl_En_Zl3/func_80B5582C.s | 2 - .../actors/ovl_En_Zl3/func_80B5585C.s | 2 - .../actors/ovl_En_Zl3/func_80B558A8.s | 15 +- .../actors/ovl_En_Zl3/func_80B559C4.s | 2 - .../actors/ovl_En_Zl3/func_80B55A58.s | 2 - .../actors/ovl_En_Zl3/func_80B55A84.s | 2 - .../actors/ovl_En_Zl3/func_80B55AC4.s | 2 - .../actors/ovl_En_Zl3/func_80B55B04.s | 2 - .../actors/ovl_En_Zl3/func_80B55B38.s | 2 - .../actors/ovl_En_Zl3/func_80B55B78.s | 2 - .../actors/ovl_En_Zl3/func_80B55BAC.s | 2 - .../actors/ovl_En_Zl3/func_80B55C0C.s | 2 - .../actors/ovl_En_Zl3/func_80B55C4C.s | 2 - .../actors/ovl_En_Zl3/func_80B55C70.s | 2 - .../actors/ovl_En_Zl3/func_80B55CCC.s | 2 - .../actors/ovl_En_Zl3/func_80B55D00.s | 2 - .../actors/ovl_En_Zl3/func_80B55DB0.s | 2 - .../actors/ovl_En_Zl3/func_80B55E08.s | 2 - .../actors/ovl_En_Zl3/func_80B55E48.s | 2 - .../actors/ovl_En_Zl3/func_80B55E7C.s | 2 - .../actors/ovl_En_Zl3/func_80B55EBC.s | 2 - .../actors/ovl_En_Zl3/func_80B55EF0.s | 2 - .../actors/ovl_En_Zl3/func_80B55F38.s | 2 - .../actors/ovl_En_Zl3/func_80B55F6C.s | 7 +- .../actors/ovl_En_Zl3/func_80B5604C.s | 2 - .../actors/ovl_En_Zl3/func_80B56090.s | 2 - .../actors/ovl_En_Zl3/func_80B56108.s | 2 - .../actors/ovl_En_Zl3/func_80B56160.s | 2 - .../actors/ovl_En_Zl3/func_80B561A0.s | 2 - .../actors/ovl_En_Zl3/func_80B561E0.s | 2 - .../actors/ovl_En_Zl3/func_80B56214.s | 7 +- .../actors/ovl_En_Zl3/func_80B562F4.s | 2 - .../actors/ovl_En_Zl3/func_80B5634C.s | 2 - .../actors/ovl_En_Zl3/func_80B5638C.s | 2 - .../actors/ovl_En_Zl3/func_80B563C0.s | 2 - .../actors/ovl_En_Zl3/func_80B56400.s | 2 - .../actors/ovl_En_Zl3/func_80B56434.s | 2 - .../actors/ovl_En_Zl3/func_80B56474.s | 2 - .../actors/ovl_En_Zl3/func_80B564A8.s | 26 +- .../actors/ovl_En_Zl3/func_80B56658.s | 2 - .../actors/ovl_En_Zl3/func_80B566AC.s | 2 - .../actors/ovl_En_Zl3/func_80B5670C.s | 2 - .../actors/ovl_En_Zl3/func_80B5676C.s | 2 - .../actors/ovl_En_Zl3/func_80B567CC.s | 2 - .../actors/ovl_En_Zl3/func_80B5682C.s | 2 - .../actors/ovl_En_Zl3/func_80B568B4.s | 2 - .../actors/ovl_En_Zl3/func_80B5691C.s | 2 - .../actors/ovl_En_Zl3/func_80B5697C.s | 2 - .../actors/ovl_En_Zl3/func_80B569E4.s | 2 - .../actors/ovl_En_Zl3/func_80B56A68.s | 2 - .../actors/ovl_En_Zl3/func_80B56AE0.s | 2 - .../actors/ovl_En_Zl3/func_80B56B54.s | 2 - .../actors/ovl_En_Zl3/func_80B56BA8.s | 2 - .../actors/ovl_En_Zl3/func_80B56C24.s | 2 - .../actors/ovl_En_Zl3/func_80B56C84.s | 2 - .../actors/ovl_En_Zl3/func_80B56CE4.s | 2 - .../actors/ovl_En_Zl3/func_80B56D44.s | 2 - .../actors/ovl_En_Zl3/func_80B56DA4.s | 2 - .../actors/ovl_En_Zl3/func_80B56DC8.s | 2 - .../actors/ovl_En_Zl3/func_80B56DEC.s | 2 - .../actors/ovl_En_Zl3/func_80B56E38.s | 2 - .../actors/ovl_En_Zl3/func_80B56EB8.s | 2 - .../actors/ovl_En_Zl3/func_80B56EE4.s | 2 - .../actors/ovl_En_Zl3/func_80B56F10.s | 12 +- .../actors/ovl_En_Zl3/func_80B56F8C.s | 2 - .../actors/ovl_En_Zl3/func_80B56FAC.s | 2 - .../actors/ovl_En_Zl3/func_80B57034.s | 7 +- .../actors/ovl_En_Zl3/func_80B57104.s | 7 +- .../actors/ovl_En_Zl3/func_80B571A8.s | 2 - .../actors/ovl_En_Zl3/func_80B571FC.s | 2 - .../actors/ovl_En_Zl3/func_80B57240.s | 2 - .../actors/ovl_En_Zl3/func_80B57298.s | 2 - .../actors/ovl_En_Zl3/func_80B572F0.s | 2 - .../actors/ovl_En_Zl3/func_80B57324.s | 2 - .../actors/ovl_En_Zl3/func_80B57350.s | 2 - .../actors/ovl_En_Zl3/func_80B573C8.s | 2 - .../actors/ovl_En_Zl3/func_80B573FC.s | 2 - .../actors/ovl_En_Zl3/func_80B57458.s | 7 +- .../actors/ovl_En_Zl3/func_80B57564.s | 2 - .../actors/ovl_En_Zl3/func_80B575B0.s | 2 - .../actors/ovl_En_Zl3/func_80B575D0.s | 2 - .../actors/ovl_En_Zl3/func_80B575F0.s | 2 - .../actors/ovl_En_Zl3/func_80B5764C.s | 2 - .../actors/ovl_En_Zl3/func_80B576C8.s | 2 - .../actors/ovl_En_Zl3/func_80B57704.s | 2 - .../actors/ovl_En_Zl3/func_80B5772C.s | 2 - .../actors/ovl_En_Zl3/func_80B57754.s | 2 - .../actors/ovl_En_Zl3/func_80B577BC.s | 7 +- .../actors/ovl_En_Zl3/func_80B57858.s | 2 - .../actors/ovl_En_Zl3/func_80B57890.s | 2 - .../actors/ovl_En_Zl3/func_80B57A74.s | 2 - .../actors/ovl_En_Zl3/func_80B57AAC.s | 2 - .../actors/ovl_En_Zl3/func_80B57AE0.s | 2 - .../actors/ovl_En_Zl3/func_80B57C54.s | 2 - .../actors/ovl_En_Zl3/func_80B57C7C.s | 2 - .../actors/ovl_En_Zl3/func_80B57C8C.s | 2 - .../actors/ovl_En_Zl3/func_80B57CB4.s | 2 - .../actors/ovl_En_Zl3/func_80B57D60.s | 2 - .../actors/ovl_En_Zl3/func_80B57D80.s | 2 - .../actors/ovl_En_Zl3/func_80B57EAC.s | 2 - .../actors/ovl_En_Zl3/func_80B57EEC.s | 2 - .../actors/ovl_En_Zl3/func_80B57F1C.s | 2 - .../actors/ovl_En_Zl3/func_80B57F84.s | 2 - .../actors/ovl_En_Zl3/func_80B58014.s | 2 - .../actors/ovl_En_Zl3/func_80B58214.s | 2 - .../actors/ovl_En_Zl3/func_80B58268.s | 2 - .../actors/ovl_En_Zl3/func_80B582C8.s | 2 - .../actors/ovl_En_Zl3/func_80B584B4.s | 2 - .../actors/ovl_En_Zl3/func_80B58624.s | 2 - .../actors/ovl_En_Zl3/func_80B5884C.s | 2 - .../actors/ovl_En_Zl3/func_80B58898.s | 2 - .../actors/ovl_En_Zl3/func_80B588E8.s | 2 - .../actors/ovl_En_Zl3/func_80B58938.s | 2 - .../actors/ovl_En_Zl3/func_80B5899C.s | 2 - .../actors/ovl_En_Zl3/func_80B58A1C.s | 2 - .../actors/ovl_En_Zl3/func_80B58A50.s | 2 - .../actors/ovl_En_Zl3/func_80B58AAC.s | 2 - .../actors/ovl_En_Zl3/func_80B58C08.s | 2 - .../actors/ovl_En_Zl3/func_80B58D50.s | 2 - .../actors/ovl_En_Zl3/func_80B58DB0.s | 2 - .../actors/ovl_En_Zl3/func_80B58E10.s | 2 - .../actors/ovl_En_Zl3/func_80B58E7C.s | 2 - .../actors/ovl_En_Zl3/func_80B58EF4.s | 2 - .../actors/ovl_En_Zl3/func_80B58F6C.s | 2 - .../actors/ovl_En_Zl3/func_80B58FDC.s | 2 - .../actors/ovl_En_Zl3/func_80B5904C.s | 2 - .../actors/ovl_En_Zl3/func_80B590BC.s | 2 - .../actors/ovl_En_Zl3/func_80B5912C.s | 2 - .../actors/ovl_En_Zl3/func_80B591BC.s | 2 - .../actors/ovl_En_Zl3/func_80B5922C.s | 2 - .../actors/ovl_En_Zl3/func_80B592A8.s | 2 - .../actors/ovl_En_Zl3/func_80B59340.s | 2 - .../actors/ovl_En_Zl3/func_80B593D0.s | 2 - .../actors/ovl_En_Zl3/func_80B5944C.s | 38 +- .../actors/ovl_En_Zl3/func_80B59698.s | 2 - .../actors/ovl_En_Zl3/func_80B59768.s | 2 - .../actors/ovl_En_Zl3/func_80B59828.s | 7 +- .../actors/ovl_En_Zl3/func_80B59A80.s | 2 - .../actors/ovl_En_Zl3/func_80B59AD0.s | 2 - .../actors/ovl_En_Zl3/func_80B59B6C.s | 8 +- .../actors/ovl_En_Zl3/func_80B59DB8.s | 8 +- .../actors/ovl_En_Zl3/func_80B59F74.s | 8 +- .../actors/ovl_En_Zl3/func_80B59FE8.s | 2 - .../actors/ovl_En_Zl3/func_80B59FF4.s | 12 +- .../actors/ovl_En_Zl3/func_80B5A1D0.s | 12 +- .../actors/ovl_En_Zl4/EnZl4_Destroy.s | 2 - .../overlays/actors/ovl_En_Zl4/EnZl4_Draw.s | 11 +- .../overlays/actors/ovl_En_Zl4/EnZl4_Init.s | 2 - .../overlays/actors/ovl_En_Zl4/EnZl4_Update.s | 2 - .../actors/ovl_En_Zl4/func_80B5B7B0.s | 2 - .../actors/ovl_En_Zl4/func_80B5B888.s | 2 - .../actors/ovl_En_Zl4/func_80B5B90C.s | 2 - .../actors/ovl_En_Zl4/func_80B5B9B0.s | 2 - .../actors/ovl_En_Zl4/func_80B5B9E8.s | 13 +- .../actors/ovl_En_Zl4/func_80B5BB38.s | 2 - .../actors/ovl_En_Zl4/func_80B5BB78.s | 2 - .../actors/ovl_En_Zl4/func_80B5BBC0.s | 2 - .../actors/ovl_En_Zl4/func_80B5BC00.s | 2 - .../actors/ovl_En_Zl4/func_80B5BCDC.s | 2 - .../actors/ovl_En_Zl4/func_80B5BF90.s | 2 - .../actors/ovl_En_Zl4/func_80B5BFE4.s | 2 - .../actors/ovl_En_Zl4/func_80B5C008.s | 2 - .../actors/ovl_En_Zl4/func_80B5C160.s | 13 +- .../actors/ovl_En_Zl4/func_80B5C458.s | 20 +- .../actors/ovl_En_Zl4/func_80B5C984.s | 24 +- .../actors/ovl_En_Zl4/func_80B5CF70.s | 19 +- .../actors/ovl_En_Zl4/func_80B5D3CC.s | 2 - .../actors/ovl_En_Zl4/func_80B5D610.s | 19 +- .../actors/ovl_En_Zl4/func_80B5DAD8.s | 14 +- .../actors/ovl_En_Zl4/func_80B5DE1C.s | 15 +- .../actors/ovl_En_Zl4/func_80B5E090.s | 2 - .../actors/ovl_En_Zl4/func_80B5E108.s | 2 - .../actors/ovl_En_Zl4/func_80B5E364.s | 16 +- .../actors/ovl_En_Zl4/func_80B5E4F0.s | 2 - .../overlays/actors/ovl_En_Zo/EnZo_Destroy.s | 2 - .../overlays/actors/ovl_En_Zo/EnZo_Draw.s | 11 +- .../overlays/actors/ovl_En_Zo/EnZo_Init.s | 2 - .../overlays/actors/ovl_En_Zo/EnZo_Update.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B60220.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B602B4.s | 10 +- .../overlays/actors/ovl_En_Zo/func_80B603E4.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B60550.s | 10 +- .../overlays/actors/ovl_En_Zo/func_80B6060C.s | 10 +- .../overlays/actors/ovl_En_Zo/func_80B6073C.s | 10 +- .../overlays/actors/ovl_En_Zo/func_80B60874.s | 16 +- .../overlays/actors/ovl_En_Zo/func_80B60A60.s | 16 +- .../overlays/actors/ovl_En_Zo/func_80B60C44.s | 16 +- .../overlays/actors/ovl_En_Zo/func_80B60E34.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B60EB0.s | 7 +- .../overlays/actors/ovl_En_Zo/func_80B61024.s | 15 +- .../overlays/actors/ovl_En_Zo/func_80B61298.s | 16 +- .../overlays/actors/ovl_En_Zo/func_80B613F8.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B61470.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B6154C.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B615E4.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B618F0.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B619D4.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B61A14.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B61AF4.s | 12 +- .../overlays/actors/ovl_En_Zo/func_80B61CA4.s | 2 - .../overlays/actors/ovl_En_Zo/func_80B61FCC.s | 16 +- .../overlays/actors/ovl_En_Zo/func_80B621E4.s | 2 - .../actors/ovl_En_fHG/EnfHG_Destroy.s | 12 +- .../overlays/actors/ovl_En_fHG/EnfHG_Draw.s | 11 +- .../overlays/actors/ovl_En_fHG/EnfHG_Init.s | 2 - .../overlays/actors/ovl_En_fHG/EnfHG_Update.s | 7 +- .../actors/ovl_En_fHG/func_80B62B04.s | 7 +- .../actors/ovl_En_fHG/func_80B62B6C.s | 65 +- .../actors/ovl_En_fHG/func_80B63D84.s | 40 +- .../actors/ovl_En_fHG/func_80B6404C.s | 20 +- .../actors/ovl_En_fHG/func_80B6424C.s | 24 +- .../actors/ovl_En_fHG/func_80B6476C.s | 15 +- .../actors/ovl_En_fHG/func_80B64AA8.s | 19 +- .../actors/ovl_En_fHG/func_80B64CF4.s | 2 - .../actors/ovl_En_fHG/func_80B64E94.s | 2 - .../actors/ovl_End_Title/EndTitle_Destroy.s | 2 - .../actors/ovl_End_Title/EndTitle_Draw.s | 30 +- .../actors/ovl_End_Title/EndTitle_Init.s | 2 - .../actors/ovl_End_Title/EndTitle_Update.s | 2 - .../actors/ovl_End_Title/func_80B65DA8.s | 11 +- .../actors/ovl_Fishing/Fishing_Destroy.s | 2 - .../actors/ovl_Fishing/Fishing_Draw.s | 28 +- .../actors/ovl_Fishing/Fishing_Init.s | 28 +- .../actors/ovl_Fishing/Fishing_Update.s | 377 +++++++- .../actors/ovl_Fishing/func_80B699A0.s | 7 +- .../actors/ovl_Fishing/func_80B69A44.s | 2 - .../actors/ovl_Fishing/func_80B69A60.s | 13 +- .../actors/ovl_Fishing/func_80B69B84.s | 2 - .../actors/ovl_Fishing/func_80B69C2C.s | 13 +- .../actors/ovl_Fishing/func_80B69D88.s | 2 - .../actors/ovl_Fishing/func_80B69ED0.s | 2 - .../actors/ovl_Fishing/func_80B6A008.s | 2 - .../actors/ovl_Fishing/func_80B6A138.s | 2 - .../actors/ovl_Fishing/func_80B6A22C.s | 19 +- .../actors/ovl_Fishing/func_80B6AF28.s | 25 +- .../actors/ovl_Fishing/func_80B6B674.s | 66 +- .../actors/ovl_Fishing/func_80B6C134.s | 23 +- .../actors/ovl_Fishing/func_80B6C2EC.s | 2 - .../actors/ovl_Fishing/func_80B6C3E0.s | 31 +- .../actors/ovl_Fishing/func_80B6C960.s | 2 - .../actors/ovl_Fishing/func_80B6CAF8.s | 40 +- .../actors/ovl_Fishing/func_80B6D054.s | 13 +- .../actors/ovl_Fishing/func_80B6D354.s | 29 +- .../actors/ovl_Fishing/func_80B6D688.s | 65 +- .../actors/ovl_Fishing/func_80B6DF30.s | 73 +- .../actors/ovl_Fishing/func_80B6E9E0.s | 168 +++- .../actors/ovl_Fishing/func_80B70A2C.s | 16 +- .../actors/ovl_Fishing/func_80B70CF0.s | 16 +- .../actors/ovl_Fishing/func_80B70ED4.s | 16 +- .../actors/ovl_Fishing/func_80B71278.s | 2 - .../actors/ovl_Fishing/func_80B71438.s | 2 - .../actors/ovl_Fishing/func_80B75BAC.s | 2 - .../actors/ovl_Fishing/func_80B75CE0.s | 2 - .../actors/ovl_Fishing/func_80B75D20.s | 2 - .../actors/ovl_Fishing/func_80B75DA4.s | 2 - .../actors/ovl_Fishing/func_80B76028.s | 10 +- .../actors/ovl_Fishing/func_80B760D4.s | 2 - .../actors/ovl_Fishing/func_80B761B8.s | 7 +- .../actors/ovl_Fishing/func_80B76474.s | 32 +- .../actors/ovl_Fishing/func_80B768FC.s | 48 +- .../actors/ovl_Fishing/func_80B771CC.s | 46 +- .../actors/ovl_Fishing/func_80B77404.s | 36 +- .../actors/ovl_Fishing/func_80B7825C.s | 134 ++- .../actors/ovl_Fishing/func_80B7A10C.s | 2 - .../actors/ovl_Fishing/func_80B7A140.s | 12 +- .../actors/ovl_Fishing/func_80B7A278.s | 29 +- .../ovl_Item_B_Heart/ItemBHeart_Destroy.s | 2 - .../actors/ovl_Item_B_Heart/ItemBHeart_Draw.s | 19 +- .../actors/ovl_Item_B_Heart/ItemBHeart_Init.s | 2 - .../ovl_Item_B_Heart/ItemBHeart_Update.s | 2 - .../actors/ovl_Item_B_Heart/func_80B85264.s | 2 - .../ovl_Item_Etcetera/ItemEtcetera_Destroy.s | 2 - .../ovl_Item_Etcetera/ItemEtcetera_Init.s | 36 +- .../ovl_Item_Etcetera/ItemEtcetera_Update.s | 2 - .../actors/ovl_Item_Etcetera/func_80B855F0.s | 2 - .../actors/ovl_Item_Etcetera/func_80B857D0.s | 2 - .../actors/ovl_Item_Etcetera/func_80B85824.s | 2 - .../actors/ovl_Item_Etcetera/func_80B858B4.s | 7 +- .../actors/ovl_Item_Etcetera/func_80B8598C.s | 9 +- .../actors/ovl_Item_Etcetera/func_80B85A98.s | 2 - .../actors/ovl_Item_Etcetera/func_80B85B28.s | 2 - .../actors/ovl_Item_Etcetera/func_80B85B6C.s | 18 +- .../actors/ovl_Item_Etcetera/func_80B85C64.s | 2 - .../actors/ovl_Item_Etcetera/func_80B85CB8.s | 1 - .../ovl_Item_Ocarina/ItemOcarina_Destroy.s | 2 - .../ovl_Item_Ocarina/ItemOcarina_Draw.s | 1 - .../ovl_Item_Ocarina/ItemOcarina_Init.s | 12 +- .../ovl_Item_Ocarina/ItemOcarina_Update.s | 2 - .../actors/ovl_Item_Ocarina/func_80B86130.s | 2 - .../actors/ovl_Item_Ocarina/func_80B862EC.s | 11 +- .../actors/ovl_Item_Ocarina/func_80B86494.s | 7 +- .../actors/ovl_Item_Ocarina/func_80B864EC.s | 9 +- .../actors/ovl_Item_Ocarina/func_80B865E0.s | 7 +- .../actors/ovl_Item_Ocarina/func_80B86640.s | 2 - .../actors/ovl_Item_Ocarina/func_80B8664C.s | 2 - .../actors/ovl_Item_Ocarina/func_80B866BC.s | 7 +- .../ovl_Item_Shield/ItemShield_Destroy.s | 2 - .../actors/ovl_Item_Shield/ItemShield_Draw.s | 15 +- .../actors/ovl_Item_Shield/ItemShield_Init.s | 8 +- .../ovl_Item_Shield/ItemShield_Update.s | 2 - .../actors/ovl_Item_Shield/func_80B86920.s | 2 - .../actors/ovl_Item_Shield/func_80B86AC8.s | 2 - .../actors/ovl_Item_Shield/func_80B86BC8.s | 7 +- .../actors/ovl_Item_Shield/func_80B86CA8.s | 16 +- .../actors/ovl_Item_Shield/func_80B86F68.s | 7 +- .../actors/ovl_Magic_Dark/MagicDark_Destroy.s | 2 - .../actors/ovl_Magic_Dark/MagicDark_Draw.s | 28 +- .../actors/ovl_Magic_Dark/MagicDark_Init.s | 16 +- .../actors/ovl_Magic_Dark/MagicDark_Update.s | 22 +- .../actors/ovl_Magic_Dark/func_80B874E4.s | 19 +- .../actors/ovl_Magic_Dark/func_80B8772C.s | 10 +- .../actors/ovl_Magic_Dark/func_80B87A18.s | 23 +- .../actors/ovl_Magic_Fire/MagicFire_Destroy.s | 2 - .../actors/ovl_Magic_Fire/MagicFire_Draw.s | 19 +- .../actors/ovl_Magic_Fire/MagicFire_Init.s | 2 - .../actors/ovl_Magic_Fire/MagicFire_Update.s | 18 +- .../actors/ovl_Magic_Fire/func_80B88E3C.s | 2 - .../actors/ovl_Magic_Wind/MagicWind_Destroy.s | 16 +- .../actors/ovl_Magic_Wind/MagicWind_Draw.s | 11 +- .../actors/ovl_Magic_Wind/MagicWind_Init.s | 20 +- .../actors/ovl_Magic_Wind/MagicWind_Update.s | 2 - .../actors/ovl_Magic_Wind/func_80B8B100.s | 2 - .../actors/ovl_Magic_Wind/func_80B8B2A8.s | 2 - .../actors/ovl_Magic_Wind/func_80B8B3C8.s | 16 +- .../actors/ovl_Magic_Wind/func_80B8B468.s | 2 - .../actors/ovl_Magic_Wind/func_80B8B4B4.s | 2 - .../actors/ovl_Magic_Wind/func_80B8B500.s | 7 +- .../actors/ovl_Magic_Wind/func_80B8B564.s | 2 - .../actors/ovl_Magic_Wind/func_80B8B5F4.s | 12 +- .../actors/ovl_Mir_Ray/MirRay_Destroy.s | 2 - .../overlays/actors/ovl_Mir_Ray/MirRay_Draw.s | 24 +- .../overlays/actors/ovl_Mir_Ray/MirRay_Init.s | 40 +- .../actors/ovl_Mir_Ray/MirRay_Update.s | 2 - .../actors/ovl_Mir_Ray/func_80B8D050.s | 2 - .../actors/ovl_Mir_Ray/func_80B8D110.s | 2 - .../actors/ovl_Mir_Ray/func_80B8D6F0.s | 2 - .../actors/ovl_Mir_Ray/func_80B8D8A0.s | 2 - .../actors/ovl_Mir_Ray/func_80B8DA78.s | 2 - .../actors/ovl_Mir_Ray/func_80B8DB7C.s | 7 +- .../actors/ovl_Mir_Ray/func_80B8E404.s | 1 - .../actors/ovl_Obj_Bean/ObjBean_Destroy.s | 2 - .../actors/ovl_Obj_Bean/ObjBean_Draw.s | 1 - .../actors/ovl_Obj_Bean/ObjBean_Init.s | 40 +- .../actors/ovl_Obj_Bean/ObjBean_Update.s | 16 +- .../actors/ovl_Obj_Bean/func_80B8EA80.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EAD8.s | 12 +- .../actors/ovl_Obj_Bean/func_80B8EB60.s | 7 +- .../actors/ovl_Obj_Bean/func_80B8EBC8.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EBE4.s | 25 +- .../actors/ovl_Obj_Bean/func_80B8EDF4.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EE24.s | 9 +- .../actors/ovl_Obj_Bean/func_80B8EEFC.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EF28.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EF44.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EF80.s | 2 - .../actors/ovl_Obj_Bean/func_80B8EFF4.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F298.s | 7 +- .../actors/ovl_Obj_Bean/func_80B8F324.s | 7 +- .../actors/ovl_Obj_Bean/func_80B8F59C.s | 11 +- .../actors/ovl_Obj_Bean/func_80B8F65C.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F6CC.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F710.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F788.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F80C.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F84C.s | 7 +- .../actors/ovl_Obj_Bean/func_80B8F8D4.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F8E4.s | 9 +- .../actors/ovl_Obj_Bean/func_80B8F94C.s | 2 - .../actors/ovl_Obj_Bean/func_80B8F964.s | 9 +- .../actors/ovl_Obj_Bean/func_80B8F9E0.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FA20.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FD50.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FD8C.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FE00.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FE3C.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FE6C.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FEAC.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FF50.s | 2 - .../actors/ovl_Obj_Bean/func_80B8FF8C.s | 9 +- .../actors/ovl_Obj_Bean/func_80B90010.s | 2 - .../actors/ovl_Obj_Bean/func_80B90050.s | 11 +- .../actors/ovl_Obj_Bean/func_80B90110.s | 2 - .../actors/ovl_Obj_Bean/func_80B90158.s | 2 - .../actors/ovl_Obj_Bean/func_80B9024C.s | 2 - .../actors/ovl_Obj_Bean/func_80B90290.s | 2 - .../actors/ovl_Obj_Bean/func_80B902D4.s | 2 - .../actors/ovl_Obj_Bean/func_80B90314.s | 12 +- .../actors/ovl_Obj_Bean/func_80B903C4.s | 2 - .../actors/ovl_Obj_Bean/func_80B90400.s | 2 - .../actors/ovl_Obj_Bean/func_80B90510.s | 2 - .../actors/ovl_Obj_Bean/func_80B90548.s | 10 +- .../actors/ovl_Obj_Bean/func_80B905E4.s | 2 - .../actors/ovl_Obj_Bean/func_80B90620.s | 2 - .../actors/ovl_Obj_Bean/func_80B90678.s | 2 - .../actors/ovl_Obj_Bean/func_80B906A4.s | 2 - .../actors/ovl_Obj_Bean/func_80B90714.s | 2 - .../actors/ovl_Obj_Bean/func_80B9075C.s | 2 - .../actors/ovl_Obj_Bean/func_80B90884.s | 2 - .../actors/ovl_Obj_Bean/func_80B908B0.s | 2 - .../actors/ovl_Obj_Bean/func_80B908EC.s | 2 - .../actors/ovl_Obj_Bean/func_80B90918.s | 2 - .../actors/ovl_Obj_Bean/func_80B90970.s | 2 - .../actors/ovl_Obj_Bean/func_80B909B0.s | 2 - .../actors/ovl_Obj_Bean/func_80B909F8.s | 2 - .../actors/ovl_Obj_Bean/func_80B90A34.s | 2 - .../actors/ovl_Obj_Bean/func_80B90C7C.s | 10 +- .../actors/ovl_Obj_Bean/func_80B90D04.s | 10 +- .../actors/ovl_Obj_Dekujr/ObjDekujr_Destroy.s | 2 - .../actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s | 19 +- .../actors/ovl_Obj_Dekujr/ObjDekujr_Init.s | 2 - .../actors/ovl_Obj_Dekujr/ObjDekujr_Update.s | 2 - .../actors/ovl_Obj_Dekujr/func_80B92538.s | 2 - .../actors/ovl_Obj_Dekujr/func_80B92578.s | 2 - .../actors/ovl_Obj_Dekujr/func_80B925B8.s | 2 - .../ovl_Obj_Hamishi/ObjHamishi_Destroy.s | 2 - .../actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s | 15 +- .../actors/ovl_Obj_Hamishi/ObjHamishi_Init.s | 2 - .../ovl_Obj_Hamishi/ObjHamishi_Update.s | 2 - .../actors/ovl_Obj_Hamishi/func_80B92F90.s | 2 - .../actors/ovl_Obj_Hamishi/func_80B92FE8.s | 2 - .../actors/ovl_Obj_Hamishi/func_80B93164.s | 2 - .../actors/ovl_Obj_Hana/ObjHana_Destroy.s | 2 - .../actors/ovl_Obj_Hana/ObjHana_Draw.s | 1 - .../actors/ovl_Obj_Hana/ObjHana_Init.s | 2 - .../actors/ovl_Obj_Hana/ObjHana_Update.s | 2 - .../ovl_Obj_Hsblock/ObjHsblock_Destroy.s | 2 - .../actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s | 15 +- .../actors/ovl_Obj_Hsblock/ObjHsblock_Init.s | 2 - .../ovl_Obj_Hsblock/ObjHsblock_Update.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93B60.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93B68.s | 12 +- .../actors/ovl_Obj_Hsblock/func_80B93BF0.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93D90.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93DB0.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93DF4.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93E38.s | 2 - .../actors/ovl_Obj_Hsblock/func_80B93E5C.s | 10 +- .../ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s | 2 - .../actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s | 15 +- .../actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s | 2 - .../ovl_Obj_Ice_Poly/ObjIcePoly_Update.s | 2 - .../actors/ovl_Obj_Ice_Poly/func_80B94470.s | 2 - .../actors/ovl_Obj_Ice_Poly/func_80B946A0.s | 7 +- .../actors/ovl_Obj_Kibako/ObjKibako_Destroy.s | 2 - .../actors/ovl_Obj_Kibako/ObjKibako_Draw.s | 1 - .../actors/ovl_Obj_Kibako/ObjKibako_Init.s | 12 +- .../actors/ovl_Obj_Kibako/ObjKibako_Update.s | 2 - .../actors/ovl_Obj_Kibako/func_80B94CA0.s | 2 - .../actors/ovl_Obj_Kibako/func_80B94D00.s | 2 - .../actors/ovl_Obj_Kibako/func_80B94D34.s | 2 - .../actors/ovl_Obj_Kibako/func_80B94E38.s | 13 +- .../actors/ovl_Obj_Kibako/func_80B950B8.s | 9 +- .../actors/ovl_Obj_Kibako/func_80B95334.s | 2 - .../actors/ovl_Obj_Kibako/func_80B9534C.s | 2 - .../actors/ovl_Obj_Kibako/func_80B95540.s | 2 - .../actors/ovl_Obj_Kibako/func_80B95574.s | 7 +- .../actors/ovl_Obj_Kibako/func_80B95638.s | 2 - .../actors/ovl_Obj_Kibako/func_80B9569C.s | 2 - .../ovl_Obj_Kibako2/ObjKibako2_Destroy.s | 2 - .../actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s | 1 - .../actors/ovl_Obj_Kibako2/ObjKibako2_Init.s | 8 +- .../ovl_Obj_Kibako2/ObjKibako2_Update.s | 2 - .../actors/ovl_Obj_Kibako2/func_80B959D0.s | 2 - .../actors/ovl_Obj_Kibako2/func_80B95A28.s | 15 +- .../actors/ovl_Obj_Kibako2/func_80B95CA4.s | 2 - .../actors/ovl_Obj_Kibako2/func_80B95DFC.s | 2 - .../actors/ovl_Obj_Kibako2/func_80B95ED4.s | 2 - .../actors/ovl_Obj_Lift/ObjLift_Destroy.s | 2 - .../actors/ovl_Obj_Lift/ObjLift_Draw.s | 1 - .../actors/ovl_Obj_Lift/ObjLift_Init.s | 16 +- .../actors/ovl_Obj_Lift/ObjLift_Update.s | 2 - .../actors/ovl_Obj_Lift/func_80B960D0.s | 2 - .../actors/ovl_Obj_Lift/func_80B960D8.s | 12 +- .../actors/ovl_Obj_Lift/func_80B96160.s | 7 +- .../actors/ovl_Obj_Lift/func_80B9651C.s | 2 - .../actors/ovl_Obj_Lift/func_80B96560.s | 2 - .../actors/ovl_Obj_Lift/func_80B9664C.s | 2 - .../actors/ovl_Obj_Lift/func_80B96678.s | 2 - .../actors/ovl_Obj_Lift/func_80B967C0.s | 2 - .../actors/ovl_Obj_Lift/func_80B96840.s | 7 +- .../ObjLightswitch_Destroy.s | 2 - .../ovl_Obj_Lightswitch/ObjLightswitch_Draw.s | 1 - .../ovl_Obj_Lightswitch/ObjLightswitch_Init.s | 24 +- .../ObjLightswitch_Update.s | 2 - .../ovl_Obj_Lightswitch/func_80B96BA0.s | 2 - .../ovl_Obj_Lightswitch/func_80B96C3C.s | 2 - .../ovl_Obj_Lightswitch/func_80B96D00.s | 2 - .../ovl_Obj_Lightswitch/func_80B96D80.s | 7 +- .../ovl_Obj_Lightswitch/func_80B971A8.s | 2 - .../ovl_Obj_Lightswitch/func_80B971D8.s | 2 - .../ovl_Obj_Lightswitch/func_80B972B8.s | 2 - .../ovl_Obj_Lightswitch/func_80B972D8.s | 2 - .../ovl_Obj_Lightswitch/func_80B973C8.s | 2 - .../ovl_Obj_Lightswitch/func_80B97400.s | 2 - .../ovl_Obj_Lightswitch/func_80B97518.s | 2 - .../ovl_Obj_Lightswitch/func_80B97540.s | 2 - .../ovl_Obj_Lightswitch/func_80B97630.s | 2 - .../ovl_Obj_Lightswitch/func_80B97648.s | 2 - .../ovl_Obj_Lightswitch/func_80B97690.s | 2 - .../ovl_Obj_Lightswitch/func_80B976A8.s | 2 - .../ovl_Obj_Lightswitch/func_80B977D0.s | 24 +- .../ovl_Obj_Lightswitch/func_80B97B50.s | 24 +- .../ObjMakeoshihiki_Draw.s | 6 +- .../ObjMakeoshihiki_Init.s | 28 +- .../actors/ovl_Obj_Mure/ObjMure_Destroy.s | 2 - .../actors/ovl_Obj_Mure/ObjMure_Init.s | 32 +- .../actors/ovl_Obj_Mure/ObjMure_Update.s | 1 - .../actors/ovl_Obj_Mure/func_80B98AA0.s | 12 +- .../actors/ovl_Obj_Mure/func_80B98B1C.s | 2 - .../actors/ovl_Obj_Mure/func_80B98C88.s | 2 - .../actors/ovl_Obj_Mure/func_80B98CB4.s | 12 +- .../actors/ovl_Obj_Mure/func_80B98D18.s | 28 +- .../actors/ovl_Obj_Mure/func_80B98F38.s | 20 +- .../actors/ovl_Obj_Mure/func_80B990BC.s | 2 - .../actors/ovl_Obj_Mure/func_80B9910C.s | 2 - .../actors/ovl_Obj_Mure/func_80B99204.s | 2 - .../actors/ovl_Obj_Mure/func_80B99224.s | 2 - .../actors/ovl_Obj_Mure/func_80B992E4.s | 2 - .../actors/ovl_Obj_Mure/func_80B992F8.s | 2 - .../actors/ovl_Obj_Mure/func_80B99358.s | 2 - .../actors/ovl_Obj_Mure/func_80B9942C.s | 2 - .../actors/ovl_Obj_Mure/func_80B995A4.s | 19 +- .../actors/ovl_Obj_Mure/func_80B997CC.s | 10 +- .../actors/ovl_Obj_Mure/func_80B99950.s | 2 - .../actors/ovl_Obj_Mure2/ObjMure2_Init.s | 2 - .../actors/ovl_Obj_Mure2/ObjMure2_Update.s | 1 - .../actors/ovl_Obj_Mure2/func_80B99F40.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A058.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A158.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A260.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A2B0.s | 12 +- .../actors/ovl_Obj_Mure2/func_80B9A438.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A534.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A628.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A638.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A658.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A668.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A6E8.s | 2 - .../actors/ovl_Obj_Mure2/func_80B9A6F8.s | 2 - .../actors/ovl_Obj_Mure3/ObjMure3_Destroy.s | 2 - .../actors/ovl_Obj_Mure3/ObjMure3_Init.s | 2 - .../actors/ovl_Obj_Mure3/ObjMure3_Update.s | 1 - .../actors/ovl_Obj_Mure3/func_80B9A9D0.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9AA90.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9ABA0.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9ACE4.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9ADCC.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9AF24.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9AF34.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9AF54.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9AF64.s | 7 +- .../actors/ovl_Obj_Mure3/func_80B9AFEC.s | 2 - .../actors/ovl_Obj_Mure3/func_80B9AFFC.s | 7 +- .../ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s | 2 - .../ovl_Obj_Oshihiki/ObjOshihiki_Draw.s | 1 - .../ovl_Obj_Oshihiki/ObjOshihiki_Init.s | 2 - .../ovl_Obj_Oshihiki/ObjOshihiki_Update.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B180.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B208.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B254.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B2D8.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B300.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B38C.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B4BC.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B584.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B5F4.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B62C.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B668.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B678.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B68C.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9B8C8.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BA28.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BB70.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BBC8.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BC20.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BCB8.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BF08.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9BFF8.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C02C.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C110.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C14C.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C340.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C368.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C584.s | 2 - .../actors/ovl_Obj_Oshihiki/func_80B9C5DC.s | 2 - .../actors/ovl_Obj_Switch/ObjSwitch_Destroy.s | 2 - .../actors/ovl_Obj_Switch/ObjSwitch_Draw.s | 1 - .../actors/ovl_Obj_Switch/ObjSwitch_Init.s | 24 +- .../actors/ovl_Obj_Switch/ObjSwitch_Update.s | 12 +- .../actors/ovl_Obj_Switch/func_80B9D210.s | 2 - .../actors/ovl_Obj_Switch/func_80B9D294.s | 12 +- .../actors/ovl_Obj_Switch/func_80B9D31C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9D3B8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9D4D8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9D54C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9D5F8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9D680.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DA48.s | 7 +- .../actors/ovl_Obj_Switch/func_80B9DA64.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DBD8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DBF0.s | 9 +- .../actors/ovl_Obj_Switch/func_80B9DCB0.s | 7 +- .../actors/ovl_Obj_Switch/func_80B9DCD4.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DE20.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DE38.s | 9 +- .../actors/ovl_Obj_Switch/func_80B9DF1C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DF8C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DF9C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9DFF0.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E004.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E06C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E084.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E100.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E118.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E1D8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E1F0.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E280.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E2A8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E3DC.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E3F4.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E47C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E4A8.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E56C.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E584.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E748.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E788.s | 2 - .../actors/ovl_Obj_Switch/func_80B9E7B4.s | 16 +- .../actors/ovl_Obj_Switch/func_80B9E904.s | 28 +- .../ovl_Obj_Syokudai/ObjSyokudai_Destroy.s | 2 - .../ovl_Obj_Syokudai/ObjSyokudai_Draw.s | 26 +- .../ovl_Obj_Syokudai/ObjSyokudai_Init.s | 2 - .../ovl_Obj_Syokudai/ObjSyokudai_Update.s | 2 - .../ovl_Obj_Timeblock/ObjTimeblock_Destroy.s | 2 - .../ovl_Obj_Timeblock/ObjTimeblock_Draw.s | 15 +- .../ovl_Obj_Timeblock/ObjTimeblock_Init.s | 8 +- .../ovl_Obj_Timeblock/ObjTimeblock_Update.s | 2 - .../actors/ovl_Obj_Timeblock/func_80B9FFA0.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0058.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA00CC.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA032C.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA040C.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0480.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA04F8.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0508.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0514.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0524.s | 8 +- .../actors/ovl_Obj_Timeblock/func_80BA06AC.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0758.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA0768.s | 8 +- .../actors/ovl_Obj_Timeblock/func_80BA083C.s | 2 - .../actors/ovl_Obj_Timeblock/func_80BA084C.s | 2 - .../actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s | 2 - .../actors/ovl_Obj_Tsubo/ObjTsubo_Init.s | 16 +- .../actors/ovl_Obj_Tsubo/ObjTsubo_Update.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA0D60.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA0DC0.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA0DF4.s | 8 +- .../actors/ovl_Obj_Tsubo/func_80BA0E98.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA100C.s | 12 +- .../actors/ovl_Obj_Tsubo/func_80BA1294.s | 10 +- .../actors/ovl_Obj_Tsubo/func_80BA152C.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA153C.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA15AC.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA15BC.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA17C4.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA180C.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA188C.s | 7 +- .../actors/ovl_Obj_Tsubo/func_80BA1958.s | 2 - .../actors/ovl_Obj_Tsubo/func_80BA1B0C.s | 1 - .../ObjWarp2block_Destroy.s | 2 - .../ovl_Obj_Warp2block/ObjWarp2block_Draw.s | 15 +- .../ovl_Obj_Warp2block/ObjWarp2block_Init.s | 8 +- .../ovl_Obj_Warp2block/ObjWarp2block_Update.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA1DF0.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA1ECC.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA2048.s | 7 +- .../actors/ovl_Obj_Warp2block/func_80BA2218.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA228C.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA2304.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA24C8.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA24DC.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA24E8.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA24F8.s | 20 +- .../actors/ovl_Obj_Warp2block/func_80BA2600.s | 2 - .../actors/ovl_Obj_Warp2block/func_80BA2610.s | 2 - .../ovl_Object_Kankyo/ObjectKankyo_Destroy.s | 2 - .../ovl_Object_Kankyo/ObjectKankyo_Draw.s | 2 - .../ovl_Object_Kankyo/ObjectKankyo_Init.s | 12 +- ..._80BA2AA0.s => ObjectKankyo_SetupAction.s} | 4 +- .../ovl_Object_Kankyo/ObjectKankyo_Update.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA2DC8.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA2DD4.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA3C94.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA414C.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA4914.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA49BC.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA4BFC.s | 4 +- .../actors/ovl_Object_Kankyo/func_80BA4C68.s | 4 +- .../actors/ovl_Object_Kankyo/func_80BA4CD4.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA4D7C.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA5304.s | 4 +- .../actors/ovl_Object_Kankyo/func_80BA5370.s | 4 +- .../actors/ovl_Object_Kankyo/func_80BA53CC.s | 2 - .../actors/ovl_Object_Kankyo/func_80BA54AC.s | 1 - .../actors/ovl_Oceff_Spot/OceffSpot_Destroy.s | 2 - .../actors/ovl_Oceff_Spot/OceffSpot_Draw.s | 15 +- .../actors/ovl_Oceff_Spot/OceffSpot_Init.s | 9 +- .../actors/ovl_Oceff_Spot/OceffSpot_Update.s | 12 +- .../actors/ovl_Oceff_Spot/func_80BA6070.s | 2 - .../actors/ovl_Oceff_Spot/func_80BA6260.s | 32 +- .../actors/ovl_Oceff_Spot/func_80BA6370.s | 2 - .../actors/ovl_Oceff_Spot/func_80BA63AC.s | 7 +- .../ovl_Oceff_Storm/OceffStorm_Destroy.s | 2 - .../actors/ovl_Oceff_Storm/OceffStorm_Draw.s | 15 +- .../actors/ovl_Oceff_Storm/OceffStorm_Init.s | 2 - .../ovl_Oceff_Storm/OceffStorm_Update.s | 2 - .../actors/ovl_Oceff_Storm/func_80BA70E0.s | 2 - .../actors/ovl_Oceff_Storm/func_80BA7200.s | 16 +- .../actors/ovl_Oceff_Storm/func_80BA73C4.s | 2 - .../actors/ovl_Oceff_Storm/func_80BA7450.s | 12 +- .../actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s | 2 - .../actors/ovl_Oceff_Wipe/OceffWipe_Draw.s | 19 +- .../actors/ovl_Oceff_Wipe/OceffWipe_Init.s | 8 +- .../actors/ovl_Oceff_Wipe/OceffWipe_Update.s | 2 - .../ovl_Oceff_Wipe2/OceffWipe2_Destroy.s | 2 - .../actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s | 23 +- .../actors/ovl_Oceff_Wipe2/OceffWipe2_Init.s | 8 +- .../ovl_Oceff_Wipe2/OceffWipe2_Update.s | 2 - .../ovl_Oceff_Wipe3/OceffWipe3_Destroy.s | 2 - .../actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s | 23 +- .../actors/ovl_Oceff_Wipe3/OceffWipe3_Init.s | 8 +- .../ovl_Oceff_Wipe3/OceffWipe3_Update.s | 2 - .../ovl_Oceff_Wipe4/OceffWipe4_Destroy.s | 2 - .../actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s | 25 +- .../actors/ovl_Oceff_Wipe4/OceffWipe4_Init.s | 8 +- .../ovl_Oceff_Wipe4/OceffWipe4_Update.s | 2 - .../actors/ovl_Shot_Sun/ShotSun_Destroy.s | 2 - .../actors/ovl_Shot_Sun/ShotSun_Init.s | 8 +- .../actors/ovl_Shot_Sun/ShotSun_Update.s | 1 - .../actors/ovl_Shot_Sun/func_80BADDCC.s | 2 - .../actors/ovl_Shot_Sun/func_80BADE74.s | 2 - .../actors/ovl_Shot_Sun/func_80BADF0C.s | 7 +- .../actors/ovl_Shot_Sun/func_80BAE05C.s | 16 +- .../actors/ovl_kaleido_scope/func_80813820.s | 2 - .../actors/ovl_kaleido_scope/func_80815CC8.s | 2 - .../actors/ovl_kaleido_scope/func_80815CE0.s | 2 - .../actors/ovl_kaleido_scope/func_80815FD4.s | 2 - .../actors/ovl_kaleido_scope/func_808161AC.s | 2 - .../actors/ovl_kaleido_scope/func_80817D50.s | 2 - .../actors/ovl_kaleido_scope/func_8081819C.s | 2 - .../actors/ovl_kaleido_scope/func_80818340.s | 2 - .../actors/ovl_kaleido_scope/func_808198A0.s | 2 - .../actors/ovl_kaleido_scope/func_80819E14.s | 2 - .../actors/ovl_kaleido_scope/func_80819E40.s | 2 - .../actors/ovl_kaleido_scope/func_80819E6C.s | 2 - .../actors/ovl_kaleido_scope/func_8081AD44.s | 2 - .../actors/ovl_kaleido_scope/func_8081BB10.s | 2 - .../actors/ovl_kaleido_scope/func_8081D398.s | 2 - .../actors/ovl_kaleido_scope/func_8081EFF0.s | 2 - .../actors/ovl_kaleido_scope/func_8081F1F0.s | 2 - .../actors/ovl_kaleido_scope/func_8081F2FC.s | 2 - .../actors/ovl_kaleido_scope/func_8081F334.s | 2 - .../actors/ovl_kaleido_scope/func_8081F50C.s | 2 - .../actors/ovl_kaleido_scope/func_8081F6E4.s | 2 - .../actors/ovl_kaleido_scope/func_8081F81C.s | 2 - .../actors/ovl_kaleido_scope/func_8081F87C.s | 2 - .../actors/ovl_kaleido_scope/func_8081FABC.s | 2 - .../actors/ovl_kaleido_scope/func_8081FB7C.s | 2 - .../actors/ovl_kaleido_scope/func_8081FCF4.s | 2 - .../actors/ovl_kaleido_scope/func_8081FE30.s | 2 - .../actors/ovl_kaleido_scope/func_8082018C.s | 2 - .../actors/ovl_kaleido_scope/func_80820434.s | 2 - .../actors/ovl_kaleido_scope/func_80821C10.s | 2 - .../actors/ovl_kaleido_scope/func_80823548.s | 2 - .../actors/ovl_kaleido_scope/func_808237B4.s | 2 - .../actors/ovl_kaleido_scope/func_80823994.s | 2 - .../actors/ovl_kaleido_scope/func_80823A0C.s | 2 - .../actors/ovl_kaleido_scope/func_8082409C.s | 2 - .../actors/ovl_kaleido_scope/func_80825C14.s | 2 - .../actors/ovl_kaleido_scope/func_808262B8.s | 2 - .../actors/ovl_kaleido_scope/func_8082650C.s | 2 - .../actors/ovl_kaleido_scope/func_808265BC.s | 2 - .../actors/ovl_kaleido_scope/func_808267AC.s | 2 - .../actors/ovl_kaleido_scope/func_80826AEC.s | 2 - .../actors/ovl_kaleido_scope/func_80826BA8.s | 2 - .../actors/ovl_kaleido_scope/func_80826CB4.s | 2 - .../actors/ovl_kaleido_scope/func_80829960.s | 2 - .../actors/ovl_kaleido_scope/func_80829990.s | 2 - .../actors/ovl_kaleido_scope/func_808299A0.s | 2 - .../actors/ovl_kaleido_scope/func_8082A00C.s | 1 - .../actors/ovl_player_actor/func_80832210.s | 2 - .../actors/ovl_player_actor/func_80832224.s | 2 - .../actors/ovl_player_actor/func_8083224C.s | 2 - .../actors/ovl_player_actor/func_80832264.s | 2 - .../actors/ovl_player_actor/func_80832284.s | 2 - .../actors/ovl_player_actor/func_808322A4.s | 2 - .../actors/ovl_player_actor/func_808322D0.s | 2 - .../actors/ovl_player_actor/func_808322FC.s | 2 - .../actors/ovl_player_actor/func_80832318.s | 2 - .../actors/ovl_player_actor/func_80832340.s | 2 - .../actors/ovl_player_actor/func_808323B4.s | 2 - .../actors/ovl_player_actor/func_80832440.s | 2 - .../actors/ovl_player_actor/func_80832528.s | 2 - .../actors/ovl_player_actor/func_80832564.s | 2 - .../actors/ovl_player_actor/func_80832594.s | 7 +- .../actors/ovl_player_actor/func_80832630.s | 2 - .../actors/ovl_player_actor/func_8083264C.s | 2 - .../actors/ovl_player_actor/func_80832698.s | 2 - .../actors/ovl_player_actor/func_808326F0.s | 2 - .../actors/ovl_player_actor/func_8083275C.s | 2 - .../actors/ovl_player_actor/func_80832770.s | 2 - .../actors/ovl_player_actor/func_808327A4.s | 2 - .../actors/ovl_player_actor/func_808327C4.s | 2 - .../actors/ovl_player_actor/func_808327F8.s | 2 - .../actors/ovl_player_actor/func_80832854.s | 2 - .../actors/ovl_player_actor/func_808328A0.s | 2 - .../actors/ovl_player_actor/func_808328EC.s | 2 - .../actors/ovl_player_actor/func_80832924.s | 2 - .../actors/ovl_player_actor/func_80832B0C.s | 2 - .../actors/ovl_player_actor/func_80832B78.s | 2 - .../actors/ovl_player_actor/func_80832BE8.s | 2 - .../actors/ovl_player_actor/func_80832C2C.s | 2 - .../actors/ovl_player_actor/func_80832C6C.s | 2 - .../actors/ovl_player_actor/func_80832CB0.s | 2 - .../actors/ovl_player_actor/func_80832CFC.s | 2 - .../actors/ovl_player_actor/func_80832D20.s | 2 - .../actors/ovl_player_actor/func_80832DB0.s | 2 - .../actors/ovl_player_actor/func_80832DBC.s | 2 - .../actors/ovl_player_actor/func_80832E48.s | 7 +- .../actors/ovl_player_actor/func_80832F54.s | 2 - .../actors/ovl_player_actor/func_80832FFC.s | 2 - .../actors/ovl_player_actor/func_8083303C.s | 2 - .../actors/ovl_player_actor/func_80833064.s | 7 +- .../actors/ovl_player_actor/func_8083308C.s | 2 - .../actors/ovl_player_actor/func_808330AC.s | 2 - .../actors/ovl_player_actor/func_808330EC.s | 2 - .../actors/ovl_player_actor/func_80833114.s | 7 +- .../actors/ovl_player_actor/func_8083313C.s | 2 - .../actors/ovl_player_actor/func_8083315C.s | 2 - .../actors/ovl_player_actor/func_8083328C.s | 2 - .../actors/ovl_player_actor/func_808332B8.s | 2 - .../actors/ovl_player_actor/func_808332E4.s | 2 - .../actors/ovl_player_actor/func_808332F4.s | 2 - .../actors/ovl_player_actor/func_80833338.s | 2 - .../actors/ovl_player_actor/func_80833350.s | 2 - .../actors/ovl_player_actor/func_808333FC.s | 2 - .../actors/ovl_player_actor/func_80833438.s | 2 - .../actors/ovl_player_actor/func_808334B4.s | 2 - .../actors/ovl_player_actor/func_808334E4.s | 2 - .../actors/ovl_player_actor/func_80833528.s | 2 - .../actors/ovl_player_actor/func_8083356C.s | 2 - .../actors/ovl_player_actor/func_808335B0.s | 2 - .../actors/ovl_player_actor/func_808335F4.s | 2 - .../actors/ovl_player_actor/func_80833638.s | 2 - .../actors/ovl_player_actor/func_80833664.s | 2 - .../actors/ovl_player_actor/func_80833724.s | 2 - .../actors/ovl_player_actor/func_80833770.s | 2 - .../actors/ovl_player_actor/func_8083377C.s | 2 - .../actors/ovl_player_actor/func_80833790.s | 2 - .../actors/ovl_player_actor/func_8083379C.s | 2 - .../actors/ovl_player_actor/func_808337D4.s | 2 - .../actors/ovl_player_actor/func_80833910.s | 2 - .../actors/ovl_player_actor/func_80833984.s | 2 - .../actors/ovl_player_actor/func_8083399C.s | 2 - .../actors/ovl_player_actor/func_80833A20.s | 2 - .../actors/ovl_player_actor/func_80833B2C.s | 2 - .../actors/ovl_player_actor/func_80833B54.s | 2 - .../actors/ovl_player_actor/func_80833BCC.s | 2 - .../actors/ovl_player_actor/func_80833C04.s | 2 - .../actors/ovl_player_actor/func_80833C3C.s | 2 - .../actors/ovl_player_actor/func_80833C50.s | 2 - .../actors/ovl_player_actor/func_80833C98.s | 2 - .../actors/ovl_player_actor/func_80833CDC.s | 2 - .../actors/ovl_player_actor/func_80833DF8.s | 2 - .../actors/ovl_player_actor/func_808340DC.s | 10 +- .../actors/ovl_player_actor/func_80834298.s | 2 - .../actors/ovl_player_actor/func_80834380.s | 2 - .../actors/ovl_player_actor/func_8083442C.s | 2 - .../actors/ovl_player_actor/func_80834594.s | 2 - .../actors/ovl_player_actor/func_80834644.s | 2 - .../actors/ovl_player_actor/func_808346C4.s | 2 - .../actors/ovl_player_actor/func_80834758.s | 2 - .../actors/ovl_player_actor/func_8083485C.s | 2 - .../actors/ovl_player_actor/func_80834894.s | 2 - .../actors/ovl_player_actor/func_808348EC.s | 2 - .../actors/ovl_player_actor/func_8083499C.s | 2 - .../actors/ovl_player_actor/func_808349DC.s | 2 - .../actors/ovl_player_actor/func_80834A2C.s | 2 - .../actors/ovl_player_actor/func_80834B5C.s | 2 - .../actors/ovl_player_actor/func_80834BD4.s | 2 - .../actors/ovl_player_actor/func_80834C74.s | 2 - .../actors/ovl_player_actor/func_80834D2C.s | 2 - .../actors/ovl_player_actor/func_80834E44.s | 2 - .../actors/ovl_player_actor/func_80834E7C.s | 2 - .../actors/ovl_player_actor/func_80834EB8.s | 2 - .../actors/ovl_player_actor/func_80834F2C.s | 2 - .../actors/ovl_player_actor/func_80834FBC.s | 2 - .../actors/ovl_player_actor/func_8083501C.s | 2 - .../actors/ovl_player_actor/func_808350A4.s | 2 - .../actors/ovl_player_actor/func_808351D4.s | 2 - .../actors/ovl_player_actor/func_808353D8.s | 2 - .../actors/ovl_player_actor/func_80835588.s | 2 - .../actors/ovl_player_actor/func_808355DC.s | 2 - .../actors/ovl_player_actor/func_80835644.s | 2 - .../actors/ovl_player_actor/func_80835688.s | 2 - .../actors/ovl_player_actor/func_808356E8.s | 2 - .../actors/ovl_player_actor/func_808357E8.s | 2 - .../actors/ovl_player_actor/func_80835800.s | 2 - .../actors/ovl_player_actor/func_80835884.s | 2 - .../actors/ovl_player_actor/func_808358F0.s | 2 - .../actors/ovl_player_actor/func_808359FC.s | 2 - .../actors/ovl_player_actor/func_80835B60.s | 2 - .../actors/ovl_player_actor/func_80835C08.s | 2 - .../actors/ovl_player_actor/func_80835C58.s | 2 - .../actors/ovl_player_actor/func_80835DAC.s | 2 - .../actors/ovl_player_actor/func_80835DE4.s | 2 - .../actors/ovl_player_actor/func_80835E44.s | 2 - .../actors/ovl_player_actor/func_80835EA4.s | 2 - .../actors/ovl_player_actor/func_80835EFC.s | 2 - .../actors/ovl_player_actor/func_80835F44.s | 2 - .../actors/ovl_player_actor/func_80836448.s | 2 - .../actors/ovl_player_actor/func_808365C8.s | 2 - .../actors/ovl_player_actor/func_80836670.s | 2 - .../actors/ovl_player_actor/func_80836898.s | 2 - .../actors/ovl_player_actor/func_808368EC.s | 2 - .../actors/ovl_player_actor/func_808369C8.s | 2 - .../actors/ovl_player_actor/func_80836AB8.s | 2 - .../actors/ovl_player_actor/func_80836BEC.s | 2 - .../actors/ovl_player_actor/func_80836FAC.s | 16 +- .../actors/ovl_player_actor/func_8083721C.s | 2 - .../actors/ovl_player_actor/func_80837268.s | 2 - .../actors/ovl_player_actor/func_80837348.s | 2 - .../actors/ovl_player_actor/func_808374A0.s | 2 - .../actors/ovl_player_actor/func_80837530.s | 2 - .../actors/ovl_player_actor/func_808375D8.s | 2 - .../actors/ovl_player_actor/func_80837704.s | 2 - .../actors/ovl_player_actor/func_808377DC.s | 2 - .../actors/ovl_player_actor/func_80837818.s | 2 - .../actors/ovl_player_actor/func_80837918.s | 2 - .../actors/ovl_player_actor/func_80837948.s | 2 - .../actors/ovl_player_actor/func_80837AE0.s | 2 - .../actors/ovl_player_actor/func_80837AFC.s | 2 - .../actors/ovl_player_actor/func_80837B18.s | 2 - .../actors/ovl_player_actor/func_80837B60.s | 2 - .../actors/ovl_player_actor/func_80837B9C.s | 2 - .../actors/ovl_player_actor/func_80837C0C.s | 2 - .../actors/ovl_player_actor/func_80838144.s | 2 - .../actors/ovl_player_actor/func_8083816C.s | 2 - .../actors/ovl_player_actor/func_8083819C.s | 2 - .../actors/ovl_player_actor/func_8083821C.s | 2 - .../actors/ovl_player_actor/func_80838280.s | 2 - .../actors/ovl_player_actor/func_808382BC.s | 2 - .../actors/ovl_player_actor/func_808382DC.s | 2 - .../actors/ovl_player_actor/func_80838940.s | 2 - .../actors/ovl_player_actor/func_808389E8.s | 2 - .../actors/ovl_player_actor/func_80838A14.s | 9 +- .../actors/ovl_player_actor/func_80838E70.s | 2 - .../actors/ovl_player_actor/func_80838F18.s | 2 - .../actors/ovl_player_actor/func_80838F5C.s | 2 - .../actors/ovl_player_actor/func_80838FB8.s | 2 - .../actors/ovl_player_actor/func_80839034.s | 2 - .../actors/ovl_player_actor/func_808395DC.s | 2 - .../actors/ovl_player_actor/func_80839680.s | 2 - .../actors/ovl_player_actor/func_808396F4.s | 2 - .../actors/ovl_player_actor/func_8083973C.s | 2 - .../actors/ovl_player_actor/func_80839768.s | 2 - .../actors/ovl_player_actor/func_80839800.s | 10 +- .../actors/ovl_player_actor/func_80839E88.s | 2 - .../actors/ovl_player_actor/func_80839F30.s | 2 - .../actors/ovl_player_actor/func_80839F90.s | 2 - .../actors/ovl_player_actor/func_80839FFC.s | 2 - .../actors/ovl_player_actor/func_8083A060.s | 2 - .../actors/ovl_player_actor/func_8083A098.s | 2 - .../actors/ovl_player_actor/func_8083A0D4.s | 2 - .../actors/ovl_player_actor/func_8083A0F4.s | 2 - .../actors/ovl_player_actor/func_8083A2F8.s | 2 - .../actors/ovl_player_actor/func_8083A360.s | 2 - .../actors/ovl_player_actor/func_8083A388.s | 2 - .../actors/ovl_player_actor/func_8083A3B0.s | 2 - .../actors/ovl_player_actor/func_8083A40C.s | 2 - .../actors/ovl_player_actor/func_8083A434.s | 2 - .../actors/ovl_player_actor/func_8083A4A8.s | 2 - .../actors/ovl_player_actor/func_8083A5C4.s | 7 +- .../actors/ovl_player_actor/func_8083A6AC.s | 7 +- .../actors/ovl_player_actor/func_8083A9B8.s | 2 - .../actors/ovl_player_actor/func_8083AA10.s | 2 - .../actors/ovl_player_actor/func_8083AD4C.s | 2 - .../actors/ovl_player_actor/func_8083ADD4.s | 2 - .../actors/ovl_player_actor/func_8083AE40.s | 24 +- .../actors/ovl_player_actor/func_8083AF44.s | 2 - .../actors/ovl_player_actor/func_8083B010.s | 2 - .../actors/ovl_player_actor/func_8083B040.s | 2 - .../actors/ovl_player_actor/func_8083B644.s | 2 - .../actors/ovl_player_actor/func_8083B8F4.s | 2 - .../actors/ovl_player_actor/func_8083B998.s | 2 - .../actors/ovl_player_actor/func_8083BA90.s | 2 - .../actors/ovl_player_actor/func_8083BB20.s | 2 - .../actors/ovl_player_actor/func_8083BBA0.s | 2 - .../actors/ovl_player_actor/func_8083BC04.s | 2 - .../actors/ovl_player_actor/func_8083BC7C.s | 2 - .../actors/ovl_player_actor/func_8083BCD0.s | 7 +- .../actors/ovl_player_actor/func_8083BDBC.s | 2 - .../actors/ovl_player_actor/func_8083BF50.s | 2 - .../actors/ovl_player_actor/func_8083C0B8.s | 2 - .../actors/ovl_player_actor/func_8083C0E8.s | 2 - .../actors/ovl_player_actor/func_8083C148.s | 2 - .../actors/ovl_player_actor/func_8083C1DC.s | 2 - .../actors/ovl_player_actor/func_8083C2B0.s | 2 - .../actors/ovl_player_actor/func_8083C484.s | 2 - .../actors/ovl_player_actor/func_8083C50C.s | 2 - .../actors/ovl_player_actor/func_8083C544.s | 2 - .../actors/ovl_player_actor/func_8083C61C.s | 2 - .../actors/ovl_player_actor/func_8083C6B8.s | 7 +- .../actors/ovl_player_actor/func_8083C858.s | 2 - .../actors/ovl_player_actor/func_8083C8DC.s | 2 - .../actors/ovl_player_actor/func_8083C910.s | 2 - .../actors/ovl_player_actor/func_8083CA20.s | 2 - .../actors/ovl_player_actor/func_8083CA54.s | 2 - .../actors/ovl_player_actor/func_8083CA9C.s | 7 +- .../actors/ovl_player_actor/func_8083CB2C.s | 2 - .../actors/ovl_player_actor/func_8083CB94.s | 2 - .../actors/ovl_player_actor/func_8083CBF0.s | 2 - .../actors/ovl_player_actor/func_8083CC9C.s | 2 - .../actors/ovl_player_actor/func_8083CD00.s | 2 - .../actors/ovl_player_actor/func_8083CD54.s | 2 - .../actors/ovl_player_actor/func_8083CE0C.s | 2 - .../actors/ovl_player_actor/func_8083CEAC.s | 2 - .../actors/ovl_player_actor/func_8083CF10.s | 2 - .../actors/ovl_player_actor/func_8083CF5C.s | 2 - .../actors/ovl_player_actor/func_8083CFA8.s | 2 - .../actors/ovl_player_actor/func_8083D0A8.s | 2 - .../actors/ovl_player_actor/func_8083D12C.s | 2 - .../actors/ovl_player_actor/func_8083D330.s | 2 - .../actors/ovl_player_actor/func_8083D36C.s | 2 - .../actors/ovl_player_actor/func_8083D53C.s | 2 - .../actors/ovl_player_actor/func_8083D6EC.s | 23 +- .../actors/ovl_player_actor/func_8083DB98.s | 2 - .../actors/ovl_player_actor/func_8083DC54.s | 2 - .../actors/ovl_player_actor/func_8083DDC8.s | 7 +- .../actors/ovl_player_actor/func_8083DF68.s | 2 - .../actors/ovl_player_actor/func_8083DFE0.s | 2 - .../actors/ovl_player_actor/func_8083E0FC.s | 2 - .../actors/ovl_player_actor/func_8083E298.s | 7 +- .../actors/ovl_player_actor/func_8083E318.s | 10 +- .../actors/ovl_player_actor/func_8083E4C4.s | 2 - .../actors/ovl_player_actor/func_8083E5A8.s | 9 +- .../actors/ovl_player_actor/func_8083EA94.s | 2 - .../actors/ovl_player_actor/func_8083EAF0.s | 7 +- .../actors/ovl_player_actor/func_8083EB44.s | 2 - .../actors/ovl_player_actor/func_8083EC18.s | 15 +- .../actors/ovl_player_actor/func_8083F070.s | 2 - .../actors/ovl_player_actor/func_8083F0C8.s | 7 +- .../actors/ovl_player_actor/func_8083F360.s | 7 +- .../actors/ovl_player_actor/func_8083F524.s | 2 - .../actors/ovl_player_actor/func_8083F570.s | 2 - .../actors/ovl_player_actor/func_8083F72C.s | 2 - .../actors/ovl_player_actor/func_8083F7BC.s | 2 - .../actors/ovl_player_actor/func_8083F9D0.s | 2 - .../actors/ovl_player_actor/func_8083FAB8.s | 2 - .../actors/ovl_player_actor/func_8083FB14.s | 2 - .../actors/ovl_player_actor/func_8083FB7C.s | 7 +- .../actors/ovl_player_actor/func_8083FBC0.s | 2 - .../actors/ovl_player_actor/func_8083FC68.s | 7 +- .../actors/ovl_player_actor/func_8083FD78.s | 2 - .../actors/ovl_player_actor/func_8083FFB8.s | 2 - .../actors/ovl_player_actor/func_80840058.s | 2 - .../actors/ovl_player_actor/func_80840138.s | 2 - .../actors/ovl_player_actor/func_808401B0.s | 2 - .../actors/ovl_player_actor/func_8084021C.s | 2 - .../actors/ovl_player_actor/func_8084029C.s | 2 - .../actors/ovl_player_actor/func_80840450.s | 13 +- .../actors/ovl_player_actor/func_808407CC.s | 7 +- .../actors/ovl_player_actor/func_808409CC.s | 7 +- .../actors/ovl_player_actor/func_80840BC8.s | 2 - .../actors/ovl_player_actor/func_80840DE4.s | 12 +- .../actors/ovl_player_actor/func_80841138.s | 10 +- .../actors/ovl_player_actor/func_8084140C.s | 2 - .../actors/ovl_player_actor/func_80841458.s | 2 - .../actors/ovl_player_actor/func_808414F8.s | 9 +- .../actors/ovl_player_actor/func_808416C0.s | 2 - .../actors/ovl_player_actor/func_8084170C.s | 2 - .../actors/ovl_player_actor/func_808417FC.s | 2 - .../actors/ovl_player_actor/func_80841860.s | 7 +- .../actors/ovl_player_actor/func_8084193C.s | 12 +- .../actors/ovl_player_actor/func_80841BA8.s | 2 - .../actors/ovl_player_actor/func_80841CC4.s | 9 +- .../actors/ovl_player_actor/func_80841EE4.s | 10 +- .../actors/ovl_player_actor/func_80842180.s | 2 - .../actors/ovl_player_actor/func_8084227C.s | 2 - .../actors/ovl_player_actor/func_808423EC.s | 2 - .../actors/ovl_player_actor/func_8084251C.s | 2 - .../actors/ovl_player_actor/func_8084260C.s | 2 - .../actors/ovl_player_actor/func_8084269C.s | 2 - .../actors/ovl_player_actor/func_8084279C.s | 2 - .../actors/ovl_player_actor/func_8084285C.s | 2 - .../actors/ovl_player_actor/func_808428D8.s | 2 - .../actors/ovl_player_actor/func_80842964.s | 2 - .../actors/ovl_player_actor/func_808429B4.s | 2 - .../actors/ovl_player_actor/func_80842A28.s | 2 - .../actors/ovl_player_actor/func_80842A88.s | 2 - .../actors/ovl_player_actor/func_80842AC4.s | 2 - .../actors/ovl_player_actor/func_80842B7C.s | 2 - .../actors/ovl_player_actor/func_80842CF0.s | 2 - .../actors/ovl_player_actor/func_80842D20.s | 2 - .../actors/ovl_player_actor/func_80842DF4.s | 2 - .../actors/ovl_player_actor/func_80843188.s | 2 - .../actors/ovl_player_actor/func_808435C4.s | 2 - .../actors/ovl_player_actor/func_8084370C.s | 2 - .../actors/ovl_player_actor/func_8084377C.s | 2 - .../actors/ovl_player_actor/func_80843954.s | 2 - .../actors/ovl_player_actor/func_80843A38.s | 2 - .../actors/ovl_player_actor/func_80843AE8.s | 2 - .../actors/ovl_player_actor/func_80843CEC.s | 2 - .../actors/ovl_player_actor/func_80843E14.s | 2 - .../actors/ovl_player_actor/func_80843E64.s | 7 +- .../actors/ovl_player_actor/func_8084409C.s | 2 - .../actors/ovl_player_actor/func_8084411C.s | 7 +- .../actors/ovl_player_actor/func_80844708.s | 2 - .../actors/ovl_player_actor/func_80844A44.s | 2 - .../actors/ovl_player_actor/func_80844AF4.s | 7 +- .../actors/ovl_player_actor/func_80844BE4.s | 7 +- .../actors/ovl_player_actor/func_80844CF8.s | 2 - .../actors/ovl_player_actor/func_80844D30.s | 2 - .../actors/ovl_player_actor/func_80844D68.s | 2 - .../actors/ovl_player_actor/func_80844DC8.s | 2 - .../actors/ovl_player_actor/func_80844E3C.s | 2 - .../actors/ovl_player_actor/func_80844E68.s | 7 +- .../actors/ovl_player_actor/func_80845000.s | 12 +- .../actors/ovl_player_actor/func_80845308.s | 15 +- .../actors/ovl_player_actor/func_80845668.s | 9 +- .../actors/ovl_player_actor/func_808458D0.s | 2 - .../actors/ovl_player_actor/func_80845964.s | 2 - .../actors/ovl_player_actor/func_80845BA0.s | 2 - .../actors/ovl_player_actor/func_80845C68.s | 2 - .../actors/ovl_player_actor/func_80845CA4.s | 7 +- .../actors/ovl_player_actor/func_80845EF8.s | 2 - .../actors/ovl_player_actor/func_80846050.s | 2 - .../actors/ovl_player_actor/func_80846120.s | 2 - .../actors/ovl_player_actor/func_80846260.s | 2 - .../actors/ovl_player_actor/func_80846358.s | 2 - .../actors/ovl_player_actor/func_80846408.s | 2 - .../actors/ovl_player_actor/func_808464B0.s | 2 - .../actors/ovl_player_actor/func_80846578.s | 2 - .../actors/ovl_player_actor/func_8084663C.s | 2 - .../actors/ovl_player_actor/func_80846648.s | 2 - .../actors/ovl_player_actor/func_80846660.s | 2 - .../actors/ovl_player_actor/func_80846720.s | 2 - .../actors/ovl_player_actor/func_808467D4.s | 2 - .../actors/ovl_player_actor/func_808468A8.s | 2 - .../actors/ovl_player_actor/func_808468E8.s | 2 - .../actors/ovl_player_actor/func_80846978.s | 2 - .../actors/ovl_player_actor/func_808469BC.s | 2 - .../actors/ovl_player_actor/func_80846A00.s | 2 - .../actors/ovl_player_actor/func_80846A68.s | 2 - .../actors/ovl_player_actor/func_80846AAC.s | 2 - .../actors/ovl_player_actor/func_80846CD8.s | 8 +- .../actors/ovl_player_actor/func_808471F4.s | 2 - .../actors/ovl_player_actor/func_80847298.s | 2 - .../actors/ovl_player_actor/func_808473D4.s | 2 - .../actors/ovl_player_actor/func_80847A78.s | 2 - .../actors/ovl_player_actor/func_80847BA0.s | 22 +- .../actors/ovl_player_actor/func_808486A8.s | 2 - .../actors/ovl_player_actor/func_80848A04.s | 2 - .../actors/ovl_player_actor/func_80848B44.s | 7 +- .../actors/ovl_player_actor/func_80848C74.s | 21 +- .../actors/ovl_player_actor/func_80848EF8.s | 9 +- .../actors/ovl_player_actor/func_80848F9C.s | 14 +- .../actors/ovl_player_actor/func_80849EA8.s | 2 - .../actors/ovl_player_actor/func_8084A0E8.s | 32 +- .../actors/ovl_player_actor/func_8084A5C4.s | 26 +- .../actors/ovl_player_actor/func_8084AB54.s | 2 - .../actors/ovl_player_actor/func_8084ABD8.s | 10 +- .../actors/ovl_player_actor/func_8084AEEC.s | 13 +- .../actors/ovl_player_actor/func_8084B000.s | 13 +- .../actors/ovl_player_actor/func_8084B158.s | 2 - .../actors/ovl_player_actor/func_8084B1D8.s | 2 - .../actors/ovl_player_actor/func_8084B3CC.s | 2 - .../actors/ovl_player_actor/func_8084B498.s | 2 - .../actors/ovl_player_actor/func_8084B4D4.s | 2 - .../actors/ovl_player_actor/func_8084B530.s | 2 - .../actors/ovl_player_actor/func_8084B78C.s | 2 - .../actors/ovl_player_actor/func_8084B840.s | 2 - .../actors/ovl_player_actor/func_8084B898.s | 2 - .../actors/ovl_player_actor/func_8084B9E4.s | 2 - .../actors/ovl_player_actor/func_8084BBE4.s | 10 +- .../actors/ovl_player_actor/func_8084BDFC.s | 2 - .../actors/ovl_player_actor/func_8084BEE4.s | 2 - .../actors/ovl_player_actor/func_8084BF1C.s | 12 +- .../actors/ovl_player_actor/func_8084C5F8.s | 2 - .../actors/ovl_player_actor/func_8084C760.s | 7 +- .../actors/ovl_player_actor/func_8084C81C.s | 2 - .../actors/ovl_player_actor/func_8084C89C.s | 2 - .../actors/ovl_player_actor/func_8084C9BC.s | 2 - .../actors/ovl_player_actor/func_8084CBF4.s | 2 - .../actors/ovl_player_actor/func_8084CC98.s | 10 +- .../actors/ovl_player_actor/func_8084D3E4.s | 2 - .../actors/ovl_player_actor/func_8084D530.s | 2 - .../actors/ovl_player_actor/func_8084D574.s | 2 - .../actors/ovl_player_actor/func_8084D5CC.s | 2 - .../actors/ovl_player_actor/func_8084D610.s | 2 - .../actors/ovl_player_actor/func_8084D7C4.s | 2 - .../actors/ovl_player_actor/func_8084D84C.s | 2 - .../actors/ovl_player_actor/func_8084D980.s | 2 - .../actors/ovl_player_actor/func_8084DAB4.s | 2 - .../actors/ovl_player_actor/func_8084DBC4.s | 2 - .../actors/ovl_player_actor/func_8084DC48.s | 7 +- .../actors/ovl_player_actor/func_8084DF6C.s | 2 - .../actors/ovl_player_actor/func_8084DFAC.s | 2 - .../actors/ovl_player_actor/func_8084DFF4.s | 2 - .../actors/ovl_player_actor/func_8084E1EC.s | 2 - .../actors/ovl_player_actor/func_8084E30C.s | 2 - .../actors/ovl_player_actor/func_8084E368.s | 2 - .../actors/ovl_player_actor/func_8084E3C4.s | 2 - .../actors/ovl_player_actor/func_8084E604.s | 2 - .../actors/ovl_player_actor/func_8084E6D4.s | 2 - .../actors/ovl_player_actor/func_8084E988.s | 2 - .../actors/ovl_player_actor/func_8084E9AC.s | 2 - .../actors/ovl_player_actor/func_8084EAC0.s | 2 - .../actors/ovl_player_actor/func_8084ECA4.s | 2 - .../actors/ovl_player_actor/func_8084EED8.s | 2 - .../actors/ovl_player_actor/func_8084EFC0.s | 2 - .../actors/ovl_player_actor/func_8084F104.s | 2 - .../actors/ovl_player_actor/func_8084F308.s | 2 - .../actors/ovl_player_actor/func_8084F390.s | 9 +- .../actors/ovl_player_actor/func_8084F608.s | 2 - .../actors/ovl_player_actor/func_8084F698.s | 2 - .../actors/ovl_player_actor/func_8084F710.s | 2 - .../actors/ovl_player_actor/func_8084F88C.s | 2 - .../actors/ovl_player_actor/func_8084F9A0.s | 2 - .../actors/ovl_player_actor/func_8084F9C0.s | 2 - .../actors/ovl_player_actor/func_8084FA54.s | 2 - .../actors/ovl_player_actor/func_8084FB10.s | 2 - .../actors/ovl_player_actor/func_8084FBF4.s | 2 - .../actors/ovl_player_actor/func_8084FCAC.s | 8 +- .../actors/ovl_player_actor/func_8084FF7C.s | 10 +- .../actors/ovl_player_actor/func_8085002C.s | 2 - .../actors/ovl_player_actor/func_80850224.s | 2 - .../actors/ovl_player_actor/func_808502D0.s | 2 - .../actors/ovl_player_actor/func_808505DC.s | 2 - .../actors/ovl_player_actor/func_8085063C.s | 2 - .../actors/ovl_player_actor/func_8085076C.s | 2 - .../actors/ovl_player_actor/func_808507F4.s | 2 - .../actors/ovl_player_actor/func_80850AEC.s | 2 - .../actors/ovl_player_actor/func_80850C68.s | 2 - .../actors/ovl_player_actor/func_80850E84.s | 2 - .../actors/ovl_player_actor/func_80850ED8.s | 2 - .../actors/ovl_player_actor/func_80850F1C.s | 2 - .../actors/ovl_player_actor/func_80850F9C.s | 2 - .../actors/ovl_player_actor/func_80851008.s | 2 - .../actors/ovl_player_actor/func_80851030.s | 2 - .../actors/ovl_player_actor/func_80851050.s | 2 - .../actors/ovl_player_actor/func_80851094.s | 2 - .../actors/ovl_player_actor/func_808510B4.s | 2 - .../actors/ovl_player_actor/func_808510D4.s | 2 - .../actors/ovl_player_actor/func_808510F4.s | 2 - .../actors/ovl_player_actor/func_80851114.s | 2 - .../actors/ovl_player_actor/func_80851134.s | 2 - .../actors/ovl_player_actor/func_80851154.s | 2 - .../actors/ovl_player_actor/func_80851174.s | 2 - .../actors/ovl_player_actor/func_80851194.s | 2 - .../actors/ovl_player_actor/func_808511B4.s | 2 - .../actors/ovl_player_actor/func_808511D4.s | 2 - .../actors/ovl_player_actor/func_808511FC.s | 2 - .../actors/ovl_player_actor/func_80851248.s | 2 - .../actors/ovl_player_actor/func_80851294.s | 2 - .../actors/ovl_player_actor/func_808512E0.s | 2 - .../actors/ovl_player_actor/func_80851314.s | 2 - .../actors/ovl_player_actor/func_80851368.s | 2 - .../actors/ovl_player_actor/func_808513BC.s | 2 - .../actors/ovl_player_actor/func_808514C0.s | 2 - .../actors/ovl_player_actor/func_8085157C.s | 2 - .../actors/ovl_player_actor/func_808515A4.s | 2 - .../actors/ovl_player_actor/func_80851688.s | 2 - .../actors/ovl_player_actor/func_80851750.s | 2 - .../actors/ovl_player_actor/func_80851788.s | 7 +- .../actors/ovl_player_actor/func_80851828.s | 2 - .../actors/ovl_player_actor/func_808518DC.s | 2 - .../actors/ovl_player_actor/func_8085190C.s | 2 - .../actors/ovl_player_actor/func_80851998.s | 2 - .../actors/ovl_player_actor/func_808519C0.s | 2 - .../actors/ovl_player_actor/func_808519EC.s | 2 - .../actors/ovl_player_actor/func_80851A50.s | 2 - .../actors/ovl_player_actor/func_80851B90.s | 2 - .../actors/ovl_player_actor/func_80851BE8.s | 2 - .../actors/ovl_player_actor/func_80851CA4.s | 2 - .../actors/ovl_player_actor/func_80851D2C.s | 2 - .../actors/ovl_player_actor/func_80851D80.s | 2 - .../actors/ovl_player_actor/func_80851DEC.s | 2 - .../actors/ovl_player_actor/func_80851E28.s | 2 - .../actors/ovl_player_actor/func_80851E64.s | 2 - .../actors/ovl_player_actor/func_80851E90.s | 2 - .../actors/ovl_player_actor/func_80851ECC.s | 2 - .../actors/ovl_player_actor/func_80851F14.s | 2 - .../actors/ovl_player_actor/func_80851F84.s | 2 - .../actors/ovl_player_actor/func_80851FB0.s | 2 - .../actors/ovl_player_actor/func_80852048.s | 2 - .../actors/ovl_player_actor/func_80852080.s | 2 - .../actors/ovl_player_actor/func_808520BC.s | 2 - .../actors/ovl_player_actor/func_80852174.s | 2 - .../actors/ovl_player_actor/func_808521B8.s | 2 - .../actors/ovl_player_actor/func_808521F4.s | 2 - .../actors/ovl_player_actor/func_80852234.s | 2 - .../actors/ovl_player_actor/func_8085225C.s | 2 - .../actors/ovl_player_actor/func_80852280.s | 2 - .../actors/ovl_player_actor/func_80852298.s | 2 - .../actors/ovl_player_actor/func_80852328.s | 2 - .../actors/ovl_player_actor/func_80852358.s | 2 - .../actors/ovl_player_actor/func_80852388.s | 2 - .../actors/ovl_player_actor/func_80852414.s | 2 - .../actors/ovl_player_actor/func_80852450.s | 2 - .../actors/ovl_player_actor/func_80852480.s | 2 - .../actors/ovl_player_actor/func_808524B0.s | 2 - .../actors/ovl_player_actor/func_808524D0.s | 2 - .../actors/ovl_player_actor/func_80852514.s | 2 - .../actors/ovl_player_actor/func_80852544.s | 2 - .../actors/ovl_player_actor/func_80852554.s | 2 - .../actors/ovl_player_actor/func_80852564.s | 2 - .../actors/ovl_player_actor/func_808525C0.s | 2 - .../actors/ovl_player_actor/func_80852608.s | 2 - .../actors/ovl_player_actor/func_80852648.s | 2 - .../actors/ovl_player_actor/func_808526EC.s | 2 - .../actors/ovl_player_actor/func_8085283C.s | 2 - .../actors/ovl_player_actor/func_808528C8.s | 2 - .../actors/ovl_player_actor/func_80852944.s | 2 - .../actors/ovl_player_actor/func_808529D0.s | 2 - .../actors/ovl_player_actor/func_80852A54.s | 2 - .../actors/ovl_player_actor/func_80852B4C.s | 2 - .../actors/ovl_player_actor/func_80852C0C.s | 2 - .../actors/ovl_player_actor/func_80852C50.s | 8 +- .../actors/ovl_player_actor/func_80852E14.s | 8 +- .../actors/ovl_player_actor/func_80852EC8.s | 2 - .../actors/ovl_player_actor/func_80852EFC.s | 2 - .../actors/ovl_player_actor/func_80852F38.s | 2 - .../actors/ovl_player_actor/func_80852FFC.s | 2 - .../actors/ovl_player_actor/func_80853080.s | 2 - .../actors/ovl_player_actor/func_808530E0.s | 2 - .../actors/ovl_player_actor/func_80853148.s | 1 - .../ovl_Effect_Ss_Blast/func_8099EDB0.s | 2 - .../ovl_Effect_Ss_Blast/func_8099EF08.s | 2 - .../ovl_Effect_Ss_Blast/func_8099F0AC.s | 1 - .../ovl_Effect_Ss_Bomb/func_8099F1B0.s | 2 - .../ovl_Effect_Ss_Bomb/func_8099F274.s | 2 - .../ovl_Effect_Ss_Bomb/func_8099F4D8.s | 1 - .../ovl_Effect_Ss_Bomb2/func_8099F650.s | 2 - .../ovl_Effect_Ss_Bomb2/func_8099F748.s | 2 - .../ovl_Effect_Ss_Bomb2/func_8099F960.s | 2 - .../ovl_Effect_Ss_Bomb2/func_8099FCCC.s | 1 - .../ovl_Effect_Ss_Bubble/func_809A0040.s | 2 - .../ovl_Effect_Ss_Bubble/func_809A01CC.s | 2 - .../ovl_Effect_Ss_Bubble/func_809A0360.s | 1 - .../ovl_Effect_Ss_D_Fire/func_809A0550.s | 2 - .../ovl_Effect_Ss_D_Fire/func_809A0698.s | 2 - .../ovl_Effect_Ss_D_Fire/func_809A090C.s | 1 - .../ovl_Effect_Ss_Dead_Db/func_809A0AA0.s | 2 - .../ovl_Effect_Ss_Dead_Db/func_809A0BB8.s | 2 - .../ovl_Effect_Ss_Dead_Db/func_809A0DB4.s | 1 - .../ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s | 1 - .../ovl_Effect_Ss_Dead_Dd/func_809A12B4.s | 1 - .../ovl_Effect_Ss_Dead_Ds/func_809A1610.s | 2 - .../ovl_Effect_Ss_Dead_Ds/func_809A16F4.s | 2 - .../ovl_Effect_Ss_Dead_Ds/func_809A1A08.s | 1 - .../ovl_Effect_Ss_Dead_Sound/func_809A1B30.s | 1 - .../ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s | 2 - .../ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s | 2 - .../ovl_Effect_Ss_Dt_Bubble/func_809A2180.s | 1 - .../ovl_Effect_Ss_Dust/func_809A22D0.s | 2 - .../ovl_Effect_Ss_Dust/func_809A2480.s | 2 - .../ovl_Effect_Ss_Dust/func_809A27F0.s | 2 - .../ovl_Effect_Ss_Dust/func_809A28EC.s | 1 - .../ovl_Effect_Ss_En_Fire/func_809A2B60.s | 2 - .../ovl_Effect_Ss_En_Fire/func_809A2D28.s | 2 - .../ovl_Effect_Ss_En_Fire/func_809A3060.s | 1 - .../ovl_Effect_Ss_En_Ice/func_809A3330.s | 2 - .../ovl_Effect_Ss_En_Ice/func_809A35DC.s | 2 - .../ovl_Effect_Ss_En_Ice/func_809A3988.s | 2 - .../ovl_Effect_Ss_En_Ice/func_809A3B60.s | 1 - .../ovl_Effect_Ss_Extra/func_809A3CC0.s | 1 - .../ovl_Effect_Ss_Extra/func_809A3E00.s | 1 - .../ovl_Effect_Ss_Fcircle/func_809A4120.s | 2 - .../ovl_Effect_Ss_Fcircle/func_809A41DC.s | 2 - .../ovl_Effect_Ss_Fcircle/func_809A44E0.s | 1 - .../ovl_Effect_Ss_Fhg_Flash/func_809A4660.s | 2 - .../ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s | 2 - .../ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s | 2 - .../ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s | 2 - .../ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s | 1 - .../ovl_Effect_Ss_Fire_Tail/func_809A5740.s | 2 - .../ovl_Effect_Ss_Fire_Tail/func_809A5858.s | 2 - .../ovl_Effect_Ss_Fire_Tail/func_809A5D98.s | 1 - .../ovl_Effect_Ss_G_Fire/func_809A5ED0.s | 2 - .../ovl_Effect_Ss_G_Fire/func_809A6010.s | 2 - .../ovl_Effect_Ss_G_Fire/func_809A60B4.s | 1 - .../ovl_Effect_Ss_G_Magma/func_809A6150.s | 2 - .../ovl_Effect_Ss_G_Magma/func_809A62A8.s | 2 - .../ovl_Effect_Ss_G_Magma/func_809A6300.s | 1 - .../ovl_Effect_Ss_G_Magma2/func_809A63A0.s | 2 - .../ovl_Effect_Ss_G_Magma2/func_809A6568.s | 2 - .../ovl_Effect_Ss_G_Magma2/func_809A67C0.s | 1 - .../ovl_Effect_Ss_G_Ripple/func_809A6960.s | 2 - .../ovl_Effect_Ss_G_Ripple/func_809A6AD8.s | 2 - .../ovl_Effect_Ss_G_Ripple/func_809A6D08.s | 2 - .../ovl_Effect_Ss_G_Ripple/func_809A6D40.s | 1 - .../ovl_Effect_Ss_G_Spk/func_809A6F30.s | 2 - .../ovl_Effect_Ss_G_Spk/func_809A70A0.s | 2 - .../ovl_Effect_Ss_G_Spk/func_809A72C0.s | 2 - .../ovl_Effect_Ss_G_Spk/func_809A73C8.s | 1 - .../ovl_Effect_Ss_G_Splash/func_809A7540.s | 2 - .../ovl_Effect_Ss_G_Splash/func_809A7760.s | 2 - .../ovl_Effect_Ss_G_Splash/func_809A7864.s | 1 - .../ovl_Effect_Ss_Hahen/func_809A79F0.s | 2 - .../ovl_Effect_Ss_Hahen/func_809A7A60.s | 2 - .../ovl_Effect_Ss_Hahen/func_809A7BFC.s | 2 - .../ovl_Effect_Ss_Hahen/func_809A7D9C.s | 2 - .../ovl_Effect_Ss_Hahen/func_809A7F84.s | 1 - .../ovl_Effect_Ss_HitMark/func_809A8150.s | 2 - .../ovl_Effect_Ss_HitMark/func_809A824C.s | 2 - .../ovl_Effect_Ss_HitMark/func_809A8484.s | 1 - .../ovl_Effect_Ss_Ice_Piece/func_809A8700.s | 2 - .../ovl_Effect_Ss_Ice_Piece/func_809A8850.s | 2 - .../ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s | 1 - .../ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s | 2 - .../ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s | 2 - .../ovl_Effect_Ss_Ice_Smoke/func_809A9030.s | 1 - .../ovl_Effect_Ss_K_Fire/func_809A91B0.s | 2 - .../ovl_Effect_Ss_K_Fire/func_809A9280.s | 2 - .../ovl_Effect_Ss_K_Fire/func_809A951C.s | 1 - .../ovl_Effect_Ss_Kakera/func_809A9680.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9818.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9874.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9BA8.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9C10.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9DC0.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9DD8.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9DEC.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9E28.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9E68.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9E88.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9F10.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9F4C.s | 2 - .../ovl_Effect_Ss_Kakera/func_809A9FD8.s | 2 - .../ovl_Effect_Ss_Kakera/func_809AA0B8.s | 2 - .../ovl_Effect_Ss_Kakera/func_809AA0EC.s | 2 - .../ovl_Effect_Ss_Kakera/func_809AA230.s | 2 - .../ovl_Effect_Ss_Kakera/func_809AA430.s | 1 - .../ovl_Effect_Ss_KiraKira/func_809AA810.s | 2 - .../ovl_Effect_Ss_KiraKira/func_809AA9AC.s | 2 - .../ovl_Effect_Ss_KiraKira/func_809AABF0.s | 2 - .../ovl_Effect_Ss_KiraKira/func_809AACAC.s | 2 - .../ovl_Effect_Ss_KiraKira/func_809AAD6C.s | 1 - .../ovl_Effect_Ss_Lightning/func_809AAEF0.s | 2 - .../ovl_Effect_Ss_Lightning/func_809AAFD4.s | 2 - .../ovl_Effect_Ss_Lightning/func_809AB078.s | 2 - .../ovl_Effect_Ss_Lightning/func_809AB338.s | 1 - .../ovl_Effect_Ss_Sibuki/func_809AB630.s | 2 - .../ovl_Effect_Ss_Sibuki/func_809AB7EC.s | 2 - .../ovl_Effect_Ss_Sibuki/func_809AB9DC.s | 1 - .../ovl_Effect_Ss_Sibuki2/func_809ABD60.s | 2 - .../ovl_Effect_Ss_Sibuki2/func_809ABE0C.s | 2 - .../ovl_Effect_Ss_Sibuki2/func_809AC030.s | 1 - .../func_809AC130.s | 2 - .../func_809AC1AC.s | 1 - .../ovl_Effect_Ss_Stick/func_809AC2D0.s | 2 - .../ovl_Effect_Ss_Stick/func_809AC42C.s | 2 - .../ovl_Effect_Ss_Stick/func_809AC604.s | 1 - .../ovl_Effect_Ss_Stone1/func_809AC700.s | 2 - .../ovl_Effect_Ss_Stone1/func_809AC78C.s | 2 - .../ovl_Effect_Ss_Stone1/func_809AC9C0.s | 1 - .../ovl_file_choose/func_80803D40.s | 2 - .../ovl_file_choose/func_80803ED8.s | 2 - .../ovl_file_choose/func_80804248.s | 2 - .../ovl_file_choose/func_808043D8.s | 2 - .../ovl_file_choose/func_808044A0.s | 2 - .../ovl_file_choose/func_80804858.s | 2 - .../ovl_file_choose/func_80804924.s | 2 - .../ovl_file_choose/func_80804A50.s | 2 - .../ovl_file_choose/func_80804C74.s | 2 - .../ovl_file_choose/func_80804CD0.s | 2 - .../ovl_file_choose/func_80804ED8.s | 2 - .../ovl_file_choose/func_8080510C.s | 2 - .../ovl_file_choose/func_808051C8.s | 2 - .../ovl_file_choose/func_80805318.s | 2 - .../ovl_file_choose/func_80805434.s | 2 - .../ovl_file_choose/func_80805524.s | 2 - .../ovl_file_choose/func_80805824.s | 2 - .../ovl_file_choose/func_8080595C.s | 2 - .../ovl_file_choose/func_80805B2C.s | 2 - .../ovl_file_choose/func_80805EB8.s | 2 - .../ovl_file_choose/func_80806180.s | 2 - .../ovl_file_choose/func_8080625C.s | 2 - .../ovl_file_choose/func_80806444.s | 2 - .../ovl_file_choose/func_808064F4.s | 2 - .../ovl_file_choose/func_80806710.s | 2 - .../ovl_file_choose/func_808068F0.s | 2 - .../ovl_file_choose/func_808069B4.s | 2 - .../ovl_file_choose/func_80806C20.s | 2 - .../ovl_file_choose/func_80806DB0.s | 2 - .../ovl_file_choose/func_80806F34.s | 2 - .../ovl_file_choose/func_8080723C.s | 2 - .../ovl_file_choose/func_80807DCC.s | 2 - .../ovl_file_choose/func_80808000.s | 2 - .../ovl_file_choose/func_80808F84.s | 2 - .../ovl_file_choose/func_80809038.s | 2 - .../ovl_file_choose/func_8080960C.s | 2 - .../ovl_file_choose/func_8080969C.s | 2 - .../ovl_file_choose/func_808099C8.s | 2 - .../ovl_file_choose/func_8080AF30.s | 2 - .../ovl_file_choose/func_8080AF50.s | 2 - .../ovl_file_choose/func_8080AFD0.s | 2 - .../ovl_file_choose/func_8080B1A8.s | 2 - .../ovl_file_choose/func_8080B22C.s | 2 - .../ovl_file_choose/func_8080B394.s | 2 - .../ovl_file_choose/func_8080B40C.s | 2 - .../ovl_file_choose/func_8080B494.s | 2 - .../ovl_file_choose/func_8080B52C.s | 2 - .../ovl_file_choose/func_8080BE30.s | 2 - .../ovl_file_choose/func_8080BE84.s | 2 - .../ovl_file_choose/func_8080BEF8.s | 2 - .../ovl_file_choose/func_8080BF6C.s | 2 - .../ovl_file_choose/func_8080BFE4.s | 2 - .../ovl_file_choose/func_8080C2F4.s | 2 - .../ovl_file_choose/func_8080C330.s | 2 - .../ovl_file_choose/func_8080C60C.s | 2 - .../ovl_file_choose/func_8080D8CC.s | 2 - .../ovl_file_choose/func_8080E074.s | 2 - .../ovl_file_choose/func_8080F560.s | 2 - .../ovl_file_choose/func_8080FE2C.s | 2 - .../ovl_file_choose/func_8080FF98.s | 2 - .../ovl_file_choose/func_8081009C.s | 2 - .../ovl_file_choose/func_8081017C.s | 2 - .../ovl_file_choose/func_80810354.s | 2 - .../ovl_file_choose/func_80810440.s | 2 - .../ovl_file_choose/func_80810698.s | 2 - .../ovl_file_choose/func_808106F4.s | 2 - .../ovl_file_choose/func_8081097C.s | 2 - .../ovl_file_choose/func_808109B8.s | 2 - .../ovl_file_choose/func_80810DAC.s | 2 - .../ovl_file_choose/func_808113A8.s | 1 - .../ovl_file_choose/func_80811A20.s | 1 - .../gamestates/ovl_select/func_80800B90.s | 2 - .../gamestates/ovl_select/func_80800BAC.s | 2 - .../gamestates/ovl_select/func_80800CB4.s | 2 - .../gamestates/ovl_select/func_80801614.s | 2 - .../gamestates/ovl_select/func_808017F0.s | 2 - .../gamestates/ovl_select/func_8080187C.s | 2 - .../gamestates/ovl_select/func_808018F0.s | 2 - .../gamestates/ovl_select/func_80801AAC.s | 2 - .../gamestates/ovl_select/func_80801BF0.s | 2 - .../gamestates/ovl_select/func_80801D04.s | 2 - .../gamestates/ovl_select/func_80801DE4.s | 2 - .../gamestates/ovl_select/func_80801E0C.s | 2 - .../gamestates/ovl_select/func_80801E44.s | 1 - .../data/ovl_map_mark_data/z_map_mark_data.s | 6 - data/overlays/actors/z_arms_hook.rodata.s | 33 - data/overlays/actors/z_bg_bombwall.rodata.s | 25 - data/overlays/actors/z_bg_bowl_wall.rodata.s | 37 - data/overlays/actors/z_bg_breakwall.rodata.s | 36 - data/overlays/actors/z_bg_ddan_kd.rodata.s | 20 - data/overlays/actors/z_bg_dodoago.rodata.s | 25 - data/overlays/actors/z_bg_dy_yoseizo.rodata.s | 106 --- .../actors/z_bg_ganon_otyuka.rodata.s | 75 -- .../actors/z_bg_gnd_darkmeiro.rodata.s | 27 - .../actors/z_bg_gnd_firemeiro.rodata.s | 23 - .../actors/z_bg_gnd_soulmeiro.rodata.s | 29 - data/overlays/actors/z_bg_haka.rodata.s | 33 - data/overlays/actors/z_bg_haka_gate.rodata.s | 50 -- data/overlays/actors/z_bg_haka_huta.rodata.s | 15 - .../actors/z_bg_haka_meganebg.rodata.s | 17 - data/overlays/actors/z_bg_haka_sgami.rodata.s | 13 - data/overlays/actors/z_bg_haka_ship.rodata.s | 55 -- data/overlays/actors/z_bg_haka_trap.rodata.s | 31 - data/overlays/actors/z_bg_haka_tubo.rodata.s | 41 - data/overlays/actors/z_bg_haka_water.rodata.s | 33 - data/overlays/actors/z_bg_haka_zou.rodata.s | 25 - .../overlays/actors/z_bg_heavy_block.rodata.s | 63 -- .../actors/z_bg_hidan_curtain.rodata.s | 41 - .../overlays/actors/z_bg_hidan_fwbig.rodata.s | 29 - .../actors/z_bg_hidan_hamstep.rodata.s | 55 -- .../overlays/actors/z_bg_hidan_hrock.rodata.s | 15 - .../overlays/actors/z_bg_hidan_kousi.rodata.s | 33 - .../actors/z_bg_hidan_kowarerukabe.rodata.s | 41 - data/overlays/actors/z_bg_hidan_rock.rodata.s | 37 - .../actors/z_bg_hidan_rsekizou.rodata.s | 35 - .../actors/z_bg_hidan_sekizou.rodata.s | 33 - data/overlays/actors/z_bg_hidan_sima.rodata.s | 43 - .../overlays/actors/z_bg_ice_objects.rodata.s | 25 - .../overlays/actors/z_bg_ice_shelter.rodata.s | 62 -- data/overlays/actors/z_bg_ice_turara.rodata.s | 15 - data/overlays/actors/z_bg_ingate.rodata.s | 23 - data/overlays/actors/z_bg_jya_1flift.rodata.s | 25 - .../actors/z_bg_jya_bigmirror.rodata.s | 63 -- data/overlays/actors/z_bg_jya_block.rodata.s | 23 - .../actors/z_bg_jya_bombchuiwa.rodata.s | 49 - .../overlays/actors/z_bg_jya_bombiwa.rodata.s | 39 - data/overlays/actors/z_bg_jya_cobra.rodata.s | 107 --- .../overlays/actors/z_bg_jya_goroiwa.rodata.s | 35 - .../actors/z_bg_jya_haheniron.rodata.s | 17 - .../overlays/actors/z_bg_jya_ironobj.rodata.s | 51 -- data/overlays/actors/z_bg_jya_lift.rodata.s | 27 - data/overlays/actors/z_bg_jya_megami.rodata.s | 53 -- .../actors/z_bg_jya_zurerukabe.rodata.s | 49 - .../overlays/actors/z_bg_menkuri_eye.rodata.s | 20 - data/overlays/actors/z_bg_mizu_bwall.rodata.s | 77 -- .../overlays/actors/z_bg_mizu_movebg.rodata.s | 67 -- .../actors/z_bg_mizu_shutter.rodata.s | 43 - data/overlays/actors/z_bg_mizu_water.rodata.s | 53 -- data/overlays/actors/z_bg_mori_bigst.rodata.s | 67 -- .../actors/z_bg_mori_elevator.rodata.s | 73 -- .../actors/z_bg_mori_hashigo.rodata.s | 51 -- .../actors/z_bg_mori_hashira4.rodata.s | 45 - .../overlays/actors/z_bg_mori_hineri.rodata.s | 61 -- .../actors/z_bg_mori_idomizu.rodata.s | 39 - .../actors/z_bg_mori_kaitenkabe.rodata.s | 43 - .../actors/z_bg_mori_rakkatenjo.rodata.s | 81 -- data/overlays/actors/z_bg_po_event.rodata.s | 40 - .../overlays/actors/z_bg_po_syokudai.rodata.s | 37 - .../actors/z_bg_relay_objects.rodata.s | 13 - .../actors/z_bg_spot00_hanebasi.rodata.s | 53 -- .../actors/z_bg_spot01_idohashira.rodata.s | 47 - .../actors/z_bg_spot01_idomizu.rodata.s | 27 - .../actors/z_bg_spot01_objects2.rodata.s | 28 - .../actors/z_bg_spot02_objects.rodata.s | 57 -- .../overlays/actors/z_bg_spot03_taki.rodata.s | 21 - .../actors/z_bg_spot06_objects.rodata.s | 73 -- .../overlays/actors/z_bg_spot07_taki.rodata.s | 31 - .../actors/z_bg_spot08_bakudankabe.rodata.s | 17 - .../actors/z_bg_spot08_iceblock.rodata.s | 24 +- .../actors/z_bg_spot11_bakudankabe.rodata.s | 19 - .../actors/z_bg_spot11_oasis.rodata.s | 31 - .../actors/z_bg_spot15_rrbox.rodata.s | 47 - .../actors/z_bg_spot16_bombstone.rodata.s | 72 -- .../actors/z_bg_spot16_doughnut.rodata.s | 45 - .../actors/z_bg_spot17_bakudankabe.rodata.s | 41 - .../actors/z_bg_spot18_basket.rodata.s | 29 - data/overlays/actors/z_bg_spot18_obj.rodata.s | 47 - data/overlays/actors/z_bg_sst_floor.rodata.s | 31 - .../overlays/actors/z_bg_toki_hikari.rodata.s | 57 -- data/overlays/actors/z_bg_treemouth.rodata.s | 53 -- data/overlays/actors/z_bg_vb_sima.rodata.s | 33 - data/overlays/actors/z_bg_ydan_hasi.rodata.s | 29 - data/overlays/actors/z_bg_ydan_sp.rodata.s | 59 -- data/overlays/actors/z_boss_dodongo.rodata.s | 234 ----- data/overlays/actors/z_boss_fd.rodata.s | 325 ------- data/overlays/actors/z_boss_fd2.rodata.s | 156 ---- data/overlays/actors/z_boss_ganon2.rodata.s | 507 ----------- .../overlays/actors/z_boss_ganondrof.rodata.s | 112 ++- data/overlays/actors/z_boss_goma.rodata.s | 148 --- data/overlays/actors/z_boss_mo.rodata.s | 516 ----------- data/overlays/actors/z_boss_sst.rodata.s | 168 ---- data/overlays/actors/z_boss_tw.rodata.s | 644 ------------- data/overlays/actors/z_boss_va.rodata.s | 495 ---------- data/overlays/actors/z_demo_6k.rodata.s | 200 ----- data/overlays/actors/z_demo_du.rodata.s | 43 - data/overlays/actors/z_demo_ec.rodata.s | 65 -- data/overlays/actors/z_demo_effect.rodata.s | 324 ------- data/overlays/actors/z_demo_ext.rodata.s | 37 - data/overlays/actors/z_demo_gj.rodata.s | 147 --- data/overlays/actors/z_demo_gt.rodata.s | 260 ------ data/overlays/actors/z_demo_ik.rodata.s | 95 -- data/overlays/actors/z_demo_im.rodata.s | 72 -- data/overlays/actors/z_demo_kankyo.rodata.s | 193 ---- data/overlays/actors/z_demo_kekkai.rodata.s | 75 -- data/overlays/actors/z_demo_sa.rodata.s | 47 - data/overlays/actors/z_demo_shd.rodata.s | 23 - data/overlays/actors/z_door_gerudo.rodata.s | 30 - data/overlays/actors/z_door_killer.rodata.s | 58 -- data/overlays/actors/z_door_shutter.rodata.s | 63 -- data/overlays/actors/z_door_warp1.rodata.s | 132 ++- data/overlays/actors/z_efc_erupc.rodata.s | 45 - data/overlays/actors/z_eff_dust.rodata.s | 73 -- data/overlays/actors/z_elf_msg.rodata.s | 63 -- data/overlays/actors/z_elf_msg2.rodata.s | 57 -- data/overlays/actors/z_en_am.rodata.s | 23 - data/overlays/actors/z_en_anubice.rodata.s | 59 -- .../actors/z_en_anubice_fire.rodata.s | 37 - data/overlays/actors/z_en_arrow.rodata.s | 56 -- data/overlays/actors/z_en_attack_niw.rodata.s | 58 -- data/overlays/actors/z_en_ba.rodata.s | 37 - data/overlays/actors/z_en_bb.rodata.s | 93 -- data/overlays/actors/z_en_bdfire.rodata.s | 43 - data/overlays/actors/z_en_bigokuta.rodata.s | 89 -- data/overlays/actors/z_en_bili.rodata.s | 121 --- data/overlays/actors/z_en_blkobj.rodata.s | 29 - data/overlays/actors/z_en_bom.rodata.s | 41 - .../actors/z_en_bom_bowl_man.rodata.s | 66 -- .../actors/z_en_bom_bowl_pit.rodata.s | 25 - data/overlays/actors/z_en_bom_chu.rodata.s | 29 - data/overlays/actors/z_en_bombf.rodata.s | 45 - data/overlays/actors/z_en_box.rodata.s | 73 -- data/overlays/actors/z_en_brob.rodata.s | 25 - data/overlays/actors/z_en_bubble.rodata.s | 49 - data/overlays/actors/z_en_butte.rodata.s | 69 -- data/overlays/actors/z_en_bw.rodata.s | 182 ---- data/overlays/actors/z_en_bx.rodata.s | 35 - data/overlays/actors/z_en_changer.rodata.s | 85 -- data/overlays/actors/z_en_clear_tag.rodata.s | 120 --- data/overlays/actors/z_en_cow.rodata.s | 21 - data/overlays/actors/z_en_crow.rodata.s | 37 - data/overlays/actors/z_en_cs.rodata.s | 37 - data/overlays/actors/z_en_daiku.rodata.s | 39 - .../actors/z_en_daiku_kakariko.rodata.s | 43 - data/overlays/actors/z_en_dekubaba.rodata.s | 121 --- data/overlays/actors/z_en_dekunuts.rodata.s | 21 - data/overlays/actors/z_en_dh.rodata.s | 50 -- data/overlays/actors/z_en_dha.rodata.s | 17 - .../overlays/actors/z_en_diving_game.rodata.s | 49 - data/overlays/actors/z_en_dns.rodata.s | 48 - data/overlays/actors/z_en_dnt_demo.rodata.s | 96 -- data/overlays/actors/z_en_dnt_jiji.rodata.s | 65 -- data/overlays/actors/z_en_dnt_nomal.rodata.s | 107 --- data/overlays/actors/z_en_dodojr.rodata.s | 29 - data/overlays/actors/z_en_dodongo.rodata.s | 103 --- data/overlays/actors/z_en_door.rodata.s | 21 - data/overlays/actors/z_en_du.rodata.s | 38 - data/overlays/actors/z_en_dy_extra.rodata.s | 37 - data/overlays/actors/z_en_eiyer.rodata.s | 37 - data/overlays/actors/z_en_elf.rodata.s | 160 +++- data/overlays/actors/z_en_encount1.rodata.s | 101 --- data/overlays/actors/z_en_encount2.rodata.s | 81 -- data/overlays/actors/z_en_ex_item.rodata.s | 148 --- data/overlays/actors/z_en_ex_ruppy.rodata.s | 71 -- data/overlays/actors/z_en_fd.rodata.s | 77 -- data/overlays/actors/z_en_fd_fire.rodata.s | 39 - data/overlays/actors/z_en_fhg.rodata.s | 162 ---- data/overlays/actors/z_en_fhg_fire.rodata.s | 131 --- data/overlays/actors/z_en_fire_rock.rodata.s | 93 -- data/overlays/actors/z_en_firefly.rodata.s | 43 - data/overlays/actors/z_en_fish.rodata.s | 93 -- data/overlays/actors/z_en_floormas.rodata.s | 79 -- data/overlays/actors/z_en_fr.rodata.s | 134 --- data/overlays/actors/z_en_fu.rodata.s | 18 - data/overlays/actors/z_en_fw.rodata.s | 37 - data/overlays/actors/z_en_fz.rodata.s | 59 -- data/overlays/actors/z_en_g_switch.rodata.s | 139 --- data/overlays/actors/z_en_ganon_mant.rodata.s | 41 - data/overlays/actors/z_en_gb.rodata.s | 16 +- data/overlays/actors/z_en_ge1.rodata.s | 49 - data/overlays/actors/z_en_ge2.rodata.s | 31 - data/overlays/actors/z_en_ge3.rodata.s | 27 - data/overlays/actors/z_en_geldb.rodata.s | 95 -- data/overlays/actors/z_en_girla.rodata.s | 200 ----- data/overlays/actors/z_en_gm.rodata.s | 43 - data/overlays/actors/z_en_go.rodata.s | 52 +- data/overlays/actors/z_en_go2.rodata.s | 52 +- data/overlays/actors/z_en_goma.rodata.s | 115 --- data/overlays/actors/z_en_goroiwa.rodata.s | 87 -- data/overlays/actors/z_en_gs.rodata.s | 123 --- data/overlays/actors/z_en_guest.rodata.s | 53 -- data/overlays/actors/z_en_hata.rodata.s | 19 - data/overlays/actors/z_en_heishi1.rodata.s | 123 --- data/overlays/actors/z_en_heishi2.rodata.s | 127 --- data/overlays/actors/z_en_heishi3.rodata.s | 21 - data/overlays/actors/z_en_heishi4.rodata.s | 43 - data/overlays/actors/z_en_hintnuts.rodata.s | 21 - data/overlays/actors/z_en_holl.rodata.s | 31 - data/overlays/actors/z_en_honotrap.rodata.s | 63 -- data/overlays/actors/z_en_horse.rodata.s | 219 ----- .../actors/z_en_horse_game_check.rodata.s | 21 - .../overlays/actors/z_en_horse_ganon.rodata.s | 13 - .../actors/z_en_horse_link_child.rodata.s | 27 - .../actors/z_en_horse_normal.rodata.s | 67 -- .../overlays/actors/z_en_horse_zelda.rodata.s | 13 - data/overlays/actors/z_en_hs.rodata.s | 30 - data/overlays/actors/z_en_hs2.rodata.s | 22 - data/overlays/actors/z_en_hy.rodata.s | 210 ----- data/overlays/actors/z_en_ice_hono.rodata.s | 81 -- data/overlays/actors/z_en_ik.rodata.s | 178 ---- data/overlays/actors/z_en_in.rodata.s | 96 -- data/overlays/actors/z_en_insect.rodata.s | 149 --- data/overlays/actors/z_en_ishi.rodata.s | 55 -- data/overlays/actors/z_en_jj.rodata.s | 23 - data/overlays/actors/z_en_jsjutan.rodata.s | 48 - data/overlays/actors/z_en_kakasi.rodata.s | 44 - data/overlays/actors/z_en_kakasi2.rodata.s | 61 -- data/overlays/actors/z_en_kakasi3.rodata.s | 46 - data/overlays/actors/z_en_kanban.rodata.s | 94 -- data/overlays/actors/z_en_karebaba.rodata.s | 71 -- data/overlays/actors/z_en_ko.rodata.s | 16 +- data/overlays/actors/z_en_kusa.rodata.s | 47 - data/overlays/actors/z_en_kz.rodata.s | 38 - data/overlays/actors/z_en_light.rodata.s | 37 - data/overlays/actors/z_en_m_thunder.rodata.s | 67 -- data/overlays/actors/z_en_ma1.rodata.s | 72 -- data/overlays/actors/z_en_ma2.rodata.s | 46 - data/overlays/actors/z_en_ma3.rodata.s | 66 -- data/overlays/actors/z_en_mag.rodata.s | 23 - data/overlays/actors/z_en_mb.rodata.s | 59 -- data/overlays/actors/z_en_md.rodata.s | 79 -- data/overlays/actors/z_en_mk.rodata.s | 13 - data/overlays/actors/z_en_mm.rodata.s | 59 -- data/overlays/actors/z_en_mm2.rodata.s | 29 - data/overlays/actors/z_en_mu.rodata.s | 31 - data/overlays/actors/z_en_nb.rodata.s | 99 -- data/overlays/actors/z_en_niw.rodata.s | 80 +- data/overlays/actors/z_en_niw_girl.rodata.s | 55 -- data/overlays/actors/z_en_niw_lady.rodata.s | 122 --- data/overlays/actors/z_en_nwc.rodata.s | 35 - data/overlays/actors/z_en_ny.rodata.s | 79 -- .../overlays/actors/z_en_okarina_tag.rodata.s | 65 -- data/overlays/actors/z_en_okuta.rodata.s | 93 -- data/overlays/actors/z_en_ossan.rodata.s | 363 -------- data/overlays/actors/z_en_owl.rodata.s | 111 --- data/overlays/actors/z_en_part.rodata.s | 82 -- data/overlays/actors/z_en_peehat.rodata.s | 97 -- data/overlays/actors/z_en_po_desert.rodata.s | 27 - data/overlays/actors/z_en_po_field.rodata.s | 110 --- data/overlays/actors/z_en_po_relay.rodata.s | 57 -- data/overlays/actors/z_en_po_sisters.rodata.s | 63 -- data/overlays/actors/z_en_poh.rodata.s | 89 -- data/overlays/actors/z_en_rd.rodata.s | 66 -- data/overlays/actors/z_en_reeba.rodata.s | 67 -- .../overlays/actors/z_en_river_sound.rodata.s | 15 - data/overlays/actors/z_en_rl.rodata.s | 37 - data/overlays/actors/z_en_rr.rodata.s | 142 --- data/overlays/actors/z_en_ru1.rodata.s | 136 --- data/overlays/actors/z_en_sa.rodata.s | 55 -- data/overlays/actors/z_en_sb.rodata.s | 52 -- data/overlays/actors/z_en_sda.rodata.s | 70 -- data/overlays/actors/z_en_shopnuts.rodata.s | 33 - data/overlays/actors/z_en_siofuki.rodata.s | 39 - data/overlays/actors/z_en_skb.rodata.s | 41 - data/overlays/actors/z_en_skj.rodata.s | 12 +- data/overlays/actors/z_en_skjneedle.rodata.s | 21 - data/overlays/actors/z_en_ssh.rodata.s | 31 - data/overlays/actors/z_en_st.rodata.s | 33 - data/overlays/actors/z_en_sth.rodata.s | 47 - data/overlays/actors/z_en_stream.rodata.s | 27 - data/overlays/actors/z_en_sw.rodata.s | 106 --- .../overlays/actors/z_en_syateki_itm.rodata.s | 73 -- .../overlays/actors/z_en_syateki_man.rodata.s | 31 - .../overlays/actors/z_en_syateki_niw.rodata.s | 114 --- data/overlays/actors/z_en_ta.rodata.s | 51 -- data/overlays/actors/z_en_takara_man.rodata.s | 29 - data/overlays/actors/z_en_test.rodata.s | 157 ---- data/overlays/actors/z_en_tg.rodata.s | 31 - data/overlays/actors/z_en_tite.rodata.s | 31 - data/overlays/actors/z_en_torch2.rodata.s | 32 - data/overlays/actors/z_en_toryo.rodata.s | 38 - data/overlays/actors/z_en_tp.rodata.s | 37 - data/overlays/actors/z_en_tr.rodata.s | 45 - data/overlays/actors/z_en_trap.rodata.s | 27 - data/overlays/actors/z_en_vali.rodata.s | 129 --- data/overlays/actors/z_en_vb_ball.rodata.s | 45 - data/overlays/actors/z_en_viewer.rodata.s | 119 --- data/overlays/actors/z_en_vm.rodata.s | 61 -- data/overlays/actors/z_en_wall_tubo.rodata.s | 49 - .../overlays/actors/z_en_weather_tag.rodata.s | 69 -- data/overlays/actors/z_en_weiyer.rodata.s | 31 - data/overlays/actors/z_en_wf.rodata.s | 110 --- .../overlays/actors/z_en_wonder_item.rodata.s | 36 - .../overlays/actors/z_en_wonder_talk.rodata.s | 104 --- .../actors/z_en_wonder_talk2.rodata.s | 139 --- data/overlays/actors/z_en_wood02.rodata.s | 60 -- data/overlays/actors/z_en_xc.rodata.s | 183 ---- .../actors/z_en_yabusame_mark.rodata.s | 69 -- data/overlays/actors/z_en_yukabyun.rodata.s | 25 - data/overlays/actors/z_en_zf.rodata.s | 119 --- data/overlays/actors/z_en_zl1.rodata.s | 39 - data/overlays/actors/z_en_zl2.rodata.s | 152 ---- data/overlays/actors/z_en_zl3.rodata.s | 231 ----- data/overlays/actors/z_en_zl4.rodata.s | 124 --- data/overlays/actors/z_en_zo.rodata.s | 108 --- data/overlays/actors/z_end_title.rodata.s | 43 - data/overlays/actors/z_fishing.rodata.s | 847 ------------------ data/overlays/actors/z_item_b_heart.rodata.s | 31 - data/overlays/actors/z_item_etcetera.rodata.s | 55 -- data/overlays/actors/z_item_ocarina.rodata.s | 33 - data/overlays/actors/z_item_shield.rodata.s | 39 - data/overlays/actors/z_kaleido_scope.rodata.s | 12 +- data/overlays/actors/z_magic_dark.rodata.s | 85 -- data/overlays/actors/z_magic_fire.rodata.s | 35 - data/overlays/actors/z_magic_wind.rodata.s | 61 -- data/overlays/actors/z_mir_ray.rodata.s | 61 -- data/overlays/actors/z_obj_bean.rodata.s | 121 --- data/overlays/actors/z_obj_dekujr.rodata.s | 27 - data/overlays/actors/z_obj_hamishi.rodata.s | 23 - data/overlays/actors/z_obj_hsblock.rodata.s | 35 - data/overlays/actors/z_obj_ice_poly.rodata.s | 25 - data/overlays/actors/z_obj_kibako.rodata.s | 29 - data/overlays/actors/z_obj_kibako2.rodata.s | 23 - data/overlays/actors/z_obj_lift.rodata.s | 33 - .../actors/z_obj_lightswitch.rodata.s | 69 -- .../actors/z_obj_makeoshihiki.rodata.s | 33 - data/overlays/actors/z_obj_mure.rodata.s | 109 --- data/overlays/actors/z_obj_mure2.rodata.s | 17 - data/overlays/actors/z_obj_mure3.rodata.s | 15 - data/overlays/actors/z_obj_oshihiki.rodata.s | 16 +- data/overlays/actors/z_obj_switch.rodata.s | 90 -- data/overlays/actors/z_obj_syokudai.rodata.s | 30 - data/overlays/actors/z_obj_timeblock.rodata.s | 33 - data/overlays/actors/z_obj_tsubo.rodata.s | 37 - .../overlays/actors/z_obj_warp2block.rodata.s | 41 - data/overlays/actors/z_object_kankyo.rodata.s | 124 ++- data/overlays/actors/z_oceff_spot.rodata.s | 53 -- data/overlays/actors/z_oceff_storm.rodata.s | 39 - data/overlays/actors/z_oceff_wipe.rodata.s | 29 - data/overlays/actors/z_oceff_wipe2.rodata.s | 33 - data/overlays/actors/z_oceff_wipe3.rodata.s | 33 - data/overlays/actors/z_oceff_wipe4.rodata.s | 33 - data/overlays/actors/z_player.rodata.s | 332 ------- data/overlays/actors/z_shot_sun.rodata.s | 29 - .../effects/z_effect_ss_blast.rodata.s | 4 +- .../effects/z_effect_ss_bomb.rodata.s | 12 +- .../effects/z_effect_ss_bomb2.rodata.s | 12 +- .../effects/z_effect_ss_bubble.rodata.s | 8 +- .../effects/z_effect_ss_dead_dd.rodata.s | 4 +- .../effects/z_effect_ss_dead_ds.rodata.s | 4 +- .../effects/z_effect_ss_dust.rodata.s | 32 +- .../effects/z_effect_ss_en_fire.rodata.s | 12 +- .../effects/z_effect_ss_en_ice.rodata.s | 12 +- .../effects/z_effect_ss_fcircle.rodata.s | 12 +- .../effects/z_effect_ss_fire_tail.rodata.s | 16 +- .../effects/z_effect_ss_g_magma2.rodata.s | 4 +- .../effects/z_effect_ss_hahen.rodata.s | 24 +- .../effects/z_effect_ss_ice_piece.rodata.s | 12 +- .../effects/z_effect_ss_k_fire.rodata.s | 4 +- .../effects/z_effect_ss_kakera.rodata.s | 32 +- .../effects/z_effect_ss_kirakira.rodata.s | 28 +- .../effects/z_effect_ss_lightning.rodata.s | 12 +- .../effects/z_effect_ss_sibuki.rodata.s | 16 +- .../effects/z_effect_ss_sibuki2.rodata.s | 4 +- .../effects/z_effect_ss_stick.rodata.s | 8 +- .../gamestates/z_file_choose.rodata.s | 22 +- data/overlays/gamestates/z_select.rodata.s | 4 +- include/z64actor.h | 1 - spec | 337 +------ src/code/z_player_call.c | 1 - .../actors/ovl_Arms_Hook/z_arms_hook.c | 6 +- .../actors/ovl_Arms_Hook/z_arms_hook.h | 3 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 - .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 2 - .../actors/ovl_Arrow_Light/z_arrow_light.c | 2 - .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 88 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 192 ++-- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h | 58 ++ .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 22 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 16 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.h | 6 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 13 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h | 5 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 15 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.h | 5 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 11 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h | 5 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 14 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h | 6 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 16 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.h | 5 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 32 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h | 4 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 12 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h | 5 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 34 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 18 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 16 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h | 5 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 11 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h | 6 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 14 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h | 5 +- .../ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c | 36 +- .../ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h | 13 + .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 11 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h | 3 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 14 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h | 4 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 19 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h | 5 +- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 8 +- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h | 5 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 32 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 6 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h | 7 +- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 11 +- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h | 3 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 15 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h | 7 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 21 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h | 5 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 12 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h | 5 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 12 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.h | 3 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 8 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 2 - .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 2 - .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 2 - .../z_bg_hidan_firewall.c | 2 - .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 34 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 2 - .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 2 - .../ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c | 8 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 4 +- .../z_bg_hidan_kowarerukabe.c | 2 - .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 2 - .../z_bg_hidan_rsekizou.c | 2 - .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 2 - .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 2 - .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 102 +-- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h | 16 + .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 8 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 2 - .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 8 +- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h | 4 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 8 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 13 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.h | 4 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 2 - .../z_bg_jya_amishutter.c | 62 +- .../z_bg_jya_amishutter.h | 16 + .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 2 - .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 8 +- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.h | 3 +- .../z_bg_jya_bombchuiwa.c | 2 - .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 2 - .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 2 - .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 2 - .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 8 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 2 - .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 52 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h | 16 + .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 8 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 2 - .../z_bg_jya_zurerukabe.c | 2 - .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 8 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h | 4 +- .../z_bg_menkuri_kaiten.c | 37 +- .../z_bg_menkuri_kaiten.h | 15 + .../z_bg_menkuri_nisekabe.c | 33 +- .../z_bg_menkuri_nisekabe.h | 11 + .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 2 - .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 2 - .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 2 - .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 30 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h | 14 + .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 2 - src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c | 30 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 2 - .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 2 - .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 2 - .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 2 - .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 - .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 2 - .../z_bg_mori_kaitenkabe.c | 2 - .../z_bg_mori_rakkatenjo.c | 2 - .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 2 - .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 2 - .../actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 26 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 8 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 38 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.h | 14 + .../z_bg_spot00_hanebasi.c | 2 - .../z_bg_spot00_hanebasi.h | 4 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 36 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h | 18 + .../z_bg_spot01_idohashira.c | 2 - .../z_bg_spot01_idomizu.c | 9 +- .../z_bg_spot01_idomizu.h | 4 +- .../z_bg_spot01_idosoko.c | 32 +- .../z_bg_spot01_idosoko.h | 14 + .../z_bg_spot01_objects2.c | 12 +- .../z_bg_spot01_objects2.h | 6 +- .../z_bg_spot02_objects.c | 2 - .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 8 +- .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 30 +- .../z_bg_spot06_objects.c | 2 - .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 8 +- .../z_bg_spot08_bakudankabe.c | 8 +- .../z_bg_spot08_iceblock.c | 2 - .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 38 +- .../z_bg_spot11_bakudankabe.c | 8 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 - .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 52 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 44 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 2 - .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 4 +- .../z_bg_spot16_bombstone.c | 2 - .../z_bg_spot16_doughnut.c | 2 - .../z_bg_spot17_bakudankabe.c | 2 - .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 8 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 - .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 38 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h | 14 + .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 2 - .../z_bg_spot18_shutter.c | 2 - .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 2 - .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 2 - .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 34 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 2 - .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 38 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.h | 15 + .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 2 - .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 2 - .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 2 - .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 2 - src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 42 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 2 - src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 2 - src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 2 - .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 2 - .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 2 - .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 2 - .../actors/ovl_Boss_Goma/z_boss_goma.c | 2 - src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 2 - src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 - src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 2 - src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 - src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 2 - src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 2 - src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 2 - .../actors/ovl_Demo_Effect/z_demo_effect.c | 2 - src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 2 - .../actors/ovl_Demo_Geff/z_demo_geff.c | 48 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 2 - src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 4 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 2 - src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 2 - src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 2 - .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 2 - .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 2 - src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 2 - src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 13 +- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h | 4 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 2 - src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 34 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 8 +- .../actors/ovl_Door_Killer/z_door_killer.c | 2 - .../actors/ovl_Door_Shutter/z_door_shutter.c | 2 - .../actors/ovl_Door_Toki/z_door_toki.c | 34 +- .../actors/ovl_Door_Toki/z_door_toki.h | 15 + .../actors/ovl_Door_Warp1/z_door_warp1.c | 2 - .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 2 - src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 2 - src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 2 - src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 2 - src/overlays/actors/ovl_En_Am/z_en_am.c | 8 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 2 - .../actors/ovl_En_Anubice/z_en_anubice.c | 8 +- .../actors/ovl_En_Anubice/z_en_anubice.h | 8 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 8 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 50 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.h | 18 + .../actors/ovl_En_Arow_Trap/z_en_arow_trap.c | 34 +- .../actors/ovl_En_Arow_Trap/z_en_arow_trap.h | 16 + src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 8 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 8 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 8 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 8 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 8 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 - src/overlays/actors/ovl_En_Bili/z_en_bili.c | 2 - src/overlays/actors/ovl_En_Bird/z_en_bird.c | 2 - .../actors/ovl_En_Blkobj/z_en_blkobj.c | 8 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 2 - .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 - .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 2 - .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 2 - src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 2 - src/overlays/actors/ovl_En_Boom/z_en_boom.c | 26 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 2 - src/overlays/actors/ovl_En_Brob/z_en_brob.c | 8 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 2 - src/overlays/actors/ovl_En_Butte/z_en_butte.c | 2 - src/overlays/actors/ovl_En_Bw/z_en_bw.c | 2 - src/overlays/actors/ovl_En_Bx/z_en_bx.c | 2 - .../actors/ovl_En_Changer/z_en_changer.c | 2 - .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 2 - src/overlays/actors/ovl_En_Cow/z_en_cow.c | 8 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 2 - src/overlays/actors/ovl_En_Cs/z_en_cs.c | 2 - src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 2 - .../z_en_daiku_kakariko.c | 2 - .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 2 - .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 8 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 2 - src/overlays/actors/ovl_En_Dha/z_en_dha.c | 8 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 2 - src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 - .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 2 - .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 2 - .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 2 - .../actors/ovl_En_Dodojr/z_en_dodojr.c | 2 - .../actors/ovl_En_Dodongo/z_en_dodongo.c | 2 - src/overlays/actors/ovl_En_Dog/z_en_dog.c | 54 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 8 +- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 2 - src/overlays/actors/ovl_En_Du/z_en_du.c | 2 - .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 - src/overlays/actors/ovl_En_Eg/z_en_eg.c | 48 +- src/overlays/actors/ovl_En_Eg/z_en_eg.h | 14 + src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 2 - src/overlays/actors/ovl_En_Elf/z_en_elf.c | 2 - .../actors/ovl_En_Encount1/z_en_encount1.c | 2 - .../actors/ovl_En_Encount2/z_en_encount2.c | 2 - .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 2 - .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 - src/overlays/actors/ovl_En_Fd/z_en_fd.c | 2 - .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 2 - .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 2 - .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 2 - .../actors/ovl_En_Firefly/z_en_firefly.c | 2 - src/overlays/actors/ovl_En_Fish/z_en_fish.c | 2 - .../actors/ovl_En_Floormas/z_en_floormas.c | 2 - src/overlays/actors/ovl_En_Fr/z_en_fr.c | 2 - src/overlays/actors/ovl_En_Fu/z_en_fu.c | 8 +- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 2 - src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 - .../actors/ovl_En_G_Switch/z_en_g_switch.c | 2 - .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 2 - .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 2 - src/overlays/actors/ovl_En_Gb/z_en_gb.c | 2 - src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 2 - src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 2 - src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 8 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 2 - src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 2 - src/overlays/actors/ovl_En_Gm/z_en_gm.c | 2 - src/overlays/actors/ovl_En_Go/z_en_go.c | 2 - src/overlays/actors/ovl_En_Go2/z_en_go2.c | 2 - src/overlays/actors/ovl_En_Goma/z_en_goma.c | 2 - .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 - src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 - src/overlays/actors/ovl_En_Guest/z_en_guest.c | 2 - src/overlays/actors/ovl_En_Hata/z_en_hata.c | 8 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 2 - .../actors/ovl_En_Heishi2/z_en_heishi2.c | 2 - .../actors/ovl_En_Heishi3/z_en_heishi3.c | 8 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 2 - .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 8 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 2 - .../actors/ovl_En_Honotrap/z_en_honotrap.c | 2 - src/overlays/actors/ovl_En_Horse/z_en_horse.c | 2 - .../z_en_horse_game_check.c | 8 +- .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 8 +- .../z_en_horse_link_child.c | 8 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 2 - .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 8 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 2 - src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 8 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 2 - .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 2 - src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 - src/overlays/actors/ovl_En_In/z_en_in.c | 2 - .../actors/ovl_En_Insect/z_en_insect.c | 2 - src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 - src/overlays/actors/ovl_En_It/z_en_it.c | 40 +- src/overlays/actors/ovl_En_It/z_en_it.h | 15 + src/overlays/actors/ovl_En_Jj/z_en_jj.c | 8 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 2 - .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 2 - .../actors/ovl_En_Kakasi/z_en_kakasi.c | 2 - .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 2 - .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 2 - .../actors/ovl_En_Kanban/z_en_kanban.c | 2 - .../actors/ovl_En_Karebaba/z_en_karebaba.c | 2 - src/overlays/actors/ovl_En_Ko/z_en_ko.c | 2 - src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 - src/overlays/actors/ovl_En_Kz/z_en_kz.c | 2 - src/overlays/actors/ovl_En_Light/z_en_light.c | 2 - .../actors/ovl_En_Lightbox/z_en_lightbox.c | 18 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 38 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.h | 15 + .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 2 - src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 2 - src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 2 - src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 2 - src/overlays/actors/ovl_En_Mag/z_en_mag.c | 8 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 2 - src/overlays/actors/ovl_En_Md/z_en_md.c | 2 - src/overlays/actors/ovl_En_Mk/z_en_mk.c | 8 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 2 - src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 - src/overlays/actors/ovl_En_Ms/z_en_ms.c | 51 +- src/overlays/actors/ovl_En_Ms/z_en_ms.h | 22 + src/overlays/actors/ovl_En_Mu/z_en_mu.c | 2 - src/overlays/actors/ovl_En_Nb/z_en_nb.c | 2 - src/overlays/actors/ovl_En_Niw/z_en_niw.c | 2 - .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 2 - .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 2 - .../actors/ovl_En_Nutsball/z_en_nutsball.c | 26 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 2 - src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 - src/overlays/actors/ovl_En_OE2/z_en_oe2.c | 52 +- src/overlays/actors/ovl_En_OE2/z_en_oe2.h | 14 + .../z_en_okarina_effect.c | 26 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 2 - src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 2 - src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2 - src/overlays/actors/ovl_En_Owl/z_en_owl.c | 2 - src/overlays/actors/ovl_En_Part/z_en_part.c | 2 - .../actors/ovl_En_Peehat/z_en_peehat.c | 2 - .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 8 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 2 - .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 2 - .../ovl_En_Po_Sisters/z_en_po_sisters.c | 2 - src/overlays/actors/ovl_En_Poh/z_en_poh.c | 2 - .../actors/ovl_En_Pu_box/z_en_pu_box.c | 18 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 2 - src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 2 - .../ovl_En_River_Sound/z_en_river_sound.c | 8 +- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 2 - src/overlays/actors/ovl_En_Rr/z_en_rr.c | 2 - src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 2 - src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 196 ++-- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 - src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 - .../ovl_En_Scene_Change/z_en_scene_change.c | 26 +- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 2 - .../actors/ovl_En_Shopnuts/z_en_shopnuts.c | 2 - src/overlays/actors/ovl_En_Si/z_en_si.c | 6 +- src/overlays/actors/ovl_En_Si/z_en_si.h | 3 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 2 - src/overlays/actors/ovl_En_Skb/z_en_skb.c | 2 - src/overlays/actors/ovl_En_Skj/z_en_skj.c | 2 - .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 8 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 2 - src/overlays/actors/ovl_En_St/z_en_st.c | 2 - src/overlays/actors/ovl_En_Sth/z_en_sth.c | 2 - .../actors/ovl_En_Stream/z_en_stream.c | 8 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 2 - .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 2 - .../ovl_En_Syateki_Man/z_en_syateki_man.c | 2 - .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 2 - src/overlays/actors/ovl_En_Ta/z_en_ta.c | 8 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 8 +- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 22 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 41 +- src/overlays/actors/ovl_En_Test/z_en_test.h | 9 +- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 8 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 8 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 - src/overlays/actors/ovl_En_Torch/z_en_torch.c | 24 +- src/overlays/actors/ovl_En_Torch/z_en_torch.h | 13 + .../actors/ovl_En_Torch2/z_en_torch2.c | 8 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 8 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 8 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 8 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 8 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 - src/overlays/actors/ovl_En_Vali/z_en_vali.c | 8 +- src/overlays/actors/ovl_En_Vase/z_en_vase.c | 34 +- src/overlays/actors/ovl_En_Vase/z_en_vase.h | 13 + .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 8 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 8 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 8 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 8 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 113 ++- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 8 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 8 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 8 +- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 8 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 8 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 8 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 8 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 8 +- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 8 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 8 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 8 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 8 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 8 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 8 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 8 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 8 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 2 - .../actors/ovl_End_Title/z_end_title.c | 8 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 8 +- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 8 +- .../ovl_Item_Etcetera/z_item_etcetera.c | 8 +- .../actors/ovl_Item_Inbox/z_item_inbox.c | 43 +- .../actors/ovl_Item_Inbox/z_item_inbox.h | 14 + .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 8 +- .../actors/ovl_Item_Shield/z_item_shield.c | 8 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 8 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 8 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 8 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 8 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 8 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h | 4 +- .../ovl_Obj_Blockstop/z_obj_blockstop.c | 30 +- .../ovl_Obj_Blockstop/z_obj_blockstop.h | 13 + .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 26 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 2 - .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 8 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 38 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 8 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 8 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 8 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.h | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 8 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 8 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 8 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.h | 4 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 8 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h | 4 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 8 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 29 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.h | 17 + .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 8 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 8 +- .../actors/ovl_Obj_Mure2/z_obj_mure2.c | 8 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.c | 8 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 8 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h | 4 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.c | 42 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.h | 16 + .../actors/ovl_Obj_Switch/z_obj_switch.c | 8 +- .../actors/ovl_Obj_Switch/z_obj_switch.h | 4 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 8 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 8 +- .../ovl_Obj_Timeblock/z_obj_timeblock.h | 6 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 8 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.h | 3 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 22 +- .../ovl_Obj_Warp2block/z_obj_warp2block.h | 6 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 11 +- .../ovl_Object_Kankyo/z_object_kankyo.h | 3 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 2 - .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 2 - .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 8 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 8 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h | 3 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 8 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h | 3 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 8 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h | 3 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 8 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h | 4 +- .../ovl_kaleido_scope/z_kaleido_scope.c | 6 + .../actors/ovl_player_actor/z_player.c | 6 + .../gamestates/ovl_opening/z_opening.c | 6 +- tools/decompile_data.py | 172 +++- tools/format_s_files.py | 86 ++ tools/migrate-rodata.py | 304 +++++++ 10327 files changed, 33390 insertions(+), 45661 deletions(-) rename asm/non_matchings/overlays/actors/ovl_Arms_Hook/{func_80864F00.s => ArmsHook_SetupAction.s} (83%) rename asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/{func_8086FBE0.s => BgBreakwall_SetupAction.s} (82%) rename asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/{func_808710F0.s => BgDdanKd_SetupAction.s} (83%) rename asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/{func_80871A00.s => BgDodoago_SetupAction.s} (83%) rename asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/{func_80889960.s => BgHidanKousi_SetupAction.s} (81%) rename asm/non_matchings/overlays/actors/ovl_Bg_Ingate/{func_80892740.s => BgIngate_SetupAction.s} (83%) create mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s create mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s create mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s create mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s create mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s rename asm/non_matchings/overlays/actors/ovl_Demo_Shd/{func_80991230.s => DemoShd_SetupAction.s} (84%) rename asm/non_matchings/overlays/actors/ovl_En_Test/{func_8085F650.s => EnTest_SetupAction.s} (84%) rename asm/non_matchings/overlays/actors/ovl_Object_Kankyo/{func_80BA2AA0.s => ObjectKankyo_SetupAction.s} (81%) delete mode 100644 data/overlays/actors/z_arms_hook.rodata.s delete mode 100644 data/overlays/actors/z_bg_bombwall.rodata.s delete mode 100644 data/overlays/actors/z_bg_bowl_wall.rodata.s delete mode 100644 data/overlays/actors/z_bg_breakwall.rodata.s delete mode 100644 data/overlays/actors/z_bg_ddan_kd.rodata.s delete mode 100644 data/overlays/actors/z_bg_dodoago.rodata.s delete mode 100644 data/overlays/actors/z_bg_dy_yoseizo.rodata.s delete mode 100644 data/overlays/actors/z_bg_ganon_otyuka.rodata.s delete mode 100644 data/overlays/actors/z_bg_gnd_darkmeiro.rodata.s delete mode 100644 data/overlays/actors/z_bg_gnd_firemeiro.rodata.s delete mode 100644 data/overlays/actors/z_bg_gnd_soulmeiro.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_gate.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_huta.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_meganebg.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_sgami.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_ship.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_trap.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_tubo.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_water.rodata.s delete mode 100644 data/overlays/actors/z_bg_haka_zou.rodata.s delete mode 100644 data/overlays/actors/z_bg_heavy_block.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_curtain.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_fwbig.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_hamstep.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_hrock.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_kousi.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_kowarerukabe.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_rock.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_rsekizou.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_sekizou.rodata.s delete mode 100644 data/overlays/actors/z_bg_hidan_sima.rodata.s delete mode 100644 data/overlays/actors/z_bg_ice_objects.rodata.s delete mode 100644 data/overlays/actors/z_bg_ice_shelter.rodata.s delete mode 100644 data/overlays/actors/z_bg_ice_turara.rodata.s delete mode 100644 data/overlays/actors/z_bg_ingate.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_1flift.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_bigmirror.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_block.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_bombchuiwa.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_bombiwa.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_cobra.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_goroiwa.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_haheniron.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_ironobj.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_lift.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_megami.rodata.s delete mode 100644 data/overlays/actors/z_bg_jya_zurerukabe.rodata.s delete mode 100644 data/overlays/actors/z_bg_menkuri_eye.rodata.s delete mode 100644 data/overlays/actors/z_bg_mizu_bwall.rodata.s delete mode 100644 data/overlays/actors/z_bg_mizu_movebg.rodata.s delete mode 100644 data/overlays/actors/z_bg_mizu_shutter.rodata.s delete mode 100644 data/overlays/actors/z_bg_mizu_water.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_bigst.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_elevator.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_hashigo.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_hashira4.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_hineri.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_idomizu.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_kaitenkabe.rodata.s delete mode 100644 data/overlays/actors/z_bg_mori_rakkatenjo.rodata.s delete mode 100644 data/overlays/actors/z_bg_po_event.rodata.s delete mode 100644 data/overlays/actors/z_bg_po_syokudai.rodata.s delete mode 100644 data/overlays/actors/z_bg_relay_objects.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot00_hanebasi.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot01_idohashira.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot01_idomizu.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot01_objects2.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot02_objects.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot03_taki.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot06_objects.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot07_taki.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot08_bakudankabe.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot11_bakudankabe.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot11_oasis.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot15_rrbox.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot16_bombstone.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot16_doughnut.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot17_bakudankabe.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot18_basket.rodata.s delete mode 100644 data/overlays/actors/z_bg_spot18_obj.rodata.s delete mode 100644 data/overlays/actors/z_bg_sst_floor.rodata.s delete mode 100644 data/overlays/actors/z_bg_toki_hikari.rodata.s delete mode 100644 data/overlays/actors/z_bg_treemouth.rodata.s delete mode 100644 data/overlays/actors/z_bg_vb_sima.rodata.s delete mode 100644 data/overlays/actors/z_bg_ydan_hasi.rodata.s delete mode 100644 data/overlays/actors/z_bg_ydan_sp.rodata.s delete mode 100644 data/overlays/actors/z_boss_dodongo.rodata.s delete mode 100644 data/overlays/actors/z_boss_fd.rodata.s delete mode 100644 data/overlays/actors/z_boss_fd2.rodata.s delete mode 100644 data/overlays/actors/z_boss_ganon2.rodata.s delete mode 100644 data/overlays/actors/z_boss_goma.rodata.s delete mode 100644 data/overlays/actors/z_boss_mo.rodata.s delete mode 100644 data/overlays/actors/z_boss_sst.rodata.s delete mode 100644 data/overlays/actors/z_boss_tw.rodata.s delete mode 100644 data/overlays/actors/z_boss_va.rodata.s delete mode 100644 data/overlays/actors/z_demo_6k.rodata.s delete mode 100644 data/overlays/actors/z_demo_du.rodata.s delete mode 100644 data/overlays/actors/z_demo_ec.rodata.s delete mode 100644 data/overlays/actors/z_demo_effect.rodata.s delete mode 100644 data/overlays/actors/z_demo_ext.rodata.s delete mode 100644 data/overlays/actors/z_demo_gj.rodata.s delete mode 100644 data/overlays/actors/z_demo_gt.rodata.s delete mode 100644 data/overlays/actors/z_demo_ik.rodata.s delete mode 100644 data/overlays/actors/z_demo_im.rodata.s delete mode 100644 data/overlays/actors/z_demo_kankyo.rodata.s delete mode 100644 data/overlays/actors/z_demo_kekkai.rodata.s delete mode 100644 data/overlays/actors/z_demo_sa.rodata.s delete mode 100644 data/overlays/actors/z_demo_shd.rodata.s delete mode 100644 data/overlays/actors/z_door_gerudo.rodata.s delete mode 100644 data/overlays/actors/z_door_killer.rodata.s delete mode 100644 data/overlays/actors/z_door_shutter.rodata.s delete mode 100644 data/overlays/actors/z_efc_erupc.rodata.s delete mode 100644 data/overlays/actors/z_eff_dust.rodata.s delete mode 100644 data/overlays/actors/z_elf_msg.rodata.s delete mode 100644 data/overlays/actors/z_elf_msg2.rodata.s delete mode 100644 data/overlays/actors/z_en_am.rodata.s delete mode 100644 data/overlays/actors/z_en_anubice.rodata.s delete mode 100644 data/overlays/actors/z_en_anubice_fire.rodata.s delete mode 100644 data/overlays/actors/z_en_arrow.rodata.s delete mode 100644 data/overlays/actors/z_en_attack_niw.rodata.s delete mode 100644 data/overlays/actors/z_en_ba.rodata.s delete mode 100644 data/overlays/actors/z_en_bb.rodata.s delete mode 100644 data/overlays/actors/z_en_bdfire.rodata.s delete mode 100644 data/overlays/actors/z_en_bigokuta.rodata.s delete mode 100644 data/overlays/actors/z_en_bili.rodata.s delete mode 100644 data/overlays/actors/z_en_blkobj.rodata.s delete mode 100644 data/overlays/actors/z_en_bom.rodata.s delete mode 100644 data/overlays/actors/z_en_bom_bowl_man.rodata.s delete mode 100644 data/overlays/actors/z_en_bom_bowl_pit.rodata.s delete mode 100644 data/overlays/actors/z_en_bom_chu.rodata.s delete mode 100644 data/overlays/actors/z_en_bombf.rodata.s delete mode 100644 data/overlays/actors/z_en_box.rodata.s delete mode 100644 data/overlays/actors/z_en_brob.rodata.s delete mode 100644 data/overlays/actors/z_en_bubble.rodata.s delete mode 100644 data/overlays/actors/z_en_butte.rodata.s delete mode 100644 data/overlays/actors/z_en_bw.rodata.s delete mode 100644 data/overlays/actors/z_en_bx.rodata.s delete mode 100644 data/overlays/actors/z_en_changer.rodata.s delete mode 100644 data/overlays/actors/z_en_clear_tag.rodata.s delete mode 100644 data/overlays/actors/z_en_cow.rodata.s delete mode 100644 data/overlays/actors/z_en_crow.rodata.s delete mode 100644 data/overlays/actors/z_en_cs.rodata.s delete mode 100644 data/overlays/actors/z_en_daiku.rodata.s delete mode 100644 data/overlays/actors/z_en_daiku_kakariko.rodata.s delete mode 100644 data/overlays/actors/z_en_dekubaba.rodata.s delete mode 100644 data/overlays/actors/z_en_dekunuts.rodata.s delete mode 100644 data/overlays/actors/z_en_dh.rodata.s delete mode 100644 data/overlays/actors/z_en_dha.rodata.s delete mode 100644 data/overlays/actors/z_en_diving_game.rodata.s delete mode 100644 data/overlays/actors/z_en_dns.rodata.s delete mode 100644 data/overlays/actors/z_en_dnt_demo.rodata.s delete mode 100644 data/overlays/actors/z_en_dnt_jiji.rodata.s delete mode 100644 data/overlays/actors/z_en_dnt_nomal.rodata.s delete mode 100644 data/overlays/actors/z_en_dodojr.rodata.s delete mode 100644 data/overlays/actors/z_en_dodongo.rodata.s delete mode 100644 data/overlays/actors/z_en_door.rodata.s delete mode 100644 data/overlays/actors/z_en_du.rodata.s delete mode 100644 data/overlays/actors/z_en_dy_extra.rodata.s delete mode 100644 data/overlays/actors/z_en_eiyer.rodata.s delete mode 100644 data/overlays/actors/z_en_encount1.rodata.s delete mode 100644 data/overlays/actors/z_en_encount2.rodata.s delete mode 100644 data/overlays/actors/z_en_ex_item.rodata.s delete mode 100644 data/overlays/actors/z_en_ex_ruppy.rodata.s delete mode 100644 data/overlays/actors/z_en_fd.rodata.s delete mode 100644 data/overlays/actors/z_en_fd_fire.rodata.s delete mode 100644 data/overlays/actors/z_en_fhg.rodata.s delete mode 100644 data/overlays/actors/z_en_fhg_fire.rodata.s delete mode 100644 data/overlays/actors/z_en_fire_rock.rodata.s delete mode 100644 data/overlays/actors/z_en_firefly.rodata.s delete mode 100644 data/overlays/actors/z_en_fish.rodata.s delete mode 100644 data/overlays/actors/z_en_floormas.rodata.s delete mode 100644 data/overlays/actors/z_en_fr.rodata.s delete mode 100644 data/overlays/actors/z_en_fu.rodata.s delete mode 100644 data/overlays/actors/z_en_fw.rodata.s delete mode 100644 data/overlays/actors/z_en_fz.rodata.s delete mode 100644 data/overlays/actors/z_en_g_switch.rodata.s delete mode 100644 data/overlays/actors/z_en_ganon_mant.rodata.s delete mode 100644 data/overlays/actors/z_en_ge1.rodata.s delete mode 100644 data/overlays/actors/z_en_ge2.rodata.s delete mode 100644 data/overlays/actors/z_en_ge3.rodata.s delete mode 100644 data/overlays/actors/z_en_geldb.rodata.s delete mode 100644 data/overlays/actors/z_en_girla.rodata.s delete mode 100644 data/overlays/actors/z_en_gm.rodata.s delete mode 100644 data/overlays/actors/z_en_goma.rodata.s delete mode 100644 data/overlays/actors/z_en_goroiwa.rodata.s delete mode 100644 data/overlays/actors/z_en_gs.rodata.s delete mode 100644 data/overlays/actors/z_en_guest.rodata.s delete mode 100644 data/overlays/actors/z_en_hata.rodata.s delete mode 100644 data/overlays/actors/z_en_heishi1.rodata.s delete mode 100644 data/overlays/actors/z_en_heishi2.rodata.s delete mode 100644 data/overlays/actors/z_en_heishi3.rodata.s delete mode 100644 data/overlays/actors/z_en_heishi4.rodata.s delete mode 100644 data/overlays/actors/z_en_hintnuts.rodata.s delete mode 100644 data/overlays/actors/z_en_holl.rodata.s delete mode 100644 data/overlays/actors/z_en_honotrap.rodata.s delete mode 100644 data/overlays/actors/z_en_horse.rodata.s delete mode 100644 data/overlays/actors/z_en_horse_game_check.rodata.s delete mode 100644 data/overlays/actors/z_en_horse_ganon.rodata.s delete mode 100644 data/overlays/actors/z_en_horse_link_child.rodata.s delete mode 100644 data/overlays/actors/z_en_horse_normal.rodata.s delete mode 100644 data/overlays/actors/z_en_horse_zelda.rodata.s delete mode 100644 data/overlays/actors/z_en_hs.rodata.s delete mode 100644 data/overlays/actors/z_en_hs2.rodata.s delete mode 100644 data/overlays/actors/z_en_hy.rodata.s delete mode 100644 data/overlays/actors/z_en_ice_hono.rodata.s delete mode 100644 data/overlays/actors/z_en_ik.rodata.s delete mode 100644 data/overlays/actors/z_en_in.rodata.s delete mode 100644 data/overlays/actors/z_en_insect.rodata.s delete mode 100644 data/overlays/actors/z_en_ishi.rodata.s delete mode 100644 data/overlays/actors/z_en_jj.rodata.s delete mode 100644 data/overlays/actors/z_en_jsjutan.rodata.s delete mode 100644 data/overlays/actors/z_en_kakasi.rodata.s delete mode 100644 data/overlays/actors/z_en_kakasi2.rodata.s delete mode 100644 data/overlays/actors/z_en_kakasi3.rodata.s delete mode 100644 data/overlays/actors/z_en_kanban.rodata.s delete mode 100644 data/overlays/actors/z_en_karebaba.rodata.s delete mode 100644 data/overlays/actors/z_en_kusa.rodata.s delete mode 100644 data/overlays/actors/z_en_kz.rodata.s delete mode 100644 data/overlays/actors/z_en_light.rodata.s delete mode 100644 data/overlays/actors/z_en_m_thunder.rodata.s delete mode 100644 data/overlays/actors/z_en_ma1.rodata.s delete mode 100644 data/overlays/actors/z_en_ma2.rodata.s delete mode 100644 data/overlays/actors/z_en_ma3.rodata.s delete mode 100644 data/overlays/actors/z_en_mag.rodata.s delete mode 100644 data/overlays/actors/z_en_mb.rodata.s delete mode 100644 data/overlays/actors/z_en_md.rodata.s delete mode 100644 data/overlays/actors/z_en_mk.rodata.s delete mode 100644 data/overlays/actors/z_en_mm.rodata.s delete mode 100644 data/overlays/actors/z_en_mm2.rodata.s delete mode 100644 data/overlays/actors/z_en_mu.rodata.s delete mode 100644 data/overlays/actors/z_en_nb.rodata.s delete mode 100644 data/overlays/actors/z_en_niw_girl.rodata.s delete mode 100644 data/overlays/actors/z_en_niw_lady.rodata.s delete mode 100644 data/overlays/actors/z_en_nwc.rodata.s delete mode 100644 data/overlays/actors/z_en_ny.rodata.s delete mode 100644 data/overlays/actors/z_en_okarina_tag.rodata.s delete mode 100644 data/overlays/actors/z_en_okuta.rodata.s delete mode 100644 data/overlays/actors/z_en_ossan.rodata.s delete mode 100644 data/overlays/actors/z_en_owl.rodata.s delete mode 100644 data/overlays/actors/z_en_part.rodata.s delete mode 100644 data/overlays/actors/z_en_peehat.rodata.s delete mode 100644 data/overlays/actors/z_en_po_desert.rodata.s delete mode 100644 data/overlays/actors/z_en_po_field.rodata.s delete mode 100644 data/overlays/actors/z_en_po_relay.rodata.s delete mode 100644 data/overlays/actors/z_en_po_sisters.rodata.s delete mode 100644 data/overlays/actors/z_en_poh.rodata.s delete mode 100644 data/overlays/actors/z_en_rd.rodata.s delete mode 100644 data/overlays/actors/z_en_reeba.rodata.s delete mode 100644 data/overlays/actors/z_en_river_sound.rodata.s delete mode 100644 data/overlays/actors/z_en_rl.rodata.s delete mode 100644 data/overlays/actors/z_en_rr.rodata.s delete mode 100644 data/overlays/actors/z_en_ru1.rodata.s delete mode 100644 data/overlays/actors/z_en_sa.rodata.s delete mode 100644 data/overlays/actors/z_en_sb.rodata.s delete mode 100644 data/overlays/actors/z_en_sda.rodata.s delete mode 100644 data/overlays/actors/z_en_shopnuts.rodata.s delete mode 100644 data/overlays/actors/z_en_siofuki.rodata.s delete mode 100644 data/overlays/actors/z_en_skb.rodata.s delete mode 100644 data/overlays/actors/z_en_skjneedle.rodata.s delete mode 100644 data/overlays/actors/z_en_ssh.rodata.s delete mode 100644 data/overlays/actors/z_en_st.rodata.s delete mode 100644 data/overlays/actors/z_en_sth.rodata.s delete mode 100644 data/overlays/actors/z_en_stream.rodata.s delete mode 100644 data/overlays/actors/z_en_sw.rodata.s delete mode 100644 data/overlays/actors/z_en_syateki_itm.rodata.s delete mode 100644 data/overlays/actors/z_en_syateki_man.rodata.s delete mode 100644 data/overlays/actors/z_en_syateki_niw.rodata.s delete mode 100644 data/overlays/actors/z_en_ta.rodata.s delete mode 100644 data/overlays/actors/z_en_takara_man.rodata.s delete mode 100644 data/overlays/actors/z_en_test.rodata.s delete mode 100644 data/overlays/actors/z_en_tg.rodata.s delete mode 100644 data/overlays/actors/z_en_tite.rodata.s delete mode 100644 data/overlays/actors/z_en_torch2.rodata.s delete mode 100644 data/overlays/actors/z_en_toryo.rodata.s delete mode 100644 data/overlays/actors/z_en_tp.rodata.s delete mode 100644 data/overlays/actors/z_en_tr.rodata.s delete mode 100644 data/overlays/actors/z_en_trap.rodata.s delete mode 100644 data/overlays/actors/z_en_vali.rodata.s delete mode 100644 data/overlays/actors/z_en_vb_ball.rodata.s delete mode 100644 data/overlays/actors/z_en_viewer.rodata.s delete mode 100644 data/overlays/actors/z_en_vm.rodata.s delete mode 100644 data/overlays/actors/z_en_wall_tubo.rodata.s delete mode 100644 data/overlays/actors/z_en_weather_tag.rodata.s delete mode 100644 data/overlays/actors/z_en_weiyer.rodata.s delete mode 100644 data/overlays/actors/z_en_wf.rodata.s delete mode 100644 data/overlays/actors/z_en_wonder_item.rodata.s delete mode 100644 data/overlays/actors/z_en_wonder_talk.rodata.s delete mode 100644 data/overlays/actors/z_en_wonder_talk2.rodata.s delete mode 100644 data/overlays/actors/z_en_wood02.rodata.s delete mode 100644 data/overlays/actors/z_en_xc.rodata.s delete mode 100644 data/overlays/actors/z_en_yabusame_mark.rodata.s delete mode 100644 data/overlays/actors/z_en_yukabyun.rodata.s delete mode 100644 data/overlays/actors/z_en_zf.rodata.s delete mode 100644 data/overlays/actors/z_en_zl1.rodata.s delete mode 100644 data/overlays/actors/z_en_zl2.rodata.s delete mode 100644 data/overlays/actors/z_en_zl3.rodata.s delete mode 100644 data/overlays/actors/z_en_zl4.rodata.s delete mode 100644 data/overlays/actors/z_en_zo.rodata.s delete mode 100644 data/overlays/actors/z_end_title.rodata.s delete mode 100644 data/overlays/actors/z_fishing.rodata.s delete mode 100644 data/overlays/actors/z_item_b_heart.rodata.s delete mode 100644 data/overlays/actors/z_item_etcetera.rodata.s delete mode 100644 data/overlays/actors/z_item_ocarina.rodata.s delete mode 100644 data/overlays/actors/z_item_shield.rodata.s delete mode 100644 data/overlays/actors/z_magic_dark.rodata.s delete mode 100644 data/overlays/actors/z_magic_fire.rodata.s delete mode 100644 data/overlays/actors/z_magic_wind.rodata.s delete mode 100644 data/overlays/actors/z_mir_ray.rodata.s delete mode 100644 data/overlays/actors/z_obj_bean.rodata.s delete mode 100644 data/overlays/actors/z_obj_dekujr.rodata.s delete mode 100644 data/overlays/actors/z_obj_hamishi.rodata.s delete mode 100644 data/overlays/actors/z_obj_hsblock.rodata.s delete mode 100644 data/overlays/actors/z_obj_ice_poly.rodata.s delete mode 100644 data/overlays/actors/z_obj_kibako.rodata.s delete mode 100644 data/overlays/actors/z_obj_kibako2.rodata.s delete mode 100644 data/overlays/actors/z_obj_lift.rodata.s delete mode 100644 data/overlays/actors/z_obj_lightswitch.rodata.s delete mode 100644 data/overlays/actors/z_obj_makeoshihiki.rodata.s delete mode 100644 data/overlays/actors/z_obj_mure.rodata.s delete mode 100644 data/overlays/actors/z_obj_mure2.rodata.s delete mode 100644 data/overlays/actors/z_obj_mure3.rodata.s delete mode 100644 data/overlays/actors/z_obj_switch.rodata.s delete mode 100644 data/overlays/actors/z_obj_syokudai.rodata.s delete mode 100644 data/overlays/actors/z_obj_timeblock.rodata.s delete mode 100644 data/overlays/actors/z_obj_tsubo.rodata.s delete mode 100644 data/overlays/actors/z_obj_warp2block.rodata.s delete mode 100644 data/overlays/actors/z_oceff_spot.rodata.s delete mode 100644 data/overlays/actors/z_oceff_storm.rodata.s delete mode 100644 data/overlays/actors/z_oceff_wipe.rodata.s delete mode 100644 data/overlays/actors/z_oceff_wipe2.rodata.s delete mode 100644 data/overlays/actors/z_oceff_wipe3.rodata.s delete mode 100644 data/overlays/actors/z_oceff_wipe4.rodata.s delete mode 100644 data/overlays/actors/z_player.rodata.s delete mode 100644 data/overlays/actors/z_shot_sun.rodata.s create mode 100644 src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h create mode 100644 src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h create mode 100644 src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h create mode 100644 src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h create mode 100644 src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h create mode 100644 src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h create mode 100644 src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h create mode 100644 src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h create mode 100644 src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h create mode 100644 src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h create mode 100644 src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h create mode 100644 src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h create mode 100644 src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h create mode 100644 src/overlays/actors/ovl_Door_Toki/z_door_toki.h create mode 100644 src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h create mode 100644 src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h create mode 100644 src/overlays/actors/ovl_En_Eg/z_en_eg.h create mode 100644 src/overlays/actors/ovl_En_It/z_en_it.h create mode 100644 src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h create mode 100644 src/overlays/actors/ovl_En_Ms/z_en_ms.h create mode 100644 src/overlays/actors/ovl_En_OE2/z_en_oe2.h create mode 100644 src/overlays/actors/ovl_En_Torch/z_en_torch.h create mode 100644 src/overlays/actors/ovl_En_Vase/z_en_vase.h create mode 100644 src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h create mode 100644 src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h create mode 100644 src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h create mode 100644 src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h mode change 100644 => 100755 tools/decompile_data.py create mode 100644 tools/format_s_files.py create mode 100644 tools/migrate-rodata.py diff --git a/asm/non_matchings/code/fault/Fault_AddAddrConvClient.s b/asm/non_matchings/code/fault/Fault_AddAddrConvClient.s index e23ae6fe47..c0cb23de61 100644 --- a/asm/non_matchings/code/fault/Fault_AddAddrConvClient.s +++ b/asm/non_matchings/code/fault/Fault_AddAddrConvClient.s @@ -1,5 +1,4 @@ .rdata - glabel D_80146DD4 .asciz "\x1b[41;37mfault_AddressConverterAddClient: %08x は既にリスト中にある\n\x1b[m" .balign 4 diff --git a/asm/non_matchings/code/fault/Fault_DrawStackTrace.s b/asm/non_matchings/code/fault/Fault_DrawStackTrace.s index 2f1cb3b011..cdf138ae96 100644 --- a/asm/non_matchings/code/fault/Fault_DrawStackTrace.s +++ b/asm/non_matchings/code/fault/Fault_DrawStackTrace.s @@ -1,5 +1,4 @@ .rdata - glabel D_801472D0 .asciz "SP PC (VPC)" .balign 4 diff --git a/asm/non_matchings/code/fault/Fault_LogStackTrace.s b/asm/non_matchings/code/fault/Fault_LogStackTrace.s index 3064136655..1dde4f0eab 100644 --- a/asm/non_matchings/code/fault/Fault_LogStackTrace.s +++ b/asm/non_matchings/code/fault/Fault_LogStackTrace.s @@ -1,6 +1,4 @@ .rdata - - glabel D_80147300 .asciz "STACK TRACE\nSP PC (VPC)\n" .balign 4 @@ -15,7 +13,6 @@ glabel D_80147340 .balign 4 .text - glabel Fault_LogStackTrace /* B4CEA8 800D5D08 3C08FFFA */ lui $t0, (0xFFFA5A5A >> 16) # lui $t0, 0xfffa /* B4CEAC 800D5D0C 03A04825 */ move $t1, $sp diff --git a/asm/non_matchings/code/fault/Fault_ThreadEntry.s b/asm/non_matchings/code/fault/Fault_ThreadEntry.s index fcde0106d2..b641dd3da1 100644 --- a/asm/non_matchings/code/fault/Fault_ThreadEntry.s +++ b/asm/non_matchings/code/fault/Fault_ThreadEntry.s @@ -1,5 +1,4 @@ .rdata - glabel D_80147368 .asciz "フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n" .balign 4 diff --git a/asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s b/asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s index 3746e5cc4d..be4d0f60a9 100644 --- a/asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s +++ b/asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s @@ -14,7 +14,6 @@ glabel jtbl_8014753C .rdata - glabel D_801471F8 .asciz "\x1B[37mKeyWaitB (ＬＲＺ \x1B[37m上\x1B[33m下 \x1B[33m上\x1B[37m下 \x1B[37m左\x1B[33m左 \x1B[33m右\x1B[37m右 \x1B[32mＢ\x1B[34mＡ\x1B[31mSTART\x1B[37m)\x1B[m\n" .balign 4 diff --git a/asm/non_matchings/code/graph/Graph_Update.s b/asm/non_matchings/code/graph/Graph_Update.s index 7bab0b0c32..d2e097af76 100644 --- a/asm/non_matchings/code/graph/Graph_Update.s +++ b/asm/non_matchings/code/graph/Graph_Update.s @@ -126,7 +126,6 @@ glabel D_801454DC .balign 4 .text - glabel Graph_Update /* B3D378 800C61D8 27BDFF38 */ addiu $sp, $sp, -0xc8 /* B3D37C 800C61DC AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/z_camera/func_80046CB4.s b/asm/non_matchings/code/z_camera/func_80046CB4.s index 6d6e9600a8..ab7dd5b850 100644 --- a/asm/non_matchings/code/z_camera/func_80046CB4.s +++ b/asm/non_matchings/code/z_camera/func_80046CB4.s @@ -6,7 +6,7 @@ glabel D_80139E78 .float 0.00003051851 glabel D_80139E7C - .float 0.01 + .float 0.01 .text glabel func_80046CB4 diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s index 8faf76f4a8..4a79459344 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s @@ -17,5 +17,3 @@ glabel ArmsHook_Destroy /* 000B8 80864FB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000BC 80864FBC 03E00008 */ jr $ra /* 000C0 80864FC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s index dc9c29e734..f1b89f6a59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s @@ -1,3 +1,28 @@ +.rdata +glabel D_80865BC0 + .asciz "../z_arms_hook.c" + .balign 4 + +glabel D_80865BD4 + .asciz "../z_arms_hook.c" + .balign 4 + +glabel D_80865BE8 + .asciz "../z_arms_hook.c" + .balign 4 + +glabel D_80865BFC + .asciz "../z_arms_hook.c" + .balign 4 + +.late_rodata +glabel D_80865C14 + .float 0.015 + +glabel D_80865C18 + .float 0.01 + +.text glabel ArmsHook_Draw /* 00930 80865830 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00934 80865834 AFBF0024 */ sw $ra, 0x0024($sp) @@ -177,4 +202,3 @@ glabel ArmsHook_Draw /* 00BD4 80865AD4 00000000 */ nop /* 00BD8 80865AD8 00000000 */ nop /* 00BDC 80865ADC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s index be8f82e31b..e294000e73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s @@ -16,7 +16,7 @@ glabel ArmsHook_Init /* 00040 80864F40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00044 80864F44 3C058086 */ lui $a1, %hi(func_80864FC4) ## $a1 = 80860000 /* 00048 80864F48 24A54FC4 */ addiu $a1, $a1, %lo(func_80864FC4) ## $a1 = 80864FC4 -/* 0004C 80864F4C 0C2193C0 */ jal func_80864F00 +/* 0004C 80864F4C 0C2193C0 */ jal ArmsHook_SetupAction /* 00050 80864F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00054 80864F54 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 /* 00058 80864F58 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 @@ -29,5 +29,3 @@ glabel ArmsHook_Init /* 00074 80864F74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00078 80864F78 03E00008 */ jr $ra /* 0007C 80864F7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864F00.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s similarity index 83% rename from asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864F00.s rename to asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s index 66a660c051..44574725f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864F00.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_80864F00 +glabel ArmsHook_SetupAction /* 00000 80864F00 03E00008 */ jr $ra /* 00004 80864F04 AC850214 */ sw $a1, 0x0214($a0) ## 00000214 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Update.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Update.s index 9a775cb259..5dfcc94995 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Update.s @@ -16,5 +16,3 @@ glabel ArmsHook_Update /* 00924 80865824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00928 80865828 03E00008 */ jr $ra /* 0092C 8086582C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864FC4.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864FC4.s index 856aa8bf5e..baeb8ec091 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864FC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864FC4.s @@ -17,7 +17,7 @@ glabel func_80864FC4 /* 00100 80865000 2402000D */ addiu $v0, $zero, 0x000D ## $v0 = 0000000D .L80865004: /* 00104 80865004 AFA20018 */ sw $v0, 0x0018($sp) -/* 00108 80865008 0C2193C0 */ jal func_80864F00 +/* 00108 80865008 0C2193C0 */ jal ArmsHook_SetupAction /* 0010C 8086500C AFA40020 */ sw $a0, 0x0020($sp) /* 00110 80865010 8FA40020 */ lw $a0, 0x0020($sp) /* 00114 80865014 0C00B669 */ jal func_8002D9A4 @@ -33,5 +33,3 @@ glabel func_80864FC4 /* 00138 80865038 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0013C 8086503C 03E00008 */ jr $ra /* 00140 80865040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865044.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865044.s index e2c48487af..8c424ecedb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865044.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865044.s @@ -3,5 +3,3 @@ glabel func_80865044 /* 00148 80865048 AC82011C */ sw $v0, 0x011C($a0) ## 0000011C /* 0014C 8086504C 03E00008 */ jr $ra /* 00150 80865050 AC440118 */ sw $a0, 0x0118($v0) ## 00000118 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865054.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865054.s index 9da2e46c18..f7a97d2f3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865054.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865054.s @@ -12,5 +12,3 @@ glabel func_80865054 .L8086507C: /* 0017C 8086507C 03E00008 */ jr $ra /* 00180 80865080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865084.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865084.s index 96079a3aa2..6e1f553d97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865084.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865084.s @@ -10,5 +10,3 @@ glabel func_80865084 .L808650A4: /* 001A4 808650A4 03E00008 */ jr $ra /* 001A8 808650A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_808650AC.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_808650AC.s index 53fffa0a91..f7fbc03034 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_808650AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_808650AC.s @@ -42,5 +42,3 @@ glabel func_808650AC /* 0023C 8086513C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00240 80865140 03E00008 */ jr $ra /* 00244 80865144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865148.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865148.s index ef127d0269..4a51b8569d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865148.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865148.s @@ -17,5 +17,3 @@ glabel func_80865148 /* 00280 80865180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00284 80865184 03E00008 */ jr $ra /* 00288 80865188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s index 1c6724b61c..3d905b55f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80865C10 + .float 3.051851E-5 + +.text glabel func_8086518C /* 0028C 8086518C 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 00290 80865190 AFBF0034 */ sw $ra, 0x0034($sp) @@ -272,7 +277,7 @@ glabel func_8086518C /* 0064C 8086554C 00000000 */ nop /* 00650 80865550 450200A2 */ bc1fl .L808657DC /* 00654 80865554 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00658 80865558 0C2193C0 */ jal func_80864F00 +/* 00658 80865558 0C2193C0 */ jal ArmsHook_SetupAction /* 0065C 8086555C 24A54FC4 */ addiu $a1, $a1, %lo(func_80864FC4) ## $a1 = 80864FC4 /* 00660 80865560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00664 80865564 0C219415 */ jal func_80865054 @@ -452,5 +457,3 @@ glabel func_8086518C /* 008E0 808657E0 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 /* 008E4 808657E4 03E00008 */ jr $ra /* 008E8 808657E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Destroy.s index bca6064e5b..c2b6efa11e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Destroy.s @@ -7,5 +7,3 @@ glabel BgBombwall_Destroy /* 00380 8086EB50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00384 8086EB54 03E00008 */ jr $ra /* 00388 8086EB58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s index 359ce2a803..13de407f98 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s @@ -11,4 +11,3 @@ glabel BgBombwall_Draw /* 00744 8086EF14 03E00008 */ jr $ra /* 00748 8086EF18 00000000 */ nop /* 0074C 8086EF1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s index cd145422f9..c234949605 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8086F088 + .asciz "(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n" + .balign 4 + +.text glabel BgBombwall_Init /* 000CC 8086E89C 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 000D0 8086E8A0 AFB30044 */ sw $s3, 0x0044($sp) @@ -146,5 +152,3 @@ glabel BgBombwall_Init /* 002E4 8086EAB4 8FBE0058 */ lw $s8, 0x0058($sp) /* 002E8 8086EAB8 03E00008 */ jr $ra /* 002EC 8086EABC 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Update.s index 978de67584..48ebb6518b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Update.s @@ -11,5 +11,3 @@ glabel BgBombwall_Update /* 00718 8086EEE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0071C 8086EEEC 03E00008 */ jr $ra /* 00720 8086EEF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E7D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E7D0.s index 4b7454052a..9fc5516514 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E7D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E7D0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8086F040 + .asciz "Warning : move BG 登録失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8086F074 + .asciz "../z_bg_bombwall.c" + .balign 4 + +.text glabel func_8086E7D0 /* 00000 8086E7D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00004 8086E7D4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -36,5 +46,3 @@ glabel func_8086E7D0 /* 00074 8086E844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00078 8086E848 03E00008 */ jr $ra /* 0007C 8086E84C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E850.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E850.s index 55cb31d792..1ec15d63c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E850.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E850.s @@ -18,5 +18,3 @@ glabel func_8086E850 /* 000C0 8086E890 460A4401 */ sub.s $f16, $f8, $f10 /* 000C4 8086E894 03E00008 */ jr $ra /* 000C8 8086E898 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s index ada0dd61e2..57283a2099 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s @@ -33,5 +33,3 @@ glabel func_8086EAC0 /* 00360 8086EB30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00364 8086EB34 03E00008 */ jr $ra /* 00368 8086EB38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s index 6a2fc37a01..cb4aaceb6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s @@ -129,5 +129,3 @@ glabel func_8086EB5C /* 00574 8086ED44 8FB50060 */ lw $s5, 0x0060($sp) /* 00578 8086ED48 03E00008 */ jr $ra /* 0057C 8086ED4C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED50.s index bd4c2f8ef1..9de75d5300 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED50.s @@ -7,5 +7,3 @@ glabel func_8086ED50 /* 00594 8086ED64 AC8E029C */ sw $t6, 0x029C($a0) ## 0000029C /* 00598 8086ED68 03E00008 */ jr $ra /* 0059C 8086ED6C AC8F0298 */ sw $t7, 0x0298($a0) ## 00000298 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s index 1a6dc4665a..43f75a9f07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s @@ -38,5 +38,3 @@ glabel func_8086ED70 /* 00620 8086EDF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00624 8086EDF4 03E00008 */ jr $ra /* 00628 8086EDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EDFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EDFC.s index 9f59750e64..09d803e2d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EDFC.s @@ -16,5 +16,3 @@ glabel func_8086EDFC /* 00664 8086EE34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00668 8086EE38 03E00008 */ jr $ra /* 0066C 8086EE3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE40.s index 3fa20ee9a7..e47bc84b9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE40.s @@ -23,5 +23,3 @@ glabel func_8086EE40 /* 006B8 8086EE88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006BC 8086EE8C 03E00008 */ jr $ra /* 006C0 8086EE90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE94.s index e21d6d0031..0c0192e9df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE94.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE94.s @@ -12,5 +12,3 @@ glabel func_8086EE94 /* 006EC 8086EEBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006F0 8086EEC0 03E00008 */ jr $ra /* 006F4 8086EEC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s index 0f406b8227..42672db818 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s @@ -12,5 +12,3 @@ glabel BgBowlWall_Destroy /* 000F4 8086F254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000F8 8086F258 03E00008 */ jr $ra /* 000FC 8086F25C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s index 7aee86f05a..9233059466 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8086FAD4 + .asciz "../z_bg_bowl_wall.c" + .balign 4 + +glabel D_8086FAE8 + .asciz "../z_bg_bowl_wall.c" + .balign 4 + +glabel D_8086FAFC + .asciz "../z_bg_bowl_wall.c" + .balign 4 + +.text glabel BgBowlWall_Draw /* 00764 8086F8C4 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00768 8086F8C8 AFB10020 */ sw $s1, 0x0020($sp) @@ -88,4 +102,3 @@ glabel BgBowlWall_Draw /* 008B4 8086FA14 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 008B8 8086FA18 00000000 */ nop /* 008BC 8086FA1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s index d29f578869..855e45854f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8086FA90 + .asciz "\n\n" + .balign 4 + +glabel D_8086FA94 + .asciz " ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel BgBowlWall_Init /* 00000 8086F160 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 8086F164 AFBF001C */ sw $ra, 0x001C($sp) @@ -59,5 +69,3 @@ glabel BgBowlWall_Init /* 000C4 8086F224 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000C8 8086F228 03E00008 */ jr $ra /* 000CC 8086F22C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Update.s index bea0efd9bb..88ddb7ca33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Update.s @@ -13,5 +13,3 @@ glabel BgBowlWall_Update /* 00758 8086F8B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0075C 8086F8BC 03E00008 */ jr $ra /* 00760 8086F8C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s index 3acd47598b..9c3110d898 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8086FAD0 + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel D_8086FB10 + .float 2.990000009536743 + +.text glabel func_8086F260 /* 00100 8086F260 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00104 8086F264 AFBF003C */ sw $ra, 0x003C($sp) @@ -129,5 +139,3 @@ glabel func_8086F260 /* 002D4 8086F434 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 002D8 8086F438 03E00008 */ jr $ra /* 002DC 8086F43C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F440.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F440.s index 3cf790cd85..a0c8f2ee1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F440.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F440.s @@ -9,5 +9,3 @@ glabel func_8086F440 .L8086F45C: /* 002FC 8086F45C 03E00008 */ jr $ra /* 00300 8086F460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s index bcb159579e..4b8a426c1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s @@ -182,5 +182,3 @@ glabel func_8086F464 /* 005AC 8086F70C 8FB60070 */ lw $s6, 0x0070($sp) /* 005B0 8086F710 03E00008 */ jr $ra /* 005B4 8086F714 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F718.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F718.s index 86b8f3138c..472c5d7a83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F718.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F718.s @@ -61,5 +61,3 @@ glabel func_8086F718 /* 0068C 8086F7EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00690 8086F7F0 03E00008 */ jr $ra /* 00694 8086F7F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s index c5674b784b..d06e3dd848 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s @@ -40,5 +40,3 @@ glabel func_8086F7F8 /* 00724 8086F884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00728 8086F888 03E00008 */ jr $ra /* 0072C 8086F88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Destroy.s index a8bad00493..8e92aa1dae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Destroy.s @@ -12,5 +12,3 @@ glabel BgBreakwall_Destroy /* 001D4 8086FDB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001D8 8086FDB8 03E00008 */ jr $ra /* 001DC 8086FDBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s index 9168882f41..c1354f3bf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s @@ -113,7 +113,7 @@ glabel BgBreakwall_Init /* 0018C 8086FD6C 10000004 */ beq $zero, $zero, .L8086FD80 /* 00190 8086FD70 8FBF001C */ lw $ra, 0x001C($sp) .L8086FD74: -/* 00194 8086FD74 0C21BEF8 */ jal func_8086FBE0 +/* 00194 8086FD74 0C21BEF8 */ jal BgBreakwall_SetupAction /* 00198 8086FD78 24A50290 */ addiu $a1, $a1, %lo(func_80870290) ## $a1 = 00000290 /* 0019C 8086FD7C 8FBF001C */ lw $ra, 0x001C($sp) .L8086FD80: @@ -121,5 +121,3 @@ glabel BgBreakwall_Init /* 001A4 8086FD84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001A8 8086FD88 03E00008 */ jr $ra /* 001AC 8086FD8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FBE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_SetupAction.s similarity index 82% rename from asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FBE0.s rename to asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_SetupAction.s index 136ccae192..fcd30581c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FBE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_8086FBE0 +glabel BgBreakwall_SetupAction /* 00000 8086FBE0 03E00008 */ jr $ra /* 00004 8086FBE4 AC8501EC */ sw $a1, 0x01EC($a0) ## 000001EC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Update.s index 3a9fd114a8..f8b26f6e58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Update.s @@ -8,5 +8,3 @@ glabel BgBreakwall_Update /* 009EC 808705CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009F0 808705D0 03E00008 */ jr $ra /* 009F4 808705D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s index f439c5cdd5..bc388211a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_808709AC + .float 3500.0 + +glabel D_808709B0 + .float 0.001 + +glabel D_808709B4 + .float 0.6 + +glabel D_808709B8 + .float 3000.0 + +.text glabel func_8086FDC0 /* 001E0 8086FDC0 27BDFE08 */ addiu $sp, $sp, 0xFE08 ## $sp = FFFFFE08 /* 001E4 8086FDC4 3C0F8087 */ lui $t7, %hi(D_808707F0) ## $t7 = 80870000 @@ -332,5 +346,3 @@ glabel func_8086FDC0 /* 006A4 80870284 8FBE0080 */ lw $s8, 0x0080($sp) /* 006A8 80870288 03E00008 */ jr $ra /* 006AC 8087028C 27BD01F8 */ addiu $sp, $sp, 0x01F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870290.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870290.s index 29da897ce3..5cb10395bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870290.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870290.s @@ -56,13 +56,13 @@ glabel func_80870290 /* 00778 80870358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0077C 8087035C 3C058087 */ lui $a1, %hi(func_80870564) ## $a1 = 80870000 /* 00780 80870360 24A50564 */ addiu $a1, $a1, %lo(func_80870564) ## $a1 = 80870564 -/* 00784 80870364 0C21BEF8 */ jal func_8086FBE0 +/* 00784 80870364 0C21BEF8 */ jal BgBreakwall_SetupAction /* 00788 80870368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0078C 8087036C 10000005 */ beq $zero, $zero, .L80870384 /* 00790 80870370 8FBF001C */ lw $ra, 0x001C($sp) .L80870374: /* 00794 80870374 3C058087 */ lui $a1, %hi(func_80870394) ## $a1 = 80870000 -/* 00798 80870378 0C21BEF8 */ jal func_8086FBE0 +/* 00798 80870378 0C21BEF8 */ jal BgBreakwall_SetupAction /* 0079C 8087037C 24A50394 */ addiu $a1, $a1, %lo(func_80870394) ## $a1 = 80870394 /* 007A0 80870380 8FBF001C */ lw $ra, 0x001C($sp) .L80870384: @@ -70,5 +70,3 @@ glabel func_80870290 /* 007A8 80870388 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 007AC 8087038C 03E00008 */ jr $ra /* 007B0 80870390 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s index 283b969130..87c39fed67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808709BC + .float 6.400000095367432 + +.text glabel func_80870394 /* 007B4 80870394 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 007B8 80870398 AFBF002C */ sw $ra, 0x002C($sp) @@ -132,5 +137,3 @@ glabel func_80870394 /* 00978 80870558 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0097C 8087055C 03E00008 */ jr $ra /* 00980 80870560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s index 0999d7d29f..9b46cbe2e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s @@ -20,5 +20,3 @@ glabel func_80870564 /* 009C8 808705A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009CC 808705AC 03E00008 */ jr $ra /* 009D0 808705B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s index d6c5276a5e..71728daff3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80870970 + .asciz "../z_bg_breakwall.c" + .balign 4 + +glabel D_80870984 + .asciz "../z_bg_breakwall.c" + .balign 4 + +glabel D_80870998 + .asciz "../z_bg_breakwall.c" + .balign 4 + +.text glabel func_808705D8 /* 009F8 808705D8 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 009FC 808705DC AFBF0034 */ sw $ra, 0x0034($sp) @@ -93,4 +107,3 @@ glabel func_808705D8 /* 00B54 80870734 03E00008 */ jr $ra /* 00B58 80870738 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 00B5C 8087073C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s index ea38716221..5b15588a33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s @@ -12,5 +12,3 @@ glabel BgDdanJd_Destroy /* 000CC 80870B7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D0 80870B80 03E00008 */ jr $ra /* 000D4 80870B84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s index 85f336795e..983cc4395d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s @@ -14,4 +14,3 @@ glabel BgDdanJd_Draw /* 005A4 80871054 00000000 */ nop /* 005A8 80871058 00000000 */ nop /* 005AC 8087105C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s index d719016f48..3f74a3ceb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s @@ -48,5 +48,3 @@ glabel BgDdanJd_Init /* 0009C 80870B4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000A0 80870B50 03E00008 */ jr $ra /* 000A4 80870B54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s index d7d9591bc9..a546d766c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s @@ -8,5 +8,3 @@ glabel BgDdanJd_Update /* 0056C 8087101C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00570 80871020 03E00008 */ jr $ra /* 00574 80871024 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s index db6f9b8eab..a0a0d0f21d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s @@ -115,5 +115,3 @@ glabel func_80870B88 /* 00270 80870D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00274 80870D24 03E00008 */ jr $ra /* 00278 80870D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s index 96fa587277..be2925fdea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s @@ -123,5 +123,3 @@ glabel func_80870D2C /* 00444 80870EF4 8FB10028 */ lw $s1, 0x0028($sp) /* 00448 80870EF8 03E00008 */ jr $ra /* 0044C 80870EFC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s index 984412e99b..a6301bfd9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s @@ -72,5 +72,3 @@ glabel func_80870F00 /* 00548 80870FF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0054C 80870FFC 03E00008 */ jr $ra /* 00550 80871000 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s index c819b78d5a..882c100847 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s @@ -19,5 +19,3 @@ glabel BgDdanKd_Destroy /* 00138 80871228 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0013C 8087122C 03E00008 */ jr $ra /* 00140 80871230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s index cbee6f2623..9ae3f99a29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s @@ -14,4 +14,3 @@ glabel BgDdanKd_Draw /* 007A4 80871894 00000000 */ nop /* 007A8 80871898 00000000 */ nop /* 007AC 8087189C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s index 6d076cfe26..03ad58232e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s @@ -47,7 +47,7 @@ glabel BgDdanKd_Init /* 000A0 80871190 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 000A4 80871194 3C058087 */ lui $a1, %hi(func_80871234) ## $a1 = 80870000 /* 000A8 80871198 24A51234 */ addiu $a1, $a1, %lo(func_80871234) ## $a1 = 80871234 -/* 000AC 8087119C 0C21C43C */ jal func_808710F0 +/* 000AC 8087119C 0C21C43C */ jal BgDdanKd_SetupAction /* 000B0 808711A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000B4 808711A4 1000000D */ beq $zero, $zero, .L808711DC /* 000B8 808711A8 8FBF001C */ lw $ra, 0x001C($sp) @@ -61,7 +61,7 @@ glabel BgDdanKd_Init /* 000D4 808711C4 24A51838 */ addiu $a1, $a1, %lo(func_80871838) ## $a1 = 80871838 /* 000D8 808711C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000DC 808711CC 460A4401 */ sub.s $f16, $f8, $f10 -/* 000E0 808711D0 0C21C43C */ jal func_808710F0 +/* 000E0 808711D0 0C21C43C */ jal BgDdanKd_SetupAction /* 000E4 808711D4 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 000E8 808711D8 8FBF001C */ lw $ra, 0x001C($sp) .L808711DC: @@ -69,5 +69,3 @@ glabel BgDdanKd_Init /* 000F0 808711E0 8FB10018 */ lw $s1, 0x0018($sp) /* 000F4 808711E4 03E00008 */ jr $ra /* 000F8 808711E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_808710F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_SetupAction.s similarity index 83% rename from asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_808710F0.s rename to asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_SetupAction.s index d44c434a73..9941fcb62f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_808710F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_808710F0 +glabel BgDdanKd_SetupAction /* 00000 808710F0 03E00008 */ jr $ra /* 00004 808710F4 AC8501C4 */ sw $a1, 0x01C4($a0) ## 000001C4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s index 03e561b2a4..5fbd83d6f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s @@ -8,5 +8,3 @@ glabel BgDdanKd_Update /* 0076C 8087185C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00770 80871860 03E00008 */ jr $ra /* 00774 80871864 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s index 33b2f03e99..6187c874a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80871920 + .asciz "dam %d\n" + .balign 4 + +.text glabel func_80871234 /* 00144 80871234 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00148 80871238 AFB00020 */ sw $s0, 0x0020($sp) @@ -39,7 +45,7 @@ glabel func_80871234 /* 001CC 808712BC 3C058087 */ lui $a1, %hi(func_80871364) ## $a1 = 80870000 /* 001D0 808712C0 4502000C */ bc1fl .L808712F4 /* 001D4 808712C4 86020168 */ lh $v0, 0x0168($s0) ## 00000168 -/* 001D8 808712C8 0C21C43C */ jal func_808710F0 +/* 001D8 808712C8 0C21C43C */ jal BgDdanKd_SetupAction /* 001DC 808712CC 24A51364 */ addiu $a1, $a1, %lo(func_80871364) ## $a1 = 80871364 /* 001E0 808712D0 8FA40034 */ lw $a0, 0x0034($sp) /* 001E4 808712D4 24050BEA */ addiu $a1, $zero, 0x0BEA ## $a1 = 00000BEA @@ -85,5 +91,3 @@ glabel func_80871234 /* 00268 80871358 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0026C 8087135C 03E00008 */ jr $ra /* 00270 80871360 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s index 17d9b1cdbb..fedf8c7109 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8087192C + .float 0.007499999832361937 + +glabel D_80871930 + .float 0.6 + +.text glabel func_80871364 /* 00274 80871364 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00278 80871368 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -49,7 +57,7 @@ glabel func_80871364 /* 00324 80871414 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00328 80871418 3C058087 */ lui $a1, %hi(func_80871838) ## $a1 = 80870000 /* 0032C 8087141C 24A51838 */ addiu $a1, $a1, %lo(func_80871838) ## $a1 = 80871838 -/* 00330 80871420 0C21C43C */ jal func_808710F0 +/* 00330 80871420 0C21C43C */ jal BgDdanKd_SetupAction /* 00334 80871424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00338 80871428 100000FF */ beq $zero, $zero, .L80871828 /* 0033C 8087142C 8FBF002C */ lw $ra, 0x002C($sp) @@ -330,5 +338,3 @@ glabel func_80871364 /* 0073C 8087182C 8FB10028 */ lw $s1, 0x0028($sp) /* 00740 80871830 03E00008 */ jr $ra /* 00744 80871834 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871838.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871838.s index 537ea00807..59106d0fdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871838.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871838.s @@ -2,5 +2,3 @@ glabel func_80871838 /* 00748 80871838 AFA40000 */ sw $a0, 0x0000($sp) /* 0074C 8087183C 03E00008 */ jr $ra /* 00750 80871840 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s index 87c86035d9..5f0546e8ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s @@ -30,5 +30,3 @@ glabel BgDodoago_Destroy /* 002E8 80871CE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002EC 80871CEC 03E00008 */ jr $ra /* 002F0 80871CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s index 02080d0489..4d969375df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80872650 + .asciz "../z_bg_dodoago.c" + .balign 4 + +glabel D_80872664 + .asciz "../z_bg_dodoago.c" + .balign 4 + +glabel D_80872678 + .asciz "../z_bg_dodoago.c" + .balign 4 + +.text glabel BgDodoago_Draw /* 00A40 80872440 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00A44 80872444 AFBF001C */ sw $ra, 0x001C($sp) @@ -57,4 +71,3 @@ glabel BgDodoago_Draw /* 00B14 80872514 00000000 */ nop /* 00B18 80872518 00000000 */ nop /* 00B1C 8087251C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s index e656aaecd1..ef85405bb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s @@ -42,7 +42,7 @@ glabel BgDodoago_Init /* 001B0 80871BB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001B4 80871BB4 3C058087 */ lui $a1, %hi(func_8087227C) ## $a1 = 80870000 /* 001B8 80871BB8 24A5227C */ addiu $a1, $a1, %lo(func_8087227C) ## $a1 = 8087227C -/* 001BC 80871BBC 0C21C680 */ jal func_80871A00 +/* 001BC 80871BBC 0C21C680 */ jal BgDodoago_SetupAction /* 001C0 80871BC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C4 80871BC4 240E1333 */ addiu $t6, $zero, 0x1333 ## $t6 = 00001333 /* 001C8 80871BC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -91,7 +91,7 @@ glabel BgDodoago_Init /* 00258 80871C58 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0025C 80871C5C 3C058087 */ lui $a1, %hi(func_80871CF4) ## $a1 = 80870000 /* 00260 80871C60 24A51CF4 */ addiu $a1, $a1, %lo(func_80871CF4) ## $a1 = 80871CF4 -/* 00264 80871C64 0C21C680 */ jal func_80871A00 +/* 00264 80871C64 0C21C680 */ jal BgDodoago_SetupAction /* 00268 80871C68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0026C 80871C6C 3C018087 */ lui $at, %hi(D_808727C0) ## $at = 80870000 /* 00270 80871C70 A02027C0 */ sb $zero, %lo(D_808727C0)($at) @@ -101,5 +101,3 @@ glabel BgDodoago_Init /* 0027C 80871C7C 8FB10018 */ lw $s1, 0x0018($sp) /* 00280 80871C80 03E00008 */ jr $ra /* 00284 80871C84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_SetupAction.s similarity index 83% rename from asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A00.s rename to asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_SetupAction.s index 6b0a7cc1bc..3c7cbb79d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A00.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_80871A00 +glabel BgDodoago_SetupAction /* 00000 80871A00 03E00008 */ jr $ra /* 00004 80871A04 AC85024C */ sw $a1, 0x024C($a0) ## 0000024C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s index faccb75ae6..da6beb8c2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s @@ -93,5 +93,3 @@ glabel BgDodoago_Update /* 00A34 80872434 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A38 80872438 03E00008 */ jr $ra /* 00A3C 8087243C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s index 811afa4706..274fc98004 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s @@ -75,5 +75,3 @@ glabel func_80871A08 /* 0011C 80871B1C 8FB70048 */ lw $s7, 0x0048($sp) /* 00120 80871B20 03E00008 */ jr $ra /* 00124 80871B24 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s index a076e5f462..c2b78cde02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s @@ -62,7 +62,7 @@ glabel func_80871CF4 /* 003C8 80871DC8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 003CC 80871DCC 3C058087 */ lui $a1, %hi(func_80871FB8) ## $a1 = 80870000 /* 003D0 80871DD0 24A51FB8 */ addiu $a1, $a1, %lo(func_80871FB8) ## $a1 = 80871FB8 -/* 003D4 80871DD4 0C21C680 */ jal func_80871A00 +/* 003D4 80871DD4 0C21C680 */ jal BgDodoago_SetupAction /* 003D8 80871DD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003DC 80871DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003E0 80871DE0 24050D34 */ addiu $a1, $zero, 0x0D34 ## $a1 = 00000D34 @@ -101,7 +101,7 @@ glabel func_80871CF4 /* 00458 80871E58 AFA00010 */ sw $zero, 0x0010($sp) /* 0045C 80871E5C 3C058087 */ lui $a1, %hi(func_80872288) ## $a1 = 80870000 /* 00460 80871E60 24A52288 */ addiu $a1, $a1, %lo(func_80872288) ## $a1 = 80872288 -/* 00464 80871E64 0C21C680 */ jal func_80871A00 +/* 00464 80871E64 0C21C680 */ jal BgDodoago_SetupAction /* 00468 80871E68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0046C 80871E6C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00470 80871E70 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 @@ -198,5 +198,3 @@ glabel func_80871CF4 /* 005AC 80871FAC 8FB10020 */ lw $s1, 0x0020($sp) /* 005B0 80871FB0 03E00008 */ jr $ra /* 005B4 80871FB4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s index 17ed5ad5b4..3df900725f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s @@ -153,7 +153,7 @@ glabel func_80871FB8 /* 007F0 808721F0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 007F4 808721F4 3C058087 */ lui $a1, %hi(func_8087227C) ## $a1 = 80870000 /* 007F8 808721F8 24A5227C */ addiu $a1, $a1, %lo(func_8087227C) ## $a1 = 8087227C -/* 007FC 808721FC 0C21C680 */ jal func_80871A00 +/* 007FC 808721FC 0C21C680 */ jal BgDodoago_SetupAction /* 00800 80872200 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00804 80872204 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00808 80872208 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 @@ -190,5 +190,3 @@ glabel func_80871FB8 /* 00870 80872270 8FB40040 */ lw $s4, 0x0040($sp) /* 00874 80872274 03E00008 */ jr $ra /* 00878 80872278 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_8087227C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_8087227C.s index 7412faf2d7..534c243b1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_8087227C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_8087227C.s @@ -2,5 +2,3 @@ glabel func_8087227C /* 0087C 8087227C AFA40000 */ sw $a0, 0x0000($sp) /* 00880 80872280 03E00008 */ jr $ra /* 00884 80872284 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80872288.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80872288.s index a08164b682..d49767e6c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80872288.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80872288.s @@ -18,12 +18,10 @@ glabel func_80872288 /* 008C8 808722C8 3C058087 */ lui $a1, %hi(func_80871CF4) ## $a1 = 80870000 /* 008CC 808722CC 55A10004 */ bnel $t5, $at, .L808722E0 /* 008D0 808722D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008D4 808722D4 0C21C680 */ jal func_80871A00 +/* 008D4 808722D4 0C21C680 */ jal BgDodoago_SetupAction /* 008D8 808722D8 24A51CF4 */ addiu $a1, $a1, %lo(func_80871CF4) ## $a1 = 80871CF4 /* 008DC 808722DC 8FBF0014 */ lw $ra, 0x0014($sp) .L808722E0: /* 008E0 808722E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008E4 808722E4 03E00008 */ jr $ra /* 008E8 808722E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s index a7775c4e4d..639427f7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s @@ -2,5 +2,3 @@ glabel BgDyYoseizo_Destroy /* 00124 80872954 AFA40000 */ sw $a0, 0x0000($sp) /* 00128 80872958 03E00008 */ jr $ra /* 0012C 8087295C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s index 5a5caa2575..5b828b30e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808754E0 + .asciz "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80875510 + .asciz "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel BgDyYoseizo_Init /* 00000 80872830 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80872834 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -77,5 +87,3 @@ glabel BgDyYoseizo_Init /* 00118 80872948 8FB00024 */ lw $s0, 0x0024($sp) /* 0011C 8087294C 03E00008 */ jr $ra /* 00120 80872950 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s index f7704c7df2..4d2133a596 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756B4 + .float 7500.0 + +.text glabel BgDyYoseizo_Update /* 02120 80874950 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02124 80874954 AFBF002C */ sw $ra, 0x002C($sp) @@ -158,5 +163,3 @@ glabel BgDyYoseizo_Update /* 02340 80874B70 8FB10028 */ lw $s1, 0x0028($sp) /* 02344 80874B74 03E00008 */ jr $ra /* 02348 80874B78 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s index 7e020bc85d..f505647dda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80875680 + .float 0.01 + +glabel D_80875684 + .float 3500.0 + +glabel D_80875688 + .float 0.4 + +glabel D_8087568C + .float 0.2 + +glabel D_80875690 + .float 0.1 + +.text glabel func_80872960 /* 00130 80872960 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00134 80872964 3C0F8087 */ lui $t7, %hi(D_808754A4) ## $t7 = 80870000 @@ -202,5 +219,3 @@ glabel func_80872960 /* 0041C 80872C4C 8FBE0080 */ lw $s8, 0x0080($sp) /* 00420 80872C50 03E00008 */ jr $ra /* 00424 80872C54 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s index 6aba634764..f10631e02a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80875694 + .float 0.4 + + .text glabel func_80872C58 /* 00428 80872C58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0042C 80872C5C AFBF001C */ sw $ra, 0x001C($sp) @@ -55,5 +60,3 @@ glabel func_80872C58 /* 004E4 80872D14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004E8 80872D18 03E00008 */ jr $ra /* 004EC 80872D1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s index f819cea16d..d63fdcd4e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s @@ -55,5 +55,3 @@ glabel func_80872D20 /* 005A8 80872DD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005AC 80872DDC 03E00008 */ jr $ra /* 005B0 80872DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s index 8964fd11aa..45a5aad217 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s @@ -1,3 +1,22 @@ +.rdata + +glabel D_80875540 + .asciz "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_8087556C + .asciz " ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_808755A0 + .asciz " ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_808755D8 + .asciz " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80872DE4 /* 005B4 80872DE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 005B8 80872DE8 AFA40020 */ sw $a0, 0x0020($sp) @@ -325,5 +344,3 @@ glabel func_80872DE4 /* 00A50 80873280 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A54 80873284 03E00008 */ jr $ra /* 00A58 80873288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s index 6c658a7e21..e5101dc187 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s @@ -67,5 +67,3 @@ glabel func_8087328C /* 00B44 80873374 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B48 80873378 03E00008 */ jr $ra /* 00B4C 8087337C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s index d8bf2cd6a1..7cd26bde4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80875698 + .float 0.03400000184774399 + +.text glabel func_80873380 /* 00B50 80873380 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00B54 80873384 AFB00020 */ sw $s0, 0x0020($sp) @@ -96,5 +101,3 @@ glabel func_80873380 /* 00CA0 808734D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CA4 808734D4 03E00008 */ jr $ra /* 00CA8 808734D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s index 9342364f1f..5ccb38078d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8087569C + .float 1273.0 + +.text glabel func_808734DC /* 00CAC 808734DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00CB0 808734E0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -46,5 +51,3 @@ glabel func_808734DC /* 00D50 80873580 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D54 80873584 03E00008 */ jr $ra /* 00D58 80873588 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s index 17c6d208c4..db837c87ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s @@ -75,5 +75,3 @@ glabel func_8087358C /* 00E68 80873698 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E6C 8087369C 03E00008 */ jr $ra /* 00E70 808736A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s index 6d7bf47ab4..e0ac22e3e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756A0 + .word 0x449F2000 + +.text glabel func_808736A4 /* 00E74 808736A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00E78 808736A8 AFB00014 */ sw $s0, 0x0014($sp) @@ -57,5 +62,3 @@ glabel func_808736A4 /* 00F44 80873774 8FB10018 */ lw $s1, 0x0018($sp) /* 00F48 80873778 03E00008 */ jr $ra /* 00F4C 8087377C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s index 01b2aa2ed7..8671568316 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s @@ -64,5 +64,3 @@ glabel func_80873780 /* 0102C 8087385C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01030 80873860 03E00008 */ jr $ra /* 01034 80873864 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s index eb3fe58ff3..9bc178af74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756A4 + .float 1300.0 + + .text glabel func_80873868 /* 01038 80873868 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0103C 8087386C AFBF003C */ sw $ra, 0x003C($sp) @@ -202,5 +207,3 @@ glabel func_80873868 /* 01300 80873B30 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01304 80873B34 03E00008 */ jr $ra /* 01308 80873B38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s index 3242bab569..fd599b025a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s @@ -56,5 +56,3 @@ glabel func_80873B3C /* 013D8 80873C08 8FB10018 */ lw $s1, 0x0018($sp) /* 013DC 80873C0C 03E00008 */ jr $ra /* 013E0 80873C10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s index 5c6eb75b40..e4b4229f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s @@ -71,5 +71,3 @@ glabel func_80873C14 /* 014D8 80873D08 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 014DC 80873D0C 03E00008 */ jr $ra /* 014E0 80873D10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s index bacd529a20..970fbcb526 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756A8 + .float 0.003000000026077032 + +.text glabel func_80873D14 /* 014E4 80873D14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 014E8 80873D18 AFB00018 */ sw $s0, 0x0018($sp) @@ -67,5 +72,3 @@ glabel func_80873D14 /* 015C8 80873DF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 015CC 80873DFC 03E00008 */ jr $ra /* 015D0 80873E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s index 0d98cadbbc..b550b676a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s @@ -48,5 +48,3 @@ glabel func_80873E04 /* 01668 80873E98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0166C 80873E9C 03E00008 */ jr $ra /* 01670 80873EA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s index 13878182de..99a6882b34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s @@ -85,5 +85,3 @@ glabel func_80873EA4 /* 0179C 80873FCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 017A0 80873FD0 03E00008 */ jr $ra /* 017A4 80873FD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s index ae03c4c71b..f50b1bfe74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756AC + .float 0.03400000184774399 + + .text glabel func_80873FD8 /* 017A8 80873FD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 017AC 80873FDC AFBF002C */ sw $ra, 0x002C($sp) @@ -227,5 +232,3 @@ glabel func_80873FD8 /* 01AC8 808742F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01ACC 808742FC 03E00008 */ jr $ra /* 01AD0 80874300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s index 4f76771ce1..fe84e82977 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756B0 + .float 0.3 + + .text glabel func_80874304 /* 01AD4 80874304 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01AD8 80874308 AFBF003C */ sw $ra, 0x003C($sp) @@ -444,5 +449,3 @@ glabel func_80874304 /* 02114 80874944 8FB10038 */ lw $s1, 0x0038($sp) /* 02118 80874948 03E00008 */ jr $ra /* 0211C 8087494C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s index 974d23ce1d..a4b963d76b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s @@ -26,5 +26,3 @@ glabel func_80874B7C .L80874BD8: /* 023A8 80874BD8 03E00008 */ jr $ra /* 023AC 80874BDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s index af87f8020f..c1ef522b10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80875608 + .asciz "../z_bg_dy_yoseizo.c" + .balign 4 + +glabel D_80875620 + .asciz "../z_bg_dy_yoseizo.c" + .balign 4 + +.text glabel func_80874BE0 /* 023B0 80874BE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 023B4 80874BE4 AFB10028 */ sw $s1, 0x0028($sp) @@ -111,5 +121,3 @@ glabel func_80874BE0 /* 02560 80874D90 8FB10028 */ lw $s1, 0x0028($sp) /* 02564 80874D94 03E00008 */ jr $ra /* 02568 80874D98 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s index e5376e3582..42f3493e51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808756B8 + .float 30000.0 + + .text glabel func_80874D9C /* 0256C 80874D9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02570 80874DA0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -71,5 +76,3 @@ glabel func_80874D9C /* 02670 80874EA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02674 80874EA4 03E00008 */ jr $ra /* 02678 80874EA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s index 98b4126784..c87d4f91d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_808756BC + .float 5000.0 + + glabel D_808756C0 + .float 0.9 + + glabel D_808756C4 + .float 3000.0 + + glabel D_808756C8 + .float 3.14159274101 + + glabel D_808756CC + .float 3.14159274101 + + .text glabel func_80874EAC /* 0267C 80874EAC 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 02680 80874EB0 F7BE0040 */ sdc1 $f30, 0x0040($sp) @@ -200,5 +217,3 @@ glabel func_80874EAC /* 02964 80875194 8FBE0068 */ lw $s8, 0x0068($sp) /* 02968 80875198 03E00008 */ jr $ra /* 0296C 8087519C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s index 2a15dfd8b5..1f3a256181 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80875638 + .asciz "../z_bg_dy_yoseizo.c" + .balign 4 + +glabel D_80875650 + .asciz "../z_bg_dy_yoseizo.c" + .balign 4 + +glabel D_80875668 + .asciz "../z_bg_dy_yoseizo.c" + .balign 4 + +.text glabel func_808751A0 /* 02970 808751A0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 02974 808751A4 AFBF0044 */ sw $ra, 0x0044($sp) @@ -170,4 +184,3 @@ glabel func_808751A0 /* 02C04 80875434 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 02C08 80875438 00000000 */ nop /* 02C0C 8087543C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Destroy.s index b299f743ef..343f34f0aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Destroy.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80877EC0 + .asciz "\x1b[32m" + .balign 4 + +glabel D_80877EC8 + .asciz "WHY !!!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80877EE0 + .asciz "\x1b[m" + .balign 4 + +.text glabel BgGanonOtyuka_Destroy /* 00098 808759B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0009C 808759BC AFA40018 */ sw $a0, 0x0018($sp) @@ -24,5 +38,3 @@ glabel BgGanonOtyuka_Destroy /* 000E0 80875A00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E4 80875A04 03E00008 */ jr $ra /* 000E8 80875A08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s index 846ffe67a6..8196f82c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s @@ -1,3 +1,35 @@ +.rdata +glabel D_80877F24 + .asciz "../z_bg_ganon_otyuka.c" + .balign 4 + +glabel D_80877F3C + .asciz "../z_bg_ganon_otyuka.c" + .balign 4 + +glabel D_80877F54 + .asciz "../z_bg_ganon_otyuka.c" + .balign 4 + +glabel D_80877F6C + .asciz "../z_bg_ganon_otyuka.c" + .balign 4 + +glabel D_80877F84 + .asciz "../z_bg_ganon_otyuka.c" + .balign 4 + +.late_rodata +glabel D_80877FAC + .float 3.1415927 + + glabel D_80877FB0 + .float 3.1415927 + + glabel D_80877FB4 + .float 0.3 + +.text glabel BgGanonOtyuka_Draw /* 00810 80876130 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 00814 80876134 AFA400E0 */ sw $a0, 0x00E0($sp) @@ -615,4 +647,3 @@ glabel BgGanonOtyuka_Draw /* 01114 80876A34 00000000 */ nop /* 01118 80876A38 00000000 */ nop /* 0111C 80876A3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Init.s index aadc2aa903..be5e059852 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Init.s @@ -43,5 +43,3 @@ glabel BgGanonOtyuka_Init /* 0008C 808759AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00090 808759B0 03E00008 */ jr $ra /* 00094 808759B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Update.s index 4002cf6b1d..e918d05048 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Update.s @@ -18,5 +18,3 @@ glabel BgGanonOtyuka_Update /* 00804 80876124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00808 80876128 03E00008 */ jr $ra /* 0080C 8087612C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875A0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875A0C.s index 7733830808..9b31297b9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875A0C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80877EE4 + .asciz "OTC O 1\n" + .balign 4 + +glabel D_80877EF0 + .asciz "OTC O 2\n" + .balign 4 + +glabel D_80877EFC + .asciz "OTC O 3\n" + .balign 4 + +.late_rodata +glabel D_80877F9C + .float 4900.0 + +.text glabel func_80875A0C /* 000EC 80875A0C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 000F0 80875A10 AFBF003C */ sw $ra, 0x003C($sp) @@ -174,5 +192,3 @@ glabel func_80875A0C /* 0035C 80875C7C 8FB60038 */ lw $s6, 0x0038($sp) /* 00360 80875C80 03E00008 */ jr $ra /* 00364 80875C84 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s index 3ffc278b7a..bb17578418 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80877F08 + .asciz "MODE DOWN\n" + .balign 4 + +glabel D_80877F14 + .asciz "MODE DOWN END\n" + .balign 4 + +.late_rodata +glabel D_80877FA0 + .float -750.0 + +glabel D_80877FA4 + .float 0.1 + +glabel D_80877FA8 + .float -750.0 + +.text glabel func_80875C88 /* 00368 80875C88 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0036C 80875C8C AFB10040 */ sw $s1, 0x0040($sp) @@ -311,5 +331,3 @@ glabel func_80875C88 /* 007B0 808760D0 8FB10040 */ lw $s1, 0x0040($sp) /* 007B4 808760D4 03E00008 */ jr $ra /* 007B8 808760D8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_808760DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_808760DC.s index 47bbd13d77..9d5f945c8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_808760DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_808760DC.s @@ -2,5 +2,3 @@ glabel func_808760DC /* 007BC 808760DC AFA40000 */ sw $a0, 0x0000($sp) /* 007C0 808760E0 03E00008 */ jr $ra /* 007C4 808760E4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Destroy.s index 3c3037dee8..10334161a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Destroy.s @@ -17,5 +17,3 @@ glabel BgGndDarkmeiro_Destroy /* 002EC 80878F1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F0 80878F20 03E00008 */ jr $ra /* 002F4 80878F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Init.s index 984e8da5d9..a9d3e20c52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Init.s @@ -156,5 +156,3 @@ glabel BgGndDarkmeiro_Init /* 002AC 80878EDC 8FB10018 */ lw $s1, 0x0018($sp) /* 002B0 80878EE0 03E00008 */ jr $ra /* 002B4 80878EE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Update.s index ea9b6ad728..db72c9925c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/BgGndDarkmeiro_Update.s @@ -8,5 +8,3 @@ glabel BgGndDarkmeiro_Update /* 00580 808791B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00584 808791B4 03E00008 */ jr $ra /* 00588 808791B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878C30.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878C30.s index fc76784b3f..45fa547a06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878C30.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878C30.s @@ -38,5 +38,3 @@ glabel func_80878C30 /* 00084 80878CB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00088 80878CB8 03E00008 */ jr $ra /* 0008C 80878CBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F28.s index 05ce71748a..d0698a8603 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F28.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F28.s @@ -2,5 +2,3 @@ glabel func_80878F28 /* 002F8 80878F28 AFA40000 */ sw $a0, 0x0000($sp) /* 002FC 80878F2C 03E00008 */ jr $ra /* 00300 80878F30 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s index db0f8c8536..706f7fb04d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s @@ -145,5 +145,3 @@ glabel func_80878F34 /* 004EC 8087911C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004F0 80879120 03E00008 */ jr $ra /* 004F4 80879124 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879128.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879128.s index 92fc07cdf3..775ef428c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879128.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879128.s @@ -2,5 +2,3 @@ glabel func_80879128 /* 004F8 80879128 AFA40000 */ sw $a0, 0x0000($sp) /* 004FC 8087912C 03E00008 */ jr $ra /* 00500 80879130 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879134.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879134.s index 2214eb5755..7c80ceccd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879134.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879134.s @@ -27,5 +27,3 @@ glabel func_80879134 /* 0055C 8087918C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00560 80879190 03E00008 */ jr $ra /* 00564 80879194 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s index 6a690dc1e8..5ab2a22ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s @@ -11,5 +11,3 @@ glabel func_808791BC /* 005AC 808791DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005B0 808791E0 03E00008 */ jr $ra /* 005B4 808791E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s index a470ae49ab..85bca994c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808793E0 + .asciz "../z_bg_gnd_darkmeiro.c" + .balign 4 + +glabel D_808793F8 + .asciz "../z_bg_gnd_darkmeiro.c" + .balign 4 + +.text glabel func_808791E8 /* 005B8 808791E8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 005BC 808791EC AFBF001C */ sw $ra, 0x001C($sp) @@ -90,5 +100,3 @@ glabel func_808791E8 /* 006F8 80879328 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 006FC 8087932C 03E00008 */ jr $ra /* 00700 80879330 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s index cb2b3c5efd..20498afe14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80879410 + .asciz "../z_bg_gnd_darkmeiro.c" + .balign 4 + +glabel D_80879428 + .asciz "../z_bg_gnd_darkmeiro.c" + .balign 4 + +.text glabel func_80879334 /* 00704 80879334 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00708 80879338 AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,4 +45,3 @@ glabel func_80879334 /* 00784 808793B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00788 808793B8 03E00008 */ jr $ra /* 0078C 808793BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Destroy.s index ac32a9dff1..814e8e4f35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Destroy.s @@ -15,5 +15,3 @@ glabel BgGndFiremeiro_Destroy /* 000E0 808795A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E4 808795A4 03E00008 */ jr $ra /* 000E8 808795A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s index d9a330ba7d..cb7e45b3d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808799E0 + .asciz "../z_bg_gnd_firemeiro.c" + .balign 4 + +glabel D_808799F8 + .asciz "../z_bg_gnd_firemeiro.c" + .balign 4 + +glabel D_80879A10 + .asciz "../z_bg_gnd_firemeiro.c" + .balign 4 + +.text glabel BgGndFiremeiro_Draw /* 0042C 808798EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00430 808798F0 AFBF001C */ sw $ra, 0x001C($sp) @@ -52,4 +66,3 @@ glabel BgGndFiremeiro_Draw /* 004F4 808799B4 00000000 */ nop /* 004F8 808799B8 00000000 */ nop /* 004FC 808799BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s index b027d5586e..1243e153cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s @@ -50,5 +50,3 @@ glabel BgGndFiremeiro_Init /* 000A8 80879568 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000AC 8087956C 03E00008 */ jr $ra /* 000B0 80879570 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Update.s index 465005d36d..032c2f08ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Update.s @@ -8,5 +8,3 @@ glabel BgGndFiremeiro_Update /* 00420 808798E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00424 808798E4 03E00008 */ jr $ra /* 00428 808798E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_808795AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_808795AC.s index eddd31fdc1..06e73b9a5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_808795AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_808795AC.s @@ -51,5 +51,3 @@ glabel func_808795AC /* 0019C 8087965C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001A0 80879660 03E00008 */ jr $ra /* 001A4 80879664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s index 0da2690a65..cfe5dfdb94 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s @@ -114,5 +114,3 @@ glabel func_80879668 /* 0033C 808797FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00340 80879800 03E00008 */ jr $ra /* 00344 80879804 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879808.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879808.s index ab7e1b6a14..ddcf09102b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879808.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879808.s @@ -52,5 +52,3 @@ glabel func_80879808 /* 003FC 808798BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00400 808798C0 03E00008 */ jr $ra /* 00404 808798C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Destroy.s index 775f985944..1679cce438 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Destroy.s @@ -12,5 +12,3 @@ glabel BgGndIceblock_Destroy /* 00158 80879BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0015C 80879BFC 03E00008 */ jr $ra /* 00160 80879C00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s index cacf36f81b..91787d7419 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s @@ -12,4 +12,3 @@ glabel BgGndIceblock_Draw /* 00C74 8087A714 03E00008 */ jr $ra /* 00C78 8087A718 00000000 */ nop /* 00C7C 8087A71C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s index b908ab5b70..85114d6185 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s @@ -86,5 +86,3 @@ glabel BgGndIceblock_Init /* 00128 80879BC8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0012C 80879BCC 03E00008 */ jr $ra /* 00130 80879BD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Update.s index 30233286ec..ba6f8632e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Update.s @@ -8,5 +8,3 @@ glabel BgGndIceblock_Update /* 00C44 8087A6E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C48 8087A6E8 03E00008 */ jr $ra /* 00C4C 8087A6EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s index 14a6b6fda5..858da77bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879C04.s @@ -68,5 +68,3 @@ glabel func_80879C04 /* 00264 80879D04 46102481 */ sub.s $f18, $f4, $f16 /* 00268 80879D08 03E00008 */ jr $ra /* 0026C 80879D0C E4920170 */ swc1 $f18, 0x0170($a0) ## 00000170 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D10.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D10.s index 6deea33bd2..a62a2fbd01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D10.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D10.s @@ -16,5 +16,3 @@ glabel func_80879D10 /* 002A0 80879D40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 002A4 80879D44 03E00008 */ jr $ra /* 002A8 80879D48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s index 8845cd908d..1cd2c29028 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D4C.s @@ -22,5 +22,3 @@ glabel L80879D8C /* 002EC 80879D8C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 002F0 80879D90 03E00008 */ jr $ra /* 002F4 80879D94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s index e415b41bc6..8c596de518 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_80879D98.s @@ -233,5 +233,3 @@ glabel L8087A0B8 /* 0061C 8087A0BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00620 8087A0C0 03E00008 */ jr $ra /* 00624 8087A0C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A0C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A0C8.s index 67fd31444d..243e4838da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A0C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A0C8.s @@ -48,5 +48,3 @@ glabel func_8087A0C8 /* 006D8 8087A178 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006DC 8087A17C 03E00008 */ jr $ra /* 006E0 8087A180 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s index 665e0192da..f325f3cc73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s @@ -54,5 +54,3 @@ glabel func_8087A184 /* 0079C 8087A23C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007A0 8087A240 03E00008 */ jr $ra /* 007A4 8087A244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s index 78855cb4b6..a414241326 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s @@ -48,5 +48,3 @@ glabel func_8087A248 /* 00854 8087A2F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00858 8087A2F8 03E00008 */ jr $ra /* 0085C 8087A2FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s index ee2ed4b8a6..fa6c5d83be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s @@ -41,5 +41,3 @@ glabel func_8087A300 /* 008F0 8087A390 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008F4 8087A394 03E00008 */ jr $ra /* 008F8 8087A398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s index 10e9e5f2d0..dc8a811e6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s @@ -230,5 +230,3 @@ glabel func_8087A39C /* 00C20 8087A6C0 8FB00030 */ lw $s0, 0x0030($sp) /* 00C24 8087A6C4 03E00008 */ jr $ra /* 00C28 8087A6C8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s index 838100da48..bc4f73b53e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s @@ -15,5 +15,3 @@ glabel BgGndSoulmeiro_Destroy /* 0016C 8087AF2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00170 8087AF30 03E00008 */ jr $ra /* 00174 8087AF34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s index 1be383c008..de5e6594d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_8087B590 + .asciz "../z_bg_gnd_soulmeiro.c" + .balign 4 + +glabel D_8087B5A8 + .asciz "../z_bg_gnd_soulmeiro.c" + .balign 4 + +glabel D_8087B5C0 + .asciz "../z_bg_gnd_soulmeiro.c" + .balign 4 + +.late_rodata +glabel D_8087B5D8 + .float 10922.0 +glabel D_8087B5DC + .float 0.0083333338 +glabel D_8087B5E0 + .float 0.69999999 + +.text glabel BgGndSoulmeiro_Draw /* 0060C 8087B3CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00610 8087B3D0 AFBF001C */ sw $ra, 0x001C($sp) @@ -86,4 +108,3 @@ glabel BgGndSoulmeiro_Draw /* 00744 8087B504 00000000 */ nop /* 00748 8087B508 00000000 */ nop /* 0074C 8087B50C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s index 17842984ae..d832de72af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s @@ -94,5 +94,3 @@ glabel BgGndSoulmeiro_Init /* 00134 8087AEF4 8FB10030 */ lw $s1, 0x0030($sp) /* 00138 8087AEF8 03E00008 */ jr $ra /* 0013C 8087AEFC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Update.s index 6eb81a1915..f244d90666 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Update.s @@ -11,5 +11,3 @@ glabel BgGndSoulmeiro_Update /* 00600 8087B3C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00604 8087B3C4 03E00008 */ jr $ra /* 00608 8087B3C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s index be8223aa12..42c6fc8e5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s @@ -228,5 +228,3 @@ glabel func_8087AF38 /* 004B8 8087B278 8FBE0098 */ lw $s8, 0x0098($sp) /* 004BC 8087B27C 03E00008 */ jr $ra /* 004C0 8087B280 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s index 9531b7b82d..48ccdb547e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s @@ -57,5 +57,3 @@ glabel func_8087B284 /* 00584 8087B344 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00588 8087B348 03E00008 */ jr $ra /* 0058C 8087B34C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B350.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B350.s index 5e0165a595..8c529544a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B350.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B350.s @@ -22,5 +22,3 @@ glabel func_8087B350 /* 005D4 8087B394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D8 8087B398 03E00008 */ jr $ra /* 005DC 8087B39C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Destroy.s index 969a271ebb..5e531619b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Destroy.s @@ -12,5 +12,3 @@ glabel BgHaka_Destroy /* 0009C 8087B74C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000A0 8087B750 03E00008 */ jr $ra /* 000A4 8087B754 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s index 0210cbb21a..fe559f92ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s @@ -1,3 +1,29 @@ +.rdata +glabel D_8087BD00 + .asciz "../z_bg_haka.c" + .balign 4 + +glabel D_8087BD10 + .asciz "../z_bg_haka.c" + .balign 4 + +glabel D_8087BD20 + .asciz "../z_bg_haka.c" + .balign 4 + +glabel D_8087BD30 + .asciz "../z_bg_haka.c" + .balign 4 + +.late_rodata +glabel D_8087BD40 + .float 34.6 +glabel D_8087BD44 + .float -112.8 +glabel D_8087BD48 + .float 0.05 + +.text glabel BgHaka_Draw /* 004D0 8087BB80 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 004D4 8087BB84 AFB10018 */ sw $s1, 0x0018($sp) @@ -83,4 +109,3 @@ glabel BgHaka_Draw /* 00614 8087BCC4 03E00008 */ jr $ra /* 00618 8087BCC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0061C 8087BCCC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Init.s index 62af4e2282..1a87f75297 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Init.s @@ -33,5 +33,3 @@ glabel BgHaka_Init /* 0006C 8087B71C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00070 8087B720 03E00008 */ jr $ra /* 00074 8087B724 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Update.s index 33802af1fd..d9818b5952 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Update.s @@ -8,5 +8,3 @@ glabel BgHaka_Update /* 004C4 8087BB74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004C8 8087BB78 03E00008 */ jr $ra /* 004CC 8087BB7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B758.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B758.s index a94621334d..519b5b9e42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B758.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B758.s @@ -36,5 +36,3 @@ glabel func_8087B758 /* 0012C 8087B7DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00130 8087B7E0 03E00008 */ jr $ra /* 00134 8087B7E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s index 936ceb2d87..44b4195db9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s @@ -91,5 +91,3 @@ glabel func_8087B7E8 /* 0027C 8087B92C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00280 8087B930 03E00008 */ jr $ra /* 00284 8087B934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s index 7b828bb2d4..901615d168 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s @@ -100,5 +100,3 @@ glabel func_8087B938 /* 003F0 8087BAA0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 003F4 8087BAA4 03E00008 */ jr $ra /* 003F8 8087BAA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAAC.s index 85bafd23ad..444709b9fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAAC.s @@ -14,5 +14,3 @@ glabel func_8087BAAC .L8087BADC: /* 0042C 8087BADC 03E00008 */ jr $ra /* 00430 8087BAE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAE4.s index 957881417e..654e815c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087BAE4.s @@ -32,5 +32,3 @@ glabel func_8087BAE4 /* 004A0 8087BB50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A4 8087BB54 03E00008 */ jr $ra /* 004A8 8087BB58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Destroy.s index 677bffeb05..8188f48e55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Destroy.s @@ -23,5 +23,3 @@ glabel BgHakaGate_Destroy /* 00318 8087C108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0031C 8087C10C 03E00008 */ jr $ra /* 00320 8087C110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s index b0afcadec7..217c650931 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s @@ -1,3 +1,28 @@ +.rdata +glabel D_8087CD4C + .asciz "../z_bg_haka_gate.c" + .balign 4 + +glabel D_8087CD60 + .asciz "../z_bg_haka_gate.c" + .balign 4 + +glabel D_8087CD74 + .asciz "../z_bg_haka_gate.c" + .balign 4 + +glabel D_8087CD88 + .asciz "../z_bg_haka_gate.c" + .balign 4 + +.late_rodata +glabel D_8087CDAC + .float 9.58738E-5 + +glabel D_8087CDB0 + .float 9.58738E-5 + +.text glabel BgHakaGate_Draw /* 00C80 8087CA70 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00C84 8087CA74 AFBF001C */ sw $ra, 0x001C($sp) @@ -157,4 +182,3 @@ glabel BgHakaGate_Draw /* 00ED4 8087CCC4 00000000 */ nop /* 00ED8 8087CCC8 00000000 */ nop /* 00EDC 8087CCCC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s index b242e1eb89..bbe6c737a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s @@ -206,5 +206,3 @@ glabel BgHakaGate_Init /* 002C0 8087C0B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 002C4 8087C0B4 03E00008 */ jr $ra /* 002C8 8087C0B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Update.s index 082f04fb93..c2af6633ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Update.s @@ -18,5 +18,3 @@ glabel BgHakaGate_Update /* 00A60 8087C850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A64 8087C854 03E00008 */ jr $ra /* 00A68 8087C858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C114.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C114.s index bc1408ebee..e316977ab2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C114.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C114.s @@ -2,5 +2,3 @@ glabel func_8087C114 /* 00324 8087C114 AFA40000 */ sw $a0, 0x0000($sp) /* 00328 8087C118 03E00008 */ jr $ra /* 0032C 8087C11C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C120.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C120.s index b59964d0ae..965b3b9c91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C120.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C120.s @@ -14,5 +14,3 @@ glabel func_8087C120 .L8087C150: /* 00360 8087C150 03E00008 */ jr $ra /* 00364 8087C154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C158.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C158.s index fdc6f8233c..7551911794 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C158.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C158.s @@ -77,5 +77,3 @@ glabel func_8087C158 .L8087C268: /* 00478 8087C268 03E00008 */ jr $ra /* 0047C 8087C26C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s index fede0f0f98..5f54049c5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8087CD9C + .float 0.1 + +glabel D_8087CDA0 + .float 182.04445 + +.text glabel func_8087C270 /* 00480 8087C270 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00484 8087C274 AFBF001C */ sw $ra, 0x001C($sp) @@ -128,5 +136,3 @@ glabel func_8087C270 /* 00658 8087C448 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0065C 8087C44C 03E00008 */ jr $ra /* 00660 8087C450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s index 9148af1c36..a1cdc6731d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s @@ -104,5 +104,3 @@ glabel func_8087C454 /* 007D4 8087C5C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 007D8 8087C5C8 03E00008 */ jr $ra /* 007DC 8087C5CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s index b3f65d604f..2a67357f64 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s @@ -39,5 +39,3 @@ glabel func_8087C5D0 /* 00860 8087C650 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00864 8087C654 03E00008 */ jr $ra /* 00868 8087C658 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C65C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C65C.s index 6cf0ab50fb..b2f7e4f648 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C65C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C65C.s @@ -21,5 +21,3 @@ glabel func_8087C65C /* 008B0 8087C6A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008B4 8087C6A4 03E00008 */ jr $ra /* 008B8 8087C6A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s index d845dd60e7..2b0046bafe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s @@ -39,5 +39,3 @@ glabel func_8087C6AC /* 00940 8087C730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00944 8087C734 03E00008 */ jr $ra /* 00948 8087C738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s index fa2b92ab23..4c7b6d8b5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s @@ -24,5 +24,3 @@ glabel func_8087C73C /* 00998 8087C788 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0099C 8087C78C 03E00008 */ jr $ra /* 009A0 8087C790 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s index 93a3246826..f16ed051b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s @@ -36,5 +36,3 @@ glabel func_8087C794 /* 00A18 8087C808 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A1C 8087C80C 03E00008 */ jr $ra /* 00A20 8087C810 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s index a2d2957ca2..e2404b6a08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s @@ -1,3 +1,24 @@ +.rdata +glabel D_8087CD10 + .asciz "../z_bg_haka_gate.c" + .balign 4 + +glabel D_8087CD24 + .asciz "../z_bg_haka_gate.c" + .balign 4 + +glabel D_8087CD38 + .asciz "../z_bg_haka_gate.c" + .balign 4 + +.late_rodata +glabel D_8087CDA4 + .float 9.58738e-5 +glabel D_8087CDA8 + .float 1.0e-5 + + +.text glabel func_8087C85C /* 00A6C 8087C85C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00A70 8087C860 AFBF003C */ sw $ra, 0x003C($sp) @@ -133,5 +154,3 @@ glabel func_8087C85C /* 00C74 8087CA64 8FB10038 */ lw $s1, 0x0038($sp) /* 00C78 8087CA68 03E00008 */ jr $ra /* 00C7C 8087CA6C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Destroy.s index 6c1ff82db4..f5900a8b51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Destroy.s @@ -12,5 +12,3 @@ glabel BgHakaHuta_Destroy /* 000E0 8087D0A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E4 8087D0A4 03E00008 */ jr $ra /* 000E8 8087D0A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s index 0120211561..8e426f9acd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s @@ -12,4 +12,3 @@ glabel BgHakaHuta_Draw /* 00954 8087D914 03E00008 */ jr $ra /* 00958 8087D918 00000000 */ nop /* 0095C 8087D91C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s index 860dcf3c33..bf8aef8f99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s @@ -53,5 +53,3 @@ glabel BgHakaHuta_Init /* 000B0 8087D070 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000B4 8087D074 03E00008 */ jr $ra /* 000B8 8087D078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Update.s index bf8bdca158..066bc69172 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Update.s @@ -8,5 +8,3 @@ glabel BgHakaHuta_Update /* 00924 8087D8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00928 8087D8E8 03E00008 */ jr $ra /* 0092C 8087D8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s index 7f9b9e3640..9e49a33d53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s @@ -116,5 +116,3 @@ glabel func_8087D0AC /* 0029C 8087D25C 8FBE0070 */ lw $s8, 0x0070($sp) /* 002A0 8087D260 03E00008 */ jr $ra /* 002A4 8087D264 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D268.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D268.s index 6a1e37ff4b..c39ab3a443 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D268.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D268.s @@ -36,5 +36,3 @@ glabel func_8087D268 /* 00324 8087D2E4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00328 8087D2E8 03E00008 */ jr $ra /* 0032C 8087D2EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s index 8e94c235b8..b72376cc9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s @@ -196,5 +196,3 @@ glabel func_8087D2F0 /* 005EC 8087D5AC 8FB10030 */ lw $s1, 0x0030($sp) /* 005F0 8087D5B0 03E00008 */ jr $ra /* 005F4 8087D5B4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s index b5681ea158..4eccc256c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s @@ -49,5 +49,3 @@ glabel func_8087D5B8 /* 006A0 8087D660 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006A4 8087D664 03E00008 */ jr $ra /* 006A8 8087D668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s index a79964bc08..e99f2e857b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s @@ -50,5 +50,3 @@ glabel func_8087D66C /* 00754 8087D714 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00758 8087D718 03E00008 */ jr $ra /* 0075C 8087D71C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s index d2a246f26f..0be52c2813 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8087D970 + .float 9.5873802e-5 +glabel D_8087D974 + .float 0.16001178 + + +.text glabel func_8087D720 /* 00760 8087D720 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00764 8087D724 AFBF0024 */ sw $ra, 0x0024($sp) @@ -106,5 +114,3 @@ glabel func_8087D720 /* 008F4 8087D8B4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 008F8 8087D8B8 03E00008 */ jr $ra /* 008FC 8087D8BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D8C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D8C0.s index fd1ad7968b..2a25d15b02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D8C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D8C0.s @@ -2,5 +2,3 @@ glabel func_8087D8C0 /* 00900 8087D8C0 AFA40000 */ sw $a0, 0x0000($sp) /* 00904 8087D8C4 03E00008 */ jr $ra /* 00908 8087D8C8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Destroy.s index 07af8496e0..9097d8639b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Destroy.s @@ -12,5 +12,3 @@ glabel BgHakaMeganeBG_Destroy /* 001BC 8087DFEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C0 8087DFF0 03E00008 */ jr $ra /* 001C4 8087DFF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s index 4a6121496a..259a650444 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s @@ -24,4 +24,3 @@ glabel BgHakaMeganeBG_Draw /* 00594 8087E3C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00598 8087E3C8 03E00008 */ jr $ra /* 0059C 8087E3CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Init.s index 580d8bf3e9..bb2db1dc9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8087E420 + .float 3000.0 + +.text glabel BgHakaMeganeBG_Init /* 00000 8087DE30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 8087DE34 AFA50034 */ sw $a1, 0x0034($sp) @@ -115,5 +120,3 @@ glabel BgHakaMeganeBG_Init /* 0018C 8087DFBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00190 8087DFC0 03E00008 */ jr $ra /* 00194 8087DFC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Update.s index c4760e72e0..80a0fea9e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Update.s @@ -8,5 +8,3 @@ glabel BgHakaMeganeBG_Update /* 00540 8087E370 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00544 8087E374 03E00008 */ jr $ra /* 00548 8087E378 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087DFF8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087DFF8.s index cb83f679f9..2427594ede 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087DFF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087DFF8.s @@ -19,5 +19,3 @@ glabel func_8087DFF8 .L8087E038: /* 00208 8087E038 03E00008 */ jr $ra /* 0020C 8087E03C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E040.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E040.s index 5683fe0387..432c92406c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E040.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E040.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8087E424 + .float 0.025 + +glabel D_8087E428 + .float 3.1415927 # PI + +.text glabel func_8087E040 /* 00210 8087E040 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00214 8087E044 AFBF0014 */ sw $ra, 0x0014($sp) @@ -54,5 +62,3 @@ glabel func_8087E040 /* 002D0 8087E100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002D4 8087E104 03E00008 */ jr $ra /* 002D8 8087E108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E10C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E10C.s index dd9d5c5067..aefad0a926 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E10C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E10C.s @@ -57,5 +57,3 @@ glabel func_8087E10C /* 003A4 8087E1D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003A8 8087E1D8 03E00008 */ jr $ra /* 003AC 8087E1DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E1E0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E1E0.s index c097e0fdc4..9cdb4b3ec4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E1E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E1E0.s @@ -32,5 +32,3 @@ glabel func_8087E1E0 /* 0041C 8087E24C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00420 8087E250 03E00008 */ jr $ra /* 00424 8087E254 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E258.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E258.s index e8cb9bc742..f536e3abd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E258.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E258.s @@ -11,5 +11,3 @@ glabel func_8087E258 /* 0044C 8087E27C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00450 8087E280 03E00008 */ jr $ra /* 00454 8087E284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E288.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E288.s index 747e5fa127..4d264d86a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E288.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E288.s @@ -21,5 +21,3 @@ glabel func_8087E288 /* 0049C 8087E2CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A0 8087E2D0 03E00008 */ jr $ra /* 004A4 8087E2D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E2D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E2D8.s index ea4b01ce1c..a045473fcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E2D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E2D8.s @@ -33,5 +33,3 @@ glabel func_8087E2D8 /* 00510 8087E340 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00514 8087E344 03E00008 */ jr $ra /* 00518 8087E348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E34C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E34C.s index cd29aeea75..dea903900e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E34C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/func_8087E34C.s @@ -2,5 +2,3 @@ glabel func_8087E34C /* 0051C 8087E34C AFA40000 */ sw $a0, 0x0000($sp) /* 00520 8087E350 03E00008 */ jr $ra /* 00524 8087E354 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s index 8914acd461..3259615c47 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s @@ -24,5 +24,3 @@ glabel BgHakaSgami_Destroy /* 002F8 8087E7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002FC 8087E7DC 03E00008 */ jr $ra /* 00300 8087E7E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s index 3a4458819c..8036c15782 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s @@ -180,5 +180,3 @@ glabel BgHakaSgami_Init /* 00298 8087E778 8FB10020 */ lw $s1, 0x0020($sp) /* 0029C 8087E77C 03E00008 */ jr $ra /* 002A0 8087E780 27BD01D8 */ addiu $sp, $sp, 0x01D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Update.s index ef79b71bdb..4af28ab766 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Update.s @@ -22,5 +22,3 @@ glabel BgHakaSgami_Update /* 008D4 8087EDB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008D8 8087EDB8 03E00008 */ jr $ra /* 008DC 8087EDBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E7E4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E7E4.s index 5ed29ea1ec..9a2e6c48ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E7E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E7E4.s @@ -30,5 +30,3 @@ glabel func_8087E7E4 /* 0036C 8087E84C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00370 8087E850 03E00008 */ jr $ra /* 00374 8087E854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s index f597306558..ed24719263 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8087EFE0 + .float 0.19634955 + +.text glabel func_8087E858 /* 00378 8087E858 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0037C 8087E85C AFBF005C */ sw $ra, 0x005C($sp) @@ -344,5 +349,3 @@ glabel func_8087E858 /* 00880 8087ED60 8FBE0058 */ lw $s8, 0x0058($sp) /* 00884 8087ED64 03E00008 */ jr $ra /* 00888 8087ED68 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s index 9c99f42c26..3b33feb5e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s @@ -37,4 +37,3 @@ glabel func_8087EDC0 /* 00954 8087EE34 00000000 */ nop /* 00958 8087EE38 00000000 */ nop /* 0095C 8087EE3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Destroy.s index 8c244166d7..1abfa91643 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Destroy.s @@ -15,5 +15,3 @@ glabel BgHakaShip_Destroy /* 00170 8087F270 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00174 8087F274 03E00008 */ jr $ra /* 00178 8087F278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s index ca12bdf7d5..6b3f031397 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s @@ -1,3 +1,37 @@ +.rdata +glabel D_8087FAF8 + .asciz "../z_bg_haka_ship.c" + .balign 4 + +glabel D_8087FB0C + .asciz "../z_bg_haka_ship.c" + .balign 4 + +glabel D_8087FB20 + .asciz "../z_bg_haka_ship.c" + .balign 4 + +glabel D_8087FB34 + .asciz "../z_bg_haka_ship.c" + .balign 4 + +glabel D_8087FB48 + .asciz "../z_bg_haka_ship.c" + .balign 4 + +glabel D_8087FB5C + .asciz "../z_bg_haka_ship.c" + .balign 4 + +.late_rodata +glabel D_8087FB88 + .float 9.5873802e-5 +glabel D_8087FB8C + .float -3670.0 +glabel D_8087FB90 + .float -367.0 + +.text glabel BgHakaShip_Draw /* 006B4 8087F7B4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 006B8 8087F7B8 AFBF001C */ sw $ra, 0x001C($sp) @@ -190,4 +224,3 @@ glabel BgHakaShip_Draw /* 00994 8087FA94 03E00008 */ jr $ra /* 00998 8087FA98 00000000 */ nop /* 0099C 8087FA9C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s index 75a4fd462f..0bfae02e21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s @@ -90,5 +90,3 @@ glabel BgHakaShip_Init /* 00134 8087F234 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00138 8087F238 03E00008 */ jr $ra /* 0013C 8087F23C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Update.s index 203e68cdb4..5182ec708f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Update.s @@ -17,5 +17,3 @@ glabel BgHakaShip_Update /* 006A8 8087F7A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006AC 8087F7AC 03E00008 */ jr $ra /* 006B0 8087F7B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F27C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F27C.s index d86058c00b..5d245ca92e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F27C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F27C.s @@ -24,5 +24,3 @@ glabel func_8087F27C .L8087F2D0: /* 001D0 8087F2D0 03E00008 */ jr $ra /* 001D4 8087F2D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F2D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F2D8.s index 8e86675e9e..5f774fadea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F2D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F2D8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8087FAD0 + .asciz "シーン 外輪船 ... アァクション！！\n" + .balign 4 + +.text glabel func_8087F2D8 /* 001D8 8087F2D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 001DC 8087F2DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 @@ -38,5 +44,3 @@ glabel func_8087F2D8 /* 00258 8087F358 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0025C 8087F35C 03E00008 */ jr $ra /* 00260 8087F360 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F364.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F364.s index 8dc2660a58..f1b57c43e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F364.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F364.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8087FB70 + .float 0.12566371 + +.text glabel func_8087F364 /* 00264 8087F364 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00268 8087F368 AFBF0014 */ sw $ra, 0x0014($sp) @@ -42,5 +47,3 @@ glabel func_8087F364 /* 002F4 8087F3F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 8087F3F8 03E00008 */ jr $ra /* 002FC 8087F3FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s index 4c418e8255..67dc2d1228 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_8087FB74 + .float 0.12566371 + +glabel D_8087FB78 + .float 7650.0 + +glabel D_8087FB7C + .float 7600.0 + +glabel D_8087FB80 + .float 50.384617 + +glabel D_8087FB84 + .float 0.12566371 + +.text glabel func_8087F400 /* 00300 8087F400 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00304 8087F404 AFBF001C */ sw $ra, 0x001C($sp) @@ -125,5 +142,3 @@ glabel func_8087F400 /* 004BC 8087F5BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004C0 8087F5C0 03E00008 */ jr $ra /* 004C4 8087F5C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s index 19c6df3a05..195b798266 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s @@ -25,5 +25,3 @@ glabel func_8087F5C8 /* 00518 8087F618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0051C 8087F61C 03E00008 */ jr $ra /* 00520 8087F620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F624.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F624.s index 1a7b0a5b93..f8a2edac07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F624.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F624.s @@ -38,5 +38,3 @@ glabel func_8087F624 /* 005A8 8087F6A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005AC 8087F6AC 03E00008 */ jr $ra /* 005B0 8087F6B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s index 3dc52f0d7a..83b15ac404 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s @@ -52,5 +52,3 @@ glabel func_8087F6B4 /* 00668 8087F768 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0066C 8087F76C 03E00008 */ jr $ra /* 00670 8087F770 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s index 218a169b7f..2072d6a626 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s @@ -38,5 +38,3 @@ glabel BgHakaTrap_Destroy /* 00314 8087FFB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00318 8087FFB8 03E00008 */ jr $ra /* 0031C 8087FFBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s index 0f8dee9cd5..b0ed21f7f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s @@ -79,4 +79,3 @@ glabel BgHakaTrap_Draw /* 01284 80880F24 00000000 */ nop /* 01288 80880F28 00000000 */ nop /* 0128C 80880F2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s index f0cd28f0a5..8492d368d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80881040 + .float 0.1 + +.text glabel BgHakaTrap_Init /* 00000 8087FCA0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 8087FCA4 AFA5003C */ sw $a1, 0x003C($sp) @@ -185,5 +190,3 @@ glabel BgHakaTrap_Init /* 00290 8087FF30 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00294 8087FF34 03E00008 */ jr $ra /* 00298 8087FF38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s index 9239fc956a..9d579c82a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s @@ -66,5 +66,3 @@ glabel BgHakaTrap_Update /* 010BC 80880D5C 8FB10018 */ lw $s1, 0x0018($sp) /* 010C0 80880D60 03E00008 */ jr $ra /* 010C4 80880D64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_8087FFC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_8087FFC0.s index fcfa30b225..1ed6a237f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_8087FFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_8087FFC0.s @@ -139,5 +139,3 @@ glabel func_8087FFC0 /* 0050C 808801AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00510 808801B0 03E00008 */ jr $ra /* 00514 808801B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808801B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808801B8.s index 8b1ad16e05..9a0169d6f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808801B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808801B8.s @@ -79,5 +79,3 @@ glabel func_808801B8 /* 0062C 808802CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00630 808802D0 03E00008 */ jr $ra /* 00634 808802D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808802D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808802D8.s index 8a2636ef76..db69f0ef81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808802D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808802D8.s @@ -114,5 +114,3 @@ glabel func_808802D8 /* 007D8 80880478 8FB50078 */ lw $s5, 0x0078($sp) /* 007DC 8088047C 03E00008 */ jr $ra /* 007E0 80880480 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s index 7fb1cf48f9..b19d5354e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s @@ -92,5 +92,3 @@ glabel func_80880484 /* 00914 808805B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00918 808805B8 03E00008 */ jr $ra /* 0091C 808805BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808805C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808805C0.s index 4d8205d950..4b9832a8d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808805C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808805C0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80881044 + .float 0.1 + +.text glabel func_808805C0 /* 00920 808805C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00924 808805C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -72,5 +77,3 @@ glabel func_808805C0 /* 00A10 808806B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A14 808806B4 03E00008 */ jr $ra /* 00A18 808806B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808806BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808806BC.s index 0d2606ec56..630533a906 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808806BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808806BC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80881048 + .float 1.6 +glabel D_8088104C + .float 0.01 +glabel D_80881050 + .float 0.01 + +.text glabel func_808806BC /* 00A1C 808806BC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00A20 808806C0 AFBF0054 */ sw $ra, 0x0054($sp) @@ -152,5 +161,3 @@ glabel func_808806BC /* 00C48 808808E8 8FB60050 */ lw $s6, 0x0050($sp) /* 00C4C 808808EC 03E00008 */ jr $ra /* 00C50 808808F0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808808F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808808F4.s index af20510330..4d43d8a74c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808808F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808808F4.s @@ -52,5 +52,3 @@ glabel func_808808F4 /* 00D04 808809A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D08 808809A8 03E00008 */ jr $ra /* 00D0C 808809AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809B0.s index e0905a0e25..204d2e5cb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809B0.s @@ -14,5 +14,3 @@ glabel func_808809B0 .L808809DC: /* 00D3C 808809DC 03E00008 */ jr $ra /* 00D40 808809E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809E4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809E4.s index a1206ac2ef..3bb05101b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_808809E4.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80881054 + .float 0.06 +glabel D_80881058 + .float 6.734914E-5 +glabel D_8088105C + .float 0.6666667 + +.text glabel func_808809E4 /* 00D44 808809E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00D48 808809E8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -65,5 +74,3 @@ glabel func_808809E4 /* 00E3C 80880ADC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E40 80880AE0 03E00008 */ jr $ra /* 00E44 80880AE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880AE8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880AE8.s index 813bdc3fea..7d59489d67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880AE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880AE8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80881060 + .float 0.03 +glabel D_80881064 + .float 0.03 + +.text glabel func_80880AE8 /* 00E48 80880AE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00E4C 80880AEC AFBF001C */ sw $ra, 0x001C($sp) @@ -77,5 +84,3 @@ glabel func_80880AE8 /* 00F60 80880C00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F64 80880C04 03E00008 */ jr $ra /* 00F68 80880C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880C0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880C0C.s index 14135de01b..7e6f533f70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880C0C.s @@ -30,5 +30,3 @@ glabel func_80880C0C /* 00FD4 80880C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FD8 80880C78 03E00008 */ jr $ra /* 00FDC 80880C7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880D68.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880D68.s index 25777cb2fa..b13e70fa91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880D68.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880D68.s @@ -38,5 +38,3 @@ glabel func_80880D68 /* 01158 80880DF8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0115C 80880DFC 03E00008 */ jr $ra /* 01160 80880E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s index f80c4e341a..01c0c58b22 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s @@ -24,5 +24,3 @@ glabel BgHakaTubo_Destroy /* 00144 80881394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00148 80881398 03E00008 */ jr $ra /* 0014C 8088139C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s index cb0c09aa18..11132a6962 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s @@ -17,4 +17,3 @@ glabel BgHakaTubo_Draw /* 008E4 80881B34 00000000 */ nop /* 008E8 80881B38 00000000 */ nop /* 008EC 80881B3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s index 4ce2712392..ba9f7af4f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s @@ -70,5 +70,3 @@ glabel BgHakaTubo_Init /* 000EC 8088133C 8FB00014 */ lw $s0, 0x0014($sp) /* 000F0 80881340 03E00008 */ jr $ra /* 000F4 80881344 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Update.s index 4f1662bca8..b6fd8cf412 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Update.s @@ -13,5 +13,3 @@ glabel BgHakaTubo_Update /* 006A8 808818F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006AC 808818FC 03E00008 */ jr $ra /* 006B0 80881900 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s index fe97d5915a..12d6106715 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80881C0C + .float -5559.0 +glabel D_80881C10 + .float -1587.0 + +.text glabel func_808813A0 /* 00150 808813A0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00154 808813A4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -167,5 +174,3 @@ glabel func_808813A0 /* 003AC 808815FC 8FB10030 */ lw $s1, 0x0030($sp) /* 003B0 80881600 03E00008 */ jr $ra /* 003B4 80881604 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881608.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881608.s index d4ed25e899..0a1ae5e345 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881608.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881608.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80881C14 + .float 0.2 +glabel D_80881C18 + .float 0.4 +glabel D_80881C1C + .float 0.6 +glabel D_80881C20 + .float 0.8 + +.text glabel func_80881608 /* 003B8 80881608 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 003BC 8088160C AFBF004C */ sw $ra, 0x004C($sp) @@ -196,5 +207,3 @@ glabel func_80881608 /* 00670 808818C0 8FB60048 */ lw $s6, 0x0048($sp) /* 00674 808818C4 03E00008 */ jr $ra /* 00678 808818C8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s index 6a788a4fec..84b9997454 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80881BD0 + .asciz "../z_bg_haka_tubo.c" + .balign 4 + +glabel D_80881BE4 + .asciz "../z_bg_haka_tubo.c" + .balign 4 + +glabel D_80881BF8 + .asciz "../z_bg_haka_tubo.c" + .balign 4 + +.late_rodata +glabel D_80881C24 + .float 9.58738E-5 +glabel D_80881C28 + .float 0.07 +glabel D_80881C2C + .float 0.04 + +.text glabel func_80881904 /* 006B4 80881904 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 006B8 80881908 AFBF003C */ sw $ra, 0x003C($sp) @@ -125,5 +147,3 @@ glabel func_80881904 /* 008A0 80881AF0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 008A4 80881AF4 03E00008 */ jr $ra /* 008A8 80881AF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Destroy.s index 96a4908160..8b34a3cc43 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Destroy.s @@ -2,5 +2,3 @@ glabel BgHakaWater_Destroy /* 00088 80881D88 AFA40000 */ sw $a0, 0x0000($sp) /* 0008C 80881D8C 03E00008 */ jr $ra /* 00090 80881D90 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s index 80c92e3d8b..7972c6b4a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s @@ -1,3 +1,29 @@ +.rdata +glabel D_808824C0 + .asciz "../z_bg_haka_water.c" + .balign 4 + +glabel D_808824D8 + .asciz "../z_bg_haka_water.c" + .balign 4 + +glabel D_808824F0 + .asciz "../z_bg_haka_water.c" + .balign 4 + +glabel D_80882508 + .asciz "../z_bg_haka_water.c" + .balign 4 + +.late_rodata +glabel D_80882520 + .float 0.765 +glabel D_80882524 + .float 0.1 +glabel D_80882528 + .float 5.1 + +.text glabel BgHakaWater_Draw /* 003C4 808820C4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 003C8 808820C8 AFBF003C */ sw $ra, 0x003C($sp) @@ -251,4 +277,3 @@ glabel BgHakaWater_Draw /* 00784 80882484 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 00788 80882488 03E00008 */ jr $ra /* 0078C 8088248C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Init.s index f9c5ac72d4..0ace405b4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Init.s @@ -37,5 +37,3 @@ glabel BgHakaWater_Init /* 0007C 80881D7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00080 80881D80 03E00008 */ jr $ra /* 00084 80881D84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Update.s index c001f9516d..3337ae926e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Update.s @@ -8,5 +8,3 @@ glabel BgHakaWater_Update /* 003B8 808820B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003BC 808820BC 03E00008 */ jr $ra /* 003C0 808820C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881D94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881D94.s index 61c4e85fbc..83733b2f69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881D94.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881D94.s @@ -83,5 +83,3 @@ glabel func_80881D94 /* 001D0 80881ED0 A5C80032 */ sh $t0, 0x0032($t6) ## 00000032 /* 001D4 80881ED4 03E00008 */ jr $ra /* 001D8 80881ED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881EDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881EDC.s index d20e476131..1f61586521 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881EDC.s @@ -53,5 +53,3 @@ glabel func_80881EDC /* 0028C 80881F8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00290 80881F90 03E00008 */ jr $ra /* 00294 80881F94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881F98.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881F98.s index d47fb9d59e..fbddf5ce12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881F98.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/func_80881F98.s @@ -75,5 +75,3 @@ glabel func_80881F98 /* 00394 80882094 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00398 80882098 03E00008 */ jr $ra /* 0039C 8088209C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s index a14931edfd..b330a597a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s @@ -22,5 +22,3 @@ glabel BgHakaZou_Destroy /* 00328 808828E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0032C 808828EC 03E00008 */ jr $ra /* 00330 808828F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s index fcd4e55552..bae7ed3138 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80883660 + .float 0.005 +glabel D_80883664 + .float 0.025 +glabel D_80883668 + .float 3000 + +.text glabel BgHakaZou_Init /* 00000 808825C0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 808825C4 AFA5003C */ sw $a1, 0x003C($sp) @@ -213,5 +222,3 @@ glabel BgHakaZou_Init /* 002D8 80882898 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 002DC 8088289C 03E00008 */ jr $ra /* 002E0 808828A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Update.s index 9288a1e744..e7b65c63c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Update.s @@ -18,5 +18,3 @@ glabel BgHakaZou_Update /* 00FEC 808835AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FF0 808835B0 03E00008 */ jr $ra /* 00FF4 808835B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s index d523a17491..0017c29df2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s @@ -101,5 +101,3 @@ glabel func_808828F4 /* 004A4 80882A64 8FB60060 */ lw $s6, 0x0060($sp) /* 004A8 80882A68 03E00008 */ jr $ra /* 004AC 80882A6C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s index fcc8e0df09..407b843cb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8088366C + .float 1500.0 + +.text glabel func_80882A70 /* 004B0 80882A70 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 004B4 80882A74 AFB00018 */ sw $s0, 0x0018($sp) @@ -103,5 +108,3 @@ glabel func_80882A70 /* 00610 80882BD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00614 80882BD4 03E00008 */ jr $ra /* 00618 80882BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882BDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882BDC.s index 4e1c8bcabe..31886d8e20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882BDC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80883670 + .float -0.6 + +.text glabel func_80882BDC /* 0061C 80882BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00620 80882BE0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -64,5 +69,3 @@ glabel func_80882BDC /* 006F8 80882CB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006FC 80882CBC 03E00008 */ jr $ra /* 00700 80882CC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s index e36a685b4b..ca65e83840 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s @@ -104,5 +104,3 @@ glabel func_80882CC4 /* 00888 80882E48 8FBE0068 */ lw $s8, 0x0068($sp) /* 0088C 80882E4C 03E00008 */ jr $ra /* 00890 80882E50 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s index 4dc751ae6b..84df61e274 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s @@ -108,5 +108,3 @@ glabel func_80882E54 /* 00A34 80882FF4 8FBE0058 */ lw $s8, 0x0058($sp) /* 00A38 80882FF8 03E00008 */ jr $ra /* 00A3C 80882FFC 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s index 6ea49a7591..23e2b8ef9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s @@ -73,5 +73,3 @@ glabel func_80883000 /* 00B38 808830F8 8FB10020 */ lw $s1, 0x0020($sp) /* 00B3C 808830FC 03E00008 */ jr $ra /* 00B40 80883100 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883104.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883104.s index 55f145627a..5c3c6baa55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883104.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883104.s @@ -18,5 +18,3 @@ glabel func_80883104 /* 00B78 80883138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B7C 8088313C 03E00008 */ jr $ra /* 00B80 80883140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s index ffc3bed574..e006e242ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s @@ -75,5 +75,3 @@ glabel func_80883144 /* 00C88 80883248 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C8C 8088324C 03E00008 */ jr $ra /* 00C90 80883250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s index 95359e4e05..a941af33a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s @@ -58,5 +58,3 @@ glabel func_80883254 /* 00D5C 8088331C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D60 80883320 03E00008 */ jr $ra /* 00D64 80883324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s index 619f97f79d..da27bc2915 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80883674 + .float 550.0 + +.text glabel func_80883328 /* 00D68 80883328 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00D6C 8088332C AFBF0064 */ sw $ra, 0x0064($sp) @@ -115,5 +120,3 @@ glabel func_80883328 /* 00F0C 808834CC 8FB70060 */ lw $s7, 0x0060($sp) /* 00F10 808834D0 03E00008 */ jr $ra /* 00F14 808834D4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808834D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808834D8.s index 4df24306df..a3875f6d94 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808834D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808834D8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80883678 + .float 0.04 + +.text glabel func_808834D8 /* 00F18 808834D8 AFA50004 */ sw $a1, 0x0004($sp) /* 00F1C 808834DC 8482016A */ lh $v0, 0x016A($a0) ## 0000016A @@ -40,5 +45,3 @@ glabel func_808834D8 .L80883560: /* 00FA0 80883560 03E00008 */ jr $ra /* 00FA4 80883564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883568.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883568.s index d5efe3cd5d..f63b1f67a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883568.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883568.s @@ -2,5 +2,3 @@ glabel func_80883568 /* 00FA8 80883568 AFA40000 */ sw $a0, 0x0000($sp) /* 00FAC 8088356C 03E00008 */ jr $ra /* 00FB0 80883570 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s index 65ca9ffaff..26a5c0b585 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s @@ -14,4 +14,3 @@ glabel func_808835B8 /* 01024 808835E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01028 808835E8 03E00008 */ jr $ra /* 0102C 808835EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s index a6d6dcbeac..90c5f1f8cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Destroy.s @@ -19,5 +19,3 @@ glabel BgHeavyBlock_Destroy /* 004F4 80883C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F8 80883C88 03E00008 */ jr $ra /* 004FC 80883C8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s index 01fe60ac15..2fd9bba910 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80884F60 + .asciz "../z_bg_heavy_block.c" + .balign 4 + +glabel D_80884F78 + .asciz "../z_bg_heavy_block.c" + .balign 4 + +glabel D_80884F90 + .asciz "../z_bg_heavy_block.c" + .balign 4 + +.text glabel BgHeavyBlock_Draw /* 0147C 80884C0C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01480 80884C10 AFBF001C */ sw $ra, 0x001C($sp) @@ -107,5 +121,3 @@ glabel BgHeavyBlock_Draw /* 01618 80884DA8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0161C 80884DAC 03E00008 */ jr $ra /* 01620 80884DB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s index 882ec99060..f2129eab6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80884EE0 + .asciz " 最大 ブロック セーブビット %x\n" + .balign 4 + +.late_rodata +glabel jtbl_80884FB0 +.word L80883BF8 +.word L80883B2C +.word L80883A9C +.word L80883AE4 +.word L80883B6C + +.text glabel BgHeavyBlock_Init /* 00278 80883A08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0027C 80883A0C AFA50024 */ sw $a1, 0x0024($sp) @@ -160,5 +174,3 @@ glabel L80883BF8 /* 004AC 80883C3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004B0 80883C40 03E00008 */ jr $ra /* 004B4 80883C44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s index 43c53deff6..d84dc1216e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Update.s @@ -8,5 +8,3 @@ glabel BgHeavyBlock_Update /* 01470 80884C00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01474 80884C04 03E00008 */ jr $ra /* 01478 80884C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s index 30be4ddc21..59a278b536 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883790.s @@ -38,5 +38,3 @@ glabel func_80883790 /* 00084 80883814 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00088 80883818 03E00008 */ jr $ra /* 0008C 8088381C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s index ee05dec9f2..96740adc7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883820.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80884FA8 + .float -0.6 + +glabel D_80884FAC + .float 0.2 + +.text glabel func_80883820 /* 00090 80883820 3C018088 */ lui $at, %hi(D_80884FA8) ## $at = 80880000 /* 00094 80883824 C4244FA8 */ lwc1 $f4, %lo(D_80884FA8)($at) @@ -104,5 +112,3 @@ glabel func_80883820 /* 001FC 8088398C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00200 80883990 03E00008 */ jr $ra /* 00204 80883994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s index cfd1341e62..d0dd1cea23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883998.s @@ -30,5 +30,3 @@ glabel func_80883998 /* 0026C 808839FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00270 80883A00 03E00008 */ jr $ra /* 00274 80883A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s index fffb6242c8..d91f54525d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883C90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80884FC4 + .float 0.9800000190734863 + +.text glabel func_80883C90 /* 00500 80883C90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00504 80883C94 AFBF0024 */ sw $ra, 0x0024($sp) @@ -121,5 +126,3 @@ glabel func_80883C90 /* 006B8 80883E48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006BC 80883E4C 03E00008 */ jr $ra /* 006C0 80883E50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s index d9833c0066..5f03eb810e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80883E54.s @@ -237,5 +237,3 @@ glabel func_80883E54 /* 00A1C 808841AC 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 00A20 808841B0 03E00008 */ jr $ra /* 00A24 808841B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s index 0be8e9513e..637de1fb86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808841B8.s @@ -133,5 +133,3 @@ glabel func_808841B8 /* 00C14 808843A4 8FB40070 */ lw $s4, 0x0070($sp) /* 00C18 808843A8 03E00008 */ jr $ra /* 00C1C 808843AC 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s index 84a7fc1e8f..2b09584ab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s @@ -76,5 +76,3 @@ glabel func_808843B0 /* 00D34 808844C4 8FB10020 */ lw $s1, 0x0020($sp) /* 00D38 808844C8 03E00008 */ jr $ra /* 00D3C 808844CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s index 436b72af00..769a709c40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808844D0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80884F08 + .asciz "../z_bg_heavy_block.c" + .balign 4 + +glabel D_80884F20 + .asciz "\"NA_SE_PL_PULL_UP_BIGROCK\" = %s\n" + .balign 4 + +glabel D_80884F44 + .asciz "NA_SE_PL_PULL_UP_BIGROCK" + .balign 4 + +.text glabel func_808844D0 /* 00D40 808844D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00D44 808844D4 AFBF002C */ sw $ra, 0x002C($sp) @@ -107,5 +121,3 @@ glabel func_808844D0 /* 00EBC 8088464C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00EC0 80884650 03E00008 */ jr $ra /* 00EC4 80884654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s index a3c00594fe..778e1f2d89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s @@ -211,5 +211,3 @@ glabel func_80884658 /* 011D0 80884960 8FB10020 */ lw $s1, 0x0020($sp) /* 011D4 80884964 03E00008 */ jr $ra /* 011D8 80884968 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s index 1402270088..6c29fdf22d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_8088496C.s @@ -2,5 +2,3 @@ glabel func_8088496C /* 011DC 8088496C AFA40000 */ sw $a0, 0x0000($sp) /* 011E0 80884970 03E00008 */ jr $ra /* 011E4 80884974 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s index 49b4c6a8c1..4fd1b0453b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884978.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_80884FC8 + .word 0x44D1C000 +glabel D_80884FCC + .word 0x44A0C000 +glabel D_80884FD0 + .word 0x44D82000 +glabel D_80884FD4 + .word 0x449EA000 +glabel D_80884FD8 + .word 0xC437C000 +glabel D_80884FDC + .word 0xC555A000 + +.text glabel func_80884978 /* 011E8 80884978 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 011EC 8088497C AFB00030 */ sw $s0, 0x0030($sp) @@ -171,5 +186,3 @@ glabel func_80884978 /* 0144C 80884BDC 8FB00030 */ lw $s0, 0x0030($sp) /* 01450 80884BE0 03E00008 */ jr $ra /* 01454 80884BE4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s index 4cf3626390..81c787e452 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s @@ -43,4 +43,3 @@ glabel func_80884DB4 /* 016B4 80884E44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016B8 80884E48 03E00008 */ jr $ra /* 016BC 80884E4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s index 8b33ecf880..020326614b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s @@ -10,5 +10,3 @@ glabel BgHidanCurtain_Destroy /* 00288 80885428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0028C 8088542C 03E00008 */ jr $ra /* 00290 80885430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s index 2c752f7744..98e47a5ad2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80885CCC + .asciz "../z_bg_hidan_curtain.c" + .balign 4 + +glabel D_80885CE4 + .asciz "../z_bg_hidan_curtain.c" + .balign 4 + +glabel D_80885CFC + .asciz "../z_bg_hidan_curtain.c" + .balign 4 + +.text glabel BgHidanCurtain_Draw /* 0084C 808859EC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00850 808859F0 AFB10038 */ sw $s1, 0x0038($sp) @@ -96,4 +110,3 @@ glabel BgHidanCurtain_Draw /* 009C4 80885B64 8FB10038 */ lw $s1, 0x0038($sp) /* 009C8 80885B68 03E00008 */ jr $ra /* 009CC 80885B6C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s index b026ba07c1..6252c8d23b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80885BF0 + .asciz "Curtain (arg_data 0x%04x)\n" + .balign 4 + +glabel D_80885C0C + .asciz "Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80885C50 + .asciz "../z_bg_hidan_curtain.c" + .balign 4 + +glabel D_80885C68 + .asciz "Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80885CB4 + .asciz "../z_bg_hidan_curtain.c" + .balign 4 + +.text glabel BgHidanCurtain_Init /* 00000 808851A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 808851A4 AFB00018 */ sw $s0, 0x0018($sp) @@ -182,5 +204,3 @@ glabel BgHidanCurtain_Init /* 00260 80885400 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00264 80885404 03E00008 */ jr $ra /* 00268 80885408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s index 79e2b4e8ac..1f8d0ae54a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s @@ -181,5 +181,3 @@ glabel BgHidanCurtain_Update /* 00840 808859E0 8FB10020 */ lw $s1, 0x0020($sp) /* 00844 808859E4 03E00008 */ jr $ra /* 00848 808859E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s index ab5ef7c01e..1667413af6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s @@ -48,5 +48,3 @@ glabel func_80885434 /* 0033C 808854DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00340 808854E0 03E00008 */ jr $ra /* 00344 808854E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s index 6f06136163..c1505b6202 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s @@ -11,5 +11,3 @@ glabel func_808854E8 .L8088550C: /* 0036C 8088550C 03E00008 */ jr $ra /* 00370 80885510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s index bc3efa9caa..c6b57b6f76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s @@ -17,5 +17,3 @@ glabel func_80885514 /* 003A8 80885548 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003AC 8088554C 03E00008 */ jr $ra /* 003B0 80885550 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s index 0ad1314362..52b8380577 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s @@ -17,5 +17,3 @@ glabel func_80885554 /* 003E8 80885588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003EC 8088558C 03E00008 */ jr $ra /* 003F0 80885590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s index 633f78cb6f..6929f16e28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s @@ -30,5 +30,3 @@ glabel func_80885594 /* 00458 808855F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0045C 808855FC 03E00008 */ jr $ra /* 00460 80885600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s index c8518ff9e2..e2f6731a38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s @@ -70,5 +70,3 @@ glabel func_80885604 /* 00548 808856E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0054C 808856EC 03E00008 */ jr $ra /* 00550 808856F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s index e8d3e1582d..053200f93f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s @@ -28,5 +28,3 @@ glabel func_808856F4 /* 005AC 8088574C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005B0 80885750 03E00008 */ jr $ra /* 005B4 80885754 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s index 543747f0bc..a1f644a50c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s @@ -18,5 +18,3 @@ glabel BgHidanDalm_Destroy /* 00120 80885F40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00124 80885F44 03E00008 */ jr $ra /* 00128 80885F48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s index e704c14648..451077c3c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s @@ -35,4 +35,3 @@ glabel BgHidanDalm_Draw /* 00654 80886474 03E00008 */ jr $ra /* 00658 80886478 00000000 */ nop /* 0065C 8088647C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s index e4c36ceb2a..2869fa7d3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s @@ -64,5 +64,3 @@ glabel BgHidanDalm_Init /* 000D8 80885EF8 8FB10020 */ lw $s1, 0x0020($sp) /* 000DC 80885EFC 03E00008 */ jr $ra /* 000E0 80885F00 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Update.s index 16cb8a4af5..71012329c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Update.s @@ -23,5 +23,3 @@ glabel BgHidanDalm_Update /* 004AC 808862CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004B0 808862D0 03E00008 */ jr $ra /* 004B4 808862D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s index 07d628c905..98a5d6ec31 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s @@ -107,5 +107,3 @@ glabel func_80885F4C /* 002A0 808860C0 8FB10018 */ lw $s1, 0x0018($sp) /* 002A4 808860C4 03E00008 */ jr $ra /* 002A8 808860C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808860CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808860CC.s index b71dd6be4c..725c5deb01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808860CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808860CC.s @@ -116,5 +116,3 @@ glabel func_808860CC /* 00450 80886270 8FB70050 */ lw $s7, 0x0050($sp) /* 00454 80886274 03E00008 */ jr $ra /* 00458 80886278 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808862D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808862D8.s index 570c2bb1c6..0d7cb7051b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808862D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808862D8.s @@ -74,5 +74,3 @@ glabel func_808862D8 /* 005D8 808863F8 8FB30028 */ lw $s3, 0x0028($sp) /* 005DC 808863FC 03E00008 */ jr $ra /* 005E0 80886400 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s index 5858e7d865..f0311acb3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s @@ -10,5 +10,3 @@ glabel BgHidanFwbig_Destroy /* 001B4 808874A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001B8 808874A8 03E00008 */ jr $ra /* 001BC 808874AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s index 35df922959..66d84a2875 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80887F00 + .asciz "../z_bg_hidan_fwbig.c" + .balign 4 + +glabel D_80887F18 + .asciz "../z_bg_hidan_fwbig.c" + .balign 4 + +glabel D_80887F30 + .asciz "../z_bg_hidan_fwbig.c" + .balign 4 + +.text glabel BgHidanFwbig_Draw /* 008E0 80887BD0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 008E4 80887BD4 AFB10038 */ sw $s1, 0x0038($sp) @@ -186,4 +200,3 @@ glabel BgHidanFwbig_Draw /* 00BB4 80887EA4 03E00008 */ jr $ra /* 00BB8 80887EA8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 00BBC 80887EAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s index 3ce24f38b4..924de00e26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s @@ -113,5 +113,3 @@ glabel BgHidanFwbig_Init /* 0018C 8088747C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00190 80887480 03E00008 */ jr $ra /* 00194 80887484 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s index a44ef60605..b4a48d4c91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s @@ -102,5 +102,3 @@ glabel BgHidanFwbig_Update /* 008D4 80887BC4 8FB10020 */ lw $s1, 0x0020($sp) /* 008D8 80887BC8 03E00008 */ jr $ra /* 008DC 80887BCC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s index 87fb6b6d09..bc59f13ebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808874B0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80887F48 + .word 0x445D599A +glabel D_80887F4C + .word 0x445D599A + +.text glabel func_808874B0 /* 001C0 808874B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 001C4 808874B4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -34,5 +41,3 @@ glabel func_808874B0 /* 00238 80887528 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0023C 8088752C 03E00008 */ jr $ra /* 00240 80887530 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s index 2117d19aa1..ffb5c20c59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887534.s @@ -26,5 +26,3 @@ glabel func_80887534 /* 0029C 8088758C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002A0 80887590 03E00008 */ jr $ra /* 002A4 80887594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s index 4d755f5344..77030c07d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887598.s @@ -11,5 +11,3 @@ glabel func_80887598 .L808875BC: /* 002CC 808875BC 03E00008 */ jr $ra /* 002D0 808875C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s index 188e38392d..acd3e8be1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808875C4.s @@ -32,5 +32,3 @@ glabel func_808875C4 /* 0033C 8088762C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00340 80887630 03E00008 */ jr $ra /* 00344 80887634 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s index 69649a0e7b..cdb9a979c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887638.s @@ -63,5 +63,3 @@ glabel func_80887638 /* 0041C 8088770C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00420 80887710 03E00008 */ jr $ra /* 00424 80887714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s index 7d8c24e4e0..19802b4bab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887718.s @@ -21,5 +21,3 @@ glabel func_80887718 /* 0046C 8088775C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00470 80887760 03E00008 */ jr $ra /* 00474 80887764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s index e72315ef91..e24a880623 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887768.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80887F50 + .float 1150.0 + +.text glabel func_80887768 /* 00478 80887768 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0047C 8088776C AFBF001C */ sw $ra, 0x001C($sp) @@ -23,5 +28,3 @@ glabel func_80887768 /* 004C8 808877B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004CC 808877BC 03E00008 */ jr $ra /* 004D0 808877C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s index f265639d22..47ef807505 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s @@ -42,5 +42,3 @@ glabel func_808877C4 /* 00568 80887858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0056C 8088785C 03E00008 */ jr $ra /* 00570 80887860 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s index 2b9675b817..cee82ba9c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_80887864.s @@ -136,5 +136,3 @@ glabel func_80887864 /* 0075C 80887A4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00760 80887A50 03E00008 */ jr $ra /* 00764 80887A54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s index a7bb0b6440..90095a242d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s @@ -22,5 +22,3 @@ glabel BgHidanHamstep_Destroy /* 0047C 808884BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00480 808884C0 03E00008 */ jr $ra /* 00484 808884C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s index c1a905b1b1..ba689bf6a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80888F84 + .asciz "../z_bg_hidan_hamstep.c" + .balign 4 + +glabel D_80888F9C + .asciz "../z_bg_hidan_hamstep.c" + .balign 4 + +glabel D_80888FB4 + .asciz "../z_bg_hidan_hamstep.c" + .balign 4 + +.text glabel BgHidanHamstep_Draw /* 00C28 80888C68 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00C2C 80888C6C AFBF001C */ sw $ra, 0x001C($sp) @@ -68,4 +82,3 @@ glabel BgHidanHamstep_Draw /* 00D28 80888D68 00000000 */ nop .L80888D6C: /* 00D2C 80888D6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s index a9f8447e60..60e5a3943b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80888EA0 + .asciz "◯◯◯炎の神殿オブジェクト【ハンマーステップ】出現\n" + .balign 4 + +glabel D_80888ED4 + .asciz "【ハンマーステップ】 足場産れない！！\n" + .balign 4 + +glabel D_80888EFC + .asciz "%s %d\n" + .balign 4 + +glabel D_80888F04 + .asciz "../z_bg_hidan_hamstep.c" + .balign 4 + +.late_rodata +glabel D_80888FCC + .float -1.2 + +.text glabel BgHidanHamstep_Init /* 00198 808881D8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0019C 808881DC AFBF002C */ sw $ra, 0x002C($sp) @@ -188,5 +210,3 @@ glabel BgHidanHamstep_Init /* 00428 80888468 8FB20028 */ lw $s2, 0x0028($sp) /* 0042C 8088846C 03E00008 */ jr $ra /* 00430 80888470 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Update.s index afab6fffae..8cf88c6a35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Update.s @@ -8,5 +8,3 @@ glabel BgHidanHamstep_Update /* 00C1C 80888C5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C20 80888C60 03E00008 */ jr $ra /* 00C24 80888C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888040.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888040.s index a59684c1fa..a71a570680 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888040.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888040.s @@ -6,5 +6,3 @@ glabel func_80888040 /* 00010 80888050 8DEF8E2C */ lw $t7, %lo(D_80888E2C)($t7) /* 00014 80888054 03E00008 */ jr $ra /* 00018 80888058 AC8F023C */ sw $t7, 0x023C($a0) ## 0000023C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s index 119339e41b..e2180b42e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s @@ -100,5 +100,3 @@ glabel func_8088805C /* 0018C 808881CC 8FB50068 */ lw $s5, 0x0068($sp) /* 00190 808881D0 03E00008 */ jr $ra /* 00194 808881D4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s index 19ffc1973c..04c9c2ae91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s @@ -94,5 +94,3 @@ glabel func_808884C8 /* 005EC 8088862C 8FB40050 */ lw $s4, 0x0050($sp) /* 005F0 80888630 03E00008 */ jr $ra /* 005F4 80888634 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888638.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888638.s index c3e3a490b0..0631e75a0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888638.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888638.s @@ -25,5 +25,3 @@ glabel func_80888638 /* 00648 80888688 8FB10018 */ lw $s1, 0x0018($sp) /* 0064C 8088868C 03E00008 */ jr $ra /* 00650 80888690 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888694.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888694.s index b320a8717a..59efd5b0a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888694.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888694.s @@ -45,5 +45,3 @@ glabel func_80888694 .L8088872C: /* 006EC 8088872C 03E00008 */ jr $ra /* 006F0 80888730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s index d2be899390..fe92ea2fbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s @@ -38,5 +38,3 @@ glabel func_80888734 /* 00778 808887B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0077C 808887BC 03E00008 */ jr $ra /* 00780 808887C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s index 939e6b86c8..8efaa71a24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s @@ -43,5 +43,3 @@ glabel func_808887C4 /* 00814 80888854 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00818 80888858 03E00008 */ jr $ra /* 0081C 8088885C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s index 848498e992..2bf66ab58c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80888F1C + .asciz "A(%d)\n" + .balign 4 + +.late_rodata +glabel D_80888FD0 + .word 0xBE75C28F + +.text glabel func_80888860 /* 00820 80888860 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00824 80888864 AFBF0024 */ sw $ra, 0x0024($sp) @@ -91,5 +101,3 @@ glabel func_80888860 /* 0096C 808889AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00970 808889B0 03E00008 */ jr $ra /* 00974 808889B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808889B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808889B8.s index bed800e811..882ba76220 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808889B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808889B8.s @@ -42,5 +42,3 @@ glabel func_808889B8 /* 00A0C 80888A4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A10 80888A50 03E00008 */ jr $ra /* 00A14 80888A54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s index 3284cd0d33..c6b5bdb4a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s @@ -1,3 +1,27 @@ +.rdata +glabel D_80888F24 + .asciz "【ハンマーステップ】 arg_data おかしい (arg_data = %d)" + .balign 4 + +glabel D_80888F5C + .asciz "%s %d\n" + .balign 4 + +glabel D_80888F64 + .asciz "../z_bg_hidan_hamstep.c" + .balign 4 + +glabel D_80888F7C + .asciz "B(%d)\n" + .balign 4 + +.late_rodata +glabel D_80888FD4 + .word 0xBE75C28F +glabel D_80888FD8 + .float 10000.0 + +.text glabel func_80888A58 /* 00A18 80888A58 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00A1C 80888A5C AFBF0024 */ sw $ra, 0x0024($sp) @@ -130,5 +154,3 @@ glabel func_80888A58 /* 00BEC 80888C2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00BF0 80888C30 03E00008 */ jr $ra /* 00BF4 80888C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888C38.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888C38.s index 4417db10d9..00ef011164 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888C38.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888C38.s @@ -2,5 +2,3 @@ glabel func_80888C38 /* 00BF8 80888C38 AFA40000 */ sw $a0, 0x0000($sp) /* 00BFC 80888C3C 03E00008 */ jr $ra /* 00C00 80888C40 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s index 5491ebfab7..36216c35c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s @@ -18,5 +18,3 @@ glabel BgHidanHrock_Destroy /* 00368 80889498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0036C 8088949C 03E00008 */ jr $ra /* 00370 808894A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s index 00a7c45c99..42f54ced75 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s @@ -17,4 +17,3 @@ glabel BgHidanHrock_Draw /* 006C4 808897F4 00000000 */ nop /* 006C8 808897F8 00000000 */ nop /* 006CC 808897FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s index 896193d28d..29ea76607b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808898C0 + .float 3000.0 +glabel D_808898C4 + .float 3000.0 + +.text glabel BgHidanHrock_Init /* 00000 80889130 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 00004 80889134 AFA500B4 */ sw $a1, 0x00B4($sp) @@ -221,5 +228,3 @@ glabel BgHidanHrock_Init /* 00320 80889450 D7B40020 */ ldc1 $f20, 0x0020($sp) /* 00324 80889454 03E00008 */ jr $ra /* 00328 80889458 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Update.s index 751e20f5d6..0b02694b3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Update.s @@ -8,5 +8,3 @@ glabel BgHidanHrock_Update /* 00680 808897B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00684 808897B4 03E00008 */ jr $ra /* 00688 808897B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894A4.s index 5ff1e2bc61..a47daf950d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894A4.s @@ -2,5 +2,3 @@ glabel func_808894A4 /* 00374 808894A4 AFA40000 */ sw $a0, 0x0000($sp) /* 00378 808894A8 03E00008 */ jr $ra /* 0037C 808894AC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s index cb2bdf84e1..ee6b339155 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s @@ -96,5 +96,3 @@ glabel func_808894B0 /* 004D0 80889600 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004D4 80889604 03E00008 */ jr $ra /* 004D8 80889608 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s index 0a7c620cf8..b073d1443d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s @@ -48,5 +48,3 @@ glabel func_8088960C /* 0057C 808896AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00580 808896B0 03E00008 */ jr $ra /* 00584 808896B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s index a3f7a1966c..7351bc012b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s @@ -64,5 +64,3 @@ glabel func_808896B8 /* 0065C 8088978C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00660 80889790 03E00008 */ jr $ra /* 00664 80889794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Destroy.s index cf753c9009..ce52dc9ec8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Destroy.s @@ -12,5 +12,3 @@ glabel BgHidanKousi_Destroy /* 00160 80889AC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00164 80889AC4 03E00008 */ jr $ra /* 00168 80889AC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s index f437fb2297..f3264fef17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80889EEC + .asciz "../z_bg_hidan_kousi.c" + .balign 4 + +glabel D_80889F04 + .asciz "../z_bg_hidan_kousi.c" + .balign 4 + +glabel D_80889F1C + .asciz "../z_bg_hidan_kousi.c" + .balign 4 + +.text glabel BgHidanKousi_Draw /* 003F8 80889D58 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 003FC 80889D5C AFBF001C */ sw $ra, 0x001C($sp) @@ -57,4 +71,3 @@ glabel BgHidanKousi_Draw /* 004D4 80889E34 00000000 */ nop /* 004D8 80889E38 00000000 */ nop /* 004DC 80889E3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Init.s index cd2c674075..4107449bb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80889E90 + .asciz "◯◯◯炎の神殿オブジェクト【格子(arg_data : %0x)】出現 (%d %d)\n" + .balign 4 + +glabel D_80889ED0 + .asciz "arg_data おかしい 【格子】\n" + .balign 4 + +.text glabel BgHidanKousi_Init /* 00008 80889968 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0000C 8088996C AFBF001C */ sw $ra, 0x001C($sp) @@ -74,13 +84,13 @@ glabel BgHidanKousi_Init /* 00100 80889A60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00104 80889A64 3C058089 */ lui $a1, %hi(func_80889D28) ## $a1 = 80890000 /* 00108 80889A68 24A59D28 */ addiu $a1, $a1, %lo(func_80889D28) ## $a1 = 80889D28 -/* 0010C 80889A6C 0C222658 */ jal func_80889960 +/* 0010C 80889A6C 0C222658 */ jal BgHidanKousi_SetupAction /* 00110 80889A70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00114 80889A74 10000005 */ beq $zero, $zero, .L80889A8C /* 00118 80889A78 8FBF001C */ lw $ra, 0x001C($sp) .L80889A7C: /* 0011C 80889A7C 3C058089 */ lui $a1, %hi(func_80889B5C) ## $a1 = 80890000 -/* 00120 80889A80 0C222658 */ jal func_80889960 +/* 00120 80889A80 0C222658 */ jal BgHidanKousi_SetupAction /* 00124 80889A84 24A59B5C */ addiu $a1, $a1, %lo(func_80889B5C) ## $a1 = 80889B5C /* 00128 80889A88 8FBF001C */ lw $ra, 0x001C($sp) .L80889A8C: @@ -88,5 +98,3 @@ glabel BgHidanKousi_Init /* 00130 80889A90 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00134 80889A94 03E00008 */ jr $ra /* 00138 80889A98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_SetupAction.s similarity index 81% rename from asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889960.s rename to asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_SetupAction.s index 84dd5f6e9d..73071443f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_80889960 +glabel BgHidanKousi_SetupAction /* 00000 80889960 03E00008 */ jr $ra /* 00004 80889964 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Update.s index 7ec9c4fb3f..cca4c77c98 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Update.s @@ -8,5 +8,3 @@ glabel BgHidanKousi_Update /* 003EC 80889D4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F0 80889D50 03E00008 */ jr $ra /* 003F4 80889D54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889ACC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889ACC.s index 2fec6f9d8f..eb74ecd1dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889ACC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889ACC.s @@ -37,5 +37,3 @@ glabel func_80889ACC /* 001F0 80889B50 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001F4 80889B54 03E00008 */ jr $ra /* 001F8 80889B58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889B5C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889B5C.s index 801c0b1d76..0bc9c30a26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889B5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889B5C.s @@ -13,7 +13,7 @@ glabel func_80889B5C /* 00224 80889B84 1040000A */ beq $v0, $zero, .L80889BB0 /* 00228 80889B88 8FA40018 */ lw $a0, 0x0018($sp) /* 0022C 80889B8C 3C058089 */ lui $a1, %hi(func_80889BC0) ## $a1 = 80890000 -/* 00230 80889B90 0C222658 */ jal func_80889960 +/* 00230 80889B90 0C222658 */ jal BgHidanKousi_SetupAction /* 00234 80889B94 24A59BC0 */ addiu $a1, $a1, %lo(func_80889BC0) ## $a1 = 80889BC0 /* 00238 80889B98 8FA4001C */ lw $a0, 0x001C($sp) /* 0023C 80889B9C 0C020120 */ jal func_80080480 @@ -26,5 +26,3 @@ glabel func_80889B5C /* 00254 80889BB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00258 80889BB8 03E00008 */ jr $ra /* 0025C 80889BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889BC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889BC0.s index 75207788fe..a72b0de623 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889BC0.s @@ -16,12 +16,10 @@ glabel func_80889BC0 /* 00298 80889BF8 5F200004 */ bgtzl $t9, .L80889C0C /* 0029C 80889BFC 8FBF0014 */ lw $ra, 0x0014($sp) .L80889C00: -/* 002A0 80889C00 0C222658 */ jal func_80889960 +/* 002A0 80889C00 0C222658 */ jal BgHidanKousi_SetupAction /* 002A4 80889C04 24A59C18 */ addiu $a1, $a1, %lo(func_80889C18) ## $a1 = 80889C18 /* 002A8 80889C08 8FBF0014 */ lw $ra, 0x0014($sp) .L80889C0C: /* 002AC 80889C0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002B0 80889C10 03E00008 */ jr $ra /* 002B4 80889C14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C18.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C18.s index f97d4478fe..3af567c91b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C18.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C18.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80889F34 + .float 0.2 + +.text glabel func_80889C18 /* 002B8 80889C18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002BC 80889C1C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -17,7 +22,7 @@ glabel func_80889C18 /* 002F4 80889C54 45000005 */ bc1f .L80889C6C /* 002F8 80889C58 00000000 */ nop /* 002FC 80889C5C E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 00300 80889C60 0C222658 */ jal func_80889960 +/* 00300 80889C60 0C222658 */ jal BgHidanKousi_SetupAction /* 00304 80889C64 AFA40018 */ sw $a0, 0x0018($sp) /* 00308 80889C68 8FA40018 */ lw $a0, 0x0018($sp) .L80889C6C: @@ -31,5 +36,3 @@ glabel func_80889C18 /* 00324 80889C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00328 80889C88 03E00008 */ jr $ra /* 0032C 80889C8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C90.s index 25992c419d..bcfa68587d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889C90.s @@ -24,7 +24,7 @@ glabel func_80889C90 /* 00384 80889CE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00388 80889CE8 3C058089 */ lui $a1, %hi(func_80889D28) ## $a1 = 80890000 /* 0038C 80889CEC 24A59D28 */ addiu $a1, $a1, %lo(func_80889D28) ## $a1 = 80889D28 -/* 00390 80889CF0 0C222658 */ jal func_80889960 +/* 00390 80889CF0 0C222658 */ jal BgHidanKousi_SetupAction /* 00394 80889CF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00398 80889CF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0039C 80889CFC 0C00BE0A */ jal Audio_PlayActorSound2 @@ -41,5 +41,3 @@ glabel func_80889C90 /* 003BC 80889D1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003C0 80889D20 03E00008 */ jr $ra /* 003C4 80889D24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889D28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889D28.s index cc4a24c3af..cffcfec58b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889D28.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889D28.s @@ -2,5 +2,3 @@ glabel func_80889D28 /* 003C8 80889D28 AFA40000 */ sw $a0, 0x0000($sp) /* 003CC 80889D2C 03E00008 */ jr $ra /* 003D0 80889D30 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s index 6ed1beca8d..c4c802174b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s @@ -18,5 +18,3 @@ glabel BgHidanKowarerukabe_Destroy /* 00264 8088A284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00268 8088A288 03E00008 */ jr $ra /* 0026C 8088A28C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s index 0f5b78c8f1..4b5eea4db0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088AF30 + .asciz "../z_bg_hidan_kowarerukabe.c" + .balign 4 + +glabel D_8088AF50 + .asciz "../z_bg_hidan_kowarerukabe.c" + .balign 4 + +glabel D_8088AF70 + .asciz "../z_bg_hidan_kowarerukabe.c" + .balign 4 + +.text glabel BgHidanKowarerukabe_Draw /* 00CDC 8088ACFC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00CE0 8088AD00 AFBF001C */ sw $ra, 0x001C($sp) @@ -60,4 +74,3 @@ glabel BgHidanKowarerukabe_Draw /* 00DC4 8088ADE4 00000000 */ nop /* 00DC8 8088ADE8 00000000 */ nop /* 00DCC 8088ADEC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Init.s index a78ef16ce7..7511ad18ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088AE90 + .asciz "Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8088AEE0 + .asciz "../z_bg_hidan_kowarerukabe.c" + .balign 4 + +glabel D_8088AF00 + .asciz "(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgHidanKowarerukabe_Init /* 00158 8088A178 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0015C 8088A17C AFBF001C */ sw $ra, 0x001C($sp) @@ -62,5 +76,3 @@ glabel BgHidanKowarerukabe_Init /* 0021C 8088A23C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00220 8088A240 03E00008 */ jr $ra /* 00224 8088A244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s index 3d7ea1d2b9..172525c719 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s @@ -60,5 +60,3 @@ glabel BgHidanKowarerukabe_Update /* 00CD0 8088ACF0 8FB10018 */ lw $s1, 0x0018($sp) /* 00CD4 8088ACF4 03E00008 */ jr $ra /* 00CD8 8088ACF8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A020.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A020.s index ace0fa64b7..522ccce145 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A020.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A020.s @@ -41,5 +41,3 @@ glabel func_8088A020 /* 0008C 8088A0AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00090 8088A0B0 03E00008 */ jr $ra /* 00094 8088A0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s index deb1850c8b..34edbf87be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s @@ -37,5 +37,3 @@ glabel func_8088A0B8 /* 00124 8088A144 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00128 8088A148 03E00008 */ jr $ra /* 0012C 8088A14C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A150.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A150.s index 876247f142..a6915938c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A150.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A150.s @@ -9,5 +9,3 @@ glabel func_8088A150 /* 0014C 8088A16C 46062200 */ add.s $f8, $f4, $f6 /* 00150 8088A170 03E00008 */ jr $ra /* 00154 8088A174 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s index 8bce1dbbc7..8fa6811e81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s @@ -74,5 +74,3 @@ glabel func_8088A290 /* 00384 8088A3A4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00388 8088A3A8 03E00008 */ jr $ra /* 0038C 8088A3AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s index 8e626f7217..94bd9602c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8088AF90 + .float 1.4 + +.text glabel func_8088A3B0 /* 00390 8088A3B0 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 /* 00394 8088A3B4 AFB20080 */ sw $s2, 0x0080($sp) @@ -190,5 +195,3 @@ glabel func_8088A3B0 /* 00650 8088A670 8FBE0098 */ lw $s8, 0x0098($sp) /* 00654 8088A674 03E00008 */ jr $ra /* 00658 8088A678 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s index 6c23def996..1bdf99a7d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8088AF94 + .float 1.4 + +.text glabel func_8088A67C /* 0065C 8088A67C 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 00660 8088A680 AFB40088 */ sw $s4, 0x0088($sp) @@ -177,5 +182,3 @@ glabel func_8088A67C /* 008E8 8088A908 8FBE0098 */ lw $s8, 0x0098($sp) /* 008EC 8088A90C 03E00008 */ jr $ra /* 008F0 8088A910 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s index 6f1c17a09c..f0029ba937 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8088AF98 + .float 1.6 + +.text glabel func_8088A914 /* 008F4 8088A914 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 008F8 8088A918 AFB40088 */ sw $s4, 0x0088($sp) @@ -174,5 +179,3 @@ glabel func_8088A914 /* 00B74 8088AB94 8FBE0098 */ lw $s8, 0x0098($sp) /* 00B78 8088AB98 03E00008 */ jr $ra /* 00B7C 8088AB9C 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088ABA0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088ABA0.s index 52ac18d160..52896da499 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088ABA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088ABA0.s @@ -38,5 +38,3 @@ glabel func_8088ABA0 /* 00C00 8088AC20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C04 8088AC24 03E00008 */ jr $ra /* 00C08 8088AC28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s index d74ab57712..d2bf3f104f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s @@ -22,5 +22,3 @@ glabel BgHidanRock_Destroy /* 001C0 8088B240 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C4 8088B244 03E00008 */ jr $ra /* 001C8 8088B248 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s index 9117c0d74c..518f4b9478 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s @@ -61,4 +61,3 @@ glabel BgHidanRock_Draw /* 00ED4 8088BF54 8FB10018 */ lw $s1, 0x0018($sp) /* 00ED8 8088BF58 03E00008 */ jr $ra /* 00EDC 8088BF5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s index 9a58feb5fb..c0322cd9f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s @@ -107,5 +107,3 @@ glabel BgHidanRock_Init /* 0016C 8088B1EC 8FB00014 */ lw $s0, 0x0014($sp) /* 00170 8088B1F0 03E00008 */ jr $ra /* 00174 8088B1F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s index 5367461991..67385b4686 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s @@ -53,5 +53,3 @@ glabel BgHidanRock_Update /* 00BB4 8088BC34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BB8 8088BC38 03E00008 */ jr $ra /* 00BBC 8088BC3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B24C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B24C.s index ec61a47674..a43b8e3343 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B24C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B24C.s @@ -6,5 +6,3 @@ glabel func_8088B24C /* 001DC 8088B25C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 001E0 8088B260 03E00008 */ jr $ra /* 001E4 8088B264 AC980164 */ sw $t8, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s index 7382fe2c8b..cb1d9eb566 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_8088C038 + .float 0.01 + +glabel D_8088C03C + .float 0.01 + +glabel D_8088C040 + .float 0.05 + +glabel D_8088C044 + .word 0x3C4DE32F + +.text glabel func_8088B268 /* 001E8 8088B268 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 001EC 8088B26C AFBF001C */ sw $ra, 0x001C($sp) @@ -249,5 +263,3 @@ glabel func_8088B268 /* 00568 8088B5E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0056C 8088B5EC 03E00008 */ jr $ra /* 00570 8088B5F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B5F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B5F4.s index ec97d12bde..4dfcdf0c37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B5F4.s @@ -17,5 +17,3 @@ glabel func_8088B5F4 /* 005A8 8088B628 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005AC 8088B62C 03E00008 */ jr $ra /* 005B0 8088B630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B634.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B634.s index 61e3d31ce7..e413d7ba20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B634.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B634.s @@ -26,5 +26,3 @@ glabel func_8088B634 /* 00610 8088B690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00614 8088B694 03E00008 */ jr $ra /* 00618 8088B698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s index 8eb94fcea6..233189eec3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s @@ -71,5 +71,3 @@ glabel func_8088B69C /* 00710 8088B790 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00714 8088B794 03E00008 */ jr $ra /* 00718 8088B798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B79C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B79C.s index 678c7f2863..a53f78708b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B79C.s @@ -101,5 +101,3 @@ glabel func_8088B79C /* 00880 8088B900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00884 8088B904 03E00008 */ jr $ra /* 00888 8088B908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s index 70e8bf0526..a7038bb51a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s @@ -19,5 +19,3 @@ glabel func_8088B90C /* 008C8 8088B948 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008CC 8088B94C 03E00008 */ jr $ra /* 008D0 8088B950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B954.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B954.s index 4e7f4e0a78..54e887d7f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B954.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B954.s @@ -16,5 +16,3 @@ glabel func_8088B954 .L8088B988: /* 00908 8088B988 03E00008 */ jr $ra /* 0090C 8088B98C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s index 636d15c618..e82b347c25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_8088C048 + .word 0x44E38000 +glabel D_8088C04C + .float 0.1 + +glabel D_8088C050 + .float 0.1 + +.text glabel func_8088B990 /* 00910 8088B990 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00914 8088B994 AFBF0024 */ sw $ra, 0x0024($sp) @@ -134,5 +144,3 @@ glabel func_8088B990 /* 00AEC 8088BB6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AF0 8088BB70 03E00008 */ jr $ra /* 00AF4 8088BB74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index 8f3bf10872..918f10b8c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088BFF0 + .asciz "../z_bg_hidan_rock.c" + .balign 4 + +glabel D_8088C008 + .asciz "../z_bg_hidan_rock.c" + .balign 4 + +glabel D_8088C020 + .asciz "../z_bg_hidan_rock.c" + .balign 4 + +.text glabel func_8088BC40 /* 00BC0 8088BC40 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00BC4 8088BC44 AFBF001C */ sw $ra, 0x001C($sp) @@ -146,5 +160,3 @@ glabel func_8088BC40 /* 00DF8 8088BE78 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00DFC 8088BE7C 03E00008 */ jr $ra /* 00E00 8088BE80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s index 85ee5c767e..f6a9c805d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s @@ -18,5 +18,3 @@ glabel BgHidanRsekizou_Destroy /* 00140 8088C340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00144 8088C344 03E00008 */ jr $ra /* 00148 8088C348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s index c64cbb27f9..b61fb40d01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088CDBC + .asciz "../z_bg_hidan_rsekizou.c" + .balign 4 + +glabel D_8088CDD8 + .asciz "../z_bg_hidan_rsekizou.c" + .balign 4 + +glabel D_8088CDF4 + .asciz "../z_bg_hidan_rsekizou.c" + .balign 4 + +.text glabel BgHidanRsekizou_Draw /* 0083C 8088CA3C 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00840 8088CA40 AFB50030 */ sw $s5, 0x0030($sp) @@ -141,4 +155,3 @@ glabel BgHidanRsekizou_Draw /* 00A54 8088CC54 00000000 */ nop /* 00A58 8088CC58 00000000 */ nop /* 00A5C 8088CC5C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s index 2cfc395939..6d329b1568 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s @@ -68,5 +68,3 @@ glabel BgHidanRsekizou_Init /* 000F8 8088C2F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000FC 8088C2FC 03E00008 */ jr $ra /* 00100 8088C300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s index 26004054ec..2550163bf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s @@ -245,5 +245,3 @@ glabel BgHidanRsekizou_Update /* 00500 8088C700 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00504 8088C704 03E00008 */ jr $ra /* 00508 8088C708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s index 1fa51f71d1..e7e3cc5cd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s @@ -1,3 +1,20 @@ +.rdata +glabel D_8088CDA0 + .asciz "../z_bg_hidan_rsekizou.c" + .balign 4 + +.late_rodata +glabel D_8088CE10 + .word 0x3E124925 +glabel D_8088CE14 + .word 0x3EAAAAAB +glabel D_8088CE18 + .float 0.7 + +glabel D_8088CE1C + .float 0.7 + +.text glabel func_8088C70C /* 0050C 8088C70C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00510 8088C710 AFBF001C */ sw $ra, 0x001C($sp) @@ -213,5 +230,3 @@ glabel func_8088C70C /* 00830 8088CA30 8FB10018 */ lw $s1, 0x0018($sp) /* 00834 8088CA34 03E00008 */ jr $ra /* 00838 8088CA38 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s index e0b635b466..c4eaf9b6f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s @@ -18,5 +18,3 @@ glabel BgHidanSekizou_Destroy /* 00568 8088D428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0056C 8088D42C 03E00008 */ jr $ra /* 00570 8088D430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s index 92dd077828..699d1ff05b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088E2B8 + .asciz "../z_bg_hidan_sekizou.c" + .balign 4 + +glabel D_8088E2D0 + .asciz "../z_bg_hidan_sekizou.c" + .balign 4 + +glabel D_8088E2E8 + .asciz "../z_bg_hidan_sekizou.c" + .balign 4 + +.text glabel BgHidanSekizou_Draw /* 01028 8088DEE8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 0102C 8088DEEC AFB40030 */ sw $s4, 0x0030($sp) @@ -164,4 +178,3 @@ glabel BgHidanSekizou_Draw /* 01294 8088E154 8FB40030 */ lw $s4, 0x0030($sp) /* 01298 8088E158 03E00008 */ jr $ra /* 0129C 8088E15C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s index a2a32e8460..55cbf01b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s @@ -101,5 +101,3 @@ glabel BgHidanSekizou_Init /* 00520 8088D3E0 8FB20028 */ lw $s2, 0x0028($sp) /* 00524 8088D3E4 03E00008 */ jr $ra /* 00528 8088D3E8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s index ac7631dbc6..024bd0332c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s @@ -90,5 +90,3 @@ glabel BgHidanSekizou_Update /* 00B28 8088D9E8 8FB10018 */ lw $s1, 0x0018($sp) /* 00B2C 8088D9EC 03E00008 */ jr $ra /* 00B30 8088D9F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s index c3e021d6d5..ff24aac2db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s @@ -244,5 +244,3 @@ glabel func_8088CEC0 /* 003B0 8088D270 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 003B4 8088D274 03E00008 */ jr $ra /* 003B8 8088D278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D434.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D434.s index 4491d397c5..d4e633727a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D434.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D434.s @@ -201,5 +201,3 @@ glabel func_8088D434 /* 00854 8088D714 8FB70030 */ lw $s7, 0x0030($sp) /* 00858 8088D718 03E00008 */ jr $ra /* 0085C 8088D71C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D720.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D720.s index 4005103631..2bfe383584 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D720.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D720.s @@ -12,5 +12,3 @@ glabel func_8088D720 .L8088D748: /* 00888 8088D748 03E00008 */ jr $ra /* 0088C 8088D74C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D750.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D750.s index 02267dc4d9..da902608b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D750.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D750.s @@ -101,5 +101,3 @@ glabel func_8088D750 /* 009EC 8088D8AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009F0 8088D8B0 03E00008 */ jr $ra /* 009F4 8088D8B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s index a0631c5f8b..150e8e0bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s @@ -1,3 +1,18 @@ +.rdata +glabel D_8088E2A0 + .asciz "../z_bg_hidan_sekizou.c" + .balign 4 + +.late_rodata +glabel D_8088E300 + .word 0x3E124925 +glabel D_8088E304 + .float 0.7 + +glabel D_8088E308 + .float 0.7 + +.text glabel func_8088D9F4 /* 00B34 8088D9F4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00B38 8088D9F8 87AE0062 */ lh $t6, 0x0062($sp) @@ -154,5 +169,3 @@ glabel func_8088D9F4 /* 00D84 8088DC44 00601025 */ or $v0, $v1, $zero ## $v0 = 00000008 /* 00D88 8088DC48 03E00008 */ jr $ra /* 00D8C 8088DC4C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s index 72271af942..23cb500621 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s @@ -120,5 +120,3 @@ glabel func_8088DC50 /* 00F3C 8088DDFC 8FB60050 */ lw $s6, 0x0050($sp) /* 00F40 8088DE00 03E00008 */ jr $ra /* 00F44 8088DE04 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DE08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DE08.s index 6cd29b372c..0c9f4af5a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DE08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DE08.s @@ -60,5 +60,3 @@ glabel func_8088DE08 /* 0101C 8088DEDC ACCF000C */ sw $t7, 0x000C($a2) ## 0000000C /* 01020 8088DEE0 03E00008 */ jr $ra /* 01024 8088DEE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s index 8285276258..afc8f8ba10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s @@ -18,5 +18,3 @@ glabel BgHidanSima_Destroy /* 0013C 8088E50C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00140 8088E510 03E00008 */ jr $ra /* 00144 8088E514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s index 057d8420e6..370751955a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088F250 + .asciz "../z_bg_hidan_sima.c" + .balign 4 + +glabel D_8088F268 + .asciz "../z_bg_hidan_sima.c" + .balign 4 + +glabel D_8088F280 + .asciz "../z_bg_hidan_sima.c" + .balign 4 + +.text glabel BgHidanSima_Draw /* 00C38 8088F008 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00C3C 8088F00C AFBF001C */ sw $ra, 0x001C($sp) @@ -95,4 +109,3 @@ glabel BgHidanSima_Draw /* 00DA4 8088F174 00000000 */ nop /* 00DA8 8088F178 00000000 */ nop /* 00DAC 8088F17C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s index da4be4bd46..b45d27e927 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s @@ -73,5 +73,3 @@ glabel BgHidanSima_Init /* 000F4 8088E4C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000F8 8088E4C8 03E00008 */ jr $ra /* 000FC 8088E4CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s index 2643eadfe5..28fe9d02f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8088F2B8 + .word 0x3E20D97C + +.text glabel BgHidanSima_Update /* 0069C 8088EA6C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 006A0 8088EA70 AFB00018 */ sw $s0, 0x0018($sp) @@ -64,5 +69,3 @@ glabel BgHidanSima_Update /* 00778 8088EB48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0077C 8088EB4C 03E00008 */ jr $ra /* 00780 8088EB50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s index 74efb48b04..cf01392e36 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s @@ -49,5 +49,3 @@ glabel func_8088E518 /* 001F4 8088E5C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001F8 8088E5C8 03E00008 */ jr $ra /* 001FC 8088E5CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s index 52ea77de52..0f0d45585c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s @@ -71,5 +71,3 @@ glabel func_8088E5D0 /* 002F4 8088E6C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002F8 8088E6C8 03E00008 */ jr $ra /* 002FC 8088E6CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s index 5759719782..6996f6cbb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s @@ -39,5 +39,3 @@ glabel func_8088E6D0 /* 00384 8088E754 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00388 8088E758 03E00008 */ jr $ra /* 0038C 8088E75C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E760.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E760.s index 03a64189ba..5f5d2647d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E760.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E760.s @@ -19,5 +19,3 @@ glabel func_8088E760 .L8088E7A0: /* 003D0 8088E7A0 03E00008 */ jr $ra /* 003D4 8088E7A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s index a064476a9f..340ca53563 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8088F298 + .word 0x3F9111F0, 0xC34C1A8B +glabel D_8088F2A0 + .word 0x400921FB, 0x60000000 +glabel D_8088F2A8 + .word 0x3F9111F0, 0xC34C1A8B +glabel D_8088F2B0 + .word 0x400921FB, 0x60000000 + +.text glabel func_8088E7A8 /* 003D8 8088E7A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 003DC 8088E7AC AFBF001C */ sw $ra, 0x001C($sp) @@ -96,5 +107,3 @@ glabel func_8088E7A8 /* 00530 8088E900 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00534 8088E904 03E00008 */ jr $ra /* 00538 8088E908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s index c7836e8351..d43da0fb88 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s @@ -91,5 +91,3 @@ glabel func_8088E90C /* 00690 8088EA60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00694 8088EA64 03E00008 */ jr $ra /* 00698 8088EA68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s index 7a7eeeb46c..cc92e07e77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8088F220 + .asciz "../z_bg_hidan_sima.c" + .balign 4 + +glabel D_8088F238 + .asciz "../z_bg_hidan_sima.c" + .balign 4 + +.late_rodata +glabel D_8088F2BC + .float 0.4 + +.text glabel func_8088EB54 /* 00784 8088EB54 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 00788 8088EB58 AFB40040 */ sw $s4, 0x0040($sp) @@ -316,5 +330,3 @@ glabel func_8088EB54 /* 00C2C 8088EFFC D7B40018 */ ldc1 $f20, 0x0018($sp) /* 00C30 8088F000 03E00008 */ jr $ra /* 00C34 8088F004 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Destroy.s index be0f07f7a5..94325e5c58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Destroy.s @@ -12,5 +12,3 @@ glabel BgIceObjects_Destroy /* 000AC 8088F8BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B0 8088F8C0 03E00008 */ jr $ra /* 000B4 8088F8C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s index 9710891feb..54cfcb0c3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s @@ -14,4 +14,3 @@ glabel BgIceObjects_Draw /* 00C74 80890484 00000000 */ nop /* 00C78 80890488 00000000 */ nop /* 00C7C 8089048C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s index 8c9e00ec2a..6b5f2a7934 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s @@ -38,5 +38,3 @@ glabel BgIceObjects_Init /* 0007C 8088F88C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00080 8088F890 03E00008 */ jr $ra /* 00084 8088F894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Update.s index f8866e6fc5..2111328ff7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Update.s @@ -8,5 +8,3 @@ glabel BgIceObjects_Update /* 00C3C 8089044C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C40 80890450 03E00008 */ jr $ra /* 00C44 80890454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088F8C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088F8C8.s index 844fbc8ae8..adb667aab6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088F8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088F8C8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80890520 + .float -1260.0 +glabel D_80890524 + .float -1780.0 + +.text glabel func_8088F8C8 /* 000B8 8088F8C8 AFA50004 */ sw $a1, 0x0004($sp) /* 000BC 8088F8CC 84830158 */ lh $v1, 0x0158($a0) ## 00000158 @@ -340,5 +347,3 @@ glabel func_8088F8C8 /* 0052C 8088FD3C E4920168 */ swc1 $f18, 0x0168($a0) ## 00000168 /* 00530 8088FD40 03E00008 */ jr $ra /* 00534 8088FD44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s index 619d8c2cfa..57428910d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80890528 + .float -1660.0 +glabel D_8089052C + .float -1060.0 +glabel D_80890530 + .float -1580.0 +glabel D_80890534 + .float -1180.0 + +.text glabel func_8088FD48 /* 00538 8088FD48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0053C 8088FD4C AFBF0014 */ sw $ra, 0x0014($sp) @@ -106,5 +117,3 @@ glabel func_8088FD48 /* 006B4 8088FEC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006B8 8088FEC8 03E00008 */ jr $ra /* 006BC 8088FECC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s index 84b2064cbb..993442ef9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s @@ -67,5 +67,3 @@ glabel func_8088FED0 /* 007B4 8088FFC4 8FB10018 */ lw $s1, 0x0018($sp) /* 007B8 8088FFC8 03E00008 */ jr $ra /* 007BC 8088FFCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s index 4ecdae4f62..186c01e6d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80890538 + .float 1387.0 + +.text glabel func_8088FFD0 /* 007C0 8088FFD0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 007C4 8088FFD4 AFB00030 */ sw $s0, 0x0030($sp) @@ -253,5 +258,3 @@ glabel func_8088FFD0 /* 00B44 80890354 8FB00030 */ lw $s0, 0x0030($sp) /* 00B48 80890358 03E00008 */ jr $ra /* 00B4C 8089035C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s index 90ecc6a897..59f1205dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s @@ -42,5 +42,3 @@ glabel func_80890360 /* 00BE0 808903F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BE4 808903F4 03E00008 */ jr $ra /* 00BE8 808903F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_808903FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_808903FC.s index ec1b3bd5f8..a8f40a907d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_808903FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_808903FC.s @@ -14,5 +14,3 @@ glabel func_808903FC .L8089042C: /* 00C1C 8089042C 03E00008 */ jr $ra /* 00C20 80890430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s index 2bc3cd5f89..231eadb3c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_808918C0 +.word L80890B5C +.word L80890B5C +.word L80890B40 +.word L80890B40 +.word L80890B5C + +.text glabel BgIceShelter_Destroy /* 003C4 80890B04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 003C8 80890B08 AFBF0014 */ sw $ra, 0x0014($sp) @@ -40,5 +49,3 @@ glabel L80890B5C /* 00440 80890B80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00444 80890B84 03E00008 */ jr $ra /* 00448 80890B88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s index 9a268af8d6..d5fc5fb1b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s @@ -1,3 +1,26 @@ +.rdata +glabel D_80891878 + .asciz "../z_bg_ice_shelter.c" + .balign 4 + +glabel D_80891890 + .asciz "../z_bg_ice_shelter.c" + .balign 4 + +glabel D_808918A8 + .asciz "../z_bg_ice_shelter.c" + .balign 4 + +.late_rodata +glabel jtbl_808918F0 +.word L808914C8 +.word L808914C8 +.word L80891568 +.word L80891680 +.word L808914C8 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel BgIceShelter_Draw /* 00C7C 808913BC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00C80 808913C0 AFB10038 */ sw $s1, 0x0038($sp) @@ -202,4 +225,3 @@ glabel L80891680 /* 00F84 808916C4 03E00008 */ jr $ra /* 00F88 808916C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 00F8C 808916CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s index 1840d699cf..a30764573d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80891858 + .asciz "(ice shelter)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgIceShelter_Init /* 00240 80890980 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00244 80890984 AFBF001C */ sw $ra, 0x001C($sp) @@ -110,5 +116,3 @@ glabel BgIceShelter_Init /* 003B8 80890AF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003BC 80890AFC 03E00008 */ jr $ra /* 003C0 80890B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Update.s index 6a74344cd4..245203e5fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Update.s @@ -8,5 +8,3 @@ glabel BgIceShelter_Update /* 00C70 808913B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C74 808913B4 03E00008 */ jr $ra /* 00C78 808913B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s index 85cb611ba8..d28da8bef1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s @@ -85,5 +85,3 @@ glabel func_80890740 /* 00128 80890868 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0012C 8089086C 03E00008 */ jr $ra /* 00130 80890870 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890874.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890874.s index 41b23ca169..baca67eec2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890874.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890874.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80891800 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80891840 + .asciz "../z_bg_ice_shelter.c" + .balign 4 + +.text glabel func_80890874 /* 00134 80890874 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00138 80890878 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_80890874 /* 001B0 808908F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001B4 808908F4 03E00008 */ jr $ra /* 001B8 808908F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s index daec5f015f..e385edd0fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s @@ -34,5 +34,3 @@ glabel func_808908FC /* 00234 80890974 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00238 80890978 03E00008 */ jr $ra /* 0023C 8089097C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s index 11d90226ba..2f51fe7f20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808918D4 + .word 0x3D8F5C29 +glabel D_808918D8 + .float 0.8 + +.text glabel func_80890B8C /* 0044C 80890B8C 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 00450 80890B90 AFBF007C */ sw $ra, 0x007C($sp) @@ -164,5 +171,3 @@ glabel func_80890B8C /* 006B4 80890DF4 8FBE0078 */ lw $s8, 0x0078($sp) /* 006B8 80890DF8 03E00008 */ jr $ra /* 006BC 80890DFC 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s index 6aeb83cd87..a5017f1402 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_808918DC + .word 0x3D8F5C29 +glabel D_808918E0 + .word 0x3E0F5C29 +glabel D_808918E4 + .float 0.2 + +glabel D_808918E8 + .float 0.8 + +.text glabel func_80890E00 /* 006C0 80890E00 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 006C4 80890E04 F7BC0048 */ sdc1 $f28, 0x0048($sp) @@ -163,5 +175,3 @@ glabel func_80890E00 /* 00918 80891058 8FBE0078 */ lw $s8, 0x0078($sp) /* 0091C 8089105C 03E00008 */ jr $ra /* 00920 80891060 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80891064.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80891064.s index f19bd0a598..6e4629b441 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80891064.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80891064.s @@ -5,5 +5,3 @@ glabel func_80891064 /* 00930 80891070 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00934 80891074 03E00008 */ jr $ra /* 00938 80891078 A48F0200 */ sh $t7, 0x0200($a0) ## 00000200 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s index b39407e290..d2b1195936 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s @@ -89,5 +89,3 @@ glabel func_8089107C /* 00A70 808911B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A74 808911B4 03E00008 */ jr $ra /* 00A78 808911B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911BC.s index 2cbfa3eb67..7acaad8380 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911BC.s @@ -5,5 +5,3 @@ glabel func_808911BC /* 00A88 808911C8 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00A8C 808911CC 03E00008 */ jr $ra /* 00A90 808911D0 A48F0200 */ sh $t7, 0x0200($a0) ## 00000200 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s index 7a83b304b5..f454706214 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808918EC + .word 0x38D1B717 + +.text glabel func_808911D4 /* 00A94 808911D4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00A98 808911D8 AFBF001C */ sw $ra, 0x001C($sp) @@ -128,5 +133,3 @@ glabel func_808911D4 /* 00C4C 8089138C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00C50 80891390 03E00008 */ jr $ra /* 00C54 80891394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Destroy.s index d1edc77649..c68bf41e14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Destroy.s @@ -12,5 +12,3 @@ glabel BgIceShutter_Destroy /* 00228 80891CE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0022C 80891CEC 03E00008 */ jr $ra /* 00230 80891CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s index 69466c570e..8094b9437b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s @@ -12,4 +12,3 @@ glabel BgIceShutter_Draw /* 003C4 80891E84 03E00008 */ jr $ra /* 003C8 80891E88 00000000 */ nop /* 003CC 80891E8C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Init.s index 07553288ce..f135261590 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Init.s @@ -113,5 +113,3 @@ glabel BgIceShutter_Init /* 001F8 80891CB8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001FC 80891CBC 03E00008 */ jr $ra /* 00200 80891CC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Update.s index a6f4de3bed..6b199756f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Update.s @@ -8,5 +8,3 @@ glabel BgIceShutter_Update /* 00394 80891E54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00398 80891E58 03E00008 */ jr $ra /* 0039C 80891E5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891AC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891AC0.s index 3e5ae51e2f..64c71807c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891AC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891AC0.s @@ -38,5 +38,3 @@ glabel func_80891AC0 /* 00080 80891B40 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00084 80891B44 03E00008 */ jr $ra /* 00088 80891B48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891CF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891CF4.s index 467982babe..242abe8f8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891CF4.s @@ -33,5 +33,3 @@ glabel func_80891CF4 /* 002A0 80891D60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002A4 80891D64 03E00008 */ jr $ra /* 002A8 80891D68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891D6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891D6C.s index fc92b35064..e36724c28f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891D6C.s @@ -28,5 +28,3 @@ glabel func_80891D6C /* 00308 80891DC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0030C 80891DCC 03E00008 */ jr $ra /* 00310 80891DD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891DD4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891DD4.s index 5c97a701f6..b32acc54d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/func_80891DD4.s @@ -30,5 +30,3 @@ glabel func_80891DD4 /* 00370 80891E30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00374 80891E34 03E00008 */ jr $ra /* 00378 80891E38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s index 30be4099f1..856c717306 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s @@ -19,5 +19,3 @@ glabel BgIceTurara_Destroy /* 00114 80892034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00118 80892038 03E00008 */ jr $ra /* 0011C 8089203C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s index cddf868fdd..a49b3ece68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s @@ -14,4 +14,3 @@ glabel BgIceTurara_Draw /* 006F4 80892614 00000000 */ nop /* 006F8 80892618 00000000 */ nop /* 006FC 8089261C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s index d33aa7882e..25daa84646 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s @@ -62,5 +62,3 @@ glabel BgIceTurara_Init /* 000CC 80891FEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000D0 80891FF0 03E00008 */ jr $ra /* 000D4 80891FF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Update.s index ae33e15eb7..93ecbc437c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Update.s @@ -8,5 +8,3 @@ glabel BgIceTurara_Update /* 006BC 808925DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006C0 808925E0 03E00008 */ jr $ra /* 006C4 808925E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s index cf2e164e15..b1c126b1e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80892690 + .float 0.1 +glabel D_80892694 + .float 0.2 + +.text glabel func_80892040 /* 00120 80892040 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00124 80892044 AFB1005C */ sw $s1, 0x005C($sp) @@ -129,5 +136,3 @@ glabel func_80892040 /* 002F4 80892214 8FBE0078 */ lw $s8, 0x0078($sp) /* 002F8 80892218 03E00008 */ jr $ra /* 002FC 8089221C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s index d5310e3f8c..5e2b98c81b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s @@ -27,5 +27,3 @@ glabel func_80892220 /* 00354 80892274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00358 80892278 03E00008 */ jr $ra /* 0035C 8089227C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892280.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892280.s index dcc72699f3..6e8640aeb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892280.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892280.s @@ -14,5 +14,3 @@ glabel func_80892280 .L808922B0: /* 00390 808922B0 03E00008 */ jr $ra /* 00394 808922B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s index 6a1c7dae59..87917837be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s @@ -104,5 +104,3 @@ glabel func_808922B8 /* 004F8 80892418 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004FC 8089241C 03E00008 */ jr $ra /* 00500 80892420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s index be81bd7edf..a6e1dec822 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s @@ -93,5 +93,3 @@ glabel func_80892424 /* 00648 80892568 8FB10020 */ lw $s1, 0x0020($sp) /* 0064C 8089256C 03E00008 */ jr $ra /* 00650 80892570 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892574.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892574.s index 5c4ea76375..67c9e33ec7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892574.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892574.s @@ -21,5 +21,3 @@ glabel func_80892574 /* 00698 808925B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0069C 808925BC 03E00008 */ jr $ra /* 006A0 808925C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Destroy.s index ebded698a9..75299446cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Destroy.s @@ -12,5 +12,3 @@ glabel BgIngate_Destroy /* 00144 80892884 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00148 80892888 03E00008 */ jr $ra /* 0014C 8089288C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s index ca00f035b8..d52ecd3779 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80892AB0 + .asciz "../z_bg_ingate.c" + .balign 4 + +glabel D_80892AC4 + .asciz "../z_bg_ingate.c" + .balign 4 + +glabel D_80892AD8 + .asciz "../z_bg_ingate.c" + .balign 4 + +.text glabel BgIngate_Draw /* 00280 808929C0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00284 808929C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -51,4 +65,3 @@ glabel BgIngate_Draw /* 00344 80892A84 00000000 */ nop /* 00348 80892A88 00000000 */ nop /* 0034C 80892A8C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s index bc2331e9b5..bd8d6cd8ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s @@ -64,13 +64,13 @@ glabel BgIngate_Init /* 000E4 80892824 3C058089 */ lui $a1, %hi(func_80892890) ## $a1 = 80890000 /* 000E8 80892828 A5C01D74 */ sh $zero, 0x1D74($t6) ## 00001D74 /* 000EC 8089282C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000F0 80892830 0C2249D0 */ jal func_80892740 +/* 000F0 80892830 0C2249D0 */ jal BgIngate_SetupAction /* 000F4 80892834 24A52890 */ addiu $a1, $a1, %lo(func_80892890) ## $a1 = 80892890 /* 000F8 80892838 10000005 */ beq $zero, $zero, .L80892850 /* 000FC 8089283C 8FBF001C */ lw $ra, 0x001C($sp) .L80892840: /* 00100 80892840 3C058089 */ lui $a1, %hi(func_80892990) ## $a1 = 80890000 -/* 00104 80892844 0C2249D0 */ jal func_80892740 +/* 00104 80892844 0C2249D0 */ jal BgIngate_SetupAction /* 00108 80892848 24A52990 */ addiu $a1, $a1, %lo(func_80892990) ## $a1 = 80892990 /* 0010C 8089284C 8FBF001C */ lw $ra, 0x001C($sp) .L80892850: @@ -78,5 +78,3 @@ glabel BgIngate_Init /* 00114 80892854 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00118 80892858 03E00008 */ jr $ra /* 0011C 8089285C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892740.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_SetupAction.s similarity index 83% rename from asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892740.s rename to asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_SetupAction.s index cbc4f6ddf8..71dae2c96d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892740.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_80892740 +glabel BgIngate_SetupAction /* 00000 80892740 03E00008 */ jr $ra /* 00004 80892744 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Update.s index 054d798203..9e6d96fc43 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Update.s @@ -8,5 +8,3 @@ glabel BgIngate_Update /* 00274 808929B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00278 808929B8 03E00008 */ jr $ra /* 0027C 808929BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892890.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892890.s index 235a6a51c2..7a066d6ce5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892890.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892890.s @@ -18,7 +18,7 @@ glabel func_80892890 /* 0018C 808928CC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00190 808928D0 24A52990 */ addiu $a1, $a1, %lo(func_80892990) ## $a1 = 80892990 /* 00194 808928D4 0302C821 */ addu $t9, $t8, $v0 -/* 00198 808928D8 0C2249D0 */ jal func_80892740 +/* 00198 808928D8 0C2249D0 */ jal BgIngate_SetupAction /* 0019C 808928DC A4D900B6 */ sh $t9, 0x00B6($a2) ## 000000B6 /* 001A0 808928E0 10000028 */ beq $zero, $zero, .L80892984 /* 001A4 808928E4 8FBF0014 */ lw $ra, 0x0014($sp) @@ -70,5 +70,3 @@ glabel func_80892890 /* 00244 80892984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00248 80892988 03E00008 */ jr $ra /* 0024C 8089298C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892990.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892990.s index 91be881ea9..89dd66aacf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892990.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892990.s @@ -2,5 +2,3 @@ glabel func_80892990 /* 00250 80892990 AFA40000 */ sw $a0, 0x0000($sp) /* 00254 80892994 03E00008 */ jr $ra /* 00258 80892998 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s index 6e05383641..8ccfa9adb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s @@ -23,5 +23,3 @@ glabel BgJya1flift_Destroy /* 00244 80892DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00248 80892DA8 03E00008 */ jr $ra /* 0024C 80892DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s index 4ce00c773c..4d8b7acbc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s @@ -14,4 +14,3 @@ glabel BgJya1flift_Draw /* 00574 808930D4 00000000 */ nop /* 00578 808930D8 00000000 */ nop /* 0057C 808930DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s index aab020fe72..f14193f238 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808931A8 + .asciz "(１Ｆリフト)(flag %d)(room %d)\n" + .balign 4 + +.text glabel BgJya1flift_Init /* 000E0 80892C40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000E4 80892C44 AFA50024 */ sw $a1, 0x0024($sp) @@ -80,5 +86,3 @@ glabel BgJya1flift_Init /* 001F0 80892D50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001F4 80892D54 03E00008 */ jr $ra /* 001F8 80892D58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s index 3fb9381222..b57825732d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s @@ -80,5 +80,3 @@ glabel BgJya1flift_Update /* 0053C 8089309C 8FB10018 */ lw $s1, 0x0018($sp) /* 00540 808930A0 03E00008 */ jr $ra /* 00544 808930A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892B60.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892B60.s index 7c11772e21..9cb9f5bb37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892B60.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892B60.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80893150 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80893190 + .asciz "../z_bg_jya_1flift.c" + .balign 4 + +.text glabel func_80892B60 /* 00000 80892B60 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80892B64 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_80892B60 /* 0007C 80892BDC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 80892BE0 03E00008 */ jr $ra /* 00084 80892BE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s index 8066a3d07d..f214e2d1bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s @@ -23,5 +23,3 @@ glabel func_80892BE8 /* 000D4 80892C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000D8 80892C38 03E00008 */ jr $ra /* 000DC 80892C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DB0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DB0.s index 90512b67aa..1ce4e4e90d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DB0.s @@ -6,5 +6,3 @@ glabel func_80892DB0 /* 00260 80892DC0 C4243130 */ lwc1 $f4, %lo(D_80893130)($at) /* 00264 80892DC4 03E00008 */ jr $ra /* 00268 80892DC8 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DCC.s index 8ea7b8ce32..0a842741b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DCC.s @@ -17,5 +17,3 @@ glabel func_80892DCC /* 002A0 80892E00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A4 80892E04 03E00008 */ jr $ra /* 002A8 80892E08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E0C.s index e45a0e5f37..5b9d7d1ee0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E0C.s @@ -6,5 +6,3 @@ glabel func_80892E0C /* 002BC 80892E1C C4243130 */ lwc1 $f4, %lo(D_80893130)($at) /* 002C0 80892E20 03E00008 */ jr $ra /* 002C4 80892E24 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E28.s index 3f98e166ec..dbf8fd784e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E28.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E28.s @@ -2,5 +2,3 @@ glabel func_80892E28 /* 002C8 80892E28 AFA40000 */ sw $a0, 0x0000($sp) /* 002CC 80892E2C 03E00008 */ jr $ra /* 002D0 80892E30 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E34.s index 0f27ff1e56..d921d3c31d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E34.s @@ -8,5 +8,3 @@ glabel func_80892E34 /* 002EC 80892E4C A09801B6 */ sb $t8, 0x01B6($a0) ## 000001B6 /* 002F0 80892E50 03E00008 */ jr $ra /* 002F4 80892E54 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E58.s index e4d8fbadca..5a3f8d01a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E58.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808931C8 + .float 0.001 + +.text glabel func_80892E58 /* 002F8 80892E58 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 002FC 80892E5C AFB00020 */ sw $s0, 0x0020($sp) @@ -62,5 +67,3 @@ glabel func_80892E58 /* 003D0 80892F30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003D4 80892F34 03E00008 */ jr $ra /* 003D8 80892F38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F3C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F3C.s index 606abe22a4..10e299a8e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F3C.s @@ -4,5 +4,3 @@ glabel func_80892F3C /* 003E4 80892F44 AC8E01B0 */ sw $t6, 0x01B0($a0) ## 000001B0 /* 003E8 80892F48 03E00008 */ jr $ra /* 003EC 80892F4C A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F50.s index 9bfaf148fa..bb08ee2dfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F50.s @@ -16,5 +16,3 @@ glabel func_80892F50 /* 00424 80892F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00428 80892F88 03E00008 */ jr $ra /* 0042C 80892F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Destroy.s index 60f292b442..871b13ba6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Destroy.s @@ -8,5 +8,3 @@ glabel BgJyaBigmirror_Destroy .L80893C18: /* 00538 80893C18 03E00008 */ jr $ra /* 0053C 80893C1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s index 595852404f..03593a551c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s @@ -35,4 +35,3 @@ glabel BgJyaBigmirror_Draw /* 007E4 80893EC4 03E00008 */ jr $ra /* 007E8 80893EC8 00000000 */ nop /* 007EC 80893ECC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Init.s index edfc378cd6..ad987eda83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80894010 + .asciz "(jya 大鏡)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgJyaBigmirror_Init /* 00488 80893B68 3C0E8089 */ lui $t6, %hi(D_80893ED0) ## $t6 = 80890000 /* 0048C 80893B6C 91CE3ED0 */ lbu $t6, %lo(D_80893ED0)($t6) @@ -42,5 +48,3 @@ glabel BgJyaBigmirror_Init /* 00514 80893BF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00518 80893BF8 03E00008 */ jr $ra /* 0051C 80893BFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Update.s index be6db42a61..01c805e2cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Update.s @@ -17,5 +17,3 @@ glabel BgJyaBigmirror_Update /* 0057C 80893C5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00580 80893C60 03E00008 */ jr $ra /* 00584 80893C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_808936E0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_808936E0.s index 49afcfcaab..1fbe5274b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_808936E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_808936E0.s @@ -32,5 +32,3 @@ glabel func_808936E0 .L80893748: /* 00068 80893748 03E00008 */ jr $ra /* 0006C 8089374C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s index 31c4932079..7ccd0af7fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80893F60 + .asciz "Error : コブラ削除された (%s %d)\n" + .balign 4 + +glabel D_80893F84 + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +glabel D_80893F9C + .asciz "Error : コブラ発生失敗 (%s %d)\n" + .balign 4 + +glabel D_80893FBC + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +.text glabel func_80893750 /* 00070 80893750 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00074 80893754 AFBF005C */ sw $ra, 0x005C($sp) @@ -142,5 +160,3 @@ glabel func_80893750 /* 00260 80893940 8FBE0058 */ lw $s8, 0x0058($sp) /* 00264 80893944 03E00008 */ jr $ra /* 00268 80893948 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089394C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089394C.s index 32a36567ac..48a3cf808b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089394C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089394C.s @@ -22,5 +22,3 @@ glabel func_8089394C /* 002B0 80893990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002B4 80893994 03E00008 */ jr $ra /* 002B8 80893998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089399C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089399C.s index f7062ee9b4..03fb43c17b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089399C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_8089399C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80893FD4 + .asciz "Error : Mir Ray 発生失敗 (%s %d)\n" + .balign 4 + +glabel D_80893FF8 + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +.text glabel func_8089399C /* 002BC 8089399C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 002C0 808939A0 AFB20038 */ sw $s2, 0x0038($sp) @@ -128,5 +138,3 @@ glabel func_8089399C /* 0047C 80893B5C 8FB00030 */ lw $s0, 0x0030($sp) /* 00480 80893B60 03E00008 */ jr $ra /* 00484 80893B64 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s index 1340505049..9f87421f79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s @@ -1,3 +1,32 @@ +.rdata +glabel D_80894030 + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +glabel D_80894048 + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +glabel D_80894060 + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +glabel D_80894078 + .asciz "../z_bg_jya_bigmirror.c" + .balign 4 + +.late_rodata +glabel D_80894090 + .float 0.1 + +glabel D_80894094 + .word 0xBA4CCCCD +glabel D_80894098 + .word 0x3FB1F0A4 +glabel D_8089409C + .float 0.1 + +.text glabel func_80893C68 /* 00588 80893C68 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0058C 80893C6C AFBF001C */ sw $ra, 0x001C($sp) @@ -124,5 +153,3 @@ glabel func_80893C68 /* 00764 80893E44 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00768 80893E48 03E00008 */ jr $ra /* 0076C 80893E4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Destroy.s index 675c0b1e48..f074826015 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Destroy.s @@ -12,5 +12,3 @@ glabel BgJyaBlock_Destroy /* 000D8 80894278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000DC 8089427C 03E00008 */ jr $ra /* 000E0 80894280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s index a013828b32..a1c6ce4688 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80894410 + .asciz "../z_bg_jya_block.c" + .balign 4 + +glabel D_80894424 + .asciz "../z_bg_jya_block.c" + .balign 4 + +glabel D_80894438 + .asciz "../z_bg_jya_block.c" + .balign 4 + +.text glabel BgJyaBlock_Draw /* 00104 808942A4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00108 808942A8 AFBF001C */ sw $ra, 0x001C($sp) @@ -78,4 +92,3 @@ glabel BgJyaBlock_Draw /* 00234 808943D4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00238 808943D8 03E00008 */ jr $ra /* 0023C 808943DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s index 4adc6e6d24..340cff0243 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s @@ -53,5 +53,3 @@ glabel BgJyaBlock_Init /* 000A8 80894248 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000AC 8089424C 03E00008 */ jr $ra /* 000B0 80894250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Update.s index 2b25741e51..3d72db0563 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Update.s @@ -7,5 +7,3 @@ glabel BgJyaBlock_Update /* 000F8 80894298 AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 /* 000FC 8089429C 03E00008 */ jr $ra /* 00100 808942A0 E4840150 */ swc1 $f4, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s index 8a27767f21..f44930bcab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s @@ -9,5 +9,3 @@ glabel BgJyaBombchuiwa_Destroy /* 00108 808945A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0010C 808945AC 03E00008 */ jr $ra /* 00110 808945B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s index 1e589b84ee..e5be1ee245 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s @@ -53,4 +53,3 @@ glabel BgJyaBombchuiwa_Draw /* 00A74 80894F14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A78 80894F18 03E00008 */ jr $ra /* 00A7C 80894F1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s index a22af2dd2a..30563f3fd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Init.s @@ -35,5 +35,3 @@ glabel BgJyaBombchuiwa_Init /* 000E0 80894580 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000E4 80894584 03E00008 */ jr $ra /* 000E8 80894588 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s index c439517ac4..eb2f7e7a52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Update.s @@ -11,5 +11,3 @@ glabel BgJyaBombchuiwa_Update /* 00658 80894AF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0065C 80894AFC 03E00008 */ jr $ra /* 00660 80894B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s index e40a470615..9ebac8b945 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s @@ -20,5 +20,3 @@ glabel func_808944A0 /* 00048 808944E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0004C 808944EC 03E00008 */ jr $ra /* 00050 808944F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s index 4bc1137e43..1aa9cc753d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944F4.s @@ -6,5 +6,3 @@ glabel func_808944F4 /* 00064 80894504 0305C825 */ or $t9, $t8, $a1 ## $t9 = 00000000 /* 00068 80894508 03E00008 */ jr $ra /* 0006C 8089450C A09901B6 */ sb $t9, 0x01B6($a0) ## 000001B6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s index 968571d705..0cf8a29c5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8089509C + .float 0.3 + +glabel D_808950A0 + .float 0.4 + +.text glabel func_808945B4 /* 00114 808945B4 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 00118 808945B8 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -175,5 +183,3 @@ glabel func_808945B4 /* 00394 80894834 8FBE0098 */ lw $s8, 0x0098($sp) /* 00398 80894838 03E00008 */ jr $ra /* 0039C 8089483C 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s index a6d5a13c1d..352ec3e453 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894840.s @@ -14,5 +14,3 @@ glabel func_80894840 /* 003D0 80894870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003D4 80894874 03E00008 */ jr $ra /* 003D8 80894878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s index c53cd03669..4fdc9e4c53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s @@ -63,5 +63,3 @@ glabel func_8089487C /* 004B4 80894954 8FB10020 */ lw $s1, 0x0020($sp) /* 004B8 80894958 03E00008 */ jr $ra /* 004BC 8089495C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s index b2b8b3ee27..4df7c64c6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894960.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808950A4 + .float 0.3 + +.text glabel func_80894960 /* 004C0 80894960 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 004C4 80894964 3C0E8089 */ lui $t6, %hi(func_808949B8) ## $t6 = 80890000 @@ -21,5 +26,3 @@ glabel func_80894960 /* 0050C 808949AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00510 808949B0 03E00008 */ jr $ra /* 00514 808949B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s index 9674006e94..e97d311330 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808949B8.s @@ -37,5 +37,3 @@ glabel func_808949B8 /* 00598 80894A38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0059C 80894A3C 03E00008 */ jr $ra /* 005A0 80894A40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s index 184d417e09..8b8848eafa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894A44.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80894FA0 + .asciz "Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80894FD8 + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +.text glabel func_80894A44 /* 005A4 80894A44 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 005A8 80894A48 3C014319 */ lui $at, 0x4319 ## $at = 43190000 @@ -39,5 +49,3 @@ glabel func_80894A44 /* 0062C 80894ACC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00630 80894AD0 03E00008 */ jr $ra /* 00634 80894AD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s index 4ea2ed395c..0f672148f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80894FF4 + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +glabel D_80895010 + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +glabel D_8089502C + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +.text glabel func_80894B04 /* 00664 80894B04 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00668 80894B08 AFBF001C */ sw $ra, 0x001C($sp) @@ -48,5 +62,3 @@ glabel func_80894B04 /* 0071C 80894BBC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00720 80894BC0 03E00008 */ jr $ra /* 00724 80894BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s index dd466fdc49..71b18e9d92 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80895048 + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +glabel D_80895064 + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +glabel D_80895080 + .asciz "../z_bg_jya_bombchuiwa.c" + .balign 4 + +.text glabel func_80894BC8 /* 00728 80894BC8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0072C 80894BCC AFBF0014 */ sw $ra, 0x0014($sp) @@ -172,5 +186,3 @@ glabel func_80894BC8 /* 009B0 80894E50 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 009B4 80894E54 03E00008 */ jr $ra /* 009B8 80894E58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s index b9a52b63b3..6a94426e85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s @@ -18,5 +18,3 @@ glabel BgJyaBombiwa_Destroy /* 001F0 80895390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001F4 80895394 03E00008 */ jr $ra /* 001F8 80895398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s index 531ae0d54d..20c5b6a36b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s @@ -17,4 +17,3 @@ glabel BgJyaBombiwa_Draw /* 00554 808956F4 00000000 */ nop /* 00558 808956F8 00000000 */ nop /* 0055C 808956FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Init.s index 951f538f5a..816b9dacf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_808957C8 + .asciz "" + .balign 4 + +glabel D_808957D4 + .asciz "Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n" + .balign 4 + +glabel D_80895810 + .asciz "../z_bg_jya_bombiwa.c" + .balign 4 + +glabel D_80895828 + .asciz "\x1b[m" + .balign 4 + +glabel D_8089582C + .asciz "(jya 爆弾で破壊岩)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgJyaBombiwa_Init /* 000DC 8089527C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000E0 80895280 AFBF001C */ sw $ra, 0x001C($sp) @@ -63,5 +85,3 @@ glabel BgJyaBombiwa_Init /* 001A8 80895348 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001AC 8089534C 03E00008 */ jr $ra /* 001B0 80895350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s index 94bf8b02ac..2566f4176d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s @@ -40,5 +40,3 @@ glabel BgJyaBombiwa_Update /* 00510 808956B0 8FB10018 */ lw $s1, 0x0018($sp) /* 00514 808956B4 03E00008 */ jr $ra /* 00518 808956B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_808951A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_808951A0.s index f4028d7e19..8ce64eccb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_808951A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_808951A0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80895770 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808957B0 + .asciz "../z_bg_jya_bombiwa.c" + .balign 4 + +.text glabel func_808951A0 /* 00000 808951A0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 808951A4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_808951A0 /* 0007C 8089521C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 80895220 03E00008 */ jr $ra /* 00084 80895224 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s index 1e61422167..1adda40e0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s @@ -20,5 +20,3 @@ glabel func_80895228 /* 000D0 80895270 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000D4 80895274 03E00008 */ jr $ra /* 000D8 80895278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s index 4d4c62193b..2e0f422c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80895854 + .word 0x3FE66666 +glabel D_80895858 + .float 0.4 + +.text glabel func_8089539C /* 001FC 8089539C 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 00200 808953A0 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -176,5 +183,3 @@ glabel func_8089539C /* 00484 80895624 8FBE0098 */ lw $s8, 0x0098($sp) /* 00488 80895628 03E00008 */ jr $ra /* 0048C 8089562C 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Destroy.s index 4995f277f6..4e3d6be95e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Destroy.s @@ -12,5 +12,3 @@ glabel BgJyaCobra_Destroy /* 0101C 8089690C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01020 80896910 03E00008 */ jr $ra /* 01024 80896914 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s index 78a3c7db6c..6a8c8a24d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s @@ -54,4 +54,3 @@ glabel BgJyaCobra_Draw /* 01974 80897264 00000000 */ nop /* 01978 80897268 00000000 */ nop /* 0197C 8089726C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s index dbaba993bd..ff0ff3fcea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8089760C + .asciz "(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n" + .balign 4 + +.text glabel BgJyaCobra_Init /* 00EE4 808967D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00EE8 808967D8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -77,5 +83,3 @@ glabel BgJyaCobra_Init /* 00FEC 808968DC 8FB10020 */ lw $s1, 0x0020($sp) /* 00FF0 808968E0 03E00008 */ jr $ra /* 00FF4 808968E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Update.s index 389e19dec6..7d2cb19949 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Update.s @@ -28,5 +28,3 @@ glabel BgJyaCobra_Update /* 013B8 80896CA8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013BC 80896CAC 03E00008 */ jr $ra /* 013C0 80896CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808958F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808958F0.s index 7c9d736d4e..8d91ce645c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808958F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808958F0.s @@ -18,5 +18,3 @@ glabel func_808958F0 /* 00040 80895930 460A4401 */ sub.s $f16, $f8, $f10 /* 00044 80895934 03E00008 */ jr $ra /* 00048 80895938 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_8089593C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_8089593C.s index ae0801871a..99ec9a94e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_8089593C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_8089593C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80897570 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808975B0 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +.text glabel func_8089593C /* 0004C 8089593C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00050 80895940 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_8089593C /* 000C8 808959B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000CC 808959BC 03E00008 */ jr $ra /* 000D0 808959C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s index 708127d317..702769dd65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808975C4 + .asciz "" + .balign 4 + +glabel D_808975CC + .asciz "Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n" + .balign 4 + +glabel D_808975F4 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_80897608 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_808959C4 /* 000D4 808959C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 000D8 808959C8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 @@ -47,5 +65,3 @@ glabel func_808959C4 /* 00174 80895A64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00178 80895A68 03E00008 */ jr $ra /* 0017C 80895A6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895A70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895A70.s index 06bd054f9f..dfd952f8fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895A70.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895A70.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808976FC + .float 9.58738019108e-05 + +glabel D_80897700 + .float 9.58738019108e-05 + +.text glabel func_80895A70 /* 00180 80895A70 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00184 80895A74 AFBF0014 */ sw $ra, 0x0014($sp) @@ -104,5 +112,3 @@ glabel func_80895A70 /* 002F0 80895BE0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002F4 80895BE4 03E00008 */ jr $ra /* 002F8 80895BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s index aeb2ca17dd..f49f8897a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s @@ -35,5 +35,3 @@ glabel func_80895BEC /* 00378 80895C68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0037C 80895C6C 03E00008 */ jr $ra /* 00380 80895C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s index 98285abe1d..32d3ea1601 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s @@ -1,3 +1,23 @@ +.late_rodata +glabel D_80897704 + .float 0.1 + +glabel D_80897708 + .float 0.1 + +glabel D_8089770C + .word 0x3EAE147B +glabel D_80897710 + .word 0x3EAE147B +glabel D_80897714 + .float 0.1 + +glabel D_80897718 + .word 0x3EAE147B +glabel D_8089771C + .word 0x3EAE147B + +.text glabel func_80895C74 /* 00384 80895C74 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00388 80895C78 AFBF0014 */ sw $ra, 0x0014($sp) @@ -176,5 +196,3 @@ glabel func_80895C74 /* 005F4 80895EE4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005F8 80895EE8 03E00008 */ jr $ra /* 005FC 80895EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895EF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895EF0.s index 74b5db614c..7f762425c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895EF0.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_80897720 + .word 0x3F490FDB +glabel D_80897724 + .float 9.58738019108e-05 + +glabel D_80897728 + .float 0.9 + +glabel D_8089772C + .word 0x3F23D70A +glabel D_80897730 + .float 0.2 + +.text glabel func_80895EF0 /* 00600 80895EF0 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 00604 80895EF4 AFB20048 */ sw $s2, 0x0048($sp) @@ -418,5 +433,3 @@ glabel func_80895EF0 /* 00C1C 8089650C 8FBE0060 */ lw $s8, 0x0060($sp) /* 00C20 80896510 03E00008 */ jr $ra /* 00C24 80896514 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896518.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896518.s index c4e9ae25d7..b598caf749 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896518.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896518.s @@ -192,5 +192,3 @@ glabel func_80896518 /* 00ED8 808967C8 27BD0158 */ addiu $sp, $sp, 0x0158 ## $sp = 00000000 /* 00EDC 808967CC 03E00008 */ jr $ra /* 00EE0 808967D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896918.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896918.s index 9c45eb9a93..81156ad6ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896918.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896918.s @@ -13,5 +13,3 @@ glabel func_80896918 /* 01054 80896944 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 /* 01058 80896948 03E00008 */ jr $ra /* 0105C 8089694C A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896950.s index dc74b52d87..bacf4bb63c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896950.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896950.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80897734 + .float 0.001 + +glabel D_80897738 + .float 0.001 + +.text glabel func_80896950 /* 01060 80896950 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01064 80896954 AFBF0014 */ sw $ra, 0x0014($sp) @@ -44,5 +52,3 @@ glabel func_80896950 /* 010FC 808969EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01100 808969F0 03E00008 */ jr $ra /* 01104 808969F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808969F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808969F8.s index 13ff2dad1f..ad81fe3ee1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808969F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808969F8.s @@ -53,5 +53,3 @@ glabel func_808969F8 /* 011C0 80896AB0 A48B0170 */ sh $t3, 0x0170($a0) ## 00000170 /* 011C4 80896AB4 03E00008 */ jr $ra /* 011C8 80896AB8 E488017C */ swc1 $f8, 0x017C($a0) ## 0000017C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s index 310f23a822..498d02ef6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8089773C + .float 0.001 + +.text glabel func_80896ABC /* 011CC 80896ABC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 011D0 80896AC0 AFBF001C */ sw $ra, 0x001C($sp) @@ -108,5 +113,3 @@ glabel func_80896ABC /* 0134C 80896C3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01350 80896C40 03E00008 */ jr $ra /* 01354 80896C44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s index 663f0767f8..a4d97b80f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80897648 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_8089765C + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_80897670 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +.text glabel func_80896CB4 /* 013C4 80896CB4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 013C8 80896CB8 AFBF001C */ sw $ra, 0x001C($sp) @@ -48,5 +62,3 @@ glabel func_80896CB4 /* 0147C 80896D6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01480 80896D70 03E00008 */ jr $ra /* 01484 80896D74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s index 86ff3e9c23..5824b8a683 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80897684 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_80897698 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_808976AC + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +.late_rodata +glabel D_80897740 + .float 0.1 + +.text glabel func_80896D78 /* 01488 80896D78 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0148C 80896D7C AFBF001C */ sw $ra, 0x001C($sp) @@ -90,5 +108,3 @@ glabel func_80896D78 /* 015E8 80896ED8 8FB10018 */ lw $s1, 0x0018($sp) /* 015EC 80896EDC 03E00008 */ jr $ra /* 015F0 80896EE0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s index b7a0d646c8..45ece79032 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808976C0 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_808976D4 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +glabel D_808976E8 + .asciz "../z_bg_jya_cobra.c" + .balign 4 + +.text glabel func_80896EE4 /* 015F4 80896EE4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 015F8 80896EE8 AFBF001C */ sw $ra, 0x001C($sp) @@ -180,5 +194,3 @@ glabel func_80896EE4 /* 018AC 8089719C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 018B0 808971A0 03E00008 */ jr $ra /* 018B4 808971A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s index b78395ab6c..c1ea021f0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s @@ -9,5 +9,3 @@ glabel BgJyaGoroiwa_Destroy /* 001A0 80897B10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A4 80897B14 03E00008 */ jr $ra /* 001A8 80897B18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s index ba1714de60..f15366fa75 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s @@ -11,4 +11,3 @@ glabel BgJyaGoroiwa_Draw /* 005D4 80897F44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D8 80897F48 03E00008 */ jr $ra /* 005DC 80897F4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s index 118761780c..a5c2806af3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s @@ -37,5 +37,3 @@ glabel BgJyaGoroiwa_Init /* 00178 80897AE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0017C 80897AEC 03E00008 */ jr $ra /* 00180 80897AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s index 677cfc936e..45f599b74f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s @@ -60,5 +60,3 @@ glabel BgJyaGoroiwa_Update /* 005A8 80897F18 8FB10020 */ lw $s1, 0x0020($sp) /* 005AC 80897F1C 03E00008 */ jr $ra /* 005B0 80897F20 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897970.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897970.s index 6a648e25a6..e8a8d75e3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897970.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897970.s @@ -19,5 +19,3 @@ glabel func_80897970 /* 00044 808979B4 44093000 */ mfc1 $t1, $f6 /* 00048 808979B8 03E00008 */ jr $ra /* 0004C 808979BC A4490004 */ sh $t1, 0x0004($v0) ## 00000034 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s index f404210add..76b68893b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s @@ -26,5 +26,3 @@ glabel func_808979C0 /* 000B0 80897A20 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000B4 80897A24 03E00008 */ jr $ra /* 000B8 80897A28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897A2C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897A2C.s index 86d52c3de0..8588053559 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897A2C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80897FC0 + .word 0x432F4CEB + +.text glabel func_80897A2C /* 000BC 80897A2C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 /* 000C0 80897A30 C4860100 */ lwc1 $f6, 0x0100($a0) ## 00000100 @@ -13,5 +18,3 @@ glabel func_80897A2C /* 000E8 80897A58 44183000 */ mfc1 $t8, $f6 /* 000EC 80897A5C 03E00008 */ jr $ra /* 000F0 80897A60 A49800B8 */ sh $t8, 0x00B8($a0) ## 000000B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B1C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B1C.s index d71294607c..e54a529693 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B1C.s @@ -10,5 +10,3 @@ glabel func_80897B1C /* 001CC 80897B3C A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 /* 001D0 80897B40 03E00008 */ jr $ra /* 001D4 80897B44 E48401B0 */ swc1 $f4, 0x01B0($a0) ## 000001B0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B48.s index a7c1d0054e..aa6723c317 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897B48.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_80897FC4 + .float 0.01 + +glabel D_80897FC8 + .word 0x44B74000 +glabel D_80897FCC + .word 0x44D12000 +glabel D_80897FD0 + .word 0xC3018000 +glabel D_80897FD4 + .word 0x44C42000 +glabel D_80897FD8 + .word 0x3EC2C859 +glabel D_80897FDC + .word 0x43018000 +glabel D_80897FE0 + .word 0x4414C000 +glabel D_80897FE4 + .word 0x44DA2000 +glabel D_80897FE8 + .word 0x44AE2000 + +.text glabel func_80897B48 /* 001D8 80897B48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 001DC 80897B4C 3C018089 */ lui $at, %hi(D_80897FC4) ## $at = 80890000 @@ -177,5 +201,3 @@ glabel func_80897B48 /* 00460 80897DD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00464 80897DD4 03E00008 */ jr $ra /* 00468 80897DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DDC.s index 0a4c43a5aa..e7a3b9dab0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DDC.s @@ -4,5 +4,3 @@ glabel func_80897DDC /* 00474 80897DE4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 00478 80897DE8 03E00008 */ jr $ra /* 0047C 80897DEC A48001B6 */ sh $zero, 0x01B6($a0) ## 000001B6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DF0.s index 58a5b4495e..510e5bdfde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_80897DF0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80897FEC + .float 0.1 + +.text glabel func_80897DF0 /* 00480 80897DF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00484 80897DF4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -20,5 +25,3 @@ glabel func_80897DF0 /* 004C4 80897E34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004C8 80897E38 03E00008 */ jr $ra /* 004CC 80897E3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s index 4d286375d4..f5e3413aa8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s @@ -13,5 +13,3 @@ glabel BgJyaHaheniron_Destroy /* 00370 80898430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00374 80898434 03E00008 */ jr $ra /* 00378 80898438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s index e6ad39289b..4657a5ac0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s @@ -26,4 +26,3 @@ glabel BgJyaHaheniron_Draw /* 00654 80898714 00000000 */ nop /* 00658 80898718 00000000 */ nop /* 0065C 8089871C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Init.s index 2687164eba..c11a167b71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808987D8 + .float 65535.0 + +.text glabel BgJyaHaheniron_Init /* 00280 80898340 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00284 80898344 AFA50024 */ sw $a1, 0x0024($sp) @@ -55,5 +60,3 @@ glabel BgJyaHaheniron_Init /* 0033C 808983FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00340 80898400 03E00008 */ jr $ra /* 00344 80898404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Update.s index 905e5afbaf..966aa7bc2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Update.s @@ -10,5 +10,3 @@ glabel BgJyaHaheniron_Update /* 005F0 808986B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005F4 808986B4 03E00008 */ jr $ra /* 005F8 808986B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s index e4e2e28679..70fb53972b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s @@ -20,5 +20,3 @@ glabel func_808980C0 /* 00048 80898108 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0004C 8089810C 03E00008 */ jr $ra /* 00050 80898110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s index 910933d191..e72b5522bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808987D0 + .float 0.8 +glabel D_808987D4 + .float 0.2 + +.text glabel func_80898114 /* 00054 80898114 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 00058 80898118 F7BA0060 */ sdc1 $f26, 0x0060($sp) @@ -147,5 +154,3 @@ glabel func_80898114 /* 00274 80898334 8FBE0088 */ lw $s8, 0x0088($sp) /* 00278 80898338 03E00008 */ jr $ra /* 0027C 8089833C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089843C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089843C.s index a436f79296..85078884a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089843C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089843C.s @@ -3,5 +3,3 @@ glabel func_8089843C /* 00380 80898440 25CE844C */ addiu $t6, $t6, %lo(func_8089844C) ## $t6 = 8089844C /* 00384 80898444 03E00008 */ jr $ra /* 00388 80898448 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s index 5079348247..0dec6c7cf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s @@ -89,5 +89,3 @@ glabel func_8089844C /* 004BC 8089857C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 004C0 80898580 03E00008 */ jr $ra /* 004C4 80898584 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898588.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898588.s index 0fd5939a86..95903ed150 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898588.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898588.s @@ -3,5 +3,3 @@ glabel func_80898588 /* 004CC 8089858C 25CE8598 */ addiu $t6, $t6, %lo(func_80898598) ## $t6 = 80898598 /* 004D0 80898590 03E00008 */ jr $ra /* 004D4 80898594 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898598.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898598.s index 1c377452a2..50640169a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898598.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898598.s @@ -37,5 +37,3 @@ glabel func_80898598 /* 00550 80898610 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00554 80898614 03E00008 */ jr $ra /* 00558 80898618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089861C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089861C.s index 7772f178e0..ca00454999 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089861C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089861C.s @@ -3,5 +3,3 @@ glabel func_8089861C /* 00560 80898620 25CE862C */ addiu $t6, $t6, %lo(func_8089862C) ## $t6 = 8089862C /* 00564 80898624 03E00008 */ jr $ra /* 00568 80898628 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089862C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089862C.s index b80c6f5674..51dc24693b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089862C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089862C.s @@ -27,5 +27,3 @@ glabel func_8089862C /* 005C4 80898684 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005C8 80898688 03E00008 */ jr $ra /* 005CC 8089868C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s index e10c46fa48..6cc9cc5c85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s @@ -19,5 +19,3 @@ glabel BgJyaIronobj_Destroy /* 00A2C 808992CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A30 808992D0 03E00008 */ jr $ra /* 00A34 808992D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s index cb173c5c80..e7931d047d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s @@ -15,4 +15,3 @@ glabel BgJyaIronobj_Draw /* 00BD4 80899474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BD8 80899478 03E00008 */ jr $ra /* 00BDC 8089947C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Init.s index 6784a2700a..c6be60df6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Init.s @@ -39,5 +39,3 @@ glabel BgJyaIronobj_Init /* 009E4 80899284 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 009E8 80899288 03E00008 */ jr $ra /* 009EC 8089928C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Update.s index 19d46f88d8..3cfbf6a330 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Update.s @@ -8,5 +8,3 @@ glabel BgJyaIronobj_Update /* 00B98 80899438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B9C 8089943C 03E00008 */ jr $ra /* 00BA0 80899440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s index 70ba21a66e..e154d26982 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s @@ -35,5 +35,3 @@ glabel func_808988A0 /* 00074 80898914 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00078 80898918 03E00008 */ jr $ra /* 0007C 8089891C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s index 0e2b1870f1..91b3bab16c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80899560 + .asciz "Error 攻撃方法が分からない(%s %d)\n" + .balign 4 + +glabel D_80899584 + .asciz "../z_bg_jya_ironobj.c" + .balign 4 + +glabel D_8089959C + .asciz "¢ attack_type(%d)\n" + .balign 4 + +.late_rodata +glabel D_80899600 + .float 0.1 + +glabel D_80899604 + .float 0.8 + +glabel D_80899608 + .word 0x3D042108 +glabel D_8089960C + .word 0x3E851EB8 + +.text glabel func_80898920 /* 00080 80898920 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 00084 80898924 AFBF0094 */ sw $ra, 0x0094($sp) @@ -320,5 +346,3 @@ glabel func_80898920 /* 00508 80898DA8 8FB60090 */ lw $s6, 0x0090($sp) /* 0050C 80898DAC 03E00008 */ jr $ra /* 00510 80898DB0 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s index cc37241539..6a47bf2e5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s @@ -1,3 +1,29 @@ +.rdata +glabel D_808995B0 + .asciz "Error 攻撃方法が分からない(%s %d)\n" + .balign 4 + +glabel D_808995D4 + .asciz "../z_bg_jya_ironobj.c" + .balign 4 + +glabel D_808995EC + .asciz "¢ attack_type(%d)\n" + .balign 4 + +.late_rodata +glabel D_80899610 + .float 0.1 + +glabel D_80899614 + .float 0.8 + +glabel D_80899618 + .word 0x3D042108 +glabel D_8089961C + .word 0x3E851EB8 + +.text glabel func_80898DB4 /* 00514 80898DB4 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 00518 80898DB8 AFBF0094 */ sw $ra, 0x0094($sp) @@ -302,5 +328,3 @@ glabel func_80898DB4 /* 00954 808991F4 8FB60090 */ lw $s6, 0x0090($sp) /* 00958 808991F8 03E00008 */ jr $ra /* 0095C 808991FC 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992D8.s index ccbb78a601..849397b430 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992D8.s @@ -3,5 +3,3 @@ glabel func_808992D8 /* 00A3C 808992DC 25CE92E8 */ addiu $t6, $t6, %lo(func_808992E8) ## $t6 = 808992E8 /* 00A40 808992E0 03E00008 */ jr $ra /* 00A44 808992E4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s index 4b634a2ff9..5f5b4a8f72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s @@ -84,5 +84,3 @@ glabel func_808992E8 /* 00B74 80899414 8FB40030 */ lw $s4, 0x0030($sp) /* 00B78 80899418 03E00008 */ jr $ra /* 00B7C 8089941C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Destroy.s index bd1543c966..17c8d71feb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Destroy.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8089A070 + .asciz "女神リフト DT\n" + .balign 4 + +.text glabel BgJyaLift_Destroy /* 00124 80899CC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00128 80899CC8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -23,5 +29,3 @@ glabel BgJyaLift_Destroy /* 0016C 80899D0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00170 80899D10 03E00008 */ jr $ra /* 00174 80899D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s index 6daab6fc50..dcb45a7e1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s @@ -13,4 +13,3 @@ glabel BgJyaLift_Draw /* 00474 8089A014 00000000 */ nop /* 00478 8089A018 00000000 */ nop /* 0047C 8089A01C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Init.s index c5ab229ac3..623d8f91e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8089A060 + .asciz "女神リフト CT\n" + .balign 4 + +.text glabel BgJyaLift_Init /* 00058 80899BF8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0005C 80899BFC AFBF001C */ sw $ra, 0x001C($sp) @@ -58,5 +64,3 @@ glabel BgJyaLift_Init /* 00118 80899CB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0011C 80899CBC 03E00008 */ jr $ra /* 00120 80899CC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Update.s index a825ff1e88..5a121a60d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Update.s @@ -64,5 +64,3 @@ glabel BgJyaLift_Update /* 00440 80899FE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00444 80899FE4 03E00008 */ jr $ra /* 00448 80899FE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899BA0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899BA0.s index 3ceb4ae768..5a187ca155 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899BA0.s @@ -24,5 +24,3 @@ glabel func_80899BA0 /* 0004C 80899BEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00050 80899BF0 03E00008 */ jr $ra /* 00054 80899BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D18.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D18.s index 46ce6b8305..29a579bd65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D18.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D18.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8089A080 + .float 1613.0 + +.text glabel func_80899D18 /* 00178 80899D18 3C0E808A */ lui $t6, %hi(func_80899D38) ## $t6 = 808A0000 /* 0017C 80899D1C 25CE9D38 */ addiu $t6, $t6, %lo(func_80899D38) ## $t6 = 80899D38 @@ -7,5 +12,3 @@ glabel func_80899D18 /* 0018C 80899D2C A4800168 */ sh $zero, 0x0168($a0) ## 00000168 /* 00190 80899D30 03E00008 */ jr $ra /* 00194 80899D34 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D38.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D38.s index 35124a4eb9..fbe40a0dde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D38.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899D38.s @@ -35,5 +35,3 @@ glabel func_80899D38 /* 00210 80899DB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00214 80899DB4 03E00008 */ jr $ra /* 00218 80899DB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DBC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DBC.s index 1a5cc2f3d3..6bdc57d908 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DBC.s @@ -3,5 +3,3 @@ glabel func_80899DBC /* 00220 80899DC0 25CE9DCC */ addiu $t6, $t6, %lo(func_80899DCC) ## $t6 = 80899DCC /* 00224 80899DC4 03E00008 */ jr $ra /* 00228 80899DC8 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DCC.s index ac84807a83..f9ba8c8fe1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899DCC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8089A084 + .float 0.20 + +glabel D_8089A088 + .float 0.001 + +.text glabel func_80899DCC /* 0022C 80899DCC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00230 80899DD0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -79,5 +87,3 @@ glabel func_80899DCC /* 00344 80899EE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00348 80899EE8 03E00008 */ jr $ra /* 0034C 80899EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899EF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899EF0.s index 02287d6187..2d080a5d63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/func_80899EF0.s @@ -1,8 +1,11 @@ +.late_rodata +glabel D_8089A08C + .float 973.0 + +.text glabel func_80899EF0 /* 00350 80899EF0 AC800164 */ sw $zero, 0x0164($a0) ## 00000164 /* 00354 80899EF4 3C01808A */ lui $at, %hi(D_8089A08C) ## $at = 808A0000 /* 00358 80899EF8 C424A08C */ lwc1 $f4, %lo(D_8089A08C)($at) /* 0035C 80899EFC 03E00008 */ jr $ra /* 00360 80899F00 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s index 461336d6b5..0366887360 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s @@ -18,5 +18,3 @@ glabel BgJyaMegami_Destroy /* 004B0 8089A5E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004B4 8089A5E4 03E00008 */ jr $ra /* 004B8 8089A5E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Draw.s index 2ad968b6eb..676f356685 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Draw.s @@ -28,4 +28,3 @@ glabel BgJyaMegami_Draw /* 00E84 8089AFB4 00000000 */ nop /* 00E88 8089AFB8 00000000 */ nop /* 00E8C 8089AFBC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Init.s index c2e6367023..5f6da5b302 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Init.s @@ -40,5 +40,3 @@ glabel BgJyaMegami_Init /* 00468 8089A598 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0046C 8089A59C 03E00008 */ jr $ra /* 00470 8089A5A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Update.s index 174b572e43..156ddaf009 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Update.s @@ -8,5 +8,3 @@ glabel BgJyaMegami_Update /* 00A8C 8089ABBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A90 8089ABC0 03E00008 */ jr $ra /* 00A94 8089ABC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A130.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A130.s index fa0cb66fcd..acb4acde7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A130.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A130.s @@ -24,5 +24,3 @@ glabel func_8089A130 /* 0004C 8089A17C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00050 8089A180 03E00008 */ jr $ra /* 00054 8089A184 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s index 1a0e4b9e7c..179a980c03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s @@ -20,5 +20,3 @@ glabel func_8089A188 /* 000A0 8089A1D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000A4 8089A1D4 03E00008 */ jr $ra /* 000A8 8089A1D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s index 7457c07187..5c090d9190 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8089B2A0 + .word 0x3EE66666 +glabel D_8089B2A4 + .float 0.7 + +.text glabel func_8089A1DC /* 000AC 8089A1DC 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 000B0 8089A1E0 AFB50084 */ sw $s5, 0x0084($sp) @@ -152,5 +159,3 @@ glabel func_8089A1DC /* 002E0 8089A410 8FBE0090 */ lw $s8, 0x0090($sp) /* 002E4 8089A414 03E00008 */ jr $ra /* 002E8 8089A418 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A41C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A41C.s index 6cd8b2bb32..41ca44fef2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A41C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A41C.s @@ -66,5 +66,3 @@ glabel func_8089A41C /* 003DC 8089A50C 8FB70048 */ lw $s7, 0x0048($sp) /* 003E0 8089A510 03E00008 */ jr $ra /* 003E4 8089A514 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A5EC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A5EC.s index c77003c20a..c1d4094a17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A5EC.s @@ -5,5 +5,3 @@ glabel func_8089A5EC /* 004C8 8089A5F8 A48001C8 */ sh $zero, 0x01C8($a0) ## 000001C8 /* 004CC 8089A5FC 03E00008 */ jr $ra /* 004D0 8089A600 A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s index 9741026f63..71ea3e28d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8089B2A8 + .float 0.04 + +glabel D_8089B2AC + .float 0.05 + +.text glabel func_8089A604 /* 004D4 8089A604 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 004D8 8089A608 AFBF0024 */ sw $ra, 0x0024($sp) @@ -110,5 +118,3 @@ glabel func_8089A604 /* 00650 8089A780 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00654 8089A784 03E00008 */ jr $ra /* 00658 8089A788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A78C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A78C.s index 49e17828fd..4bcd67b5a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A78C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A78C.s @@ -38,5 +38,3 @@ glabel func_8089A78C /* 006E4 8089A814 8FB00018 */ lw $s0, 0x0018($sp) /* 006E8 8089A818 03E00008 */ jr $ra /* 006EC 8089A81C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A820.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A820.s index ac197b3f9e..4ffbdf09ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A820.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A820.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_8089B2B0 + .word 0x3D89374C +glabel D_8089B2B4 + .word 0x3F7EB852 +glabel D_8089B2B8 + .float 0.6 + +.text glabel func_8089A820 /* 006F0 8089A820 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 006F4 8089A824 AFBF0074 */ sw $ra, 0x0074($sp) @@ -244,5 +253,3 @@ glabel func_8089A820 /* 00A68 8089AB98 8FBE0070 */ lw $s8, 0x0070($sp) /* 00A6C 8089AB9C 03E00008 */ jr $ra /* 00A70 8089ABA0 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s index 038a7c0f17..24b2b092f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8089B210 + .asciz "../z_bg_jya_megami.c" + .balign 4 + +glabel D_8089B228 + .asciz "../z_bg_jya_megami.c" + .balign 4 + +glabel D_8089B240 + .asciz "../z_bg_jya_megami.c" + .balign 4 + +.text glabel func_8089ABC8 /* 00A98 8089ABC8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00A9C 8089ABCC AFBF001C */ sw $ra, 0x001C($sp) @@ -95,5 +109,3 @@ glabel func_8089ABC8 /* 00C0C 8089AD3C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00C10 8089AD40 03E00008 */ jr $ra /* 00C14 8089AD44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s index 70479ee6df..e1f4fa4587 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s @@ -1,3 +1,24 @@ +.rdata +glabel D_8089B258 + .asciz "../z_bg_jya_megami.c" + .balign 4 + +glabel D_8089B270 + .asciz "../z_bg_jya_megami.c" + .balign 4 + +glabel D_8089B288 + .asciz "../z_bg_jya_megami.c" + .balign 4 + +.late_rodata +glabel D_8089B2BC + .float 9.58738019108e-05 + +glabel D_8089B2C0 + .float 0.1 + +.text glabel func_8089AD48 /* 00C18 8089AD48 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00C1C 8089AD4C AFB60048 */ sw $s6, 0x0048($sp) @@ -131,5 +152,3 @@ glabel func_8089AD48 /* 00E18 8089AF48 8FBE0050 */ lw $s8, 0x0050($sp) /* 00E1C 8089AF4C 03E00008 */ jr $ra /* 00E20 8089AF50 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s index 884cfe8c4b..5cef987be0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s @@ -18,5 +18,3 @@ glabel BgJyaZurerukabe_Destroy /* 00368 8089B7A8 00390821 */ addu $at, $at, $t9 /* 0036C 8089B7AC 03E00008 */ jr $ra /* 00370 8089B7B0 E424B9C0 */ swc1 $f4, %lo(D_8089B9C0)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s index 4d4ec35f0a..60ec165db0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s @@ -12,4 +12,3 @@ glabel BgJyaZurerukabe_Draw /* 00574 8089B9B4 03E00008 */ jr $ra /* 00578 8089B9B8 00000000 */ nop /* 0057C 8089B9BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s index 52cca9efe3..c59c983d71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s @@ -1,3 +1,29 @@ +.rdata +glabel D_8089BAAC + .asciz "" + .balign 4 + +glabel D_8089BAB8 + .asciz "home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +.balign 4 + +glabel D_8089BAF0 + .asciz "../z_bg_jya_zurerukabe.c" + .balign 4 + +glabel D_8089BB0C + .asciz "\x1b[m" + .balign 4 + +glabel D_8089BB10 + .asciz "(jya ずれる壁)(arg_data 0x%04x)\n" + .balign 4 + +.balign 4 + +.text glabel BgJyaZurerukabe_Init /* 00220 8089B660 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00224 8089B664 AFBF001C */ sw $ra, 0x001C($sp) @@ -75,5 +101,3 @@ glabel BgJyaZurerukabe_Init /* 00320 8089B760 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00324 8089B764 03E00008 */ jr $ra /* 00328 8089B768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s index f060c712a5..2c3051b217 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s @@ -23,5 +23,3 @@ glabel BgJyaZurerukabe_Update /* 00544 8089B984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00548 8089B988 03E00008 */ jr $ra /* 0054C 8089B98C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s index a261524e8b..7702c30993 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s @@ -1,3 +1,15 @@ +.rdata +glabel D_8089BA50 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +.balign 4 + +glabel D_8089BA90 + .asciz "../z_bg_jya_zurerukabe.c" + .balign 4 + +.text glabel func_8089B440 /* 00000 8089B440 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 8089B444 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +50,3 @@ glabel func_8089B440 /* 0007C 8089B4BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 8089B4C0 03E00008 */ jr $ra /* 00084 8089B4C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s index c9c15f9824..793dbe47f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_8089BB34 +.word L8089B574 +.word L8089B5D8 +.word L8089B574 +.word L8089B574 +.word L8089B5D8 +.word L8089B574 +.word 0x00000000 + +.text glabel func_8089B4C8 /* 00088 8089B4C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0008C 8089B4CC AFBF001C */ sw $ra, 0x001C($sp) @@ -108,5 +119,3 @@ glabel L8089B5D8 /* 00214 8089B654 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00218 8089B658 03E00008 */ jr $ra /* 0021C 8089B65C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s index bcbe28154c..190df34dd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s @@ -3,5 +3,3 @@ glabel func_8089B7B4 /* 00378 8089B7B8 25CEB7C4 */ addiu $t6, $t6, %lo(func_8089B7C4) ## $t6 = 8089B7C4 /* 0037C 8089B7BC 03E00008 */ jr $ra /* 00380 8089B7C0 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s index e9960a2d25..b684205dec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s @@ -18,5 +18,3 @@ glabel func_8089B7C4 /* 003C0 8089B800 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003C4 8089B804 03E00008 */ jr $ra /* 003C8 8089B808 E424B9C0 */ swc1 $f4, %lo(D_8089B9C0)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s index 4d30d862b7..7f83e9dde9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s @@ -27,5 +27,3 @@ glabel func_8089B80C /* 00424 8089B864 004A5821 */ addu $t3, $v0, $t2 /* 00428 8089B868 03E00008 */ jr $ra /* 0042C 8089B86C A48B016C */ sh $t3, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s index cab5823a79..33572b933f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s @@ -51,5 +51,3 @@ glabel func_8089B870 /* 004EC 8089B92C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F0 8089B930 03E00008 */ jr $ra /* 004F4 8089B934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s index 5565018dbd..d3b7fe82bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s @@ -9,5 +9,3 @@ glabel BgMenkuriEye_Destroy /* 000F4 8089BD64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000F8 8089BD68 03E00008 */ jr $ra /* 000FC 8089BD6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s index fb5e7abcce..68fe5fc629 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8089C0D0 + .asciz "../z_bg_menkuri_eye.c" + .balign 4 + +glabel D_8089C0E8 + .asciz "../z_bg_menkuri_eye.c" + .balign 4 + +glabel D_8089C100 + .asciz "../z_bg_menkuri_eye.c" + .balign 4 + +.text glabel BgMenkuriEye_Draw /* 00270 8089BEE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00274 8089BEE4 AFBF001C */ sw $ra, 0x001C($sp) @@ -103,4 +117,3 @@ glabel BgMenkuriEye_Draw /* 003F4 8089C064 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 003F8 8089C068 00000000 */ nop /* 003FC 8089C06C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s index bb914ec025..0be8f5393d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s @@ -56,5 +56,3 @@ glabel BgMenkuriEye_Init /* 000CC 8089BD3C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000D0 8089BD40 03E00008 */ jr $ra /* 000D4 8089BD44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s index 6b142cb622..5006fdbf4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s @@ -104,5 +104,3 @@ glabel BgMenkuriEye_Update /* 00264 8089BED4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00268 8089BED8 03E00008 */ jr $ra /* 0026C 8089BEDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s index faa74709e8..d45db020ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s @@ -18,5 +18,3 @@ glabel BgMizuBwall_Destroy /* 00978 8089CDF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0097C 8089CDFC 03E00008 */ jr $ra /* 00980 8089CE00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s index 19b66488c3..933018d5fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8089DA14 + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +glabel D_8089DA2C + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +glabel D_8089DA44 + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +.text glabel BgMizuBwall_Draw /* 00F2C 8089D3AC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00F30 8089D3B0 AFB10048 */ sw $s1, 0x0048($sp) @@ -189,4 +203,3 @@ glabel BgMizuBwall_Draw /* 01214 8089D694 03E00008 */ jr $ra /* 01218 8089D698 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0121C 8089D69C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s index 65267a3748..b5872702fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s @@ -1,3 +1,53 @@ +.rdata +glabel D_8089D870 + .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8089D8AC + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +glabel D_8089D8C4 + .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8089D900 + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +glabel D_8089D918 + .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8089D954 + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +glabel D_8089D96C + .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8089D9A8 + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +glabel D_8089D9C0 + .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_8089D9FC + .asciz "../z_bg_mizu_bwall.c" + .balign 4 + +.late_rodata +glabel jtbl_8089DA5C +.word L8089C5B0 +.word L8089C740 +.word L8089C8D4 +.word L8089CA5C +.word L8089CBF0 + +.text glabel BgMizuBwall_Init /* 0004C 8089C4CC 27BDFE40 */ addiu $sp, $sp, 0xFE40 ## $sp = FFFFFE40 /* 00050 8089C4D0 AFB00038 */ sw $s0, 0x0038($sp) @@ -627,5 +677,3 @@ glabel L8089CBF0 /* 00930 8089CDB0 8FBE0058 */ lw $s8, 0x0058($sp) /* 00934 8089CDB4 03E00008 */ jr $ra /* 00938 8089CDB8 27BD01C0 */ addiu $sp, $sp, 0x01C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Update.s index 47fc3c3aa9..7265bfb8c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Update.s @@ -8,5 +8,3 @@ glabel BgMizuBwall_Update /* 00F20 8089D3A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F24 8089D3A4 03E00008 */ jr $ra /* 00F28 8089D3A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089C480.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089C480.s index be4910de8a..36543f96f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089C480.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089C480.s @@ -18,5 +18,3 @@ glabel func_8089C480 /* 00040 8089C4C0 460A4401 */ sub.s $f16, $f8, $f10 /* 00044 8089C4C4 03E00008 */ jr $ra /* 00048 8089C4C8 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CE04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CE04.s index 67067dee8a..c67e07abf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CE04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CE04.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8089DA70 + .word 0x43DE8000 +glabel D_8089DA74 + .word 0x43DE8000 +glabel D_8089DA78 + .word 0x443F4000 +glabel D_8089DA7C + .word 0xC450C000 + +.text glabel func_8089CE04 /* 00984 8089CE04 8CAE07C0 */ lw $t6, 0x07C0($a1) ## 000007C0 /* 00988 8089CE08 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 @@ -102,5 +113,3 @@ glabel func_8089CE04 /* 00AF8 8089CF78 8C8F02A8 */ lw $t7, 0x02A8($a0) ## 000002A8 /* 00AFC 8089CF7C 03E00008 */ jr $ra /* 00B00 8089CF80 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s index e72d7962d3..388c340c34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s @@ -200,5 +200,3 @@ glabel func_8089CF84 /* 00DCC 8089D24C 8FB60078 */ lw $s6, 0x0078($sp) /* 00DD0 8089D250 03E00008 */ jr $ra /* 00DD4 8089D254 27BD0170 */ addiu $sp, $sp, 0x0170 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s index 9e2245ca01..d805e9cf7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s @@ -68,5 +68,3 @@ glabel func_8089D258 /* 00EC4 8089D344 8FB10020 */ lw $s1, 0x0020($sp) /* 00EC8 8089D348 03E00008 */ jr $ra /* 00ECC 8089D34C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D350.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D350.s index b6fb619a7b..33054394fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D350.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D350.s @@ -11,5 +11,3 @@ glabel func_8089D350 /* 00EF0 8089D370 AC8F0298 */ sw $t7, 0x0298($a0) ## 00000298 /* 00EF4 8089D374 03E00008 */ jr $ra /* 00EF8 8089D378 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D37C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D37C.s index 8163387105..daea36d267 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D37C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D37C.s @@ -2,5 +2,3 @@ glabel func_8089D37C /* 00EFC 8089D37C AFA40000 */ sw $a0, 0x0000($sp) /* 00F00 8089D380 03E00008 */ jr $ra /* 00F04 8089D384 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Destroy.s index 3e14e06915..f587178c03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Destroy.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_8089EC3C +.word L8089E0AC +.word L8089E0AC +.word L8089E0AC +.word L8089E0AC +.word L8089E0D4 + +.text glabel BgMizuMovebg_Destroy /* 00428 8089E058 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0042C 8089E05C AFA40018 */ sw $a0, 0x0018($sp) @@ -48,5 +57,3 @@ glabel L8089E0D4 /* 004CC 8089E0FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004D0 8089E100 03E00008 */ jr $ra /* 004D4 8089E104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s index 1d43b544f5..c99c70f81c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8089EBC0 + .asciz "../z_bg_mizu_movebg.c" + .balign 4 + +glabel D_8089EBD8 + .asciz "../z_bg_mizu_movebg.c" + .balign 4 + +glabel D_8089EBF0 + .asciz "../z_bg_mizu_movebg.c" + .balign 4 + +.text glabel BgMizuMovebg_Draw /* 00C00 8089E830 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00C04 8089E834 AFB10048 */ sw $s1, 0x0048($sp) @@ -188,4 +202,3 @@ glabel BgMizuMovebg_Draw /* 00EE4 8089EB14 8FB10048 */ lw $s1, 0x0048($sp) /* 00EE8 8089EB18 03E00008 */ jr $ra /* 00EEC 8089EB1C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s index a40c4be526..a4af4c4adc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s @@ -1,3 +1,21 @@ +.late_rodata +glabel jtbl_8089EC08 +.word L8089DD64 +.word L8089DDC8 +.word L8089DE2C +.word L8089DE90 +.word L8089DED0 +.word L8089DED0 +.word L8089DED0 +.word L8089DF24 +glabel D_8089EC28 + .word 0x44318000, 0x00000000 +glabel D_8089EC30 + .word 0x405CCCCC, 0xCCCCCCCC +glabel D_8089EC38 + .float 9.58738019108e-05 + +.text glabel BgMizuMovebg_Init /* 00068 8089DC98 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 0006C 8089DC9C AFBF003C */ sw $ra, 0x003C($sp) @@ -260,5 +278,3 @@ glabel L8089DF24 /* 0041C 8089E04C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00420 8089E050 03E00008 */ jr $ra /* 00424 8089E054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Update.s index f359e0f717..7fe0f81c99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Update.s @@ -8,5 +8,3 @@ glabel BgMizuMovebg_Update /* 00BF4 8089E824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BF8 8089E828 03E00008 */ jr $ra /* 00BFC 8089E82C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089DC30.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089DC30.s index 4892a28ab0..fa0a5f74cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089DC30.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089DC30.s @@ -31,5 +31,3 @@ glabel func_8089DC30 /* 0005C 8089DC8C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000003 /* 00060 8089DC90 03E00008 */ jr $ra /* 00064 8089DC94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s index 347541291f..06c003a51a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s @@ -35,5 +35,3 @@ glabel func_8089E108 /* 0055C 8089E18C 468084A0 */ cvt.s.w $f18, $f16 /* 00560 8089E190 03E00008 */ jr $ra /* 00564 8089E194 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E198.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E198.s index cda6654e92..b60306f661 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E198.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E198.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8089EC50 + .word 0x43DE8000 +glabel D_8089EC54 + .word 0x43DE8000 +glabel D_8089EC58 + .word 0x443F4000 +glabel D_8089EC5C + .word 0xC450C000 + +.text glabel func_8089E198 /* 00568 8089E198 8CAE07C0 */ lw $t6, 0x07C0($a1) ## 000007C0 /* 0056C 8089E19C 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 @@ -102,5 +113,3 @@ glabel func_8089E198 /* 006DC 8089E30C 8C980174 */ lw $t8, 0x0174($a0) ## 00000174 /* 006E0 8089E310 03E00008 */ jr $ra /* 006E4 8089E314 AC980178 */ sw $t8, 0x0178($a0) ## 00000178 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s index 8c9869223c..fb1aca01a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s @@ -1,3 +1,20 @@ +.late_rodata +glabel jtbl_8089EC60 +.word L8089E36C +.word L8089E3C0 +.word L8089E36C +.word L8089E414 +.word L8089E4D8 +.word L8089E4D8 +.word L8089E4D8 +glabel D_8089EC7C + .word 0x44318000 +glabel D_8089EC80 + .word 0x42E66667 +glabel D_8089EC84 + .float 9.58738019108e-05 + +.text glabel func_8089E318 /* 006E8 8089E318 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 006EC 8089E31C AFBF001C */ sw $ra, 0x001C($sp) @@ -227,5 +244,3 @@ glabel L8089E4D8 /* 00A14 8089E644 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00A18 8089E648 03E00008 */ jr $ra /* 00A1C 8089E64C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E650.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E650.s index fb99760bfe..454f8d3efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E650.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E650.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8089EC88 + .float 0.1 + +.text glabel func_8089E650 /* 00A20 8089E650 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00A24 8089E654 AFBF001C */ sw $ra, 0x001C($sp) @@ -114,5 +119,3 @@ glabel func_8089E650 /* 00BD0 8089E800 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00BD4 8089E804 03E00008 */ jr $ra /* 00BD8 8089E808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Destroy.s index a69cd25042..45add8bb7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Destroy.s @@ -12,5 +12,3 @@ glabel BgMizuShutter_Destroy /* 00280 8089F0D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00284 8089F0D4 03E00008 */ jr $ra /* 00288 8089F0D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s index 44be37bac1..ea665300a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8089F580 + .asciz "../z_bg_mizu_shutter.c" + .balign 4 + +glabel D_8089F598 + .asciz "../z_bg_mizu_shutter.c" + .balign 4 + +glabel D_8089F5B0 + .asciz "../z_bg_mizu_shutter.c" + .balign 4 + +.text glabel BgMizuShutter_Draw /* 005F8 8089F448 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 005FC 8089F44C AFBF001C */ sw $ra, 0x001C($sp) @@ -54,4 +68,3 @@ glabel BgMizuShutter_Draw /* 006C4 8089F514 03E00008 */ jr $ra /* 006C8 8089F518 00000000 */ nop /* 006CC 8089F51C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Init.s index f244eecd3b..7bf5fd3fe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Init.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8089F5C8 + .float 9.58738019108e-05 + +glabel D_8089F5CC + .float 9.58738019108e-05 + +glabel D_8089F5D0 + .float 9.58738019108e-05 + +.text glabel BgMizuShutter_Init /* 00000 8089EE50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 8089EE54 AFA50044 */ sw $a1, 0x0044($sp) @@ -161,5 +172,3 @@ glabel BgMizuShutter_Init /* 00250 8089F0A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00254 8089F0A4 03E00008 */ jr $ra /* 00258 8089F0A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Update.s index b95971b7e6..be5130aa14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Update.s @@ -8,5 +8,3 @@ glabel BgMizuShutter_Update /* 005EC 8089F43C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005F0 8089F440 03E00008 */ jr $ra /* 005F4 8089F444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F0DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F0DC.s index 5fe815b6a1..9023901884 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F0DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F0DC.s @@ -41,5 +41,3 @@ glabel func_8089F0DC /* 00314 8089F164 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00318 8089F168 03E00008 */ jr $ra /* 0031C 8089F16C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F170.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F170.s index b9566d379c..2301f1b28c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F170.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F170.s @@ -20,5 +20,3 @@ glabel func_8089F170 /* 00360 8089F1B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00364 8089F1B4 03E00008 */ jr $ra /* 00368 8089F1B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F1BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F1BC.s index 835c9e6113..1943f60005 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F1BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F1BC.s @@ -1,3 +1,26 @@ +.late_rodata +glabel D_8089F5D4 + .float 0.1 + +glabel D_8089F5D8 + .float 0.1 + +glabel D_8089F5DC + .float 0.1 + +glabel D_8089F5E0 + .float 0.1 + +glabel D_8089F5E4 + .float 0.1 + +glabel D_8089F5E8 + .float 0.1 + +glabel D_8089F5EC + .float 0.1 + +.text glabel func_8089F1BC /* 0036C 8089F1BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00370 8089F1C0 AFB00020 */ sw $s0, 0x0020($sp) @@ -133,5 +156,3 @@ glabel func_8089F1BC /* 00548 8089F398 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0054C 8089F39C 03E00008 */ jr $ra /* 00550 8089F3A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F3A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F3A4.s index 73a29f18de..ac834fd79c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/func_8089F3A4.s @@ -34,5 +34,3 @@ glabel func_8089F3A4 /* 005C8 8089F418 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005CC 8089F41C 03E00008 */ jr $ra /* 005D0 8089F420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s index a806ffa4ad..93ba4c60bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s @@ -2,5 +2,3 @@ glabel BgMizuWater_Destroy /* 0043C 8089FCEC AFA40000 */ sw $a0, 0x0000($sp) /* 00440 8089FCF0 03E00008 */ jr $ra /* 00444 8089FCF4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s index ff5d8c59ad..986ecf04df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A05A8 + .asciz "../z_bg_mizu_water.c" + .balign 4 + +glabel D_808A05C0 + .asciz "../z_bg_mizu_water.c" + .balign 4 + +glabel D_808A05D8 + .asciz "../z_bg_mizu_water.c" + .balign 4 + +.text glabel BgMizuWater_Draw /* 00AE8 808A0398 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00AEC 808A039C AFB10038 */ sw $s1, 0x0038($sp) @@ -93,4 +107,3 @@ glabel BgMizuWater_Draw /* 00C54 808A0504 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 00C58 808A0508 00000000 */ nop /* 00C5C 808A050C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s index e037735416..8de24a6b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A0580 + .asciz "<コンストラクト>%x %x %x\n" + .balign 4 + +.late_rodata +glabel jtbl_808A05F0 +.word L8089FAB4 +.word L8089FCCC +.word L8089FBFC +.word L8089FC3C +.word L8089FC84 + +.text glabel BgMizuWater_Init /* 0018C 8089FA3C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00190 8089FA40 AFBF001C */ sw $ra, 0x001C($sp) @@ -198,5 +212,3 @@ glabel L8089FCCC /* 00430 8089FCE0 8FB00014 */ lw $s0, 0x0014($sp) /* 00434 8089FCE4 03E00008 */ jr $ra /* 00438 8089FCE8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s index cc085822a9..1c6eef996e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A059C + .asciz "%x %x %x\n" + .balign 4 + +.late_rodata +glabel D_808A062C + .word 0xC450C000 +glabel D_808A0630 + .word 0x43DE8000 +glabel D_808A0634 + .word 0x443F4000, 0x00000000, 0x00000000 + +.text glabel BgMizuWater_Update /* 00924 808A01D4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00928 808A01D8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 @@ -122,5 +136,3 @@ glabel BgMizuWater_Update /* 00ADC 808A038C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00AE0 808A0390 03E00008 */ jr $ra /* 00AE4 808A0394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s index 71e7a46fce..0f59a6bd7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s @@ -89,5 +89,3 @@ glabel func_8089F8B0 /* 00114 8089F9C4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00118 8089F9C8 03E00008 */ jr $ra /* 0011C 8089F9CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s index bbae24caa1..3054265d2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s @@ -27,5 +27,3 @@ glabel func_8089F9D0 /* 00180 8089FA30 A5E50002 */ sh $a1, 0x0002($t7) ## 00000002 /* 00184 8089FA34 03E00008 */ jr $ra /* 00188 8089FA38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s index 10e2f56630..4b3fde8aa0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_808A0604 +.word L8089FD30 +.word L8089FE8C +.word L8089FDE8 +.word L8089FE20 +.word L8089FE58 + +.text glabel func_8089FCF8 /* 00448 8089FCF8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0044C 8089FCFC AFBF0024 */ sw $ra, 0x0024($sp) @@ -130,5 +139,3 @@ glabel L8089FE8C /* 00608 8089FEB8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0060C 8089FEBC 03E00008 */ jr $ra /* 00610 8089FEC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s index 356acde5a9..36f8333783 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_808A0618 +.word L8089FF08 +.word L808A0154 +.word L8089FFE0 +.word L808A005C +.word L808A00D8 + +.text glabel func_8089FEC4 /* 00614 8089FEC4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00618 8089FEC8 AFBF001C */ sw $ra, 0x001C($sp) @@ -226,5 +235,3 @@ glabel L808A0154 /* 00918 808A01C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0091C 808A01CC 03E00008 */ jr $ra /* 00920 808A01D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s index 26c6e1ee1d..561f4c9043 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s @@ -12,5 +12,3 @@ glabel BgMoriBigst_Destroy /* 00210 808A0DD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00214 808A0DD4 03E00008 */ jr $ra /* 00218 808A0DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s index fe3fcd202a..de63b63e8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808A1558 + .asciz "mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n" + .balign 4 + +glabel D_808A15A4 + .asciz "【ビッグスタルフォス鍵型天井】 バンク危険！\n" + .balign 4 + +glabel D_808A15D4 + .asciz "%s %d\n" + .balign 4 + +glabel D_808A15DC + .asciz "../z_bg_mori_bigst.c" + .balign 4 + +.text glabel BgMoriBigst_Init /* 00090 808A0C50 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00094 808A0C54 AFB00024 */ sw $s0, 0x0024($sp) @@ -101,5 +119,3 @@ glabel BgMoriBigst_Init /* 001E0 808A0DA0 8FB10028 */ lw $s1, 0x0028($sp) /* 001E4 808A0DA4 03E00008 */ jr $ra /* 001E8 808A0DA8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s index aa576ac6a8..2a99fafaa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s @@ -31,5 +31,3 @@ glabel BgMoriBigst_Update /* 007E8 808A13A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007EC 808A13AC 03E00008 */ jr $ra /* 007F0 808A13B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s index 1cc63ca1bd..0eab171c04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s @@ -1,5 +1,3 @@ glabel func_808A0BC0 /* 00000 808A0BC0 03E00008 */ jr $ra /* 00004 808A0BC4 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s index b37ca7a2b7..838517e0fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808A1500 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808A1540 + .asciz "../z_bg_mori_bigst.c" + .balign 4 + +.text glabel func_808A0BC8 /* 00008 808A0BC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 808A0BCC AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_808A0BC8 /* 00084 808A0C44 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00088 808A0C48 03E00008 */ jr $ra /* 0008C 808A0C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s index 5c6c04d6e6..97a686b130 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s @@ -9,5 +9,3 @@ glabel func_808A0DDC /* 00238 808A0DF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0023C 808A0DFC 03E00008 */ jr $ra /* 00240 808A0E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s index f66f988eb8..ba0ddf92fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s @@ -57,5 +57,3 @@ glabel func_808A0E04 /* 00304 808A0EC4 8FB10018 */ lw $s1, 0x0018($sp) /* 00308 808A0EC8 03E00008 */ jr $ra /* 0030C 808A0ECC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s index 7c38662fdf..bac7a6edf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s @@ -8,5 +8,3 @@ glabel func_808A0ED0 /* 00328 808A0EE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0032C 808A0EEC 03E00008 */ jr $ra /* 00330 808A0EF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s index cbed0e4cbf..5384a2720c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s @@ -1,3 +1,15 @@ +.rdata +glabel D_808A15F4 + .asciz "Warning : 第２スタルフォス発生失敗\n" + .balign 4 + +.late_rodata +glabel D_808A16B0 + .float 827.0 +glabel D_808A16B4 + .float -3320.0 + +.text glabel func_808A0EF4 /* 00334 808A0EF4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00338 808A0EF8 AFA50044 */ sw $a1, 0x0044($sp) @@ -52,5 +64,3 @@ glabel func_808A0EF4 /* 003E4 808A0FA4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 003E8 808A0FA8 03E00008 */ jr $ra /* 003EC 808A0FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s index 5c128f02f5..3d67cbd4fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s @@ -29,5 +29,3 @@ glabel func_808A0FB0 /* 00458 808A1018 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0045C 808A101C 03E00008 */ jr $ra /* 00460 808A1020 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s index f33c8c39d1..76ea164644 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s @@ -9,5 +9,3 @@ glabel func_808A1024 /* 00480 808A1040 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00484 808A1044 03E00008 */ jr $ra /* 00488 808A1048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s index e3dee78fb0..250783a51c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s @@ -36,5 +36,3 @@ glabel func_808A104C /* 00508 808A10C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0050C 808A10CC 03E00008 */ jr $ra /* 00510 808A10D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s index 07625a221d..1bf469b2ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s @@ -35,5 +35,3 @@ glabel func_808A10D4 /* 00598 808A1158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0059C 808A115C 03E00008 */ jr $ra /* 005A0 808A1160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s index 56eced1826..f5de908dce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s @@ -11,5 +11,3 @@ glabel func_808A1164 /* 005C4 808A1184 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005C8 808A1188 03E00008 */ jr $ra /* 005CC 808A118C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s index 95a8556f13..98d3438c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s @@ -1,3 +1,23 @@ +.rdata +glabel D_808A1618 + .asciz "Warning : 第３-1スタルフォス発生失敗\n" + .balign 4 + +glabel D_808A1640 + .asciz "Warning : 第３-2スタルフォス発生失敗\n" + .balign 4 + +.late_rodata +glabel D_808A16B8 + .float 827.0 +glabel D_808A16BC + .float -3383.0 +glabel D_808A16C0 + .float 827.0 +glabel D_808A16C4 + .float -3260.0 + +.text glabel func_808A1190 /* 005D0 808A1190 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 005D4 808A1194 AFB10038 */ sw $s1, 0x0038($sp) @@ -86,5 +106,3 @@ glabel func_808A1190 /* 006F8 808A12B8 8FB10038 */ lw $s1, 0x0038($sp) /* 006FC 808A12BC 03E00008 */ jr $ra /* 00700 808A12C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s index 3ab6188aa9..1d918be273 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s @@ -25,5 +25,3 @@ glabel func_808A12C4 /* 00754 808A1314 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00758 808A1318 03E00008 */ jr $ra /* 0075C 808A131C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s index 4103138e55..e14fb99738 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s @@ -8,5 +8,3 @@ glabel func_808A1320 /* 00778 808A1338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0077C 808A133C 03E00008 */ jr $ra /* 00780 808A1340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s index 2dc4fa3ae2..df78378a61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A1668 + .asciz "../z_bg_mori_bigst.c" + .balign 4 + +glabel D_808A1680 + .asciz "../z_bg_mori_bigst.c" + .balign 4 + +glabel D_808A1698 + .asciz "../z_bg_mori_bigst.c" + .balign 4 + +.text glabel func_808A13B4 /* 007F4 808A13B4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 007F8 808A13B8 AFB10018 */ sw $s1, 0x0018($sp) @@ -66,4 +80,3 @@ glabel func_808A13B4 /* 008F4 808A14B4 00000000 */ nop /* 008F8 808A14B8 00000000 */ nop /* 008FC 808A14BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Destroy.s index 6c9f1e5890..e747821ba3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Destroy.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808A22B4 + .asciz "森の神殿 elevator DT\n" + .balign 4 + +.text glabel BgMoriElevator_Destroy /* 002AC 808A1AAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002B0 808A1AB0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -23,5 +29,3 @@ glabel BgMoriElevator_Destroy /* 002F4 808A1AF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 808A1AF8 03E00008 */ jr $ra /* 002FC 808A1AFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Init.s index 7ff06e6b3b..c4e64714a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A2250 + .asciz "Error : 森の神殿 obj elevator バンク危険！(%s %d)\n" + .balign 4 + +glabel D_808A2284 + .asciz "../z_bg_mori_elevator.c" + .balign 4 + +glabel D_808A229C + .asciz "森の神殿 elevator CT\n" + .balign 4 + +.text glabel BgMoriElevator_Init /* 00184 808A1984 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00188 808A1988 3C0E808A */ lui $t6, %hi(D_808A2210) ## $t6 = 808A0000 @@ -86,5 +100,3 @@ glabel BgMoriElevator_Init /* 002A0 808A1AA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002A4 808A1AA4 03E00008 */ jr $ra /* 002A8 808A1AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Update.s index cdddab74c5..8a83be19cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/BgMoriElevator_Update.s @@ -20,5 +20,3 @@ glabel BgMoriElevator_Update /* 00900 808A2100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00904 808A2104 03E00008 */ jr $ra /* 00908 808A2108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1800.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1800.s index 8d4b8e4403..25752f23c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1800.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1800.s @@ -73,5 +73,3 @@ glabel func_808A1800 .L808A18F4: /* 000F4 808A18F4 03E00008 */ jr $ra /* 000F8 808A18F8 46001006 */ mov.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A18FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A18FC.s index d4b5b0726f..97624920db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A18FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A18FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A23B4 + .word 0x3DB851EC + +.text glabel func_808A18FC /* 000FC 808A18FC 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 /* 00100 808A1900 3C01808A */ lui $at, %hi(D_808A23B4) ## $at = 808A0000 @@ -36,5 +41,3 @@ glabel func_808A18FC /* 00178 808A1978 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0017C 808A197C 03E00008 */ jr $ra /* 00180 808A1980 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B00.s index e430a55b64..581aec1e47 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B00.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B00.s @@ -24,5 +24,3 @@ glabel func_808A1B00 .L808A1B58: /* 00358 808A1B58 03E00008 */ jr $ra /* 0035C 808A1B5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B60.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B60.s index 2d1826612e..26251a01bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B60.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B60.s @@ -3,5 +3,3 @@ glabel func_808A1B60 /* 00364 808A1B64 25CE1B70 */ addiu $t6, $t6, %lo(func_808A1B70) ## $t6 = 808A1B70 /* 00368 808A1B68 03E00008 */ jr $ra /* 0036C 808A1B6C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B70.s index 946d9906e0..0c7d3ed282 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B70.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1B70.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808A22CC + .asciz "Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n" + .balign 4 + +glabel D_808A2304 + .asciz "../z_bg_mori_elevator.c" + .balign 4 + +.text glabel func_808A1B70 /* 00370 808A1B70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00374 808A1B74 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +64,3 @@ glabel func_808A1B70 /* 00424 808A1C24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00428 808A1C28 03E00008 */ jr $ra /* 0042C 808A1C2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C30.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C30.s index 3475ad7610..6d6852ea9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C30.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C30.s @@ -3,5 +3,3 @@ glabel func_808A1C30 /* 00434 808A1C34 25CE1C40 */ addiu $t6, $t6, %lo(func_808A1C40) ## $t6 = 808A1C40 /* 00438 808A1C38 03E00008 */ jr $ra /* 0043C 808A1C3C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C40.s index 6037130f5f..1fa8b9aedc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1C40.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A23B8 + .float 0.001 + +.text glabel func_808A1C40 /* 00440 808A1C40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00444 808A1C44 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -47,5 +52,3 @@ glabel func_808A1C40 /* 004E8 808A1CE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004EC 808A1CEC 03E00008 */ jr $ra /* 004F0 808A1CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1CF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1CF4.s index cbf924d974..2e6d8ff2de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1CF4.s @@ -22,5 +22,3 @@ glabel func_808A1CF4 /* 00544 808A1D44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00548 808A1D48 03E00008 */ jr $ra /* 0054C 808A1D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1D50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1D50.s index 89bfb13ddc..859ab31e16 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1D50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1D50.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A23BC + .float 0.001 + +.text glabel func_808A1D50 /* 00550 808A1D50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00554 808A1D54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -47,5 +52,3 @@ glabel func_808A1D50 /* 005F8 808A1DF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005FC 808A1DFC 03E00008 */ jr $ra /* 00600 808A1E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E04.s index a068152406..1e040d2280 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E04.s @@ -3,5 +3,3 @@ glabel func_808A1E04 /* 00608 808A1E08 25CE1E14 */ addiu $t6, $t6, %lo(func_808A1E14) ## $t6 = 808A1E14 /* 0060C 808A1E0C 03E00008 */ jr $ra /* 00610 808A1E10 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E14.s index 6e220437a0..ddbea625f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1E14.s @@ -1,3 +1,23 @@ +.rdata +glabel D_808A231C + .asciz "Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n" + .balign 4 + +glabel D_808A2354 + .asciz "../z_bg_mori_elevator.c" + .balign 4 + +.late_rodata +glabel D_808A23C0 + .word 0xC442C000 +glabel D_808A23C4 + .word 0xC3898000 +glabel D_808A23C8 + .word 0xC3898000 +glabel D_808A23CC + .word 0xC442C000 + +.text glabel func_808A1E14 /* 00614 808A1E14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00618 808A1E18 AFBF0014 */ sw $ra, 0x0014($sp) @@ -130,5 +150,3 @@ glabel func_808A1E14 /* 007E4 808A1FE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007E8 808A1FE8 03E00008 */ jr $ra /* 007EC 808A1FEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1FF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1FF0.s index 65c605cc62..ddc81d6d29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A1FF0.s @@ -5,5 +5,3 @@ glabel func_808A1FF0 /* 007FC 808A1FFC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00800 808A2000 03E00008 */ jr $ra /* 00804 808A2004 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A2008.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A2008.s index 19aaba8fa4..b96a0aee67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A2008.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A2008.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808A23D0 + .float 0.3 + +glabel D_808A23D4 + .float 0.001 + +.text glabel func_808A2008 /* 00808 808A2008 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0080C 808A200C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -47,5 +55,3 @@ glabel func_808A2008 /* 008B0 808A20B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008B4 808A20B4 03E00008 */ jr $ra /* 008B8 808A20B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s index cf3c5c9d48..e48f90fc36 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A236C + .asciz "../z_bg_mori_elevator.c" + .balign 4 + +glabel D_808A2384 + .asciz "../z_bg_mori_elevator.c" + .balign 4 + +glabel D_808A239C + .asciz "../z_bg_mori_elevator.c" + .balign 4 + +.text glabel func_808A210C /* 0090C 808A210C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00910 808A2110 AFB10018 */ sw $s1, 0x0018($sp) @@ -64,4 +78,3 @@ glabel func_808A210C /* 00A04 808A2204 03E00008 */ jr $ra /* 00A08 808A2208 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00A0C 808A220C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s index 26da445f3b..3aa255bbed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s @@ -24,5 +24,3 @@ glabel BgMoriHashigo_Destroy /* 0040C 808A296C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00410 808A2970 03E00008 */ jr $ra /* 00414 808A2974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s index 60e1da721d..1fa37c8e5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A2EB0 + .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" + .balign 4 + +glabel D_808A2EE0 + .asciz "../z_bg_mori_hashigo.c" + .balign 4 + +glabel D_808A2EF8 + .asciz "(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgMoriHashigo_Init /* 002D8 808A2838 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 002DC 808A283C AFBF001C */ sw $ra, 0x001C($sp) @@ -68,5 +82,3 @@ glabel BgMoriHashigo_Init /* 003B4 808A2914 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003B8 808A2918 03E00008 */ jr $ra /* 003BC 808A291C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s index a731de3e22..2ba6a871f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s @@ -16,5 +16,3 @@ glabel BgMoriHashigo_Update /* 006BC 808A2C1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006C0 808A2C20 03E00008 */ jr $ra /* 006C4 808A2C24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s index c1e660b115..1326f0b242 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808A2E10 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808A2E50 + .asciz "../z_bg_mori_hashigo.c" + .balign 4 + +.text glabel func_808A2560 /* 00000 808A2560 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 808A2564 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_808A2560 /* 0007C 808A25DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 808A25E0 03E00008 */ jr $ra /* 00084 808A25E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s index ff4de84c2b..254c1342b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s @@ -43,5 +43,3 @@ glabel func_808A25E8 /* 0012C 808A268C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00130 808A2690 03E00008 */ jr $ra /* 00134 808A2694 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s index dec2b9c17b..af6db6f13c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808A2E68 + .asciz "Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808A2E98 + .asciz "../z_bg_mori_hashigo.c" + .balign 4 + +.text glabel func_808A2698 /* 00138 808A2698 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0013C 808A269C AFB00038 */ sw $s0, 0x0038($sp) @@ -59,5 +69,3 @@ glabel func_808A2698 /* 00204 808A2764 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00208 808A2768 03E00008 */ jr $ra /* 0020C 808A276C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s index ce898d22d7..d8c51aea3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s @@ -36,5 +36,3 @@ glabel func_808A2770 /* 0028C 808A27EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00290 808A27F0 03E00008 */ jr $ra /* 00294 808A27F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s index 61c6c908f8..422685ead7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s @@ -16,5 +16,3 @@ glabel func_808A27F8 /* 002CC 808A282C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 002D0 808A2830 03E00008 */ jr $ra /* 002D4 808A2834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s index df4234a9ac..5bc0660368 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s @@ -3,5 +3,3 @@ glabel func_808A2978 /* 0041C 808A297C 25CE2988 */ addiu $t6, $t6, %lo(func_808A2988) ## $t6 = 808A2988 /* 00420 808A2980 03E00008 */ jr $ra /* 00424 808A2984 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s index a05cb47492..0ce57a3460 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s @@ -34,5 +34,3 @@ glabel func_808A2988 /* 00498 808A29F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0049C 808A29FC 03E00008 */ jr $ra /* 004A0 808A2A00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s index a3e2fb8540..6bc31f76c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s @@ -3,5 +3,3 @@ glabel func_808A2A04 /* 004A8 808A2A08 25CE2A14 */ addiu $t6, $t6, %lo(func_808A2A14) ## $t6 = 808A2A14 /* 004AC 808A2A0C 03E00008 */ jr $ra /* 004B0 808A2A10 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s index 149e3829b4..8e678ab3df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s @@ -28,5 +28,3 @@ glabel func_808A2A14 /* 0050C 808A2A6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00510 808A2A70 03E00008 */ jr $ra /* 00514 808A2A74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s index 44904af9b0..98afdcc273 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s @@ -3,5 +3,3 @@ glabel func_808A2A78 /* 0051C 808A2A7C 25CE2A88 */ addiu $t6, $t6, %lo(func_808A2A88) ## $t6 = 808A2A88 /* 00520 808A2A80 03E00008 */ jr $ra /* 00524 808A2A84 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s index 250b9654f1..025a69230b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s @@ -13,5 +13,3 @@ glabel func_808A2A88 /* 00550 808A2AB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00554 808A2AB4 03E00008 */ jr $ra /* 00558 808A2AB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s index 0c169fe95f..d634810819 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s @@ -13,5 +13,3 @@ glabel func_808A2ABC /* 00588 808A2AE8 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 /* 0058C 808A2AEC 03E00008 */ jr $ra /* 00590 808A2AF0 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s index a16f975227..5fcd56909d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s @@ -59,5 +59,3 @@ glabel func_808A2AF4 /* 00664 808A2BC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00668 808A2BC8 03E00008 */ jr $ra /* 0066C 808A2BCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s index 6a768707c6..822cc6f436 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s @@ -6,5 +6,3 @@ glabel func_808A2BD0 /* 00680 808A2BE0 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 /* 00684 808A2BE4 03E00008 */ jr $ra /* 00688 808A2BE8 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s index 9332cf45aa..984526e8f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A2F28 + .asciz "../z_bg_mori_hashigo.c" + .balign 4 + +glabel D_808A2F40 + .asciz "../z_bg_mori_hashigo.c" + .balign 4 + +glabel D_808A2F58 + .asciz "../z_bg_mori_hashigo.c" + .balign 4 + +.text glabel func_808A2C28 /* 006C8 808A2C28 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 006CC 808A2C2C AFBF0014 */ sw $ra, 0x0014($sp) @@ -89,4 +103,3 @@ glabel func_808A2C28 /* 00814 808A2D74 00000000 */ nop /* 00818 808A2D78 00000000 */ nop /* 0081C 808A2D7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s index 64c68c41d9..13aa72abed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s @@ -12,5 +12,3 @@ glabel BgMoriHashira4_Destroy /* 001F0 808A3250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001F4 808A3254 03E00008 */ jr $ra /* 001F8 808A3258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s index 0c96ad5987..ce4e5ce549 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A3638 + .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" + .balign 4 + +glabel D_808A3668 + .asciz "../z_bg_mori_hashira4.c" + .balign 4 + +glabel D_808A3680 + .asciz "(森の神殿 ４本柱)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgMoriHashira4_Init /* 00090 808A30F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00094 808A30F4 AFBF001C */ sw $ra, 0x001C($sp) @@ -91,5 +105,3 @@ glabel BgMoriHashira4_Init /* 001C0 808A3220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001C4 808A3224 03E00008 */ jr $ra /* 001C8 808A3228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s index a1bb5aa6b8..9e32cc41d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s @@ -11,5 +11,3 @@ glabel BgMoriHashira4_Update /* 00418 808A3478 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0041C 808A347C 03E00008 */ jr $ra /* 00420 808A3480 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s index a9513f83cc..c9f683f40b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s @@ -1,5 +1,3 @@ glabel func_808A3060 /* 00000 808A3060 03E00008 */ jr $ra /* 00004 808A3064 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s index 93435cb1d9..aac8683824 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s @@ -1,3 +1,15 @@ +.rdata +glabel D_808A35E0 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +.balign 4 + +glabel D_808A3620 + .asciz "../z_bg_mori_hashira4.c" + .balign 4 + +.text glabel func_808A3068 /* 00008 808A3068 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 808A306C AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +50,3 @@ glabel func_808A3068 /* 00084 808A30E4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00088 808A30E8 03E00008 */ jr $ra /* 0008C 808A30EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s index bc55216631..e6a1cff174 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s @@ -8,5 +8,3 @@ glabel func_808A325C /* 00214 808A3274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00218 808A3278 03E00008 */ jr $ra /* 0021C 808A327C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s index 86929df395..0d05a1af3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s @@ -33,5 +33,3 @@ glabel func_808A3280 /* 0028C 808A32EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00290 808A32F0 03E00008 */ jr $ra /* 00294 808A32F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s index 77582b1dad..7cbb6b2ebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s @@ -8,5 +8,3 @@ glabel func_808A32F8 /* 002B0 808A3310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002B4 808A3314 03E00008 */ jr $ra /* 002B8 808A3318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s index bd95f95785..7ad4e78657 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s @@ -14,5 +14,3 @@ glabel func_808A331C /* 002E8 808A3348 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002EC 808A334C 03E00008 */ jr $ra /* 002F0 808A3350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s index e2c7f0a7ff..3137675b9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s @@ -46,5 +46,3 @@ glabel func_808A3354 /* 00394 808A33F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00398 808A33F8 03E00008 */ jr $ra /* 0039C 808A33FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s index 0fbe728bc7..e17271d9a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s @@ -24,5 +24,3 @@ glabel func_808A3400 /* 003EC 808A344C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F0 808A3450 03E00008 */ jr $ra /* 003F4 808A3454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s index 57d5982627..d553ae4bb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A36A4 + .asciz "../z_bg_mori_hashira4.c" + .balign 4 + +glabel D_808A36BC + .asciz "../z_bg_mori_hashira4.c" + .balign 4 + +glabel D_808A36D4 + .asciz "../z_bg_mori_hashira4.c" + .balign 4 + +.text glabel func_808A3484 /* 00424 808A3484 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00428 808A3488 AFB10018 */ sw $s1, 0x0018($sp) @@ -70,4 +84,3 @@ glabel func_808A3484 /* 00534 808A3594 00000000 */ nop /* 00538 808A3598 00000000 */ nop /* 0053C 808A359C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Destroy.s index 2ac6458143..1fad9f7a4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Destroy.s @@ -12,5 +12,3 @@ glabel BgMoriHineri_Destroy /* 00220 808A39F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00224 808A39F4 03E00008 */ jr $ra /* 00228 808A39F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Init.s index 67d09ffb1a..3b35e3d51c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Init.s @@ -151,5 +151,3 @@ glabel BgMoriHineri_Init /* 001F0 808A39C0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001F4 808A39C4 03E00008 */ jr $ra /* 001F8 808A39C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Update.s index fb1bdc4989..e902f23b38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/BgMoriHineri_Update.s @@ -8,5 +8,3 @@ glabel BgMoriHineri_Update /* 0077C 808A3F4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00780 808A3F50 03E00008 */ jr $ra /* 00784 808A3F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A39FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A39FC.s index bc5b363d41..e47428e21a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A39FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A39FC.s @@ -151,5 +151,3 @@ glabel func_808A39FC /* 00414 808A3BE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00418 808A3BE8 03E00008 */ jr $ra /* 0041C 808A3BEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BF0.s index 71ef0be97a..85d1982aea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BF0.s @@ -2,5 +2,3 @@ glabel func_808A3BF0 /* 00420 808A3BF0 AFA40000 */ sw $a0, 0x0000($sp) /* 00424 808A3BF4 03E00008 */ jr $ra /* 00428 808A3BF8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BFC.s index 1272d35414..e7aba529f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3BFC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A44B0 + .float -453.0 + +.text glabel func_808A3BFC /* 0042C 808A3BFC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00430 808A3C00 AFA40030 */ sw $a0, 0x0030($sp) @@ -36,5 +41,3 @@ glabel func_808A3BFC /* 004B0 808A3C80 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004B4 808A3C84 03E00008 */ jr $ra /* 004B8 808A3C88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3C8C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3C8C.s index 292ce8f301..30463e7d9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3C8C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808A44B4 + .float 1100.0 + +glabel D_808A44B8 + .float 16.384 + +.text glabel func_808A3C8C /* 004BC 808A3C8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 004C0 808A3C90 AFBF0014 */ sw $ra, 0x0014($sp) @@ -54,5 +62,3 @@ glabel func_808A3C8C /* 0057C 808A3D4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00580 808A3D50 03E00008 */ jr $ra /* 00584 808A3D54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3D58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3D58.s index 3cf6d68a49..06331200d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3D58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3D58.s @@ -70,5 +70,3 @@ glabel func_808A3D58 /* 00678 808A3E48 8FB10020 */ lw $s1, 0x0020($sp) /* 0067C 808A3E4C 03E00008 */ jr $ra /* 00680 808A3E50 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3E54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3E54.s index 2b17fc3f38..e9b5f183d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3E54.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A44BC + .float 1100.0 + +.text glabel func_808A3E54 /* 00684 808A3E54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00688 808A3E58 3C03808A */ lui $v1, %hi(D_808A43E0) ## $v1 = 808A0000 @@ -58,5 +63,3 @@ glabel func_808A3E54 /* 00758 808A3F28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0075C 808A3F2C 03E00008 */ jr $ra /* 00760 808A3F30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s index bcade15d72..18289be08e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s @@ -1,3 +1,49 @@ +.rdata +glabel D_808A4420 + .asciz "../z_bg_mori_hineri.c" + .balign 4 + +glabel D_808A4438 + .asciz "../z_bg_mori_hineri.c" + .balign 4 + +glabel D_808A4450 + .asciz "../z_bg_mori_hineri.c" + .balign 4 + +glabel D_808A4468 + .asciz "../z_bg_mori_hineri.c" + .balign 4 + +glabel D_808A4480 + .asciz "../z_bg_mori_hineri.c" + .balign 4 + +glabel D_808A4498 + .asciz "../z_bg_mori_hineri.c" + .balign 4 + +.late_rodata +glabel D_808A44C0 + .float -1761.0 +glabel D_808A44C4 + .float 1278.0 +glabel D_808A44C8 + .float 1999.0 +glabel D_808A44CC + .float 1278.0 +glabel D_808A44D0 + .float 1.57079637051 +glabel D_808A44D4 + .float 0.01 +glabel D_808A44D8 + .float 1.3008157 +glabel D_808A44DC + .float 3.14159274101 +glabel D_808A44E0 + .float 0.01 + +.text glabel func_808A3F58 /* 00788 808A3F58 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 0078C 808A3F5C AFBF001C */ sw $ra, 0x001C($sp) @@ -300,4 +346,3 @@ glabel func_808A3F58 /* 00C04 808A43D4 00000000 */ nop /* 00C08 808A43D8 00000000 */ nop /* 00C0C 808A43DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s index 4809900662..013dbf4b76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s @@ -8,5 +8,3 @@ glabel BgMoriIdomizu_Destroy .L808A47D0: /* 00190 808A47D0 03E00008 */ jr $ra /* 00194 808A47D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s index 5219aa41de..2ff66b745a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s @@ -1,3 +1,24 @@ +.rdata +glabel D_808A4C40 + .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" + .balign 4 + +glabel D_808A4C70 + .asciz "../z_bg_mori_idomizu.c" + .balign 4 + +glabel D_808A4C88 + .asciz "(森の神殿 井戸水)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel D_808A4CF4 + .float 1.1 + +glabel D_808A4CF8 + .word 0xC4E38000, 0x00000000 + +.text glabel BgMoriIdomizu_Init /* 0002C 808A466C 3C0E808A */ lui $t6, %hi(D_808A4C10) ## $t6 = 808A0000 /* 00030 808A4670 85CE4C10 */ lh $t6, %lo(D_808A4C10)($t6) @@ -93,5 +114,3 @@ glabel BgMoriIdomizu_Init /* 0016C 808A47AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00170 808A47B0 03E00008 */ jr $ra /* 00174 808A47B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s index e602a4ca2f..705c59cc01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s @@ -11,5 +11,3 @@ glabel BgMoriIdomizu_Update /* 00418 808A4A58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0041C 808A4A5C 03E00008 */ jr $ra /* 00420 808A4A60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s index 0641571c7c..768dc25cbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s @@ -1,5 +1,3 @@ glabel func_808A4640 /* 00000 808A4640 03E00008 */ jr $ra /* 00004 808A4644 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s index ca29bc2dc7..3499e321ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s @@ -8,5 +8,3 @@ glabel func_808A4648 /* 00020 808A4660 A4450032 */ sh $a1, 0x0032($v0) ## 00000032 /* 00024 808A4664 03E00008 */ jr $ra /* 00028 808A4668 A4450042 */ sh $a1, 0x0042($v0) ## 00000042 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s index 36e65af50e..f94ce1257d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s @@ -8,5 +8,3 @@ glabel func_808A47D8 /* 001B0 808A47F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001B4 808A47F4 03E00008 */ jr $ra /* 001B8 808A47F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s index a0221a677c..b133728b28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s @@ -22,5 +22,3 @@ glabel func_808A47FC /* 00204 808A4844 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00208 808A4848 03E00008 */ jr $ra /* 0020C 808A484C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s index 3849cd5cde..f722db539f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s @@ -8,5 +8,3 @@ glabel func_808A4850 /* 00228 808A4868 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0022C 808A486C 03E00008 */ jr $ra /* 00230 808A4870 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s index f9d06bf255..baf731952b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s @@ -125,5 +125,3 @@ glabel func_808A4874 /* 003EC 808A4A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003F0 808A4A30 03E00008 */ jr $ra /* 003F4 808A4A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s index 71d88ba755..2819c8b21b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A4CAC + .asciz "../z_bg_mori_idomizu.c" + .balign 4 + +glabel D_808A4CC4 + .asciz "../z_bg_mori_idomizu.c" + .balign 4 + +glabel D_808A4CDC + .asciz "../z_bg_mori_idomizu.c" + .balign 4 + +.text glabel func_808A4A64 /* 00424 808A4A64 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00428 808A4A68 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -106,4 +120,3 @@ glabel func_808A4A64 /* 005C4 808A4C04 00000000 */ nop /* 005C8 808A4C08 00000000 */ nop /* 005CC 808A4C0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s index 38894211a6..13f007871e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s @@ -12,5 +12,3 @@ glabel BgMoriKaitenkabe_Destroy /* 00170 808A4F30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00174 808A4F34 03E00008 */ jr $ra /* 00178 808A4F38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s index f4bbbd0504..f1b3cd44bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A53E0 + .asciz "◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n" + .balign 4 + +glabel D_808A5420 + .asciz "【回転壁】 バンク危険！(%s %d)\n" + .balign 4 + +glabel D_808A5440 + .asciz "../z_bg_mori_kaitenkabe.c" + .balign 4 + +.text glabel BgMoriKaitenkabe_Init /* 00070 808A4E30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00074 808A4E34 AFB00018 */ sw $s0, 0x0018($sp) @@ -64,5 +78,3 @@ glabel BgMoriKaitenkabe_Init /* 00140 808A4F00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00144 808A4F04 03E00008 */ jr $ra /* 00148 808A4F08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s index 3567f0b35b..29de6bd183 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s @@ -8,5 +8,3 @@ glabel BgMoriKaitenkabe_Update /* 004E0 808A52A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004E4 808A52A4 03E00008 */ jr $ra /* 004E8 808A52A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s index 1d9ae2df5e..4ddc048513 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s @@ -27,5 +27,3 @@ glabel func_808A4DC0 /* 00064 808A4E24 46069281 */ sub.s $f10, $f18, $f6 /* 00068 808A4E28 03E00008 */ jr $ra /* 0006C 808A4E2C E48A0008 */ swc1 $f10, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s index 21e484a92d..2351b18c4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s @@ -22,5 +22,3 @@ glabel func_808A4F3C /* 001C4 808A4F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C8 808A4F88 03E00008 */ jr $ra /* 001CC 808A4F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s index 69c67f5bd0..f9e20668f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s @@ -4,5 +4,3 @@ glabel func_808A4F90 /* 001D8 808A4F98 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 001DC 808A4F9C 03E00008 */ jr $ra /* 001E0 808A4FA0 AC800168 */ sw $zero, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s index 434ddbae20..292439b205 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808A54B0 + .float 0.001 + +glabel D_808A54B4 + .float 0.001 + +.text glabel func_808A4FA4 /* 001E4 808A4FA4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 001E8 808A4FA8 AFBF001C */ sw $ra, 0x001C($sp) @@ -94,5 +102,3 @@ glabel func_808A4FA4 /* 00338 808A50F8 8FB10018 */ lw $s1, 0x0018($sp) /* 0033C 808A50FC 03E00008 */ jr $ra /* 00340 808A5100 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s index f1daaf89c2..9d59d0beb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s @@ -6,5 +6,3 @@ glabel func_808A5104 /* 00354 808A5114 E4800170 */ swc1 $f0, 0x0170($a0) ## 00000170 /* 00358 808A5118 03E00008 */ jr $ra /* 0035C 808A511C E4800174 */ swc1 $f0, 0x0174($a0) ## 00000174 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s index 115a29fa1c..0998508ca4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808A54B8 + .word 0x43360B61 +glabel D_808A54BC + .float 0.001 + +.text glabel func_808A5120 /* 00360 808A5120 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00364 808A5124 AFBF001C */ sw $ra, 0x001C($sp) @@ -97,5 +104,3 @@ glabel func_808A5120 /* 004BC 808A527C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004C0 808A5280 03E00008 */ jr $ra /* 004C4 808A5284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s index 1fc11afc40..e8479a8f99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A545C + .asciz "../z_bg_mori_kaitenkabe.c" + .balign 4 + +glabel D_808A5478 + .asciz "../z_bg_mori_kaitenkabe.c" + .balign 4 + +glabel D_808A5494 + .asciz "../z_bg_mori_kaitenkabe.c" + .balign 4 + +.text glabel func_808A52AC /* 004EC 808A52AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 004F0 808A52B0 AFB10018 */ sw $s1, 0x0018($sp) @@ -64,4 +78,3 @@ glabel func_808A52AC /* 005E4 808A53A4 03E00008 */ jr $ra /* 005E8 808A53A8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 005EC 808A53AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s index 01d91a849e..00a5a5afce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s @@ -12,5 +12,3 @@ glabel BgMoriRakkatenjo_Destroy /* 001A8 808A5718 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001AC 808A571C 03E00008 */ jr $ra /* 001B0 808A5720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s index 5cc1029e9b..c89b4baffe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s @@ -1,3 +1,36 @@ +.rdata +glabel D_808A5EA0 + .asciz "森の神殿 obj. 落下天井 (home posY %f)\n" + .balign 4 + +glabel D_808A5EC8 + .asciz "Warning : セット位置が変更されています。プログラムを修正しましょう。\n" + .balign 4 + +glabel D_808A5F10 + .asciz "Warning : セット Angle が変更されています。プログラムを修正しましょう。\n" + .balign 4 + +glabel D_808A5F5C + .asciz "Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n" + .balign 4 + +glabel D_808A5F90 + .asciz "../z_bg_mori_rakkatenjo.c" + .balign 4 + +.late_rodata +glabel D_808A604C + .float 0.001 + +glabel D_808A6050 + .word 0x44F8E000 +glabel D_808A6054 + .word 0x442AC000 +glabel D_808A6058 + .word 0xC51D8000 + +.text glabel BgMoriRakkatenjo_Init /* 00000 808A5570 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 808A5574 AFBF001C */ sw $ra, 0x001C($sp) @@ -111,5 +144,3 @@ glabel BgMoriRakkatenjo_Init /* 00178 808A56E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0017C 808A56EC 03E00008 */ jr $ra /* 00180 808A56F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s index d7fd5eb155..e31e924aa9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808A5FAC + .asciz "camera changed (mori rakka tenjyo) ... \n" + .balign 4 + +glabel D_808A5FD8 + .asciz "camera changed (previous) ... \n" + .balign 4 + +.text glabel BgMoriRakkatenjo_Update /* 00700 808A5C70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00704 808A5C74 AFBF002C */ sw $ra, 0x002C($sp) @@ -64,5 +74,3 @@ glabel BgMoriRakkatenjo_Update /* 007E4 808A5D54 8FB10028 */ lw $s1, 0x0028($sp) /* 007E8 808A5D58 03E00008 */ jr $ra /* 007EC 808A5D5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s index 43b2d6076f..82b2ce259a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808A605C + .word 0xC54E4000 +glabel D_808A6060 + .word 0x44DFE000 +glabel D_808A6064 + .word 0x4508F000 + +.text glabel func_808A5724 /* 001B4 808A5724 AFA40000 */ sw $a0, 0x0000($sp) /* 001B8 808A5728 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 @@ -47,5 +56,3 @@ glabel func_808A5724 .L808A57CC: /* 0025C 808A57CC 03E00008 */ jr $ra /* 00260 808A57D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s index adab5966cf..c6b620ad1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808A6068 + .word 0x44DFE000 +glabel D_808A606C + .word 0x4508F000 + +.text glabel func_808A57D4 /* 00264 808A57D4 AFA40000 */ sw $a0, 0x0000($sp) /* 00268 808A57D8 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 @@ -47,5 +54,3 @@ glabel func_808A57D4 .L808A587C: /* 0030C 808A587C 03E00008 */ jr $ra /* 00310 808A5880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s index fb920dd83d..506bf423b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s @@ -3,5 +3,3 @@ glabel func_808A5884 /* 00318 808A5888 25CE5894 */ addiu $t6, $t6, %lo(func_808A5894) ## $t6 = 808A5894 /* 0031C 808A588C 03E00008 */ jr $ra /* 00320 808A5890 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s index d7ab1eaa47..1da1d1b85f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s @@ -22,5 +22,3 @@ glabel func_808A5894 /* 0036C 808A58DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00370 808A58E0 03E00008 */ jr $ra /* 00374 808A58E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s index 0f6d9e46d4..81f35a7360 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A6070 + .word 0x442AC000 + +.text glabel func_808A58E8 /* 00378 808A58E8 8C8E0170 */ lw $t6, 0x0170($a0) ## 00000170 /* 0037C 808A58EC 3C19808A */ lui $t9, %hi(func_808A5920) ## $t9 = 808A0000 @@ -15,5 +20,3 @@ glabel func_808A58E8 /* 003A4 808A5914 AC990164 */ sw $t9, 0x0164($a0) ## 00000164 /* 003A8 808A5918 03E00008 */ jr $ra /* 003AC 808A591C E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s index debfbfedc4..9925b3a403 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s @@ -58,5 +58,3 @@ glabel func_808A5920 /* 00474 808A59E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00478 808A59E8 03E00008 */ jr $ra /* 0047C 808A59EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s index 5b36ead609..64873ca9a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s @@ -6,5 +6,3 @@ glabel func_808A59F0 /* 00490 808A5A00 AC80016C */ sw $zero, 0x016C($a0) ## 0000016C /* 00494 808A5A04 03E00008 */ jr $ra /* 00498 808A5A08 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s index 7449221fb6..adf52e33f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808A6074 + .word 0x43C98000 +glabel D_808A6078 + .word 0x43C98000 + +.text glabel func_808A5A0C /* 0049C 808A5A0C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 004A0 808A5A10 AFBF0024 */ sw $ra, 0x0024($sp) @@ -96,5 +103,3 @@ glabel func_808A5A0C /* 00604 808A5B74 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00608 808A5B78 03E00008 */ jr $ra /* 0060C 808A5B7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s index d34dfe9ce3..6a028bdc9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A607C + .word 0x43C98000 + +.text glabel func_808A5B80 /* 00610 808A5B80 3C0E808A */ lui $t6, %hi(func_808A5BA4) ## $t6 = 808A0000 /* 00614 808A5B84 25CE5BA4 */ addiu $t6, $t6, %lo(func_808A5BA4) ## $t6 = 808A5BA4 @@ -8,5 +13,3 @@ glabel func_808A5B80 /* 00628 808A5B98 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 /* 0062C 808A5B9C 03E00008 */ jr $ra /* 00630 808A5BA0 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s index 2a1b6afd0c..26e92bb398 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s @@ -12,5 +12,3 @@ glabel func_808A5BA4 /* 00658 808A5BC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0065C 808A5BCC 03E00008 */ jr $ra /* 00660 808A5BD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s index 907e2e8ab5..b8ff4d0d4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A6080 + .word 0xBDCCCCCD + +.text glabel func_808A5BD4 /* 00664 808A5BD4 3C0E808A */ lui $t6, %hi(func_808A5BF0) ## $t6 = 808A0000 /* 00668 808A5BD8 25CE5BF0 */ addiu $t6, $t6, %lo(func_808A5BF0) ## $t6 = 808A5BF0 @@ -6,5 +11,3 @@ glabel func_808A5BD4 /* 00674 808A5BE4 C4246080 */ lwc1 $f4, %lo(D_808A6080)($at) /* 00678 808A5BE8 03E00008 */ jr $ra /* 0067C 808A5BEC E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s index 7e652d12cc..0f469f71ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A6084 + .word 0x442AC000, 0x00000000, 0x00000000 + +.text glabel func_808A5BF0 /* 00680 808A5BF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00684 808A5BF4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -33,5 +38,3 @@ glabel func_808A5BF0 /* 006F4 808A5C64 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006F8 808A5C68 03E00008 */ jr $ra /* 006FC 808A5C6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s index 52c5dc08e6..b43096733e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808A5FF8 + .asciz "../z_bg_mori_rakkatenjo.c" + .balign 4 + +glabel D_808A6014 + .asciz "../z_bg_mori_rakkatenjo.c" + .balign 4 + +glabel D_808A6030 + .asciz "../z_bg_mori_rakkatenjo.c" + .balign 4 + +.text glabel func_808A5D60 /* 007F0 808A5D60 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 007F4 808A5D64 AFB10018 */ sw $s1, 0x0018($sp) @@ -63,4 +77,3 @@ glabel func_808A5D60 /* 008E4 808A5E54 8FB10018 */ lw $s1, 0x0018($sp) /* 008E8 808A5E58 03E00008 */ jr $ra /* 008EC 808A5E5C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s index 4a92bced34..20f6c9ebdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s @@ -36,5 +36,3 @@ glabel BgPoEvent_Destroy /* 006B4 808A68C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006B8 808A68C8 03E00008 */ jr $ra /* 006BC 808A68CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s index ba74430e69..fe934a8819 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s @@ -1,3 +1,29 @@ +.rdata +glabel D_808A7DB0 + .asciz "../z_bg_po_event.c" + .balign 4 + +glabel D_808A7DC4 + .asciz "../z_bg_po_event.c" + .balign 4 + +glabel D_808A7DD8 + .asciz "../z_bg_po_event.c" + .balign 4 + +.late_rodata +glabel D_808A7E00 + .word 0x44504000 +glabel D_808A7E04 + .float 0.0025 + +glabel D_808A7E08 + .float 0.3 + +glabel D_808A7E0C + .float 0.4 + +.text glabel BgPoEvent_Draw /* 0180C 808A7A1C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 01810 808A7A20 AFBF001C */ sw $ra, 0x001C($sp) @@ -174,4 +200,3 @@ glabel BgPoEvent_Draw /* 01A94 808A7CA4 00000000 */ nop /* 01A98 808A7CA8 00000000 */ nop /* 01A9C 808A7CAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s index 7087854c81..537b95eb07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s @@ -76,5 +76,3 @@ glabel BgPoEvent_Init /* 0062C 808A683C 8FB10020 */ lw $s1, 0x0020($sp) /* 00630 808A6840 03E00008 */ jr $ra /* 00634 808A6844 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s index 1fe1d94c0a..33442fb499 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s @@ -27,5 +27,3 @@ glabel BgPoEvent_Update /* 01800 808A7A10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01804 808A7A14 03E00008 */ jr $ra /* 01808 808A7A18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s index a732d78e51..99fd9ca0e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808A7DEC + .word 0x4019999A +glabel D_808A7DF0 + .word 0x3FE8B439 + +.text glabel func_808A6210 /* 00000 808A6210 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00004 808A6214 AFB00050 */ sw $s0, 0x0050($sp) @@ -243,5 +250,3 @@ glabel func_808A6210 /* 00370 808A6580 8FBE0070 */ lw $s8, 0x0070($sp) /* 00374 808A6584 03E00008 */ jr $ra /* 00378 808A6588 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s index 9c8fe4c851..3424f9d478 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A7DF4 + .word 0x44504000 + +.text glabel func_808A658C /* 0037C 808A658C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00380 808A6590 AFBF003C */ sw $ra, 0x003C($sp) @@ -119,5 +124,3 @@ glabel func_808A658C /* 00520 808A6730 8FB10038 */ lw $s1, 0x0038($sp) /* 00524 808A6734 03E00008 */ jr $ra /* 00528 808A6738 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s index b1a2f98557..c930e52355 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A7DF8 + .word 0x44504000 + +.text glabel func_808A68D0 /* 006C0 808A68D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006C4 808A68D4 3C01808A */ lui $at, %hi(D_808A7DF8) ## $at = 808A0000 @@ -71,5 +76,3 @@ glabel func_808A68D0 /* 007C0 808A69D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007C4 808A69D4 03E00008 */ jr $ra /* 007C8 808A69D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s index 65ae2e55dd..3a982a6d10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s @@ -50,5 +50,3 @@ glabel func_808A69DC /* 00878 808A6A88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0087C 808A6A8C 03E00008 */ jr $ra /* 00880 808A6A90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s index a01386706d..9a53c2badb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s @@ -82,5 +82,3 @@ glabel func_808A6A94 /* 009AC 808A6BBC A0790000 */ sb $t9, 0x0000($v1) ## 808A80A0 /* 009B0 808A6BC0 03E00008 */ jr $ra /* 009B4 808A6BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s index e7ed05b40a..466f35f5a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s @@ -70,5 +70,3 @@ glabel func_808A6BC8 /* 00AB0 808A6CC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AB4 808A6CC4 03E00008 */ jr $ra /* 00AB8 808A6CC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s index 83f857d7e1..ffa120acca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s @@ -185,5 +185,3 @@ glabel func_808A6CCC /* 00D60 808A6F70 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00D64 808A6F74 03E00008 */ jr $ra /* 00D68 808A6F78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s index 736b715d4d..b5bcec66d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A7DFC + .float 0.1 + +.text glabel func_808A6F7C /* 00D6C 808A6F7C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00D70 808A6F80 AFBF0024 */ sw $ra, 0x0024($sp) @@ -119,5 +124,3 @@ glabel func_808A6F7C /* 00F1C 808A712C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F20 808A7130 03E00008 */ jr $ra /* 00F24 808A7134 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s index 26d279e806..4bff161ed4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s @@ -69,5 +69,3 @@ glabel func_808A7138 /* 0101C 808A722C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01020 808A7230 03E00008 */ jr $ra /* 01024 808A7234 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s index a7597c608e..c3cfbea6af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s @@ -32,5 +32,3 @@ glabel func_808A7238 /* 01090 808A72A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01094 808A72A4 03E00008 */ jr $ra /* 01098 808A72A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s index fa4c236021..833fcc39c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s @@ -32,5 +32,3 @@ glabel func_808A72AC /* 0110C 808A731C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01110 808A7320 03E00008 */ jr $ra /* 01114 808A7324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s index 9b6790d248..eb4dcf39b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s @@ -77,5 +77,3 @@ glabel func_808A7328 /* 01228 808A7438 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 0122C 808A743C 03E00008 */ jr $ra /* 01230 808A7440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s index 148d12be8d..59ba9224e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s @@ -53,5 +53,3 @@ glabel func_808A7444 /* 012E4 808A74F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012E8 808A74F8 03E00008 */ jr $ra /* 012EC 808A74FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s index ddb1262ba2..594a1d9aea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s @@ -12,5 +12,3 @@ glabel func_808A7500 .L808A7528: /* 01318 808A7528 03E00008 */ jr $ra /* 0131C 808A752C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s index b430a3b740..b3f66ed41b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s @@ -14,5 +14,3 @@ glabel func_808A7530 .L808A7560: /* 01350 808A7560 03E00008 */ jr $ra /* 01354 808A7564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s index 4e892575e8..9be0bfdbad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s @@ -20,5 +20,3 @@ glabel func_808A7568 /* 0139C 808A75AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013A0 808A75B0 03E00008 */ jr $ra /* 013A4 808A75B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s index 0f440a404d..a9ecba0327 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s @@ -166,5 +166,3 @@ glabel func_808A75B8 /* 015F0 808A7800 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 015F4 808A7804 03E00008 */ jr $ra /* 015F8 808A7808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s index 0d6aa0f409..2ab70659d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s @@ -114,5 +114,3 @@ glabel func_808A780C /* 0179C 808A79AC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 017A0 808A79B0 03E00008 */ jr $ra /* 017A4 808A79B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s index 5416bd93a7..e3e6ae4b7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s @@ -29,5 +29,3 @@ glabel BgPoSyokudai_Destroy /* 00300 808A83B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00304 808A83B4 03E00008 */ jr $ra /* 00308 808A83B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s index 2226a1a6ce..9ed203ebb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s @@ -1,3 +1,34 @@ +.rdata +glabel D_808A89D0 + .asciz "../z_bg_po_syokudai.c" + .balign 4 + +glabel D_808A89E8 + .asciz "../z_bg_po_syokudai.c" + .balign 4 + +glabel D_808A8A00 + .asciz "../z_bg_po_syokudai.c" + .balign 4 + +glabel D_808A8A18 + .asciz "../z_bg_po_syokudai.c" + .balign 4 + +.late_rodata +glabel D_808A8A34 + .float 0.3 + +glabel D_808A8A38 + .float 0.7 + +glabel D_808A8A3C + .float 9.58738019108e-05 + +glabel D_808A8A40 + .float 0.0027 + +.text glabel BgPoSyokudai_Draw /* 00390 808A8440 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00394 808A8444 AFB10038 */ sw $s1, 0x0038($sp) @@ -342,4 +373,3 @@ glabel BgPoSyokudai_Draw /* 008A4 808A8954 8FB10038 */ lw $s1, 0x0038($sp) /* 008A8 808A8958 03E00008 */ jr $ra /* 008AC 808A895C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s index d15f196fa8..e457298dc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A8A30 + .word 0xC4C3C000 + +.text glabel BgPoSyokudai_Init /* 00000 808A80B0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 808A80B4 AFB10030 */ sw $s1, 0x0030($sp) @@ -182,5 +187,3 @@ glabel BgPoSyokudai_Init /* 00290 808A8340 8FB0002C */ lw $s0, 0x002C($sp) /* 00294 808A8344 03E00008 */ jr $ra /* 00298 808A8348 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s index 5c7b7edb1b..9ad71336de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s @@ -36,5 +36,3 @@ glabel BgPoSyokudai_Update /* 00384 808A8434 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00388 808A8438 03E00008 */ jr $ra /* 0038C 808A843C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s index 04d9cf13b1..5c0e6873d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s @@ -27,5 +27,3 @@ glabel BgRelayObjects_Destroy /* 00298 808A90E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0029C 808A90EC 03E00008 */ jr $ra /* 002A0 808A90F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s index e204aaf03a..72dbb79898 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s @@ -23,4 +23,3 @@ glabel BgRelayObjects_Draw /* 00684 808A94D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00688 808A94D8 03E00008 */ jr $ra /* 0068C 808A94DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s index 7f957ccb39..5330c874a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s @@ -163,5 +163,3 @@ glabel BgRelayObjects_Init /* 00230 808A9080 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00234 808A9084 03E00008 */ jr $ra /* 00238 808A9088 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Update.s index 15b4800764..9cd46b2a3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Update.s @@ -8,5 +8,3 @@ glabel BgRelayObjects_Update /* 00634 808A9484 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00638 808A9488 03E00008 */ jr $ra /* 0063C 808A948C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s index 1d53d7fb37..c6acc1ebba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s @@ -52,5 +52,3 @@ glabel func_808A90F4 /* 00350 808A91A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00354 808A91A4 03E00008 */ jr $ra /* 00358 808A91A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A91AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A91AC.s index 3288fc9c47..2ac420f4e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A91AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A91AC.s @@ -38,5 +38,3 @@ glabel func_808A91AC /* 003D8 808A9228 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003DC 808A922C 03E00008 */ jr $ra /* 003E0 808A9230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s index f70b804a70..2704c9b7ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s @@ -64,5 +64,3 @@ glabel func_808A9234 /* 004C4 808A9314 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004C8 808A9318 03E00008 */ jr $ra /* 004CC 808A931C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9320.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9320.s index f44ef10f78..929b7fdfea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9320.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9320.s @@ -2,5 +2,3 @@ glabel func_808A9320 /* 004D0 808A9320 AFA40000 */ sw $a0, 0x0000($sp) /* 004D4 808A9324 03E00008 */ jr $ra /* 004D8 808A9328 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s index 1511d589e3..c2b73c9f2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s @@ -29,5 +29,3 @@ glabel func_808A932C /* 00540 808A9390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00544 808A9394 03E00008 */ jr $ra /* 00548 808A9398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s index beed36dd67..6d4b83a42c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808A9510 + .float 0.0011160715 + +.text glabel func_808A939C /* 0054C 808A939C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00550 808A93A0 AFB00018 */ sw $s0, 0x0018($sp) @@ -56,5 +61,3 @@ glabel func_808A939C /* 00610 808A9460 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00614 808A9464 03E00008 */ jr $ra /* 00618 808A9468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s index 6b1fbd71f8..eb8b5c2e9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s @@ -25,5 +25,3 @@ glabel BgSpot00Hanebasi_Destroy /* 0045C 808A9BDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00460 808A9BE0 03E00008 */ jr $ra /* 00464 808A9BE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s index 5bafcdb1e4..5e9dea88ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808AA824 + .asciz "../z_bg_spot00_hanebasi.c" + .balign 4 + +glabel D_808AA840 + .asciz "../z_bg_spot00_hanebasi.c" + .balign 4 + +glabel D_808AA85C + .asciz "../z_bg_spot00_hanebasi.c" + .balign 4 + +.text glabel BgSpot00Hanebasi_Draw /* 00E08 808AA588 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00E0C 808AA58C 3C0F808B */ lui $t7, %hi(D_808AA7C4) ## $t7 = 808B0000 @@ -134,4 +148,3 @@ glabel BgSpot00Hanebasi_Draw /* 01004 808AA784 03E00008 */ jr $ra /* 01008 808AA788 00000000 */ nop /* 0100C 808AA78C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s index 08af174e83..d7f1f85d1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s @@ -298,5 +298,3 @@ glabel BgSpot00Hanebasi_Init /* 00400 808A9B80 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 00404 808A9B84 03E00008 */ jr $ra /* 00408 808A9B88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s index 475ea0f9fb..921c89618f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808AA884 + .word 0x44D48000 +glabel D_808AA888 + .word 0x3B3B3EE7 + +.text glabel BgSpot00Hanebasi_Update /* 0082C 808A9FAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00830 808A9FB0 AFBF001C */ sw $ra, 0x001C($sp) @@ -203,5 +210,3 @@ glabel BgSpot00Hanebasi_Update /* 00B24 808AA2A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B28 808AA2A8 03E00008 */ jr $ra /* 00B2C 808AA2AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s index be8b7dca8a..c9734b915b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s @@ -82,5 +82,3 @@ glabel func_808A9BE8 /* 0058C 808A9D0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00590 808A9D10 03E00008 */ jr $ra /* 00594 808A9D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s index f68f59b150..3c368132ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s @@ -2,5 +2,3 @@ glabel func_808A9D18 /* 00598 808A9D18 AFA40000 */ sw $a0, 0x0000($sp) /* 0059C 808A9D1C 03E00008 */ jr $ra /* 005A0 808A9D20 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s index bf56d68c7d..88edcdfb25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808AA878 + .float 0.4 + +.text glabel func_808A9D24 /* 005A4 808A9D24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 005A8 808A9D28 AFBF0014 */ sw $ra, 0x0014($sp) @@ -87,5 +92,3 @@ glabel func_808A9D24 /* 006CC 808A9E4C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006D0 808A9E50 03E00008 */ jr $ra /* 006D4 808A9E54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s index dd5c51318c..7091bc952a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808AA87C + .float 5000.0 + +glabel D_808AA880 + .word 0x47127C00 + +.text glabel func_808A9E58 /* 006D8 808A9E58 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006DC 808A9E5C AFBF0024 */ sw $ra, 0x0024($sp) @@ -91,5 +99,3 @@ glabel func_808A9E58 /* 00820 808A9FA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00824 808A9FA4 03E00008 */ jr $ra /* 00828 808A9FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s index d2189ddb67..89a2f1c6c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s @@ -1,3 +1,29 @@ +.rdata +glabel D_808AA7D0 + .asciz "../z_bg_spot00_hanebasi.c" + .balign 4 + +glabel D_808AA7EC + .asciz "../z_bg_spot00_hanebasi.c" + .balign 4 + +glabel D_808AA808 + .asciz "../z_bg_spot00_hanebasi.c" + .balign 4 + +.late_rodata +glabel D_808AA88C + .float 0.008 + +glabel D_808AA890 + .word 0x3583126F +glabel D_808AA894 + .float 9.58738019108e-05 + +glabel D_808AA898 + .word 0x442C8000, 0x00000000 + +.text glabel func_808AA2B0 /* 00B30 808AA2B0 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00B34 808AA2B4 AFB3006C */ sw $s3, 0x006C($sp) @@ -186,5 +212,3 @@ glabel func_808AA2B0 /* 00DFC 808AA57C 8FBE0080 */ lw $s8, 0x0080($sp) /* 00E00 808AA580 03E00008 */ jr $ra /* 00E04 808AA584 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Destroy.s index 3ff3013f43..2a682bcddf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot01Idohashira_Destroy /* 00438 808AB118 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0043C 808AB11C 03E00008 */ jr $ra /* 00440 808AB120 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Draw.s index 4a66c94109..17f3f7bc7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808AB98C + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel BgSpot01Idohashira_Draw /* 00AE8 808AB7C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00AEC 808AB7CC AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,4 +35,3 @@ glabel BgSpot01Idohashira_Draw /* 00B44 808AB824 00000000 */ nop /* 00B48 808AB828 00000000 */ nop /* 00B4C 808AB82C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s index 71867e92ce..13c5590311 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808AB9D0 + .float 1100.0 + +.text glabel BgSpot01Idohashira_Init /* 0090C 808AB5EC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00910 808AB5F0 AFA5003C */ sw $a1, 0x003C($sp) @@ -80,5 +85,3 @@ glabel BgSpot01Idohashira_Init /* 00A14 808AB6F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A18 808AB6F8 03E00008 */ jr $ra /* 00A1C 808AB6FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Update.s index b3b0b00bc0..9cc5595fae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808AB8FC + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel BgSpot01Idohashira_Update /* 008B0 808AB590 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 008B4 808AB594 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel BgSpot01Idohashira_Update /* 00900 808AB5E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00904 808AB5E4 03E00008 */ jr $ra /* 00908 808AB5E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AACE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AACE0.s index a7afa92b86..4ad40973ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AACE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AACE0.s @@ -8,5 +8,3 @@ glabel func_808AACE0 /* 00018 808AACF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0001C 808AACFC 03E00008 */ jr $ra /* 00020 808AAD00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD04.s index 3fc5bc6ec6..7c05fc9868 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD04.s @@ -14,5 +14,3 @@ glabel func_808AAD04 /* 00050 808AAD30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00054 808AAD34 03E00008 */ jr $ra /* 00058 808AAD38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD3C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD3C.s index 9a4b8a82ce..fd91282fd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAD3C.s @@ -75,5 +75,3 @@ glabel func_808AAD3C /* 00180 808AAE60 27BD04E8 */ addiu $sp, $sp, 0x04E8 ## $sp = 00000000 /* 00184 808AAE64 03E00008 */ jr $ra /* 00188 808AAE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s index 80e36e3a2e..8c5374ee66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s @@ -49,5 +49,3 @@ glabel func_808AAE6C /* 00248 808AAF28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0024C 808AAF2C 03E00008 */ jr $ra /* 00250 808AAF30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s index be30912ed7..1e99a38588 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808AB9C4 + .float 1300.0 + +glabel D_808AB9C8 + .float 1300.0 + +.text glabel func_808AAF34 /* 00254 808AAF34 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00258 808AAF38 AFBF002C */ sw $ra, 0x002C($sp) @@ -112,5 +120,3 @@ glabel func_808AAF34 /* 00408 808AB0E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0040C 808AB0EC 03E00008 */ jr $ra /* 00410 808AB0F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB124.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB124.s index ddabd52619..989a715a00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB124.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB124.s @@ -8,5 +8,3 @@ glabel func_808AB124 .L808AB13C: /* 0045C 808AB13C 03E00008 */ jr $ra /* 00460 808AB140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB144.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB144.s index a1728c3e71..9d7facdf06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB144.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB144.s @@ -18,5 +18,3 @@ glabel func_808AB144 /* 004A0 808AB180 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 004A4 808AB184 03E00008 */ jr $ra /* 004A8 808AB188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s index df5a131b6d..c94d8313a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s @@ -19,5 +19,3 @@ glabel func_808AB18C /* 004F0 808AB1D0 01CB6021 */ addu $t4, $t6, $t3 /* 004F4 808AB1D4 03E00008 */ jr $ra /* 004F8 808AB1D8 A48C00B8 */ sh $t4, 0x00B8($a0) ## 000000B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s index 45892e0097..be3ba982d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808AB870 + .asciz "Bg_Spot01_Idohashira_Get_FreeFallで割り算出来ない!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_808AB1DC /* 004FC 808AB1DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00500 808AB1E0 AFA60020 */ sw $a2, 0x0020($sp) @@ -50,5 +56,3 @@ glabel func_808AB1DC /* 005B0 808AB290 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005B4 808AB294 03E00008 */ jr $ra /* 005B8 808AB298 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s index dbb9ab5329..bb28d5b485 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808AB9CC + .float 1100.0 + +.text glabel func_808AB29C /* 005BC 808AB29C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 005C0 808AB2A0 AFA40050 */ sw $a0, 0x0050($sp) @@ -85,5 +90,3 @@ glabel func_808AB29C /* 006FC 808AB3DC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00700 808AB3E0 03E00008 */ jr $ra /* 00704 808AB3E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3E8.s index 4290c837b8..4107891b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3E8.s @@ -3,5 +3,3 @@ glabel func_808AB3E8 /* 0070C 808AB3EC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00710 808AB3F0 03E00008 */ jr $ra /* 00714 808AB3F4 AC800168 */ sw $zero, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3F8.s index cc3de52c98..1710bdb819 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB3F8.s @@ -6,5 +6,3 @@ glabel func_808AB3F8 /* 00728 808AB408 AC800168 */ sw $zero, 0x0168($a0) ## 00000168 /* 0072C 808AB40C 03E00008 */ jr $ra /* 00730 808AB410 AC8F0170 */ sw $t7, 0x0170($a0) ## 00000170 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB414.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB414.s index fd524e2c0b..9200266d14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB414.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB414.s @@ -11,5 +11,3 @@ glabel func_808AB414 /* 00758 808AB438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0075C 808AB43C 03E00008 */ jr $ra /* 00760 808AB440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB444.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB444.s index 84bad56469..ec6a8cde61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB444.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB444.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808AB8BC + .asciz "Bg_Spot01_Idohashira_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_808AB444 /* 00764 808AB444 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00768 808AB448 AFB00018 */ sw $s0, 0x0018($sp) @@ -55,5 +61,3 @@ glabel func_808AB444 /* 00818 808AB4F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0081C 808AB4FC 03E00008 */ jr $ra /* 00820 808AB500 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB504.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB504.s index 20a5aa9025..eb4b527a6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB504.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB504.s @@ -2,5 +2,3 @@ glabel func_808AB504 /* 00824 808AB504 AFA40000 */ sw $a0, 0x0000($sp) /* 00828 808AB508 03E00008 */ jr $ra /* 0082C 808AB50C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB510.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB510.s index cf558d65b2..155bfa1ffb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB510.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB510.s @@ -7,5 +7,3 @@ glabel func_808AB510 /* 00844 808AB524 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00848 808AB528 03E00008 */ jr $ra /* 0084C 808AB52C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB530.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB530.s index f231dd6efe..a912c5bcca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB530.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB530.s @@ -16,5 +16,3 @@ glabel func_808AB530 /* 00884 808AB564 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00888 808AB568 03E00008 */ jr $ra /* 0088C 808AB56C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB570.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB570.s index 9de5ea018e..192c9b0dcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB570.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB570.s @@ -7,5 +7,3 @@ glabel func_808AB570 /* 008A4 808AB584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008A8 808AB588 03E00008 */ jr $ra /* 008AC 808AB58C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s index 33379752c6..77a7f6c6a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808AB938 + .asciz "../z_bg_spot01_idohashira.c" + .balign 4 + +glabel D_808AB954 + .asciz "../z_bg_spot01_idohashira.c" + .balign 4 + +glabel D_808AB970 + .asciz "../z_bg_spot01_idohashira.c" + .balign 4 + +.text glabel func_808AB700 /* 00A20 808AB700 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00A24 808AB704 AFBF001C */ sw $ra, 0x001C($sp) @@ -49,5 +63,3 @@ glabel func_808AB700 /* 00ADC 808AB7BC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00AE0 808AB7C0 03E00008 */ jr $ra /* 00AE4 808AB7C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Destroy.s index 443338b039..ab71eafa13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Destroy.s @@ -2,5 +2,3 @@ glabel BgSpot01Idomizu_Destroy /* 00098 808ABB78 AFA40000 */ sw $a0, 0x0000($sp) /* 0009C 808ABB7C 03E00008 */ jr $ra /* 000A0 808ABB80 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s index fc74c069b1..416ec9bc3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808ABDC0 + .asciz "../z_bg_spot01_idomizu.c" + .balign 4 + +glabel D_808ABDDC + .asciz "../z_bg_spot01_idomizu.c" + .balign 4 + +glabel D_808ABDF8 + .asciz "../z_bg_spot01_idomizu.c" + .balign 4 + +.text glabel BgSpot01Idomizu_Draw /* 00178 808ABC58 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0017C 808ABC5C AFB10038 */ sw $s1, 0x0038($sp) @@ -77,4 +91,3 @@ glabel BgSpot01Idomizu_Draw /* 002A4 808ABD84 03E00008 */ jr $ra /* 002A8 808ABD88 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 002AC 808ABD8C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s index f3dbe6f768..14c4144e5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808ABE14 + .float -550.0 + +.text glabel BgSpot01Idomizu_Init /* 00000 808ABAE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 808ABAE4 AFA5001C */ sw $a1, 0x001C($sp) @@ -42,5 +47,3 @@ glabel BgSpot01Idomizu_Init /* 0008C 808ABB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00090 808ABB70 03E00008 */ jr $ra /* 00094 808ABB74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Update.s index 82ff07541b..a3905a9a45 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Update.s @@ -8,5 +8,3 @@ glabel BgSpot01Idomizu_Update /* 0016C 808ABC4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00170 808ABC50 03E00008 */ jr $ra /* 00174 808ABC54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s index 473d26bfd8..452ae330f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808ABE18 + .float -550.0 + +.text glabel func_808ABB84 /* 000A4 808ABB84 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 000A8 808ABB88 95CEF540 */ lhu $t6, -0x0AC0($t6) ## 8015F540 @@ -47,5 +52,3 @@ glabel func_808ABB84 /* 00148 808ABC28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0014C 808ABC2C 03E00008 */ jr $ra /* 00150 808ABC30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Destroy.s index 1ee558f9fe..af8ebfeb09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Destroy.s @@ -2,5 +2,3 @@ glabel BgSpot01Objects2_Destroy /* 000E0 808AC220 AFA40000 */ sw $a0, 0x0000($sp) /* 000E4 808AC224 03E00008 */ jr $ra /* 000E8 808AC228 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Init.s index c8b7d001fc..a3740aaf3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Init.s @@ -1,3 +1,26 @@ +.rdata +glabel D_808AC530 + .asciz "-----------------------------バンク設定ありませんでした." + .balign 4 + + +.late_rodata +glabel jtbl_808AC58C +.word L808AC17C +.word L808AC17C +.word L808AC17C +.word L808AC188 +.word L808AC194 + +glabel jtbl_808AC5A0 +.word L808AC448 +.word L808AC448 +.word L808AC448 +.word L808AC394 +.word L808AC368 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel BgSpot01Objects2_Init /* 00000 808AC140 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 808AC144 AFBF001C */ sw $ra, 0x001C($sp) @@ -67,5 +90,3 @@ glabel L808AC194 /* 000D4 808AC214 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000D8 808AC218 03E00008 */ jr $ra /* 000DC 808AC21C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Update.s index d097814553..90e14b3884 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/BgSpot01Objects2_Update.s @@ -8,5 +8,3 @@ glabel BgSpot01Objects2_Update /* 00358 808AC498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0035C 808AC49C 03E00008 */ jr $ra /* 00360 808AC4A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s index 69bc3c0420..2ff5e7098c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s @@ -35,5 +35,3 @@ glabel func_808AC22C /* 00170 808AC2B0 468084A0 */ cvt.s.w $f18, $f16 /* 00174 808AC2B4 03E00008 */ jr $ra /* 00178 808AC2B8 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s index a166a3eb0b..fa3fd8d971 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808AC56C + .asciz "-----バンク切り換え成功！！\n" + .balign 4 + +.text glabel func_808AC2BC /* 0017C 808AC2BC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00180 808AC2C0 AFB00034 */ sw $s0, 0x0034($sp) @@ -122,5 +128,3 @@ glabel L808AC448 /* 00328 808AC468 8FB10038 */ lw $s1, 0x0038($sp) /* 0032C 808AC46C 03E00008 */ jr $ra /* 00330 808AC470 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC474.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC474.s index 39c1677dca..96054b4529 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC474.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC474.s @@ -2,5 +2,3 @@ glabel func_808AC474 /* 00334 808AC474 AFA40000 */ sw $a0, 0x0000($sp) /* 00338 808AC478 03E00008 */ jr $ra /* 0033C 808AC47C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s index ad6a6213d2..a2c6e5892d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s @@ -15,4 +15,3 @@ glabel func_808AC4A4 /* 00394 808AC4D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00398 808AC4D8 03E00008 */ jr $ra /* 0039C 808AC4DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Destroy.s index c19d8ad134..85280356f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot02Objects_Destroy /* 00290 808AC8F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00294 808AC8F4 03E00008 */ jr $ra /* 00298 808AC8F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s index e5aa8c7754..097e8e2952 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s @@ -14,5 +14,3 @@ glabel BgSpot02Objects_Draw /* 005C8 808ACC28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005CC 808ACC2C 03E00008 */ jr $ra /* 005D0 808ACC30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s index 94c8a2d3d2..78b5834723 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_808AD968 +.word L808AC6BC +.word L808AC6BC +.word L808AC6BC +.word L808AC824 +.word L808AC87C + +.text glabel BgSpot02Objects_Init /* 00000 808AC660 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 808AC664 AFBF001C */ sw $ra, 0x001C($sp) @@ -180,5 +189,3 @@ glabel L808AC87C /* 00260 808AC8C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00264 808AC8C4 03E00008 */ jr $ra /* 00268 808AC8C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Update.s index 7bf6c62e8d..45ddc84832 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Update.s @@ -8,5 +8,3 @@ glabel BgSpot02Objects_Update /* 00590 808ACBF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00594 808ACBF4 03E00008 */ jr $ra /* 00598 808ACBF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC8FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC8FC.s index 13d3eeabf4..79ed9f455f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC8FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC8FC.s @@ -2,5 +2,3 @@ glabel func_808AC8FC /* 0029C 808AC8FC AFA40000 */ sw $a0, 0x0000($sp) /* 002A0 808AC900 03E00008 */ jr $ra /* 002A4 808AC904 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s index b7256c45a8..c95d1082ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s @@ -67,5 +67,3 @@ glabel func_808AC908 /* 0039C 808AC9FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003A0 808ACA00 03E00008 */ jr $ra /* 003A4 808ACA04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s index 425e028204..43c2fc9527 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s @@ -66,5 +66,3 @@ glabel func_808ACA08 /* 00490 808ACAF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00494 808ACAF4 03E00008 */ jr $ra /* 00498 808ACAF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACAFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACAFC.s index d2996318ac..f3f30a28c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACAFC.s @@ -25,5 +25,3 @@ glabel func_808ACAFC /* 004EC 808ACB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F0 808ACB50 03E00008 */ jr $ra /* 004F4 808ACB54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s index dbc0a6edbd..c37c058552 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s @@ -35,5 +35,3 @@ glabel func_808ACB58 /* 0056C 808ACBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00570 808ACBD0 03E00008 */ jr $ra /* 00574 808ACBD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACC34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACC34.s index 16941682a2..78d5b8829d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACC34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACC34.s @@ -37,5 +37,3 @@ glabel func_808ACC34 /* 0064C 808ACCAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00650 808ACCB0 03E00008 */ jr $ra /* 00654 808ACCB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s index 406bf7f0a3..514ba48ffc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s @@ -1,3 +1,27 @@ +.rdata +glabel D_808AD8C0 + .asciz "../z_bg_spot02_objects.c" + .balign 4 + +glabel D_808AD8DC + .asciz "../z_bg_spot02_objects.c" + .balign 4 + +glabel D_808AD8F8 + .asciz "../z_bg_spot02_objects.c" + .balign 4 + +.late_rodata +glabel D_808AD97C + .float 9.58738019108e-05 + +glabel D_808AD980 + .float 9.58738019108e-05 + +glabel D_808AD984 + .float 9.58738019108e-05 + +.text glabel func_808ACCB8 /* 00658 808ACCB8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0065C 808ACCBC AFB10018 */ sw $s1, 0x0018($sp) @@ -479,5 +503,3 @@ glabel func_808ACCB8 /* 00D68 808AD3C8 8FB10018 */ lw $s1, 0x0018($sp) /* 00D6C 808AD3CC 03E00008 */ jr $ra /* 00D70 808AD3D0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD3D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD3D4.s index f3135f150a..a7c2476eea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD3D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD3D4.s @@ -36,5 +36,3 @@ glabel func_808AD3D4 /* 00DE4 808AD444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DE8 808AD448 03E00008 */ jr $ra /* 00DEC 808AD44C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s index bb554b7535..b72b5b24ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s @@ -1,3 +1,32 @@ +.rdata +glabel D_808AD914 + .asciz "../z_bg_spot02_objects.c" + .balign 4 + +glabel D_808AD930 + .asciz "../z_bg_spot02_objects.c" + .balign 4 + +glabel D_808AD94C + .asciz "../z_bg_spot02_objects.c" + .balign 4 + +.late_rodata +glabel D_808AD988 + .float 5.4932502e-3 +glabel D_808AD98C + .float 9.58738019108e-05 + +glabel D_808AD990 + .float 9.58738019108e-05 + +glabel D_808AD994 + .float 0.9 + +glabel D_808AD998 + .float 0.1 + +.text glabel func_808AD450 /* 00DF0 808AD450 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00DF4 808AD454 AFB1003C */ sw $s1, 0x003C($sp) @@ -265,4 +294,3 @@ glabel func_808AD450 /* 011E4 808AD844 8FB20040 */ lw $s2, 0x0040($sp) /* 011E8 808AD848 03E00008 */ jr $ra /* 011EC 808AD84C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s index be088c8382..0abb0266ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot03Taki_Destroy /* 00404 808ADEE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00408 808ADEE8 03E00008 */ jr $ra /* 0040C 808ADEEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s index 58f8011d53..9d933019c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808AE3C0 + .asciz "../z_bg_spot03_taki.c" + .balign 4 + +glabel D_808AE3D8 + .asciz "../z_bg_spot03_taki.c" + .balign 4 + +glabel D_808AE3F0 + .asciz "../z_bg_spot03_taki.c" + .balign 4 + +.text glabel BgSpot03Taki_Draw /* 00604 808AE0E4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00608 808AE0E8 AFBF003C */ sw $ra, 0x003C($sp) @@ -174,4 +188,3 @@ glabel BgSpot03Taki_Draw /* 008A4 808AE384 00000000 */ nop /* 008A8 808AE388 00000000 */ nop /* 008AC 808AE38C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s index 8a85bd4522..34a9523e0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s @@ -46,5 +46,3 @@ glabel BgSpot03Taki_Init /* 003D4 808ADEB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003D8 808ADEB8 03E00008 */ jr $ra /* 003DC 808ADEBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s index 270812561f..518a5c9763 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s @@ -8,5 +8,3 @@ glabel BgSpot03Taki_Update /* 005F8 808AE0D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005FC 808AE0DC 03E00008 */ jr $ra /* 00600 808AE0E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s index dc9099f8f1..4ff03b9668 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s @@ -221,5 +221,3 @@ glabel func_808ADAE0 /* 00328 808ADE08 44CDF800 */ ctc1 $t5, $31 /* 0032C 808ADE0C 03E00008 */ jr $ra /* 00330 808ADE10 A08E00DF */ sb $t6, 0x00DF($a0) ## 000000DF - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s index 588cfe4c7b..6cffe18e40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s @@ -123,5 +123,3 @@ glabel func_808ADEF0 /* 005D4 808AE0B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005D8 808AE0B8 03E00008 */ jr $ra /* 005DC 808AE0BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s index 0d2e4f36b3..e670d4e938 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s @@ -29,5 +29,3 @@ glabel BgSpot06Objects_Destroy /* 00434 808AEBB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00438 808AEBB8 03E00008 */ jr $ra /* 0043C 808AEBBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s index 1c97e4e26a..5ab75361f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s @@ -56,5 +56,3 @@ glabel BgSpot06Objects_Draw /* 01070 808AF7F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01074 808AF7F4 03E00008 */ jr $ra /* 01078 808AF7F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s index e63699101e..4190cf2669 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808AF970 + .asciz "spot06 obj nthisx->arg_data=[%d]" + .balign 4 + +.late_rodata +glabel D_808AF9E8 + .word 0xC4F92000 +glabel D_808AF9EC + .word 0xC4A42000 +glabel D_808AF9F0 + .word 0xC42A4000 +glabel D_808AF9F4 + .word 0xC42A4000 +glabel D_808AF9F8 + .word 0xC4A42000 + +.text glabel BgSpot06Objects_Init /* 00000 808AE780 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 808AE784 AFBF0024 */ sw $ra, 0x0024($sp) @@ -274,5 +292,3 @@ glabel BgSpot06Objects_Init /* 003D0 808AEB50 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 003D4 808AEB54 03E00008 */ jr $ra /* 003D8 808AEB58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s index 38fbbab25c..ab6f385adb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s @@ -22,5 +22,3 @@ glabel BgSpot06Objects_Update /* 00D98 808AF518 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D9C 808AF51C 03E00008 */ jr $ra /* 00DA0 808AF520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s index 7af5288d94..2a13a8790d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808AF9FC + .float 0.05 + +glabel D_808AFA00 + .word 0x3E333333 + +.text glabel func_808AEBC0 /* 00440 808AEBC0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00444 808AEBC4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -65,5 +73,3 @@ glabel func_808AEBC0 /* 00528 808AECA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0052C 808AECAC 03E00008 */ jr $ra /* 00530 808AECB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AECB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AECB4.s index bedc1d09d9..c1ecfa15ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AECB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AECB4.s @@ -39,5 +39,3 @@ glabel func_808AECB4 /* 005BC 808AED3C 8FB30020 */ lw $s3, 0x0020($sp) /* 005C0 808AED40 03E00008 */ jr $ra /* 005C4 808AED44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED48.s index 15fde58474..d21f343dac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED48.s @@ -14,5 +14,3 @@ glabel func_808AED48 .L808AED74: /* 005F4 808AED74 03E00008 */ jr $ra /* 005F8 808AED78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s index 097c00433f..259f036def 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s @@ -36,5 +36,3 @@ glabel func_808AED7C /* 00674 808AEDF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00678 808AEDF8 03E00008 */ jr $ra /* 0067C 808AEDFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE00.s index c1956a72eb..3b4a0ab336 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE00.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE00.s @@ -2,5 +2,3 @@ glabel func_808AEE00 /* 00680 808AEE00 AFA40000 */ sw $a0, 0x0000($sp) /* 00684 808AEE04 03E00008 */ jr $ra /* 00688 808AEE08 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s index 0177b2f44c..ac211081dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s @@ -25,5 +25,3 @@ glabel func_808AEE0C /* 006E0 808AEE60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006E4 808AEE64 03E00008 */ jr $ra /* 006E8 808AEE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s index 5edf28bf5b..6497899ae5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808AFA04 + .float 0.05 + +glabel D_808AFA08 + .word 0x3E333333 + +.text glabel func_808AEE6C /* 006EC 808AEE6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 006F0 808AEE70 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -38,5 +46,3 @@ glabel func_808AEE6C /* 00770 808AEEF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00774 808AEEF4 03E00008 */ jr $ra /* 00778 808AEEF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s index 291ed0c20e..dbde568fb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808AFA0C + .float 0.7 + +glabel D_808AFA10 + .float 0.1 + +.text glabel func_808AEEFC /* 0077C 808AEEFC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00780 808AEF00 AFBF0054 */ sw $ra, 0x0054($sp) @@ -146,5 +154,3 @@ glabel func_808AEEFC /* 00994 808AF114 8FB40050 */ lw $s4, 0x0050($sp) /* 00998 808AF118 03E00008 */ jr $ra /* 0099C 808AF11C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s index b8223fc0c0..612adf58cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808AFA14 + .float 0.3 + +glabel D_808AFA18 + .float 0.3 + +.text glabel func_808AF120 /* 009A0 808AF120 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 009A4 808AF124 AFBF001C */ sw $ra, 0x001C($sp) @@ -49,5 +57,3 @@ glabel func_808AF120 /* 00A4C 808AF1CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A50 808AF1D0 03E00008 */ jr $ra /* 00A54 808AF1D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s index 315d88ca66..3698b59405 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_808AFA1C + .word 0x4089999A +glabel D_808AFA20 + .float 1.3 + +glabel D_808AFA24 + .word 0xC4F92000 +glabel D_808AFA28 + .word 0xC4F6A000 +glabel D_808AFA2C + .float 0.02 + +glabel D_808AFA30 + .word 0xC4F92000 + +.text glabel func_808AF1D8 /* 00A58 808AF1D8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00A5C 808AF1DC AFBF0024 */ sw $ra, 0x0024($sp) @@ -173,5 +190,3 @@ glabel func_808AF1D8 /* 00CC4 808AF444 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00CC8 808AF448 03E00008 */ jr $ra /* 00CCC 808AF44C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF450.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF450.s index 9dd6a01090..60facbf1b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF450.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF450.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808AFA34 + .word 0x3E490FDB + +.text glabel func_808AF450 /* 00CD0 808AF450 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00CD4 808AF454 AFBF0014 */ sw $ra, 0x0014($sp) @@ -34,5 +39,3 @@ glabel func_808AF450 /* 00D44 808AF4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D48 808AF4C8 03E00008 */ jr $ra /* 00D4C 808AF4CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s index ff6f2a1cbf..f1788ee20a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808AF994 + .asciz "../z_bg_spot06_objects.c" + .balign 4 + +glabel D_808AF9B0 + .asciz "../z_bg_spot06_objects.c" + .balign 4 + +glabel D_808AF9CC + .asciz "../z_bg_spot06_objects.c" + .balign 4 + +.text glabel func_808AF524 /* 00DA4 808AF524 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00DA8 808AF528 AFB20040 */ sw $s2, 0x0040($sp) @@ -134,5 +148,3 @@ glabel func_808AF524 /* 00FAC 808AF72C 8FB20040 */ lw $s2, 0x0040($sp) /* 00FB0 808AF730 03E00008 */ jr $ra /* 00FB4 808AF734 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s index 7d5a0783f7..928f2a30d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s @@ -10,5 +10,3 @@ glabel func_808AF7FC .L808AF81C: /* 0109C 808AF81C 03E00008 */ jr $ra /* 010A0 808AF820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s index f6cbf1800a..b88790fcd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808AFA38 + .word 0xC4A42000 +glabel D_808AFA3C + .word 0x38D1B717 +glabel D_808AFA40 + .float 0.001 + +.text glabel func_808AF824 /* 010A4 808AF824 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 010A8 808AF828 AFBF0024 */ sw $ra, 0x0024($sp) @@ -61,4 +70,3 @@ glabel func_808AF824 /* 01184 808AF904 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01188 808AF908 03E00008 */ jr $ra /* 0118C 808AF90C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Destroy.s index 628b6c357c..d3e9a4f295 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot07Taki_Destroy /* 000CC 808AFCFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D0 808AFD00 03E00008 */ jr $ra /* 000D4 808AFD04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s index 02a5183847..e04a0540d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808B0210 + .asciz "../z_bg_spot07_taki.c" + .balign 4 + +glabel D_808B0228 + .asciz "../z_bg_spot07_taki.c" + .balign 4 + +glabel D_808B0240 + .asciz "../z_bg_spot07_taki.c" + .balign 4 + +glabel D_808B0258 + .asciz "../z_bg_spot07_taki.c" + .balign 4 + +.text glabel BgSpot07Taki_Draw /* 00108 808AFD38 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 0010C 808AFD3C AFBF003C */ sw $ra, 0x003C($sp) @@ -303,4 +321,3 @@ glabel BgSpot07Taki_Draw /* 005A4 808B01D4 00000000 */ nop /* 005A8 808B01D8 00000000 */ nop /* 005AC 808B01DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s index f72cf7093f..041638a3a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s @@ -49,5 +49,3 @@ glabel BgSpot07Taki_Init /* 0009C 808AFCCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000A0 808AFCD0 03E00008 */ jr $ra /* 000A4 808AFCD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Update.s index 52fe10fa49..cbe1188ea1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Update.s @@ -8,5 +8,3 @@ glabel BgSpot07Taki_Update /* 000FC 808AFD2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00100 808AFD30 03E00008 */ jr $ra /* 00104 808AFD34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/func_808AFD08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/func_808AFD08.s index aa03fd6c66..a22cd6ee2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/func_808AFD08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/func_808AFD08.s @@ -2,5 +2,3 @@ glabel func_808AFD08 /* 000D8 808AFD08 AFA40000 */ sw $a0, 0x0000($sp) /* 000DC 808AFD0C 03E00008 */ jr $ra /* 000E0 808AFD10 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s index 15c574bb2a..d62aa6e92d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s @@ -18,5 +18,3 @@ glabel BgSpot08Bakudankabe_Destroy /* 00424 808B06F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00428 808B06F8 03E00008 */ jr $ra /* 0042C 808B06FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s index 8dad3f3969..cc4cef2ac0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s @@ -25,4 +25,3 @@ glabel BgSpot08Bakudankabe_Draw /* 00534 808B0804 00000000 */ nop /* 00538 808B0808 00000000 */ nop /* 0053C 808B080C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Init.s index f0fec1fdb5..dd13cf3acf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Init.s @@ -46,5 +46,3 @@ glabel BgSpot08Bakudankabe_Init /* 003DC 808B06AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003E0 808B06B0 03E00008 */ jr $ra /* 003E4 808B06B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s index 6775be9eab..b1918bc5d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s @@ -48,5 +48,3 @@ glabel BgSpot08Bakudankabe_Update /* 004D0 808B07A0 8FB10018 */ lw $s1, 0x0018($sp) /* 004D4 808B07A4 03E00008 */ jr $ra /* 004D8 808B07A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s index 6c74eae599..f197e40994 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s @@ -20,5 +20,3 @@ glabel func_808B02D0 /* 00048 808B0318 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0004C 808B031C 03E00008 */ jr $ra /* 00050 808B0320 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s index dae7a06591..eabdce8518 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808B08E0 + .float 5.4166665 +glabel D_808B08E4 + .float 0.2 +glabel D_808B08E8 + .float 0.4 + +.text glabel func_808B0324 /* 00054 808B0324 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 00058 808B0328 AFB10078 */ sw $s1, 0x0078($sp) @@ -203,5 +212,3 @@ glabel func_808B0324 /* 00340 808B0610 8FB70090 */ lw $s7, 0x0090($sp) /* 00344 808B0614 03E00008 */ jr $ra /* 00348 808B0618 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Destroy.s index 2eccc4c234..b1741e3c7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot08Iceblock_Destroy /* 00A1C 808B137C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A20 808B1380 03E00008 */ jr $ra /* 00A24 808B1384 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s index 0bbb940ea6..86eec5d355 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s @@ -28,4 +28,3 @@ glabel BgSpot08Iceblock_Draw /* 00D24 808B1684 03E00008 */ jr $ra /* 00D28 808B1688 00000000 */ nop /* 00D2C 808B168C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s index d6960ab5cf..fccdbea5bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s @@ -155,5 +155,3 @@ glabel L808B133C /* 009EC 808B134C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009F0 808B1350 03E00008 */ jr $ra /* 009F4 808B1354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s index 4bcf52b363..10dcb7380f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s @@ -42,5 +42,3 @@ glabel BgSpot08Iceblock_Update /* 00CC0 808B1620 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CC4 808B1624 03E00008 */ jr $ra /* 00CC8 808B1628 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0960.s index 07897af911..3fd90025da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0960.s @@ -1,5 +1,3 @@ glabel func_808B0960 /* 00000 808B0960 03E00008 */ jr $ra /* 00004 808B0964 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s index 9d7de542dd..9374268fb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0968.s @@ -38,5 +38,3 @@ glabel func_808B0968 /* 00084 808B09E4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00088 808B09E8 03E00008 */ jr $ra /* 0008C 808B09EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s index 23371712c6..053ee9fce7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B09F0.s @@ -43,5 +43,3 @@ glabel L808B0A74 /* 00118 808B0A78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0011C 808B0A7C 03E00008 */ jr $ra /* 00120 808B0A80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s index 967658cb1c..a5c7a7a3dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s @@ -24,5 +24,3 @@ glabel func_808B0A84 /* 00174 808B0AD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00178 808B0AD8 03E00008 */ jr $ra /* 0017C 808B0ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s index 82e6bcf792..7efa24487c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s @@ -49,5 +49,3 @@ glabel func_808B0AE0 /* 00220 808B0B80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00224 808B0B84 03E00008 */ jr $ra /* 00228 808B0B88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0B8C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0B8C.s index 932a88c321..9ed14b13a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0B8C.s @@ -6,5 +6,3 @@ glabel func_808B0B8C /* 0023C 808B0B9C 460A4400 */ add.s $f16, $f8, $f10 /* 00240 808B0BA0 03E00008 */ jr $ra /* 00244 808B0BA4 E4900028 */ swc1 $f16, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BA8.s index bc96f631a8..820c9283f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BA8.s @@ -10,5 +10,3 @@ glabel func_808B0BA8 /* 00268 808B0BC8 460C8482 */ mul.s $f18, $f16, $f12 /* 0026C 808B0BCC 03E00008 */ jr $ra /* 00270 808B0BD0 E4920008 */ swc1 $f18, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BD4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BD4.s index 30809ac3e2..ab88183aae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0BD4.s @@ -27,5 +27,3 @@ glabel func_808B0BD4 /* 002D8 808B0C38 46069281 */ sub.s $f10, $f18, $f6 /* 002DC 808B0C3C 03E00008 */ jr $ra /* 002E0 808B0C40 E48A0008 */ swc1 $f10, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s index 1a79150bbc..1260b7a854 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0C44.s @@ -40,5 +40,3 @@ glabel func_808B0C44 /* 00374 808B0CD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00378 808B0CD8 03E00008 */ jr $ra /* 0037C 808B0CDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s index 2503e86c5d..cb9f1d4dfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s @@ -237,5 +237,3 @@ glabel func_808B0CE0 /* 006E8 808B1048 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 /* 006EC 808B104C 03E00008 */ jr $ra /* 006F0 808B1050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s index a6618a3c49..de7bb38347 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s @@ -68,5 +68,3 @@ glabel func_808B1054 /* 007E8 808B1148 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 007EC 808B114C 03E00008 */ jr $ra /* 007F0 808B1150 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1388.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1388.s index 28a07cfb7e..c0254f4738 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1388.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1388.s @@ -8,5 +8,3 @@ glabel func_808B1388 /* 00A40 808B13A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A44 808B13A4 03E00008 */ jr $ra /* 00A48 808B13A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13AC.s index 36715e89ba..4fc9c9936d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13AC.s @@ -19,5 +19,3 @@ glabel func_808B13AC /* 00A90 808B13F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A94 808B13F4 03E00008 */ jr $ra /* 00A98 808B13F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13FC.s index d174e41008..fdf9b2cedf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B13FC.s @@ -8,5 +8,3 @@ glabel func_808B13FC /* 00AB4 808B1414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AB8 808B1418 03E00008 */ jr $ra /* 00ABC 808B141C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1420.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1420.s index e185272b82..360fe71968 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1420.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1420.s @@ -22,5 +22,3 @@ glabel func_808B1420 /* 00B10 808B1470 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B14 808B1474 03E00008 */ jr $ra /* 00B18 808B1478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B147C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B147C.s index 08ee5e118b..1530c49ba5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B147C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B147C.s @@ -8,5 +8,3 @@ glabel func_808B147C /* 00B34 808B1494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B38 808B1498 03E00008 */ jr $ra /* 00B3C 808B149C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s index eaaa994646..4f0402e092 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s @@ -56,5 +56,3 @@ glabel func_808B14A0 /* 00C08 808B1568 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C0C 808B156C 03E00008 */ jr $ra /* 00C10 808B1570 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1574.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1574.s index b14b40cd84..831b9a6b2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1574.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1574.s @@ -7,5 +7,3 @@ glabel func_808B1574 /* 00C28 808B1588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C2C 808B158C 03E00008 */ jr $ra /* 00C30 808B1590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s index a9d707fbdf..2b6d87dcc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s @@ -19,5 +19,3 @@ glabel BgSpot11Bakudankabe_Destroy /* 00490 808B2610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00494 808B2614 03E00008 */ jr $ra /* 00498 808B2618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s index 562bac6a11..a2a8c8cfd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s @@ -11,4 +11,3 @@ glabel BgSpot11Bakudankabe_Draw /* 00554 808B26D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00558 808B26D8 03E00008 */ jr $ra /* 0055C 808B26DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Init.s index 42cd0dec15..499deace6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808B2750 + .asciz "(spot11 爆弾壁)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgSpot11Bakudankabe_Init /* 003AC 808B252C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 003B0 808B2530 AFBF001C */ sw $ra, 0x001C($sp) @@ -50,5 +56,3 @@ glabel BgSpot11Bakudankabe_Init /* 00448 808B25C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0044C 808B25CC 03E00008 */ jr $ra /* 00450 808B25D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s index 7deb05ab1c..9091d9ede6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s @@ -43,5 +43,3 @@ glabel BgSpot11Bakudankabe_Update /* 00528 808B26A8 8FB10018 */ lw $s1, 0x0018($sp) /* 0052C 808B26AC 03E00008 */ jr $ra /* 00530 808B26B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s index aa7fe6a10f..a301838b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s @@ -39,5 +39,3 @@ glabel func_808B2180 /* 0008C 808B220C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00090 808B2210 03E00008 */ jr $ra /* 00094 808B2214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s index 9859c13410..a3958a3b90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808B2774 + .float 0.2 +glabel D_808B2778 + .float 0.4 + +.text glabel func_808B2218 /* 00098 808B2218 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 0009C 808B221C F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -209,5 +216,3 @@ glabel func_808B2218 /* 003A0 808B2520 8FBE0098 */ lw $s8, 0x0098($sp) /* 003A4 808B2524 03E00008 */ jr $ra /* 003A8 808B2528 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s index ffba9c4ad0..258726d752 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Init.s @@ -20,5 +20,3 @@ glabel BgSpot11Oasis_Init /* 00174 808B2964 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00178 808B2968 03E00008 */ jr $ra /* 0017C 808B296C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s index bd231d1040..b1a4aeb7fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_808B2EB8 + .float 0.12 + +glabel D_808B2EBC + .float 0.02 + +glabel D_808B2EC0 + .float 0.3 + +glabel D_808B2EC4 + .word 0x409CCCCD, 0x00000000, 0x00000000 + +.text glabel BgSpot11Oasis_Update /* 002D4 808B2AC4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 002D8 808B2AC8 AFB00020 */ sw $s0, 0x0020($sp) @@ -132,5 +146,3 @@ glabel BgSpot11Oasis_Update /* 004AC 808B2C9C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 004B0 808B2CA0 03E00008 */ jr $ra /* 004B4 808B2CA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s index b2da1ddd5c..02327b1c03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B27F0.s @@ -6,5 +6,3 @@ glabel func_808B27F0 /* 00010 808B2800 8DC20028 */ lw $v0, 0x0028($t6) ## 00000028 /* 00014 808B2804 03E00008 */ jr $ra /* 00018 808B2808 A4450002 */ sh $a1, 0x0002($v0) ## 00000002 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s index a52d31ce66..5a113aa520 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B280C.s @@ -71,5 +71,3 @@ glabel func_808B280C /* 00124 808B2914 8FB50030 */ lw $s5, 0x0030($sp) /* 00128 808B2918 03E00008 */ jr $ra /* 0012C 808B291C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s index a3ec1f945f..90cbb18662 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2970.s @@ -3,5 +3,3 @@ glabel func_808B2970 /* 00184 808B2974 25CE2980 */ addiu $t6, $t6, %lo(func_808B2980) ## $t6 = 808B2980 /* 00188 808B2978 03E00008 */ jr $ra /* 0018C 808B297C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s index 5047c286a5..5801bf5b12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2980.s @@ -25,5 +25,3 @@ glabel func_808B2980 /* 001E4 808B29D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001E8 808B29D8 03E00008 */ jr $ra /* 001EC 808B29DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s index d4214cd296..ac4040360b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29E0.s @@ -3,5 +3,3 @@ glabel func_808B29E0 /* 001F4 808B29E4 25CE29F0 */ addiu $t6, $t6, %lo(func_808B29F0) ## $t6 = 808B29F0 /* 001F8 808B29E8 03E00008 */ jr $ra /* 001FC 808B29EC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s index 16bba4ee68..671cd2ce9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B29F0.s @@ -48,5 +48,3 @@ glabel func_808B29F0 /* 002AC 808B2A9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 002B0 808B2AA0 03E00008 */ jr $ra /* 002B4 808B2AA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s index 8b54fdb508..93dbd5c829 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AA8.s @@ -3,5 +3,3 @@ glabel func_808B2AA8 /* 002BC 808B2AAC 25CE2AB8 */ addiu $t6, $t6, %lo(func_808B2AB8) ## $t6 = 808B2AB8 /* 002C0 808B2AB0 03E00008 */ jr $ra /* 002C4 808B2AB4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s index d84c81af49..f5744f0e81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2AB8.s @@ -2,5 +2,3 @@ glabel func_808B2AB8 /* 002C8 808B2AB8 AFA40000 */ sw $a0, 0x0000($sp) /* 002CC 808B2ABC 03E00008 */ jr $ra /* 002D0 808B2AC0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s index 7c2ab326f3..824c34fc38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808B2E70 + .asciz "../z_bg_spot11_oasis.c" + .balign 4 + +glabel D_808B2E88 + .asciz "../z_bg_spot11_oasis.c" + .balign 4 + +glabel D_808B2EA0 + .asciz "../z_bg_spot11_oasis.c" + .balign 4 + +.text glabel func_808B2CA8 /* 004B8 808B2CA8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 004BC 808B2CAC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -81,4 +95,3 @@ glabel func_808B2CA8 /* 005F4 808B2DE4 03E00008 */ jr $ra /* 005F8 808B2DE8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 005FC 808B2DEC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s index bbc59f1461..d631c7b996 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s @@ -13,5 +13,3 @@ glabel BgSpot15Rrbox_Destroy /* 00334 808B3C94 A4204590 */ sh $zero, %lo(D_808B4590)($at) /* 00338 808B3C98 03E00008 */ jr $ra /* 0033C 808B3C9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s index 41232d2af0..6ba5147cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s @@ -14,4 +14,3 @@ glabel BgSpot15Rrbox_Draw /* 00C24 808B4584 00000000 */ nop /* 00C28 808B4588 00000000 */ nop /* 00C2C 808B458C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s index b7c66c0ebd..d021b5a137 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808B4678 + .asciz "(spot15 ロンロン木箱)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel BgSpot15Rrbox_Init /* 00234 808B3B94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00238 808B3B98 AFBF001C */ sw $ra, 0x001C($sp) @@ -58,5 +64,3 @@ glabel BgSpot15Rrbox_Init /* 00300 808B3C60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00304 808B3C64 03E00008 */ jr $ra /* 00308 808B3C68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s index 05f8a53903..2f2803a498 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s @@ -29,5 +29,3 @@ glabel BgSpot15Rrbox_Update /* 00BEC 808B454C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BF0 808B4550 03E00008 */ jr $ra /* 00BF4 808B4554 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s index 37f1506451..4dd4cc369d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s @@ -1,3 +1,15 @@ +.rdata +glabel D_808B4620 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +.balign 4 + +glabel D_808B4660 + .asciz "../z_bg_spot15_rrbox.c" + .balign 4 + +.text glabel func_808B3960 /* 00000 808B3960 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 808B3964 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +50,3 @@ glabel func_808B3960 /* 0007C 808B39DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 808B39E0 03E00008 */ jr $ra /* 00084 808B39E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s index 58ff6150e7..bca2cfbfec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s @@ -18,5 +18,3 @@ glabel func_808B39E8 /* 000C8 808B3A28 460A4401 */ sub.s $f16, $f8, $f10 /* 000CC 808B3A2C 03E00008 */ jr $ra /* 000D0 808B3A30 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s index 4b7f04da3e..f6e7846b6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s @@ -2,5 +2,3 @@ glabel func_808B3A34 /* 000D4 808B3A34 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 /* 000D8 808B3A38 03E00008 */ jr $ra /* 000DC 808B3A3C AC8E0180 */ sw $t6, 0x0180($a0) ## 00000180 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s index b2f9f89848..9423f8cd6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B46F4 + .float 0.01 + +.text glabel func_808B3A40 /* 000E0 808B3A40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 000E4 808B3A44 AFA40018 */ sw $a0, 0x0018($sp) @@ -29,5 +34,3 @@ glabel func_808B3A40 /* 00140 808B3AA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00144 808B3AA4 03E00008 */ jr $ra /* 00148 808B3AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s index ac0458f58f..cad42a5d89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B46F8 + .word 0x44688000 + +.text glabel func_808B3AAC /* 0014C 808B3AAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00150 808B3AB0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -63,5 +68,3 @@ glabel func_808B3AAC /* 00228 808B3B88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0022C 808B3B8C 03E00008 */ jr $ra /* 00230 808B3B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s index 42ee037e55..691af6573c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B46FC + .word 0xBA83126F + +.text glabel func_808B3CA0 /* 00340 808B3CA0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00344 808B3CA4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -79,5 +84,3 @@ glabel func_808B3CA0 /* 00470 808B3DD0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00474 808B3DD4 03E00008 */ jr $ra /* 00478 808B3DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s index 5da2366790..c8aa0ca69f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s @@ -96,5 +96,3 @@ glabel func_808B3DDC /* 005EC 808B3F4C 8FB70050 */ lw $s7, 0x0050($sp) /* 005F0 808B3F50 03E00008 */ jr $ra /* 005F4 808B3F54 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s index 33741c07b6..ecb6eed32b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s @@ -50,5 +50,3 @@ glabel func_808B3F58 /* 006A4 808B4004 8FB10018 */ lw $s1, 0x0018($sp) /* 006A8 808B4008 03E00008 */ jr $ra /* 006AC 808B400C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s index 58d17c2de6..53ef67f0a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s @@ -28,5 +28,3 @@ glabel func_808B4010 /* 00718 808B4078 2C420001 */ sltiu $v0, $v0, 0x0001 /* 0071C 808B407C 03E00008 */ jr $ra /* 00720 808B4080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s index 2393671fd5..e4394898f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s @@ -9,5 +9,3 @@ glabel func_808B4084 /* 00740 808B40A0 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 /* 00744 808B40A4 03E00008 */ jr $ra /* 00748 808B40A8 E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s index 81c4528e26..b2697a04e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B4700 + .float 0.001 + +.text glabel func_808B40AC /* 0074C 808B40AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00750 808B40B0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -54,5 +59,3 @@ glabel func_808B40AC /* 0080C 808B416C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00810 808B4170 03E00008 */ jr $ra /* 00814 808B4174 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s index 38748209d4..1f6a1ec7a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s @@ -6,5 +6,3 @@ glabel func_808B4178 /* 00828 808B4188 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 0082C 808B418C 03E00008 */ jr $ra /* 00830 808B4190 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s index 843338daa4..f9671387f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s @@ -133,5 +133,3 @@ glabel func_808B4194 /* 00A14 808B4374 8FB10018 */ lw $s1, 0x0018($sp) /* 00A18 808B4378 03E00008 */ jr $ra /* 00A1C 808B437C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s index 3f1598787b..966c3a480f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s @@ -19,5 +19,3 @@ glabel func_808B4380 /* 00A64 808B43C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A68 808B43C8 03E00008 */ jr $ra /* 00A6C 808B43CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s index 972885b203..b443940017 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s @@ -1,3 +1,22 @@ +.rdata +glabel D_808B46A0 + .asciz "Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B46DC + .asciz "../z_bg_spot15_rrbox.c" + .balign 4 + +.late_rodata +glabel D_808B4704 + .float 0.001 + +glabel D_808B4708 + .word 0xC6F9EC00 +glabel D_808B470C + .word 0xBA83126F + +.text glabel func_808B43D0 /* 00A70 808B43D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00A74 808B43D4 AFBF001C */ sw $ra, 0x001C($sp) @@ -64,5 +83,3 @@ glabel func_808B43D0 /* 00B4C 808B44AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B50 808B44B0 03E00008 */ jr $ra /* 00B54 808B44B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s index 037138a746..1f29f64b5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s @@ -4,5 +4,3 @@ glabel func_808B44B8 /* 00B60 808B44C0 25CE44CC */ addiu $t6, $t6, %lo(func_808B44CC) ## $t6 = 808B44CC /* 00B64 808B44C4 03E00008 */ jr $ra /* 00B68 808B44C8 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s index 39584c7ef3..b3cd544310 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s @@ -7,5 +7,3 @@ glabel func_808B44CC /* 00B80 808B44E0 AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 /* 00B84 808B44E4 03E00008 */ jr $ra /* 00B88 808B44E8 E4840150 */ swc1 $f4, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s index 882c29bbcf..be9d4b49fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s @@ -20,5 +20,3 @@ glabel BgSpot16Bombstone_Destroy /* 0056C 808B519C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00570 808B51A0 03E00008 */ jr $ra /* 00574 808B51A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s index c715d9236a..92e9ce4f48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808B61E4 + .asciz "../z_bg_spot16_bombstone.c" + .balign 4 + +glabel D_808B6200 + .asciz "../z_bg_spot16_bombstone.c" + .balign 4 + +glabel D_808B621C + .asciz "../z_bg_spot16_bombstone.c" + .balign 4 + +.text glabel BgSpot16Bombstone_Draw /* 01068 808B5C98 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0106C 808B5C9C AFB10018 */ sw $s1, 0x0018($sp) @@ -79,4 +93,3 @@ glabel BgSpot16Bombstone_Draw /* 01194 808B5DC4 00000000 */ nop /* 01198 808B5DC8 00000000 */ nop /* 0119C 808B5DCC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s index 1ee9dbbcff..6589fa198d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s @@ -1,3 +1,26 @@ +.rdata +glabel D_808B6108 + .asciz "Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B6140 + .asciz "../z_bg_spot16_bombstone.c" + .balign 4 + +glabel D_808B615C + .asciz "Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel jtbl_808B623C +.word L808B50DC +.word L808B50DC +.word L808B50DC +.word L808B50DC +.word L808B50DC +.word L808B50DC + +.text glabel BgSpot16Bombstone_Init /* 00438 808B5068 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0043C 808B506C AFBF0024 */ sw $ra, 0x0024($sp) @@ -70,5 +93,3 @@ glabel L808B50DC /* 00520 808B5150 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00524 808B5154 03E00008 */ jr $ra /* 00528 808B5158 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s index 91f399eed7..7435f339cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s @@ -13,5 +13,3 @@ glabel BgSpot16Bombstone_Update /* 0105C 808B5C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01060 808B5C90 03E00008 */ jr $ra /* 01064 808B5C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s index 960882c472..aa7140483b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s @@ -6,5 +6,3 @@ glabel func_808B4C30 /* 00010 808B4C40 A48F0156 */ sh $t7, 0x0156($a0) ## 00000156 /* 00014 808B4C44 03E00008 */ jr $ra /* 00018 808B4C48 A498001C */ sh $t8, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s index 1011669234..93c408c8e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s @@ -45,5 +45,3 @@ glabel func_808B4C4C /* 000C8 808B4CF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000CC 808B4CFC 03E00008 */ jr $ra /* 000D0 808B4D00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s index 48ca33ae27..6a8292dfae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s @@ -39,5 +39,3 @@ glabel func_808B4D04 /* 00160 808B4D90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00164 808B4D94 03E00008 */ jr $ra /* 00168 808B4D98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s index 06ed0ecbad..ae188aa6b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808B60A0 + .asciz "Spot16 obj 爆弾石 破壊済み\n" + .balign 4 + +.text glabel func_808B4D9C /* 0016C 808B4D9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00170 808B4DA0 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +60,3 @@ glabel func_808B4D9C /* 0021C 808B4E4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00220 808B4E50 03E00008 */ jr $ra /* 00224 808B4E54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s index 777eec9a95..2ea01cd910 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808B60BC + .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" + .balign 4 + +glabel D_808B60EC + .asciz "../z_bg_spot16_bombstone.c" + .balign 4 + +.late_rodata +glabel D_808B6238 + .word 0x3ADA740E + +.text glabel func_808B4E58 /* 00228 808B4E58 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0022C 808B4E5C AFA50034 */ sw $a1, 0x0034($sp) @@ -139,5 +153,3 @@ glabel func_808B4E58 /* 0042C 808B505C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00430 808B5060 03E00008 */ jr $ra /* 00434 808B5064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s index de8ead4ba2..5911563abd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s @@ -37,5 +37,3 @@ glabel func_808B51A8 /* 00604 808B5234 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00608 808B5238 03E00008 */ jr $ra /* 0060C 808B523C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s index bfb05a9581..449c4263d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s @@ -92,5 +92,3 @@ glabel func_808B5240 /* 0076C 808B539C 8FB60040 */ lw $s6, 0x0040($sp) /* 00770 808B53A0 03E00008 */ jr $ra /* 00774 808B53A4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s index 6a95fc25c1..02070e1112 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B6254 + .float 1.3 + +.text glabel func_808B53A8 /* 00778 808B53A8 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 0077C 808B53AC AFBF0094 */ sw $ra, 0x0094($sp) @@ -167,5 +172,3 @@ glabel func_808B53A8 /* 009E0 808B5610 8FB70090 */ lw $s7, 0x0090($sp) /* 009E4 808B5614 03E00008 */ jr $ra /* 009E8 808B5618 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s index ddadaba62c..eea3fe02de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s @@ -42,5 +42,3 @@ glabel func_808B561C /* 00A80 808B56B0 8FB40040 */ lw $s4, 0x0040($sp) /* 00A84 808B56B4 03E00008 */ jr $ra /* 00A88 808B56B8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s index 856707fb37..a7fa8eff26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808B618C + .asciz "Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n" + .balign 4 + +glabel D_808B61C8 + .asciz "../z_bg_spot16_bombstone.c" + .balign 4 + +.text glabel func_808B56BC /* 00A8C 808B56BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00A90 808B56C0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -78,5 +88,3 @@ glabel func_808B56BC /* 00BA4 808B57D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00BA8 808B57D8 03E00008 */ jr $ra /* 00BAC 808B57DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s index c2f0746eab..7aa640981a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808B6258 + .word 0x44C56000 +glabel D_808B625C + .word 0x44458000 +glabel D_808B6260 + .word 0x481C4000, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_808B57E0 /* 00BB0 808B57E0 3C09808B */ lui $t1, %hi(D_808B5DD4) ## $t1 = 808B0000 /* 00BB4 808B57E4 25295DD4 */ addiu $t1, $t1, %lo(D_808B5DD4) ## $t1 = 808B5DD4 @@ -89,5 +98,3 @@ glabel func_808B57E0 /* 00CF8 808B5928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CFC 808B592C 03E00008 */ jr $ra /* 00D00 808B5930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s index 804ad2dbf7..5cd885e0a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s @@ -6,5 +6,3 @@ glabel func_808B5934 /* 00D14 808B5944 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 /* 00D18 808B5948 03E00008 */ jr $ra /* 00D1C 808B594C AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s index 2e8a66ea03..b55cb760c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s @@ -81,5 +81,3 @@ glabel func_808B5950 /* 00E3C 808B5A6C 8FB10020 */ lw $s1, 0x0020($sp) /* 00E40 808B5A70 03E00008 */ jr $ra /* 00E44 808B5A74 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s index 3c50a1d666..6da2713ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s @@ -6,5 +6,3 @@ glabel func_808B5A78 /* 00E58 808B5A88 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 /* 00E5C 808B5A8C 03E00008 */ jr $ra /* 00E60 808B5A90 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s index fc100606b0..e4f14be056 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s @@ -25,5 +25,3 @@ glabel func_808B5A94 /* 00EB4 808B5AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EB8 808B5AE8 03E00008 */ jr $ra /* 00EBC 808B5AEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s index 9fae015b62..dba99f4b53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s @@ -4,5 +4,3 @@ glabel func_808B5AF0 /* 00EC8 808B5AF8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 00ECC 808B5AFC 03E00008 */ jr $ra /* 00ED0 808B5B00 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s index 5853488b76..4c98cf47e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s @@ -22,5 +22,3 @@ glabel func_808B5B04 /* 00F1C 808B5B4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F20 808B5B50 03E00008 */ jr $ra /* 00F24 808B5B54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s index 237fbbec81..f959513c40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s @@ -4,5 +4,3 @@ glabel func_808B5B58 /* 00F30 808B5B60 A4800154 */ sh $zero, 0x0154($a0) ## 00000154 /* 00F34 808B5B64 03E00008 */ jr $ra /* 00F38 808B5B68 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s index 0ab71b26a9..9892d5a1fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s @@ -70,5 +70,3 @@ glabel func_808B5B6C /* 01028 808B5C58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0102C 808B5C5C 03E00008 */ jr $ra /* 01030 808B5C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Destroy.s index b51372daa0..1a03c4be06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Destroy.s @@ -2,5 +2,3 @@ glabel BgSpot16Doughnut_Destroy /* 001A0 808B65E0 AFA40000 */ sw $a0, 0x0000($sp) /* 001A4 808B65E4 03E00008 */ jr $ra /* 001A8 808B65E8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s index d0a53b4958..45b74028fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808B6A68 + .asciz "../z_bg_spot16_doughnut.c" + .balign 4 + +glabel D_808B6A84 + .asciz "../z_bg_spot16_doughnut.c" + .balign 4 + +glabel D_808B6AA0 + .asciz "../z_bg_spot16_doughnut.c" + .balign 4 + +.text glabel BgSpot16Doughnut_Draw /* 002A8 808B66E8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 002AC 808B66EC 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -125,5 +139,3 @@ glabel BgSpot16Doughnut_Draw /* 0048C 808B68CC 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 00490 808B68D0 03E00008 */ jr $ra /* 00494 808B68D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s index 6f5805bdb5..5afddd1e5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808B6A30 + .asciz "%f\n" + .balign 4 + +glabel D_808B6A3C + .asciz "(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel D_808B6B10 + .word 0x38D1B717 + +.text glabel BgSpot16Doughnut_Init /* 00000 808B6440 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 808B6444 AFA50024 */ sw $a1, 0x0024($sp) @@ -120,5 +134,3 @@ glabel BgSpot16Doughnut_Init /* 00194 808B65D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00198 808B65D8 03E00008 */ jr $ra /* 0019C 808B65DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Update.s index 7030ac2ed2..02cbae05c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Update.s @@ -41,5 +41,3 @@ glabel BgSpot16Doughnut_Update .L808B6678: /* 00238 808B6678 03E00008 */ jr $ra /* 0023C 808B667C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B6680.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B6680.s index 9699f3ea48..8944fdfa61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B6680.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B6680.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B6B14 + .word 0x3B03126E, 0x00000000, 0x00000000 + +.text glabel func_808B6680 /* 00240 808B6680 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00244 808B6684 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +34,3 @@ glabel func_808B6680 /* 0029C 808B66DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A0 808B66E0 03E00008 */ jr $ra /* 002A4 808B66E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s index 2b37a7b8de..3c238f9269 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808B6ABC + .asciz "../z_bg_spot16_doughnut.c" + .balign 4 + +glabel D_808B6AD8 + .asciz "../z_bg_spot16_doughnut.c" + .balign 4 + +glabel D_808B6AF4 + .asciz "../z_bg_spot16_doughnut.c" + .balign 4 + +.text glabel func_808B68D8 /* 00498 808B68D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0049C 808B68DC AFBF001C */ sw $ra, 0x001C($sp) @@ -69,4 +83,3 @@ glabel func_808B68D8 /* 005A4 808B69E4 00000000 */ nop /* 005A8 808B69E8 00000000 */ nop /* 005AC 808B69EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Destroy.s index fe7e199a17..f080b52d74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot17Bakudankabe_Destroy /* 003E4 808B6FA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003E8 808B6FA8 03E00008 */ jr $ra /* 003EC 808B6FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s index 62c6ababe5..c39c6377b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s @@ -1,3 +1,29 @@ +.rdata +glabel D_808B72B0 + .asciz "../z_bg_spot17_bakudankabe.c" + .balign 4 + +glabel D_808B72D0 + .asciz "../z_bg_spot17_bakudankabe.c" + .balign 4 + +glabel D_808B72F0 + .asciz "../z_bg_spot17_bakudankabe.c" + .balign 4 + +glabel D_808B7310 + .asciz "../z_bg_spot17_bakudankabe.c" + .balign 4 + +glabel D_808B7330 + .asciz "../z_bg_spot17_bakudankabe.c" + .balign 4 + +glabel D_808B7350 + .asciz "../z_bg_spot17_bakudankabe.c" + .balign 4 + +.text glabel BgSpot17Bakudankabe_Draw /* 00484 808B7044 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00488 808B7048 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -144,4 +170,3 @@ glabel BgSpot17Bakudankabe_Draw /* 006B4 808B7274 00000000 */ nop /* 006B8 808B7278 00000000 */ nop /* 006BC 808B727C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Init.s index 31afaee894..b08d45c31d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Init.s @@ -43,5 +43,3 @@ glabel BgSpot17Bakudankabe_Init /* 003B4 808B6F74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003B8 808B6F78 03E00008 */ jr $ra /* 003BC 808B6F7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Update.s index c86038b92e..8deb1863a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B7378 + .word 0x44228000, 0x00000000 + +.text glabel BgSpot17Bakudankabe_Update /* 003F0 808B6FB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 003F4 808B6FB4 AFBF001C */ sw $ra, 0x001C($sp) @@ -41,5 +46,3 @@ glabel BgSpot17Bakudankabe_Update /* 00478 808B7038 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0047C 808B703C 03E00008 */ jr $ra /* 00480 808B7040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s index 917b1bd26b..bcc6cbc12c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808B7370 + .float 0.2 + +glabel D_808B7374 + .float 0.4 + +.text glabel func_808B6BC0 /* 00000 808B6BC0 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 00004 808B6BC4 AFB20080 */ sw $s2, 0x0080($sp) @@ -217,5 +225,3 @@ glabel func_808B6BC0 /* 00324 808B6EE4 8FBE0098 */ lw $s8, 0x0098($sp) /* 00328 808B6EE8 03E00008 */ jr $ra /* 0032C 808B6EEC 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s new file mode 100644 index 0000000000..3de1881222 --- /dev/null +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s @@ -0,0 +1,4 @@ +glabel BgSpot17Funen_Destroy +/* 00040 808B7440 AFA40000 */ sw $a0, 0x0000($sp) +/* 00044 808B7444 03E00008 */ jr $ra +/* 00048 808B7448 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s new file mode 100644 index 0000000000..e24921f8cb --- /dev/null +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s @@ -0,0 +1,25 @@ +.rdata +glabel D_808B7630 + .asciz "spot17 obj. 噴煙 (arg_data 0x%04x)\n" + .balign 4 + +.text +glabel BgSpot17Funen_Init +/* 00000 808B7400 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 +/* 00004 808B7404 AFA5001C */ sw $a1, 0x001C($sp) +/* 00008 808B7408 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0000C 808B740C 3C05808B */ lui $a1, %hi(D_808B7620) ## $a1 = 808B0000 +/* 00010 808B7410 AFA40018 */ sw $a0, 0x0018($sp) +/* 00014 808B7414 0C01E037 */ jal Actor_ProcessInitChain + +/* 00018 808B7418 24A57620 */ addiu $a1, $a1, %lo(D_808B7620) ## $a1 = 808B7620 +/* 0001C 808B741C 8FAE0018 */ lw $t6, 0x0018($sp) +/* 00020 808B7420 3C04808B */ lui $a0, %hi(D_808B7630) ## $a0 = 808B0000 +/* 00024 808B7424 24847630 */ addiu $a0, $a0, %lo(D_808B7630) ## $a0 = 808B7630 +/* 00028 808B7428 0C00084C */ jal osSyncPrintf + +/* 0002C 808B742C 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C +/* 00030 808B7430 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00034 808B7434 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 +/* 00038 808B7438 03E00008 */ jr $ra +/* 0003C 808B743C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s new file mode 100644 index 0000000000..abf93ac811 --- /dev/null +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s @@ -0,0 +1,9 @@ +glabel BgSpot17Funen_Update +/* 0004C 808B744C 3C0E808B */ lui $t6, %hi(func_808B7478) ## $t6 = 808B0000 +/* 00050 808B7450 3C0F808B */ lui $t7, %hi(func_808B746C) ## $t7 = 808B0000 +/* 00054 808B7454 AFA50004 */ sw $a1, 0x0004($sp) +/* 00058 808B7458 25CE7478 */ addiu $t6, $t6, %lo(func_808B7478) ## $t6 = 808B7478 +/* 0005C 808B745C 25EF746C */ addiu $t7, $t7, %lo(func_808B746C) ## $t7 = 808B746C +/* 00060 808B7460 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 +/* 00064 808B7464 03E00008 */ jr $ra +/* 00068 808B7468 AC8F0130 */ sw $t7, 0x0130($a0) ## 00000130 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s new file mode 100644 index 0000000000..9f256e66c5 --- /dev/null +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s @@ -0,0 +1,4 @@ +glabel func_808B746C +/* 0006C 808B746C AFA40000 */ sw $a0, 0x0000($sp) +/* 00070 808B7470 03E00008 */ jr $ra +/* 00074 808B7474 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s new file mode 100644 index 0000000000..1ec1e14887 --- /dev/null +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s @@ -0,0 +1,117 @@ +.rdata +glabel D_808B7654 + .asciz "../z_bg_spot17_funen.c" + .balign 4 + +glabel D_808B766C + .asciz "../z_bg_spot17_funen.c" + .balign 4 + +glabel D_808B7684 + .asciz "../z_bg_spot17_funen.c" + .balign 4 + +.late_rodata +glabel D_808B769C + .float 9.58738E-5 + +.text +glabel func_808B7478 +/* 00078 808B7478 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 +/* 0007C 808B747C AFB10038 */ sw $s1, 0x0038($sp) +/* 00080 808B7480 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 +/* 00084 808B7484 AFBF003C */ sw $ra, 0x003C($sp) +/* 00088 808B7488 AFB00034 */ sw $s0, 0x0034($sp) +/* 0008C 808B748C AFA40070 */ sw $a0, 0x0070($sp) +/* 00090 808B7490 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 +/* 00094 808B7494 3C06808B */ lui $a2, %hi(D_808B7654) ## $a2 = 808B0000 +/* 00098 808B7498 24C67654 */ addiu $a2, $a2, %lo(D_808B7654) ## $a2 = 808B7654 +/* 0009C 808B749C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 +/* 000A0 808B74A0 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 +/* 000A4 808B74A4 0C031AB1 */ jal Graph_OpenDisps +/* 000A8 808B74A8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 +/* 000AC 808B74AC 0C024F61 */ jal func_80093D84 +/* 000B0 808B74B0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 +/* 000B4 808B74B4 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 +/* 000B8 808B74B8 000E7880 */ sll $t7, $t6, 2 +/* 000BC 808B74BC 022FC021 */ addu $t8, $s1, $t7 +/* 000C0 808B74C0 0C016A7D */ jal func_8005A9F4 +/* 000C4 808B74C4 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 +/* 000C8 808B74C8 8FB90070 */ lw $t9, 0x0070($sp) +/* 000CC 808B74CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 +/* 000D0 808B74D0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 +/* 000D4 808B74D4 872800B6 */ lh $t0, 0x00B6($t9) ## 000000B6 +/* 000D8 808B74D8 00484823 */ subu $t1, $v0, $t0 +/* 000DC 808B74DC 01215021 */ addu $t2, $t1, $at +/* 000E0 808B74E0 000A5C00 */ sll $t3, $t2, 16 +/* 000E4 808B74E4 000B6403 */ sra $t4, $t3, 16 +/* 000E8 808B74E8 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 +/* 000EC 808B74EC 3C01808B */ lui $at, %hi(D_808B769C) ## $at = 808B0000 +/* 000F0 808B74F0 C428769C */ lwc1 $f8, %lo(D_808B769C)($at) +/* 000F4 808B74F4 468021A0 */ cvt.s.w $f6, $f4 +/* 000F8 808B74F8 46083302 */ mul.s $f12, $f6, $f8 +/* 000FC 808B74FC 0C034348 */ jal Matrix_RotateY +/* 00100 808B7500 00000000 */ nop +/* 00104 808B7504 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 +/* 00108 808B7508 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 +/* 0010C 808B750C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 +/* 00110 808B7510 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 +/* 00114 808B7514 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 +/* 00118 808B7518 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 +/* 0011C 808B751C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 +/* 00120 808B7520 3C05808B */ lui $a1, %hi(D_808B766C) ## $a1 = 808B0000 +/* 00124 808B7524 24A5766C */ addiu $a1, $a1, %lo(D_808B766C) ## $a1 = 808B766C +/* 00128 808B7528 240600A1 */ addiu $a2, $zero, 0x00A1 ## $a2 = 000000A1 +/* 0012C 808B752C 0C0346A2 */ jal Matrix_NewMtx +/* 00130 808B7530 AFA20054 */ sw $v0, 0x0054($sp) +/* 00134 808B7534 8FA30054 */ lw $v1, 0x0054($sp) +/* 00138 808B7538 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 +/* 0013C 808B753C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 +/* 00140 808B7540 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 +/* 00144 808B7544 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 +/* 00148 808B7548 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 +/* 0014C 808B754C 00F13821 */ addu $a3, $a3, $s1 +/* 00150 808B7550 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 +/* 00154 808B7554 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 +/* 00158 808B7558 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 +/* 0015C 808B755C 8CE71DE4 */ lw $a3, 0x1DE4($a3) ## 00011DE4 +/* 00160 808B7560 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 +/* 00164 808B7564 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 +/* 00168 808B7568 00073823 */ subu $a3, $zero, $a3 +/* 0016C 808B756C 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 00000000 +/* 00170 808B7570 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 +/* 00174 808B7574 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 +/* 00178 808B7578 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 +/* 0017C 808B757C 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 +/* 00180 808B7580 AFAB0028 */ sw $t3, 0x0028($sp) +/* 00184 808B7584 AFAA0024 */ sw $t2, 0x0024($sp) +/* 00188 808B7588 AFA90018 */ sw $t1, 0x0018($sp) +/* 0018C 808B758C AFA80014 */ sw $t0, 0x0014($sp) +/* 00190 808B7590 AFA70020 */ sw $a3, 0x0020($sp) +/* 00194 808B7594 AFB90010 */ sw $t9, 0x0010($sp) +/* 00198 808B7598 AFA0001C */ sw $zero, 0x001C($sp) +/* 0019C 808B759C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 +/* 001A0 808B75A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 +/* 001A4 808B75A4 0C0253D0 */ jal Gfx_TwoTexScroll +/* 001A8 808B75A8 AFA20050 */ sw $v0, 0x0050($sp) +/* 001AC 808B75AC 8FA30050 */ lw $v1, 0x0050($sp) +/* 001B0 808B75B0 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 001B4 808B75B4 25CE0B40 */ addiu $t6, $t6, 0x0B40 ## $t6 = 06000B40 +/* 001B8 808B75B8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 +/* 001BC 808B75BC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 +/* 001C0 808B75C0 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 +/* 001C4 808B75C4 3C06808B */ lui $a2, %hi(D_808B7684) ## $a2 = 808B0000 +/* 001C8 808B75C8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 +/* 001CC 808B75CC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 +/* 001D0 808B75D0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 +/* 001D4 808B75D4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 +/* 001D8 808B75D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 +/* 001DC 808B75DC 24C67684 */ addiu $a2, $a2, %lo(D_808B7684) ## $a2 = 808B7684 +/* 001E0 808B75E0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 +/* 001E4 808B75E4 0C031AD5 */ jal Graph_CloseDisps +/* 001E8 808B75E8 240700B0 */ addiu $a3, $zero, 0x00B0 ## $a3 = 000000B0 +/* 001EC 808B75EC 8FBF003C */ lw $ra, 0x003C($sp) +/* 001F0 808B75F0 8FB00034 */ lw $s0, 0x0034($sp) +/* 001F4 808B75F4 8FB10038 */ lw $s1, 0x0038($sp) +/* 001F8 808B75F8 03E00008 */ jr $ra +/* 001FC 808B75FC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s index 70fb58a982..8bebc37eb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s @@ -18,5 +18,3 @@ glabel BgSpot18Basket_Destroy /* 003D0 808B7AE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003D4 808B7AE4 03E00008 */ jr $ra /* 003D8 808B7AE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s index b3bcffdea6..890365be83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s @@ -23,4 +23,3 @@ glabel BgSpot18Basket_Draw /* 00E34 808B8544 00000000 */ nop /* 00E38 808B8548 00000000 */ nop /* 00E3C 808B854C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s index 51ad18d087..b8f8875225 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_808B85F0 + .asciz "" + .balign 4 + +glabel D_808B85F8 + .asciz "Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n" + .balign 4 + +glabel D_808B8620 + .asciz "../z_bg_spot18_basket.c" + .balign 4 + +glabel D_808B8638 + .asciz "\x1b[m" + .balign 4 + +.late_rodata +glabel D_808B863C + .float 0.01 + +.text glabel BgSpot18Basket_Init /* 0021C 808B792C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00220 808B7930 AFB10038 */ sw $s1, 0x0038($sp) @@ -106,5 +128,3 @@ glabel BgSpot18Basket_Init /* 00388 808B7A98 8FB10038 */ lw $s1, 0x0038($sp) /* 0038C 808B7A9C 03E00008 */ jr $ra /* 00390 808B7AA0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s index e9a392171e..540f16083d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s @@ -50,5 +50,3 @@ glabel BgSpot18Basket_Update /* 00DD8 808B84E8 8FB10020 */ lw $s1, 0x0020($sp) /* 00DDC 808B84EC 03E00008 */ jr $ra /* 00DE0 808B84F0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s index 9fd301450c..535f09d7ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s @@ -23,5 +23,3 @@ glabel func_808B7710 /* 00054 808B7764 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00058 808B7768 03E00008 */ jr $ra /* 0005C 808B776C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7770.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7770.s index ae5ad9bf7a..5b994eed32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7770.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7770.s @@ -118,5 +118,3 @@ glabel func_808B7770 /* 00210 808B7920 8FB60068 */ lw $s6, 0x0068($sp) /* 00214 808B7924 03E00008 */ jr $ra /* 00218 808B7928 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AEC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AEC.s index 4517e4e87a..50fa185509 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AEC.s @@ -3,5 +3,3 @@ glabel func_808B7AEC /* 003E0 808B7AF0 25CE7AFC */ addiu $t6, $t6, %lo(func_808B7AFC) ## $t6 = 808B7AFC /* 003E4 808B7AF4 03E00008 */ jr $ra /* 003E8 808B7AF8 AC8E0204 */ sw $t6, 0x0204($a0) ## 00000204 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AFC.s index ce9ab3a594..cef1cb3cd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7AFC.s @@ -24,5 +24,3 @@ glabel func_808B7AFC /* 0043C 808B7B4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00440 808B7B50 03E00008 */ jr $ra /* 00444 808B7B54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B58.s index a2fd01dd2e..6bb6cb9add 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B58.s @@ -4,5 +4,3 @@ glabel func_808B7B58 /* 00450 808B7B60 AC8E0204 */ sw $t6, 0x0204($a0) ## 00000204 /* 00454 808B7B64 03E00008 */ jr $ra /* 00458 808B7B68 A4800216 */ sh $zero, 0x0216($a0) ## 00000216 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B6C.s index dfca0fa414..144c8d25bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7B6C.s @@ -17,5 +17,3 @@ glabel func_808B7B6C /* 00494 808B7BA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00498 808B7BA8 03E00008 */ jr $ra /* 0049C 808B7BAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BB0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BB0.s index 1d15778c20..a22a7d7b7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BB0.s @@ -6,5 +6,3 @@ glabel func_808B7BB0 /* 004B0 808B7BC0 AC8E0204 */ sw $t6, 0x0204($a0) ## 00000204 /* 004B4 808B7BC4 03E00008 */ jr $ra /* 004B8 808B7BC8 A48F0210 */ sh $t7, 0x0210($a0) ## 00000210 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BCC.s index cdded8d901..718045a114 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7BCC.s @@ -97,5 +97,3 @@ glabel func_808B7BCC /* 0061C 808B7D2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00620 808B7D30 03E00008 */ jr $ra /* 00624 808B7D34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D38.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D38.s index b514239137..8304210ace 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D38.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D38.s @@ -5,5 +5,3 @@ glabel func_808B7D38 /* 00634 808B7D44 A4800216 */ sh $zero, 0x0216($a0) ## 00000216 /* 00638 808B7D48 03E00008 */ jr $ra /* 0063C 808B7D4C A4800214 */ sh $zero, 0x0214($a0) ## 00000214 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D50.s index 11d4f6c46c..336e176723 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7D50.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B8640 + .word 0x3A1D4952 + +.text glabel func_808B7D50 /* 00640 808B7D50 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00644 808B7D54 AFBF001C */ sw $ra, 0x001C($sp) @@ -156,5 +161,3 @@ glabel func_808B7D50 /* 00858 808B7F68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0085C 808B7F6C 03E00008 */ jr $ra /* 00860 808B7F70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7F74.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7F74.s index 681ec4f68a..11c0ea5cea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7F74.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7F74.s @@ -22,5 +22,3 @@ glabel func_808B7F74 .L808B7FB8: /* 008A8 808B7FB8 03E00008 */ jr $ra /* 008AC 808B7FBC A4800216 */ sh $zero, 0x0216($a0) ## 00000216 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7FC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7FC0.s index 97452beab0..33aef31fe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7FC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7FC0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B8644 + .word 0x3A1D4952, 0x00000000, 0x00000000 + +.text glabel func_808B7FC0 /* 008B0 808B7FC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 008B4 808B7FC4 AFBF001C */ sw $ra, 0x001C($sp) @@ -126,5 +131,3 @@ glabel func_808B7FC0 /* 00A70 808B8180 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A74 808B8184 03E00008 */ jr $ra /* 00A78 808B8188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B818C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B818C.s index 1052559c69..d3a9be80fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B818C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B818C.s @@ -4,5 +4,3 @@ glabel func_808B818C /* 00A84 808B8194 AC8E0204 */ sw $t6, 0x0204($a0) ## 00000204 /* 00A88 808B8198 03E00008 */ jr $ra /* 00A8C 808B819C A4800216 */ sh $zero, 0x0216($a0) ## 00000216 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B81A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B81A0.s index 8ba2112bca..2967371fec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B81A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B81A0.s @@ -188,5 +188,3 @@ glabel func_808B81A0 /* 00D18 808B8428 8FB40030 */ lw $s4, 0x0030($sp) /* 00D1C 808B842C 03E00008 */ jr $ra /* 00D20 808B8430 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Destroy.s index 048736e5d1..1e0e176bce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot18Obj_Destroy /* 004A4 808B8DB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A8 808B8DB8 03E00008 */ jr $ra /* 004AC 808B8DBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s index 5faa4eab86..1c5796ce5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s @@ -15,4 +15,3 @@ glabel BgSpot18Obj_Draw /* 007B4 808B90C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007B8 808B90C8 03E00008 */ jr $ra /* 007BC 808B90CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Init.s index cd274293e6..4075146439 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808B925C + .asciz "Spot18 Object [arg_data : 0x%04x]\n" + .balign 4 + +.text glabel BgSpot18Obj_Init /* 0040C 808B8D1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00410 808B8D20 AFB00018 */ sw $s0, 0x0018($sp) @@ -33,5 +39,3 @@ glabel BgSpot18Obj_Init /* 00474 808B8D84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00478 808B8D88 03E00008 */ jr $ra /* 0047C 808B8D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Update.s index 90114b9e45..4276014d28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Update.s @@ -13,5 +13,3 @@ glabel BgSpot18Obj_Update /* 00778 808B9088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0077C 808B908C 03E00008 */ jr $ra /* 00780 808B9090 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s index 1f9c570005..72d3f264f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s @@ -1,3 +1,33 @@ +.rdata +glabel D_808B9150 + .asciz "Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B9184 + .asciz "../z_bg_spot18_obj.c" + .balign 4 + +glabel D_808B919C + .asciz "出現しない Object (0x%04x)\n" + .balign 4 + +glabel D_808B91B8 + .asciz "Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B91F8 + .asciz "../z_bg_spot18_obj.c" + .balign 4 + +glabel D_808B9210 + .asciz "Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_808B9244 + .asciz "../z_bg_spot18_obj.c" + .balign 4 + +.text glabel func_808B8910 /* 00000 808B8910 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00004 808B8914 8C63E664 */ lw $v1, -0x199C($v1) ## 8015E664 @@ -98,5 +128,3 @@ glabel func_808B8910 /* 00140 808B8A50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00144 808B8A54 03E00008 */ jr $ra /* 00148 808B8A58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A5C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A5C.s index de847f9584..e0ce77939c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A5C.s @@ -15,5 +15,3 @@ glabel func_808B8A5C /* 0017C 808B8A8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00180 808B8A90 03E00008 */ jr $ra /* 00184 808B8A94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A98.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A98.s index 9e79929352..875414d156 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A98.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8A98.s @@ -30,5 +30,3 @@ glabel func_808B8A98 /* 001EC 808B8AFC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 001F0 808B8B00 03E00008 */ jr $ra /* 001F4 808B8B04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B08.s index a4dd2d8b54..5a327c1871 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B08.s @@ -11,5 +11,3 @@ glabel func_808B8B08 /* 0021C 808B8B2C 01C84825 */ or $t1, $t6, $t0 ## $t1 = 808C0000 /* 00220 808B8B30 03E00008 */ jr $ra /* 00224 808B8B34 AC890004 */ sw $t1, 0x0004($a0) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B38.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B38.s index 3f08aacb00..b3336bb4ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B38.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8B38.s @@ -33,5 +33,3 @@ glabel func_808B8B38 /* 00298 808B8BA8 8FB30020 */ lw $s3, 0x0020($sp) /* 0029C 808B8BAC 03E00008 */ jr $ra /* 002A0 808B8BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s index e0fbf037ae..dafb499b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s @@ -63,5 +63,3 @@ glabel func_808B8BB4 /* 00374 808B8C84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00378 808B8C88 03E00008 */ jr $ra /* 0037C 808B8C8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8C90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8C90.s index 4cf3dd35b8..54bd0d188c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8C90.s @@ -14,5 +14,3 @@ glabel func_808B8C90 /* 003AC 808B8CBC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 003B0 808B8CC0 03E00008 */ jr $ra /* 003B4 808B8CC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8CC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8CC8.s index a3c7bb9111..b63ff00195 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8CC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8CC8.s @@ -21,5 +21,3 @@ glabel func_808B8CC8 /* 00400 808B8D10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00404 808B8D14 03E00008 */ jr $ra /* 00408 808B8D18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DC0.s index ffc17be885..abc03a59b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DC0.s @@ -3,5 +3,3 @@ glabel func_808B8DC0 /* 004B4 808B8DC4 25CE8DD0 */ addiu $t6, $t6, %lo(func_808B8DD0) ## $t6 = 808B8DD0 /* 004B8 808B8DC8 03E00008 */ jr $ra /* 004BC 808B8DCC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DD0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DD0.s index b0e0d6d345..e65fc9deb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DD0.s @@ -2,5 +2,3 @@ glabel func_808B8DD0 /* 004C0 808B8DD0 AFA40000 */ sw $a0, 0x0000($sp) /* 004C4 808B8DD4 03E00008 */ jr $ra /* 004C8 808B8DD8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DDC.s index 4f8ff269b9..95f178cbe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8DDC.s @@ -16,5 +16,3 @@ glabel func_808B8DDC /* 00504 808B8E14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00508 808B8E18 03E00008 */ jr $ra /* 0050C 808B8E1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E20.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E20.s index 76f9e9964d..b9aee035ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E20.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E20.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B9280 + .float 0.001 + +.text glabel func_808B8E20 /* 00510 808B8E20 C4800150 */ lwc1 $f0, 0x0150($a0) ## 00000150 /* 00514 808B8E24 3C01808C */ lui $at, %hi(D_808B9280) ## $at = 808C0000 @@ -17,5 +22,3 @@ glabel func_808B8E20 .L808B8E5C: /* 0054C 808B8E5C 03E00008 */ jr $ra /* 00550 808B8E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E64.s index d9f743e2d5..24e0258f63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E64.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E64.s @@ -5,5 +5,3 @@ glabel func_808B8E64 /* 00560 808B8E70 A48E0168 */ sh $t6, 0x0168($a0) ## 00000168 /* 00564 808B8E74 03E00008 */ jr $ra /* 00568 808B8E78 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E7C.s index cf8141b757..09835e1f02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8E7C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808B9284 + .float -0.001 + +.text glabel func_808B8E7C /* 0056C 808B8E7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00570 808B8E80 AFBF0014 */ sw $ra, 0x0014($sp) @@ -25,5 +30,3 @@ glabel func_808B8E7C /* 005C4 808B8ED4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005C8 808B8ED8 03E00008 */ jr $ra /* 005CC 808B8EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8EE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8EE0.s index 0fa27500ac..126bf172ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8EE0.s @@ -9,5 +9,3 @@ glabel func_808B8EE0 /* 005EC 808B8EFC E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 /* 005F0 808B8F00 03E00008 */ jr $ra /* 005F4 808B8F04 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8F08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8F08.s index bcf32919d1..8777aece59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8F08.s @@ -81,5 +81,3 @@ glabel func_808B8F08 /* 00714 808B9024 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00718 808B9028 03E00008 */ jr $ra /* 0071C 808B902C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9030.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9030.s index e792893675..8fe148cb1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9030.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9030.s @@ -3,5 +3,3 @@ glabel func_808B9030 /* 00724 808B9034 25CE9040 */ addiu $t6, $t6, %lo(func_808B9040) ## $t6 = 808B9040 /* 00728 808B9038 03E00008 */ jr $ra /* 0072C 808B903C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9040.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9040.s index 702cbb7865..050c98fe08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9040.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B9040.s @@ -7,5 +7,3 @@ glabel func_808B9040 /* 00744 808B9054 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00748 808B9058 03E00008 */ jr $ra /* 0074C 808B905C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Destroy.s index 4734bd9430..47977c4093 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Destroy.s @@ -12,5 +12,3 @@ glabel BgSpot18Shutter_Destroy /* 001D0 808B95A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001D4 808B95A4 03E00008 */ jr $ra /* 001D8 808B95A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s index 528049e1f4..cf3d77590a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s @@ -13,4 +13,3 @@ glabel BgSpot18Shutter_Draw /* 00474 808B9844 00000000 */ nop /* 00478 808B9848 00000000 */ nop /* 0047C 808B984C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s index f981dc5a0a..355d641d6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s @@ -119,5 +119,3 @@ glabel BgSpot18Shutter_Init /* 001A0 808B9570 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001A4 808B9574 03E00008 */ jr $ra /* 001A8 808B9578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Update.s index 634bf35160..b512af4b17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Update.s @@ -8,5 +8,3 @@ glabel BgSpot18Shutter_Update /* 00440 808B9810 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00444 808B9814 03E00008 */ jr $ra /* 00448 808B9818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95AC.s index f91cf11bda..1bf5301379 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95AC.s @@ -2,5 +2,3 @@ glabel func_808B95AC /* 001DC 808B95AC AFA40000 */ sw $a0, 0x0000($sp) /* 001E0 808B95B0 03E00008 */ jr $ra /* 001E4 808B95B4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95B8.s index 55deac1da7..2d21d16c20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B95B8.s @@ -26,5 +26,3 @@ glabel func_808B95B8 /* 0023C 808B960C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00240 808B9610 03E00008 */ jr $ra /* 00244 808B9614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s index c3726395b6..1a694f314f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s @@ -34,5 +34,3 @@ glabel func_808B9618 /* 002BC 808B968C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002C0 808B9690 03E00008 */ jr $ra /* 002C4 808B9694 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9698.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9698.s index 62131ca99e..4596db2bb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9698.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9698.s @@ -36,5 +36,3 @@ glabel func_808B9698 /* 00340 808B9710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00344 808B9714 03E00008 */ jr $ra /* 00348 808B9718 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B971C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B971C.s index 51db875d23..076597848f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B971C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B971C.s @@ -61,5 +61,3 @@ glabel func_808B971C /* 0041C 808B97EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00420 808B97F0 03E00008 */ jr $ra /* 00424 808B97F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s index a88ac182bb..3a0848939e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s @@ -12,5 +12,3 @@ glabel BgSstFloor_Destroy /* 0008C 808B999C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00090 808B99A0 03E00008 */ jr $ra /* 00094 808B99A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s index f3474a5d1a..961bf0fda8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808B9E40 + .asciz "../z_bg_sst_floor.c" + .balign 4 + +glabel D_808B9E54 + .asciz "../z_bg_sst_floor.c" + .balign 4 + +glabel D_808B9E68 + .asciz "../z_bg_sst_floor.c" + .balign 4 + +.late_rodata +glabel D_808B9E88 + .word 0xBB23D70A, 0x00000000 + +.text glabel BgSstFloor_Draw /* 00404 808B9D14 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00408 808B9D18 AFBF001C */ sw $ra, 0x001C($sp) @@ -62,4 +80,3 @@ glabel BgSstFloor_Draw /* 004F4 808B9E04 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 004F8 808B9E08 03E00008 */ jr $ra /* 004FC 808B9E0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s index 576089438f..3fd86e6088 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s @@ -29,5 +29,3 @@ glabel BgSstFloor_Init /* 0005C 808B996C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00060 808B9970 03E00008 */ jr $ra /* 00064 808B9974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s index add39963d3..66ed618501 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808B9E7C + .word 0x3B3B3EE7 +glabel D_808B9E80 + .word 0x3B3B3EE7 +glabel D_808B9E84 + .float 1.57079637051 + +.text glabel BgSstFloor_Update /* 00098 808B99A8 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 /* 0009C 808B99AC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 @@ -235,5 +244,3 @@ glabel BgSstFloor_Update /* 003F8 808B9D08 8FB20020 */ lw $s2, 0x0020($sp) /* 003FC 808B9D0C 03E00008 */ jr $ra /* 00400 808B9D10 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Destroy.s index b977ab3284..c7f30992a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Destroy.s @@ -2,5 +2,3 @@ glabel BgTokiHikari_Destroy /* 0008C 808B9F8C AFA40000 */ sw $a0, 0x0000($sp) /* 00090 808B9F90 03E00008 */ jr $ra /* 00094 808B9F94 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Draw.s index 56c32c8be8..9cbc9420d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Draw.s @@ -22,5 +22,3 @@ glabel BgTokiHikari_Draw /* 0010C 808BA00C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00110 808BA010 03E00008 */ jr $ra /* 00114 808BA014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s index 83c7cbcc6a..ed778cde63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s @@ -41,5 +41,3 @@ glabel BgTokiHikari_Init /* 00080 808B9F80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00084 808B9F84 03E00008 */ jr $ra /* 00088 808B9F88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Update.s index d99306d58a..b63ceeb49e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Update.s @@ -8,5 +8,3 @@ glabel BgTokiHikari_Update /* 000BC 808B9FBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000C0 808B9FC0 03E00008 */ jr $ra /* 000C4 808B9FC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808B9F98.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808B9F98.s index 01e8bb12f7..5d2aacf8e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808B9F98.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808B9F98.s @@ -2,5 +2,3 @@ glabel func_808B9F98 /* 00098 808B9F98 AFA40000 */ sw $a0, 0x0000($sp) /* 0009C 808B9F9C 03E00008 */ jr $ra /* 000A0 808B9FA0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s index 9a950d092d..a074cf517b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808BAC80 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BAC98 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BACB0 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BACC8 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +.text glabel func_808BA018 /* 00118 808BA018 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 0011C 808BA01C AFB10020 */ sw $s1, 0x0020($sp) @@ -124,5 +142,3 @@ glabel func_808BA018 /* 002F8 808BA1F8 8FB10020 */ lw $s1, 0x0020($sp) /* 002FC 808BA1FC 03E00008 */ jr $ra /* 00300 808BA200 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA204.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA204.s index d07dba3331..3c25362c80 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA204.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA204.s @@ -10,5 +10,3 @@ glabel func_808BA204 .L808BA224: /* 00324 808BA224 03E00008 */ jr $ra /* 00328 808BA228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA22C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA22C.s index f2b13ef058..e017590674 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA22C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA22C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808BAD58 + .float 0.05 + +.text glabel func_808BA22C /* 0032C 808BA22C AFA50004 */ sw $a1, 0x0004($sp) /* 00330 808BA230 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -19,5 +24,3 @@ glabel func_808BA22C /* 00368 808BA268 AC8E0150 */ sw $t6, 0x0150($a0) ## 00000150 /* 0036C 808BA26C 03E00008 */ jr $ra /* 00370 808BA270 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA274.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA274.s index af26444cdc..57e3164d35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA274.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA274.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808BAD5C + .float 0.2 + +glabel D_808BAD60 + .float 0.025 + +.text glabel func_808BA274 /* 00374 808BA274 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00378 808BA278 AFBF0014 */ sw $ra, 0x0014($sp) @@ -24,5 +32,3 @@ glabel func_808BA274 /* 003C0 808BA2C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003C4 808BA2C4 03E00008 */ jr $ra /* 003C8 808BA2C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s index 5d2859446b..77bed719e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s @@ -1,3 +1,31 @@ +.rdata +glabel D_808BACE0 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BACF8 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BAD10 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BAD28 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +glabel D_808BAD40 + .asciz "../z_bg_toki_hikari.c" + .balign 4 + +.late_rodata +glabel D_808BAD64 + .float 0.32 +glabel D_808BAD68 + .float 3.1415927 + +.text glabel func_808BA2CC /* 003CC 808BA2CC 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 003D0 808BA2D0 AFBF003C */ sw $ra, 0x003C($sp) @@ -638,4 +666,3 @@ glabel func_808BA2CC /* 00D44 808BAC44 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 00D48 808BAC48 03E00008 */ jr $ra /* 00D4C 808BAC4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Destroy.s index 7d8f23f259..7197055e44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Destroy.s @@ -12,5 +12,3 @@ glabel BgTreemouth_Destroy /* 00150 808BC650 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00154 808BC654 03E00008 */ jr $ra /* 00158 808BC658 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s index 7b625f3ecb..9933edda53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808BD9E0 + .asciz "../z_bg_treemouth.c" + .balign 4 + +glabel D_808BD9F4 + .asciz "../z_bg_treemouth.c" + .balign 4 + +glabel D_808BDA08 + .asciz "../z_bg_treemouth.c" + .balign 4 + +.late_rodata +glabel D_808BDA54 + .float 0.1 + +.text glabel BgTreemouth_Draw /* 0071C 808BCC1C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00720 808BCC20 AFBF0014 */ sw $ra, 0x0014($sp) @@ -135,4 +153,3 @@ glabel BgTreemouth_Draw /* 00914 808BCE14 03E00008 */ jr $ra /* 00918 808BCE18 00000000 */ nop /* 0091C 808BCE1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s index 1ac4b9b360..ae28ff4db2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s @@ -82,5 +82,3 @@ glabel BgTreemouth_Init /* 00120 808BC620 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00124 808BC624 03E00008 */ jr $ra /* 00128 808BC628 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Update.s index d3d6d22a7c..eb6f26c96b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Update.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808BDA48 + .float 4029.0 +glabel D_808BDA4C + .float -399.0 +glabel D_808BDA50 + .float -1255.0 + +.text glabel BgTreemouth_Update /* 00698 808BCB98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0069C 808BCB9C AFBF0014 */ sw $ra, 0x0014($sp) @@ -32,5 +41,3 @@ glabel BgTreemouth_Update /* 00710 808BCC10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00714 808BCC14 03E00008 */ jr $ra /* 00718 808BCC18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC500.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC500.s index 5cc7958bfa..cc1473069a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC500.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC500.s @@ -1,5 +1,3 @@ glabel func_808BC500 /* 00000 808BC500 03E00008 */ jr $ra /* 00004 808BC504 AC85016C */ sw $a1, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s index 7d6b6e7288..7f61e42289 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s @@ -42,5 +42,3 @@ glabel func_808BC65C /* 001EC 808BC6EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001F0 808BC6F0 03E00008 */ jr $ra /* 001F4 808BC6F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s index 54f38a5aa3..c13f4796a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_808BDA1C + .float 0.01 + +glabel D_808BDA20 + .float 1158.0 +glabel D_808BDA24 + .float 3407.0 +glabel D_808BDA28 + .float 970.0 +glabel D_808BDA2C + .float 2026.0 +glabel D_808BDA30 + .float -2163.0 + +.text glabel func_808BC6F8 /* 001F8 808BC6F8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 001FC 808BC6FC AFBF002C */ sw $ra, 0x002C($sp) @@ -72,5 +88,3 @@ glabel func_808BC6F8 /* 00300 808BC800 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00304 808BC804 03E00008 */ jr $ra /* 00308 808BC808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC80C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC80C.s index 0151f60c4d..20cc7f9efd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC80C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC80C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808BDA34 + .float 0.05 + +glabel D_808BDA38 + .float 0.8 + +.text glabel func_808BC80C /* 0030C 808BC80C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00310 808BC810 AFBF0014 */ sw $ra, 0x0014($sp) @@ -22,5 +30,3 @@ glabel func_808BC80C /* 00358 808BC858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0035C 808BC85C 03E00008 */ jr $ra /* 00360 808BC860 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC864.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC864.s index fda6c270d2..76d073e277 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC864.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC864.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808BDA3C + .float 0.03 + +.text glabel func_808BC864 /* 00364 808BC864 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00368 808BC868 AFBF0014 */ sw $ra, 0x0014($sp) @@ -21,5 +26,3 @@ glabel func_808BC864 /* 003AC 808BC8AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B0 808BC8B0 03E00008 */ jr $ra /* 003B4 808BC8B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s index c1f6ea6587..1dcb8fd5de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s @@ -84,5 +84,3 @@ glabel func_808BC8B8 /* 004E0 808BC9E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004E4 808BC9E4 03E00008 */ jr $ra /* 004E8 808BC9E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s index cdaf15dba8..27f6f27f20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808BDA40 + .float 3827.0 +glabel D_808BDA44 + .float -1142.0 + +.text glabel func_808BC9EC /* 004EC 808BC9EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 004F0 808BC9F0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -69,5 +76,3 @@ glabel func_808BC9EC /* 005E4 808BCAE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005E8 808BCAE8 03E00008 */ jr $ra /* 005EC 808BCAEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s index 3ebbaedde7..d9896828c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s @@ -42,5 +42,3 @@ glabel func_808BCAF0 /* 00680 808BCB80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00684 808BCB84 03E00008 */ jr $ra /* 00688 808BCB88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCB8C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCB8C.s index 0805ddf285..f234c109f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCB8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCB8C.s @@ -2,5 +2,3 @@ glabel func_808BCB8C /* 0068C 808BCB8C AFA40000 */ sw $a0, 0x0000($sp) /* 00690 808BCB90 03E00008 */ jr $ra /* 00694 808BCB94 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Destroy.s index df85f80c20..5467781421 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Destroy.s @@ -12,5 +12,3 @@ glabel BgVbSima_Destroy /* 0008C 808BDDEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00090 808BDDF0 03E00008 */ jr $ra /* 00094 808BDDF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s index a6c0cfb3c7..5b38c55731 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808BE420 + .asciz "../z_bg_vb_sima.c" + .balign 4 + +glabel D_808BE434 + .asciz "../z_bg_vb_sima.c" + .balign 4 + +glabel D_808BE448 + .asciz "../z_bg_vb_sima.c" + .balign 4 + +.text glabel BgVbSima_Draw /* 005C4 808BE324 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 005C8 808BE328 AFBF001C */ sw $ra, 0x001C($sp) @@ -50,4 +64,3 @@ glabel BgVbSima_Draw /* 00684 808BE3E4 03E00008 */ jr $ra /* 00688 808BE3E8 00000000 */ nop /* 0068C 808BE3EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Init.s index f6e4bd3d3d..e844db25fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Init.s @@ -29,5 +29,3 @@ glabel BgVbSima_Init /* 0005C 808BDDBC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00060 808BDDC0 03E00008 */ jr $ra /* 00064 808BDDC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s index d76917e88c..ab09eaf0fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_808BE45C + .float 0.4 + +glabel D_808BE460 + .word 0x3EA8F5C3 +glabel D_808BE464 + .float 0.05 + +glabel D_808BE468 + .float 0.05 + +glabel D_808BE46C + .word 0xBE99999A + +.text glabel BgVbSima_Update /* 00164 808BDEC4 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 00168 808BDEC8 AFBF007C */ sw $ra, 0x007C($sp) @@ -308,5 +324,3 @@ glabel BgVbSima_Update /* 005B8 808BE318 8FB70078 */ lw $s7, 0x0078($sp) /* 005BC 808BE31C 03E00008 */ jr $ra /* 005C0 808BE320 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s index b3c4f0363f..d446921a71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s @@ -54,5 +54,3 @@ glabel func_808BDDF8 /* 00158 808BDEB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0015C 808BDEBC 03E00008 */ jr $ra /* 00160 808BDEC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Destroy.s index 2409dfd2bf..d7de94da73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Destroy.s @@ -12,5 +12,3 @@ glabel BgYdanHasi_Destroy /* 00184 808BE684 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00188 808BE688 03E00008 */ jr $ra /* 0018C 808BE68C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s index 88bd3fa285..137b78d90a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808BEC30 + .asciz "../z_bg_ydan_hasi.c" + .balign 4 + +glabel D_808BEC44 + .asciz "../z_bg_ydan_hasi.c" + .balign 4 + +glabel D_808BEC58 + .asciz "../z_bg_ydan_hasi.c" + .balign 4 + +.text glabel BgYdanHasi_Draw /* 00590 808BEA90 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00594 808BEA94 AFBF003C */ sw $ra, 0x003C($sp) @@ -95,4 +109,3 @@ glabel BgYdanHasi_Draw /* 006F4 808BEBF4 00000000 */ nop /* 006F8 808BEBF8 00000000 */ nop /* 006FC 808BEBFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Init.s index 756b4251fb..07b17e3ec0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808BEC6C + .float 0.15 + +.text glabel BgYdanHasi_Init /* 00000 808BE500 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 808BE504 AFA5003C */ sw $a1, 0x003C($sp) @@ -97,5 +102,3 @@ glabel BgYdanHasi_Init /* 00154 808BE654 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00158 808BE658 03E00008 */ jr $ra /* 0015C 808BE65C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Update.s index 92fbd2b8ff..6b54e61baa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Update.s @@ -8,5 +8,3 @@ glabel BgYdanHasi_Update /* 00584 808BEA84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00588 808BEA88 03E00008 */ jr $ra /* 0058C 808BEA8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE690.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE690.s index 400054522f..2903561813 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE690.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE690.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808BEC70 + .word 0x3CC90FDB +glabel D_808BEC74 + .word 0x3E00ADFD, 0x00000000, 0x00000000 + +.text glabel func_808BE690 /* 00190 808BE690 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00194 808BE694 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -84,5 +91,3 @@ glabel func_808BE690 /* 002BC 808BE7BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002C0 808BE7C0 03E00008 */ jr $ra /* 002C4 808BE7C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE7C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE7C8.s index 1933abb9c9..b41705c612 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE7C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE7C8.s @@ -19,5 +19,3 @@ glabel func_808BE7C8 /* 00304 808BE804 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00308 808BE808 03E00008 */ jr $ra /* 0030C 808BE80C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE810.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE810.s index fd3fe99bc0..bc0eb83475 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE810.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE810.s @@ -57,5 +57,3 @@ glabel func_808BE810 /* 003D0 808BE8D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003D4 808BE8D4 03E00008 */ jr $ra /* 003D8 808BE8D8 24420010 */ addiu $v0, $v0, 0x0010 ## $v0 = 00000010 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE8DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE8DC.s index cd8a26bbbe..eb0e683301 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE8DC.s @@ -22,5 +22,3 @@ glabel func_808BE8DC /* 00424 808BE924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00428 808BE928 03E00008 */ jr $ra /* 0042C 808BE92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE930.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE930.s index 31a31be8fa..1980fa44e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE930.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE930.s @@ -28,5 +28,3 @@ glabel func_808BE930 /* 00490 808BE990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00494 808BE994 03E00008 */ jr $ra /* 00498 808BE998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE99C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE99C.s index a7e0d77c13..0f15a52e82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE99C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/func_808BE99C.s @@ -60,5 +60,3 @@ glabel func_808BE99C /* 00560 808BEA60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00564 808BEA64 03E00008 */ jr $ra /* 00568 808BEA68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s index 4b6d5048c1..30bb88ce46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s @@ -22,5 +22,3 @@ glabel BgYdanMaruta_Destroy /* 002A8 808BEFE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002AC 808BEFEC 03E00008 */ jr $ra /* 002B0 808BEFF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s index dc96899f1c..589ddd31be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s @@ -24,4 +24,3 @@ glabel BgYdanMaruta_Draw /* 00594 808BF2D4 03E00008 */ jr $ra /* 00598 808BF2D8 00000000 */ nop /* 0059C 808BF2DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s index 078b82311c..d58bb51b46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s @@ -163,5 +163,3 @@ glabel BgYdanMaruta_Init /* 00254 808BEF94 8FB10020 */ lw $s1, 0x0020($sp) /* 00258 808BEF98 03E00008 */ jr $ra /* 0025C 808BEF9C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Update.s index 78fd90ab01..6e2b4ef5b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Update.s @@ -8,5 +8,3 @@ glabel BgYdanMaruta_Update /* 00540 808BF280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00544 808BF284 03E00008 */ jr $ra /* 00548 808BF288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s index 9d7b6387ee..720e99d4af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s @@ -34,5 +34,3 @@ glabel func_808BEFF4 /* 0032C 808BF06C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00330 808BF070 03E00008 */ jr $ra /* 00334 808BF074 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s index 627846af84..5a3fe5d8a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s @@ -39,5 +39,3 @@ glabel func_808BF078 /* 003BC 808BF0FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003C0 808BF100 03E00008 */ jr $ra /* 003C4 808BF104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF108.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF108.s index 650bc45af1..8688866c8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF108.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF108.s @@ -63,5 +63,3 @@ glabel func_808BF108 /* 004A0 808BF1E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004A4 808BF1E4 03E00008 */ jr $ra /* 004A8 808BF1E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF1EC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF1EC.s index 59ca263836..9f14e6ac69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF1EC.s @@ -30,5 +30,3 @@ glabel func_808BF1EC /* 00510 808BF250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00514 808BF254 03E00008 */ jr $ra /* 00518 808BF258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF25C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF25C.s index 72471bf6d7..b907c7b3cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF25C.s @@ -2,5 +2,3 @@ glabel func_808BF25C /* 0051C 808BF25C AFA40000 */ sw $a0, 0x0000($sp) /* 00520 808BF260 03E00008 */ jr $ra /* 00524 808BF264 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s index a2c13cd568..d264055c02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s @@ -18,5 +18,3 @@ glabel BgYdanSp_Destroy /* 00420 808BF830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00424 808BF834 03E00008 */ jr $ra /* 00428 808BF838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s index 4e4f47c40b..7b6ab8e569 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s @@ -1,3 +1,36 @@ +.rdata +glabel D_808C09F0 + .asciz "../z_bg_ydan_sp.c" + .balign 4 + +glabel D_808C0A04 + .asciz "../z_bg_ydan_sp.c" + .balign 4 + +glabel D_808C0A18 + .asciz "../z_bg_ydan_sp.c" + .balign 4 + +glabel D_808C0A2C + .asciz "../z_bg_ydan_sp.c" + .balign 4 + +glabel D_808C0A40 + .asciz "../z_bg_ydan_sp.c" + .balign 4 + +glabel D_808C0A54 + .asciz "../z_bg_ydan_sp.c" + .balign 4 + +.late_rodata +glabel D_808C0A90 + .float 0.1 + +glabel D_808C0A94 + .float 0.1 + +.text glabel BgYdanSp_Draw /* 011B8 808C05C8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 011BC 808C05CC AFB40030 */ sw $s4, 0x0030($sp) @@ -214,4 +247,3 @@ glabel BgYdanSp_Draw /* 014F4 808C0904 8FB40030 */ lw $s4, 0x0030($sp) /* 014F8 808C0908 03E00008 */ jr $ra /* 014FC 808C090C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s index 099288addf..745ce0410a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s @@ -267,5 +267,3 @@ glabel BgYdanSp_Init /* 003D8 808BF7E8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 003DC 808BF7EC 03E00008 */ jr $ra /* 003E0 808BF7F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s index 7ef6297a29..8c6fb49d89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s @@ -8,5 +8,3 @@ glabel BgYdanSp_Update /* 011AC 808C05BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011B0 808C05C0 03E00008 */ jr $ra /* 011B4 808C05C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s index 3c37128f37..710b2c92aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s @@ -51,5 +51,3 @@ glabel func_808BF83C /* 004F0 808BF900 8C4D0010 */ lw $t5, 0x0010($v0) ## 00000010 /* 004F4 808BF904 03E00008 */ jr $ra /* 004F8 808BF908 A5A60002 */ sh $a2, 0x0002($t5) ## 00000002 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s index 62a05fd6b4..8305f0bc6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s @@ -29,5 +29,3 @@ glabel func_808BF90C /* 00560 808BF970 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00564 808BF974 03E00008 */ jr $ra /* 00568 808BF978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s index 56bef12c6f..383f4a10de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808C0A68 + .word 0x462AA800 +glabel D_808C0A6C + .word 0x3C088889 +glabel D_808C0A70 + .float 0.7 + +.text glabel func_808BF97C /* 0056C 808BF97C 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 00570 808BF980 AFBF009C */ sw $ra, 0x009C($sp) @@ -194,5 +203,3 @@ glabel func_808BF97C /* 00834 808BFC44 8FBE0098 */ lw $s8, 0x0098($sp) /* 00838 808BFC48 03E00008 */ jr $ra /* 0083C 808BFC4C 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s index 120470de8c..bf3cb86dd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s @@ -18,5 +18,3 @@ glabel func_808BFC50 /* 00874 808BFC84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00878 808BFC88 03E00008 */ jr $ra /* 0087C 808BFC8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s index 329c5c704c..251b115923 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808C0A74 + .word 0x3E20D97C + +.text glabel func_808BFC90 /* 00880 808BFC90 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00884 808BFC94 AFBF0054 */ sw $ra, 0x0054($sp) @@ -118,5 +123,3 @@ glabel func_808BFC90 /* 00A34 808BFE44 8FBE0050 */ lw $s8, 0x0050($sp) /* 00A38 808BFE48 03E00008 */ jr $ra /* 00A3C 808BFE4C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s index e8a59e7979..1ead3df5e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_808C0A78 + .word 0x443B8000 +glabel D_808C0A7C + .float 0.1 + +glabel D_808C0A80 + .word 0x3EE5C8FA + +.text glabel func_808BFE50 /* 00A40 808BFE50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00A44 808BFE54 AFBF001C */ sw $ra, 0x001C($sp) @@ -201,5 +211,3 @@ glabel func_808BFE50 /* 00D10 808C0120 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00D14 808C0124 03E00008 */ jr $ra /* 00D18 808C0128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s index c37465fb60..83d8bc94d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808C0A84 + .word 0x462AA800 +glabel D_808C0A88 + .word 0x3BEA0EA1 +glabel D_808C0A8C + .word 0x3F266666 + +.text glabel func_808C012C /* 00D1C 808C012C 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 00D20 808C0130 AFBF009C */ sw $ra, 0x009C($sp) @@ -223,5 +232,3 @@ glabel func_808C012C /* 01048 808C0458 8FBE0098 */ lw $s8, 0x0098($sp) /* 0104C 808C045C 03E00008 */ jr $ra /* 01050 808C0460 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s index 04aabdaf6d..edf1cea2cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s @@ -86,5 +86,3 @@ glabel func_808C0464 /* 01188 808C0598 8FB10020 */ lw $s1, 0x0020($sp) /* 0118C 808C059C 03E00008 */ jr $ra /* 01190 808C05A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s index 78b6e51015..249aa866a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s @@ -13,5 +13,3 @@ glabel BossDodongo_Destroy /* 00AE4 808C1C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AE8 808C1C78 03E00008 */ jr $ra /* 00AEC 808C1C7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s index 98846d3935..fc43c2442a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808CA5DC + .asciz "../z_boss_dodongo.c" + .balign 4 + +glabel D_808CA5F0 + .asciz "../z_boss_dodongo.c" + .balign 4 + +.late_rodata +glabel D_808CA740 + .word 0x40490FD0 + +.text glabel BossDodongo_Draw /* 03AE0 808C4C70 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 03AE4 808C4C74 AFB20030 */ sw $s2, 0x0030($sp) @@ -202,5 +216,3 @@ glabel BossDodongo_Draw /* 03DD0 808C4F60 8FB20030 */ lw $s2, 0x0030($sp) /* 03DD4 808C4F64 03E00008 */ jr $ra /* 03DD8 808C4F68 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index a5a09b4938..0b1f49f92a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -1,3 +1,24 @@ +.late_rodata +glabel D_808CA644 + .word 0x4478C000 +glabel D_808CA648 + .word 0x460FC000 +glabel D_808CA64C + .word 0xC45E8000 +glabel D_808CA650 + .word 0xC4BE7852 +glabel D_808CA654 + .word 0xC54E8000 +glabel D_808CA658 + .word 0xC4BE7852 +glabel D_808CA65C + .word 0xC54E8000 +glabel D_808CA660 + .word 0xC4BE7852 +glabel D_808CA664 + .word 0xC54E8000 + +.text glabel BossDodongo_Init /* 007E0 808C1970 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 007E4 808C1974 AFB30040 */ sw $s3, 0x0040($sp) @@ -192,5 +213,3 @@ glabel BossDodongo_Init /* 00AAC 808C1C3C 8FB00034 */ lw $s0, 0x0034($sp) /* 00AB0 808C1C40 03E00008 */ jr $ra /* 00AB4 808C1C44 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s index f963b8455a..f6c958ad7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s @@ -1,3 +1,57 @@ +.late_rodata +glabel D_808CA6D8 + .float 0.1 + +glabel D_808CA6DC + .float 1.9 + +glabel D_808CA6E0 + .float 1.7 + +glabel D_808CA6E4 + .float 1.4 + +glabel D_808CA6E8 + .float 1.9 + +glabel D_808CA6EC + .float 1.1 + +glabel D_808CA6F0 + .float 1.9 + +glabel D_808CA6F4 + .float 6.28 + +glabel D_808CA6F8 + .word 0xC45E8000 +glabel D_808CA6FC + .word 0xC4BE7852 +glabel D_808CA700 + .word 0xC54E8000 +glabel D_808CA704 + .float 6.28 + +glabel D_808CA708 + .word 0xC45E8000 +glabel D_808CA70C + .word 0xC4BE7852 +glabel D_808CA710 + .word 0xC54E8000 +glabel D_808CA714 + .float 0.4 + +glabel D_808CA718 + .float 6.28 + +glabel D_808CA71C + .word 0xC45E8000 +glabel D_808CA720 + .word 0xC4BD3852 +glabel D_808CA724 + .word 0xC54E8000 + +.text glabel BossDodongo_Update /* 02970 808C3B00 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 02974 808C3B04 AFBF002C */ sw $ra, 0x002C($sp) @@ -1014,5 +1068,3 @@ glabel BossDodongo_Update /* 037A4 808C4934 8FB10028 */ lw $s1, 0x0028($sp) /* 037A8 808C4938 03E00008 */ jr $ra /* 037AC 808C493C 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1190.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1190.s index 20d0b2137f..e8c2578b1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1190.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1190.s @@ -17,5 +17,3 @@ glabel func_808C1190 .L808C11C8: /* 00038 808C11C8 03E00008 */ jr $ra /* 0003C 808C11CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C11D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C11D0.s index cfbc1490b9..2720b79bd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C11D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C11D0.s @@ -12,5 +12,3 @@ glabel func_808C11D0 .L808C11F8: /* 00068 808C11F8 03E00008 */ jr $ra /* 0006C 808C11FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1200.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1200.s index b8766565c5..0b27a64db8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1200.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1200.s @@ -12,5 +12,3 @@ glabel func_808C1200 .L808C1228: /* 00098 808C1228 03E00008 */ jr $ra /* 0009C 808C122C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1230.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1230.s index 40e85eb563..a26f310aef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1230.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1230.s @@ -18,5 +18,3 @@ glabel func_808C1230 .L808C1270: /* 000E0 808C1270 03E00008 */ jr $ra /* 000E4 808C1274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1278.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1278.s index b32b903c5a..5aaaf28c41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1278.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1278.s @@ -19,5 +19,3 @@ glabel func_808C1278 .L808C12BC: /* 0012C 808C12BC 03E00008 */ jr $ra /* 00130 808C12C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s index 132a6196ce..51172c2bd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s @@ -163,5 +163,3 @@ glabel func_808C12C4 /* 003B8 808C1548 8FB40028 */ lw $s4, 0x0028($sp) /* 003BC 808C154C 03E00008 */ jr $ra /* 003C0 808C1550 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s index 565e5755c7..87f8554d6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808CA640 + .word 0x3E490FDB + +.text glabel func_808C1554 /* 003C4 808C1554 44862000 */ mtc1 $a2, $f4 ## $f4 = 0.00 /* 003C8 808C1558 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -163,5 +168,3 @@ glabel func_808C1554 /* 0062C 808C17BC 8FB30030 */ lw $s3, 0x0030($sp) /* 00630 808C17C0 03E00008 */ jr $ra /* 00634 808C17C4 27BD1060 */ addiu $sp, $sp, 0x1060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s index bee35a2a66..5da5cf98b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s @@ -61,5 +61,3 @@ glabel func_808C17C8 /* 00714 808C18A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00718 808C18A8 03E00008 */ jr $ra /* 0071C 808C18AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C18B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C18B0.s index 852e9fb3e9..e2dc3d4f6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C18B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C18B0.s @@ -52,5 +52,3 @@ glabel func_808C18B0 /* 007D4 808C1964 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007D8 808C1968 03E00008 */ jr $ra /* 007DC 808C196C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s index 712afc71f8..2f8078de1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s @@ -33,5 +33,3 @@ glabel func_808C1C80 /* 00B64 808C1CF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B68 808C1CF8 03E00008 */ jr $ra /* 00B6C 808C1CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s index cb992811e9..207c63ad0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s @@ -1,3 +1,43 @@ +.late_rodata +glabel jtbl_808CA668 +.word L808C1D84 +.word L808C1DCC +.word L808C1E60 +.word L808C2190 +.word L808C23A8 +glabel D_808CA67C + .word 0xC498F852 +glabel D_808CA680 + .word 0xC4ADC000 +glabel D_808CA684 + .word 0xC552E000 +glabel D_808CA688 + .word 0xC47FF0A4 +glabel D_808CA68C + .word 0xC45E8000 +glabel D_808CA690 + .word 0xC52F4000 +glabel D_808CA694 + .word 0xC48B4000 +glabel D_808CA698 + .word 0xC52F4000 +glabel D_808CA69C + .float 0.05 + +glabel D_808CA6A0 + .float 0.1 + +glabel D_808CA6A4 + .word 0x40490E56 +glabel D_808CA6A8 + .float 0.7 + +glabel D_808CA6AC + .word 0x40490E56 +glabel D_808CA6B0 + .float 0.7 + +.text glabel func_808C1D00 /* 00B70 808C1D00 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00B74 808C1D04 AFB00028 */ sw $s0, 0x0028($sp) @@ -794,5 +834,3 @@ glabel L808C23A8 /* 016E0 808C2870 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 016E4 808C2874 03E00008 */ jr $ra /* 016E8 808C2878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s index ef25f5d3b7..56c49f2f36 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s @@ -38,5 +38,3 @@ glabel func_808C287C /* 01770 808C2900 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01774 808C2904 03E00008 */ jr $ra /* 01778 808C2908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s index 0cca9f5d2f..fcc85e7ba5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s @@ -42,5 +42,3 @@ glabel func_808C290C /* 01814 808C29A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01818 808C29A8 03E00008 */ jr $ra /* 0181C 808C29AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s index 5c4d339d1f..388e2ef1a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s @@ -37,5 +37,3 @@ glabel func_808C29B0 /* 018A4 808C2A34 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 018A8 808C2A38 03E00008 */ jr $ra /* 018AC 808C2A3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s index 64cf04f03c..770c2d13b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s @@ -28,5 +28,3 @@ glabel func_808C2A40 /* 01914 808C2AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01918 808C2AA8 03E00008 */ jr $ra /* 0191C 808C2AAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s index 00e204dc82..7cedab9ee2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s @@ -35,5 +35,3 @@ glabel func_808C2AB0 /* 0199C 808C2B2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 019A0 808C2B30 03E00008 */ jr $ra /* 019A4 808C2B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s index 282607b9f8..09a8b7c2ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s @@ -37,5 +37,3 @@ glabel func_808C2B38 /* 01A2C 808C2BBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01A30 808C2BC0 03E00008 */ jr $ra /* 01A34 808C2BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s index 0a8056f601..67c7c3dea8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808CA6B4 + .float 0.001 + +.text glabel func_808C2BC8 /* 01A38 808C2BC8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01A3C 808C2BCC AFA40028 */ sw $a0, 0x0028($sp) @@ -48,5 +53,3 @@ glabel func_808C2BC8 /* 01ADC 808C2C6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01AE0 808C2C70 03E00008 */ jr $ra /* 01AE4 808C2C74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s index 567cc1c159..9faed03dea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808CA6B8 + .word 0xBDCCCCCD + +.text glabel func_808C2C78 /* 01AE8 808C2C78 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01AEC 808C2C7C AFB70068 */ sw $s7, 0x0068($sp) @@ -160,5 +165,3 @@ glabel func_808C2C78 /* 01D30 808C2EC0 8FB70068 */ lw $s7, 0x0068($sp) /* 01D34 808C2EC4 03E00008 */ jr $ra /* 01D38 808C2EC8 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s index acbbe41a8c..b10dbb821d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808CA6BC + .float 0.001 + +.text glabel func_808C2ECC /* 01D3C 808C2ECC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01D40 808C2ED0 AFBF002C */ sw $ra, 0x002C($sp) @@ -61,5 +66,3 @@ glabel func_808C2ECC /* 01E10 808C2FA0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01E14 808C2FA4 03E00008 */ jr $ra /* 01E18 808C2FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s index 394253bcd4..71e3646e6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808CA6C0 + .float 0.001 + +.text glabel func_808C2FAC /* 01E1C 808C2FAC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01E20 808C2FB0 AFBF002C */ sw $ra, 0x002C($sp) @@ -64,5 +69,3 @@ glabel func_808C2FAC /* 01EF8 808C3088 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01EFC 808C308C 03E00008 */ jr $ra /* 01F00 808C3090 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s index 69d5afd90a..0758a9ed07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s @@ -26,5 +26,3 @@ glabel func_808C3094 /* 01F58 808C30E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F5C 808C30EC 03E00008 */ jr $ra /* 01F60 808C30F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s index 55c24a21dc..ce13af26c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s @@ -82,5 +82,3 @@ glabel func_808C30F4 /* 02088 808C3218 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0208C 808C321C 03E00008 */ jr $ra /* 02090 808C3220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s index 6531d7174a..7948315434 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s @@ -59,5 +59,3 @@ glabel func_808C3224 /* 02158 808C32E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0215C 808C32EC 03E00008 */ jr $ra /* 02160 808C32F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s index 5be1d58ff5..7c7736a382 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808CA6C4 + .float 0.7 + +glabel D_808CA6C8 + .word 0x4622F983 + +.text glabel func_808C32F4 /* 02164 808C32F4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02168 808C32F8 AFBF0034 */ sw $ra, 0x0034($sp) @@ -280,5 +288,3 @@ glabel func_808C32F4 /* 02568 808C36F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0256C 808C36FC 03E00008 */ jr $ra /* 02570 808C3700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s index d9980754cd..1babe357bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_808CA6CC + .word 0x45F0A000 +glabel D_808CA6D0 + .word 0x4622F983 +glabel D_808CA6D4 + .word 0x460FC000 + +.text glabel func_808C3704 /* 02574 808C3704 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 02578 808C3708 AFBF0034 */ sw $ra, 0x0034($sp) @@ -275,5 +284,3 @@ glabel func_808C3704 /* 02964 808C3AF4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 02968 808C3AF8 03E00008 */ jr $ra /* 0296C 808C3AFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s index bee79f236f..5cdf590f79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s @@ -1,3 +1,33 @@ +.rdata +glabel D_808CA5A0 + .asciz "../z_boss_dodongo.c" + .balign 4 + +glabel D_808CA5B4 + .asciz "../z_boss_dodongo.c" + .balign 4 + +glabel D_808CA5C8 + .asciz "../z_boss_dodongo.c" + .balign 4 + +.late_rodata +glabel D_808CA728 + .word 0x3DEB851F +glabel D_808CA72C + .word 0x3E051EB8 +glabel D_808CA730 + .float 0.1 + +glabel D_808CA734 + .float 0.1 + +glabel D_808CA738 + .word 0x3E051EB8 +glabel D_808CA73C + .word 0x3DEB851F + +.text glabel func_808C4940 /* 037B0 808C4940 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 037B4 808C4944 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -152,5 +182,3 @@ glabel func_808C4940 /* 039F4 808C4B84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 039F8 808C4B88 03E00008 */ jr $ra /* 039FC 808C4B8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4B90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4B90.s index c21f8dbb82..b9e2ecfbae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4B90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4B90.s @@ -59,5 +59,3 @@ glabel func_808C4B90 /* 03AD4 808C4C64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03AD8 808C4C68 03E00008 */ jr $ra /* 03ADC 808C4C6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s index dfed9e5b43..c133f8790d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s @@ -84,5 +84,3 @@ glabel func_808C4F6C /* 03F0C 808C509C 8FB00018 */ lw $s0, 0x0018($sp) /* 03F10 808C50A0 03E00008 */ jr $ra /* 03F14 808C50A4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s index 9e4fac7bdb..bf59d94107 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s @@ -88,5 +88,3 @@ glabel func_808C50A8 /* 04058 808C51E8 8FB00018 */ lw $s0, 0x0018($sp) /* 0405C 808C51EC 03E00008 */ jr $ra /* 04060 808C51F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C51F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C51F4.s index f2e86c65ae..59fe13b8d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C51F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C51F4.s @@ -23,5 +23,3 @@ glabel func_808C51F4 /* 040B0 808C5240 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 040B4 808C5244 03E00008 */ jr $ra /* 040B8 808C5248 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C524C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C524C.s index 6eabe84fc4..fe8edd7532 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C524C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C524C.s @@ -38,5 +38,3 @@ glabel func_808C524C /* 04144 808C52D4 00000000 */ nop /* 04148 808C52D8 03E00008 */ jr $ra /* 0414C 808C52DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s index fe35deffe0..9cd0486286 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s @@ -29,5 +29,3 @@ glabel func_808C52E0 /* 041B8 808C5348 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 041BC 808C534C 03E00008 */ jr $ra /* 041C0 808C5350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5354.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5354.s index e874b64a83..5008b4e2f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5354.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5354.s @@ -99,5 +99,3 @@ glabel func_808C5354 /* 04324 808C54B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04328 808C54B8 03E00008 */ jr $ra /* 0432C 808C54BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s index 2fc9364996..974a853c18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s @@ -49,5 +49,3 @@ glabel func_808C54C0 /* 043DC 808C556C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 043E0 808C5570 03E00008 */ jr $ra /* 043E4 808C5574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index e889bf6a41..4d777726cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -1,3 +1,89 @@ +.late_rodata +glabel jtbl_808CA744 +.word L808C55E0 +.word L808C6C84 +.word L808C6C84 +.word L808C6C84 +.word L808C6C84 +.word L808C5670 +.word L808C5934 +.word L808C5A4C +.word L808C5FE4 +.word L808C5FE4 +glabel D_808CA76C + .float 0.1 + +glabel D_808CA770 + .float 0.1 + +glabel D_808CA774 + .float 0.1 + +glabel D_808CA778 + .float 0.1 + +glabel D_808CA77C + .float 0.1 + +glabel D_808CA780 + .float 0.1 + +glabel D_808CA784 + .word 0xC4BE7852 +glabel D_808CA788 + .word 0xC54E8000 +glabel D_808CA78C + .float 0.1 + +glabel D_808CA790 + .float 0.1 + +glabel D_808CA794 + .float 0.1 + +glabel D_808CA798 + .word 0x45F0A000 +glabel D_808CA79C + .float 0.1 + +glabel D_808CA7A0 + .float 0.1 + +glabel D_808CA7A4 + .float 9.58738019108e-05 + +glabel D_808CA7A8 + .word 0x4622F983 +glabel D_808CA7AC + .word 0xC4BB5852 +glabel D_808CA7B0 + .float 1.9 + +glabel D_808CA7B4 + .float 0.01 + +glabel D_808CA7B8 + .float 0.01 + +glabel D_808CA7BC + .float 0.1 + +glabel D_808CA7C0 + .float 0.1 + +glabel D_808CA7C4 + .float 0.1 + +glabel D_808CA7C8 + .word 0xC45E8000 +glabel D_808CA7CC + .word 0xC4BE7852 +glabel D_808CA7D0 + .word 0xC54E8000 +glabel D_808CA7D4 + .word 0xC4BB5852, 0x00000000, 0x00000000 + +.text glabel func_808C5578 /* 043E8 808C5578 27BDFE60 */ addiu $sp, $sp, 0xFE60 ## $sp = FFFFFE60 /* 043EC 808C557C AFB00038 */ sw $s0, 0x0038($sp) @@ -1631,5 +1717,3 @@ glabel L808C6C84 /* 05B18 808C6CA8 27BD01A0 */ addiu $sp, $sp, 0x01A0 ## $sp = 00000000 /* 05B1C 808C6CAC 03E00008 */ jr $ra /* 05B20 808C6CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6CB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6CB4.s index f67369c1f3..bb56ae02f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6CB4.s @@ -80,5 +80,3 @@ glabel func_808C6CB4 /* 05C4C 808C6DDC 24420030 */ addiu $v0, $v0, 0x0030 ## $v0 = 00010030 /* 05C50 808C6DE0 03E00008 */ jr $ra /* 05C54 808C6DE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s index 40b4ec6064..8e148676bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808CA604 + .asciz "../z_boss_dodongo.c" + .balign 4 + +glabel D_808CA618 + .asciz "../z_boss_dodongo.c" + .balign 4 + +glabel D_808CA62C + .asciz "../z_boss_dodongo.c" + .balign 4 + +.text glabel func_808C6DE8 /* 05C58 808C6DE8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 05C5C 808C6DEC AFB00020 */ sw $s0, 0x0020($sp) @@ -128,4 +142,3 @@ glabel func_808C6DE8 /* 05E44 808C6FD4 8FBE0040 */ lw $s8, 0x0040($sp) /* 05E48 808C6FD8 03E00008 */ jr $ra /* 05E4C 808C6FDC 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s index 8e78cb8f09..e0b073b790 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s @@ -21,5 +21,3 @@ glabel BossFd_Destroy /* 008B0 808CB670 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008B4 808CB674 03E00008 */ jr $ra /* 008B8 808CB678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s index 15607b0328..22372b9d8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_808D1D5C + .asciz "FD DRAW START\n" + .balign 4 + +glabel D_808D1D6C + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D7C + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D8C + .asciz "FD DRAW END\n" + .balign 4 + +glabel D_808D1D9C + .asciz "FD DRAW END2\n" + .balign 4 + +.text glabel BossFd_Draw /* 051DC 808CFF9C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 051E0 808CFFA0 AFA40050 */ sw $a0, 0x0050($sp) @@ -70,5 +92,3 @@ glabel BossFd_Draw /* 052D8 808D0098 8FB10028 */ lw $s1, 0x0028($sp) /* 052DC 808D009C 03E00008 */ jr $ra /* 052E0 808D00A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s index e35545c932..385ac5ac94 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s @@ -220,5 +220,3 @@ glabel BossFd_Init /* 00858 808CB618 8FB10038 */ lw $s1, 0x0038($sp) /* 0085C 808CB61C 03E00008 */ jr $ra /* 00860 808CB620 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s index 0391fd5c92..e6112561cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s @@ -1,3 +1,28 @@ +.rdata +glabel D_808D1CBC + .asciz "FD MOVE START \n" + .balign 4 + +glabel D_808D1CCC + .asciz "FD MOVE END 1\n" + .balign 4 + +glabel D_808D1CDC + .asciz "FD MOVE END 2\n" + .balign 4 + +.late_rodata +glabel D_808D1F88 + .float 0.4 + +glabel D_808D1F8C + .word 0x410E6666 +glabel D_808D1F90 + .word 0x41EF3333 +glabel D_808D1F94 + .float 0.4 + +.text glabel BossFd_Update /* 03F24 808CECE4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 03F28 808CECE8 AFB30054 */ sw $s3, 0x0054($sp) @@ -530,5 +555,3 @@ glabel BossFd_Update /* 0467C 808CF43C 8FB40058 */ lw $s4, 0x0058($sp) /* 04680 808CF440 03E00008 */ jr $ra /* 04684 808CF444 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s index d2a24c56de..e0c230174a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s @@ -54,5 +54,3 @@ glabel func_808CADC0 /* 000C0 808CAE80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000C4 808CAE84 03E00008 */ jr $ra /* 000C8 808CAE88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s index 3268da3676..ae693e065d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s @@ -56,5 +56,3 @@ glabel func_808CAE8C /* 00190 808CAF50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00194 808CAF54 03E00008 */ jr $ra /* 00198 808CAF58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAF5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAF5C.s index fcce79aec1..ab014a3244 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAF5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAF5C.s @@ -39,5 +39,3 @@ glabel func_808CAF5C /* 00228 808CAFE8 2484003C */ addiu $a0, $a0, 0x003C ## $a0 = 0000003C /* 0022C 808CAFEC 03E00008 */ jr $ra /* 00230 808CAFF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s index 74b56e4e2d..f8b11b12db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s @@ -70,5 +70,3 @@ glabel func_808CAFF4 /* 00334 808CB0F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00338 808CB0F8 03E00008 */ jr $ra /* 0033C 808CB0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB100.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB100.s index 6fb44c3f95..5d0bf2cba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB100.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB100.s @@ -37,5 +37,3 @@ glabel func_808CB100 /* 003CC 808CB18C 460C0482 */ mul.s $f18, $f0, $f12 /* 003D0 808CB190 03E00008 */ jr $ra /* 003D4 808CB194 E492144C */ swc1 $f18, 0x144C($a0) ## 0000144C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s index 0d381fb746..7ba213f78b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s @@ -99,5 +99,3 @@ glabel func_808CB198 /* 00538 808CB2F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0053C 808CB2FC 03E00008 */ jr $ra /* 00540 808CB300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB67C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB67C.s index b977f477bd..602790b599 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB67C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB67C.s @@ -11,5 +11,3 @@ glabel func_808CB67C .L808CB6A0: /* 008E0 808CB6A0 03E00008 */ jr $ra /* 008E4 808CB6A4 28622000 */ slti $v0, $v1, 0x2000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s index 48ab2a5926..5b93ab60f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s @@ -27,5 +27,3 @@ glabel func_808CB6A8 /* 0094C 808CB70C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00950 808CB710 03E00008 */ jr $ra /* 00954 808CB714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s index 9b3a1dce84..7d30c83bc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s @@ -1,3 +1,174 @@ +.rdata +glabel D_808D1C30 + .asciz "MODE %d\n" + .balign 4 + +glabel D_808D1C3C + .asciz "WAY_SPD X = %f\n" + .balign 4 + +glabel D_808D1C4C + .asciz "WAY_SPD Y = %f\n" + .balign 4 + +glabel D_808D1C5C + .asciz "WAY_SPD Z = %f\n" + .balign 4 + +glabel D_808D1C6C + .asciz "this->timer[2] = %d\n" + .balign 4 + +glabel D_808D1C84 + .asciz "this->timer[5] = %d\n" + .balign 4 + +glabel D_808D1C9C + .asciz "BGCHECKKKKKKKKKKKKKKKKKKKKKKK\n" + .balign 4 + +.late_rodata +glabel D_808D1E48 + .word 0x44E08000 +glabel D_808D1E4C + .word 0x4622F983 +glabel jtbl_808D1E50 +.word L808CB988 +.word L808CBCD4 +.word L808CBCF8 +.word L808CBE20 +.word L808CBF44 +.word L808CC140 +glabel D_808D1E68 + .float 10000.0 + +glabel D_808D1E6C + .float 0.05 + +glabel D_808D1E70 + .float 0.1 + +glabel D_808D1E74 + .word 0x3BA3D70A, 0x3DCCCCCD +glabel D_808D1E7C + .word 0x3A831270 +glabel D_808D1E80 + .float 0.2 + +glabel D_808D1E84 + .float 0.02 + +glabel D_808D1E88 + .float 0.005 + +glabel D_808D1E8C + .float 0.1 + +glabel D_808D1E90 + .float 0.1 + +glabel D_808D1E94 + .float 0.1 + +glabel D_808D1E98 + .float 0.1 + +glabel D_808D1E9C + .float 0.1 + +glabel D_808D1EA0 + .float 0.1 + +glabel D_808D1EA4 + .float 0.05 + +glabel D_808D1EA8 + .float 0.05 + +glabel D_808D1EAC + .float 0.05 + +glabel D_808D1EB0 + .word 0x42AB1EB8, 0x3DCCCCCD +glabel jtbl_808D1EB8 +.word L808CCCF4 +.word L808CCDF0 +.word L808CD0E4 +.word L808CD154 +.word L808CD178 +.word L808CD3A8 +glabel jtbl_808D1ED0 +.word L808CD598 +.word L808CC6A4 +.word L808CC878 +.word L808CC91C +.word L808CC944 +glabel D_808D1EE4 + .word 0x410E6666 +glabel D_808D1EE8 + .float 10000.0 + +glabel D_808D1EEC + .float 3000.0 + +glabel D_808D1EF0 + .float 10000.0 + +glabel D_808D1EF4 + .word 0xC68FA000 +glabel D_808D1EF8 + .word 0x4515C000 +glabel D_808D1EFC + .float 10000.0 + +glabel D_808D1F00 + .float 0.4 + +glabel D_808D1F04 + .word 0x42C7CCCD +glabel D_808D1F08 + .float 0.03 + +glabel D_808D1F0C + .float 0.3 + +glabel D_808D1F10 + .float 0.03 + +glabel D_808D1F14 + .float 3.14159274101 + +glabel D_808D1F18 + .word 0x45AEE000 +glabel D_808D1F1C + .float 0.3 + +glabel D_808D1F20 + .word 0x45ABC000 +glabel D_808D1F24 + .float 0.3 + +glabel D_808D1F28 + .float 0.3 + +glabel D_808D1F2C + .float 1500.0 + +glabel D_808D1F30 + .float 3000.0 + +glabel D_808D1F34 + .word 0x45098000 +glabel D_808D1F38 + .word 0x44D48000 +glabel D_808D1F3C + .word 0x44ED8000 +glabel D_808D1F40 + .word 0xC53B8000 +glabel D_808D1F44 + .word 0xC53B8000 + +.text glabel func_808CB718 /* 00958 808CB718 27BDFE30 */ addiu $sp, $sp, 0xFE30 ## $sp = FFFFFE30 /* 0095C 808CB71C AFB60078 */ sw $s6, 0x0078($sp) @@ -2700,5 +2871,3 @@ glabel L808CD598 /* 03064 808CDE24 8FB60078 */ lw $s6, 0x0078($sp) /* 03068 808CDE28 03E00008 */ jr $ra /* 0306C 808CDE2C 27BD01D0 */ addiu $sp, $sp, 0x01D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s index 7cd73d62d8..1fea15d748 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808D1F48 + .word 0x410E6666 + +.text glabel func_808CDE30 /* 03070 808CDE30 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03074 808CDE34 AFBF0024 */ sw $ra, 0x0024($sp) @@ -129,5 +134,3 @@ glabel func_808CDE30 /* 03250 808CE010 8FB00020 */ lw $s0, 0x0020($sp) /* 03254 808CE014 03E00008 */ jr $ra /* 03258 808CE018 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s index 47af9f8a74..6ccc43bb2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s @@ -1,3 +1,45 @@ +.late_rodata +glabel D_808D1F4C + .float 0.05 + +glabel D_808D1F50 + .word 0x3F0CCCCD +glabel D_808D1F54 + .word 0x3D8F5C29 +glabel D_808D1F58 + .word 0x3E570A3D +glabel D_808D1F5C + .float 0.01 + +glabel D_808D1F60 + .float 0.3 + +glabel D_808D1F64 + .float 6000.0 + +glabel D_808D1F68 + .float 1300.0 + +glabel D_808D1F6C + .word 0xBE99999A +glabel D_808D1F70 + .word 0xBE99999A +glabel D_808D1F74 + .float 0.4 + +glabel D_808D1F78 + .float 3.14159274101 + +glabel D_808D1F7C + .float 0.3 + +glabel D_808D1F80 + .float 6.28318548203 + +glabel D_808D1F84 + .float 6.28318548203 + +.text glabel func_808CE01C /* 0325C 808CE01C 27BDFEF8 */ addiu $sp, $sp, 0xFEF8 ## $sp = FFFFFEF8 /* 03260 808CE020 3C0E808D */ lui $t6, %hi(D_808D1A34) ## $t6 = 808D0000 @@ -841,5 +883,3 @@ glabel func_808CE01C /* 03E68 808CEC28 8FB20060 */ lw $s2, 0x0060($sp) /* 03E6C 808CEC2C 03E00008 */ jr $ra /* 03E70 808CEC30 27BD0108 */ addiu $sp, $sp, 0x0108 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s index 840f2e346e..92ad67e87c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s @@ -47,5 +47,3 @@ glabel func_808CEC34 /* 03F18 808CECD8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03F1C 808CECDC 03E00008 */ jr $ra /* 03F20 808CECE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s index 78951527c7..e95bfa45c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_808D1F98 + .word 0x3F0CCCCD +glabel D_808D1F9C + .float 0.1 + +glabel D_808D1FA0 + .float 0.3 + +glabel D_808D1FA4 + .float 0.08 + +.text glabel func_808CF448 /* 04688 808CF448 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 0468C 808CF44C F7BE0040 */ sdc1 $f30, 0x0040($sp) @@ -295,5 +308,3 @@ glabel func_808CF448 /* 04ACC 808CF88C 8FB50060 */ lw $s5, 0x0060($sp) /* 04AD0 808CF890 03E00008 */ jr $ra /* 04AD4 808CF894 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s index e440bdc92a..383b784ba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s @@ -1,3 +1,33 @@ +.rdata +glabel D_808D1CEC + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1CFC + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D0C + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D1C + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D2C + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D3C + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1D4C + .asciz "../z_boss_fd.c" + .balign 4 + +.text glabel func_808CF898 /* 04AD8 808CF898 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 04ADC 808CF89C AFBF0044 */ sw $ra, 0x0044($sp) @@ -463,5 +493,3 @@ glabel func_808CF898 /* 051D0 808CFF90 8FBE0040 */ lw $s8, 0x0040($sp) /* 051D4 808CFF94 03E00008 */ jr $ra /* 051D8 808CFF98 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D00A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D00A4.s index 50f792e3bc..12ee04e3bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D00A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D00A4.s @@ -75,5 +75,3 @@ glabel func_808D00A4 .L808D01B8: /* 053F8 808D01B8 03E00008 */ jr $ra /* 053FC 808D01BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D01C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D01C0.s index 8f84a3061d..090ff2d7f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D01C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D01C0.s @@ -75,5 +75,3 @@ glabel func_808D01C0 .L808D02D4: /* 05514 808D02D4 03E00008 */ jr $ra /* 05518 808D02D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s index 64113fe0fb..b3e03302b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s @@ -1,3 +1,32 @@ +.rdata +glabel D_808D1DAC + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1DBC + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1DCC + .asciz "../z_boss_fd.c" + .balign 4 + +.late_rodata +glabel D_808D1FA8 + .float 0.1 + +glabel D_808D1FAC + .float 0.01 + +glabel D_808D1FB0 + .float 0.7 + +glabel D_808D1FB4 + .word 0x3A51B717 +glabel D_808D1FB8 + .float -1.57079637051 + +.text glabel func_808D02DC /* 0551C 808D02DC 27BDFE98 */ addiu $sp, $sp, 0xFE98 ## $sp = FFFFFE98 /* 05520 808D02E0 AFB60060 */ sw $s6, 0x0060($sp) @@ -315,5 +344,3 @@ glabel func_808D02DC /* 059D8 808D0798 8FBE0068 */ lw $s8, 0x0068($sp) /* 059DC 808D079C 03E00008 */ jr $ra /* 059E0 808D07A0 27BD0168 */ addiu $sp, $sp, 0x0168 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D07A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D07A4.s index ed63ef5fdf..1442b594fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D07A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D07A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808D1FBC + .float 0.1 + +.text glabel func_808D07A4 /* 059E4 808D07A4 AFA40000 */ sw $a0, 0x0000($sp) /* 059E8 808D07A8 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 @@ -71,5 +76,3 @@ glabel func_808D07A4 .L808D089C: /* 05ADC 808D089C 03E00008 */ jr $ra /* 05AE0 808D08A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08A4.s index eaafd05c60..0350d4e516 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08A4.s @@ -21,5 +21,3 @@ glabel func_808D08A4 /* 05B2C 808D08EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05B30 808D08F0 03E00008 */ jr $ra /* 05B34 808D08F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index 42c3d625e5..56cf3f23cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -1,3 +1,77 @@ +.rdata +glabel D_808D1DDC + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1DEC + .asciz "LH\n" + .balign 4 + +glabel D_808D1DF0 + .asciz "RH\n" + .balign 4 + +glabel D_808D1DF4 + .asciz "BD\n" + .balign 4 + +glabel D_808D1DF8 + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1E08 + .asciz "../z_boss_fd.c" + .balign 4 + +glabel D_808D1E18 + .asciz "BH\n" + .balign 4 + +glabel D_808D1E1C + .asciz "BHC\n" + .balign 4 + +glabel D_808D1E24 + .asciz "BHCE\n" + .balign 4 + +glabel D_808D1E2C + .asciz "SK\n" + .balign 4 + +glabel D_808D1E30 + .asciz "END\n" + .balign 4 + +glabel D_808D1E38 + .asciz "../z_boss_fd.c" + .balign 4 + +.late_rodata +glabel D_808D1FC0 + .float 0.1 + +glabel D_808D1FC4 + .float 7000.0 + +glabel D_808D1FC8 + .float 5000.0 + +glabel D_808D1FCC + .float 5000.0 + +glabel D_808D1FD0 + .float 1.57079637051 + +glabel D_808D1FD4 + .word 0xC0490FDB +glabel D_808D1FD8 + .float 0.2 + +glabel D_808D1FDC + .float 3.14159274101 + +.text glabel func_808D08F8 /* 05B38 808D08F8 27BDFE88 */ addiu $sp, $sp, 0xFE88 ## $sp = FFFFFE88 /* 05B3C 808D08FC AFB60070 */ sw $s6, 0x0070($sp) @@ -881,4 +955,3 @@ glabel func_808D08F8 /* 06874 808D1634 8FB60070 */ lw $s6, 0x0070($sp) /* 06878 808D1638 03E00008 */ jr $ra /* 0687C 808D163C 27BD0178 */ addiu $sp, $sp, 0x0178 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s index 35b2b85b7d..f575868f7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s @@ -13,5 +13,3 @@ glabel BossFd2_Destroy /* 00554 808D2BC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00558 808D2BC8 03E00008 */ jr $ra /* 0055C 808D2BCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index 9c8ad887fa..70c0a01621 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808D6444 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D6454 + .asciz "FD2 draw start \n" + .balign 4 + +glabel D_808D6468 + .asciz "../z_boss_fd2.c" + .balign 4 + +.text glabel BossFd2_Draw /* 036E0 808D5D50 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 036E4 808D5D54 AFB20040 */ sw $s2, 0x0040($sp) @@ -154,4 +168,3 @@ glabel BossFd2_Draw /* 03934 808D5FA4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 03938 808D5FA8 00000000 */ nop /* 0393C 808D5FAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s index b4bd2d0086..4d75e83683 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808D6478 + .float -850.0 + +.text glabel BossFd2_Init /* 00430 808D2AA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00434 808D2AA4 AFA50044 */ sw $a1, 0x0044($sp) @@ -66,5 +71,3 @@ glabel BossFd2_Init /* 0051C 808D2B8C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00520 808D2B90 03E00008 */ jr $ra /* 00524 808D2B94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s index ac145aa5d8..53ef6ab364 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808D63A0 + .asciz "FD2 move start \n" + .balign 4 + +.text glabel BossFd2_Update /* 02764 808D4DD4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02768 808D4DD8 AFB00014 */ sw $s0, 0x0014($sp) @@ -123,5 +129,3 @@ glabel BossFd2_Update /* 02918 808D4F88 8FB10018 */ lw $s1, 0x0018($sp) /* 0291C 808D4F8C 03E00008 */ jr $ra /* 02920 808D4F90 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s index 581105d778..d68bcc878a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s @@ -58,5 +58,3 @@ glabel func_808D2670 /* 000CC 808D273C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D0 808D2740 03E00008 */ jr $ra /* 000D4 808D2744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s index 0ac99d93ca..0ad8b0fd64 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s @@ -72,5 +72,3 @@ glabel func_808D2748 /* 001E0 808D2850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001E4 808D2854 03E00008 */ jr $ra /* 001E8 808D2858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s index b69ff14c09..d48b46ab37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s @@ -56,5 +56,3 @@ glabel func_808D285C /* 002B4 808D2924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002B8 808D2928 03E00008 */ jr $ra /* 002BC 808D292C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s index 45aedf3abc..117473f728 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s @@ -58,5 +58,3 @@ glabel func_808D2930 /* 0038C 808D29FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00390 808D2A00 03E00008 */ jr $ra /* 00394 808D2A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2A08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2A08.s index 2231f3592f..f3b1194ae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2A08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2A08.s @@ -39,5 +39,3 @@ glabel func_808D2A08 /* 00424 808D2A94 2484003C */ addiu $a0, $a0, 0x003C ## $a0 = 0000003C /* 00428 808D2A98 03E00008 */ jr $ra /* 0042C 808D2A9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s index 2e66ae40f5..ebd4ee6f2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_808D62D0 + .asciz "UP INIT 1\n" + .balign 4 + +glabel D_808D62DC + .asciz "UP INIT 2\n" + .balign 4 + +.late_rodata +glabel D_808D647C + .word 0x410E6666 + +.text glabel func_808D2BD0 /* 00560 808D2BD0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00564 808D2BD4 AFBF001C */ sw $ra, 0x001C($sp) @@ -75,5 +89,3 @@ glabel func_808D2BD0 /* 00664 808D2CD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00668 808D2CD8 03E00008 */ jr $ra /* 0066C 808D2CDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s index 685ea6db4e..b999d6cf75 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s @@ -1,3 +1,41 @@ +.rdata +glabel D_808D62E8 + .asciz "UP 1 mode %d\n" + .balign 4 + +glabel D_808D62FC + .asciz "UP 1.5 \n" + .balign 4 + +glabel D_808D6308 + .asciz "UP time %d \n" + .balign 4 + +glabel D_808D6318 + .asciz "PL time %x \n" + .balign 4 + +glabel D_808D6328 + .asciz "MT time %x \n" + .balign 4 + +glabel D_808D6338 + .asciz "UP 1.6 \n" + .balign 4 + +glabel D_808D6344 + .asciz "UP 1.7 \n" + .balign 4 + +glabel D_808D6350 + .asciz "UP 2\n" + .balign 4 + +.late_rodata +glabel D_808D6480 + .word 0x410E6666 + +.text glabel func_808D2CE0 /* 00670 808D2CE0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00674 808D2CE4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -264,5 +302,3 @@ glabel func_808D2CE0 /* 00A10 808D3080 8FB20030 */ lw $s2, 0x0030($sp) /* 00A14 808D3084 03E00008 */ jr $ra /* 00A18 808D3088 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s index 4921ec154e..0f30530cd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_808D6358 + .asciz "UP INIT 1\n" + .balign 4 + +.text glabel func_808D308C /* 00A1C 808D308C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00A20 808D3090 AFBF0014 */ sw $ra, 0x0014($sp) @@ -49,5 +55,3 @@ glabel func_808D308C /* 00AC4 808D3134 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AC8 808D3138 03E00008 */ jr $ra /* 00ACC 808D313C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s index 147dfd239e..03ff7f5cef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s @@ -1,3 +1,13 @@ +.rdata +glabel D_808D6364 + .asciz "SW1 = %d\n" + .balign 4 + +glabel D_808D6370 + .asciz "SW2 = %d\n" + .balign 4 + +.text glabel func_808D3140 /* 00AD0 808D3140 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00AD4 808D3144 AFB00020 */ sw $s0, 0x0020($sp) @@ -100,5 +110,3 @@ glabel func_808D3140 /* 00C38 808D32A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C3C 808D32AC 03E00008 */ jr $ra /* 00C40 808D32B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s index 05609320d4..07fd55ed79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s @@ -31,5 +31,3 @@ glabel func_808D32B4 /* 00CB4 808D3324 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CB8 808D3328 03E00008 */ jr $ra /* 00CBC 808D332C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s index 47e568c1ae..d2875e3def 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s @@ -57,5 +57,3 @@ glabel func_808D3330 /* 00D84 808D33F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D88 808D33F8 03E00008 */ jr $ra /* 00D8C 808D33FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s index 58ad35e596..9921212703 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s @@ -25,5 +25,3 @@ glabel func_808D3400 /* 00DE8 808D3458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DEC 808D345C 03E00008 */ jr $ra /* 00DF0 808D3460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s index bd3d910d07..cd10103313 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808D6484 + .float 3.14159274101 + +glabel D_808D6488 + .float 6.28318548203 + +.text glabel func_808D3464 /* 00DF4 808D3464 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 00DF8 808D3468 AFBF005C */ sw $ra, 0x005C($sp) @@ -360,5 +368,3 @@ glabel func_808D3464 /* 0132C 808D399C 8FB20058 */ lw $s2, 0x0058($sp) /* 01330 808D39A0 03E00008 */ jr $ra /* 01334 808D39A4 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s index 96bafc2c96..29a0cae164 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s @@ -24,5 +24,3 @@ glabel func_808D39A8 /* 0138C 808D39FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01390 808D3A00 03E00008 */ jr $ra /* 01394 808D3A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A08.s index 282fbd6eff..96e30004e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A08.s @@ -34,5 +34,3 @@ glabel func_808D3A08 /* 01404 808D3A74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01408 808D3A78 03E00008 */ jr $ra /* 0140C 808D3A7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s index d83ed585e6..98ea68fa8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s @@ -24,5 +24,3 @@ glabel func_808D3A80 /* 01464 808D3AD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01468 808D3AD8 03E00008 */ jr $ra /* 0146C 808D3ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s index ad105808f3..2627431176 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s @@ -168,5 +168,3 @@ glabel func_808D3AE0 /* 016BC 808D3D2C 8FB40050 */ lw $s4, 0x0050($sp) /* 016C0 808D3D30 03E00008 */ jr $ra /* 016C4 808D3D34 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s index 7dd90e5678..78131d3b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s @@ -24,5 +24,3 @@ glabel func_808D3D38 /* 0171C 808D3D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01720 808D3D90 03E00008 */ jr $ra /* 01724 808D3D94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s index 169fa3af28..b3a4c38918 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s @@ -85,5 +85,3 @@ glabel func_808D3D98 /* 0184C 808D3EBC 8FB10018 */ lw $s1, 0x0018($sp) /* 01850 808D3EC0 03E00008 */ jr $ra /* 01854 808D3EC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s index cd700ccfe7..3fb477795c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s @@ -37,5 +37,3 @@ glabel func_808D3EC8 /* 018DC 808D3F4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 018E0 808D3F50 03E00008 */ jr $ra /* 018E4 808D3F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s index f296ea4cc3..4333bb9807 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s @@ -100,5 +100,3 @@ glabel func_808D3F58 /* 01A4C 808D40BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A50 808D40C0 03E00008 */ jr $ra /* 01A54 808D40C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s index d4f4bef3cc..72d9bb13a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s @@ -1,3 +1,30 @@ +.late_rodata +glabel jtbl_808D648C +.word L808D4124 +.word L808D41FC +.word L808D43D4 +.word L808D4420 +.word L808D4594 +.word L808D4728 +glabel D_808D64A4 + .float 0.1 + +glabel D_808D64A8 + .float 0.02 + +glabel D_808D64AC + .float 3.14159274101 + +glabel D_808D64B0 + .float 0.2 + +glabel D_808D64B4 + .float 0.02 + +glabel D_808D64B8 + .float 0.02 + +.text glabel func_808D40C8 /* 01A58 808D40C8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01A5C 808D40CC AFBF003C */ sw $ra, 0x003C($sp) @@ -449,5 +476,3 @@ glabel L808D4728 /* 020CC 808D473C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 020D0 808D4740 03E00008 */ jr $ra /* 020D4 808D4744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4748.s index 425cfa38bc..9727ea5fe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4748.s @@ -18,5 +18,3 @@ glabel func_808D4748 /* 02114 808D4784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02118 808D4788 03E00008 */ jr $ra /* 0211C 808D478C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s index 5c313f9300..02e0588952 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808D637C + .asciz "" + .balign 4 + +glabel D_808D6384 + .asciz "damage %d\n" + .balign 4 + +glabel D_808D6394 + .asciz "\x1b[m" + .balign 4 + +glabel D_808D6398 + .asciz "hp %d\n" + .balign 4 + +.text glabel func_808D4790 /* 02120 808D4790 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 02124 808D4794 AFBF003C */ sw $ra, 0x003C($sp) @@ -345,5 +363,3 @@ glabel func_808D4790 /* 025EC 808D4C5C 8FB50038 */ lw $s5, 0x0038($sp) /* 025F0 808D4C60 03E00008 */ jr $ra /* 025F4 808D4C64 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s index e68cb5391c..b9e3d6a025 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_808D64BC + .float 0.3 + +glabel D_808D64C0 + .float 6000.0 + +glabel D_808D64C4 + .float 1300.0 + +.text glabel func_808D4C68 /* 025F8 808D4C68 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 025FC 808D4C6C 3C0F808D */ lui $t7, %hi(D_808D6200) ## $t7 = 808D0000 @@ -103,5 +114,3 @@ glabel func_808D4C68 /* 02758 808D4DC8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0275C 808D4DCC 03E00008 */ jr $ra /* 02760 808D4DD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s index 13ebc3800d..69448c52c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s @@ -1,3 +1,25 @@ +.rdata +glabel D_808D63B4 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D63C4 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D63D4 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D63E4 + .asciz "../z_boss_fd2.c" + .balign 4 + +.late_rodata +glabel D_808D64C8 + .float 0.1 + +.text glabel func_808D4F94 /* 02924 808D4F94 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02928 808D4F98 AFA70074 */ sw $a3, 0x0074($sp) @@ -174,5 +196,3 @@ glabel func_808D4F94 /* 02BAC 808D521C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02BB0 808D5220 03E00008 */ jr $ra /* 02BB4 808D5224 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D5228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D5228.s index 27f20f1c60..24ac52bfca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D5228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D5228.s @@ -41,5 +41,3 @@ glabel func_808D5228 /* 02C50 808D52C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C54 808D52C4 03E00008 */ jr $ra /* 02C58 808D52C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s index 20b4fa5f35..27a138a993 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s @@ -1,3 +1,28 @@ +.rdata +glabel D_808D63F4 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D6404 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D6414 + .asciz "../z_boss_fd2.c" + .balign 4 + +.late_rodata +glabel D_808D64CC + .word 0xC4638000 +glabel D_808D64D0 + .float 1.57079637051 + +glabel D_808D64D4 + .word 0x3A6BEDFA +glabel D_808D64D8 + .float 0.01 + +.text glabel func_808D52CC /* 02C5C 808D52CC 27BDFEA0 */ addiu $sp, $sp, 0xFEA0 ## $sp = FFFFFEA0 /* 02C60 808D52D0 3C0F808D */ lui $t7, %hi(D_808D6248) ## $t7 = 808D0000 @@ -409,5 +434,3 @@ glabel func_808D52CC /* 03264 808D58D4 8FBE0068 */ lw $s8, 0x0068($sp) /* 03268 808D58D8 03E00008 */ jr $ra /* 0326C 808D58DC 27BD0160 */ addiu $sp, $sp, 0x0160 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s index da2de4df23..d2027a8cc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_808D6424 + .asciz "../z_boss_fd2.c" + .balign 4 + +glabel D_808D6434 + .asciz "../z_boss_fd2.c" + .balign 4 + +.late_rodata +glabel D_808D64DC + .word 0x45ABC000 +glabel D_808D64E0 + .word 0x45AEE000 +glabel D_808D64E4 + .float 0.3 + +.text glabel func_808D58E0 /* 03270 808D58E0 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 03274 808D58E4 AFBF006C */ sw $ra, 0x006C($sp) @@ -296,5 +314,3 @@ glabel func_808D58E0 /* 036D4 808D5D44 8FB40068 */ lw $s4, 0x0068($sp) /* 036D8 808D5D48 03E00008 */ jr $ra /* 036DC 808D5D4C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s index 739df79b51..1899e52bd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s @@ -28,5 +28,3 @@ glabel BossGanon_Destroy /* 00F20 808D7790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F24 808D7794 03E00008 */ jr $ra /* 00F28 808D7798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index 96f21eaf50..93a40931ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s @@ -158,5 +158,3 @@ glabel BossGanon_Draw /* 0A6D0 808E0F40 8FB20030 */ lw $s2, 0x0030($sp) /* 0A6D4 808E0F44 03E00008 */ jr $ra /* 0A6D8 808E0F48 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index c8bcc801a4..290c17029c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -400,5 +400,3 @@ glabel BossGanon_Init /* 00EBC 808D772C 8FB10038 */ lw $s1, 0x0038($sp) /* 00EC0 808D7730 03E00008 */ jr $ra /* 00EC4 808D7734 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s index e7b6ffb164..3d68863621 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s @@ -1243,5 +1243,3 @@ glabel L808DE3B0 /* 07EB8 808DE728 8FB60070 */ lw $s6, 0x0070($sp) /* 07EBC 808DE72C 03E00008 */ jr $ra /* 07EC0 808DE730 27BD0130 */ addiu $sp, $sp, 0x0130 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s index 8db3abe47b..cb0b8fca7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s @@ -86,5 +86,3 @@ glabel func_808D6870 /* 00134 808D69A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00138 808D69A8 03E00008 */ jr $ra /* 0013C 808D69AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s index b01c5ed12e..47411e9482 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s @@ -67,5 +67,3 @@ glabel func_808D69B0 /* 00230 808D6AA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00234 808D6AA4 03E00008 */ jr $ra /* 00238 808D6AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s index d1a4b65ff1..d3b3e300ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s @@ -87,5 +87,3 @@ glabel func_808D6AAC /* 00374 808D6BE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00378 808D6BE8 03E00008 */ jr $ra /* 0037C 808D6BEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6BF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6BF0.s index 33a249aad1..4aa0f86e58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6BF0.s @@ -53,5 +53,3 @@ glabel func_808D6BF0 /* 00440 808D6CB0 2442004C */ addiu $v0, $v0, 0x004C ## $v0 = 0001004C /* 00444 808D6CB4 03E00008 */ jr $ra /* 00448 808D6CB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6CBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6CBC.s index 198312d36e..40cfa1c4ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6CBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6CBC.s @@ -43,5 +43,3 @@ glabel func_808D6CBC /* 004E4 808D6D54 2442004C */ addiu $v0, $v0, 0x004C ## $v0 = 0001004C /* 004E8 808D6D58 03E00008 */ jr $ra /* 004EC 808D6D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s index a899ed81cc..a617050167 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s @@ -64,5 +64,3 @@ glabel func_808D6D60 /* 005D8 808D6E48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005DC 808D6E4C 03E00008 */ jr $ra /* 005E0 808D6E50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s index 0adcd360ca..07bd2be585 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s @@ -58,5 +58,3 @@ glabel func_808D6E54 /* 006C0 808D6F30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006C4 808D6F34 03E00008 */ jr $ra /* 006C8 808D6F38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s index 37d1c3f17b..d498faa393 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s @@ -65,5 +65,3 @@ glabel func_808D6F3C /* 007B8 808D7028 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007BC 808D702C 03E00008 */ jr $ra /* 007C0 808D7030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7034.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7034.s index 0fe27bfb4a..12fcc1fe44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7034.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7034.s @@ -48,5 +48,3 @@ glabel func_808D7034 /* 00874 808D70E4 2442004C */ addiu $v0, $v0, 0x004C ## $v0 = 0001004C /* 00878 808D70E8 03E00008 */ jr $ra /* 0087C 808D70EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D70F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D70F0.s index e7cd6a0613..e35fecfb10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D70F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D70F0.s @@ -14,5 +14,3 @@ glabel func_808D70F0 /* 008B0 808D7120 44099000 */ mfc1 $t1, $f18 /* 008B4 808D7124 03E00008 */ jr $ra /* 008B8 808D7128 A4A9004A */ sh $t1, 0x004A($a1) ## 0000004A - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s index 093d9d0fb7..8c03ab6994 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s @@ -27,5 +27,3 @@ glabel func_808D712C /* 0091C 808D718C AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 00920 808D7190 03E00008 */ jr $ra /* 00924 808D7194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s index 915f8cd867..9df9ca0b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s @@ -61,5 +61,3 @@ glabel func_808D779C /* 01000 808D7870 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01004 808D7874 03E00008 */ jr $ra /* 01008 808D7878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D787C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D787C.s index a915d2e477..88d9eb904f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D787C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D787C.s @@ -38,5 +38,3 @@ glabel func_808D787C /* 0109C 808D790C 468084A0 */ cvt.s.w $f18, $f16 /* 010A0 808D7910 03E00008 */ jr $ra /* 010A4 808D7914 E4920694 */ swc1 $f18, 0x0694($a0) ## 00000694 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index d99de3e7ab..10c742d29d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -1598,5 +1598,3 @@ glabel L808D8ED4 /* 0279C 808D900C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 027A0 808D9010 03E00008 */ jr $ra /* 027A4 808D9014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s index 52637c2ccb..5e4235a728 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s @@ -59,5 +59,3 @@ glabel func_808D9018 /* 0287C 808D90EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02880 808D90F0 03E00008 */ jr $ra /* 02884 808D90F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s index a347559ee5..15ebdce209 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s @@ -68,5 +68,3 @@ glabel func_808D90F8 /* 0297C 808D91EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02980 808D91F0 03E00008 */ jr $ra /* 02984 808D91F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s index cf429e3d42..7ce1d41054 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s @@ -84,5 +84,3 @@ glabel func_808D91F8 /* 02AC0 808D9330 8FB70038 */ lw $s7, 0x0038($sp) /* 02AC4 808D9334 03E00008 */ jr $ra /* 02AC8 808D9338 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index 047dcfbe28..54d36bdc10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -1776,5 +1776,3 @@ glabel L808DAB60 /* 0446C 808DACDC 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 04470 808DACE0 03E00008 */ jr $ra /* 04474 808DACE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DACE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DACE8.s index 5a4c2b9054..04364f642a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DACE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DACE8.s @@ -13,5 +13,3 @@ glabel func_808DACE8 /* 044A4 808DAD14 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 /* 044A8 808DAD18 03E00008 */ jr $ra /* 044AC 808DAD1C E48401D0 */ swc1 $f4, 0x01D0($a0) ## 000001D0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s index 3183ffd158..0259138ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s @@ -382,5 +382,3 @@ glabel L808DB174 /* 049FC 808DB26C 8FB10030 */ lw $s1, 0x0030($sp) /* 04A00 808DB270 03E00008 */ jr $ra /* 04A04 808DB274 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s index 07243a0ea0..2a68c07e4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s @@ -28,5 +28,3 @@ glabel func_808DB278 /* 04A6C 808DB2DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04A70 808DB2E0 03E00008 */ jr $ra /* 04A74 808DB2E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index 0c04578b7c..f2e0541d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -580,5 +580,3 @@ glabel L808DBAB0 /* 05274 808DBAE4 8FB10048 */ lw $s1, 0x0048($sp) /* 05278 808DBAE8 03E00008 */ jr $ra /* 0527C 808DBAEC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s index bbeadcfd8a..f51e2d7ce0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s @@ -34,5 +34,3 @@ glabel func_808DBAF0 /* 052FC 808DBB6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05300 808DBB70 03E00008 */ jr $ra /* 05304 808DBB74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s index 36c8693d96..167baaae24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s @@ -229,5 +229,3 @@ glabel func_808DBB78 /* 05648 808DBEB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0564C 808DBEBC 03E00008 */ jr $ra /* 05650 808DBEC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s index f0108d593b..8bf1ab6a91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s @@ -27,5 +27,3 @@ glabel func_808DBEC4 /* 056B4 808DBF24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 056B8 808DBF28 03E00008 */ jr $ra /* 056BC 808DBF2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s index 5d641814a1..9395dca27f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s @@ -122,5 +122,3 @@ glabel func_808DBF30 /* 0586C 808DC0DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05870 808DC0E0 03E00008 */ jr $ra /* 05874 808DC0E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s index 2022eea94a..3abc19a809 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s @@ -25,5 +25,3 @@ glabel func_808DC0E8 /* 058D0 808DC140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 058D4 808DC144 03E00008 */ jr $ra /* 058D8 808DC148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index 08e29cc52e..6fea4d9a6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -199,5 +199,3 @@ glabel func_808DC14C /* 05BA4 808DC414 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 05BA8 808DC418 03E00008 */ jr $ra /* 05BAC 808DC41C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s index 5de3bc3fe7..56f395af30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s @@ -50,5 +50,3 @@ glabel func_808DC420 /* 05C60 808DC4D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05C64 808DC4D4 03E00008 */ jr $ra /* 05C68 808DC4D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s index 266955dded..7944d06aa9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s @@ -109,5 +109,3 @@ glabel func_808DC4DC /* 05DF0 808DC660 8FB10018 */ lw $s1, 0x0018($sp) /* 05DF4 808DC664 03E00008 */ jr $ra /* 05DF8 808DC668 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s index d4e21ae8a2..99654abaf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s @@ -61,5 +61,3 @@ glabel func_808DC66C /* 05EE0 808DC750 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05EE4 808DC754 03E00008 */ jr $ra /* 05EE8 808DC758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s index 4dfc482274..15c8cece2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s @@ -167,5 +167,3 @@ glabel func_808DC75C /* 06138 808DC9A8 D7B40018 */ ldc1 $f20, 0x0018($sp) /* 0613C 808DC9AC 03E00008 */ jr $ra /* 06140 808DC9B0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s index 246f9cea09..f7eaf74d33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s @@ -119,5 +119,3 @@ glabel func_808DC9B4 /* 06300 808DCB70 8FB30058 */ lw $s3, 0x0058($sp) /* 06304 808DCB74 03E00008 */ jr $ra /* 06308 808DCB78 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s index 19d4f5cd15..e86eb6b1ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s @@ -390,5 +390,3 @@ glabel L808DD000 /* 0686C 808DD0DC 8FB10028 */ lw $s1, 0x0028($sp) /* 06870 808DD0E0 03E00008 */ jr $ra /* 06874 808DD0E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s index d037791d9e..57e032c351 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s @@ -25,5 +25,3 @@ glabel func_808DD0E8 /* 068D0 808DD140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 068D4 808DD144 03E00008 */ jr $ra /* 068D8 808DD148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s index bc176a09a9..da731ee9e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s @@ -52,5 +52,3 @@ glabel func_808DD14C /* 06990 808DD200 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 06994 808DD204 03E00008 */ jr $ra /* 06998 808DD208 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s index 0ebcf887bf..0dca35a6d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s @@ -268,5 +268,3 @@ glabel func_808DD20C /* 06D54 808DD5C4 8FB50038 */ lw $s5, 0x0038($sp) /* 06D58 808DD5C8 03E00008 */ jr $ra /* 06D5C 808DD5CC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s index 7505530fc1..0c63f454c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s @@ -20,5 +20,3 @@ glabel L808DE760 /* 07F08 808DE778 00000000 */ nop /* 07F0C 808DE77C 03E00008 */ jr $ra /* 07F10 808DE780 ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s index 32156e806f..4ac2d4b8d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s @@ -22,5 +22,3 @@ glabel func_808DE784 /* 07F64 808DE7D4 440C9000 */ mfc1 $t4, $f18 /* 07F68 808DE7D8 03E00008 */ jr $ra /* 07F6C 808DE7DC A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s index 044325d62f..0fc110665e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s @@ -17,5 +17,3 @@ glabel func_808DE7E0 /* 07FAC 808DE81C 440F4000 */ mfc1 $t7, $f8 /* 07FB0 808DE820 03E00008 */ jr $ra /* 07FB4 808DE824 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s index 54ae1e0508..7af5a2e708 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s @@ -22,5 +22,3 @@ glabel func_808DE828 /* 08008 808DE878 440B4000 */ mfc1 $t3, $f8 /* 0800C 808DE87C 03E00008 */ jr $ra /* 08010 808DE880 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s index 71c834d276..66313b367b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s @@ -22,5 +22,3 @@ glabel func_808DE884 /* 08064 808DE8D4 44194000 */ mfc1 $t9, $f8 /* 08068 808DE8D8 03E00008 */ jr $ra /* 0806C 808DE8DC A4790004 */ sh $t9, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s index fdee5f028b..347e5bbd10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s @@ -17,5 +17,3 @@ glabel func_808DE8E0 /* 080AC 808DE91C 440A5000 */ mfc1 $t2, $f10 /* 080B0 808DE920 03E00008 */ jr $ra /* 080B4 808DE924 A46A0004 */ sh $t2, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s index 166bf99732..c958297535 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s @@ -25,5 +25,3 @@ glabel L808DE980 .L808DE980: /* 08110 808DE980 03E00008 */ jr $ra /* 08114 808DE984 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s index e9c31b3702..7d62531601 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s @@ -247,5 +247,3 @@ glabel func_808DE988 /* 084B4 808DED24 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 084B8 808DED28 03E00008 */ jr $ra /* 084BC 808DED2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED30.s index 9dd893ef63..e277fc1287 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED30.s @@ -6,5 +6,3 @@ glabel func_808DED30 /* 084D0 808DED40 3C018090 */ lui $at, %hi(D_808F93CC) ## $at = 80900000 /* 084D4 808DED44 03E00008 */ jr $ra /* 084D8 808DED48 AC2693CC */ sw $a2, %lo(D_808F93CC)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED4C.s index ba66553613..42234bb199 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED4C.s @@ -74,5 +74,3 @@ glabel func_808DED4C .L808DEE68: /* 085F8 808DEE68 03E00008 */ jr $ra /* 085FC 808DEE6C 46001005 */ abs.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s index a3bc70a9d6..0449f42a66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s @@ -260,5 +260,3 @@ glabel func_808DEE70 /* 089E0 808DF250 8FBE0060 */ lw $s8, 0x0060($sp) /* 089E4 808DF254 03E00008 */ jr $ra /* 089E8 808DF258 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s index 44fd0c7093..f0a5c1de6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s @@ -168,5 +168,3 @@ glabel func_808DF25C /* 08C74 808DF4E4 8FB10018 */ lw $s1, 0x0018($sp) /* 08C78 808DF4E8 03E00008 */ jr $ra /* 08C7C 808DF4EC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s index 2912038371..02c7a247e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s @@ -442,5 +442,3 @@ glabel func_808DF4F0 /* 09354 808DFBC4 8FB20048 */ lw $s2, 0x0048($sp) /* 09358 808DFBC8 03E00008 */ jr $ra /* 0935C 808DFBCC 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s index c06fc2a8a8..03008b8f2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s @@ -265,5 +265,3 @@ glabel func_808DFBD0 /* 0974C 808DFFBC 8FB10018 */ lw $s1, 0x0018($sp) /* 09750 808DFFC0 03E00008 */ jr $ra /* 09754 808DFFC4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s index 5b3e5194a2..7e95ecf651 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s @@ -165,5 +165,3 @@ glabel func_808DFFC8 /* 099D8 808E0248 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 099DC 808E024C 03E00008 */ jr $ra /* 099E0 808E0250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0254.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0254.s index ddc1fb8722..31dd8f21bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0254.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0254.s @@ -321,5 +321,3 @@ glabel func_808E0254 /* 09E80 808E06F0 8FB30048 */ lw $s3, 0x0048($sp) /* 09E84 808E06F4 03E00008 */ jr $ra /* 09E88 808E06F8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E06FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E06FC.s index 627b26684e..2864fe6a17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E06FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E06FC.s @@ -218,5 +218,3 @@ glabel func_808E06FC /* 0A1C0 808E0A30 8FBE0060 */ lw $s8, 0x0060($sp) /* 0A1C4 808E0A34 03E00008 */ jr $ra /* 0A1C8 808E0A38 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s index 5b17e9dd90..1662941149 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s @@ -168,5 +168,3 @@ glabel func_808E0A3C /* 0A45C 808E0CCC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 0A460 808E0CD0 03E00008 */ jr $ra /* 0A464 808E0CD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0F4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0F4C.s index c1267b576b..b1f8b476f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0F4C.s @@ -63,5 +63,3 @@ glabel func_808E0F4C /* 0A7B8 808E1028 D7B40008 */ ldc1 $f20, 0x0008($sp) /* 0A7BC 808E102C 03E00008 */ jr $ra /* 0A7C0 808E1030 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s index fc08540679..02b91bb2b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s @@ -796,5 +796,3 @@ glabel L808E176C /* 0B2D8 808E1B48 8FB10030 */ lw $s1, 0x0030($sp) /* 0B2DC 808E1B4C 03E00008 */ jr $ra /* 0B2E0 808E1B50 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s index d04950cb9b..00e707fa07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s @@ -220,5 +220,3 @@ glabel func_808E1B54 /* 0B638 808E1EA8 8FB40028 */ lw $s4, 0x0028($sp) /* 0B63C 808E1EAC 03E00008 */ jr $ra /* 0B640 808E1EB0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s index e463507a8d..7a077ce43e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s @@ -269,5 +269,3 @@ glabel func_808E1EB4 /* 0BA20 808E2290 8FB20050 */ lw $s2, 0x0050($sp) /* 0BA24 808E2294 03E00008 */ jr $ra /* 0BA28 808E2298 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s index 50f4bc78b2..67f4459557 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s @@ -172,5 +172,3 @@ glabel func_808E229C /* 0BCC8 808E2538 8FBE0068 */ lw $s8, 0x0068($sp) /* 0BCCC 808E253C 03E00008 */ jr $ra /* 0BCD0 808E2540 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s index 96be55e2cf..ffd2e5a184 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s @@ -890,5 +890,3 @@ glabel L808E306C /* 0C9D0 808E3240 8FB20040 */ lw $s2, 0x0040($sp) /* 0C9D4 808E3244 03E00008 */ jr $ra /* 0C9D8 808E3248 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s index f8eae7febf..6d34206b9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s @@ -202,5 +202,3 @@ glabel func_808E324C /* 0CCE8 808E3558 8FBE0038 */ lw $s8, 0x0038($sp) /* 0CCEC 808E355C 03E00008 */ jr $ra /* 0CCF0 808E3560 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s index d3919b09a4..a08fc4122e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s @@ -567,5 +567,3 @@ glabel func_808E3564 /* 0D508 808E3D78 8FBE0070 */ lw $s8, 0x0070($sp) /* 0D50C 808E3D7C 03E00008 */ jr $ra /* 0D510 808E3D80 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s index c8ea4c6d7d..9e7eee40c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s @@ -943,4 +943,3 @@ glabel func_808E3D84 /* 0E364 808E4BD4 00000000 */ nop /* 0E368 808E4BD8 00000000 */ nop /* 0E36C 808E4BDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s index 74dfbdbc02..f891fc0469 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s @@ -17,5 +17,3 @@ glabel BossGanon2_Destroy /* 00588 808FD4C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0058C 808FD4CC 03E00008 */ jr $ra /* 00590 808FD4D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index fbf184a367..14e973c4d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8090D9BC + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D9D0 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D9E4 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.text glabel BossGanon2_Draw /* 089B0 809058F0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 089B4 809058F4 AFB10028 */ sw $s1, 0x0028($sp) @@ -312,5 +326,3 @@ glabel BossGanon2_Draw /* 08E5C 80905D9C 8FB10028 */ lw $s1, 0x0028($sp) /* 08E60 80905DA0 03E00008 */ jr $ra /* 08E64 80905DA4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s index 74f3e48605..4e808fb72c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s @@ -76,5 +76,3 @@ glabel BossGanon2_Init /* 00540 808FD480 8FB00024 */ lw $s0, 0x0024($sp) /* 00544 808FD484 03E00008 */ jr $ra /* 00548 808FD488 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s index ac5bbe1c8e..b78540fa86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s @@ -1,3 +1,75 @@ +.late_rodata +glabel D_8090DC64 + .float 0.3 + +glabel D_8090DC68 + .word 0x465AC000 +glabel D_8090DC6C + .word 0x463B8000 +glabel D_8090DC70 + .float 0.2 + +glabel D_8090DC74 + .float 1.9 + +glabel D_8090DC78 + .float 10000.0 + +glabel jtbl_8090DC7C +.word L80903360 +.word L8090304C +.word L80903360 +.word L80903360 +.word L80903070 +.word L809030C0 +.word L80903110 +.word L809031D8 +.word L80903264 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L80903360 +.word L809032A4 +.word L809032C8 +.word L809032F0 +.word L80903318 +.word L80903340 +glabel D_8090DCE4 + .float 0.15 + +glabel D_8090DCE8 + .float 0.15 + +glabel D_8090DCEC + .float 0.15 + +glabel D_8090DCF0 + .float 0.15 + +glabel D_8090DCF4 + .float 6.28318548203 + +glabel D_8090DCF8 + .float 0.1 + +glabel D_8090DCFC + .float 0.3 + +glabel D_8090DD00 + .float 0.2 + +glabel D_8090DD04 + .float 0.15 + +.text glabel BossGanon2_Update /* 058E0 80902820 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 058E4 80902824 AFBF002C */ sw $ra, 0x002C($sp) @@ -911,5 +983,3 @@ glabel L80903360 /* 06598 809034D8 8FB20028 */ lw $s2, 0x0028($sp) /* 0659C 809034DC 03E00008 */ jr $ra /* 065A0 809034E0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF40.s index 841e2fbc15..7a2163f077 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF40.s @@ -6,5 +6,3 @@ glabel func_808FCF40 /* 00010 808FCF50 3C018091 */ lui $at, %hi(D_809105D0) ## $at = 80910000 /* 00014 808FCF54 03E00008 */ jr $ra /* 00018 808FCF58 AC2605D0 */ sw $a2, %lo(D_809105D0)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF5C.s index c5c51fbb58..661cd5e32d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FCF5C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8090DA98 + .float 30269.0 + +glabel D_8090DA9C + .float 30307.0 + +glabel D_8090DAA0 + .float 30323.0 + +.text glabel func_808FCF5C /* 0001C 808FCF5C 3C028091 */ lui $v0, %hi(D_809105C8) ## $v0 = 80910000 /* 00020 808FCF60 244205C8 */ addiu $v0, $v0, %lo(D_809105C8) ## $v0 = 809105C8 @@ -74,5 +85,3 @@ glabel func_808FCF5C .L808FD078: /* 00138 808FD078 03E00008 */ jr $ra /* 0013C 808FD07C 46001005 */ abs.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD080.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD080.s index f95b69101c..91ecac36ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD080.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD080.s @@ -33,5 +33,3 @@ glabel func_808FD080 /* 001BC 808FD0FC 440A8000 */ mfc1 $t2, $f16 /* 001C0 808FD100 03E00008 */ jr $ra /* 001C4 808FD104 A46A0036 */ sh $t2, 0x0036($v1) ## 00000036 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s index 7ff4a59b2f..5b4fb04767 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8090D6C0 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D6D4 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.text glabel func_808FD108 /* 001C8 808FD108 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 001CC 808FD10C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -67,5 +77,3 @@ glabel func_808FD108 /* 002C4 808FD204 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 002C8 808FD208 03E00008 */ jr $ra /* 002CC 808FD20C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD210.s index 46e0845f93..a440245aa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD210.s @@ -26,5 +26,3 @@ glabel func_808FD210 /* 00330 808FD270 AC58000C */ sw $t8, 0x000C($v0) ## 0001000C /* 00334 808FD274 03E00008 */ jr $ra /* 00338 808FD278 E4480020 */ swc1 $f8, 0x0020($v0) ## 00010020 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s index f31bb527c1..121738fa27 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8090DAA4 + .float 6.28318548203 + +glabel D_8090DAA8 + .float 6.28318548203 + +glabel D_8090DAAC + .float 6.28318548203 + +.text glabel func_808FD27C /* 0033C 808FD27C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00340 808FD280 AFB00018 */ sw $s0, 0x0018($sp) @@ -61,5 +72,3 @@ glabel func_808FD27C /* 00410 808FD350 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00414 808FD354 03E00008 */ jr $ra /* 00418 808FD358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD4D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD4D4.s index ed76984091..28c65360d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD4D4.s @@ -64,5 +64,3 @@ glabel func_808FD4D4 /* 00678 808FD5B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0067C 808FD5BC 03E00008 */ jr $ra /* 00680 808FD5C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5C4.s index ca6cc2e9ad..ea0d9260ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8090DAB0 + .word 0xC53B8000 + +.text glabel func_808FD5C4 /* 00684 808FD5C4 AFA50004 */ sw $a1, 0x0004($sp) /* 00688 808FD5C8 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 @@ -11,5 +16,3 @@ glabel func_808FD5C4 /* 006A8 808FD5E8 C424DAB0 */ lwc1 $f4, %lo(D_8090DAB0)($at) /* 006AC 808FD5EC 03E00008 */ jr $ra /* 006B0 808FD5F0 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 8a6097dddb..0d0d72c3ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -1,3 +1,100 @@ +.late_rodata +glabel jtbl_8090DAB4 +.word L808FD644 +.word L808FD80C +.word L808FD940 +.word L808FDB64 +.word L808FDC48 +.word L808FDD74 +.word L808FF810 +.word L808FF810 +.word L808FF810 +.word L808FF810 +.word L808FDDE8 +.word L808FDF70 +.word L808FE1C0 +.word L808FE1C0 +.word L808FE2E0 +.word L808FE4C0 +.word L808FE63C +.word L808FE8E4 +.word L808FEA08 +.word L808FEAC8 +.word L808FEB70 +.word L808FECE8 +.word L808FED50 +.word L808FEF74 +.word L808FF150 +.word L808FF1F4 +.word L808FF330 +.word L808FF404 +.word L808FF51C +.word L808FF678 +glabel D_8090DB2C + .word 0x44728000 +glabel D_8090DB30 + .word 0x4487C000 +glabel D_8090DB34 + .word 0x44728000 +glabel D_8090DB38 + .word 0x4487C000 +glabel D_8090DB3C + .word 0x44728000 +glabel D_8090DB40 + .word 0x4487C000 +glabel D_8090DB44 + .float 1500.0 + +glabel D_8090DB48 + .word 0x4487C000 +glabel D_8090DB4C + .word 0x44728000 +glabel D_8090DB50 + .word 0x4487C000 +glabel D_8090DB54 + .word 0x44738000 +glabel D_8090DB58 + .word 0x4487C000 +glabel D_8090DB5C + .word 0x44688000 +glabel D_8090DB60 + .word 0x448D2000 +glabel D_8090DB64 + .word 0x44A14000 +glabel D_8090DB68 + .word 0x4487C000 +glabel D_8090DB6C + .word 0x4487C000 +glabel D_8090DB70 + .word 0x4487C000 +glabel D_8090DB74 + .word 0x4487C000 +glabel D_8090DB78 + .word 0x448C2000 +glabel D_8090DB7C + .word 0x447C4000 +glabel D_8090DB80 + .float 7000.0 + +glabel D_8090DB84 + .word 0x448A4000 +glabel D_8090DB88 + .word 0x4487C000 +glabel D_8090DB8C + .word 0x44EBC000 +glabel D_8090DB90 + .word 0x4487C000 +glabel D_8090DB94 + .word 0x44896000 +glabel D_8090DB98 + .float 0.8 + +glabel D_8090DB9C + .word 0x44896000 +glabel D_8090DBA0 + .word 0x4487C000 + +.text glabel func_808FD5F4 /* 006B4 808FD5F4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 006B8 808FD5F8 AFBF003C */ sw $ra, 0x003C($sp) @@ -2360,5 +2457,3 @@ glabel L808FF810 /* 0294C 808FF88C 8FB10038 */ lw $s1, 0x0038($sp) /* 02950 808FF890 03E00008 */ jr $ra /* 02954 808FF894 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FF898.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FF898.s index 5ff6b2e4a2..040f72cdac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FF898.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FF898.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8090DBA4 + .float 10000.0 + +glabel D_8090DBA8 + .float 3.14159274101 + +.text glabel func_808FF898 /* 02958 808FF898 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0295C 808FF89C AFBF001C */ sw $ra, 0x001C($sp) @@ -106,5 +114,3 @@ glabel func_808FF898 /* 02AD8 808FFA18 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02ADC 808FFA1C 03E00008 */ jr $ra /* 02AE0 808FFA20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFA24.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFA24.s index 02cba30502..bd00ff6808 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFA24.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFA24.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8090DBAC + .float 40000.0 + +.text glabel func_808FFA24 /* 02AE4 808FFA24 8CA21C64 */ lw $v0, 0x1C64($a1) ## 00001C64 /* 02AE8 808FFA28 3C018091 */ lui $at, %hi(D_8090DBAC) ## $at = 80910000 @@ -45,5 +50,3 @@ glabel func_808FFA24 /* 02B7C 808FFABC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02B80 808FFAC0 03E00008 */ jr $ra /* 02B84 808FFAC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s index bad06427c1..da83c6bbdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s @@ -70,5 +70,3 @@ glabel func_808FFAC8 /* 02C70 808FFBB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02C74 808FFBB4 03E00008 */ jr $ra /* 02C78 808FFBB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s index d763159c37..f2ae10fbde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8090DBB0 + .float 5000.0 + +glabel D_8090DBB4 + .float 3000.0 + +.text glabel func_808FFBBC /* 02C7C 808FFBBC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02C80 808FFBC0 AFA60028 */ sw $a2, 0x0028($sp) @@ -56,5 +64,3 @@ glabel func_808FFBBC /* 02D38 808FFC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D3C 808FFC7C 03E00008 */ jr $ra /* 02D40 808FFC80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFC84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFC84.s index 8e01b52178..be574b0863 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFC84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFC84.s @@ -32,5 +32,3 @@ glabel func_808FFC84 /* 02DB0 808FFCF0 AC8A0040 */ sw $t2, 0x0040($a0) ## 00000040 /* 02DB4 808FFCF4 03E00008 */ jr $ra /* 02DB8 808FFCF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s index cdbcfa448d..8276fc5697 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s @@ -48,5 +48,3 @@ glabel func_808FFCFC /* 02E64 808FFDA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E68 808FFDA8 03E00008 */ jr $ra /* 02E6C 808FFDAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s index bd0c575188..9546d17ffa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s @@ -73,5 +73,3 @@ glabel func_808FFDB0 /* 02F70 808FFEB0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02F74 808FFEB4 03E00008 */ jr $ra /* 02F78 808FFEB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s index 7a86f51508..b831406659 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s @@ -59,5 +59,3 @@ glabel func_808FFEBC /* 03044 808FFF84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03048 808FFF88 03E00008 */ jr $ra /* 0304C 808FFF8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s index fed228249d..b08f6d6ad1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s @@ -19,5 +19,3 @@ glabel func_808FFF90 /* 03094 808FFFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03098 808FFFD8 03E00008 */ jr $ra /* 0309C 808FFFDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s index ac556da31f..3b88ce4c67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s @@ -53,5 +53,3 @@ glabel func_808FFFE0 /* 03154 80900094 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03158 80900098 03E00008 */ jr $ra /* 0315C 8090009C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s index 3794921734..6f3a2af184 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s @@ -25,5 +25,3 @@ glabel func_809000A0 /* 031B8 809000F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 031BC 809000FC 03E00008 */ jr $ra /* 031C0 80900100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s index 04d3033a7c..afae1ac55a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s @@ -74,5 +74,3 @@ glabel func_80900104 /* 032C4 80900204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 032C8 80900208 03E00008 */ jr $ra /* 032CC 8090020C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s index cf7ccabbba..2cc058363c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s @@ -23,5 +23,3 @@ glabel func_80900210 /* 03320 80900260 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03324 80900264 03E00008 */ jr $ra /* 03328 80900268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s index 9dd158e368..10155e9329 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s @@ -26,5 +26,3 @@ glabel func_8090026C /* 03380 809002C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03384 809002C4 03E00008 */ jr $ra /* 03388 809002C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s index 740ad9d529..c0e9a61e6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s @@ -30,5 +30,3 @@ glabel func_809002CC /* 033F8 80900338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 033FC 8090033C 03E00008 */ jr $ra /* 03400 80900340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s index b2ec4cd1f4..0d3c8d3fd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8090DBB8 + .float 0.005 + +.text glabel func_80900344 /* 03404 80900344 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 03408 80900348 AFBF001C */ sw $ra, 0x001C($sp) @@ -158,5 +163,3 @@ glabel func_80900344 /* 03634 80900574 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03638 80900578 03E00008 */ jr $ra /* 0363C 8090057C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s index c15710cab7..fab2262abc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s @@ -55,5 +55,3 @@ glabel func_80900580 /* 03704 80900644 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03708 80900648 03E00008 */ jr $ra /* 0370C 8090064C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s index 720c0c17ba..3805018ef7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s @@ -125,5 +125,3 @@ glabel func_80900650 /* 038CC 8090080C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 038D0 80900810 03E00008 */ jr $ra /* 038D4 80900814 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s index 58635e5e2d..bf22eed9a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s @@ -31,5 +31,3 @@ glabel func_80900818 /* 03944 80900884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03948 80900888 03E00008 */ jr $ra /* 0394C 8090088C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index 820a26fc9f..3132930221 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -1,3 +1,24 @@ +.late_rodata +glabel jtbl_8090DBBC +.word L80900904 +.word L809009A8 +.word L80900AFC +.word L80900E4C +.word L80900E4C +.word L80900E4C +.word L80900E4C +.word L80900E4C +.word L80900E4C +.word L80900E4C +.word L80900C88 +.word L80900CE4 +glabel D_8090DBEC + .float 3.14159274101 + +glabel D_8090DBF0 + .float 0.3 + +.text glabel func_80900890 /* 03950 80900890 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 03954 80900894 AFB00014 */ sw $s0, 0x0014($sp) @@ -516,5 +537,3 @@ glabel L80900E4C /* 040D4 80901014 8FB10018 */ lw $s1, 0x0018($sp) /* 040D8 80901018 03E00008 */ jr $ra /* 040DC 8090101C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s index 174ee12b9d..040024c911 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s @@ -32,5 +32,3 @@ glabel func_80901020 /* 04150 80901090 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04154 80901094 03E00008 */ jr $ra /* 04158 80901098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s index 0d06da1341..d35855616d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s @@ -96,5 +96,3 @@ glabel func_8090109C /* 042C0 80901200 8FB70070 */ lw $s7, 0x0070($sp) /* 042C4 80901204 03E00008 */ jr $ra /* 042C8 80901208 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index e85365f4c7..7f245adb9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -1,3 +1,45 @@ +.late_rodata +glabel jtbl_8090DBF4 +.word L8090129C +.word L80901344 +.word L80901560 +.word L80901648 +.word L80901700 +.word L809017B4 +.word L80901968 +.word L80901AB0 +.word L80901E00 +.word L80901F88 +.word L80902014 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902290 +.word L80902240 +glabel D_8090DC48 + .float 1150.0 + +glabel D_8090DC4C + .float 1150.0 + +glabel D_8090DC50 + .word 0x43868000 +glabel D_8090DC54 + .word 0x448BA000 +glabel D_8090DC58 + .float -0.8 + +glabel D_8090DC5C + .word 0x448F4000 +glabel D_8090DC60 + .float 1150.0 + +.text glabel func_8090120C /* 042CC 8090120C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 042D0 80901210 AFBF0024 */ sw $ra, 0x0024($sp) @@ -1200,5 +1242,3 @@ glabel L80902290 /* 053FC 8090233C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 05400 80902340 03E00008 */ jr $ra /* 05404 80902344 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s index bdfb183071..5d916223a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s @@ -129,5 +129,3 @@ glabel func_80902348 /* 055D8 80902518 8FB20028 */ lw $s2, 0x0028($sp) /* 055DC 8090251C 03E00008 */ jr $ra /* 055E0 80902520 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s index 6c86c270a3..3482167b8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8090D6E8 + .asciz "this->no_hit_time %d\n" + .balign 4 + +glabel D_8090D700 + .asciz "this->look_on %d\n" + .balign 4 + +.text glabel func_80902524 /* 055E4 80902524 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 055E8 80902528 AFB00018 */ sw $s0, 0x0018($sp) @@ -211,5 +221,3 @@ glabel func_80902524 /* 058D4 80902814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 058D8 80902818 03E00008 */ jr $ra /* 058DC 8090281C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s index c9c83e409d..d517ace35b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8090DD08 + .word 0x3DA9FBE7 +glabel D_8090DD0C + .word 0x3DA9FBE7 + +.text glabel func_809034E4 /* 065A4 809034E4 27BDFD20 */ addiu $sp, $sp, 0xFD20 ## $sp = FFFFFD20 /* 065A8 809034E8 AFBE0068 */ sw $s8, 0x0068($sp) @@ -698,5 +705,3 @@ glabel func_809034E4 /* 06FEC 80903F2C 8FBE0068 */ lw $s8, 0x0068($sp) /* 06FF0 80903F30 03E00008 */ jr $ra /* 06FF4 80903F34 27BD02E0 */ addiu $sp, $sp, 0x02E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s index 742f49832e..8a961e635a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8090D714 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D728 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D73C + .asciz "../z_boss_ganon2.c" + .balign 4 + +.text glabel func_80903F38 /* 06FF8 80903F38 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 06FFC 80903F3C AFBF003C */ sw $ra, 0x003C($sp) @@ -117,5 +131,3 @@ glabel func_80903F38 /* 071BC 809040FC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 071C0 80904100 03E00008 */ jr $ra /* 071C4 80904104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s index c25a5198b7..32600978b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s @@ -1,3 +1,25 @@ +.rdata +glabel D_8090D750 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D764 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D778 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD10 + .word 0x4487C000 +glabel D_8090DD14 + .word 0x3DC8B43A +glabel D_8090DD18 + .float 0.1 + +.text glabel func_80904108 /* 071C8 80904108 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 071CC 8090410C AFBF003C */ sw $ra, 0x003C($sp) @@ -142,5 +164,3 @@ glabel func_80904108 /* 073F4 80904334 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 073F8 80904338 03E00008 */ jr $ra /* 073FC 8090433C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s index a1969f30de..6703f25a40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s @@ -1,3 +1,34 @@ +.rdata +glabel D_8090D78C + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D7A0 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D7B4 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD1C + .float 3.14159274101 + +glabel D_8090DD20 + .float 5000.0 + +glabel D_8090DD24 + .word 0x3FA0D97C +glabel D_8090DD28 + .word 0x45959000 +glabel D_8090DD2C + .float 0.01 + +glabel D_8090DD30 + .float 3.14159274101 + +.text glabel func_80904340 /* 07400 80904340 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 07404 80904344 AFB60060 */ sw $s6, 0x0060($sp) @@ -204,5 +235,3 @@ glabel func_80904340 /* 07700 80904640 8FB60060 */ lw $s6, 0x0060($sp) /* 07704 80904644 03E00008 */ jr $ra /* 07708 80904648 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s index 0ed0e2b061..5b8f02f965 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s @@ -1,3 +1,23 @@ +.rdata +glabel D_8090D7C8 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D7DC + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D7F0 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD34 + .word 0xBE4CCCCD +glabel D_8090DD38 + .float 0.6 + +.text glabel func_8090464C /* 0770C 8090464C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 07710 80904650 AFBF001C */ sw $ra, 0x001C($sp) @@ -115,5 +135,3 @@ glabel func_8090464C /* 078CC 8090480C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 078D0 80904810 03E00008 */ jr $ra /* 078D4 80904814 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s index 434a2c1967..b925589562 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8090D804 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D818 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.text glabel func_80904818 /* 078D8 80904818 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 078DC 8090481C AFB00018 */ sw $s0, 0x0018($sp) @@ -102,5 +112,3 @@ glabel func_80904818 /* 07A54 80904994 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 07A58 80904998 03E00008 */ jr $ra /* 07A5C 8090499C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s index e0351a6340..ac06d0067d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s @@ -1,3 +1,27 @@ +.rdata +glabel D_8090D82C + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D840 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D854 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D868 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD3C + .word 0x4684D000 +glabel D_8090DD40 + .float 3000.0 + +.text glabel func_809049A0 /* 07A60 809049A0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 07A64 809049A4 AFBF001C */ sw $ra, 0x001C($sp) @@ -265,5 +289,3 @@ glabel func_809049A0 /* 07E3C 80904D7C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 07E40 80904D80 03E00008 */ jr $ra /* 07E44 80904D84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s index d2d6b0bc5d..ae4fdd38f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8090D87C + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D890 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D8A4 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD44 + .float 3.14159274101 + +.text glabel func_80904D88 /* 07E48 80904D88 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 07E4C 80904D8C AFBF0044 */ sw $ra, 0x0044($sp) @@ -148,5 +166,3 @@ glabel func_80904D88 /* 0807C 80904FBC 8FBE0040 */ lw $s8, 0x0040($sp) /* 08080 80904FC0 03E00008 */ jr $ra /* 08084 80904FC4 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s index b1f5817577..0a1919aacb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8090D8B8 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D8CC + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D8E0 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D8F4 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.text glabel func_80904FC8 /* 08088 80904FC8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0808C 80904FCC AFBF001C */ sw $ra, 0x001C($sp) @@ -157,5 +175,3 @@ glabel func_80904FC8 /* 082F0 80905230 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 082F4 80905234 03E00008 */ jr $ra /* 082F8 80905238 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s index 82082babe5..6af45e21b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s @@ -1,3 +1,23 @@ +.rdata +glabel D_8090D908 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D91C + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D930 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD48 + .word 0x3E6EEEED +glabel D_8090DD4C + .float 6.28318548203 + +.text glabel func_8090523C /* 082FC 8090523C 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 08300 80905240 AFBF006C */ sw $ra, 0x006C($sp) @@ -183,5 +203,3 @@ glabel func_8090523C /* 085BC 809054FC 8FBE0068 */ lw $s8, 0x0068($sp) /* 085C0 80905500 03E00008 */ jr $ra /* 085C4 80905504 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s index eaee23c690..25fa7ae905 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8090D944 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D958 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D96C + .asciz "../z_boss_ganon2.c" + .balign 4 + +.text glabel func_80905508 /* 085C8 80905508 3C0E8090 */ lui $t6, %hi(D_80907144) ## $t6 = 80900000 /* 085CC 8090550C 25CE7144 */ addiu $t6, $t6, %lo(D_80907144) ## $t6 = 80907144 @@ -94,5 +108,3 @@ glabel func_80905508 /* 08728 80905668 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0872C 8090566C 03E00008 */ jr $ra /* 08730 80905670 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s index f80a078189..d0c44eaee7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s @@ -1,3 +1,25 @@ +.rdata +glabel D_8090D980 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D994 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090D9A8 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD50 + .word 0xBF490FDB +glabel D_8090DD54 + .word 0x3D23D70B +glabel D_8090DD58 + .float 1.57079637051 + +.text glabel func_80905674 /* 08734 80905674 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 08738 80905678 AFBF003C */ sw $ra, 0x003C($sp) @@ -159,5 +181,3 @@ glabel func_80905674 /* 089A4 809058E4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 089A8 809058E8 03E00008 */ jr $ra /* 089AC 809058EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905DA8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905DA8.s index 3116999c58..d4102f115b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905DA8.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_8090DD5C + .word 0x44944000 +glabel D_8090DD60 + .word 0x44894000 +glabel D_8090DD64 + .word 0x3FA0D97C +glabel D_8090DD68 + .float 1.57079637051 + +glabel D_8090DD6C + .word 0x4487C000 +glabel D_8090DD70 + .word 0x441C4000 +glabel D_8090DD74 + .float 0.1 + +glabel D_8090DD78 + .float 0.4 + +glabel D_8090DD7C + .word 0xBE4CCCCD + +.text glabel func_80905DA8 /* 08E68 80905DA8 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 08E6C 80905DAC F7BE0040 */ sdc1 $f30, 0x0040($sp) @@ -216,5 +240,3 @@ glabel func_80905DA8 /* 0919C 809060DC 8FBE0068 */ lw $s8, 0x0068($sp) /* 091A0 809060E0 03E00008 */ jr $ra /* 091A4 809060E4 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s index 6eb73bc2c9..9b75d2d505 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s @@ -1,3 +1,39 @@ +.rdata +glabel D_8090D9F8 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090DA0C + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090DA20 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090DA34 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090DA48 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD80 + .float 0.03 + +glabel D_8090DD84 + .word 0x3F20D97C +glabel D_8090DD88 + .float 1.57079637051 + +glabel D_8090DD8C + .word 0x44894000 +glabel D_8090DD90 + .word 0x4487C000 + +.text glabel func_809060E8 /* 091A8 809060E8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 091AC 809060EC AFB40048 */ sw $s4, 0x0048($sp) @@ -283,5 +319,3 @@ glabel func_809060E8 /* 095EC 8090652C 8FBE0058 */ lw $s8, 0x0058($sp) /* 095F0 80906530 03E00008 */ jr $ra /* 095F4 80906534 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906538.s index 8625e13db3..2c8f85691a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906538.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8090DD94 + .float 0.2 + +.text glabel func_80906538 /* 095F8 80906538 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 095FC 8090653C F7BE0038 */ sdc1 $f30, 0x0038($sp) @@ -327,5 +332,3 @@ glabel func_80906538 /* 09AAC 809069EC 8FB30050 */ lw $s3, 0x0050($sp) /* 09AB0 809069F0 03E00008 */ jr $ra /* 09AB4 809069F4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809069F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809069F8.s index d5ae39c2ae..2a21868bda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809069F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809069F8.s @@ -47,5 +47,3 @@ glabel func_809069F8 /* 09B64 80906AA4 8FB20028 */ lw $s2, 0x0028($sp) /* 09B68 80906AA8 03E00008 */ jr $ra /* 09B6C 80906AAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s index e2c83e08a3..d8df936b6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8090DA5C + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090DA70 + .asciz "../z_boss_ganon2.c" + .balign 4 + +glabel D_8090DA84 + .asciz "../z_boss_ganon2.c" + .balign 4 + +.late_rodata +glabel D_8090DD98 + .word 0x3FD33333, 0x00000000 + +.text glabel func_80906AB0 /* 09B70 80906AB0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 09B74 80906AB4 AFBF001C */ sw $ra, 0x001C($sp) @@ -165,4 +183,3 @@ glabel func_80906AB0 /* 09DF4 80906D34 00000000 */ nop /* 09DF8 80906D38 00000000 */ nop /* 09DFC 80906D3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s index f47300fd79..4afa9a20aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s @@ -38,5 +38,3 @@ glabel BossGanondrof_Destroy /* 00734 80910D74 8FB10018 */ lw $s1, 0x0018($sp) /* 00738 80910D78 03E00008 */ jr $ra /* 0073C 80910D7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s index be43b821a1..4f2593f738 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s @@ -304,4 +304,3 @@ glabel BossGanondrof_Draw /* 04664 80914CA4 00000000 */ nop /* 04668 80914CA8 00000000 */ nop /* 0466C 80914CAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s index 055bc5adcf..8d28f8fde5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s @@ -181,5 +181,3 @@ glabel BossGanondrof_Init /* 006B0 80910CF0 8FB10038 */ lw $s1, 0x0038($sp) /* 006B4 80910CF4 03E00008 */ jr $ra /* 006B8 80910CF8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s index df72f96f5b..e9402dd1b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s @@ -314,5 +314,3 @@ glabel BossGanondrof_Update /* 03C94 809142D4 8FB20030 */ lw $s2, 0x0030($sp) /* 03C98 809142D8 03E00008 */ jr $ra /* 03C9C 809142DC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910640.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910640.s index 2d553bcdc1..828642ee9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910640.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910640.s @@ -17,5 +17,3 @@ glabel func_80910640 .L80910678: /* 00038 80910678 03E00008 */ jr $ra /* 0003C 8091067C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910680.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910680.s index ea73fc3fd0..8285044ee3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910680.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910680.s @@ -17,5 +17,3 @@ glabel func_80910680 .L809106B8: /* 00078 809106B8 03E00008 */ jr $ra /* 0007C 809106BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106C0.s index f094b119ac..7ca07f987e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106C0.s @@ -12,5 +12,3 @@ glabel func_809106C0 .L809106E8: /* 000A8 809106E8 03E00008 */ jr $ra /* 000AC 809106EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106F0.s index 0ae80d0bc3..f8eeb5dbed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809106F0.s @@ -18,5 +18,3 @@ glabel func_809106F0 .L80910730: /* 000F0 80910730 03E00008 */ jr $ra /* 000F4 80910734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910738.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910738.s index 4e976aa674..34e6db19b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910738.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910738.s @@ -19,5 +19,3 @@ glabel func_80910738 .L8091077C: /* 0013C 8091077C 03E00008 */ jr $ra /* 00140 80910780 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s index 16b0a7c94e..5efa1d829d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s @@ -175,5 +175,3 @@ glabel func_80910784 /* 003E8 80910A28 8FBE0038 */ lw $s8, 0x0038($sp) /* 003EC 80910A2C 03E00008 */ jr $ra /* 003F0 80910A30 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910A34.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910A34.s index e69eb5f00f..1ea3ea75d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910A34.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910A34.s @@ -14,5 +14,3 @@ glabel func_80910A34 /* 00424 80910A64 44099000 */ mfc1 $t1, $f18 /* 00428 80910A68 03E00008 */ jr $ra /* 0042C 80910A6C A4A9004A */ sh $t1, 0x004A($a1) ## 0000004A - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s index 2ae6006723..13cea689c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s @@ -18,5 +18,3 @@ glabel func_80910D80 /* 00780 80910DC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00784 80910DC4 03E00008 */ jr $ra /* 00788 80910DC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index 8814e33196..f48263ddb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -333,5 +333,3 @@ glabel func_80910DCC /* 00C48 80911288 D7B40030 */ ldc1 $f20, 0x0030($sp) /* 00C4C 8091128C 03E00008 */ jr $ra /* 00C50 80911290 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s index 082cf3b466..178fe95a64 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s @@ -15,5 +15,3 @@ glabel func_80911294 /* 00C88 809112C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C8C 809112CC 03E00008 */ jr $ra /* 00C90 809112D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s index 2b6496fc04..854b027a6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s @@ -145,5 +145,3 @@ glabel func_809112D4 /* 00E9C 809114DC 8FB10038 */ lw $s1, 0x0038($sp) /* 00EA0 809114E0 03E00008 */ jr $ra /* 00EA4 809114E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s index dc357e05d7..3a9901d1ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s @@ -33,5 +33,3 @@ glabel func_809114E8 /* 00F20 80911560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F24 80911564 03E00008 */ jr $ra /* 00F28 80911568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s index 3d35aeff7c..f75089cdd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s @@ -512,5 +512,3 @@ glabel func_8091156C /* 01664 80911CA4 8FB10028 */ lw $s1, 0x0028($sp) /* 01668 80911CA8 03E00008 */ jr $ra /* 0166C 80911CAC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s index 8d3790dba5..6366397c13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s @@ -79,5 +79,3 @@ glabel func_80911CB0 /* 0178C 80911DCC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01790 80911DD0 03E00008 */ jr $ra /* 01794 80911DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s index 0152d104b3..af798ef1da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s @@ -164,5 +164,3 @@ glabel func_80911DD8 /* 019D4 80912014 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 019D8 80912018 03E00008 */ jr $ra /* 019DC 8091201C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s index 0e7cde88a4..1ac5956431 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s @@ -40,5 +40,3 @@ glabel func_80912020 /* 01A70 809120B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01A74 809120B4 03E00008 */ jr $ra /* 01A78 809120B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s index 3e58a049d8..36c5e7b18a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s @@ -82,5 +82,3 @@ glabel func_809120BC /* 01B94 809121D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B98 809121D8 03E00008 */ jr $ra /* 01B9C 809121DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s index eb875a2c61..89ed23b0fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s @@ -52,5 +52,3 @@ glabel func_809121E0 /* 01C58 80912298 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C5C 8091229C 03E00008 */ jr $ra /* 01C60 809122A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s index 109747fa04..895b1cd6be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s @@ -85,5 +85,3 @@ glabel func_809122A4 /* 01D88 809123C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D8C 809123CC 03E00008 */ jr $ra /* 01D90 809123D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s index 7ade13a92b..5569ea747e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s @@ -30,5 +30,3 @@ glabel func_809123D4 /* 01DFC 8091243C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E00 80912440 03E00008 */ jr $ra /* 01E04 80912444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s index 95b8f4d768..93c7d192e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s @@ -59,5 +59,3 @@ glabel func_80912448 /* 01ED8 80912518 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EDC 8091251C 03E00008 */ jr $ra /* 01EE0 80912520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s index e2ec7dfea9..96045e150f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s @@ -28,5 +28,3 @@ glabel func_80912524 /* 01F48 80912588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F4C 8091258C 03E00008 */ jr $ra /* 01F50 80912590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index 49584e1895..6c93c7793e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -481,5 +481,3 @@ glabel func_80912594 /* 02648 80912C88 8FB10060 */ lw $s1, 0x0060($sp) /* 0264C 80912C8C 03E00008 */ jr $ra /* 02650 80912C90 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s index 5d8e08a8a4..6ae572f125 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s @@ -40,5 +40,3 @@ glabel func_80912C94 /* 026E0 80912D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 026E4 80912D24 03E00008 */ jr $ra /* 026E8 80912D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index ad684a5a70..01027e6252 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -1055,5 +1055,3 @@ glabel L8091352C /* 03608 80913C48 8FB40048 */ lw $s4, 0x0048($sp) /* 0360C 80913C4C 03E00008 */ jr $ra /* 03610 80913C50 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80913C54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80913C54.s index ace45951e2..bbff6e20bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80913C54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80913C54.s @@ -164,5 +164,3 @@ glabel func_80913C54 /* 03840 80913E80 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03844 80913E84 03E00008 */ jr $ra /* 03848 80913E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s index 38f4d5d63d..be7af3a818 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s @@ -46,5 +46,3 @@ glabel L8091430C /* 03D48 80914388 440F5000 */ mfc1 $t7, $f10 /* 03D4C 8091438C 03E00008 */ jr $ra /* 03D50 80914390 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s index 7bce98545a..9dcec9d63e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s @@ -22,5 +22,3 @@ glabel func_80914394 /* 03DA4 809143E4 440B5000 */ mfc1 $t3, $f10 /* 03DA8 809143E8 03E00008 */ jr $ra /* 03DAC 809143EC A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s index 160ddc5c2b..f2dc7a6574 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s @@ -22,5 +22,3 @@ glabel func_809143F0 /* 03E00 80914440 44195000 */ mfc1 $t9, $f10 /* 03E04 80914444 03E00008 */ jr $ra /* 03E08 80914448 A4790004 */ sh $t9, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s index 41f7cd5922..2339876044 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s @@ -22,5 +22,3 @@ glabel func_8091444C /* 03E5C 8091449C 440D5000 */ mfc1 $t5, $f10 /* 03E60 809144A0 03E00008 */ jr $ra /* 03E64 809144A4 A46D0004 */ sh $t5, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s index afc952aa55..c084ae50cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s @@ -22,5 +22,3 @@ glabel func_809144A8 /* 03EB8 809144F8 44095000 */ mfc1 $t1, $f10 /* 03EBC 809144FC 03E00008 */ jr $ra /* 03EC0 80914500 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s index 9d591276c8..f04c026309 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s @@ -22,5 +22,3 @@ glabel func_80914504 /* 03F14 80914554 440F5000 */ mfc1 $t7, $f10 /* 03F18 80914558 03E00008 */ jr $ra /* 03F1C 8091455C A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s index 1fbbc83cff..c1911affd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s @@ -22,5 +22,3 @@ glabel func_80914560 /* 03F70 809145B0 440B5000 */ mfc1 $t3, $f10 /* 03F74 809145B4 03E00008 */ jr $ra /* 03F78 809145B8 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s index 0388f68187..d50de230d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s @@ -20,5 +20,3 @@ glabel func_809145BC /* 03FC4 80914604 44193000 */ mfc1 $t9, $f6 /* 03FC8 80914608 03E00008 */ jr $ra /* 03FCC 8091460C A4790004 */ sh $t9, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s index d6f435e327..b8a04e3295 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s @@ -20,5 +20,3 @@ glabel func_80914610 /* 04018 80914658 440D9000 */ mfc1 $t5, $f18 /* 0401C 8091465C 03E00008 */ jr $ra /* 04020 80914660 A46D0004 */ sh $t5, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s index fa9995905d..dd89ffecaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s @@ -32,5 +32,3 @@ glabel L80914678 /* 04090 809146D0 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 /* 04094 809146D4 03E00008 */ jr $ra /* 04098 809146D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809146DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809146DC.s index 0ffa7bd75b..51cc5c826c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809146DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809146DC.s @@ -53,5 +53,3 @@ glabel func_809146DC /* 04154 80914794 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04158 80914798 03E00008 */ jr $ra /* 0415C 8091479C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809147A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809147A0.s index b979965624..e0b343b73f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809147A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809147A0.s @@ -30,5 +30,3 @@ glabel func_809147A0 /* 041CC 8091480C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 041D0 80914810 03E00008 */ jr $ra /* 041D4 80914814 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914818.s index 68515a8468..730160def4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914818.s @@ -11,5 +11,3 @@ glabel func_80914818 /* 041F8 80914838 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 041FC 8091483C 03E00008 */ jr $ra /* 04200 80914840 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s index e445454646..356cc7ab8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s @@ -13,5 +13,3 @@ glabel BossGoma_Destroy /* 0051C 80915F2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00520 80915F30 03E00008 */ jr $ra /* 00524 80915F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s index e297e61886..ad58b3f76e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8091B4B4 + .asciz "../z_boss_goma.c" + .balign 4 + +glabel D_8091B4C8 + .asciz "../z_boss_goma.c" + .balign 4 + +.text glabel BossGoma_Draw /* 05280 8091AC90 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 05284 8091AC94 AFB00020 */ sw $s0, 0x0020($sp) @@ -72,5 +82,3 @@ glabel BossGoma_Draw /* 0538C 8091AD9C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 05390 8091ADA0 03E00008 */ jr $ra /* 05394 8091ADA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index 6e70f8a2d3..7b71bef04a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -116,5 +116,3 @@ glabel BossGoma_Init /* 003DC 80915DEC 8FB10038 */ lw $s1, 0x0038($sp) /* 003E0 80915DF0 03E00008 */ jr $ra /* 003E4 80915DF4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s index d7abcfad31..e930db82a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s @@ -129,5 +129,3 @@ glabel BossGoma_Update /* 04B44 8091A554 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 04B48 8091A558 03E00008 */ jr $ra /* 04B4C 8091A55C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A10.s index 5d43ad2da3..f36a1af343 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A10.s @@ -12,5 +12,3 @@ glabel func_80915A10 .L80915A38: /* 00028 80915A38 03E00008 */ jr $ra /* 0002C 80915A3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A40.s index 67f2be209b..b073ef0dbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A40.s @@ -21,5 +21,3 @@ glabel func_80915A40 .L80915A8C: /* 0007C 80915A8C 03E00008 */ jr $ra /* 00080 80915A90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s index d93ac4e1b3..bf35d7326f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s @@ -107,5 +107,3 @@ glabel func_80915A94 /* 00228 80915C38 8FB40028 */ lw $s4, 0x0028($sp) /* 0022C 80915C3C 03E00008 */ jr $ra /* 00230 80915C40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915DF8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915DF8.s index 2f28a02c06..3d6068d47d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915DF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915DF8.s @@ -73,5 +73,3 @@ glabel func_80915DF8 /* 004E4 80915EF4 8FB10030 */ lw $s1, 0x0030($sp) /* 004E8 80915EF8 03E00008 */ jr $ra /* 004EC 80915EFC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s index dc181666c6..e59c3e46eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s @@ -53,5 +53,3 @@ glabel func_80915F38 /* 005E4 80915FF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005E8 80915FF8 03E00008 */ jr $ra /* 005EC 80915FFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s index fcfa25c4e0..80e1f6cdb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s @@ -42,5 +42,3 @@ glabel func_80916000 /* 00688 80916098 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0068C 8091609C 03E00008 */ jr $ra /* 00690 809160A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s index bf0583ae7f..f3adff0b09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s @@ -36,5 +36,3 @@ glabel func_809160A4 /* 00710 80916120 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00714 80916124 03E00008 */ jr $ra /* 00718 80916128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s index 05b9d6fc1b..e4d6f2fd34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s @@ -35,5 +35,3 @@ glabel func_8091612C /* 00794 809161A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00798 809161A8 03E00008 */ jr $ra /* 0079C 809161AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s index 5cd7c3b3c4..555f5c0927 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s @@ -31,5 +31,3 @@ glabel func_809161B0 /* 00810 80916220 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00814 80916224 03E00008 */ jr $ra /* 00818 80916228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s index 90e9065758..145f4d03be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s @@ -31,5 +31,3 @@ glabel func_8091622C /* 0088C 8091629C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00890 809162A0 03E00008 */ jr $ra /* 00894 809162A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s index ed5c877575..de3ebc422f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s @@ -30,5 +30,3 @@ glabel func_809162A8 /* 00900 80916310 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00904 80916314 03E00008 */ jr $ra /* 00908 80916318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s index be5e1287b8..e94498c4a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s @@ -31,5 +31,3 @@ glabel func_8091631C /* 00978 80916388 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0097C 8091638C 03E00008 */ jr $ra /* 00980 80916390 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s index b2e5655f53..8e047cd954 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s @@ -34,5 +34,3 @@ glabel func_80916394 /* 009FC 8091640C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A00 80916410 03E00008 */ jr $ra /* 00A04 80916414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s index 5011342b79..f09a03bc39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s @@ -39,5 +39,3 @@ glabel func_80916418 /* 00A90 809164A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A94 809164A4 03E00008 */ jr $ra /* 00A98 809164A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s index b503d4427d..22e7fe16fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s @@ -35,5 +35,3 @@ glabel func_809164AC /* 00B14 80916524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B18 80916528 03E00008 */ jr $ra /* 00B1C 8091652C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s index 4af64dedb4..5ab9df3e8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s @@ -38,5 +38,3 @@ glabel func_80916530 /* 00BA4 809165B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BA8 809165B8 03E00008 */ jr $ra /* 00BAC 809165BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s index d23b5c762a..db9bedc399 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s @@ -45,5 +45,3 @@ glabel func_809165C0 /* 00C4C 8091665C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C50 80916660 03E00008 */ jr $ra /* 00C54 80916664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s index 5296a0e75e..c13c577a3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s @@ -29,5 +29,3 @@ glabel func_80916668 /* 00CBC 809166CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CC0 809166D0 03E00008 */ jr $ra /* 00CC4 809166D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s index e6ca41755f..9900025f49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s @@ -30,5 +30,3 @@ glabel func_809166D8 /* 00D30 80916740 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D34 80916744 03E00008 */ jr $ra /* 00D38 80916748 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s index 2ab7695dd4..8e38f91fe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s @@ -30,5 +30,3 @@ glabel func_8091674C /* 00DA4 809167B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DA8 809167B8 03E00008 */ jr $ra /* 00DAC 809167BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s index 1e400d0cfc..db953064e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s @@ -32,5 +32,3 @@ glabel func_809167C0 /* 00E20 80916830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E24 80916834 03E00008 */ jr $ra /* 00E28 80916838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s index 03c8585820..a480c49077 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s @@ -30,5 +30,3 @@ glabel func_8091683C /* 00E94 809168A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E98 809168A8 03E00008 */ jr $ra /* 00E9C 809168AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s index bfa1bf66a9..2d856a9d26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s @@ -156,5 +156,3 @@ glabel func_809168B0 /* 010D0 80916AE0 8FBE0068 */ lw $s8, 0x0068($sp) /* 010D4 80916AE4 03E00008 */ jr $ra /* 010D8 80916AE8 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s index a9b4950572..80fad8a3b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s @@ -111,5 +111,3 @@ glabel func_80916AEC /* 01280 80916C90 8FB20030 */ lw $s2, 0x0030($sp) /* 01284 80916C94 03E00008 */ jr $ra /* 01288 80916C98 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s index 2e8214e308..0e40158192 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s @@ -1,3 +1,45 @@ +.rdata +glabel D_8091B430 + .asciz "MAKE CAMERA !!! 1 !!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_8091B4DC +.word L80916D30 +.word L80916E18 +.word L80916F0C +.word L809171FC +.word L80917318 +.word L80917520 +.word L80917D68 +.word L80917D68 +.word L80917D68 +.word L80917738 +glabel D_8091B504 + .word 0x4324B852 +glabel D_8091B508 + .word 0x43C6D70B +glabel D_8091B50C + .word 0x4324B852 +glabel D_8091B510 + .word 0x43C6D70B +glabel D_8091B514 + .word 0x3FE66666 +glabel D_8091B518 + .word 0x40490E56 +glabel D_8091B51C + .float 0.7 + +glabel D_8091B520 + .float 0.1 + +glabel D_8091B524 + .float 0.1 + +glabel D_8091B528 + .float 0.1 + +.text glabel func_80916C9C /* 0128C 80916C9C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01290 80916CA0 AFB00038 */ sw $s0, 0x0038($sp) @@ -1181,5 +1223,3 @@ glabel L80917D68 /* 0237C 80917D8C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02380 80917D90 03E00008 */ jr $ra /* 02384 80917D94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s index 4869ec2a3c..044d2c6bae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s @@ -1,3 +1,52 @@ +.late_rodata +glabel D_8091B52C + .float 10000.0 + +glabel D_8091B530 + .float 10000.0 + +glabel D_8091B534 + .word 0x3CB43958 +glabel D_8091B538 + .float 0.1 + +glabel D_8091B53C + .float 0.1 + +glabel D_8091B540 + .float 0.1 + +glabel D_8091B544 + .float 0.1 + +glabel D_8091B548 + .float 0.1 + +glabel D_8091B54C + .float 0.1 + +glabel D_8091B550 + .float 0.1 + +glabel D_8091B554 + .float 0.1 + +glabel D_8091B558 + .float 0.1 + +glabel D_8091B55C + .float 0.1 + +glabel D_8091B560 + .float 0.1 + +glabel D_8091B564 + .float 0.1 + +glabel D_8091B568 + .float 0.001 + +.text glabel func_80917D98 /* 02388 80917D98 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 0238C 80917D9C 3C0F8092 */ lui $t7, %hi(D_8091B2D8) ## $t7 = 80920000 @@ -1015,5 +1064,3 @@ glabel func_80917D98 /* 031EC 80918BFC 8FB30040 */ lw $s3, 0x0040($sp) /* 031F0 80918C00 03E00008 */ jr $ra /* 031F4 80918C04 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s index 5460c7a470..2a2bf231c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8091B56C + .word 0x419AAAAB + +.text glabel func_80918C08 /* 031F8 80918C08 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 031FC 80918C0C AFB00018 */ sw $s0, 0x0018($sp) @@ -73,5 +78,3 @@ glabel func_80918C08 /* 032F4 80918D04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 032F8 80918D08 03E00008 */ jr $ra /* 032FC 80918D0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D10.s index 7f7140fca4..96d37fcec6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D10.s @@ -25,5 +25,3 @@ glabel func_80918D10 /* 03350 80918D60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03354 80918D64 03E00008 */ jr $ra /* 03358 80918D68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s index 32d04288b8..b5c453adc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s @@ -166,5 +166,3 @@ glabel func_80918D6C /* 035A0 80918FB0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 035A4 80918FB4 03E00008 */ jr $ra /* 035A8 80918FB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s index 4022e73766..745335032a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s @@ -41,5 +41,3 @@ glabel func_80918FBC /* 03638 80919048 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0363C 8091904C 03E00008 */ jr $ra /* 03640 80919050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919054.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919054.s index af764f0203..baa1d5c407 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919054.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919054.s @@ -42,5 +42,3 @@ glabel func_80919054 /* 036DC 809190EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 036E0 809190F0 03E00008 */ jr $ra /* 036E4 809190F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809190F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809190F8.s index 581b27bf1f..165a802be3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809190F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809190F8.s @@ -23,5 +23,3 @@ glabel func_809190F8 /* 03734 80919144 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03738 80919148 03E00008 */ jr $ra /* 0373C 8091914C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s index deb0af305a..69648f0bf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s @@ -81,5 +81,3 @@ glabel func_80919150 /* 0385C 8091926C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03860 80919270 03E00008 */ jr $ra /* 03864 80919274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s index 72a75a7331..989c435ad7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s @@ -48,5 +48,3 @@ glabel func_80919278 /* 03910 80919320 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03914 80919324 03E00008 */ jr $ra /* 03918 80919328 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s index 7e0df565a3..fcb93c6934 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s @@ -52,5 +52,3 @@ glabel func_8091932C /* 039D0 809193E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 039D4 809193E4 03E00008 */ jr $ra /* 039D8 809193E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s index df38c34b6a..07e4072f83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s @@ -102,5 +102,3 @@ glabel func_809193EC /* 03B2C 8091953C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03B30 80919540 03E00008 */ jr $ra /* 03B34 80919544 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919548.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919548.s index 308584a2c3..009fbd0bb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919548.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919548.s @@ -24,5 +24,3 @@ glabel func_80919548 /* 03B88 80919598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B8C 8091959C 03E00008 */ jr $ra /* 03B90 809195A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s index 373c00357b..10a6477ce6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s @@ -29,5 +29,3 @@ glabel func_809195A4 /* 03BF0 80919600 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03BF4 80919604 03E00008 */ jr $ra /* 03BF8 80919608 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s index 9f5ef26d40..c90dfc5401 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s @@ -68,5 +68,3 @@ glabel func_8091960C /* 03CE8 809196F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03CEC 809196FC 03E00008 */ jr $ra /* 03CF0 80919700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s index dd8dc726db..b4bc8450d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s @@ -180,5 +180,3 @@ glabel func_80919704 /* 03F58 80919968 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03F5C 8091996C 03E00008 */ jr $ra /* 03F60 80919970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s index 10bf987909..55165cf02f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s @@ -57,5 +57,3 @@ glabel func_80919974 /* 04024 80919A34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04028 80919A38 03E00008 */ jr $ra /* 0402C 80919A3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s index c2413454fa..125641a8e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s @@ -140,5 +140,3 @@ glabel func_80919A40 /* 0421C 80919C2C 8FB10020 */ lw $s1, 0x0020($sp) /* 04220 80919C30 03E00008 */ jr $ra /* 04224 80919C34 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s index 4601f7f0c4..2337276d03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8091B570 + .float 0.3 + +.text glabel func_80919C38 /* 04228 80919C38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0422C 80919C3C AFBF001C */ sw $ra, 0x001C($sp) @@ -170,5 +175,3 @@ glabel func_80919C38 /* 04464 80919E74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04468 80919E78 03E00008 */ jr $ra /* 0446C 80919E7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s index 655b335932..582c97ffad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8091B574 + .float 0.1 + +glabel D_8091B578 + .float 0.2 + +.text glabel func_80919E80 /* 04470 80919E80 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 04474 80919E84 AFBF003C */ sw $ra, 0x003C($sp) @@ -72,5 +80,3 @@ glabel func_80919E80 /* 04570 80919F80 8FB10038 */ lw $s1, 0x0038($sp) /* 04574 80919F84 03E00008 */ jr $ra /* 04578 80919F88 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s index f091da71f8..f27e93b744 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s @@ -132,5 +132,3 @@ glabel func_80919F8C /* 04750 8091A160 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04754 8091A164 03E00008 */ jr $ra /* 04758 8091A168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s index cf59685eff..39cc34d8eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s @@ -106,5 +106,3 @@ glabel func_8091A16C /* 048CC 8091A2DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 048D0 8091A2E0 03E00008 */ jr $ra /* 048D4 8091A2E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s index bd4aacb864..b33f8f614b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s @@ -44,5 +44,3 @@ glabel func_8091A2E8 /* 04974 8091A384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04978 8091A388 03E00008 */ jr $ra /* 0497C 8091A38C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s index 644dc19f4b..eaca485d8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s @@ -1,3 +1,59 @@ +.rdata +glabel D_8091B464 + .asciz "../z_boss_goma.c" + .balign 4 + +glabel D_8091B478 + .asciz "../z_boss_goma.c" + .balign 4 + +glabel D_8091B48C + .asciz "../z_boss_goma.c" + .balign 4 + +glabel D_8091B4A0 + .asciz "../z_boss_goma.c" + .balign 4 + +.late_rodata +glabel jtbl_8091B57C +.word L8091A660 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A8F4 +.word L8091A8F4 +.word L8091A8F4 +.word L8091A8F4 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A774 +.word L8091A9B8 +.word L8091A9B8 +.word L8091A78C +.word L8091A9B8 +.word L8091A9B8 +.word L8091A7A4 +.word L8091A7CC + +.text glabel func_8091A560 /* 04B50 8091A560 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 04B54 8091A564 AFBF0014 */ sw $ra, 0x0014($sp) @@ -308,5 +364,3 @@ glabel L8091A9B8 /* 04FCC 8091A9DC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 04FD0 8091A9E0 03E00008 */ jr $ra /* 04FD4 8091A9E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s index d95a94ff69..cc46a28331 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8091B608 + .float 10000.0 + +.text glabel func_8091A9E8 /* 04FD8 8091A9E8 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 04FDC 8091A9EC AFB00038 */ sw $s0, 0x0038($sp) @@ -139,5 +144,3 @@ glabel func_8091A9E8 /* 051D0 8091ABE0 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 051D4 8091ABE4 03E00008 */ jr $ra /* 051D8 8091ABE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ABEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ABEC.s index a663eeb33b..6f59bb2a55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ABEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ABEC.s @@ -11,5 +11,3 @@ glabel func_8091ABEC /* 051FC 8091AC0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05200 8091AC10 03E00008 */ jr $ra /* 05204 8091AC14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091AC18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091AC18.s index db2a4cb216..92d8159f97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091AC18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091AC18.s @@ -30,5 +30,3 @@ glabel func_8091AC18 /* 05274 8091AC84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05278 8091AC88 03E00008 */ jr $ra /* 0527C 8091AC8C 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s index a4478f6531..915dbb96fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s @@ -38,4 +38,3 @@ glabel func_8091ADA8 /* 05424 8091AE34 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 05428 8091AE38 03E00008 */ jr $ra /* 0542C 8091AE3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s index 8886d8b1e0..13cd5d148e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s @@ -21,5 +21,3 @@ glabel BossMo_Destroy /* 009D4 8091C4D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009D8 8091C4D8 03E00008 */ jr $ra /* 009DC 8091C4DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s index 036d200e2e..8d17cecc49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80926AD0 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926AE0 + .asciz "../z_boss_mo.c" + .balign 4 + +.text glabel BossMo_Draw /* 09008 80924B08 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0900C 80924B0C AFBF003C */ sw $ra, 0x003C($sp) @@ -155,5 +165,3 @@ glabel BossMo_Draw /* 09264 80924D64 8FB10038 */ lw $s1, 0x0038($sp) /* 09268 80924D68 03E00008 */ jr $ra /* 0926C 80924D6C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s index 62ce5915e0..d782c181a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s @@ -269,5 +269,3 @@ glabel BossMo_Init /* 00988 8091C488 8FB10038 */ lw $s1, 0x0038($sp) /* 0098C 8091C48C 03E00008 */ jr $ra /* 00990 8091C490 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s index 676c6a871b..b6c6d4a9b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s @@ -1,3 +1,25 @@ +.rdata +glabel D_809269F8 + .asciz "MO : Move mode = <%d>\n" + .balign 4 + +.late_rodata +glabel D_80926E58 + .word 0x463B8000 +glabel D_80926E5C + .word 0x469C4000 +glabel D_80926E60 + .word 0x3F2AA64C +glabel D_80926E64 + .float 6.28318548203 + +glabel D_80926E68 + .float 0.05 + +glabel D_80926E6C + .float 0.2 + +.text glabel BossMo_Update /* 07474 80922F74 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 07478 80922F78 AFB30038 */ sw $s3, 0x0038($sp) @@ -588,5 +610,3 @@ glabel BossMo_Update /* 07CB8 809237B8 8FB50040 */ lw $s5, 0x0040($sp) /* 07CBC 809237BC 03E00008 */ jr $ra /* 07CC0 809237C0 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB00.s index 5b7e319381..e495a6632f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB00.s @@ -6,5 +6,3 @@ glabel func_8091BB00 /* 00010 8091BB10 3C018093 */ lui $at, %hi(D_8092C5C8) ## $at = 80930000 /* 00014 8091BB14 03E00008 */ jr $ra /* 00018 8091BB18 AC26C5C8 */ sw $a2, %lo(D_8092C5C8)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB1C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB1C.s index 896101783f..747fee7763 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BB1C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80926B60 + .float 30269.0 + +glabel D_80926B64 + .float 30307.0 + +glabel D_80926B68 + .float 30323.0 + +.text glabel func_8091BB1C /* 0001C 8091BB1C 3C028093 */ lui $v0, %hi(D_8092C5C0) ## $v0 = 80930000 /* 00020 8091BB20 2442C5C0 */ addiu $v0, $v0, %lo(D_8092C5C0) ## $v0 = 8092C5C0 @@ -74,5 +85,3 @@ glabel func_8091BB1C .L8091BC38: /* 00138 8091BC38 03E00008 */ jr $ra /* 0013C 8091BC3C 46001005 */ abs.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BC40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BC40.s index 69de90f3e7..dc43e8a409 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BC40.s @@ -70,5 +70,3 @@ glabel func_8091BC40 .L8091BD30: /* 00230 8091BD30 03E00008 */ jr $ra /* 00234 8091BD34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BD38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BD38.s index d4cac4f08f..b4ae74238a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BD38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BD38.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80926B6C + .float 0.0025 + +glabel D_80926B70 + .float 0.05 + +glabel D_80926B74 + .float 0.1 + +.text glabel func_8091BD38 /* 00238 8091BD38 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 /* 0023C 8091BD3C 87A60016 */ lh $a2, 0x0016($sp) @@ -76,5 +87,3 @@ glabel func_8091BD38 .L8091BE54: /* 00354 8091BE54 03E00008 */ jr $ra /* 00358 8091BE58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BE5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BE5C.s index 431d2b9559..c89eab24c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BE5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BE5C.s @@ -58,5 +58,3 @@ glabel func_8091BE5C .L8091BF30: /* 00430 8091BF30 03E00008 */ jr $ra /* 00434 8091BF34 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BF38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BF38.s index bcea51de01..4f313b5aa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BF38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BF38.s @@ -51,5 +51,3 @@ glabel func_8091BF38 .L8091BFF4: /* 004F4 8091BFF4 03E00008 */ jr $ra /* 004F8 8091BFF8 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BFFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BFFC.s index 43835632be..44a1f1b5de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091BFFC.s @@ -48,5 +48,3 @@ glabel func_8091BFFC /* 005A4 8091C0A4 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 /* 005A8 8091C0A8 03E00008 */ jr $ra /* 005AC 8091C0AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s index 8127e8f487..4f5d515abe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s @@ -22,5 +22,3 @@ glabel func_8091C4E0 /* 00A2C 8091C52C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A30 8091C530 03E00008 */ jr $ra /* 00A34 8091C534 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index 6e91dc824a..8c5952d77f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -1,3 +1,231 @@ +.late_rodata +glabel D_80926B78 + .float 2500.0 + +glabel D_80926B7C + .float 3000.0 + +glabel D_80926B80 + .float 1500.0 + +glabel D_80926B84 + .float 2500.0 + +glabel D_80926B88 + .float 3000.0 + +glabel D_80926B8C + .float 1500.0 + +glabel D_80926B90 + .float 2500.0 + +glabel D_80926B94 + .float 3000.0 + +glabel D_80926B98 + .float 1500.0 + +glabel D_80926B9C + .float 2500.0 + +glabel D_80926BA0 + .float 1300.0 + +glabel D_80926BA4 + .float 7000.0 + +glabel D_80926BA8 + .float 5000.0 + +glabel D_80926BAC + .float 2500.0 + +glabel D_80926BB0 + .float 5000.0 + +glabel D_80926BB4 + .float 1500.0 + +glabel D_80926BB8 + .float 2500.0 + +glabel D_80926BBC + .float 1300.0 + +glabel D_80926BC0 + .float 7000.0 + +glabel D_80926BC4 + .float 5000.0 + +glabel D_80926BC8 + .word 0x450FC000 +glabel jtbl_80926BCC +.word L8091E614 +.word L8091E83C +.word L8091EA54 +.word L8091E624 +.word L8091F118 +.word L8091ED18 +.word L8091F118 +glabel jtbl_80926BE8 +.word L8091CD0C +.word L8091CD0C +.word L8091D0B0 +.word L8091D430 +.word L8091D430 +.word L8091D918 +.word L8091F118 +.word L8091F118 +.word L8091F118 +.word L8091F118 +.word L8091CAD8 +.word L8091CB1C +glabel D_80926C18 + .float 0.01 + +glabel D_80926C1C + .float 0.025 + +glabel D_80926C20 + .float 0.7 + +glabel D_80926C24 + .float 0.01 + +glabel D_80926C28 + .float 0.001 + +glabel D_80926C2C + .float 0.001 + +glabel D_80926C30 + .float 0.001 + +glabel D_80926C34 + .float 0.001 + +glabel D_80926C38 + .float 0.025 + +glabel D_80926C3C + .float 0.01 + +glabel D_80926C40 + .float 0.3 + +glabel D_80926C44 + .float 0.03 + +glabel D_80926C48 + .float 0.01 + +glabel D_80926C4C + .float 0.2 + +glabel D_80926C50 + .float 0.1 + +glabel D_80926C54 + .float 0.005 + +glabel D_80926C58 + .float 7000.0 + +glabel D_80926C5C + .float 5000.0 + +glabel D_80926C60 + .float 0.025 + +glabel D_80926C64 + .float 0.01 + +glabel D_80926C68 + .float 3.14159274101 + +glabel D_80926C6C + .word 0x41A73333 +glabel D_80926C70 + .float 0.001 + +glabel D_80926C74 + .float 0.025 + +glabel D_80926C78 + .float 0.05 + +glabel D_80926C7C + .word 0x44228000 +glabel D_80926C80 + .float 0.025 + +glabel D_80926C84 + .float 0.05 + +glabel D_80926C88 + .word 0x44228000 +glabel D_80926C8C + .float 0.025 + +glabel D_80926C90 + .float 0.1 + +glabel D_80926C94 + .float 0.05 + +glabel D_80926C98 + .float 0.001 + +glabel D_80926C9C + .float 0.05 + +glabel D_80926CA0 + .float 0.05 + +glabel D_80926CA4 + .float 0.3 + +glabel D_80926CA8 + .word 0x44228000 +glabel D_80926CAC + .float 0.2 + +glabel D_80926CB0 + .word 0x3A03126F +glabel D_80926CB4 + .float 0.002 + +glabel D_80926CB8 + .word 0x3E6B851F +glabel D_80926CBC + .float 0.03 + +glabel D_80926CC0 + .float 0.0015 + +glabel D_80926CC4 + .word 0x3E051EB8 +glabel D_80926CC8 + .float 0.8 + +glabel D_80926CCC + .float 0.001 + +glabel D_80926CD0 + .float 0.1 + +glabel D_80926CD4 + .float 0.1 + +glabel D_80926CD8 + .float 0.02 + +glabel D_80926CDC + .float 0.05 + +.text glabel func_8091C538 /* 00A38 8091C538 27BDFE48 */ addiu $sp, $sp, 0xFE48 ## $sp = FFFFFE48 /* 00A3C 8091C53C AFBF007C */ sw $ra, 0x007C($sp) @@ -3185,5 +3413,3 @@ glabel L8091F118 /* 037F0 8091F2F0 8FB50078 */ lw $s5, 0x0078($sp) /* 037F4 8091F2F4 03E00008 */ jr $ra /* 037F8 8091F2F8 27BD01B8 */ addiu $sp, $sp, 0x01B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s index 22ba0548f4..c5795e30f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80926CE0 + .float 0.2 + +glabel D_80926CE4 + .word 0x3E051EB8 +glabel D_80926CE8 + .float 0.08 + +.text glabel func_8091F2FC /* 037FC 8091F2FC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 03800 8091F300 AFB10054 */ sw $s1, 0x0054($sp) @@ -183,5 +193,3 @@ glabel func_8091F2FC /* 03A9C 8091F59C 8FB40060 */ lw $s4, 0x0060($sp) /* 03AA0 8091F5A0 03E00008 */ jr $ra /* 03AA4 8091F5A4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index 69cc01760e..6d057913b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -1,3 +1,67 @@ +.late_rodata +glabel jtbl_80926CEC +.word L8091F61C +.word L8091F7D0 +.word L8091F8F8 +.word L8091FF00 +.word L80920280 +glabel D_80926D00 + .float 0.05 + +glabel D_80926D04 + .word 0x3E051EB8 +glabel D_80926D08 + .word 0x4622F983 +glabel D_80926D0C + .word 0x4622F983 +glabel D_80926D10 + .float 0.05 + +glabel D_80926D14 + .word 0x3E051EB8 +glabel D_80926D18 + .float 0.1 + +glabel D_80926D1C + .float 0.4 + +glabel D_80926D20 + .float 0.3 + +glabel D_80926D24 + .float 2500.0 + +glabel D_80926D28 + .float 2500.0 + +glabel D_80926D2C + .float 0.1 + +glabel D_80926D30 + .float 0.01 + +glabel D_80926D34 + .float 0.001 + +glabel D_80926D38 + .float 0.1 + +glabel D_80926D3C + .float 0.1 + +glabel D_80926D40 + .float 0.03 + +glabel D_80926D44 + .float 0.03 + +glabel D_80926D48 + .float 0.01 + +glabel D_80926D4C + .float 0.03 + +.text glabel func_8091F5A8 /* 03AA8 8091F5A8 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 03AAC 8091F5AC AFB00028 */ sw $s0, 0x0028($sp) @@ -1166,5 +1230,3 @@ glabel L80920280 /* 04BB8 809206B8 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 04BBC 809206BC 03E00008 */ jr $ra /* 04BC0 809206C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s index a5503439b6..88dd146ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s @@ -1,3 +1,53 @@ +.late_rodata +glabel jtbl_80926D50 +.word L80920734 +.word L80920CB0 +.word L80920D48 +.word L80920D8C +.word L80920DFC +.word L8092107C +glabel D_80926D68 + .float 0.005 + +glabel D_80926D6C + .word 0x3C75C28F +glabel D_80926D70 + .word 0x3C75C28F +glabel D_80926D74 + .float 0.005 + +glabel D_80926D78 + .float 0.002 + +glabel D_80926D7C + .float 0.08 + +glabel D_80926D80 + .word 0x3E051EB8 +glabel D_80926D84 + .float 0.05 + +glabel D_80926D88 + .float 0.02 + +glabel D_80926D8C + .float 0.2 + +glabel D_80926D90 + .float 3000.0 + +glabel D_80926D94 + .float 2500.0 + +glabel D_80926D98 + .float 0.05 + +glabel D_80926D9C + .word 0x406CCCCE +glabel D_80926DA0 + .float 0.02 + +.text glabel func_809206C4 /* 04BC4 809206C4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 04BC8 809206C8 AFB10020 */ sw $s1, 0x0020($sp) @@ -812,5 +862,3 @@ glabel L8092107C /* 05774 80921274 8FB10020 */ lw $s1, 0x0020($sp) /* 05778 80921278 03E00008 */ jr $ra /* 0577C 8092127C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s index 30ea864e03..6922f6293a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s @@ -1,3 +1,40 @@ +.rdata +glabel D_80926940 + .asciz "" + .balign 4 + +glabel D_80926948 + .asciz "Core_Damage_check START\n" + .balign 4 + +glabel D_80926964 + .asciz "Core_Damage_check 当り！！\n" + .balign 4 + +glabel D_80926980 + .asciz "Core_Damage_check 当り 2 ！！\n" + .balign 4 + +glabel D_809269A0 + .asciz "Core_Damage_check 剣 当り！！\n" + .balign 4 + +glabel D_809269C0 + .asciz "Core_Damage_check 終わり ！！\n" + .balign 4 + +glabel D_809269E0 + .asciz "\x1b[m" + .balign 4 + +.late_rodata +glabel D_80926DA4 + .float 0.08 + +glabel D_80926DA8 + .word 0x3E051EB8 + +.text glabel func_80921280 /* 05780 80921280 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 05784 80921284 AFB10030 */ sw $s1, 0x0030($sp) @@ -304,5 +341,3 @@ glabel func_80921280 /* 05BC4 809216C4 8FB10030 */ lw $s1, 0x0030($sp) /* 05BC8 809216C8 03E00008 */ jr $ra /* 05BCC 809216CC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s index 03bf62d6e3..8a532713e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s @@ -1,3 +1,93 @@ +.late_rodata +glabel D_80926DAC + .float 0.005 + +glabel D_80926DB0 + .word 0x3C75C28F +glabel D_80926DB4 + .word 0x3C75C28F +glabel D_80926DB8 + .float 0.005 + +glabel D_80926DBC + .float 0.008 + +glabel jtbl_80926DC0 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921B08 +.word L80921928 +.word L809219DC +.word L80921A60 +.word L80921B08 +.word L80921B08 +.word L80921AA0 +glabel D_80926E04 + .float 0.02 + +glabel D_80926E08 + .float 0.05 + +glabel D_80926E0C + .float -0.01 + +glabel D_80926E10 + .float 0.08 + +glabel D_80926E14 + .word 0x3E051EB8 +glabel D_80926E18 + .float 0.4 + +glabel D_80926E1C + .float 3.14159274101 + +glabel D_80926E20 + .word 0x45418000 +glabel D_80926E24 + .word 0x452EC000 +glabel D_80926E28 + .word 0x4622F983 +glabel D_80926E2C + .word 0x4622F983 +glabel D_80926E30 + .float 0.2 + +glabel D_80926E34 + .word 0x4048F5C3 +glabel D_80926E38 + .float 0.6 + +glabel D_80926E3C + .float 1.6 + +glabel D_80926E40 + .float 0.3 + +glabel D_80926E44 + .float 0.075 + +glabel D_80926E48 + .float 0.15 + +glabel D_80926E4C + .float 0.1 + +glabel D_80926E50 + .float 0.05 + +glabel D_80926E54 + .float 0.1 + +.text glabel func_809216D0 /* 05BD0 809216D0 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 05BD4 809216D4 AFBF003C */ sw $ra, 0x003C($sp) @@ -1559,5 +1649,3 @@ glabel L80921B08 /* 07224 80922D24 8FB20038 */ lw $s2, 0x0038($sp) /* 07228 80922D28 03E00008 */ jr $ra /* 0722C 80922D2C 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s index 95fed13749..b108c957f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809269E4 + .asciz "CORE mode = <%d>\n" + .balign 4 + +.text glabel func_80922D30 /* 07230 80922D30 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 07234 80922D34 AFBF001C */ sw $ra, 0x001C($sp) @@ -159,5 +165,3 @@ glabel func_80922D30 /* 07468 80922F68 8FB10018 */ lw $s1, 0x0018($sp) /* 0746C 80922F6C 03E00008 */ jr $ra /* 07470 80922F70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809237C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809237C4.s index 2b285d5d88..15d31847a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809237C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809237C4.s @@ -44,5 +44,3 @@ glabel func_809237C4 /* 07D64 80923864 A5800036 */ sh $zero, 0x0036($t4) ## 00000036 /* 07D68 80923868 03E00008 */ jr $ra /* 07D6C 8092386C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s index 8f89495df0..55ecdad114 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s @@ -1,3 +1,51 @@ +.rdata +glabel D_80926A10 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926A20 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926A30 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926A40 + .asciz "../z_boss_mo.c" + .balign 4 + +.late_rodata +glabel D_80926E70 + .float 3.14159274101 + +glabel D_80926E74 + .float 3.14159274101 + +glabel D_80926E78 + .float 3.14159274101 + +glabel D_80926E7C + .float 3.14159274101 + +glabel D_80926E80 + .float 1.57079637051 + +glabel D_80926E84 + .float 0.1 + +glabel D_80926E88 + .word 0x3E3851EC +glabel D_80926E8C + .float 0.08 + +glabel D_80926E90 + .float 0.08 + +glabel D_80926E94 + .word 0xBFDBE958 + +.text glabel func_80923870 /* 07D70 80923870 27BDFED0 */ addiu $sp, $sp, 0xFED0 ## $sp = FFFFFED0 /* 07D74 80923874 AFB60050 */ sw $s6, 0x0050($sp) @@ -493,5 +541,3 @@ glabel func_80923870 /* 084D0 80923FD0 8FBE0058 */ lw $s8, 0x0058($sp) /* 084D4 80923FD4 03E00008 */ jr $ra /* 084D8 80923FD8 27BD0130 */ addiu $sp, $sp, 0x0130 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s index 119b9153a7..e66919e7bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80926A50 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926A60 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926A70 + .asciz "../z_boss_mo.c" + .balign 4 + +.text glabel func_80923FDC /* 084DC 80923FDC 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 084E0 80923FE0 AFBF003C */ sw $ra, 0x003C($sp) @@ -146,5 +160,3 @@ glabel func_80923FDC /* 0871C 8092421C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 08720 80924220 03E00008 */ jr $ra /* 08724 80924224 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s index 10126ebb9c..ffd5e26563 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s @@ -1,3 +1,50 @@ +.rdata +glabel D_80926A80 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926A90 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926AA0 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926AB0 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926AC0 + .asciz "../z_boss_mo.c" + .balign 4 + +.late_rodata +glabel D_80926E98 + .float 0.8 + +glabel D_80926E9C + .word 0x3E6B851F +glabel D_80926EA0 + .float 0.01 + +glabel D_80926EA4 + .float 0.1 + +glabel D_80926EA8 + .word 0x3F533333 +glabel D_80926EAC + .word 0x3F966666 +glabel D_80926EB0 + .float 0.1 + +glabel D_80926EB4 + .float 1.57079637051 + +glabel D_80926EB8 + .float 0.05 + +.text glabel func_80924228 /* 08728 80924228 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 0872C 8092422C AFBF003C */ sw $ra, 0x003C($sp) @@ -577,5 +624,3 @@ glabel func_80924228 /* 08FFC 80924AFC 8FB10038 */ lw $s1, 0x0038($sp) /* 09000 80924B00 03E00008 */ jr $ra /* 09004 80924B04 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s index 41725f13de..a03d7d9df7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80926EBC + .float 0.15 + +.text glabel func_80924D70 /* 09270 80924D70 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 09274 80924D74 AFB2004C */ sw $s2, 0x004C($sp) @@ -489,5 +494,3 @@ glabel func_80924D70 /* 09974 80925474 8FB50058 */ lw $s5, 0x0058($sp) /* 09978 80925478 03E00008 */ jr $ra /* 0997C 8092547C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s index 44d9005292..319533ddce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80926AF0 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926B00 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926B10 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926B20 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926B30 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926B40 + .asciz "../z_boss_mo.c" + .balign 4 + +glabel D_80926B50 + .asciz "../z_boss_mo.c" + .balign 4 + +.text glabel func_80925480 /* 09980 80925480 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 09984 80925484 AFBF004C */ sw $ra, 0x004C($sp) @@ -501,5 +531,3 @@ glabel func_80925480 /* 0A10C 80925C0C 8FBE0048 */ lw $s8, 0x0048($sp) /* 0A110 80925C10 03E00008 */ jr $ra /* 0A114 80925C14 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s index 3bd640bc16..1f7cc7c620 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s @@ -41,4 +41,3 @@ glabel func_80925C18 /* 0A1A4 80925CA4 00000000 */ nop /* 0A1A8 80925CA8 00000000 */ nop /* 0A1AC 80925CAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s index 1cc7c24a46..ef27af7321 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s @@ -19,5 +19,3 @@ glabel BossSst_Destroy /* 004C4 8092CA94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004C8 8092CA98 03E00008 */ jr $ra /* 004CC 8092CA9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s index d954b537c2..5eb93ed67b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809378F0 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937900 + .asciz "../z_boss_sst.c" + .balign 4 + +.late_rodata +glabel D_80937A18 + .float 0.02 + +.text glabel BossSst_Draw /* 08098 80934668 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 0809C 8093466C AFBF005C */ sw $ra, 0x005C($sp) @@ -256,5 +270,3 @@ glabel BossSst_Draw /* 08468 80934A38 8FBE0058 */ lw $s8, 0x0058($sp) /* 0846C 80934A3C 03E00008 */ jr $ra /* 08470 80934A40 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s index b51e4aec56..772f2a6eb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80937990 + .word 0xC4228000 +glabel D_80937994 + .word 0xC4228000 +glabel D_80937998 + .float 5000.0 + +.text glabel BossSst_Init /* 00000 8092C5D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00004 8092C5D4 AFB10030 */ sw $s1, 0x0030($sp) @@ -308,5 +317,3 @@ glabel BossSst_Init /* 00478 8092CA48 8FB10030 */ lw $s1, 0x0030($sp) /* 0047C 8092CA4C 03E00008 */ jr $ra /* 00480 8092CA50 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s index 5479134c7d..116101d5b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80937A14 + .float 0.01 + +.text glabel BossSst_Update /* 07A5C 8093402C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 07A60 80934030 AFBF0024 */ sw $ra, 0x0024($sp) @@ -214,5 +219,3 @@ glabel BossSst_Update /* 07D5C 8093432C 8FB10020 */ lw $s1, 0x0020($sp) /* 07D60 80934330 03E00008 */ jr $ra /* 07D64 80934334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s index bb8dd844fb..71ada23e55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s @@ -11,5 +11,3 @@ glabel func_8092CAA0 /* 004F4 8092CAC4 A0800194 */ sb $zero, 0x0194($a0) ## 00000194 /* 004F8 8092CAC8 03E00008 */ jr $ra /* 004FC 8092CACC AC980190 */ sw $t8, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s index 4fa180120b..b1dae7a4d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s @@ -15,5 +15,3 @@ glabel func_8092CAD0 /* 00530 8092CB00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00534 8092CB04 03E00008 */ jr $ra /* 00538 8092CB08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s index d9837c280a..e1e073891d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s @@ -85,5 +85,3 @@ glabel func_8092CB0C /* 0067C 8092CC4C 8FB00014 */ lw $s0, 0x0014($sp) /* 00680 8092CC50 03E00008 */ jr $ra /* 00684 8092CC54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s index b44869cff7..f976e34c2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_8093799C + .word 0x409D70A4 +glabel D_809379A0 + .word 0x3F4CCCCC +glabel D_809379A4 + .word 0x40666666 + +.text glabel func_8092CC58 /* 00688 8092CC58 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0068C 8092CC5C AFBF0034 */ sw $ra, 0x0034($sp) @@ -947,5 +956,3 @@ glabel func_8092CC58 /* 01490 8092DA60 8FB20030 */ lw $s2, 0x0030($sp) /* 01494 8092DA64 03E00008 */ jr $ra /* 01498 8092DA68 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s index eebdeca366..7598503ca2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s @@ -19,5 +19,3 @@ glabel func_8092DA6C /* 014DC 8092DAAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014E0 8092DAB0 03E00008 */ jr $ra /* 014E4 8092DAB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s index eed5b8d528..5d9e237d2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s @@ -31,5 +31,3 @@ glabel func_8092DAB8 /* 01554 8092DB24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01558 8092DB28 03E00008 */ jr $ra /* 0155C 8092DB2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s index 8ad1e50d0a..b29b42744d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s @@ -6,5 +6,3 @@ glabel func_8092DB30 /* 01570 8092DB40 A0800195 */ sb $zero, 0x0195($a0) ## 00000195 /* 01574 8092DB44 03E00008 */ jr $ra /* 01578 8092DB48 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s index 4d0b3d19e9..db020a7137 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s @@ -116,5 +116,3 @@ glabel func_8092DB4C /* 01710 8092DCE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01714 8092DCE4 03E00008 */ jr $ra /* 01718 8092DCE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s index 8900cc2b18..5e2710ec41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s @@ -26,5 +26,3 @@ glabel func_8092DCEC /* 01774 8092DD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01778 8092DD48 03E00008 */ jr $ra /* 0177C 8092DD4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s index ef26723f6c..151f1abed2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s @@ -68,5 +68,3 @@ glabel func_8092DD50 /* 0186C 8092DE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01870 8092DE40 03E00008 */ jr $ra /* 01874 8092DE44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s index 02aca61935..51ea302bef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s @@ -21,5 +21,3 @@ glabel func_8092DE48 /* 018C4 8092DE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018C8 8092DE98 03E00008 */ jr $ra /* 018CC 8092DE9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s index 37c7f942dc..002f94c7f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s @@ -44,5 +44,3 @@ glabel func_8092DEA0 /* 01964 8092DF34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01968 8092DF38 03E00008 */ jr $ra /* 0196C 8092DF3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s index c446cbb198..b7c8a83474 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379A8 + .word 0xC4228000 + +.text glabel func_8092DF40 /* 01970 8092DF40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01974 8092DF44 AFB00028 */ sw $s0, 0x0028($sp) @@ -48,5 +53,3 @@ glabel func_8092DF40 /* 01A20 8092DFF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01A24 8092DFF4 03E00008 */ jr $ra /* 01A28 8092DFF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s index 1d4116a3dc..3dc4126e95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809379AC + .float 0.2 + +glabel D_809379B0 + .word 0x44228000 + +.text glabel func_8092DFFC /* 01A2C 8092DFFC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01A30 8092E000 AFB00020 */ sw $s0, 0x0020($sp) @@ -165,5 +173,3 @@ glabel func_8092DFFC /* 01C80 8092E250 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01C84 8092E254 03E00008 */ jr $ra /* 01C88 8092E258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s index 553b166b42..34ca391bba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s @@ -32,5 +32,3 @@ glabel func_8092E25C /* 01D04 8092E2D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D08 8092E2D8 03E00008 */ jr $ra /* 01D0C 8092E2DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s index 077bf01ee3..5aba3b5216 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s @@ -29,5 +29,3 @@ glabel func_8092E2E0 /* 01D70 8092E340 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D74 8092E344 03E00008 */ jr $ra /* 01D78 8092E348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s index 62443e7f98..02dff9af87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s @@ -20,5 +20,3 @@ glabel func_8092E34C /* 01DC4 8092E394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DC8 8092E398 03E00008 */ jr $ra /* 01DCC 8092E39C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s index d9d1a13444..6181e43783 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s @@ -19,5 +19,3 @@ glabel func_8092E3A0 /* 01E0C 8092E3DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E10 8092E3E0 03E00008 */ jr $ra /* 01E14 8092E3E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s index c8cecc8db0..9f0068e1f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s @@ -19,5 +19,3 @@ glabel func_8092E3E8 /* 01E5C 8092E42C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E60 8092E430 03E00008 */ jr $ra /* 01E64 8092E434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s index 7e9a3a64fc..c15dbe465e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s @@ -15,5 +15,3 @@ glabel func_8092E438 /* 01E94 8092E464 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E98 8092E468 03E00008 */ jr $ra /* 01E9C 8092E46C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s index 803bdfb9f4..5f799f2419 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s @@ -40,5 +40,3 @@ glabel func_8092E470 /* 01F34 8092E504 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F38 8092E508 03E00008 */ jr $ra /* 01F3C 8092E50C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s index 141f5a676a..f1a35b6992 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809379B4 + .word 0x3E923A14 +glabel D_809379B8 + .word 0x3E923A14 +glabel D_809379BC + .word 0x3F20D97C + +.text glabel func_8092E510 /* 01F40 8092E510 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01F44 8092E514 AFB00020 */ sw $s0, 0x0020($sp) @@ -179,5 +188,3 @@ glabel func_8092E510 /* 021B4 8092E784 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 021B8 8092E788 03E00008 */ jr $ra /* 021BC 8092E78C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s index a4831ac0f6..dd4bd3ad6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s @@ -40,5 +40,3 @@ glabel func_8092E790 /* 02254 8092E824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02258 8092E828 03E00008 */ jr $ra /* 0225C 8092E82C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s index 3708046ed8..b11bca94f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s @@ -73,5 +73,3 @@ glabel func_8092E830 /* 02354 8092E924 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02358 8092E928 03E00008 */ jr $ra /* 0235C 8092E92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s index 11a719cccf..49c26cd2b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s @@ -54,5 +54,3 @@ glabel func_8092E930 /* 02424 8092E9F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02428 8092E9F8 03E00008 */ jr $ra /* 0242C 8092E9FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s index dd3c6d5c82..7f6a2f4c70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s @@ -22,5 +22,3 @@ glabel func_8092EA00 /* 02474 8092EA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02478 8092EA48 03E00008 */ jr $ra /* 0247C 8092EA4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s index b3886b545a..570dfe8e01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s @@ -35,5 +35,3 @@ glabel func_8092EA50 /* 02504 8092EAD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02508 8092EAD8 03E00008 */ jr $ra /* 0250C 8092EADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s index 4d6ac38066..ffe13191bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379C0 + .word 0xC4228000 + +.text glabel func_8092EAE0 /* 02510 8092EAE0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02514 8092EAE4 AFB00020 */ sw $s0, 0x0020($sp) @@ -108,5 +113,3 @@ glabel func_8092EAE0 /* 02698 8092EC68 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0269C 8092EC6C 03E00008 */ jr $ra /* 026A0 8092EC70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s index 0637689592..06e65ac023 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s @@ -76,5 +76,3 @@ glabel func_8092EC74 /* 027C0 8092ED90 460C8482 */ mul.s $f18, $f16, $f12 /* 027C4 8092ED94 03E00008 */ jr $ra /* 027C8 8092ED98 E4327378 */ swc1 $f18, %lo(D_80937378)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s index fe1ef31cde..5b0d97aa1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s @@ -100,5 +100,3 @@ glabel func_8092ED9C /* 0294C 8092EF1C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 02950 8092EF20 03E00008 */ jr $ra /* 02954 8092EF24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s index fcb38d1cb5..0a3077a1ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s @@ -102,5 +102,3 @@ glabel func_8092EF28 /* 02AE0 8092F0B0 8FB0001C */ lw $s0, 0x001C($sp) /* 02AE4 8092F0B4 03E00008 */ jr $ra /* 02AE8 8092F0B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s index 24c6de22d5..0cbb5d99f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379C4 + .word 0x3CAAAAAB + +.text glabel func_8092F0BC /* 02AEC 8092F0BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02AF0 8092F0C0 AFB00014 */ sw $s0, 0x0014($sp) @@ -161,5 +166,3 @@ glabel func_8092F0BC /* 02D30 8092F300 8FB10018 */ lw $s1, 0x0018($sp) /* 02D34 8092F304 03E00008 */ jr $ra /* 02D38 8092F308 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s index 186b344d9b..9c75dd78b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379C8 + .word 0x3C4CCCCD + +.text glabel func_8092F30C /* 02D3C 8092F30C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02D40 8092F310 AFBF0014 */ sw $ra, 0x0014($sp) @@ -25,5 +30,3 @@ glabel func_8092F30C /* 02D98 8092F368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D9C 8092F36C 03E00008 */ jr $ra /* 02DA0 8092F370 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s index a3d389caeb..ca51baa69c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s @@ -35,5 +35,3 @@ glabel func_8092F374 /* 02E14 8092F3E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E18 8092F3E8 03E00008 */ jr $ra /* 02E1C 8092F3EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s index e80f56ba99..b24936194a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379CC + .word 0x3C4CCCCD + +.text glabel func_8092F3F0 /* 02E20 8092F3F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02E24 8092F3F4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -16,5 +21,3 @@ glabel func_8092F3F0 /* 02E58 8092F428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E5C 8092F42C 03E00008 */ jr $ra /* 02E60 8092F430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s index ac3f8e1a62..1b659dfacb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379D0 + .word 0x3C4CCCCD + +.text glabel func_8092F434 /* 02E64 8092F434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02E68 8092F438 AFBF0014 */ sw $ra, 0x0014($sp) @@ -147,5 +152,3 @@ glabel func_8092F434 /* 03080 8092F650 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03084 8092F654 03E00008 */ jr $ra /* 03088 8092F658 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s index 265cc65add..83f874d6d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s @@ -39,5 +39,3 @@ glabel func_8092F65C /* 03114 8092F6E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03118 8092F6E8 03E00008 */ jr $ra /* 0311C 8092F6EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s index b7f4ac46b5..f7d6c35ea3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s @@ -42,5 +42,3 @@ glabel func_8092F6F0 /* 031B4 8092F784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 031B8 8092F788 03E00008 */ jr $ra /* 031BC 8092F78C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s index a42e1fffc0..abb5a1941f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379D4 + .float 0.0166666675359 + +.text glabel func_8092F790 /* 031C0 8092F790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 031C4 8092F794 AFBF0014 */ sw $ra, 0x0014($sp) @@ -18,5 +23,3 @@ glabel func_8092F790 /* 03200 8092F7D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03204 8092F7D4 03E00008 */ jr $ra /* 03208 8092F7D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s index 7f14341b36..d7208b89de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809379D8 + .word 0x389D4952 +glabel D_809379DC + .word 0x3983126F +glabel D_809379E0 + .word 0x4633B000 + +.text glabel func_8092F7DC /* 0320C 8092F7DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03210 8092F7E0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -48,5 +57,3 @@ glabel func_8092F7DC /* 032B8 8092F888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032BC 8092F88C 03E00008 */ jr $ra /* 032C0 8092F890 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s index cdc2f185ee..7d40c2d031 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809379E4 + .float 0.025 + +.text glabel func_8092F894 /* 032C4 8092F894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 032C8 8092F898 AFBF0014 */ sw $ra, 0x0014($sp) @@ -23,5 +28,3 @@ glabel func_8092F894 /* 03314 8092F8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03318 8092F8E8 03E00008 */ jr $ra /* 0331C 8092F8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s index bd9970f5a9..b595e224f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s @@ -205,5 +205,3 @@ glabel func_8092F8F0 /* 03608 8092FBD8 8FB60060 */ lw $s6, 0x0060($sp) /* 0360C 8092FBDC 03E00008 */ jr $ra /* 03610 8092FBE0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s index 9ec3dca08e..7d3c24cbfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s @@ -30,5 +30,3 @@ glabel func_8092FBE4 /* 03684 8092FC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03688 8092FC58 03E00008 */ jr $ra /* 0368C 8092FC5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s index cf27c1e1b9..155d5b4fcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s @@ -100,5 +100,3 @@ glabel func_8092FC60 /* 037F4 8092FDC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 037F8 8092FDC8 03E00008 */ jr $ra /* 037FC 8092FDCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s index 9ae0ae8efe..4a4d7820e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s @@ -28,5 +28,3 @@ glabel func_8092FDD0 /* 03868 8092FE38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0386C 8092FE3C 03E00008 */ jr $ra /* 03870 8092FE40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s index ec59ee7ff0..95b8c89f59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s @@ -95,5 +95,3 @@ glabel func_8092FE44 /* 039B8 8092FF88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 039BC 8092FF8C 03E00008 */ jr $ra /* 039C0 8092FF90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s index e8e0d13c54..68d2d3dd23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s @@ -22,5 +22,3 @@ glabel func_8092FF94 /* 03A14 8092FFE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A18 8092FFE8 03E00008 */ jr $ra /* 03A1C 8092FFEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s index 47e2a844a5..e3541dfcfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s @@ -67,5 +67,3 @@ glabel func_8092FFF0 /* 03B08 809300D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03B0C 809300DC 03E00008 */ jr $ra /* 03B10 809300E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s index 7ef9ea796d..1a71ded1cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s @@ -28,5 +28,3 @@ glabel func_809300E4 /* 03B7C 8093014C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B80 80930150 03E00008 */ jr $ra /* 03B84 80930154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s index 15724383b3..386914937e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s @@ -64,5 +64,3 @@ glabel func_80930158 /* 03C5C 8093022C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03C60 80930230 03E00008 */ jr $ra /* 03C64 80930234 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s index 49fe50d09f..6dc702a9ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s @@ -18,5 +18,3 @@ glabel func_80930238 /* 03CA8 80930278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03CAC 8093027C 03E00008 */ jr $ra /* 03CB0 80930280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s index 62deee54da..49a9290c4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s @@ -89,5 +89,3 @@ glabel func_80930284 /* 03DEC 809303BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03DF0 809303C0 03E00008 */ jr $ra /* 03DF4 809303C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s index fd9c50e84c..f5c1aafced 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s @@ -28,5 +28,3 @@ glabel func_809303C8 /* 03E60 80930430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03E64 80930434 03E00008 */ jr $ra /* 03E68 80930438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s index da5b5d1592..56137944de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s @@ -15,5 +15,3 @@ glabel func_8093043C /* 03E98 80930468 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03E9C 8093046C 03E00008 */ jr $ra /* 03EA0 80930470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s index b527c5957f..3d9ce5b21a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s @@ -41,5 +41,3 @@ glabel func_80930474 /* 03F40 80930510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F44 80930514 03E00008 */ jr $ra /* 03F48 80930518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s index 1256b8ff54..c6b0ac53e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809379E8 + .float 1.2 + +glabel D_809379EC + .float 3.14159274101 + +.text glabel func_8093051C /* 03F4C 8093051C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 03F50 80930520 AFB00020 */ sw $s0, 0x0020($sp) @@ -152,5 +160,3 @@ glabel func_8093051C /* 0416C 8093073C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 04170 80930740 03E00008 */ jr $ra /* 04174 80930744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s index 119fefa5d0..3c9d22b565 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s @@ -26,5 +26,3 @@ glabel func_80930748 /* 041D8 809307A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 041DC 809307AC 03E00008 */ jr $ra /* 041E0 809307B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s index 279f0bbab7..8b42cd09e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s @@ -69,5 +69,3 @@ glabel func_809307B4 /* 042C8 80930898 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 042CC 8093089C 03E00008 */ jr $ra /* 042D0 809308A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s index 404b380c08..8ae92674c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s @@ -36,5 +36,3 @@ glabel func_809308A4 /* 04358 80930928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0435C 8093092C 03E00008 */ jr $ra /* 04360 80930930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s index ef1c98d57f..b9259a8d2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s @@ -137,5 +137,3 @@ glabel func_80930934 /* 0453C 80930B0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04540 80930B10 03E00008 */ jr $ra /* 04544 80930B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s index 45be66e899..06a2a668d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s @@ -41,5 +41,3 @@ glabel func_80930B18 /* 045E4 80930BB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 045E8 80930BB8 03E00008 */ jr $ra /* 045EC 80930BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s index 0862c56467..0d80a8f5ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s @@ -82,5 +82,3 @@ glabel func_80930BC0 /* 04708 80930CD8 8FB10020 */ lw $s1, 0x0020($sp) /* 0470C 80930CDC 03E00008 */ jr $ra /* 04710 80930CE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s index 40bc94c6dd..c1f47fb6f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s @@ -35,5 +35,3 @@ glabel func_80930CE4 /* 04794 80930D64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04798 80930D68 03E00008 */ jr $ra /* 0479C 80930D6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s index f97ec81ef3..e3b64d286c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s @@ -142,5 +142,3 @@ glabel func_80930D70 /* 049A4 80930F74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 049A8 80930F78 03E00008 */ jr $ra /* 049AC 80930F7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s index 0dc0fbd571..397b728b29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s @@ -25,5 +25,3 @@ glabel func_80930F80 /* 04A0C 80930FDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04A10 80930FE0 03E00008 */ jr $ra /* 04A14 80930FE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s index 0c24db2b69..e30145c4d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s @@ -26,5 +26,3 @@ glabel func_80930FE8 /* 04A68 80931038 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04A6C 8093103C 03E00008 */ jr $ra /* 04A70 80931040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s index b83c933b95..c46d6076a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s @@ -33,5 +33,3 @@ glabel func_80931044 /* 04AF0 809310C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04AF4 809310C4 03E00008 */ jr $ra /* 04AF8 809310C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s index e72468b6b8..711edb902e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s @@ -89,5 +89,3 @@ glabel func_809310CC /* 04C34 80931204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04C38 80931208 03E00008 */ jr $ra /* 04C3C 8093120C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s index 371dd5978b..8bdc62339f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s @@ -60,5 +60,3 @@ glabel func_80931210 /* 04D24 809312F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04D28 809312F8 03E00008 */ jr $ra /* 04D2C 809312FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s index 0ecebd19a0..3491f81f00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s @@ -139,5 +139,3 @@ glabel func_80931300 /* 04F14 809314E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04F18 809314E8 03E00008 */ jr $ra /* 04F1C 809314EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s index f942fdf8ad..e617107a6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s @@ -27,5 +27,3 @@ glabel func_809314F0 /* 04F84 80931554 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04F88 80931558 03E00008 */ jr $ra /* 04F8C 8093155C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s index 7d72b4fea0..4cf98350c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s @@ -157,5 +157,3 @@ glabel func_80931560 /* 051AC 8093177C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 051B0 80931780 03E00008 */ jr $ra /* 051B4 80931784 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s index 9e59aa8c50..ee789cf05c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s @@ -27,5 +27,3 @@ glabel func_80931788 /* 0521C 809317EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05220 809317F0 03E00008 */ jr $ra /* 05224 809317F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s index f9a1a9b5ae..a55f06bb60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s @@ -47,5 +47,3 @@ glabel func_809317F8 /* 052C4 80931894 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 052C8 80931898 03E00008 */ jr $ra /* 052CC 8093189C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s index 34c27d47b9..ab7ae67e39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s @@ -33,5 +33,3 @@ glabel func_809318A0 /* 0534C 8093191C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05350 80931920 03E00008 */ jr $ra /* 05354 80931924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s index 341ab64ff9..9cbb082461 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s @@ -46,5 +46,3 @@ glabel func_80931928 /* 053F4 809319C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 053F8 809319C8 03E00008 */ jr $ra /* 053FC 809319CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s index 51fff4f9f8..ada87832fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s @@ -34,5 +34,3 @@ glabel func_809319D0 /* 05480 80931A50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05484 80931A54 03E00008 */ jr $ra /* 05488 80931A58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s index 1178d05589..4106811689 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809379F0 + .word 0x3D567750 +glabel D_809379F4 + .word 0x3FA147AE + +.text glabel func_80931A5C /* 0548C 80931A5C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 05490 80931A60 AFBF0024 */ sw $ra, 0x0024($sp) @@ -187,5 +194,3 @@ glabel func_80931A5C /* 05728 80931CF8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0572C 80931CFC 03E00008 */ jr $ra /* 05730 80931D00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s index 5b64a0a658..b7e670c848 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s @@ -21,5 +21,3 @@ glabel func_80931D04 /* 05780 80931D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05784 80931D54 03E00008 */ jr $ra /* 05788 80931D58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s index 160de71dac..3ea15d638f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s @@ -77,5 +77,3 @@ glabel func_80931D5C /* 05894 80931E64 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05898 80931E68 03E00008 */ jr $ra /* 0589C 80931E6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s index 765f3eecc8..feabd23c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s @@ -19,5 +19,3 @@ glabel func_80931E70 /* 058E4 80931EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 058E8 80931EB8 03E00008 */ jr $ra /* 058EC 80931EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s index aba25bf6f3..523f771786 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s @@ -15,5 +15,3 @@ glabel func_80931EC0 /* 0591C 80931EEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05920 80931EF0 03E00008 */ jr $ra /* 05924 80931EF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s index 1d1123631b..b970a2f2eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s @@ -36,5 +36,3 @@ glabel func_80931EF8 /* 059A8 80931F78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 059AC 80931F7C 03E00008 */ jr $ra /* 059B0 80931F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s index 821ac7e063..5865d8db0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s @@ -229,5 +229,3 @@ glabel func_80931F84 /* 05CD8 809322A8 8FB10020 */ lw $s1, 0x0020($sp) /* 05CDC 809322AC 03E00008 */ jr $ra /* 05CE0 809322B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s index 710cb2fc70..e3fff4ad9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s @@ -38,5 +38,3 @@ glabel func_809322B4 /* 05D70 80932340 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05D74 80932344 03E00008 */ jr $ra /* 05D78 80932348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s index db2aeea66c..7bfa70f4c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s @@ -97,5 +97,3 @@ glabel func_8093234C /* 05EC8 80932498 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05ECC 8093249C 03E00008 */ jr $ra /* 05ED0 809324A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s index 54fd8bc6c2..ffb1475641 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s @@ -19,5 +19,3 @@ glabel func_809324A4 /* 05F18 809324E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05F1C 809324EC 03E00008 */ jr $ra /* 05F20 809324F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s index efd161559c..02a8c89091 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s @@ -99,5 +99,3 @@ glabel func_809324F4 /* 06080 80932650 8FB10028 */ lw $s1, 0x0028($sp) /* 06084 80932654 03E00008 */ jr $ra /* 06088 80932658 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s index c624acb103..4e22d9976b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s @@ -5,5 +5,3 @@ glabel func_8093265C /* 06098 80932668 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 /* 0609C 8093266C 03E00008 */ jr $ra /* 060A0 80932670 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s index a04a92530f..ce67c588cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809379F8 + .word 0x3F20D97C +glabel D_809379FC + .word 0x3F490FDB + +.text glabel func_80932674 /* 060A4 80932674 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 060A8 80932678 AFB00018 */ sw $s0, 0x0018($sp) @@ -112,5 +119,3 @@ glabel func_80932674 /* 0622C 809327FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06230 80932800 03E00008 */ jr $ra /* 06234 80932804 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s index 635129f717..cbc9860bab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s @@ -20,5 +20,3 @@ glabel func_80932808 /* 06280 80932850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06284 80932854 03E00008 */ jr $ra /* 06288 80932858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s index 6ddbc41476..6831cd82cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s @@ -102,5 +102,3 @@ glabel func_8093285C /* 063F8 809329C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 063FC 809329CC 03E00008 */ jr $ra /* 06400 809329D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s index 1953018522..8af770f19a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s @@ -44,5 +44,3 @@ glabel func_809329D4 /* 064A4 80932A74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 064A8 80932A78 03E00008 */ jr $ra /* 064AC 80932A7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s index 1d6cfac144..2cdb92d1dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s @@ -100,5 +100,3 @@ glabel func_80932A80 /* 06600 80932BD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 06604 80932BD4 03E00008 */ jr $ra /* 06608 80932BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s index f7f8ea8ac0..81582cb463 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s @@ -22,5 +22,3 @@ glabel func_80932BDC /* 0665C 80932C2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06660 80932C30 03E00008 */ jr $ra /* 06664 80932C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s index 8c640610e4..dccd1dbd37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s @@ -62,5 +62,3 @@ glabel func_80932C38 /* 06734 80932D04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06738 80932D08 03E00008 */ jr $ra /* 0673C 80932D0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s index 8411ff7cf0..ec116181c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s @@ -40,5 +40,3 @@ glabel func_80932D10 /* 067D0 80932DA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 067D4 80932DA4 03E00008 */ jr $ra /* 067D8 80932DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s index 9b75d74072..f3668430a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s @@ -137,5 +137,3 @@ glabel func_80932DAC /* 069C4 80932F94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 069C8 80932F98 03E00008 */ jr $ra /* 069CC 80932F9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s index be37612692..5e2af41a28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s @@ -19,5 +19,3 @@ glabel func_80932FA0 /* 06A14 80932FE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06A18 80932FE8 03E00008 */ jr $ra /* 06A1C 80932FEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s index 7256d9a6c4..3a5ac33ea9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s @@ -32,5 +32,3 @@ glabel func_80932FF0 /* 06A88 80933058 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06A8C 8093305C 03E00008 */ jr $ra /* 06A90 80933060 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s index a2d3b4ef6c..93094dd4a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s @@ -19,5 +19,3 @@ glabel func_80933064 /* 06AD8 809330A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06ADC 809330AC 03E00008 */ jr $ra /* 06AE0 809330B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s index bc1d2bf9b3..c47f6f5c94 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s @@ -34,5 +34,3 @@ glabel func_809330B4 /* 06B58 80933128 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06B5C 8093312C 03E00008 */ jr $ra /* 06B60 80933130 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s index 58a5a8bf6f..5da8d9982c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s @@ -14,5 +14,3 @@ glabel func_80933134 /* 06B94 80933164 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06B98 80933168 03E00008 */ jr $ra /* 06B9C 8093316C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s index 23c094adab..f14e069957 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80937A00 + .word 0x37D1B717 +glabel D_80937A04 + .word 0x3983126F + +.text glabel func_80933170 /* 06BA0 80933170 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 06BA4 80933174 AFBF0014 */ sw $ra, 0x0014($sp) @@ -31,5 +38,3 @@ glabel func_80933170 /* 06C0C 809331DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06C10 809331E0 03E00008 */ jr $ra /* 06C14 809331E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s index 5c9a23a911..13b752b0b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s @@ -9,5 +9,3 @@ glabel func_809331E8 /* 06C34 80933204 A4800722 */ sh $zero, 0x0722($a0) ## 00000722 /* 06C38 80933208 03E00008 */ jr $ra /* 06C3C 8093320C AC980190 */ sw $t8, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s index d318c5bcf3..f77b08261a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s @@ -12,5 +12,3 @@ glabel func_80933210 .L80933234: /* 06C64 80933234 03E00008 */ jr $ra /* 06C68 80933238 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s index 87b9aa8fdf..b627f18dfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s @@ -20,5 +20,3 @@ glabel func_8093323C /* 06CB4 80933284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06CB8 80933288 03E00008 */ jr $ra /* 06CBC 8093328C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s index d5adbcc839..e5856144e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s @@ -41,5 +41,3 @@ glabel func_80933290 /* 06D4C 8093331C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 06D50 80933320 03E00008 */ jr $ra /* 06D54 80933324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s index e387ceebdd..c45125c031 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s @@ -52,5 +52,3 @@ glabel func_80933328 /* 06E18 809333E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 06E1C 809333EC 03E00008 */ jr $ra /* 06E20 809333F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s index 38e926e516..7aacf19de7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s @@ -97,5 +97,3 @@ glabel func_809333F4 /* 06F78 80933548 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 06F7C 8093354C 03E00008 */ jr $ra /* 06F80 80933550 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s index e0f18395d9..46bf4b12ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s @@ -45,5 +45,3 @@ glabel func_80933554 /* 0702C 809335FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 07030 80933600 03E00008 */ jr $ra /* 07034 80933604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s index a622899712..8d81e9765f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s @@ -80,5 +80,3 @@ glabel func_80933608 /* 07148 80933718 8FB10018 */ lw $s1, 0x0018($sp) /* 0714C 8093371C 03E00008 */ jr $ra /* 07150 80933720 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s index 41a983c7bc..32768111dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s @@ -8,5 +8,3 @@ glabel func_80933724 /* 0716C 8093373C AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 /* 07170 80933740 03E00008 */ jr $ra /* 07174 80933744 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s index 141eb3a8cc..62b598a44e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80937A08 + .float 0.8 + +glabel D_80937A0C + .float 0.4 + +.text glabel func_80933748 /* 07178 80933748 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0717C 8093374C AFBF001C */ sw $ra, 0x001C($sp) @@ -111,5 +119,3 @@ glabel func_80933748 /* 07300 809338D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 07304 809338D4 03E00008 */ jr $ra /* 07308 809338D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s index 6f4bc8be09..572347c053 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s @@ -40,5 +40,3 @@ glabel func_809338DC /* 0739C 8093396C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 073A0 80933970 03E00008 */ jr $ra /* 073A4 80933974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s index 6ff0167cdd..54a821378a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s @@ -33,5 +33,3 @@ glabel func_80933978 /* 0741C 809339EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 07420 809339F0 03E00008 */ jr $ra /* 07424 809339F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s index 14002ab3d2..fb3a8270d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s @@ -103,5 +103,3 @@ glabel func_809339F8 /* 075A8 80933B78 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 075AC 80933B7C 03E00008 */ jr $ra /* 075B0 80933B80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s index a6d0f3e2d7..122e3a4b13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80937A10 + .word 0x3F555555 + +.text glabel func_80933B84 /* 075B4 80933B84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 075B8 80933B88 AFBF0014 */ sw $ra, 0x0014($sp) @@ -70,5 +75,3 @@ glabel func_80933B84 /* 076A4 80933C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 076A8 80933C78 03E00008 */ jr $ra /* 076AC 80933C7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s index 7163cab5d8..73102911d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s @@ -27,5 +27,3 @@ glabel func_80933C80 /* 07710 80933CE0 A30500C5 */ sb $a1, 0x00C5($t8) ## 000000C5 /* 07714 80933CE4 03E00008 */ jr $ra /* 07718 80933CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s index 04ea67192f..cfc4c0e26d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s @@ -16,5 +16,3 @@ glabel func_80933CEC /* 07750 80933D20 A08A03E5 */ sb $t2, 0x03E5($a0) ## 000003E5 /* 07754 80933D24 03E00008 */ jr $ra /* 07758 80933D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s index d99aa5cad4..9ad9b81ea9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s @@ -9,5 +9,3 @@ glabel func_80933D2C /* 07778 80933D48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0777C 80933D4C 03E00008 */ jr $ra /* 07780 80933D50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s index 07d3b078f1..457adce4ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s @@ -107,5 +107,3 @@ glabel func_80933D54 /* 07904 80933ED4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 07908 80933ED8 03E00008 */ jr $ra /* 0790C 80933EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s index a622bdfa95..621b89596e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s @@ -90,5 +90,3 @@ glabel func_80933EE0 /* 07A50 80934020 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07A54 80934024 03E00008 */ jr $ra /* 07A58 80934028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s index 1c3d95338e..8208cd8efd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s @@ -172,5 +172,3 @@ glabel func_80934338 /* 07FC8 80934598 8FB10018 */ lw $s1, 0x0018($sp) /* 07FCC 8093459C 03E00008 */ jr $ra /* 07FD0 809345A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s index 23a132eae3..82a13a7b0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s @@ -19,5 +19,3 @@ glabel func_809345A4 .L809345E8: /* 08018 809345E8 03E00008 */ jr $ra /* 0801C 809345EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s index cf2ed6091f..8a990d258c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s @@ -13,5 +13,3 @@ glabel func_809345F0 /* 0804C 8093461C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08050 80934620 03E00008 */ jr $ra /* 08054 80934624 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s index 69b21f46bd..fba6dbd733 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s @@ -16,5 +16,3 @@ glabel func_80934628 .L80934660: /* 08090 80934660 03E00008 */ jr $ra /* 08094 80934664 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s index 2fd14d8439..17c020311e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s @@ -1,3 +1,30 @@ +.late_rodata +glabel D_80937A1C + .word 0x3F20D97C +glabel D_80937A20 + .word 0x3F20D97C +glabel D_80937A24 + .word 0x3F20D97C +glabel D_80937A28 + .word 0x3F20D97C +glabel D_80937A2C + .word 0x3F20D97C +glabel D_80937A30 + .word 0x3F20D97C +glabel D_80937A34 + .word 0x3F20D97C +glabel D_80937A38 + .word 0x3F20D97C +glabel D_80937A3C + .word 0x3F20D97C +glabel D_80937A40 + .word 0x3E060A92 +glabel D_80937A44 + .word 0x3E060A92 +glabel D_80937A48 + .word 0x3E060A92 + +.text glabel func_80934A44 /* 08474 80934A44 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 08478 80934A48 AFA40038 */ sw $a0, 0x0038($sp) @@ -552,5 +579,3 @@ glabel func_80934A44 /* 08C5C 8093522C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 08C60 80935230 03E00008 */ jr $ra /* 08C64 80935234 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s index c6e71b9913..c9203029a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s @@ -41,5 +41,3 @@ glabel func_80935238 /* 08D00 809352D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 08D04 809352D4 03E00008 */ jr $ra /* 08D08 809352D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s index a9dd67376f..8e03cc9fd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80937910 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937920 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937930 + .asciz "../z_boss_sst.c" + .balign 4 + +.late_rodata +glabel D_80937A4C + .float 6.28318548203 + +glabel D_80937A50 + .float 6.28318548203 + +glabel D_80937A54 + .word 0x39C49BA6 +glabel D_80937A58 + .word 0x3A449BA6 + +.text glabel func_809352DC /* 08D0C 809352DC 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 08D10 809352E0 AFBF002C */ sw $ra, 0x002C($sp) @@ -300,5 +326,3 @@ glabel func_809352DC /* 09188 80935758 8FB10028 */ lw $s1, 0x0028($sp) /* 0918C 8093575C 03E00008 */ jr $ra /* 09190 80935760 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s index 44c8725b7d..fd1da950a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s @@ -78,5 +78,3 @@ glabel func_80935764 /* 092B4 80935884 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 092B8 80935888 03E00008 */ jr $ra /* 092BC 8093588C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s index 77c347a040..e37a212f69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s @@ -47,5 +47,3 @@ glabel func_80935890 /* 0936C 8093593C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09370 80935940 03E00008 */ jr $ra /* 09374 80935944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s index 6754c9ca24..cdb9ceb42f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s @@ -58,5 +58,3 @@ glabel func_80935948 /* 09444 80935A14 8FB60030 */ lw $s6, 0x0030($sp) /* 09448 80935A18 03E00008 */ jr $ra /* 0944C 80935A1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s index b9c2d7fa33..c87f6ca376 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_80937A5C + .word 0x3D75C28F +glabel D_80937A60 + .float 0.12 + +glabel D_80937A64 + .word 0x3D75C28F +glabel D_80937A68 + .float 0.12 + +.text glabel func_80935A20 /* 09450 80935A20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 09454 80935A24 AFB10018 */ sw $s1, 0x0018($sp) @@ -188,5 +200,3 @@ glabel func_80935A20 /* 09700 80935CD0 8FB10018 */ lw $s1, 0x0018($sp) /* 09704 80935CD4 03E00008 */ jr $ra /* 09708 80935CD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s index 0cf8bfb5e9..1f75a7ebbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s @@ -164,5 +164,3 @@ glabel func_80935CDC /* 09954 80935F24 8FB60060 */ lw $s6, 0x0060($sp) /* 09958 80935F28 03E00008 */ jr $ra /* 0995C 80935F2C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s index 3a416acd3b..2cdb1c5848 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s @@ -121,5 +121,3 @@ glabel func_80935F30 /* 09B20 809360F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09B24 809360F4 03E00008 */ jr $ra /* 09B28 809360F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s index 473cba8c07..1be9ff0ea2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s @@ -183,5 +183,3 @@ glabel func_809360FC /* 09DC0 80936390 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 09DC4 80936394 03E00008 */ jr $ra /* 09DC8 80936398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s index 5c4e0be50f..894ba17951 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s @@ -1,3 +1,38 @@ +.rdata +glabel D_80937940 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937950 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937960 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937970 + .asciz "../z_boss_sst.c" + .balign 4 + +glabel D_80937980 + .asciz "../z_boss_sst.c" + .balign 4 + +.late_rodata +glabel D_80937A6C + .float 0.001 + +glabel D_80937A70 + .float 0.005 + +glabel D_80937A74 + .float 0.001 + +glabel D_80937A78 + .float 0.001 + +.text glabel func_8093639C /* 09DCC 8093639C 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 09DD0 809363A0 AFBF006C */ sw $ra, 0x006C($sp) @@ -395,4 +430,3 @@ glabel func_8093639C /* 0A3B4 80936984 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 /* 0A3B8 80936988 00000000 */ nop /* 0A3BC 8093698C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s index 3ef3b808dc..3760a0b687 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s @@ -28,5 +28,3 @@ glabel BossTw_Destroy /* 01264 80939F34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01268 80939F38 03E00008 */ jr $ra /* 0126C 80939F3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s index c51b2e3a1d..9b2c8899ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8094AC28 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AC38 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B06C + .word 0x458FC000 + +.text glabel BossTw_Draw /* 0A5A4 80943274 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0A5A8 80943278 AFBF0044 */ sw $ra, 0x0044($sp) @@ -458,5 +472,3 @@ glabel BossTw_Draw /* 0AC74 80943944 8FB20040 */ lw $s2, 0x0040($sp) /* 0AC78 80943948 03E00008 */ jr $ra /* 0AC7C 8094394C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 09ad12ec6e..b970717631 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AEC4 + .float 1.99000000954 + +.text glabel BossTw_Init /* 009F0 809396C0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 009F4 809396C4 AFB10038 */ sw $s1, 0x0038($sp) @@ -562,5 +567,3 @@ glabel BossTw_Init /* 011FC 80939ECC 8FB10038 */ lw $s1, 0x0038($sp) /* 01200 80939ED0 03E00008 */ jr $ra /* 01204 80939ED4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s index 6fcf7157ca..18146ba207 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8094B014 + .float 0.3 + +glabel D_8094B018 + .float 0.4 + +glabel D_8094B01C + .float 0.4 + +.text glabel BossTw_Update /* 07A04 809406D4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 07A08 809406D8 AFBF004C */ sw $ra, 0x004C($sp) @@ -457,5 +468,3 @@ glabel BossTw_Update /* 0806C 80940D3C 8FB30048 */ lw $s3, 0x0048($sp) /* 08070 80940D40 03E00008 */ jr $ra /* 08074 80940D44 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s index 20a21c8bfe..4f75d340d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s @@ -64,5 +64,3 @@ glabel func_80938CD0 /* 000E8 80938DB8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000EC 80938DBC 03E00008 */ jr $ra /* 000F0 80938DC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s index 1fc0091a18..46c58cf94b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s @@ -66,5 +66,3 @@ glabel func_80938DC4 /* 001E4 80938EB4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001E8 80938EB8 03E00008 */ jr $ra /* 001EC 80938EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s index ed5e69bfb0..b4e51a5682 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8094AEA8 + .float 0.0025 + +glabel D_8094AEAC + .float 3.14159274101 + +.text glabel func_80938EC0 /* 001F0 80938EC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 001F4 80938EC4 44867000 */ mtc1 $a2, $f14 ## $f14 = 0.00 @@ -68,5 +76,3 @@ glabel func_80938EC0 /* 002E8 80938FB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002EC 80938FBC 03E00008 */ jr $ra /* 002F0 80938FC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938FC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938FC4.s index f7b8e09472..64d626666f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938FC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938FC4.s @@ -45,5 +45,3 @@ glabel func_80938FC4 /* 00394 80939064 24420048 */ addiu $v0, $v0, 0x0048 ## $v0 = 00010048 /* 00398 80939068 03E00008 */ jr $ra /* 0039C 8093906C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s index 6476a63b7e..08377ff03c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s @@ -57,5 +57,3 @@ glabel func_80939070 /* 0046C 8093913C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00470 80939140 03E00008 */ jr $ra /* 00474 80939144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s index 1d24a6fc07..b1350bcef9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AEB0 + .float 6.28318548203 + +.text glabel func_80939148 /* 00478 80939148 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0047C 8093914C 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 @@ -70,5 +75,3 @@ glabel func_80939148 /* 00574 80939244 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00578 80939248 03E00008 */ jr $ra /* 0057C 8093924C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s index 7478f38ee0..c9f44d7bd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s @@ -61,5 +61,3 @@ glabel func_80939250 /* 0065C 8093932C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00660 80939330 03E00008 */ jr $ra /* 00664 80939334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s index ae3b4e16a6..6860ba377f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8094AEB4 + .float 1.57079637051 + +glabel D_8094AEB8 + .word 0x3F490FDB + +.text glabel func_80939338 /* 00668 80939338 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0066C 8093933C AFBF005C */ sw $ra, 0x005C($sp) @@ -117,5 +125,3 @@ glabel func_80939338 /* 00820 809394F0 8FB70058 */ lw $s7, 0x0058($sp) /* 00824 809394F4 03E00008 */ jr $ra /* 00828 809394F8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s index 35b7d9a1ac..e875be36f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8094AEBC + .float 1.57079637051 + +glabel D_8094AEC0 + .word 0x3F490FDB + +.text glabel func_809394FC /* 0082C 809394FC 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00830 80939500 AFBF005C */ sw $ra, 0x005C($sp) @@ -117,5 +125,3 @@ glabel func_809394FC /* 009E4 809396B4 8FB70058 */ lw $s7, 0x0058($sp) /* 009E8 809396B8 03E00008 */ jr $ra /* 009EC 809396BC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F40.s index b4509b9f9f..61278ef58d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F40.s @@ -19,5 +19,3 @@ glabel func_80939F40 /* 012AC 80939F7C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 012B0 80939F80 03E00008 */ jr $ra /* 012B4 80939F84 E48404C8 */ swc1 $f4, 0x04C8($a0) ## 000004C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s index 4612f5b0e3..c5fc87402e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s @@ -79,5 +79,3 @@ glabel func_80939F88 /* 013CC 8093A09C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 013D0 8093A0A0 03E00008 */ jr $ra /* 013D4 8093A0A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s index 71435d4981..49f95741bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AEC8 + .word 0x407F5C29 + +.text glabel func_8093A0A8 /* 013D8 8093A0A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 013DC 8093A0AC AFBF001C */ sw $ra, 0x001C($sp) @@ -142,5 +147,3 @@ glabel func_8093A0A8 /* 015D0 8093A2A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 015D4 8093A2A4 03E00008 */ jr $ra /* 015D8 8093A2A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s index 874ec1ee87..2972d2f6b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8094AECC + .word 0x4622F983 +glabel D_8094AED0 + .word 0x4622F983 + +.text glabel func_8093A2AC /* 015DC 8093A2AC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 015E0 8093A2B0 AFBF001C */ sw $ra, 0x001C($sp) @@ -150,5 +157,3 @@ glabel func_8093A2AC /* 01800 8093A4D0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01804 8093A4D4 03E00008 */ jr $ra /* 01808 8093A4D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s index 184e367e08..3e1cbbe848 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AED4 + .float 0.01 + +.text glabel func_8093A4DC /* 0180C 8093A4DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01810 8093A4E0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -58,5 +63,3 @@ glabel func_8093A4DC /* 018E8 8093A5B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 018EC 8093A5BC 03E00008 */ jr $ra /* 018F0 8093A5C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s index cfc2722e5b..a245dbc263 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8094AED8 + .float 0.2 + +glabel D_8094AEDC + .float 0.005 + +glabel D_8094AEE0 + .float 0.005 + +.text glabel func_8093A5C4 /* 018F4 8093A5C4 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 018F8 8093A5C8 F7BC0050 */ sdc1 $f28, 0x0050($sp) @@ -237,5 +248,3 @@ glabel func_8093A5C4 /* 01C64 8093A934 8FB70078 */ lw $s7, 0x0078($sp) /* 01C68 8093A938 03E00008 */ jr $ra /* 01C6C 8093A93C 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s index bf181e8808..bad62ef936 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s @@ -128,5 +128,3 @@ glabel func_8093A940 /* 01E54 8093AB24 8FB10020 */ lw $s1, 0x0020($sp) /* 01E58 8093AB28 03E00008 */ jr $ra /* 01E5C 8093AB2C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s index fcee51d9f8..f99f6ad2ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AEE4 + .float 3.14159274101 + +.text glabel func_8093AB30 /* 01E60 8093AB30 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01E64 8093AB34 AFBF001C */ sw $ra, 0x001C($sp) @@ -165,5 +170,3 @@ glabel func_8093AB30 /* 020D8 8093ADA8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 020DC 8093ADAC 03E00008 */ jr $ra /* 020E0 8093ADB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093ADB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093ADB4.s index 24ed9698a4..622717a910 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093ADB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093ADB4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AEE8 + .float 1.1 + +.text glabel func_8093ADB4 /* 020E4 8093ADB4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 020E8 8093ADB8 AFBF001C */ sw $ra, 0x001C($sp) @@ -73,5 +78,3 @@ glabel func_8093ADB4 /* 021FC 8093AECC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02200 8093AED0 03E00008 */ jr $ra /* 02204 8093AED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AED8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AED8.s index 71af1b3123..b54f6989bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AED8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AED8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8094AEEC + .word 0x448E8000 +glabel D_8094AEF0 + .word 0x3F490FDB + +.text glabel func_8093AED8 /* 02208 8093AED8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0220C 8093AEDC AFBF0014 */ sw $ra, 0x0014($sp) @@ -197,5 +204,3 @@ glabel func_8093AED8 /* 024D0 8093B1A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 024D4 8093B1A4 03E00008 */ jr $ra /* 024D8 8093B1A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s index 11403916a7..e20d91efe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_8094AEF4 + .word 0xBE99999A +glabel D_8094AEF8 + .float 0.0025 + +glabel D_8094AEFC + .float 0.0025 + +glabel D_8094AF00 + .float 10000.0 + +glabel D_8094AF04 + .float 10000.0 + +glabel D_8094AF08 + .float 3.14159274101 + +.text glabel func_8093B1AC /* 024DC 8093B1AC 27BDFEB0 */ addiu $sp, $sp, 0xFEB0 ## $sp = FFFFFEB0 /* 024E0 8093B1B0 AFBF0064 */ sw $ra, 0x0064($sp) @@ -1111,5 +1130,3 @@ glabel func_8093B1AC /* 03488 8093C158 8FB60060 */ lw $s6, 0x0060($sp) /* 0348C 8093C15C 03E00008 */ jr $ra /* 03490 8093C160 27BD0150 */ addiu $sp, $sp, 0x0150 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s index 9dee0e0654..5e6b986005 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s @@ -24,5 +24,3 @@ glabel func_8093C164 /* 034E8 8093C1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 034EC 8093C1BC 03E00008 */ jr $ra /* 034F0 8093C1C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s index 30c420297b..8e85abe99e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s @@ -42,5 +42,3 @@ glabel func_8093C1C4 /* 03580 8093C250 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03584 8093C254 03E00008 */ jr $ra /* 03588 8093C258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s index 0ac54a4e21..a8e24bd063 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s @@ -26,5 +26,3 @@ glabel func_8093C25C /* 035E8 8093C2B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 035EC 8093C2BC 03E00008 */ jr $ra /* 035F0 8093C2C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s index 5863f4768b..c53bc8b2f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094AF0C + .float 0.1 + +.text glabel func_8093C2C4 /* 035F4 8093C2C4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 035F8 8093C2C8 AFB00030 */ sw $s0, 0x0030($sp) @@ -196,5 +201,3 @@ glabel func_8093C2C4 /* 038B0 8093C580 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 038B4 8093C584 03E00008 */ jr $ra /* 038B8 8093C588 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s index 5935c5c251..0faa59c147 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s @@ -26,5 +26,3 @@ glabel func_8093C58C /* 03918 8093C5E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0391C 8093C5EC 03E00008 */ jr $ra /* 03920 8093C5F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C5F4.s index 073dd00d90..95951ae627 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C5F4.s @@ -41,5 +41,3 @@ glabel func_8093C5F4 /* 039A8 8093C678 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 039AC 8093C67C 03E00008 */ jr $ra /* 039B0 8093C680 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s index bd16c67776..e04a814669 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s @@ -32,5 +32,3 @@ glabel func_8093C684 /* 03A24 8093C6F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03A28 8093C6F8 03E00008 */ jr $ra /* 03A2C 8093C6FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s index 29c5dea131..66c18a90ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s @@ -44,5 +44,3 @@ glabel func_8093C700 /* 03AC0 8093C790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03AC4 8093C794 03E00008 */ jr $ra /* 03AC8 8093C798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s index 022ae152b2..aba6447a50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s @@ -17,5 +17,3 @@ glabel func_8093C79C /* 03B08 8093C7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B0C 8093C7DC 03E00008 */ jr $ra /* 03B10 8093C7E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s index 983da2fe64..0899d69774 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s @@ -17,5 +17,3 @@ glabel func_8093C7E4 /* 03B48 8093C818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B4C 8093C81C 03E00008 */ jr $ra /* 03B50 8093C820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C824.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C824.s index 69d1455e77..2f9176bbee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C824.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C824.s @@ -12,5 +12,3 @@ glabel func_8093C824 /* 03B7C 8093C84C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 03B80 8093C850 03E00008 */ jr $ra /* 03B84 8093C854 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C858.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C858.s index bda7ca2beb..a393947a7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C858.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C858.s @@ -40,5 +40,3 @@ glabel func_8093C858 /* 03C18 8093C8E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03C1C 8093C8EC 03E00008 */ jr $ra /* 03C20 8093C8F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C8F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C8F4.s index 456409e4ff..daf0334adb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C8F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C8F4.s @@ -6,5 +6,3 @@ glabel func_8093C8F4 /* 03C34 8093C904 A48005FA */ sh $zero, 0x05FA($a0) ## 000005FA /* 03C38 8093C908 03E00008 */ jr $ra /* 03C3C 8093C90C A4800440 */ sh $zero, 0x0440($a0) ## 00000440 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index 833a6ecd69..dbe8a9850a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -1,3 +1,26 @@ +.late_rodata +glabel D_8094AF10 + .float 3.14159274101 + +glabel D_8094AF14 + .float 3.14159274101 + +glabel D_8094AF18 + .float 3.14159274101 + +glabel D_8094AF1C + .float 3000.0 + +glabel D_8094AF20 + .float 3000.0 + +glabel D_8094AF24 + .float 1.99000000954 + +glabel D_8094AF28 + .word 0x3BA71DE7 + +.text glabel func_8093C910 /* 03C40 8093C910 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 03C44 8093C914 AFBF003C */ sw $ra, 0x003C($sp) @@ -744,5 +767,3 @@ glabel func_8093C910 /* 046FC 8093D3CC 8FB20038 */ lw $s2, 0x0038($sp) /* 04700 8093D3D0 03E00008 */ jr $ra /* 04704 8093D3D4 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s index cc4c93c67b..f0bf1827c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s @@ -27,5 +27,3 @@ glabel func_8093D3D8 /* 04768 8093D438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0476C 8093D43C 03E00008 */ jr $ra /* 04770 8093D440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s index 2066920da9..eda980adbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s @@ -75,5 +75,3 @@ glabel func_8093D444 /* 04870 8093D540 8FB00020 */ lw $s0, 0x0020($sp) /* 04874 8093D544 03E00008 */ jr $ra /* 04878 8093D548 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D54C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D54C.s index 5ab63d51f9..c3548a8aca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D54C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D54C.s @@ -12,5 +12,3 @@ glabel func_8093D54C /* 048A4 8093D574 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 048A8 8093D578 03E00008 */ jr $ra /* 048AC 8093D57C E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D580.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D580.s index 4479c642c7..e29b854ba4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D580.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D580.s @@ -2,5 +2,3 @@ glabel func_8093D580 /* 048B0 8093D580 AFA40000 */ sw $a0, 0x0000($sp) /* 048B4 8093D584 03E00008 */ jr $ra /* 048B8 8093D588 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D58C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D58C.s index a6e89812cc..d989d630b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D58C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D58C.s @@ -12,5 +12,3 @@ glabel func_8093D58C /* 048E4 8093D5B4 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 048E8 8093D5B8 03E00008 */ jr $ra /* 048EC 8093D5BC E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index f9886f7fbe..d6f98abe4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -1,3 +1,79 @@ +.late_rodata +glabel jtbl_8094AF2C +.word L8093D670 +.word L8093D7EC +.word L8093D988 +.word L8093DAB8 +.word L8093DC4C +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093E130 +.word L8093E258 +.word L8093E3E8 +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093ECEC +.word L8093E854 +glabel D_8094AF80 + .word 0x46AFC800 +glabel D_8094AF84 + .word 0x44048000 +glabel D_8094AF88 + .float 0.05 + +glabel D_8094AF8C + .float 0.05 + +glabel D_8094AF90 + .float 0.2 + +glabel D_8094AF94 + .word 0x44048000 +glabel D_8094AF98 + .word 0x43848000 +glabel D_8094AF9C + .float 0.1 + +glabel D_8094AFA0 + .float 0.05 + +glabel D_8094AFA4 + .float 10000.0 + +glabel D_8094AFA8 + .word 0x3CCCCCCC +glabel D_8094AFAC + .float 0.2 + +glabel D_8094AFB0 + .word 0xC4048000 +glabel D_8094AFB4 + .word 0x43848000 +glabel D_8094AFB8 + .float 0.1 + +glabel D_8094AFBC + .float 0.05 + +glabel D_8094AFC0 + .float 10000.0 + +glabel D_8094AFC4 + .word 0x3CCCCCCC +glabel D_8094AFC8 + .float -1.57079637051 + +glabel D_8094AFCC + .float 3.14159274101 + +.text glabel func_8093D5C0 /* 048F0 8093D5C0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 048F4 8093D5C4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -1688,5 +1764,3 @@ glabel L8093ECEC /* 06134 8093EE04 8FB30030 */ lw $s3, 0x0030($sp) /* 06138 8093EE08 03E00008 */ jr $ra /* 0613C 8093EE0C 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s index bcd2349a12..caaab21c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8094AFD0 + .word 0x43CE8000 +glabel D_8094AFD4 + .word 0x43838000 +glabel D_8094AFD8 + .word 0x4622F983 +glabel D_8094AFDC + .word 0x4622F983 + +.text glabel func_8093EE10 /* 06140 8093EE10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 06144 8093EE14 AFBF001C */ sw $ra, 0x001C($sp) @@ -207,5 +218,3 @@ glabel func_8093EE10 /* 0642C 8093F0FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 06430 8093F100 03E00008 */ jr $ra /* 06434 8093F104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s index 9114ee6719..5bcb2b7940 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s @@ -46,5 +46,3 @@ glabel func_8093F108 /* 064E8 8093F1B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 064EC 8093F1BC 03E00008 */ jr $ra /* 064F0 8093F1C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index e7ede0a3b0..617e157090 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_8094AFE0 + .float 0.05 + +glabel D_8094AFE4 + .float 0.4 + +glabel D_8094AFE8 + .float 0.05 + +glabel D_8094AFEC + .float 0.4 + +glabel D_8094AFF0 + .word 0x43838000 +glabel D_8094AFF4 + .word 0x43838000 + +.text glabel func_8093F1C4 /* 064F4 8093F1C4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 064F8 8093F1C8 AFBF001C */ sw $ra, 0x001C($sp) @@ -585,5 +604,3 @@ glabel func_8093F1C4 /* 06D08 8093F9D8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 06D0C 8093F9DC 03E00008 */ jr $ra /* 06D10 8093F9E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index 9af82ec5b3..ee2a7fdcfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_8094AFF8 + .float 1.99000000954 + +glabel jtbl_8094AFFC +.word L8093FDC0 +.word L8093FE58 +.word L809400CC +.word L809402FC +.word L80940690 +glabel D_8094B010 + .word 0x43838000 + +.text glabel func_8093F9E4 /* 06D14 8093F9E4 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 06D18 8093F9E8 AFB20044 */ sw $s2, 0x0044($sp) @@ -901,5 +915,3 @@ glabel L80940690 /* 079F8 809406C8 8FB30048 */ lw $s3, 0x0048($sp) /* 079FC 809406CC 03E00008 */ jr $ra /* 07A00 809406D0 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s index 1d99bedf49..ef568cb8b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s @@ -1,3 +1,33 @@ +.rdata +glabel D_8094AA60 + .asciz "OooooooooooooooooooooooooooooooooCC\n" + .balign 4 + +.late_rodata +glabel D_8094B020 + .float 0.3 + +glabel D_8094B024 + .float 0.4 + +glabel jtbl_8094B028 +.word L80941618 +.word L80941470 +.word L80941494 +.word L809414CC +.word L80941534 +.word L80941574 +.word L809415E4 +glabel D_8094B044 + .float 0.03 + +glabel D_8094B048 + .float 0.05 + +glabel D_8094B04C + .word 0x3F733333 + +.text glabel func_80940D48 /* 08078 80940D48 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0807C 80940D4C AFBF0044 */ sw $ra, 0x0044($sp) @@ -681,5 +711,3 @@ glabel L80941618 /* 089F4 809416C4 8FB30040 */ lw $s3, 0x0040($sp) /* 089F8 809416C8 03E00008 */ jr $ra /* 089FC 809416CC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s index 25a7a43309..cad89ef899 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s @@ -52,5 +52,3 @@ glabel func_809416D0 .L80941780: /* 08AB0 80941780 03E00008 */ jr $ra /* 08AB4 80941784 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s index 85927422e9..a564f01a99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8094AA88 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AA98 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AAA8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AAB8 + .asciz "../z_boss_tw.c" + .balign 4 + +.text glabel func_80941788 /* 08AB8 80941788 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 08ABC 8094178C AFB10018 */ sw $s1, 0x0018($sp) @@ -274,5 +292,3 @@ glabel func_80941788 /* 08EE4 80941BB4 8FB10018 */ lw $s1, 0x0018($sp) /* 08EE8 80941BB8 03E00008 */ jr $ra /* 08EEC 80941BBC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s index 8534d05b82..38a5d7e14a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s @@ -1,3 +1,25 @@ +.rdata +glabel D_8094AAC8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AAD8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AAE8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AAF8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB08 + .asciz "../z_boss_tw.c" + .balign 4 + +.text glabel func_80941BC0 /* 08EF0 80941BC0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 08EF4 80941BC4 AFBF003C */ sw $ra, 0x003C($sp) @@ -373,5 +395,3 @@ glabel func_80941BC0 /* 094A4 80942174 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 094A8 80942178 03E00008 */ jr $ra /* 094AC 8094217C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s index da9220db30..064a81b527 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s @@ -1,3 +1,29 @@ +.rdata +glabel D_8094AB18 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB28 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB38 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB48 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB58 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B050 + .float 0.7 + +.text glabel func_80942180 /* 094B0 80942180 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 094B4 80942184 AFBF003C */ sw $ra, 0x003C($sp) @@ -347,5 +373,3 @@ glabel func_80942180 /* 09A14 809426E4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 09A18 809426E8 03E00008 */ jr $ra /* 09A1C 809426EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s index efdb7b6fb7..572b5e5f32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s @@ -1,3 +1,28 @@ +.rdata +glabel D_8094AB68 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB78 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB88 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AB98 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B054 + .float 0.4 + +glabel D_8094B058 + .float 3.14159274101 + +.text glabel func_809426F0 /* 09A20 809426F0 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 09A24 809426F4 AFB40058 */ sw $s4, 0x0058($sp) @@ -356,5 +381,3 @@ glabel func_809426F0 /* 09F94 80942C64 8FB40058 */ lw $s4, 0x0058($sp) /* 09F98 80942C68 03E00008 */ jr $ra /* 09F9C 80942C6C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s index 10a9703275..ac6a8d3f1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s @@ -1,3 +1,33 @@ +.rdata +glabel D_8094ABA8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ABB8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ABC8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ABD8 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B05C + .float 0.01 + +glabel D_8094B060 + .word 0x469C4000 +glabel D_8094B064 + .float 0.01 + +glabel D_8094B068 + .word 0x469C4000 + +.text glabel func_80942C70 /* 09FA0 80942C70 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 09FA4 80942C74 AFBF0024 */ sw $ra, 0x0024($sp) @@ -241,5 +271,3 @@ glabel func_80942C70 /* 0A34C 8094301C 8FB10020 */ lw $s1, 0x0020($sp) /* 0A350 80943020 03E00008 */ jr $ra /* 0A354 80943024 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s index 42ab2a0227..e1b78ca381 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8094ABE8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ABF8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AC08 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AC18 + .asciz "../z_boss_tw.c" + .balign 4 + +.text glabel func_80943028 /* 0A358 80943028 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0A35C 8094302C AFBF001C */ sw $ra, 0x001C($sp) @@ -146,5 +164,3 @@ glabel func_80943028 /* 0A598 80943268 8FB10018 */ lw $s1, 0x0018($sp) /* 0A59C 8094326C 03E00008 */ jr $ra /* 0A5A0 80943270 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s index dfef6178ac..b31436c386 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s @@ -1,3 +1,44 @@ +.rdata +glabel D_8094AC48 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AC58 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel jtbl_8094B070 +.word L80943CA8 +.word L80943C20 +.word L80943B0C +.word L80943B94 +.word L80943CFC +.word L80943D1C +.word L809439B8 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943CA8 +.word L80943C20 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943D38 +.word L80943B0C +.word L80943B94 + +.text glabel func_80943950 /* 0AC80 80943950 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0AC84 80943954 AFBF0034 */ sw $ra, 0x0034($sp) @@ -284,5 +325,3 @@ glabel L80943D38 /* 0B0B4 80943D84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0B0B8 80943D88 03E00008 */ jr $ra /* 0B0BC 80943D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s index c5a78d115e..d84ae1609b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s @@ -1,3 +1,48 @@ +.rdata +glabel D_8094AC68 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AC78 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AC88 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel jtbl_8094B0E0 +.word L80943E54 +.word L80943E54 +.word L80943E54 +.word L80943E54 +.word L80943EDC +.word L80943EDC +.word L80943E24 +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943E54 +.word L80943E54 +.word L80943EDC +.word L80943DEC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943EDC +.word L80943E08 +.word L80943E54 +.word L80943E54 + +.text glabel func_80943D90 /* 0B0C0 80943D90 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0B0C4 80943D94 AFBF0014 */ sw $ra, 0x0014($sp) @@ -100,5 +145,3 @@ glabel L80943EDC /* 0B22C 80943EFC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0B230 80943F00 03E00008 */ jr $ra /* 0B234 80943F04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 701edff5c9..3d71bda68d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -1,3 +1,31 @@ +.rdata +glabel D_8094AC98 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ACA8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ACB8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ACC8 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B150 + .float 1.57079637051 + +glabel D_8094B154 + .float 1.3 + +glabel D_8094B158 + .float 1.57079637051 + +.text glabel func_80943F08 /* 0B238 80943F08 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0B23C 80943F0C AFBF003C */ sw $ra, 0x003C($sp) @@ -581,5 +609,3 @@ glabel func_80943F08 /* 0BAE0 809447B0 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 /* 0BAE4 809447B4 03E00008 */ jr $ra /* 0BAE8 809447B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s index e092df2c84..8ce6ba0eb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s @@ -1,3 +1,36 @@ +.rdata +glabel D_8094ACD8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ACE8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ACF8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD08 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD18 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD28 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B15C + .float 1.57079637051 + +glabel D_8094B160 + .float 1.57079637051 + +.text glabel func_809447BC /* 0BAEC 809447BC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0BAF0 809447C0 AFBF003C */ sw $ra, 0x003C($sp) @@ -292,5 +325,3 @@ glabel func_809447BC /* 0BF74 80944C44 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 0BF78 80944C48 03E00008 */ jr $ra /* 0BF7C 80944C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s index 2af4f5f35b..b5b11aeaf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s @@ -1,3 +1,33 @@ +.rdata +glabel D_8094AD38 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD48 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD58 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD68 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD78 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B164 + .word 0x443B8000 +glabel D_8094B168 + .word 0x3EB33333 +glabel D_8094B16C + .float 0.3 + +.text glabel func_80944C50 /* 0BF80 80944C50 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 0BF84 80944C54 AFBF003C */ sw $ra, 0x003C($sp) @@ -270,5 +300,3 @@ glabel func_80944C50 /* 0C3A8 80945078 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 0C3AC 8094507C 03E00008 */ jr $ra /* 0C3B0 80945080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s index bda209c72a..0f4648d193 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8094AD88 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AD98 + .asciz "../z_boss_tw.c" + .balign 4 + +.text glabel func_80945084 /* 0C3B4 80945084 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0C3B8 80945088 AFB1002C */ sw $s1, 0x002C($sp) @@ -231,5 +241,3 @@ glabel func_80945084 /* 0C710 809453E0 8FB20030 */ lw $s2, 0x0030($sp) /* 0C714 809453E4 03E00008 */ jr $ra /* 0C718 809453E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s index a53d5b0c8c..5b0737e38d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_8094B170 + .word 0x4622F983 +glabel D_8094B174 + .word 0x4622F983 +glabel D_8094B178 + .word 0x46FF4C00 +glabel D_8094B17C + .float 3.14159274101 + +glabel D_8094B180 + .float 3.14159274101 + +glabel D_8094B184 + .word 0x41EF3333 +glabel D_8094B188 + .float 0.4 + +glabel D_8094B18C + .word 0x458E3000 +glabel D_8094B190 + .float 0.03 + +.text glabel func_809453EC /* 0C71C 809453EC 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 0C720 809453F0 AFBF0034 */ sw $ra, 0x0034($sp) @@ -641,5 +665,3 @@ glabel func_809453EC /* 0D038 80945D08 8FB10030 */ lw $s1, 0x0030($sp) /* 0D03C 80945D0C 03E00008 */ jr $ra /* 0D040 80945D10 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s index 36838d5466..7f6bf39309 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s @@ -1,3 +1,33 @@ +.late_rodata +glabel D_8094B194 + .word 0x4622F983 +glabel D_8094B198 + .word 0x4622F983 +glabel D_8094B19C + .float 3.14159274101 + +glabel D_8094B1A0 + .word 0x46FF4C00 +glabel D_8094B1A4 + .word 0x46FF4C00 +glabel D_8094B1A8 + .word 0x41EF3333 +glabel D_8094B1AC + .float 0.4 + +glabel D_8094B1B0 + .word 0x3E051EB8 +glabel D_8094B1B4 + .word 0x411E6666 +glabel D_8094B1B8 + .float 3.14159274101 + +glabel D_8094B1BC + .word 0x3E051EB8 +glabel D_8094B1C0 + .float 0.2 + +.text glabel func_80945D14 /* 0D044 80945D14 27BDFED8 */ addiu $sp, $sp, 0xFED8 ## $sp = FFFFFED8 /* 0D048 80945D18 AFBF0044 */ sw $ra, 0x0044($sp) @@ -799,5 +829,3 @@ glabel func_80945D14 /* 0DBA0 80946870 8FB20040 */ lw $s2, 0x0040($sp) /* 0DBA4 80946874 03E00008 */ jr $ra /* 0DBA8 80946878 27BD0128 */ addiu $sp, $sp, 0x0128 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s index 6e7b4ad10c..2bee2aaff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s @@ -171,5 +171,3 @@ glabel func_8094687C /* 0DE24 80946AF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0DE28 80946AF8 03E00008 */ jr $ra /* 0DE2C 80946AFC 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s index ce6530e82e..0555b05de9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s @@ -104,5 +104,3 @@ glabel func_80946B00 /* 0DFA0 80946C70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0DFA4 80946C74 03E00008 */ jr $ra /* 0DFA8 80946C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s index cded773956..d6ef1cde6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s @@ -1,3 +1,27 @@ +.rdata +glabel D_8094ADA8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ADB8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ADC8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ADD8 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B1C4 + .word 0x3DB851EC +glabel D_8094B1C8 + .word 0x3DB851EC + +.text glabel func_80946C7C /* 0DFAC 80946C7C 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 0DFB0 80946C80 AFB40058 */ sw $s4, 0x0058($sp) @@ -373,5 +397,3 @@ glabel func_80946C7C /* 0E564 80947234 8FBE0068 */ lw $s8, 0x0068($sp) /* 0E568 80947238 03E00008 */ jr $ra /* 0E56C 8094723C 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s index bbaa0b9055..621561b493 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s @@ -1,3 +1,27 @@ +.rdata +glabel D_8094ADE8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094ADF8 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE08 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE18 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B1CC + .word 0x3DB851EC +glabel D_8094B1D0 + .word 0x3DB851EC + +.text glabel func_80947240 /* 0E570 80947240 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 0E574 80947244 AFB40058 */ sw $s4, 0x0058($sp) @@ -363,5 +387,3 @@ glabel func_80947240 /* 0EB04 809477D4 8FBE0068 */ lw $s8, 0x0068($sp) /* 0EB08 809477D8 03E00008 */ jr $ra /* 0EB0C 809477DC 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s index 7698336631..0097f1bb0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s @@ -1,3 +1,31 @@ +.late_rodata +glabel D_8094B1D4 + .float 3.14159274101 + +glabel D_8094B1D8 + .word 0xBE4CCCCD +glabel D_8094B1DC + .float 3.14159274101 + +glabel D_8094B1E0 + .word 0xBE4CCCCD +glabel D_8094B1E4 + .word 0x3A03126F +glabel D_8094B1E8 + .float 0.8 + +glabel D_8094B1EC + .float 0.8 + +glabel D_8094B1F0 + .float 0.4 + +glabel D_8094B1F4 + .word 0x418F3333 +glabel D_8094B1F8 + .float 0.1 + +.text glabel func_809477E0 /* 0EB10 809477E0 27BDFED8 */ addiu $sp, $sp, 0xFED8 ## $sp = FFFFFED8 /* 0EB14 809477E4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -918,5 +946,3 @@ glabel func_809477E0 /* 0F84C 8094851C 8FBE0080 */ lw $s8, 0x0080($sp) /* 0F850 80948520 03E00008 */ jr $ra /* 0F854 80948524 27BD0128 */ addiu $sp, $sp, 0x0128 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948528.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948528.s index d9292a1603..903043c011 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948528.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948528.s @@ -6,5 +6,3 @@ glabel func_80948528 /* 0F868 80948538 3C018095 */ lui $at, %hi(D_8094F2B8) ## $at = 80950000 /* 0F86C 8094853C 03E00008 */ jr $ra /* 0F870 80948540 AC26F2B8 */ sw $a2, %lo(D_8094F2B8)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948544.s index f513d8b823..f9082ad664 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948544.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8094B1FC + .float 30269.0 + +glabel D_8094B200 + .float 30307.0 + +glabel D_8094B204 + .float 30323.0 + +.text glabel func_80948544 /* 0F874 80948544 3C028095 */ lui $v0, %hi(D_8094F2B0) ## $v0 = 80950000 /* 0F878 80948548 2442F2B0 */ addiu $v0, $v0, %lo(D_8094F2B0) ## $v0 = 8094F2B0 @@ -74,5 +85,3 @@ glabel func_80948544 .L80948660: /* 0F990 80948660 03E00008 */ jr $ra /* 0F994 80948664 46001005 */ abs.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s index 0521b809b8..c6b58c29e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s @@ -1,3 +1,44 @@ +.rdata +glabel D_8094AE28 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE38 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE48 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE58 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE68 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE78 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE88 + .asciz "../z_boss_tw.c" + .balign 4 + +glabel D_8094AE98 + .asciz "../z_boss_tw.c" + .balign 4 + +.late_rodata +glabel D_8094B208 + .float 1.57079637051 + +glabel D_8094B20C + .float 3.14159274101 + +.text glabel func_80948668 /* 0F998 80948668 27BDFE70 */ addiu $sp, $sp, 0xFE70 ## $sp = FFFFFE70 /* 0F99C 8094866C AFBF008C */ sw $ra, 0x008C($sp) @@ -975,5 +1016,3 @@ glabel func_80948668 /* 10854 80949524 8FBE0088 */ lw $s8, 0x0088($sp) /* 10858 80949528 03E00008 */ jr $ra /* 1085C 8094952C 27BD0190 */ addiu $sp, $sp, 0x0190 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s index e48b8efba2..0a8bc767f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s @@ -29,5 +29,3 @@ glabel func_80949530 /* 108C8 80949598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 108CC 8094959C 03E00008 */ jr $ra /* 108D0 809495A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s index d8d447e117..fad2363c35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s @@ -82,5 +82,3 @@ glabel func_809495A4 /* 109F4 809496C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 109F8 809496C8 03E00008 */ jr $ra /* 109FC 809496CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s index 6901f04cc4..b969c60f24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s @@ -25,5 +25,3 @@ glabel func_809496D0 /* 10A58 80949728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10A5C 8094972C 03E00008 */ jr $ra /* 10A60 80949730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s index 4adaf1bdd6..73003ce3ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094B210 + .float 1.99000000954 + +.text glabel func_80949734 /* 10A64 80949734 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 10A68 80949738 AFB00018 */ sw $s0, 0x0018($sp) @@ -135,5 +140,3 @@ glabel func_80949734 /* 10C44 80949914 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 10C48 80949918 03E00008 */ jr $ra /* 10C4C 8094991C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s index 31d6eb4ef3..da8d0e1477 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s @@ -37,5 +37,3 @@ glabel func_80949920 /* 10CD0 809499A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10CD4 809499A4 03E00008 */ jr $ra /* 10CD8 809499A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s index 55eed96e06..2a243fd851 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s @@ -163,5 +163,3 @@ glabel func_809499AC /* 10F20 80949BF0 8FB60060 */ lw $s6, 0x0060($sp) /* 10F24 80949BF4 03E00008 */ jr $ra /* 10F28 80949BF8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s index 726438703a..edc82656bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s @@ -19,5 +19,3 @@ glabel func_80949BFC /* 10F70 80949C40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10F74 80949C44 03E00008 */ jr $ra /* 10F78 80949C48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s index 5010dcbbe1..1e87b83abe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s @@ -41,5 +41,3 @@ glabel func_80949C4C /* 11008 80949CD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1100C 80949CDC 03E00008 */ jr $ra /* 11010 80949CE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s index cc1dc9ba57..8143310f03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s @@ -83,5 +83,3 @@ glabel func_80949CE4 /* 11134 80949E04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 11138 80949E08 03E00008 */ jr $ra /* 1113C 80949E0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s index 1790f9ffae..e3282462ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8094B214 + .float 0.1 + +.text glabel func_80949E10 /* 11140 80949E10 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 11144 80949E14 AFBF0034 */ sw $ra, 0x0034($sp) @@ -190,5 +195,3 @@ glabel func_80949E10 /* 113E8 8094A0B8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 113EC 8094A0BC 03E00008 */ jr $ra /* 113F0 8094A0C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s index 6e8341caa3..326f845fe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s @@ -26,5 +26,3 @@ glabel func_8094A0C4 /* 11450 8094A120 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 11454 8094A124 03E00008 */ jr $ra /* 11458 8094A128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s index 390190f813..06c1f6f91d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s @@ -40,5 +40,3 @@ glabel func_8094A12C /* 114E4 8094A1B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 114E8 8094A1B8 03E00008 */ jr $ra /* 114EC 8094A1BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s index 483c628be8..a8d412ceb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_8094B218 + .word 0x47AFC800 +glabel D_8094B21C + .word 0x403F5C29 +glabel D_8094B220 + .word 0x4622F983 + +.text glabel func_8094A1C0 /* 114F0 8094A1C0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 114F4 8094A1C4 F7BA0030 */ sdc1 $f26, 0x0030($sp) @@ -120,5 +129,3 @@ glabel func_8094A1C0 /* 116BC 8094A38C 8FB40048 */ lw $s4, 0x0048($sp) /* 116C0 8094A390 03E00008 */ jr $ra /* 116C4 8094A394 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s index cc5dcecc45..f4e9a79d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8094B224 + .word 0x4622F983 +glabel D_8094B228 + .word 0x4622F983, 0x00000000 + +.text glabel func_8094A398 /* 116C8 8094A398 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 116CC 8094A39C AFBF001C */ sw $ra, 0x001C($sp) @@ -167,5 +174,3 @@ glabel func_8094A398 /* 1192C 8094A5FC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 11930 8094A600 03E00008 */ jr $ra /* 11934 8094A604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s index cdab9839da..44c1b4edd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s @@ -21,5 +21,3 @@ glabel func_8094A608 /* 11984 8094A654 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 11988 8094A658 03E00008 */ jr $ra /* 1198C 8094A65C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A660.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A660.s index 0d5d3ac8f9..fef88995e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A660.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A660.s @@ -34,5 +34,3 @@ glabel func_8094A660 /* 119FC 8094A6CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 11A00 8094A6D0 03E00008 */ jr $ra /* 11A04 8094A6D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s index 6ef49524ec..01433f40b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s @@ -26,5 +26,3 @@ glabel func_8094A6D8 /* 11A64 8094A734 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 11A68 8094A738 03E00008 */ jr $ra /* 11A6C 8094A73C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A740.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A740.s index 937dda01bc..749710a0fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A740.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A740.s @@ -31,4 +31,3 @@ glabel func_8094A740 /* 11AD4 8094A7A4 00000000 */ nop /* 11AD8 8094A7A8 00000000 */ nop /* 11ADC 8094A7AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s index 23ba422a08..d1e67d8ea1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s @@ -18,5 +18,3 @@ glabel BossVa_Destroy /* 01424 809506E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01428 809506E8 03E00008 */ jr $ra /* 0142C 809506EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index 2f2f8d9608..c4f42c1f14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -1,3 +1,37 @@ +.rdata +glabel D_8095C470 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C480 + .asciz "../z_boss_va.c" + .balign 4 + +.late_rodata +glabel jtbl_8095C840 +.word L80959318 +.word L809594D0 +.word L809594D0 +.word L809594D0 +.word L80959510 +.word L80959510 +.word L80959510 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959578 +.word L80959550 +.word L80959550 +.word L80959550 +.word L8095978C + +.text glabel BossVa_Draw /* 09F08 809591C8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 09F0C 809591CC 3C0F8096 */ lui $t7, %hi(D_8095C2AC) ## $t7 = 80960000 @@ -414,5 +448,3 @@ glabel L8095978C /* 0A528 809597E8 8FB10038 */ lw $s1, 0x0038($sp) /* 0A52C 809597EC 03E00008 */ jr $ra /* 0A530 809597F0 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index a2b85bf5c3..b68595d72e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -1,3 +1,50 @@ +.late_rodata +glabel jtbl_8095C58C +.word L8094FEC4 +.word L8094FF00 +.word L8094FF00 +.word L8094FF00 +.word L8094FF30 +.word L8094FF30 +.word L8094FF30 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF90 +.word L8094FF60 +.word L8094FF60 +.word L8094FF60 +.word L8094FFD8 +glabel jtbl_8095C5E0 +.word L80950024 +.word L809504C4 +.word L809504C4 +.word L809504C4 +.word L80950538 +.word L80950538 +.word L80950538 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L809505C4 +.word L8095059C +.word L8095059C +.word L8095059C +.word L809505B0 + +.text glabel BossVa_Init /* 00B9C 8094FE5C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00BA0 8094FE60 AFB40048 */ sw $s4, 0x0048($sp) @@ -573,5 +620,3 @@ glabel L809505C4 /* 013DC 8095069C 8FB40048 */ lw $s4, 0x0048($sp) /* 013E0 809506A0 03E00008 */ jr $ra /* 013E4 809506A4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s index 3d4fc2a57c..580997748a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s @@ -1,3 +1,34 @@ +.late_rodata +glabel jtbl_8095C7C0 +.word L80957DA8 +.word L80957F50 +.word L80957F50 +.word L80957F50 +.word L80957F50 +.word L80957F50 +.word L80957F50 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957E74 +.word L80957F50 +glabel D_8095C814 + .word 0x3E75C28F +glabel D_8095C818 + .word 0x3F428F5C +glabel D_8095C81C + .float 0.2 + +.text glabel BossVa_Update /* 08A9C 80957D5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 08AA0 80957D60 AFBF0014 */ sw $ra, 0x0014($sp) @@ -140,5 +171,3 @@ glabel L80957F50 /* 08C94 80957F54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08C98 80957F58 03E00008 */ jr $ra /* 08C9C 80957F5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C0.s index 82923388ea..dea0caae7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C0.s @@ -1,5 +1,3 @@ glabel func_8094F2C0 /* 00000 8094F2C0 03E00008 */ jr $ra /* 00004 8094F2C4 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s index 5640f0f57b..969ee46bd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_8095C560 +.word L8094F350 +.word L8094F350 +.word L8094F350 +.word L8094F39C +.word L8094F39C +.word L8094F39C + +.text glabel func_8094F2C8 /* 00008 8094F2C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0000C 8094F2CC AFBF001C */ sw $ra, 0x001C($sp) @@ -151,5 +161,3 @@ glabel L8094F39C /* 00240 8094F500 8FB00014 */ lw $s0, 0x0014($sp) /* 00244 8094F504 03E00008 */ jr $ra /* 00248 8094F508 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s index c3ac6fcb43..de7d3a4d45 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s @@ -67,5 +67,3 @@ glabel func_8094F50C /* 00340 8094F600 8FB60048 */ lw $s6, 0x0048($sp) /* 00344 8094F604 03E00008 */ jr $ra /* 00348 8094F608 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s index d0823e4abd..068bac3526 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C578 + .word 0x46CB2000 + +.text glabel func_8094F60C /* 0034C 8094F60C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00350 8094F610 AFB00038 */ sw $s0, 0x0038($sp) @@ -79,5 +84,3 @@ glabel func_8094F60C /* 00468 8094F728 8FB60050 */ lw $s6, 0x0050($sp) /* 0046C 8094F72C 03E00008 */ jr $ra /* 00470 8094F730 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s index af28418fbb..a8bfab5c6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C57C + .word 0x46CB2000 + +.text glabel func_8094F734 /* 00474 8094F734 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00478 8094F738 3C0E8096 */ lui $t6, %hi(D_809668D2) ## $t6 = 80960000 @@ -83,5 +88,3 @@ glabel func_8094F734 /* 00598 8094F858 8FB60048 */ lw $s6, 0x0048($sp) /* 0059C 8094F85C 03E00008 */ jr $ra /* 005A0 8094F860 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s index 3c1dfaf613..030e3a8c65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C580 + .float 0.6 + +.text glabel func_8094F864 /* 005A4 8094F864 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 005A8 8094F868 AFB30044 */ sw $s3, 0x0044($sp) @@ -104,5 +109,3 @@ glabel func_8094F864 /* 0071C 8094F9DC 8FBE0058 */ lw $s8, 0x0058($sp) /* 00720 8094F9E0 03E00008 */ jr $ra /* 00724 8094F9E4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s index de8a070e8a..4de3d2bb14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C584 + .float 0.6 + +.text glabel func_8094F9E8 /* 00728 8094F9E8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0072C 8094F9EC AFB30044 */ sw $s3, 0x0044($sp) @@ -104,5 +109,3 @@ glabel func_8094F9E8 /* 008A0 8094FB60 8FBE0058 */ lw $s8, 0x0058($sp) /* 008A4 8094FB64 03E00008 */ jr $ra /* 008A8 8094FB68 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FB6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FB6C.s index 58c5ec4637..b751cf3264 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FB6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FB6C.s @@ -17,5 +17,3 @@ glabel func_8094FB6C /* 008E8 8094FBA8 A4450ABE */ sh $a1, 0x0ABE($v0) ## 00000ABE /* 008EC 8094FBAC 03E00008 */ jr $ra /* 008F0 8094FBB0 A4590AC0 */ sh $t9, 0x0AC0($v0) ## 00000AC0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FBB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FBB4.s index c63634ddd2..270b1f4538 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FBB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FBB4.s @@ -30,5 +30,3 @@ glabel func_8094FBB4 /* 00964 8094FC24 A0490B08 */ sb $t1, 0x0B08($v0) ## 00000B08 /* 00968 8094FC28 03E00008 */ jr $ra /* 0096C 8094FC2C A04A0B09 */ sb $t2, 0x0B09($v0) ## 00000B09 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC30.s index e6a2c2f8a1..b4e8a38bce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC30.s @@ -19,5 +19,3 @@ glabel func_8094FC30 .L8094FC68: /* 009A8 8094FC68 03E00008 */ jr $ra /* 009AC 8094FC6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s index 08a39cc9ba..68db68d008 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C588 + .float 0.7 + +.text glabel func_8094FC70 /* 009B0 8094FC70 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 009B4 8094FC74 3C0E8096 */ lui $t6, %hi(D_8095C240) ## $t6 = 80960000 @@ -131,5 +136,3 @@ glabel func_8094FC70 /* 00B90 8094FE50 8FB60060 */ lw $s6, 0x0060($sp) /* 00B94 8094FE54 03E00008 */ jr $ra /* 00B98 8094FE58 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s index 62d4252a38..0da79b5ef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s @@ -37,5 +37,3 @@ glabel func_809506F0 /* 014B4 80950774 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 014B8 80950778 03E00008 */ jr $ra /* 014BC 8095077C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s index 0d5369781c..dc280185f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s @@ -1,3 +1,63 @@ +.late_rodata +glabel D_8095C634 + .float 0.1 + +glabel D_8095C638 + .float 0.05 + +glabel jtbl_8095C63C +.word L80950830 +.word L80950858 +.word L809508B0 +.word L80950A10 +.word L80950A4C +.word L80950A9C +.word L80950AC0 +.word L80951578 +.word L80950CDC +.word L80950DC8 +.word L80950E78 +.word L80950F2C +.word L80951578 +.word L80950FF8 +.word L809510AC +.word L809513F0 +.word L80951460 +.word L809514D0 +.word L8095156C +glabel D_8095C688 + .float 0.1 + +glabel D_8095C68C + .float 0.7 + +glabel D_8095C690 + .word 0x411CCCCD +glabel D_8095C694 + .float 0.1 + +glabel D_8095C698 + .float 1.6 + +glabel D_8095C69C + .float 0.075 + +glabel D_8095C6A0 + .float 0.075 + +glabel D_8095C6A4 + .float 0.075 + +glabel D_8095C6A8 + .float 0.075 + +glabel D_8095C6AC + .float 0.075 + +glabel D_8095C6B0 + .float 0.075 + +.text glabel func_80950780 /* 014C0 80950780 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 014C4 80950784 AFBF0044 */ sw $ra, 0x0044($sp) @@ -1105,5 +1165,3 @@ glabel L80951578 /* 024D4 80951794 8FB30040 */ lw $s3, 0x0040($sp) /* 024D8 80951798 03E00008 */ jr $ra /* 024DC 8095179C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s index 5f5bd67ff0..e6eec70ad6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s @@ -42,5 +42,3 @@ glabel func_809517A0 /* 02578 80951838 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0257C 8095183C 03E00008 */ jr $ra /* 02580 80951840 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s index 1a0c400fc8..326e143dc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8095C6B4 + .float 0.1 + +glabel D_8095C6B8 + .float 0.05 + +glabel D_8095C6BC + .float 0.1 + +.text glabel func_80951844 /* 02584 80951844 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02588 80951848 AFBF0034 */ sw $ra, 0x0034($sp) @@ -183,5 +194,3 @@ glabel func_80951844 /* 0280C 80951ACC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 02810 80951AD0 03E00008 */ jr $ra /* 02814 80951AD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s index c9fc5f68e6..4a86d03a7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s @@ -76,5 +76,3 @@ glabel func_80951AD8 /* 02938 80951BF8 8FB60050 */ lw $s6, 0x0050($sp) /* 0293C 80951BFC 03E00008 */ jr $ra /* 02940 80951C00 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s index 30409cf140..063b52bcc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_8095C6C0 + .float 0.1 + +glabel D_8095C6C4 + .float 0.1 + +glabel D_8095C6C8 + .float 0.05 + +glabel D_8095C6CC + .word 0x3983126F + +.text glabel func_80951C04 /* 02944 80951C04 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 02948 80951C08 AFBF0034 */ sw $ra, 0x0034($sp) @@ -351,5 +365,3 @@ glabel func_80951C04 /* 02E34 809520F4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 02E38 809520F8 03E00008 */ jr $ra /* 02E3C 809520FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952100.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952100.s index 1d61bb1710..2294e6141b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952100.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952100.s @@ -14,5 +14,3 @@ glabel func_80952100 /* 02E70 80952130 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E74 80952134 03E00008 */ jr $ra /* 02E78 80952138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s index c9950829a8..064dfd143c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_8095C6D0 + .word 0x463B8000 +glabel D_8095C6D4 + .float 0.1 + +glabel D_8095C6D8 + .float 0.05 + +glabel D_8095C6DC + .float 0.1 + +glabel D_8095C6E0 + .word 0x3983126F + +.text glabel func_8095213C /* 02E7C 8095213C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02E80 80952140 AFB30044 */ sw $s3, 0x0044($sp) @@ -458,5 +474,3 @@ glabel func_8095213C /* 034D8 80952798 8FB40048 */ lw $s4, 0x0048($sp) /* 034DC 8095279C 03E00008 */ jr $ra /* 034E0 809527A0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s index bc00111027..8154117313 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s @@ -46,5 +46,3 @@ glabel func_809527A4 /* 0358C 8095284C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03590 80952850 03E00008 */ jr $ra /* 03594 80952854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s index a23f1903fa..6140a12870 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s @@ -1,3 +1,21 @@ +.late_rodata +glabel D_8095C6E4 + .word 0x463B8000 +glabel D_8095C6E8 + .float 0.1 + +glabel D_8095C6EC + .float 0.1 + +glabel D_8095C6F0 + .float 0.05 + +glabel D_8095C6F4 + .word 0x45AAA000 +glabel D_8095C6F8 + .word 0x3983126F + +.text glabel func_80952858 /* 03598 80952858 3C188096 */ lui $t8, %hi(D_809668D1) ## $t8 = 80960000 /* 0359C 8095285C 931868D1 */ lbu $t8, %lo(D_809668D1)($t8) @@ -776,5 +794,3 @@ glabel func_80952858 /* 04090 80953350 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 04094 80953354 03E00008 */ jr $ra /* 04098 80953358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s index 1d8e691dd4..ae5bfda360 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s @@ -39,5 +39,3 @@ glabel func_8095335C /* 04128 809533E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0412C 809533EC 03E00008 */ jr $ra /* 04130 809533F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s index e89410888f..18fdfee125 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s @@ -1,3 +1,52 @@ +.late_rodata +glabel jtbl_8095C6FC +.word L80953460 +.word L8095361C +.word L80953CD8 +.word L80953CD8 +.word L80953CD8 +.word L80953CD8 +.word L80953CD8 +.word L80953868 +.word L80953940 +.word L80953A84 +.word L80953CBC +glabel D_8095C728 + .float 0.6 + +glabel D_8095C72C + .float 0.12 + +glabel D_8095C730 + .float 0.075 + +glabel D_8095C734 + .word 0x3C75C28F +glabel D_8095C738 + .float 0.15 + +glabel D_8095C73C + .float 0.15 + +glabel D_8095C740 + .float 0.15 + +glabel D_8095C744 + .float 0.15 + +glabel D_8095C748 + .float 0.15 + +glabel D_8095C74C + .float 0.15 + +glabel D_8095C750 + .float 0.1 + +glabel D_8095C754 + .float 0.05 + +.text glabel func_809533F4 /* 04134 809533F4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 04138 809533F8 AFB30044 */ sw $s3, 0x0044($sp) @@ -772,5 +821,3 @@ glabel L80953CD8 /* 04C80 80953F40 D7B40030 */ ldc1 $f20, 0x0030($sp) /* 04C84 80953F44 03E00008 */ jr $ra /* 04C88 80953F48 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s index af873b08b7..feca584138 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s @@ -31,5 +31,3 @@ glabel func_80953F4C /* 04CF8 80953FB8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04CFC 80953FBC 03E00008 */ jr $ra /* 04D00 80953FC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s index b472d8fbd4..9692b0f657 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C758 + .float 0.1 + +.text glabel func_80953FC4 /* 04D04 80953FC4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 04D08 80953FC8 AFBF0034 */ sw $ra, 0x0034($sp) @@ -78,5 +83,3 @@ glabel func_80953FC4 /* 04E18 809540D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 04E1C 809540DC 03E00008 */ jr $ra /* 04E20 809540E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s index da059b8e39..572d65393b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s @@ -34,5 +34,3 @@ glabel func_809540E4 /* 04E9C 8095415C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04EA0 80954160 03E00008 */ jr $ra /* 04EA4 80954164 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s index 32f7742879..c542c57b85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C75C + .float 0.1 + +.text glabel func_80954168 /* 04EA8 80954168 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 04EAC 8095416C AFBF0034 */ sw $ra, 0x0034($sp) @@ -156,5 +161,3 @@ glabel func_80954168 /* 050C0 80954380 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 050C4 80954384 03E00008 */ jr $ra /* 050C8 80954388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095438C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095438C.s index 471ab9784d..5e5595a180 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095438C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095438C.s @@ -50,5 +50,3 @@ glabel func_8095438C /* 05188 80954448 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0518C 8095444C 03E00008 */ jr $ra /* 05190 80954450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s index 4573986589..e9919ed3de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s @@ -336,5 +336,3 @@ glabel func_80954454 /* 05658 80954918 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0565C 8095491C 03E00008 */ jr $ra /* 05660 80954920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s index 2b5dd87864..5562195301 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s @@ -34,5 +34,3 @@ glabel func_80954924 /* 056DC 8095499C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 056E0 809549A0 03E00008 */ jr $ra /* 056E4 809549A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s index 6957097b1e..46245494fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C760 + .float 0.3 + +.text glabel func_809549A8 /* 056E8 809549A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 056EC 809549AC AFBF0014 */ sw $ra, 0x0014($sp) @@ -42,5 +47,3 @@ glabel func_809549A8 /* 05770 80954A30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05774 80954A34 03E00008 */ jr $ra /* 05778 80954A38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s index 41533cc1d9..cd9bc526ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s @@ -38,5 +38,3 @@ glabel func_80954A3C /* 05804 80954AC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05808 80954AC8 03E00008 */ jr $ra /* 0580C 80954ACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s index 4fd6819fa1..efb0d04850 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s @@ -52,5 +52,3 @@ glabel func_80954AD0 /* 058C0 80954B80 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 058C4 80954B84 03E00008 */ jr $ra /* 058C8 80954B88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s index 2f24ceb219..3376409774 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s @@ -38,5 +38,3 @@ glabel func_80954B8C /* 05954 80954C14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05958 80954C18 03E00008 */ jr $ra /* 0595C 80954C1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s index 4af88d3c37..5737284998 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8095C764 + .float 0.12 + +glabel D_8095C768 + .float 0.005 + +glabel D_8095C76C + .float 0.1 + +.text glabel func_80954C20 /* 05960 80954C20 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 05964 80954C24 AFBF0034 */ sw $ra, 0x0034($sp) @@ -732,5 +743,3 @@ glabel func_80954C20 /* 0638C 8095564C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 06390 80955650 03E00008 */ jr $ra /* 06394 80955654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s index 68db0ed08c..93e82ef068 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s @@ -71,5 +71,3 @@ glabel func_80955658 /* 06490 80955750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 06494 80955754 03E00008 */ jr $ra /* 06498 80955758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s index 588731fb6f..47cef02a1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s @@ -77,5 +77,3 @@ glabel func_8095575C /* 065A0 80955860 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 065A4 80955864 03E00008 */ jr $ra /* 065A8 80955868 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s index 1fd5a2d4d8..d2eafdad24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s @@ -56,5 +56,3 @@ glabel func_8095586C /* 06674 80955934 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 06678 80955938 03E00008 */ jr $ra /* 0667C 8095593C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s index 595eff79e8..474a44f71a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C770 + .float 0.6 + +.text glabel func_80955940 /* 06680 80955940 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 06684 80955944 3C01425C */ lui $at, 0x425C ## $at = 425C0000 @@ -366,5 +371,3 @@ glabel func_80955940 /* 06B98 80955E58 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 06B9C 80955E5C 03E00008 */ jr $ra /* 06BA0 80955E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s index 027d30e157..012d8bbaad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s @@ -35,5 +35,3 @@ glabel func_80955E64 /* 06C20 80955EE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 06C24 80955EE4 03E00008 */ jr $ra /* 06C28 80955EE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s index 82db239c97..9b56e1c52f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C774 + .float 0.1 + +.text glabel func_80955EEC /* 06C2C 80955EEC 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 06C30 80955EF0 AFBF0034 */ sw $ra, 0x0034($sp) @@ -527,5 +532,3 @@ glabel func_80955EEC /* 07378 80956638 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 0737C 8095663C 03E00008 */ jr $ra /* 07380 80956640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s index 7328d1875c..2a69a415c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s @@ -33,5 +33,3 @@ glabel func_80956644 /* 073F8 809566B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 073FC 809566BC 03E00008 */ jr $ra /* 07400 809566C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s index c52fd4eae9..160dc4f598 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s @@ -74,5 +74,3 @@ glabel func_809566C4 /* 07504 809567C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 07508 809567C8 03E00008 */ jr $ra /* 0750C 809567CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s index 60b916c980..f3ddf03922 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s @@ -70,5 +70,3 @@ glabel func_809567D0 /* 07614 809568D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 07618 809568D8 03E00008 */ jr $ra /* 0761C 809568DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s index ac7d2bf9d6..2c6eac1c80 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s @@ -1,3 +1,30 @@ +.late_rodata +glabel jtbl_8095C778 +.word L80956998 +.word L80956A1C +.word L80956A1C +.word L80956A1C +.word L80956A1C +.word L80956CC0 +.word L80956AFC +.word L80956AFC +.word L80956D88 +.word L80956D88 +.word L80956D88 +.word L80956D68 +glabel D_8095C7A8 + .float 0.15 + +glabel D_8095C7AC + .float 0.15 + +glabel D_8095C7B0 + .float 0.15 + +glabel D_8095C7B4 + .float 0.1 + +.text glabel func_809568E0 /* 07620 809568E0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 07624 809568E4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -382,5 +409,3 @@ glabel L80956D88 /* 07B6C 80956E2C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 07B70 80956E30 03E00008 */ jr $ra /* 07B74 80956E34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s index bb50151766..20ee6b75e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s @@ -43,5 +43,3 @@ glabel func_80956E38 /* 07C14 80956ED4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 07C18 80956ED8 03E00008 */ jr $ra /* 07C1C 80956EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s index 177e91a8fb..7af634089e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C7B8 + .float 0.1 + +.text glabel func_80956EE0 /* 07C20 80956EE0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 07C24 80956EE4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -284,5 +289,3 @@ glabel func_80956EE0 /* 08010 809572D0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 08014 809572D4 03E00008 */ jr $ra /* 08018 809572D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s index 0f014d0868..6e6bde64c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s @@ -43,5 +43,3 @@ glabel func_809572DC /* 080B8 80957378 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 080BC 8095737C 03E00008 */ jr $ra /* 080C0 80957380 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s index f1e880a19e..28abe71820 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C7BC + .float 0.1 + +.text glabel func_80957384 /* 080C4 80957384 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 080C8 80957388 AFBF0034 */ sw $ra, 0x0034($sp) @@ -430,5 +435,3 @@ glabel func_80957384 /* 086CC 8095798C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 086D0 80957990 03E00008 */ jr $ra /* 086D4 80957994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957998.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957998.s index d153baeb15..649191c6d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957998.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957998.s @@ -22,5 +22,3 @@ glabel func_80957998 /* 08728 809579E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0872C 809579EC 03E00008 */ jr $ra /* 08730 809579F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s index a3a1ca0038..00b82dd5e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s @@ -145,5 +145,3 @@ glabel func_809579F4 /* 08944 80957C04 8FB10030 */ lw $s1, 0x0030($sp) /* 08948 80957C08 03E00008 */ jr $ra /* 0894C 80957C0C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C10.s index 27806a5b3b..bdbba61710 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C10.s @@ -22,5 +22,3 @@ glabel func_80957C10 /* 0899C 80957C5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 089A0 80957C60 03E00008 */ jr $ra /* 089A4 80957C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C68.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C68.s index 1726981ae2..aa425190bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C68.s @@ -14,5 +14,3 @@ glabel func_80957C68 /* 089D0 80957C90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 089D4 80957C94 03E00008 */ jr $ra /* 089D8 80957C98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C9C.s index 627bf32754..7c9d94ed50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957C9C.s @@ -20,5 +20,3 @@ glabel func_80957C9C /* 08A20 80957CE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08A24 80957CE4 03E00008 */ jr $ra /* 08A28 80957CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957CEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957CEC.s index 6ceba775b4..da68775a85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957CEC.s @@ -32,5 +32,3 @@ glabel func_80957CEC /* 08A90 80957D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08A94 80957D54 03E00008 */ jr $ra /* 08A98 80957D58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s index 39cef429f1..c03ce6cccd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8095C3B0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C3C0 + .asciz "../z_boss_va.c" + .balign 4 + +.late_rodata +glabel D_8095C820 + .float -1.57079637051 + +.text glabel func_80957F60 /* 08CA0 80957F60 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 08CA4 80957F64 AFBF0034 */ sw $ra, 0x0034($sp) @@ -130,5 +144,3 @@ glabel func_80957F60 /* 08E84 80958144 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 08E88 80958148 03E00008 */ jr $ra /* 08E8C 8095814C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s index e69c6df576..3a969bb892 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s @@ -1,3 +1,35 @@ +.rdata +glabel D_8095C3D0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C3E0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C3F0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C400 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C410 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C420 + .asciz "../z_boss_va.c" + .balign 4 + +.late_rodata +glabel D_8095C824 + .word 0x44048000 +glabel D_8095C828 + .word 0x44048000 + +.text glabel func_80958150 /* 08E90 80958150 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 08E94 80958154 3C0F8096 */ lui $t7, %hi(D_8095C258) ## $t7 = 80960000 @@ -363,5 +395,3 @@ glabel func_80958150 /* 093D8 80958698 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 093DC 8095869C 03E00008 */ jr $ra /* 093E0 809586A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586A4.s index 2433f004ea..429e847f68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586A4.s @@ -16,5 +16,3 @@ glabel func_809586A4 .L809586DC: /* 0941C 809586DC 03E00008 */ jr $ra /* 09420 809586E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586E4.s index ea2bdefc6c..1f76ab9c2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586E4.s @@ -156,5 +156,3 @@ glabel func_809586E4 /* 09668 80958928 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0966C 8095892C 03E00008 */ jr $ra /* 09670 80958930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958934.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958934.s index 47806336a4..1bc7094cc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958934.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958934.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_8095C82C + .float 9.58738019108e-05 + +glabel D_8095C830 + .float 9.58738019108e-05 + +glabel D_8095C834 + .float 9.58738019108e-05 + +glabel D_8095C838 + .float 9.58738019108e-05 + +glabel D_8095C83C + .float 9.58738019108e-05 + +.text glabel func_80958934 /* 09674 80958934 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 09678 80958938 AFB00018 */ sw $s0, 0x0018($sp) @@ -122,5 +139,3 @@ glabel func_80958934 /* 09840 80958B00 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 09844 80958B04 03E00008 */ jr $ra /* 09848 80958B08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s index 3277c96e9b..2a01eb0d0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s @@ -291,5 +291,3 @@ glabel func_80958B0C /* 09CA0 80958F60 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 09CA4 80958F64 03E00008 */ jr $ra /* 09CA8 80958F68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958F6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958F6C.s index cedf318d3a..7c44c02c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958F6C.s @@ -40,5 +40,3 @@ glabel func_80958F6C /* 09D30 80958FF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 09D34 80958FF4 03E00008 */ jr $ra /* 09D38 80958FF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s index c713a95853..802fb06d59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8095C430 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C440 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C450 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C460 + .asciz "../z_boss_va.c" + .balign 4 + +.text glabel func_80958FFC /* 09D3C 80958FFC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 09D40 80959000 AFBF003C */ sw $ra, 0x003C($sp) @@ -117,5 +135,3 @@ glabel func_80958FFC /* 09EFC 809591BC 8FB10038 */ lw $s1, 0x0038($sp) /* 09F00 809591C0 03E00008 */ jr $ra /* 09F04 809591C4 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s index bc702bf53f..a798c7505e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s @@ -1,3 +1,34 @@ +.late_rodata +glabel D_8095C894 + .float 0.005 + +glabel D_8095C898 + .word 0x469C4000 +glabel D_8095C89C + .float 10000.0 + +glabel D_8095C8A0 + .word 0x418F3333 +glabel D_8095C8A4 + .word 0x469C4000 +glabel D_8095C8A8 + .float 10000.0 + +glabel D_8095C8AC + .word 0x3AAA64C3 +glabel D_8095C8B0 + .float 4500.0 + +glabel D_8095C8B4 + .float 1.2 + +glabel D_8095C8B8 + .float 4500.0 + +glabel D_8095C8BC + .float 1.2 + +.text glabel func_809597F4 /* 0A534 809597F4 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 0A538 809597F8 F7B60020 */ sdc1 $f22, 0x0020($sp) @@ -660,5 +691,3 @@ glabel func_809597F4 /* 0AEBC 8095A17C 8FB70048 */ lw $s7, 0x0048($sp) /* 0AEC0 8095A180 03E00008 */ jr $ra /* 0AEC4 8095A184 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index 1289a17ab2..0cf508fa2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -1,3 +1,79 @@ +.rdata +glabel D_8095C490 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C4A0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C4B0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C4C0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C4D0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C4E0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C4F0 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C500 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C510 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C520 + .asciz "../z_boss_va.c" + .balign 4 + +.late_rodata +glabel D_8095C8C0 + .word 0x40490FF9 +glabel D_8095C8C4 + .word 0x3C978D50 +glabel D_8095C8C8 + .word 0x40490FF9 +glabel D_8095C8CC + .float 1.57079637051 + +glabel D_8095C8D0 + .word 0x3DEB851F +glabel D_8095C8D4 + .word 0x3E051EB8 +glabel D_8095C8D8 + .float 0.1 + +glabel D_8095C8DC + .float 0.1 + +glabel D_8095C8E0 + .word 0x3E051EB8 +glabel D_8095C8E4 + .word 0x3DEB851F +glabel D_8095C8E8 + .word 0x40490FF9 +glabel D_8095C8EC + .float 0.02 + +glabel D_8095C8F0 + .word 0x40490FF9 +glabel D_8095C8F4 + .word 0x40490FF9 + +.text glabel func_8095A188 /* 0AEC8 8095A188 27BDFEB8 */ addiu $sp, $sp, 0xFEB8 ## $sp = FFFFFEB8 /* 0AECC 8095A18C AFBF0044 */ sw $ra, 0x0044($sp) @@ -965,5 +1041,3 @@ glabel func_8095A188 /* 0BD5C 8095B01C 8FBE0040 */ lw $s8, 0x0040($sp) /* 0BD60 8095B020 03E00008 */ jr $ra /* 0BD64 8095B024 27BD0148 */ addiu $sp, $sp, 0x0148 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s index 72de0d9023..8264f93a75 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_8095C8F8 +.word L8095B15C +.word L8095B1D0 +.word L8095B1E4 +.word L8095B154 +.word L8095B1C8 +.word L8095B228 +glabel D_8095C910 + .word 0x418F3333 +glabel D_8095C914 + .float 0.01 + +.text glabel func_8095B028 /* 0BD68 8095B028 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0BD6C 8095B02C AFBF001C */ sw $ra, 0x001C($sp) @@ -205,5 +219,3 @@ glabel L8095B228 /* 0C04C 8095B30C 8FB10018 */ lw $s1, 0x0018($sp) /* 0C050 8095B310 03E00008 */ jr $ra /* 0C054 8095B314 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s index da36ebddd2..65e9a76071 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C918 + .float 0.01 + +.text glabel func_8095B318 /* 0C058 8095B318 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0C05C 8095B31C 3C0E8096 */ lui $t6, %hi(D_8095C32C) ## $t6 = 80960000 @@ -103,5 +108,3 @@ glabel func_8095B318 /* 0C1D8 8095B498 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0C1DC 8095B49C 03E00008 */ jr $ra /* 0C1E0 8095B4A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s index 1df8281735..d4630590c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8095C91C + .float 0.3 + +glabel D_8095C920 + .float 0.01 + +.text glabel func_8095B4A4 /* 0C1E4 8095B4A4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0C1E8 8095B4A8 3C0F8096 */ lui $t7, %hi(D_8095C338) ## $t7 = 80960000 @@ -124,5 +132,3 @@ glabel func_8095B4A4 /* 0C3A4 8095B664 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0C3A8 8095B668 03E00008 */ jr $ra /* 0C3AC 8095B66C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s index 45e8e0f1ea..4e34bc4a87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8095C924 + .float 0.3 + +glabel D_8095C928 + .float 0.01 + +.text glabel func_8095B670 /* 0C3B0 8095B670 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0C3B4 8095B674 3C0F8096 */ lui $t7, %hi(D_8095C350) ## $t7 = 80960000 @@ -111,5 +119,3 @@ glabel func_8095B670 /* 0C540 8095B800 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0C544 8095B804 03E00008 */ jr $ra /* 0C548 8095B808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s index 42c5279c47..e8bb829d67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C92C + .float 0.01 + +.text glabel func_8095B80C /* 0C54C 8095B80C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0C550 8095B810 3C0E8096 */ lui $t6, %hi(D_8095C35C) ## $t6 = 80960000 @@ -111,5 +116,3 @@ glabel func_8095B80C /* 0C6E4 8095B9A4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0C6E8 8095B9A8 03E00008 */ jr $ra /* 0C6EC 8095B9AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s index 224ce54162..fe659143ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8095C930 + .float 0.3 + +glabel D_8095C934 + .float 0.01 + +glabel D_8095C938 + .float 0.9 + +.text glabel func_8095B9B0 /* 0C6F0 8095B9B0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0C6F4 8095B9B4 3C0F8096 */ lui $t7, %hi(D_8095C368) ## $t7 = 80960000 @@ -148,5 +159,3 @@ glabel func_8095B9B0 /* 0C904 8095BBC4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0C908 8095BBC8 03E00008 */ jr $ra /* 0C90C 8095BBCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s index 86ee296f96..a0a1f31735 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8095C93C + .float 0.01 + +.text glabel func_8095BBD0 /* 0C910 8095BBD0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0C914 8095BBD4 3C0F8096 */ lui $t7, %hi(D_8095C374) ## $t7 = 80960000 @@ -88,5 +93,3 @@ glabel func_8095BBD0 /* 0CA58 8095BD18 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0CA5C 8095BD1C 03E00008 */ jr $ra /* 0CA60 8095BD20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s index e46b3244c9..f7b87cf23a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s @@ -1,3 +1,33 @@ +.rdata +glabel D_8095C530 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C540 + .asciz "../z_boss_va.c" + .balign 4 + +glabel D_8095C550 + .asciz "../z_boss_va.c" + .balign 4 + +.late_rodata +glabel D_8095C940 + .float 3.14159274101 + +glabel D_8095C944 + .float 0.1 + +glabel D_8095C948 + .float 0.01 + +glabel D_8095C94C + .float 0.1 + +glabel D_8095C950 + .word 0x3F490FDB, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_8095BD24 /* 0CA64 8095BD24 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 0CA68 8095BD28 AFB00038 */ sw $s0, 0x0038($sp) @@ -136,4 +166,3 @@ glabel func_8095BD24 /* 0CC74 8095BF34 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 /* 0CC78 8095BF38 00000000 */ nop /* 0CC7C 8095BF3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Destroy.s index cfe36631d9..3320c4128a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Destroy.s @@ -12,5 +12,3 @@ glabel Demo6K_Destroy /* 00454 80966DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00458 80966DA8 03E00008 */ jr $ra /* 0045C 80966DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Init.s index 04dc0fa19d..2d06598eb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Init.s @@ -1,3 +1,52 @@ +.rdata +glabel D_809693E0 + .asciz "no = %d\n" + .balign 4 + +glabel D_809693EC + .asciz "bank_ID = %d\n" + .balign 4 + +glabel D_809693FC + .asciz "0" + .balign 4 + +glabel D_80969400 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969410 + .asciz "0" + .balign 4 + +glabel D_80969414 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel jtbl_80969588 +.word L80966A38 +.word L80966AA4 +.word L80966AD4 +.word L80966B1C +.word L80966B1C +.word L80966B1C +.word L80966B1C +.word L80966B1C +.word L80966B1C +.word L80966B54 +.word L80966B54 +.word L80966B80 +.word L80966BCC +.word L80966C14 +.word L80966C48 +.word L80966C48 +.word L80966C48 +.word L80966C48 +.word L80966C48 +.word L80966C48 + +.text glabel Demo6K_Init /* 00008 80966958 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0000C 8096695C AFBF002C */ sw $ra, 0x002C($sp) @@ -304,5 +353,3 @@ glabel L80966C48 /* 00424 80966D74 8FB00024 */ lw $s0, 0x0024($sp) /* 00428 80966D78 03E00008 */ jr $ra /* 0042C 80966D7C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Update.s index 686bbadfde..8021443860 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/Demo6K_Update.s @@ -8,5 +8,3 @@ glabel Demo6K_Update /* 016A0 80967FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016A4 80967FF4 03E00008 */ jr $ra /* 016A8 80967FF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966950.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966950.s index dce636ee2e..321eafdbfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966950.s @@ -1,5 +1,3 @@ glabel func_80966950 /* 00000 80966950 03E00008 */ jr $ra /* 00004 80966954 AC850288 */ sw $a1, 0x0288($a0) ## 00000288 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966DB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966DB0.s index a90f64d63e..f653b5e7ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966DB0.s @@ -22,5 +22,3 @@ glabel func_80966DB0 /* 004A8 80966DF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004AC 80966DFC 03E00008 */ jr $ra /* 004B0 80966E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E04.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E04.s index 0f0caaa865..feb9e4440c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E04.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E04.s @@ -40,5 +40,3 @@ glabel func_80966E04 /* 0053C 80966E8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00540 80966E90 03E00008 */ jr $ra /* 00544 80966E94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E98.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E98.s index f65e68d3a7..17f84197fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E98.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966E98.s @@ -64,5 +64,3 @@ glabel func_80966E98 /* 00628 80966F78 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0062C 80966F7C 03E00008 */ jr $ra /* 00630 80966F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s index 431418a14f..a23dddaff2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809695D8 + .float 0.012 + +.text glabel func_80966F84 /* 00634 80966F84 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00638 80966F88 AFBF003C */ sw $ra, 0x003C($sp) @@ -81,5 +86,3 @@ glabel func_80966F84 /* 00750 809670A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00754 809670A4 03E00008 */ jr $ra /* 00758 809670A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809670AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809670AC.s index 5430077a1e..0a06c8d07f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809670AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809670AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809695DC + .float 0.008333334 + +.text glabel func_809670AC /* 0075C 809670AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00760 809670B0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -37,5 +42,3 @@ glabel func_809670AC /* 007D0 80967120 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007D4 80967124 03E00008 */ jr $ra /* 007D8 80967128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096712C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096712C.s index eb7cae3c15..c4263b73db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096712C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096712C.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809695E0 + .float 0.1 + +glabel D_809695E4 + .float 0.0017 + +glabel D_809695E8 + .float 0.103999995 + +glabel D_809695EC + .float 0.1 + +.text glabel func_8096712C /* 007DC 8096712C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007E0 80967130 AFBF0014 */ sw $ra, 0x0014($sp) @@ -76,5 +90,3 @@ glabel func_8096712C /* 008E8 80967238 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008EC 8096723C 03E00008 */ jr $ra /* 008F0 80967240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s index c7a96c6100..64055b752a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809695F0 + .float 65535.0 + +glabel D_809695F4 + .float 65535.0 + +.text glabel func_80967244 /* 008F4 80967244 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 008F8 80967248 AFBF002C */ sw $ra, 0x002C($sp) @@ -123,5 +131,3 @@ glabel func_80967244 /* 00AB4 80967404 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00AB8 80967408 03E00008 */ jr $ra /* 00ABC 8096740C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967410.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967410.s index 39dbba5102..d5398fabe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967410.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967410.s @@ -56,5 +56,3 @@ glabel func_80967410 /* 00B84 809674D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B88 809674D8 03E00008 */ jr $ra /* 00B8C 809674DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809674E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809674E0.s index 20946dd6d0..b3a26e9fe1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809674E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809674E0.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_809695F8 + .float 0.05 + +glabel D_809695FC + .float 0.005 + +glabel D_80969600 + .float 0.051999997 + +glabel D_80969604 + .float -1611.0 +glabel D_80969608 + .float 1613.0 + +.text glabel func_809674E0 /* 00B90 809674E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00B94 809674E4 AFBF002C */ sw $ra, 0x002C($sp) @@ -122,5 +138,3 @@ glabel func_809674E0 /* 00D48 80967698 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D4C 8096769C 03E00008 */ jr $ra /* 00D50 809676A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s index c91884f9b4..e2f30de005 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8096960C + .float 0.1 + +.text glabel func_809676A4 /* 00D54 809676A4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00D58 809676A8 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -112,5 +117,3 @@ glabel func_809676A4 /* 00EF0 80967840 8FBE0078 */ lw $s8, 0x0078($sp) /* 00EF4 80967844 03E00008 */ jr $ra /* 00EF8 80967848 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s index d11e430bcf..42b0f025b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s @@ -1,3 +1,23 @@ +.late_rodata +glabel D_80969610 + .float 0.2 + +glabel D_80969614 + .float 0.12 + +glabel D_80969618 + .float 0.2 + +glabel D_8096961C + .float 0.0015 + +glabel D_80969620 + .float 0.033 + +glabel D_80969624 + .float 0.03 + +.text glabel func_8096784C /* 00EFC 8096784C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00F00 80967850 AFBF002C */ sw $ra, 0x002C($sp) @@ -119,5 +139,3 @@ glabel func_8096784C /* 010A8 809679F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 010AC 809679FC 03E00008 */ jr $ra /* 010B0 80967A00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s index cfaa9f34ac..4781ec2998 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80969628 + .float 0.02 + +glabel D_8096962C + .float 0.01 + +.text glabel func_80967A04 /* 010B4 80967A04 44852000 */ mtc1 $a1, $f4 ## $f4 = 0.00 /* 010B8 80967A08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -54,5 +62,3 @@ glabel func_80967A04 /* 01174 80967AC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01178 80967AC8 03E00008 */ jr $ra /* 0117C 80967ACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967AD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967AD0.s index bc31672edd..025b99408f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967AD0.s @@ -78,5 +78,3 @@ glabel func_80967AD0 /* 0129C 80967BEC D7B40010 */ ldc1 $f20, 0x0010($sp) /* 012A0 80967BF0 03E00008 */ jr $ra /* 012A4 80967BF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s index c5ad627936..3c527d1818 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s @@ -120,5 +120,3 @@ glabel func_80967BF8 /* 01460 80967DB0 8FBE0078 */ lw $s8, 0x0078($sp) /* 01464 80967DB4 03E00008 */ jr $ra /* 01468 80967DB8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967DBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967DBC.s index 5f6bab42b3..bbe33a904f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967DBC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80969424 + .asciz "\x1b[36m NA_SE_EN_GANON_FIRE_DEMO\n\x1b[m" + .balign 4 + +.late_rodata +glabel D_80969630 + .float 0.03 + +.text glabel func_80967DBC /* 0146C 80967DBC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01470 80967DC0 AFBF002C */ sw $ra, 0x002C($sp) @@ -97,5 +107,3 @@ glabel func_80967DBC /* 015B4 80967F04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 015B8 80967F08 03E00008 */ jr $ra /* 015BC 80967F0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967F10.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967F10.s index 11d6df4f5e..d30ec5dae0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967F10.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967F10.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80969634 + .float 7.5e-4 +glabel D_80969638 + .float 0.05 + +.text glabel func_80967F10 /* 015C0 80967F10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 015C4 80967F14 AFBF0034 */ sw $ra, 0x0034($sp) @@ -55,5 +62,3 @@ glabel func_80967F10 /* 0167C 80967FCC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01680 80967FD0 03E00008 */ jr $ra /* 01684 80967FD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s index 804ecfc77f..cbf8663263 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80969448 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969458 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969468 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel D_8096963C + .float -1.57079637051 + +glabel D_80969640 + .float 1.0471976 + +.text glabel func_80967FFC /* 016AC 80967FFC 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 016B0 80968000 AFBF0064 */ sw $ra, 0x0064($sp) @@ -168,5 +189,3 @@ glabel func_80967FFC /* 0193C 8096828C 8FBE0060 */ lw $s8, 0x0060($sp) /* 01940 80968290 03E00008 */ jr $ra /* 01944 80968294 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s index 59844df63e..fbcf43256c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80969478 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969488 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969498 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_809694A8 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel D_80969644 + .float -1.57079637051 + +.text glabel func_80968298 /* 01948 80968298 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 0194C 8096829C AFBF003C */ sw $ra, 0x003C($sp) @@ -242,5 +264,3 @@ glabel func_80968298 /* 01D00 80968650 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 01D04 80968654 03E00008 */ jr $ra /* 01D08 80968658 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s index e6580131a6..80ff0d1115 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s @@ -1,3 +1,28 @@ +.rdata +glabel D_809694B8 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_809694C8 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_809694D8 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_809694E8 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel D_80969648 + .float 0.017453292 + +glabel D_8096964C + .float 0.017453292 + +.text glabel func_8096865C /* 01D0C 8096865C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01D10 80968660 AFBF001C */ sw $ra, 0x001C($sp) @@ -156,5 +181,3 @@ glabel func_8096865C /* 01F68 809688B8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01F6C 809688BC 03E00008 */ jr $ra /* 01F70 809688C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s index f578a37eb8..a6678c6967 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809694F8 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969508 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969518 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel D_80969650 + .float 9.58738019108e-05 + +.text glabel func_809688C4 /* 01F74 809688C4 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 01F78 809688C8 AFBF0044 */ sw $ra, 0x0044($sp) @@ -173,5 +191,3 @@ glabel func_809688C4 /* 02214 80968B64 8FBE0040 */ lw $s8, 0x0040($sp) /* 02218 80968B68 03E00008 */ jr $ra /* 0221C 80968B6C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s index e036fd98e2..f0bf8b83f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80969528 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969538 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969548 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel D_80969654 + .float 1.57079637051 + +.text glabel func_80968B70 /* 02220 80968B70 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02224 80968B74 AFBF003C */ sw $ra, 0x003C($sp) @@ -282,5 +300,3 @@ glabel func_80968B70 /* 02654 80968FA4 8FB10038 */ lw $s1, 0x0038($sp) /* 02658 80968FA8 03E00008 */ jr $ra /* 0265C 80968FAC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s index 3a9ef4100f..148ebeaf7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80969558 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969568 + .asciz "../z_demo_6k.c" + .balign 4 + +glabel D_80969578 + .asciz "../z_demo_6k.c" + .balign 4 + +.late_rodata +glabel D_80969658 + .float 0.01 + +.text glabel func_80968FB0 /* 02660 80968FB0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02664 80968FB4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -131,5 +149,3 @@ glabel func_80968FB0 /* 02860 809691B0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02864 809691B4 03E00008 */ jr $ra /* 02868 809691B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809691BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809691BC.s index 91874a9a66..215f36750e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809691BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809691BC.s @@ -60,4 +60,3 @@ glabel func_809691BC /* 02954 809692A4 03E00008 */ jr $ra /* 02958 809692A8 00000000 */ nop /* 0295C 809692AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s index 2e96d772a1..14109f00dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s @@ -7,5 +7,3 @@ glabel DemoDu_Destroy /* 00014 80969AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00018 80969AE8 03E00008 */ jr $ra /* 0001C 80969AEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s index 393a4cf658..9a0f9d4426 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8096D0B0 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoDu_Draw /* 02668 8096C138 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0266C 8096C13C AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,4 +35,3 @@ glabel DemoDu_Draw /* 026C4 8096C194 00000000 */ nop /* 026C8 8096C198 00000000 */ nop /* 026CC 8096C19C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s index 43d5ff0c7d..3cd48793da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s @@ -46,5 +46,3 @@ glabel DemoDu_Init /* 02478 8096BF48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0247C 8096BF4C 03E00008 */ jr $ra /* 02480 8096BF50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s index 09cd2c9f59..fa6fbb9943 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8096D054 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoDu_Update /* 02384 8096BE54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02388 8096BE58 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel DemoDu_Update /* 023D4 8096BEA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023D8 8096BEA8 03E00008 */ jr $ra /* 023DC 8096BEAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s index 7025489bce..02feaaad6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s @@ -38,5 +38,3 @@ glabel func_80969AF0 /* 0009C 80969B6C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000A0 80969B70 03E00008 */ jr $ra /* 000A4 80969B74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s index 23af9c7b5f..1ad3f2a74a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s @@ -4,5 +4,3 @@ glabel func_80969B78 /* 000B0 80969B80 00052C03 */ sra $a1, $a1, 16 /* 000B4 80969B84 03E00008 */ jr $ra /* 000B8 80969B88 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s index af1ee33834..73e8e1c998 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s @@ -4,5 +4,3 @@ glabel func_80969B8C /* 000C4 80969B94 00052C03 */ sra $a1, $a1, 16 /* 000C8 80969B98 03E00008 */ jr $ra /* 000CC 80969B9C A4850194 */ sh $a1, 0x0194($a0) ## 00000194 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s index 9348d07863..dd3980f0e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s @@ -8,5 +8,3 @@ glabel func_80969BA0 /* 000E8 80969BB8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 000EC 80969BBC 03E00008 */ jr $ra /* 000F0 80969BC0 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s index d1a51987e8..765e423942 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s @@ -32,5 +32,3 @@ glabel func_80969BC4 /* 0015C 80969C2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00160 80969C30 03E00008 */ jr $ra /* 00164 80969C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s index a8c487dd0c..fcc25b10fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s @@ -8,5 +8,3 @@ glabel func_80969C38 /* 0017C 80969C4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00180 80969C50 03E00008 */ jr $ra /* 00184 80969C54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s index 0f62eb8818..259d74804b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s @@ -17,5 +17,3 @@ glabel func_80969C58 /* 001C4 80969C94 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001C8 80969C98 03E00008 */ jr $ra /* 001CC 80969C9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s index b730e9d71b..d6fc256992 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s @@ -9,5 +9,3 @@ glabel func_80969CA0 .L80969CBC: /* 001EC 80969CBC 03E00008 */ jr $ra /* 001F0 80969CC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s index bbfccbadf2..473cae8fcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s @@ -20,5 +20,3 @@ glabel func_80969CC4 .L80969D08: /* 00238 80969D08 03E00008 */ jr $ra /* 0023C 80969D0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s index b377356387..e934e10c79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s @@ -20,5 +20,3 @@ glabel func_80969D10 .L80969D54: /* 00284 80969D54 03E00008 */ jr $ra /* 00288 80969D58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s index bb3198bcc3..bf18b32ab5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s @@ -32,5 +32,3 @@ glabel func_80969D5C /* 00300 80969DD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00304 80969DD4 03E00008 */ jr $ra /* 00308 80969DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s index f0454cb0c5..d8fd138d3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s @@ -39,5 +39,3 @@ glabel func_80969DDC /* 00390 80969E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00394 80969E64 03E00008 */ jr $ra /* 00398 80969E68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s index 4a0b5382b7..a7ca1bc74d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8096D0E8 + .word 0xC61C4000 + +.text glabel func_80969E6C /* 0039C 80969E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 003A0 80969E70 AFA40028 */ sw $a0, 0x0028($sp) @@ -27,5 +32,3 @@ glabel func_80969E6C /* 00400 80969ED0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00404 80969ED4 03E00008 */ jr $ra /* 00408 80969ED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s index 6d9b02440f..9da851276d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s @@ -23,5 +23,3 @@ glabel func_80969EDC /* 0045C 80969F2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00460 80969F30 03E00008 */ jr $ra /* 00464 80969F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s index 7f4ddf6cf7..57fbbb823e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s @@ -31,5 +31,3 @@ glabel func_80969F38 /* 004D8 80969FA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 004DC 80969FAC 03E00008 */ jr $ra /* 004E0 80969FB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s index 80d2512f0f..08687a2b14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8096D0EC + .word 0x42A6AAAB + +.text glabel func_80969FB4 /* 004E4 80969FB4 AFA50004 */ sw $a1, 0x0004($sp) /* 004E8 80969FB8 3C018097 */ lui $at, %hi(D_8096D0EC) ## $at = 80970000 @@ -6,5 +11,3 @@ glabel func_80969FB4 /* 004F4 80969FC4 46062200 */ add.s $f8, $f4, $f6 /* 004F8 80969FC8 03E00008 */ jr $ra /* 004FC 80969FCC E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s index aec6b4fde7..de880c6958 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s @@ -35,5 +35,3 @@ glabel func_80969FD0 /* 00580 8096A050 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00584 8096A054 03E00008 */ jr $ra /* 00588 8096A058 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s index fa525ed37c..58c5d68699 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s @@ -20,5 +20,3 @@ glabel func_8096A05C /* 005D0 8096A0A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D4 8096A0A4 03E00008 */ jr $ra /* 005D8 8096A0A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s index 4b61fd6da5..f8e648b7cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s @@ -11,5 +11,3 @@ glabel func_8096A0AC .L8096A0D0: /* 00600 8096A0D0 03E00008 */ jr $ra /* 00604 8096A0D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s index 3dee2407b4..7460ca49b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s @@ -39,5 +39,3 @@ glabel func_8096A0D8 /* 00690 8096A160 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00694 8096A164 03E00008 */ jr $ra /* 00698 8096A168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s index e45860f7c9..6aaeae05ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s @@ -29,5 +29,3 @@ glabel func_8096A16C /* 006FC 8096A1CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00700 8096A1D0 03E00008 */ jr $ra /* 00704 8096A1D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s index cea401251e..73a1ffab57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s @@ -19,5 +19,3 @@ glabel func_8096A1D8 /* 00748 8096A218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0074C 8096A21C 03E00008 */ jr $ra /* 00750 8096A220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s index efae4ddbab..f5fa99b745 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s @@ -7,5 +7,3 @@ glabel func_8096A224 /* 00768 8096A238 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0076C 8096A23C 03E00008 */ jr $ra /* 00770 8096A240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s index e0cf04a9a7..fde73a39b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s @@ -7,5 +7,3 @@ glabel func_8096A244 /* 00788 8096A258 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0078C 8096A25C 03E00008 */ jr $ra /* 00790 8096A260 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s index aa6a9ba8ae..519b3f6d9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s @@ -11,5 +11,3 @@ glabel func_8096A264 /* 007B8 8096A288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007BC 8096A28C 03E00008 */ jr $ra /* 007C0 8096A290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s index 72a6f993b2..2f4bac32ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s @@ -13,5 +13,3 @@ glabel func_8096A294 /* 007F0 8096A2C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F4 8096A2C4 03E00008 */ jr $ra /* 007F8 8096A2C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s index 33f8ae467a..d7e1e10237 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s @@ -12,5 +12,3 @@ glabel func_8096A2CC /* 00824 8096A2F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00828 8096A2F8 03E00008 */ jr $ra /* 0082C 8096A2FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s index 809f6677de..a1e2bfc076 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s @@ -13,5 +13,3 @@ glabel func_8096A300 /* 0085C 8096A32C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00860 8096A330 03E00008 */ jr $ra /* 00864 8096A334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s index 7910f122fe..855d5a9d7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s @@ -9,5 +9,3 @@ glabel func_8096A338 /* 00884 8096A354 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00888 8096A358 03E00008 */ jr $ra /* 0088C 8096A35C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s index ec4a48b864..3d19628ee2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s @@ -20,5 +20,3 @@ glabel func_8096A360 /* 008D8 8096A3A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008DC 8096A3AC 03E00008 */ jr $ra /* 008E0 8096A3B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s index 1fba605721..1dd1302130 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s @@ -8,5 +8,3 @@ glabel func_8096A3B4 /* 008FC 8096A3CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00900 8096A3D0 03E00008 */ jr $ra /* 00904 8096A3D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s index 9d013ab846..6103e68405 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s @@ -12,5 +12,3 @@ glabel func_8096A3D8 /* 0092C 8096A3FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00930 8096A400 03E00008 */ jr $ra /* 00934 8096A404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s index 6807de25d9..e106d6005a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s @@ -21,5 +21,3 @@ glabel func_8096A408 /* 00980 8096A450 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00984 8096A454 03E00008 */ jr $ra /* 00988 8096A458 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s index af408da940..0b424c0f47 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s @@ -8,5 +8,3 @@ glabel func_8096A45C /* 009A4 8096A474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009A8 8096A478 03E00008 */ jr $ra /* 009AC 8096A47C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s index a4d8a43cf7..6a3117f9dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s @@ -22,5 +22,3 @@ glabel func_8096A480 /* 009F8 8096A4C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009FC 8096A4CC 03E00008 */ jr $ra /* 00A00 8096A4D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s index 8baac67815..7befe2762b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s @@ -22,5 +22,3 @@ glabel func_8096A4D4 /* 00A4C 8096A51C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A50 8096A520 03E00008 */ jr $ra /* 00A54 8096A524 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s index 4930d6ea5d..05e0f6303d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s @@ -71,5 +71,3 @@ glabel func_8096A528 /* 00B54 8096A624 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B58 8096A628 03E00008 */ jr $ra /* 00B5C 8096A62C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s index 2e1f3a6903..391b5b494d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s @@ -43,5 +43,3 @@ glabel func_8096A630 /* 00C04 8096A6D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C08 8096A6D8 03E00008 */ jr $ra /* 00C0C 8096A6DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s index bd9d33c6c6..6c251fe24a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s @@ -170,5 +170,3 @@ glabel func_8096A6E0 /* 00E94 8096A964 8FBE0070 */ lw $s8, 0x0070($sp) /* 00E98 8096A968 03E00008 */ jr $ra /* 00E9C 8096A96C 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s index ad01f2744b..c9ddd1f88a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s @@ -55,5 +55,3 @@ glabel func_8096A970 /* 00F70 8096AA40 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F74 8096AA44 03E00008 */ jr $ra /* 00F78 8096AA48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s index b7387d290f..d761f8b41d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s @@ -3,5 +3,3 @@ glabel func_8096AA4C /* 00F80 8096AA50 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 00F84 8096AA54 03E00008 */ jr $ra /* 00F88 8096AA58 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s index 155127a067..33bf118af9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s @@ -44,5 +44,3 @@ glabel func_8096AA5C /* 01024 8096AAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01028 8096AAF8 03E00008 */ jr $ra /* 0102C 8096AAFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s index 690081d91e..523b951747 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s @@ -21,5 +21,3 @@ glabel func_8096AB00 /* 01078 8096AB48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0107C 8096AB4C 03E00008 */ jr $ra /* 01080 8096AB50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s index 0af8844d2f..6549cc996d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s @@ -14,5 +14,3 @@ glabel func_8096AB54 .L8096AB84: /* 010B4 8096AB84 03E00008 */ jr $ra /* 010B8 8096AB88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s index 9bda69980c..b177caae4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s @@ -29,5 +29,3 @@ glabel func_8096AB8C /* 0111C 8096ABEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01120 8096ABF0 03E00008 */ jr $ra /* 01124 8096ABF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s index 14dc69327d..c909371660 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s @@ -40,5 +40,3 @@ glabel func_8096ABF8 /* 011B4 8096AC84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 011B8 8096AC88 03E00008 */ jr $ra /* 011BC 8096AC8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s index 56f5914916..35526b2d6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s @@ -29,5 +29,3 @@ glabel func_8096AC90 /* 01220 8096ACF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01224 8096ACF4 03E00008 */ jr $ra /* 01228 8096ACF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s index e67dd9f771..1654f9363e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s @@ -39,5 +39,3 @@ glabel func_8096ACFC /* 012B4 8096AD84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012B8 8096AD88 03E00008 */ jr $ra /* 012BC 8096AD8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s index a9ce0890bf..265bcea3f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s @@ -30,5 +30,3 @@ glabel func_8096AD90 /* 01324 8096ADF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01328 8096ADF8 03E00008 */ jr $ra /* 0132C 8096ADFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s index 42e3dea1ed..ac8b4ca97e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s @@ -29,5 +29,3 @@ glabel func_8096AE00 /* 01390 8096AE60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01394 8096AE64 03E00008 */ jr $ra /* 01398 8096AE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s index 28e820d740..37b3ebfa8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s @@ -39,5 +39,3 @@ glabel func_8096AE6C /* 01424 8096AEF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01428 8096AEF8 03E00008 */ jr $ra /* 0142C 8096AEFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s index 9517bb5304..429d961147 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s @@ -29,5 +29,3 @@ glabel func_8096AF00 /* 01490 8096AF60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01494 8096AF64 03E00008 */ jr $ra /* 01498 8096AF68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s index 7689b164b5..e84c912a38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s @@ -38,5 +38,3 @@ glabel func_8096AF6C /* 01520 8096AFF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01524 8096AFF4 03E00008 */ jr $ra /* 01528 8096AFF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s index 9617415265..142fad4d39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s @@ -12,5 +12,3 @@ glabel func_8096AFFC /* 01554 8096B024 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01558 8096B028 03E00008 */ jr $ra /* 0155C 8096B02C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s index 287c4cea35..929bce0958 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s @@ -14,5 +14,3 @@ glabel func_8096B030 /* 01590 8096B060 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01594 8096B064 03E00008 */ jr $ra /* 01598 8096B068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s index 4ae93161a3..f5445f2dd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s @@ -20,5 +20,3 @@ glabel func_8096B06C /* 015E4 8096B0B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 015E8 8096B0B8 03E00008 */ jr $ra /* 015EC 8096B0BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s index eb706214df..a7e1d13ed1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s @@ -13,5 +13,3 @@ glabel func_8096B0C0 /* 0161C 8096B0EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01620 8096B0F0 03E00008 */ jr $ra /* 01624 8096B0F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s index 3a8b6033ed..21bc0a7fa2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s @@ -17,5 +17,3 @@ glabel func_8096B0F8 /* 01664 8096B134 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01668 8096B138 03E00008 */ jr $ra /* 0166C 8096B13C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s index cdb520cd24..f011a59cdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s @@ -16,5 +16,3 @@ glabel func_8096B140 /* 016A8 8096B178 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016AC 8096B17C 03E00008 */ jr $ra /* 016B0 8096B180 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s index d7c8a9d3fd..efb02ac1bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s @@ -21,5 +21,3 @@ glabel func_8096B184 /* 01700 8096B1D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01704 8096B1D4 03E00008 */ jr $ra /* 01708 8096B1D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s index ef8412a9df..763244c8a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s @@ -16,5 +16,3 @@ glabel func_8096B1DC /* 01744 8096B214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01748 8096B218 03E00008 */ jr $ra /* 0174C 8096B21C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s index c18fbf36c8..04570f61c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s @@ -22,5 +22,3 @@ glabel func_8096B220 /* 017A0 8096B270 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017A4 8096B274 03E00008 */ jr $ra /* 017A8 8096B278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s index 085f15f10c..4c2960be42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s @@ -21,5 +21,3 @@ glabel func_8096B27C /* 017F8 8096B2C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017FC 8096B2CC 03E00008 */ jr $ra /* 01800 8096B2D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s index 548bcda141..7746b10e52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s @@ -16,5 +16,3 @@ glabel func_8096B2D4 /* 0183C 8096B30C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01840 8096B310 03E00008 */ jr $ra /* 01844 8096B314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s index e328bb7ac7..c3b6241b63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s @@ -17,5 +17,3 @@ glabel func_8096B318 /* 01884 8096B354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01888 8096B358 03E00008 */ jr $ra /* 0188C 8096B35C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s index 4cb4da4f0b..0594689634 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s @@ -16,5 +16,3 @@ glabel func_8096B360 /* 018C8 8096B398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018CC 8096B39C 03E00008 */ jr $ra /* 018D0 8096B3A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s index 3ba2790184..847621b699 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s @@ -15,5 +15,3 @@ glabel func_8096B3A4 /* 01908 8096B3D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0190C 8096B3DC 03E00008 */ jr $ra /* 01910 8096B3E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s index 0eb5b811e9..555fdae96b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s @@ -42,5 +42,3 @@ glabel func_8096B3E4 /* 019AC 8096B47C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 019B0 8096B480 03E00008 */ jr $ra /* 019B4 8096B484 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s index def29ef8db..6f5bacb883 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s @@ -7,5 +7,3 @@ glabel func_8096B488 /* 019CC 8096B49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 019D0 8096B4A0 03E00008 */ jr $ra /* 019D4 8096B4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s index b47936e57c..dfae1c3197 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s @@ -32,5 +32,3 @@ glabel func_8096B4A8 /* 01A4C 8096B51C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01A50 8096B520 03E00008 */ jr $ra /* 01A54 8096B524 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s index adef9204b1..dbbb31f637 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s @@ -21,5 +21,3 @@ glabel func_8096B528 /* 01AA0 8096B570 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AA4 8096B574 03E00008 */ jr $ra /* 01AA8 8096B578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s index a992f21575..6b73691abc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s @@ -87,5 +87,3 @@ glabel func_8096B57C /* 01BF4 8096B6C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BF8 8096B6C8 03E00008 */ jr $ra /* 01BFC 8096B6CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s index 872db80600..946bae1bb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s @@ -39,5 +39,3 @@ glabel func_8096B6D0 /* 01C8C 8096B75C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C90 8096B760 03E00008 */ jr $ra /* 01C94 8096B764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s index 0a47419175..fbd65f2317 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s @@ -11,5 +11,3 @@ glabel func_8096B768 /* 01CBC 8096B78C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CC0 8096B790 03E00008 */ jr $ra /* 01CC4 8096B794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s index 45d9f222aa..5dee6a70a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s @@ -20,5 +20,3 @@ glabel func_8096B798 /* 01D10 8096B7E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D14 8096B7E4 03E00008 */ jr $ra /* 01D18 8096B7E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s index f3305edf12..3f975a6510 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s @@ -20,5 +20,3 @@ glabel func_8096B7EC /* 01D64 8096B834 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D68 8096B838 03E00008 */ jr $ra /* 01D6C 8096B83C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s index 3af0e25cd0..be283d0d7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8096CFD0 + .asciz "../z_demo_du_inKenjyanomaDemo02.c" + .balign 4 + +glabel D_8096CFF4 + .asciz "../z_demo_du_inKenjyanomaDemo02.c" + .balign 4 + +.text glabel func_8096B840 /* 01D70 8096B840 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01D74 8096B844 AFBF002C */ sw $ra, 0x002C($sp) @@ -122,5 +132,3 @@ glabel func_8096B840 /* 01F50 8096BA20 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 01F54 8096BA24 03E00008 */ jr $ra /* 01F58 8096BA28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s index 1a75b22727..27191df61f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s @@ -26,5 +26,3 @@ glabel func_8096BA2C /* 01FBC 8096BA8C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01FC0 8096BA90 03E00008 */ jr $ra /* 01FC4 8096BA94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s index 1199ae5590..04ce8c8108 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s @@ -36,5 +36,3 @@ glabel func_8096BA98 /* 02048 8096BB18 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 /* 0204C 8096BB1C 03E00008 */ jr $ra /* 02050 8096BB20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s index d635b14b97..20ebd04604 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s @@ -13,5 +13,3 @@ glabel func_8096BB24 /* 02080 8096BB50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02084 8096BB54 03E00008 */ jr $ra /* 02088 8096BB58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s index 25b35f6b5a..24c4d6ab07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s @@ -19,5 +19,3 @@ glabel func_8096BB5C .L8096BBA0: /* 020D0 8096BBA0 03E00008 */ jr $ra /* 020D4 8096BBA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s index 52f67ed21f..4eff79d5fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s @@ -15,5 +15,3 @@ glabel func_8096BBA8 /* 0210C 8096BBDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02110 8096BBE0 03E00008 */ jr $ra /* 02114 8096BBE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s index a7de72eaa7..0fde27e636 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s @@ -15,5 +15,3 @@ glabel func_8096BBE8 /* 0214C 8096BC1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02150 8096BC20 03E00008 */ jr $ra /* 02154 8096BC24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s index b0c0e889c8..8e4effff06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s @@ -17,5 +17,3 @@ glabel func_8096BC28 /* 02190 8096BC60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02194 8096BC64 03E00008 */ jr $ra /* 02198 8096BC68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s index f8408a3d20..78180d6c27 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8096D018 + .asciz "Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_8096BC6C /* 0219C 8096BC6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 021A0 8096BC70 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +60,3 @@ glabel func_8096BC6C /* 02250 8096BD20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02254 8096BD24 03E00008 */ jr $ra /* 02258 8096BD28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s index c434f4648a..f38919ba49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s @@ -7,5 +7,3 @@ glabel func_8096BD2C /* 02270 8096BD40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02274 8096BD44 03E00008 */ jr $ra /* 02278 8096BD48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s index e2eba0ee80..af24c6bd95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s @@ -17,5 +17,3 @@ glabel func_8096BD4C /* 022B8 8096BD88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022BC 8096BD8C 03E00008 */ jr $ra /* 022C0 8096BD90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s index 68424edeaa..d203c3424f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s @@ -15,5 +15,3 @@ glabel func_8096BD94 /* 022F8 8096BDC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 022FC 8096BDCC 03E00008 */ jr $ra /* 02300 8096BDD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s index 6f0b0ec3f7..3b510486eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s @@ -15,5 +15,3 @@ glabel func_8096BDD4 /* 02338 8096BE08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0233C 8096BE0C 03E00008 */ jr $ra /* 02340 8096BE10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s index be51723900..6efcf85d4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s @@ -15,5 +15,3 @@ glabel func_8096BE14 /* 02378 8096BE48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0237C 8096BE4C 03E00008 */ jr $ra /* 02380 8096BE50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s index 37e5b386f7..63bde1a447 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s @@ -2,5 +2,3 @@ glabel func_8096BF54 /* 02484 8096BF54 AFA40000 */ sw $a0, 0x0000($sp) /* 02488 8096BF58 03E00008 */ jr $ra /* 0248C 8096BF5C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s index 9b950df8af..6b51754c17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8096D090 + .asciz "../z_demo_du.c" + .balign 4 + +glabel D_8096D0A0 + .asciz "../z_demo_du.c" + .balign 4 + +.text glabel func_8096BF60 /* 02490 8096BF60 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 02494 8096BF64 AFBF0024 */ sw $ra, 0x0024($sp) @@ -117,5 +127,3 @@ glabel func_8096BF60 /* 0265C 8096C12C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 02660 8096C130 03E00008 */ jr $ra /* 02664 8096C134 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s index e302254fb6..c17eefc4ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s @@ -7,5 +7,3 @@ glabel DemoEc_Destroy /* 00014 8096D4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00018 8096D4C8 03E00008 */ jr $ra /* 0001C 8096D4CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s index 716f02f0d7..a5493437ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809707D4 + .asciz "\x1B[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1B[m" + .balign 4 + +.text glabel DemoEc_Draw /* 02E0C 809702BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02E10 809702C0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -41,4 +47,3 @@ glabel DemoEc_Draw /* 02E94 80970344 00000000 */ nop /* 02E98 80970348 00000000 */ nop /* 02E9C 8097034C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s index 70c22de1ba..1b41b9f4bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80970630 + .asciz "\x1B[31mDemo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n\x1B[m" + .balign 4 + +.text glabel DemoEc_Init /* 00020 8096D4D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00024 8096D4D4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,5 +33,3 @@ glabel DemoEc_Init /* 00070 8096D520 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00074 8096D524 03E00008 */ jr $ra /* 00078 8096D528 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s index e937453f29..e98af33139 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80970798 + .asciz "\x1B[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1B[m" + .balign 4 + +.text glabel DemoEc_Update /* 02D74 80970224 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02D78 80970228 AFBF0014 */ sw $ra, 0x0014($sp) @@ -39,5 +45,3 @@ glabel DemoEc_Update /* 02DF4 809702A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02DF8 809702A8 03E00008 */ jr $ra /* 02DFC 809702AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s index b7bc75e57d..effbeb204a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s @@ -8,5 +8,3 @@ glabel func_8096D52C /* 00090 8096D540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00094 8096D544 03E00008 */ jr $ra /* 00098 8096D548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s index c480a7aad1..75bceab88e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s @@ -17,5 +17,3 @@ glabel func_8096D54C /* 000D8 8096D588 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000DC 8096D58C 03E00008 */ jr $ra /* 000E0 8096D590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s index d271157999..94cd7bf38b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s @@ -15,5 +15,3 @@ glabel func_8096D594 /* 00118 8096D5C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0011C 8096D5CC 03E00008 */ jr $ra /* 00120 8096D5D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s index f3a8de0830..887a6f34f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s @@ -29,5 +29,3 @@ glabel func_8096D5D4 /* 00190 8096D640 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00194 8096D644 03E00008 */ jr $ra /* 00198 8096D648 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s index 97fa0be67f..5fa1563b82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s @@ -15,5 +15,3 @@ glabel func_8096D64C /* 001D0 8096D680 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001D4 8096D684 03E00008 */ jr $ra /* 001D8 8096D688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s index 869c414a91..f553cf1247 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s @@ -38,5 +38,3 @@ glabel func_8096D68C /* 00258 8096D708 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0025C 8096D70C 03E00008 */ jr $ra /* 00260 8096D710 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s index 0abc3203a2..eb5169a910 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s @@ -4,5 +4,3 @@ glabel func_8096D714 /* 0026C 8096D71C 00052C03 */ sra $a1, $a1, 16 /* 00270 8096D720 03E00008 */ jr $ra /* 00274 8096D724 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s index 2ec0092e09..76f25345be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s @@ -28,5 +28,3 @@ glabel func_8096D728 /* 002E0 8096D790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002E4 8096D794 03E00008 */ jr $ra /* 002E8 8096D798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s index a7f549ab3c..b99c97baea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s @@ -50,5 +50,3 @@ glabel func_8096D79C /* 0039C 8096D84C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003A0 8096D850 03E00008 */ jr $ra /* 003A4 8096D854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s index 4e76acdb77..92e2302a06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s @@ -27,5 +27,3 @@ glabel func_8096D858 /* 00408 8096D8B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0040C 8096D8BC 03E00008 */ jr $ra /* 00410 8096D8C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s index 3fc94fc4bf..b549d0e664 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8097066C + .asciz "../z_demo_ec.c" + .balign 4 + +glabel D_8097067C + .asciz "../z_demo_ec.c" + .balign 4 + +.text glabel func_8096D8C4 /* 00414 8096D8C4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00418 8096D8C8 AFBF002C */ sw $ra, 0x002C($sp) @@ -112,5 +122,3 @@ glabel func_8096D8C4 /* 005C4 8096DA74 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 005C8 8096DA78 03E00008 */ jr $ra /* 005CC 8096DA7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s index 347410e5f7..1274e08f97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8097068C + .asciz "../z_demo_ec.c" + .balign 4 + +glabel D_8097069C + .asciz "../z_demo_ec.c" + .balign 4 + +.text glabel func_8096DA80 /* 005D0 8096DA80 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 005D4 8096DA84 AFBF002C */ sw $ra, 0x002C($sp) @@ -166,5 +176,3 @@ glabel func_8096DA80 /* 00850 8096DD00 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 00854 8096DD04 03E00008 */ jr $ra /* 00858 8096DD08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s index 9f42d7909a..dbf029445a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809706AC + .asciz "../z_demo_ec.c" + .balign 4 + +glabel D_809706BC + .asciz "../z_demo_ec.c" + .balign 4 + +.text glabel func_8096DD0C /* 0085C 8096DD0C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00860 8096DD10 AFBF0014 */ sw $ra, 0x0014($sp) @@ -43,5 +53,3 @@ glabel func_8096DD0C /* 00900 8096DDB0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00904 8096DDB4 03E00008 */ jr $ra /* 00908 8096DDB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s index 3bcbc1ee5c..245121d968 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s @@ -12,5 +12,3 @@ glabel func_8096DDBC /* 00934 8096DDE4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00938 8096DDE8 03E00008 */ jr $ra /* 0093C 8096DDEC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s index 0f8679b288..e513391a23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s @@ -9,5 +9,3 @@ glabel func_8096DDF0 .L8096DE0C: /* 0095C 8096DE0C 03E00008 */ jr $ra /* 00960 8096DE10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s index 9d7005e61d..1ab071d9b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s @@ -32,5 +32,3 @@ glabel func_8096DE14 /* 009D8 8096DE88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009DC 8096DE8C 03E00008 */ jr $ra /* 009E0 8096DE90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s index 80a6e9e484..8c66c17ba7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s @@ -38,5 +38,3 @@ glabel func_8096DE94 /* 00A70 8096DF20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A74 8096DF24 03E00008 */ jr $ra /* 00A78 8096DF28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s index 6f92d2aed7..87b4a50f03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s @@ -14,5 +14,3 @@ glabel func_8096DF2C /* 00AAC 8096DF5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AB0 8096DF60 03E00008 */ jr $ra /* 00AB4 8096DF64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s index e6f1243920..2398e62912 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s @@ -12,5 +12,3 @@ glabel func_8096DF68 /* 00AE0 8096DF90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AE4 8096DF94 03E00008 */ jr $ra /* 00AE8 8096DF98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s index c0972625e1..992e0a4467 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s @@ -38,5 +38,3 @@ glabel func_8096DF9C /* 00B78 8096E028 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B7C 8096E02C 03E00008 */ jr $ra /* 00B80 8096E030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s index c6a5255126..b78525c9e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s @@ -14,5 +14,3 @@ glabel func_8096E034 /* 00BB4 8096E064 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BB8 8096E068 03E00008 */ jr $ra /* 00BBC 8096E06C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s index de7dbf598c..ec78ecd356 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s @@ -12,5 +12,3 @@ glabel func_8096E070 /* 00BE8 8096E098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00BEC 8096E09C 03E00008 */ jr $ra /* 00BF0 8096E0A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s index 7c59dfe16d..56f43f43f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s @@ -38,5 +38,3 @@ glabel func_8096E0A4 /* 00C80 8096E130 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C84 8096E134 03E00008 */ jr $ra /* 00C88 8096E138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s index ebcc651731..b5446b7855 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s @@ -14,5 +14,3 @@ glabel func_8096E13C /* 00CBC 8096E16C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CC0 8096E170 03E00008 */ jr $ra /* 00CC4 8096E174 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s index 5184dad76c..62c70f0fc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s @@ -12,5 +12,3 @@ glabel func_8096E178 /* 00CF0 8096E1A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CF4 8096E1A4 03E00008 */ jr $ra /* 00CF8 8096E1A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s index 06098a3342..31c6f6da51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s @@ -38,5 +38,3 @@ glabel func_8096E1AC /* 00D88 8096E238 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D8C 8096E23C 03E00008 */ jr $ra /* 00D90 8096E240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s index b4db642a8b..4b184070a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s @@ -39,5 +39,3 @@ glabel func_8096E244 /* 00E24 8096E2D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E28 8096E2D8 03E00008 */ jr $ra /* 00E2C 8096E2DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s index fca1fb3467..a73b893e92 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s @@ -14,5 +14,3 @@ glabel func_8096E2E0 /* 00E60 8096E310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E64 8096E314 03E00008 */ jr $ra /* 00E68 8096E318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s index cad337d6f8..af8b0aff29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s @@ -7,5 +7,3 @@ glabel func_8096E31C /* 00E80 8096E330 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E84 8096E334 03E00008 */ jr $ra /* 00E88 8096E338 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s index b17c3ee196..2ebc747990 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s @@ -16,5 +16,3 @@ glabel func_8096E33C /* 00EC4 8096E374 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00EC8 8096E378 03E00008 */ jr $ra /* 00ECC 8096E37C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s index df6cefab69..6ab3ea4c3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s @@ -38,5 +38,3 @@ glabel func_8096E380 /* 00F5C 8096E40C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F60 8096E410 03E00008 */ jr $ra /* 00F64 8096E414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s index 315bb688e9..8fd06e1293 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s @@ -39,5 +39,3 @@ glabel func_8096E418 /* 00FF8 8096E4A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FFC 8096E4AC 03E00008 */ jr $ra /* 01000 8096E4B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s index 4f7b042261..6ece39d561 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s @@ -16,5 +16,3 @@ glabel func_8096E4B4 /* 0103C 8096E4EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01040 8096E4F0 03E00008 */ jr $ra /* 01044 8096E4F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s index 93192cc24b..67648c0fac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s @@ -7,5 +7,3 @@ glabel func_8096E4F8 /* 0105C 8096E50C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01060 8096E510 03E00008 */ jr $ra /* 01064 8096E514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s index b65f577c70..78b0ee311e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s @@ -20,5 +20,3 @@ glabel func_8096E518 /* 010B0 8096E560 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010B4 8096E564 03E00008 */ jr $ra /* 010B8 8096E568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s index 36c262946b..369d215ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s @@ -38,5 +38,3 @@ glabel func_8096E56C /* 01148 8096E5F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0114C 8096E5FC 03E00008 */ jr $ra /* 01150 8096E600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s index 5426911f32..04168b7fb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s @@ -16,5 +16,3 @@ glabel func_8096E604 /* 0118C 8096E63C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01190 8096E640 03E00008 */ jr $ra /* 01194 8096E644 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s index 074033159c..8f4449bfa1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s @@ -20,5 +20,3 @@ glabel func_8096E648 /* 011E0 8096E690 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 011E4 8096E694 03E00008 */ jr $ra /* 011E8 8096E698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s index 47c93a496d..a7d5b16955 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s @@ -38,5 +38,3 @@ glabel func_8096E69C /* 01278 8096E728 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0127C 8096E72C 03E00008 */ jr $ra /* 01280 8096E730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s index 2bc6a94c1c..b19475a66c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s @@ -16,5 +16,3 @@ glabel func_8096E734 /* 012BC 8096E76C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012C0 8096E770 03E00008 */ jr $ra /* 012C4 8096E774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s index 0be760f2d8..81e4e8ff97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s @@ -20,5 +20,3 @@ glabel func_8096E778 /* 01310 8096E7C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01314 8096E7C4 03E00008 */ jr $ra /* 01318 8096E7C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s index 1a10fb8829..08b326abf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s @@ -38,5 +38,3 @@ glabel func_8096E7CC /* 013A8 8096E858 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 013AC 8096E85C 03E00008 */ jr $ra /* 013B0 8096E860 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s index f13ce96d5e..c1bf81d111 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s @@ -16,5 +16,3 @@ glabel func_8096E864 /* 013EC 8096E89C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013F0 8096E8A0 03E00008 */ jr $ra /* 013F4 8096E8A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s index 7d48599697..dcbfe094b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s @@ -14,5 +14,3 @@ glabel func_8096E8A8 /* 01428 8096E8D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0142C 8096E8DC 03E00008 */ jr $ra /* 01430 8096E8E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s index cc7d90dfb9..fb16b1df65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s @@ -38,5 +38,3 @@ glabel func_8096E8E4 /* 014C0 8096E970 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014C4 8096E974 03E00008 */ jr $ra /* 014C8 8096E978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s index c889783616..6dac8af43c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s @@ -14,5 +14,3 @@ glabel func_8096E97C /* 014FC 8096E9AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01500 8096E9B0 03E00008 */ jr $ra /* 01504 8096E9B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s index dc88971104..e256a1b4de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s @@ -11,5 +11,3 @@ glabel func_8096E9B8 /* 0152C 8096E9DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01530 8096E9E0 03E00008 */ jr $ra /* 01534 8096E9E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s index 1cfabcb233..8adb7e1328 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s @@ -38,5 +38,3 @@ glabel func_8096E9E8 /* 015C4 8096EA74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 015C8 8096EA78 03E00008 */ jr $ra /* 015CC 8096EA7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s index debb5a7808..e58935b259 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s @@ -14,5 +14,3 @@ glabel func_8096EA80 /* 01600 8096EAB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01604 8096EAB4 03E00008 */ jr $ra /* 01608 8096EAB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s index c377cbb293..c43e2fcb4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s @@ -10,5 +10,3 @@ glabel func_8096EABC /* 0162C 8096EADC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01630 8096EAE0 03E00008 */ jr $ra /* 01634 8096EAE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s index 1351cdbb54..4979e24de0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s @@ -38,5 +38,3 @@ glabel func_8096EAE8 /* 016C4 8096EB74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 016C8 8096EB78 03E00008 */ jr $ra /* 016CC 8096EB7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s index deff6672af..ef87a5af2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s @@ -14,5 +14,3 @@ glabel func_8096EB80 /* 01700 8096EBB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01704 8096EBB4 03E00008 */ jr $ra /* 01708 8096EBB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s index 27d5899b3d..fe100ea368 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s @@ -68,5 +68,3 @@ glabel func_8096EBBC .L8096ECB4: /* 01804 8096ECB4 03E00008 */ jr $ra /* 01808 8096ECB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s index aeceab2cfc..026c7def70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809706CC + .asciz "\x1B[31mかつらが無い!!!!!!!!!!!!!!!!\n\x1B[m" + .balign 4 + +.text glabel func_8096ECBC /* 0180C 8096ECBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01810 8096ECC0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -39,5 +45,3 @@ glabel func_8096ECBC /* 01884 8096ED34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01888 8096ED38 03E00008 */ jr $ra /* 0188C 8096ED3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s index f2a56090f7..ee6b78d606 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s @@ -32,5 +32,3 @@ glabel func_8096ED40 /* 01904 8096EDB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01908 8096EDB8 03E00008 */ jr $ra /* 0190C 8096EDBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s index 4aa4b2ac0b..02e9c688de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s @@ -14,5 +14,3 @@ glabel func_8096EDC0 /* 01940 8096EDF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01944 8096EDF4 03E00008 */ jr $ra /* 01948 8096EDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s index 92c65b83e5..97267c14dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s @@ -39,5 +39,3 @@ glabel func_8096EDFC /* 019DC 8096EE8C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 019E0 8096EE90 03E00008 */ jr $ra /* 019E4 8096EE94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s index fde84115e3..8808bee852 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s @@ -16,5 +16,3 @@ glabel func_8096EE98 /* 01A20 8096EED0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A24 8096EED4 03E00008 */ jr $ra /* 01A28 8096EED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s index 858df58971..d80aad7f2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809706F4 + .asciz "\x1B[31mかつらが無い!!!!!!!!!!!!!!!!\n\x1B[m" + .balign 4 + +.text glabel func_8096EEDC /* 01A2C 8096EEDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01A30 8096EEE0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -33,5 +39,3 @@ glabel func_8096EEDC /* 01A90 8096EF40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A94 8096EF44 03E00008 */ jr $ra /* 01A98 8096EF48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s index 7dd540d826..caed632127 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s @@ -32,5 +32,3 @@ glabel func_8096EF4C /* 01B10 8096EFC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B14 8096EFC4 03E00008 */ jr $ra /* 01B18 8096EFC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s index 6bf9c14093..2b881c9364 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s @@ -16,5 +16,3 @@ glabel func_8096EFCC /* 01B54 8096F004 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B58 8096F008 03E00008 */ jr $ra /* 01B5C 8096F00C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s index faa18acd1c..8b150d57a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s @@ -39,5 +39,3 @@ glabel func_8096F010 /* 01BF0 8096F0A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BF4 8096F0A4 03E00008 */ jr $ra /* 01BF8 8096F0A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s index b7d663a243..051e802261 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s @@ -16,5 +16,3 @@ glabel func_8096F0AC /* 01C34 8096F0E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C38 8096F0E8 03E00008 */ jr $ra /* 01C3C 8096F0EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s index eaa3bbfb0c..62e12cd084 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s @@ -14,5 +14,3 @@ glabel func_8096F0F0 /* 01C70 8096F120 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C74 8096F124 03E00008 */ jr $ra /* 01C78 8096F128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s index 131cacd50d..c176f877bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s @@ -42,5 +42,3 @@ glabel func_8096F12C /* 01D18 8096F1C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D1C 8096F1CC 03E00008 */ jr $ra /* 01D20 8096F1D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s index ce9a198676..ce2633c52f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s @@ -21,5 +21,3 @@ glabel func_8096F1D4 /* 01D68 8096F218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D6C 8096F21C 03E00008 */ jr $ra /* 01D70 8096F220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s index ab76090b15..c412ec4ae3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s @@ -17,5 +17,3 @@ glabel func_8096F224 /* 01DB0 8096F260 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01DB4 8096F264 03E00008 */ jr $ra /* 01DB8 8096F268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s index 48a4150530..4a949b6d7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s @@ -17,5 +17,3 @@ glabel func_8096F26C /* 01DF4 8096F2A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01DF8 8096F2A8 03E00008 */ jr $ra /* 01DFC 8096F2AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s index 38a78443fe..e0f306631a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s @@ -27,5 +27,3 @@ glabel func_8096F2B0 /* 01E58 8096F308 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E5C 8096F30C 03E00008 */ jr $ra /* 01E60 8096F310 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s index 4a8bc2622c..b5956dd700 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s @@ -24,5 +24,3 @@ glabel func_8096F314 /* 01EBC 8096F36C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EC0 8096F370 03E00008 */ jr $ra /* 01EC4 8096F374 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s index e435b1a2fc..79d5b62193 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s @@ -22,5 +22,3 @@ glabel func_8096F378 /* 01F18 8096F3C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F1C 8096F3CC 03E00008 */ jr $ra /* 01F20 8096F3D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s index 8d0fc3f3c6..bc0a1a1bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s @@ -16,5 +16,3 @@ glabel func_8096F3D4 /* 01F5C 8096F40C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F60 8096F410 03E00008 */ jr $ra /* 01F64 8096F414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s index 1fa050c60b..d8ebf8bb25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s @@ -14,5 +14,3 @@ glabel func_8096F418 /* 01F98 8096F448 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F9C 8096F44C 03E00008 */ jr $ra /* 01FA0 8096F450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s index bb5f7d2fdb..e822e28199 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s @@ -42,5 +42,3 @@ glabel func_8096F454 /* 02040 8096F4F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02044 8096F4F4 03E00008 */ jr $ra /* 02048 8096F4F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s index d34999d580..d1efcfc0e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s @@ -17,5 +17,3 @@ glabel func_8096F4FC /* 02088 8096F538 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0208C 8096F53C 03E00008 */ jr $ra /* 02090 8096F540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s index 69049356c7..23d4e5b74f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s @@ -13,5 +13,3 @@ glabel func_8096F544 /* 020BC 8096F56C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 020C0 8096F570 03E00008 */ jr $ra /* 020C4 8096F574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s index 29fe117439..396c04baa1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s @@ -27,5 +27,3 @@ glabel func_8096F578 /* 02120 8096F5D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02124 8096F5D4 03E00008 */ jr $ra /* 02128 8096F5D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s index e25f313353..4e51520db6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s @@ -24,5 +24,3 @@ glabel func_8096F5DC /* 02184 8096F634 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02188 8096F638 03E00008 */ jr $ra /* 0218C 8096F63C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s index e403869349..4b028c477a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s @@ -22,5 +22,3 @@ glabel func_8096F640 /* 021E0 8096F690 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 021E4 8096F694 03E00008 */ jr $ra /* 021E8 8096F698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s index 5b5c83db9d..f8c0fe76b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s @@ -14,5 +14,3 @@ glabel func_8096F69C /* 0221C 8096F6CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02220 8096F6D0 03E00008 */ jr $ra /* 02224 8096F6D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s index 0ff837dd08..b55820c3ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s @@ -53,5 +53,3 @@ glabel func_8096F6D8 /* 022E4 8096F794 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 022E8 8096F798 03E00008 */ jr $ra /* 022EC 8096F79C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s index 01ed0f4235..f1762d3a90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s @@ -14,5 +14,3 @@ glabel func_8096F7A0 /* 02320 8096F7D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02324 8096F7D4 03E00008 */ jr $ra /* 02328 8096F7D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s index be6c7b6268..14034bcfb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s @@ -10,5 +10,3 @@ glabel func_8096F7DC /* 0234C 8096F7FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02350 8096F800 03E00008 */ jr $ra /* 02354 8096F804 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s index da49e8975b..478cca8e70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s @@ -39,5 +39,3 @@ glabel func_8096F808 /* 023E8 8096F898 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 023EC 8096F89C 03E00008 */ jr $ra /* 023F0 8096F8A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s index 82db77f8b8..0517fa06ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s @@ -16,5 +16,3 @@ glabel func_8096F8A4 /* 0242C 8096F8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02430 8096F8E0 03E00008 */ jr $ra /* 02434 8096F8E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s index f3c4f91b6c..a132daf121 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s @@ -14,5 +14,3 @@ glabel func_8096F8E8 /* 02468 8096F918 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0246C 8096F91C 03E00008 */ jr $ra /* 02470 8096F920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s index caa9caaadd..758f612610 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s @@ -39,5 +39,3 @@ glabel func_8096F924 /* 02504 8096F9B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02508 8096F9B8 03E00008 */ jr $ra /* 0250C 8096F9BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s index a3cebb19bd..2e9647c304 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s @@ -16,5 +16,3 @@ glabel func_8096F9C0 /* 02548 8096F9F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0254C 8096F9FC 03E00008 */ jr $ra /* 02550 8096FA00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s index be4e5ace60..e6d093481f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s @@ -14,5 +14,3 @@ glabel func_8096FA04 /* 02584 8096FA34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02588 8096FA38 03E00008 */ jr $ra /* 0258C 8096FA3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s index 28b4ea2abc..dd7dae8bf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s @@ -39,5 +39,3 @@ glabel func_8096FA40 /* 02620 8096FAD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02624 8096FAD4 03E00008 */ jr $ra /* 02628 8096FAD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s index 1830a6996d..17fdad1bc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s @@ -14,5 +14,3 @@ glabel func_8096FADC /* 0265C 8096FB0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02660 8096FB10 03E00008 */ jr $ra /* 02664 8096FB14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s index c3c1b2573f..eee9a4ecf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s @@ -11,5 +11,3 @@ glabel func_8096FB18 /* 0268C 8096FB3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02690 8096FB40 03E00008 */ jr $ra /* 02694 8096FB44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s index 95fc3bcf8f..d69d9acd7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s @@ -39,5 +39,3 @@ glabel func_8096FB48 /* 02728 8096FBD8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0272C 8096FBDC 03E00008 */ jr $ra /* 02730 8096FBE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s index c22568018f..56c5515ffa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s @@ -16,5 +16,3 @@ glabel func_8096FBE4 /* 0276C 8096FC1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02770 8096FC20 03E00008 */ jr $ra /* 02774 8096FC24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s index 8fb958e182..51ace0cfba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s @@ -32,5 +32,3 @@ glabel func_8096FC28 .L8096FCA0: /* 027F0 8096FCA0 03E00008 */ jr $ra /* 027F4 8096FCA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s index 0831cc328e..ec72b61d7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s @@ -16,5 +16,3 @@ glabel func_8096FCA8 /* 02830 8096FCE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02834 8096FCE4 03E00008 */ jr $ra /* 02838 8096FCE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s index 7f0e4caff7..fd5420df14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s @@ -39,5 +39,3 @@ glabel func_8096FCEC /* 028CC 8096FD7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 028D0 8096FD80 03E00008 */ jr $ra /* 028D4 8096FD84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s index 7c851bd80d..4bc84e2a97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s @@ -16,5 +16,3 @@ glabel func_8096FD88 /* 02910 8096FDC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02914 8096FDC4 03E00008 */ jr $ra /* 02918 8096FDC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s index 0cc165723c..85991e48ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s @@ -14,5 +14,3 @@ glabel func_8096FDCC /* 0294C 8096FDFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02950 8096FE00 03E00008 */ jr $ra /* 02954 8096FE04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s index 9084c40f65..1db3a9ab78 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s @@ -80,5 +80,3 @@ glabel func_8096FE08 /* 02A7C 8096FF2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02A80 8096FF30 03E00008 */ jr $ra /* 02A84 8096FF34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s index 6ee5cd7966..afc5562b59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s @@ -16,5 +16,3 @@ glabel func_8096FF38 /* 02AC0 8096FF70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02AC4 8096FF74 03E00008 */ jr $ra /* 02AC8 8096FF78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s index f082fae7c2..1b1d773a64 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s @@ -15,5 +15,3 @@ glabel func_8096FF7C /* 02B00 8096FFB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02B04 8096FFB4 03E00008 */ jr $ra /* 02B08 8096FFB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s index 840b69a0c8..cce38dc630 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s @@ -39,5 +39,3 @@ glabel func_8096FFBC /* 02B9C 8097004C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02BA0 80970050 03E00008 */ jr $ra /* 02BA4 80970054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s index 7c58669fa6..924223795f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s @@ -16,5 +16,3 @@ glabel func_80970058 /* 02BE0 80970090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02BE4 80970094 03E00008 */ jr $ra /* 02BE8 80970098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s index 0f84221852..0078de3ecd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s @@ -15,5 +15,3 @@ glabel func_8097009C /* 02C20 809700D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02C24 809700D4 03E00008 */ jr $ra /* 02C28 809700D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s index d9b9c4c7c6..a04154f0df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8097071C + .asciz "\x1B[31m Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n\x1B[m" + .balign 4 + +.text glabel func_809700DC /* 02C2C 809700DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02C30 809700E0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -28,5 +34,3 @@ glabel func_809700DC /* 02C84 80970134 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C88 80970138 03E00008 */ jr $ra /* 02C8C 8097013C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s index fbd13d2d29..04475cd221 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8097075C + .asciz "\x1B[31mDemo_Ec_main_bank:バンクを読めない arg_data = %d!\n\x1B[m" + .balign 4 + +.text glabel func_80970140 /* 02C90 80970140 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02C94 80970144 AFBF001C */ sw $ra, 0x001C($sp) @@ -66,5 +72,3 @@ glabel func_80970140 /* 02D68 80970218 8FB10018 */ lw $s1, 0x0018($sp) /* 02D6C 8097021C 03E00008 */ jr $ra /* 02D70 80970220 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s index a9f97bcb97..cef453e827 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s @@ -2,5 +2,3 @@ glabel func_809702B0 /* 02E00 809702B0 AFA40000 */ sw $a0, 0x0000($sp) /* 02E04 809702B4 03E00008 */ jr $ra /* 02E08 809702B8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s index 3fb9ef8c9a..4519f2aaf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s @@ -20,5 +20,3 @@ glabel DemoEffect_Destroy /* 00A04 80971954 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A08 80971958 03E00008 */ jr $ra /* 00A0C 8097195C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s index 7f8171d50f..7ce46d8e91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s @@ -1,3 +1,66 @@ +.rdata +glabel D_80976880 + .asciz "\x1b[36m no = %d\n\x1b[m" + .balign 4 + +glabel D_80976894 + .asciz "\x1b[36m bank_ID = %d\n\x1b[m" + .balign 4 + +glabel D_809768AC + .asciz "0" + .balign 4 + +glabel D_809768B0 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_809768C4 + .asciz "0" + .balign 4 + +glabel D_809768C8 + .asciz "../z_demo_effect.c" + .balign 4 + +.late_rodata +glabel jtbl_80976C58 +.word L809711AC +.word L809711C8 +.word L809711F8 +.word L809713A8 +.word L809713CC +.word L80971424 +.word L809714B8 +.word L80971544 +.word L809715E0 +.word L809716D8 +.word L809716EC +.word L80971700 +.word L80971714 +.word L80971728 +.word L8097173C +.word L80971774 +.word L809715B0 +.word L80971578 +.word L8097125C +.word L809717B0 +.word L809717E8 +.word L80971820 +.word L8097189C +.word L80971750 +.word L80971764 +.word L80971764 +glabel jtbl_80976CC0 +.word L809712AC +.word L809712CC +.word L809712EC +.word L8097130C +.word L8097132C +.word L8097134C +.word L80971370 + +.text glabel DemoEffect_Init /* 00170 809710C0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00174 809710C4 AFBF003C */ sw $ra, 0x003C($sp) @@ -600,5 +663,3 @@ glabel L8097189C /* 009B8 80971908 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 009BC 8097190C 03E00008 */ jr $ra /* 009C0 80971910 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s index 26daacad61..9bbcf0f173 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s @@ -8,5 +8,3 @@ glabel DemoEffect_Update /* 03758 809746A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0375C 809746AC 03E00008 */ jr $ra /* 03760 809746B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s index a2add07bb9..5bdee26c69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s @@ -1,5 +1,3 @@ glabel func_80970F50 /* 00000 80970F50 03E00008 */ jr $ra /* 00004 80970F54 AC85019C */ sw $a1, 0x019C($a0) ## 0000019C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s index a1c368f5bd..54c654d5a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s @@ -23,5 +23,3 @@ glabel func_80970F58 .L80970FAC: /* 0005C 80970FAC 03E00008 */ jr $ra /* 00060 80970FB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s index 64340526c6..837d161f4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s @@ -52,5 +52,3 @@ glabel func_80970FB4 /* 00114 80971064 A4206810 */ sh $zero, %lo(D_80976810)($at) /* 00118 80971068 03E00008 */ jr $ra /* 0011C 8097106C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s index cc1d7bb6e0..ab224857f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s @@ -20,5 +20,3 @@ glabel func_80971070 /* 00164 809710B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00168 809710B8 03E00008 */ jr $ra /* 0016C 809710BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s index 65fb173de9..a50e97cf35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809768DC + .asciz "\x1b[36m 転送終了 move_wait \x1b[m" + .balign 4 + +.text glabel func_80971960 /* 00A10 80971960 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00A14 80971964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 @@ -26,5 +32,3 @@ glabel func_80971960 /* 00A64 809719B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A68 809719B8 03E00008 */ jr $ra /* 00A6C 809719BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s index f60929c134..588069da35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s @@ -12,5 +12,3 @@ glabel func_809719C0 .L809719E8: /* 00A98 809719E8 03E00008 */ jr $ra /* 00A9C 809719EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s index 3bd0501e68..b6ef4683ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s @@ -13,5 +13,3 @@ glabel func_809719F0 /* 00ACC 80971A1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AD0 80971A20 03E00008 */ jr $ra /* 00AD4 80971A24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s index e7132154f6..65462efd42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976CDC + .float -0.1 + +.text glabel func_80971A28 /* 00AD8 80971A28 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00ADC 80971A2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -111,5 +116,3 @@ glabel func_80971A28 /* 00C60 80971BB0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00C64 80971BB4 03E00008 */ jr $ra /* 00C68 80971BB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s index 86f7b34483..8ac8a2851a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976CE0 + .float 0.1 + +.text glabel func_80971BBC /* 00C6C 80971BBC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00C70 80971BC0 AFBF001C */ sw $ra, 0x001C($sp) @@ -165,5 +170,3 @@ glabel func_80971BBC /* 00EA0 80971DF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EA4 80971DF4 03E00008 */ jr $ra /* 00EA8 80971DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s index 3298a4bb30..68f4c4e24d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s @@ -1,3 +1,25 @@ +.rdata +glabel D_809768FC + .asciz "0" + .balign 4 + +glabel D_80976900 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976914 + .asciz " 縮むバージョン \n" + .balign 4 + +glabel D_80976930 + .asciz " 通常 バージョン \n" + .balign 4 + +.late_rodata +glabel D_80976CE4 + .float 1.7 + +.text glabel func_80971DFC /* 00EAC 80971DFC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00EB0 80971E00 AFBF0024 */ sw $ra, 0x0024($sp) @@ -144,5 +166,3 @@ glabel func_80971DFC /* 010AC 80971FFC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 010B0 80972000 03E00008 */ jr $ra /* 010B4 80972004 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s index 0abb98cee1..4ba733d30d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s @@ -42,5 +42,3 @@ glabel func_80972008 /* 01150 809720A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01154 809720A4 03E00008 */ jr $ra /* 01158 809720A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s index a0ad168368..c3c45b97a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s @@ -78,5 +78,3 @@ glabel func_809720AC /* 01274 809721C4 24840004 */ addiu $a0, $a0, 0x0004 ## $a0 = 8097684D /* 01278 809721C8 03E00008 */ jr $ra /* 0127C 809721CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s index 176f32bfee..4ed5295dd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976CE8 + .float 0.0013333333 + +.text glabel func_809721D0 /* 01280 809721D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01284 809721D4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -50,5 +55,3 @@ glabel func_809721D0 /* 0132C 8097227C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01330 80972280 03E00008 */ jr $ra /* 01334 80972284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s index d7e65f9a17..5963b361aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80976CEC + .float 0.01 + +glabel D_80976CF0 + .float 0.14 + +glabel D_80976CF4 + .float 0.6 + +.text glabel func_80972288 /* 01338 80972288 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0133C 8097228C AFBF0014 */ sw $ra, 0x0014($sp) @@ -50,5 +61,3 @@ glabel func_80972288 /* 013E8 80972338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013EC 8097233C 03E00008 */ jr $ra /* 013F0 80972340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s index 0049c94d4f..45e2873b72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s @@ -32,5 +32,3 @@ glabel func_80972344 /* 01468 809723B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0146C 809723BC 03E00008 */ jr $ra /* 01470 809723C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s index 244affcbc3..c39a590f83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s @@ -200,5 +200,3 @@ glabel func_809723C4 /* 01750 809726A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01754 809726A4 03E00008 */ jr $ra /* 01758 809726A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s index dc64dba945..1d85e61705 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s @@ -41,5 +41,3 @@ glabel func_809726AC /* 017E0 80972730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017E4 80972734 03E00008 */ jr $ra /* 017E8 80972738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s index 3741ee5946..f7ba11c5bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s @@ -31,5 +31,3 @@ glabel func_8097273C /* 01854 809727A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01858 809727A8 03E00008 */ jr $ra /* 0185C 809727AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s index 795b3bae19..9b9236366e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s @@ -50,5 +50,3 @@ glabel func_809727B0 /* 0190C 8097285C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01910 80972860 03E00008 */ jr $ra /* 01914 80972864 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s index 9e3f294160..050d0a6e42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s @@ -96,5 +96,3 @@ glabel func_80972868 /* 01A5C 809729AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01A60 809729B0 03E00008 */ jr $ra /* 01A64 809729B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s index 25b5aa3810..bd221db213 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976CF8 + .float -0.03 + +.text glabel func_809729B8 /* 01A68 809729B8 AFA50004 */ sw $a1, 0x0004($sp) /* 01A6C 809729BC 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 @@ -18,5 +23,3 @@ glabel func_809729B8 /* 01AA8 809729F8 AC98019C */ sw $t8, 0x019C($a0) ## 0000019C /* 01AAC 809729FC 03E00008 */ jr $ra /* 01AB0 80972A00 E488006C */ swc1 $f8, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s index c7550ce748..79a28bdfcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976CFC + .float 0.9 + +.text glabel func_80972A04 /* 01AB4 80972A04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01AB8 80972A08 AFBF0014 */ sw $ra, 0x0014($sp) @@ -28,5 +33,3 @@ glabel func_80972A04 /* 01B10 80972A60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B14 80972A64 03E00008 */ jr $ra /* 01B18 80972A68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s index 39cf217375..4d41233724 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80976D00 + .float 0.01 + +glabel D_80976D04 + .float 0.01 + +.text glabel func_80972A6C /* 01B1C 80972A6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01B20 80972A70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -61,5 +69,3 @@ glabel func_80972A6C /* 01BF0 80972B40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BF4 80972B44 03E00008 */ jr $ra /* 01BF8 80972B48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s index 6197517c0d..6f451d11ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s @@ -1,3 +1,23 @@ +.late_rodata +glabel D_80976D08 + .float 0.23 + +glabel D_80976D0C + .float 0.001 + +glabel D_80976D10 + .float 2.03 + +glabel D_80976D14 + .float 0.05 + +glabel D_80976D18 + .float 0.1 + +glabel D_80976D1C + .float 0.005 + +.text glabel func_80972B4C /* 01BFC 80972B4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01C00 80972B50 AFBF0024 */ sw $ra, 0x0024($sp) @@ -215,5 +235,3 @@ glabel func_80972B4C /* 01EE0 80972E30 8FB10020 */ lw $s1, 0x0020($sp) /* 01EE4 80972E34 03E00008 */ jr $ra /* 01EE8 80972E38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s index 48a8cb7395..20349dc931 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976D20 + .float 1.05 + +.text glabel func_80972E3C /* 01EEC 80972E3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01EF0 80972E40 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +34,3 @@ glabel func_80972E3C /* 01F4C 80972E9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F50 80972EA0 03E00008 */ jr $ra /* 01F54 80972EA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s index 4f81ddfd86..0306e2cdde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s @@ -113,5 +113,3 @@ glabel func_80972EA8 /* 020E0 80973030 8FB10038 */ lw $s1, 0x0038($sp) /* 020E4 80973034 03E00008 */ jr $ra /* 020E8 80973038 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s index 1e3ad836c3..2b61f6bdde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s @@ -139,5 +139,3 @@ glabel func_8097303C /* 022D0 80973220 8FB10030 */ lw $s1, 0x0030($sp) /* 022D4 80973224 03E00008 */ jr $ra /* 022D8 80973228 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s index 18aca1a514..c90266b370 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80976D24 + .float 0.23 + +glabel D_80976D28 + .float 0.15 + +.text glabel func_8097322C /* 022DC 8097322C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 022E0 80973230 AFBF003C */ sw $ra, 0x003C($sp) @@ -113,5 +121,3 @@ glabel func_8097322C /* 0246C 809733BC 8FB10038 */ lw $s1, 0x0038($sp) /* 02470 809733C0 03E00008 */ jr $ra /* 02474 809733C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s index fe19086189..44c23ac2db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s @@ -22,5 +22,3 @@ glabel func_809733C8 /* 024C8 80973418 46107480 */ add.s $f18, $f14, $f16 /* 024CC 8097341C 03E00008 */ jr $ra /* 024D0 80973420 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s index c0cf87ef1a..a28179396d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s @@ -66,5 +66,3 @@ glabel func_80973424 /* 025C8 80973518 A0800183 */ sb $zero, 0x0183($a0) ## 00000183 /* 025CC 8097351C 03E00008 */ jr $ra /* 025D0 80973520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s index 8dff52ae1b..1bb10ee05a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s @@ -514,5 +514,3 @@ glabel func_80973524 /* 02D44 80973C94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D48 80973C98 03E00008 */ jr $ra /* 02D4C 80973C9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s index c309c045d8..7b2e0c3445 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s @@ -26,5 +26,3 @@ glabel func_80973CA0 .L80973CF4: /* 02DA4 80973CF4 03E00008 */ jr $ra /* 02DA8 80973CF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s index 986a2d7843..028e55f1a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80976D2C + .float 0.017453292 + +glabel D_80976D30 + .float 9.58738019108e-05 + +glabel D_80976D34 + .float 9.58738019108e-05 + +.text glabel func_80973CFC /* 02DAC 80973CFC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02DB0 80973D00 AFA60050 */ sw $a2, 0x0050($sp) @@ -130,5 +141,3 @@ glabel func_80973CFC /* 02F84 80973ED4 D7B40018 */ ldc1 $f20, 0x0018($sp) /* 02F88 80973ED8 03E00008 */ jr $ra /* 02F8C 80973EDC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s index 8ee2b4259c..d9269db172 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976D38 + .float 10430.378 + +.text glabel func_80973EE0 /* 02F90 80973EE0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02F94 80973EE4 AFBF003C */ sw $ra, 0x003C($sp) @@ -164,5 +169,3 @@ glabel func_80973EE0 /* 031F0 80974140 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 031F4 80974144 03E00008 */ jr $ra /* 031F8 80974148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s index 8d13489da5..5f838418ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976D3C + .float -0.1 + +.text glabel func_8097414C /* 031FC 8097414C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 03200 80974150 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -92,5 +97,3 @@ glabel func_8097414C /* 03354 809742A4 8FB70050 */ lw $s7, 0x0050($sp) /* 03358 809742A8 03E00008 */ jr $ra /* 0335C 809742AC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s index 380705c9d3..0af6e9f98e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s @@ -27,5 +27,3 @@ glabel func_809742B0 /* 033B8 80974308 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 033BC 8097430C 03E00008 */ jr $ra /* 033C0 80974310 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s index 5b63681167..0f8c0bbf20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s @@ -16,5 +16,3 @@ glabel func_80974314 /* 033FC 8097434C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03400 80974350 03E00008 */ jr $ra /* 03404 80974354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s index f11732b1f4..655320cbff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s @@ -144,5 +144,3 @@ glabel func_80974358 /* 03610 80974560 8FB10018 */ lw $s1, 0x0018($sp) /* 03614 80974564 03E00008 */ jr $ra /* 03618 80974568 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s index 6d562731df..4cf84b6710 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80976D40 + .float 0.2 + +.text glabel func_8097456C /* 0361C 8097456C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 03620 80974570 AFBF0024 */ sw $ra, 0x0024($sp) @@ -75,5 +80,3 @@ glabel func_8097456C /* 03734 80974684 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 03738 80974688 03E00008 */ jr $ra /* 0373C 8097468C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s index 9c43c6c361..f997cfa0c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s @@ -18,5 +18,3 @@ glabel func_809746B4 .L809746F0: /* 037A0 809746F0 03E00008 */ jr $ra /* 037A4 809746F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s index 847aa093f4..f3bdc88e4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8097694C + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976960 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976974 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976988 + .asciz "../z_demo_effect.c" + .balign 4 + +.text glabel func_809746F8 /* 037A8 809746F8 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 037AC 809746FC AFBF003C */ sw $ra, 0x003C($sp) @@ -296,5 +314,3 @@ glabel func_809746F8 /* 03C24 80974B74 8FB10038 */ lw $s1, 0x0038($sp) /* 03C28 80974B78 03E00008 */ jr $ra /* 03C2C 80974B7C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s index 5e4785e465..03bc3838e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s @@ -1,3 +1,41 @@ +.rdata +glabel D_8097699C + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_809769B0 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_809769C4 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_809769D8 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_809769EC + .asciz "../z_demo_effect.c" + .balign 4 + +.late_rodata +glabel D_80976D44 + .float 0.19198622 + +glabel D_80976D48 + .float 2.0943952 + +glabel D_80976D4C + .float 0.19198622 + +glabel D_80976D50 + .float 4.1887903 + +glabel D_80976D54 + .float 0.19198622 + +.text glabel func_80974B80 /* 03C30 80974B80 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 03C34 80974B84 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 @@ -206,5 +244,3 @@ glabel func_80974B80 /* 03F58 80974EA8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 03F5C 80974EAC 03E00008 */ jr $ra /* 03F60 80974EB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s index 3d8dfbcc8c..335955623f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80976A00 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976A14 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976A28 + .asciz "../z_demo_effect.c" + .balign 4 + +.text glabel func_80974EB4 /* 03F64 80974EB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 03F68 80974EB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -111,5 +125,3 @@ glabel func_80974EB4 /* 04118 80975068 8FB10038 */ lw $s1, 0x0038($sp) /* 0411C 8097506C 03E00008 */ jr $ra /* 04120 80975070 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s index 9ce6c7106a..7101bd25fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80976A3C + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976A50 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976A64 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976A78 + .asciz "../z_demo_effect.c" + .balign 4 + +.late_rodata +glabel D_80976D58 + .float 0.017453292 + +glabel D_80976D5C + .float 1.57079637051 + +glabel D_80976D60 + .float 0.03 + +.text glabel func_80975074 /* 04124 80975074 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 04128 80975078 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -268,5 +296,3 @@ glabel func_80975074 /* 04538 80975488 8FB10038 */ lw $s1, 0x0038($sp) /* 0453C 8097548C 03E00008 */ jr $ra /* 04540 80975490 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s index d8b3ac6d59..9b21e2eb6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80976A8C + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976AA0 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976AB4 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976AC8 + .asciz "../z_demo_effect.c" + .balign 4 + +.late_rodata +glabel D_80976D64 + .float 0.05 + +glabel D_80976D68 + .float 0.017453292 + +glabel D_80976D6C + .float 0.017453292 + +.text glabel func_80975494 /* 04544 80975494 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 04548 80975498 AFBF001C */ sw $ra, 0x001C($sp) @@ -164,5 +192,3 @@ glabel func_80975494 /* 047C0 80975710 8FB10018 */ lw $s1, 0x0018($sp) /* 047C4 80975714 03E00008 */ jr $ra /* 047C8 80975718 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s index da7266e56a..0fe1db9d33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80976ADC + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976AF0 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976B04 + .asciz "../z_demo_effect.c" + .balign 4 + +.late_rodata +glabel D_80976D70 + .float 9.58738019108e-05 + +.text glabel func_8097571C /* 047CC 8097571C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 047D0 80975720 AFB10018 */ sw $s1, 0x0018($sp) @@ -87,5 +105,3 @@ glabel func_8097571C /* 04920 80975870 8FB10018 */ lw $s1, 0x0018($sp) /* 04924 80975874 03E00008 */ jr $ra /* 04928 80975878 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s index 1349a80613..3c17a35aeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80976B18 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976B2C + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976B40 + .asciz "../z_demo_effect.c" + .balign 4 + +.text glabel func_8097587C /* 0492C 8097587C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 04930 80975880 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -111,5 +125,3 @@ glabel func_8097587C /* 04AE0 80975A30 8FB10038 */ lw $s1, 0x0038($sp) /* 04AE4 80975A34 03E00008 */ jr $ra /* 04AE8 80975A38 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s index cb09765753..92e8a88fb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80976B54 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976B68 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976B7C + .asciz "../z_demo_effect.c" + .balign 4 + +.text glabel func_80975A3C /* 04AEC 80975A3C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 04AF0 80975A40 AFBF003C */ sw $ra, 0x003C($sp) @@ -101,5 +115,3 @@ glabel func_80975A3C /* 04C78 80975BC8 8FB10038 */ lw $s1, 0x0038($sp) /* 04C7C 80975BCC 03E00008 */ jr $ra /* 04C80 80975BD0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s index 53efac88d4..d8b7d3e170 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s @@ -1,3 +1,39 @@ +.rdata +glabel D_80976B90 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976BA4 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976BB8 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976BCC + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976BE0 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976BF4 + .asciz "../z_demo_effect.c" + .balign 4 + +.late_rodata +glabel D_80976D74 + .float 2.4 + +glabel D_80976D78 + .float 9.58738019108e-05 + +glabel D_80976D7C + .float 9.58738019108e-05 + +.text glabel func_80975BD4 /* 04C84 80975BD4 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 04C88 80975BD8 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 @@ -386,5 +422,3 @@ glabel func_80975BD4 /* 05268 809761B8 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 /* 0526C 809761BC 03E00008 */ jr $ra /* 05270 809761C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s index 145ad3721e..b7bd6ce700 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s @@ -38,5 +38,3 @@ glabel func_809761C4 /* 052F8 80976248 8FB10018 */ lw $s1, 0x0018($sp) /* 052FC 8097624C 03E00008 */ jr $ra /* 05300 80976250 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s index 970f07606f..3a0a45b68e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80976C08 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976C1C + .asciz "../z_demo_effect.c" + .balign 4 + +.text glabel func_80976254 /* 05304 80976254 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 05308 80976258 AFBF003C */ sw $ra, 0x003C($sp) @@ -108,5 +118,3 @@ glabel func_80976254 /* 054A8 809763F8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 054AC 809763FC 03E00008 */ jr $ra /* 054B0 80976400 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s index 9a1e23f225..f4217b5114 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80976C30 + .asciz "../z_demo_effect.c" + .balign 4 + +glabel D_80976C44 + .asciz "../z_demo_effect.c" + .balign 4 + +.text glabel func_80976404 /* 054B4 80976404 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 054B8 80976408 AFBF002C */ sw $ra, 0x002C($sp) @@ -63,5 +73,3 @@ glabel func_80976404 /* 055A0 809764F0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 055A4 809764F4 03E00008 */ jr $ra /* 055A8 809764F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s index 0bad8a0dba..e4975ffb27 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80976D80 + .float 10430.378 + +glabel D_80976D84 + .float 10430.378 + +.text glabel func_809764FC /* 055AC 809764FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 055B0 80976500 AFA5002C */ sw $a1, 0x002C($sp) @@ -43,5 +51,3 @@ glabel func_809764FC /* 05650 809765A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05654 809765A4 03E00008 */ jr $ra /* 05658 809765A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s index 31ea376c98..b4e943f751 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s @@ -88,5 +88,3 @@ glabel func_809765AC /* 057B0 80976700 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 057B4 80976704 03E00008 */ jr $ra /* 057B8 80976708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s index d06e4f3bd8..87be75b47f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s @@ -40,5 +40,3 @@ glabel func_8097670C /* 05854 809767A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 05858 809767A8 03E00008 */ jr $ra /* 0585C 809767AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s index 4f9bff1a97..1131644654 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s @@ -15,4 +15,3 @@ glabel func_809767B0 /* 05894 809767E4 E4820028 */ swc1 $f2, 0x0028($a0) ## 00000028 /* 05898 809767E8 03E00008 */ jr $ra /* 0589C 809767EC E48C002C */ swc1 $f12, 0x002C($a0) ## 0000002C - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Destroy.s index 6bc7b04a88..f404e231dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Destroy.s @@ -2,5 +2,3 @@ glabel DemoExt_Destroy /* 00000 80977390 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80977394 03E00008 */ jr $ra /* 00008 80977398 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Draw.s index d42ca4ea9c..bcff0819f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80977D50 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoExt_Draw /* 00880 80977C10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00884 80977C14 AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,4 +33,3 @@ glabel DemoExt_Draw /* 008D4 80977C64 03E00008 */ jr $ra /* 008D8 80977C68 00000000 */ nop /* 008DC 80977C6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s index fff55d9ef7..42dfa57fd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s @@ -44,5 +44,3 @@ glabel DemoExt_Init /* 000B4 80977444 46004280 */ add.s $f10, $f8, $f0 /* 000B8 80977448 03E00008 */ jr $ra /* 000BC 8097744C E48A0180 */ swc1 $f10, 0x0180($a0) ## 00000180 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Update.s index 66adc12d99..669d88d98c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80977CE4 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoExt_Update /* 00558 809778E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0055C 809778EC AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel DemoExt_Update /* 005A8 80977938 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005AC 8097793C 03E00008 */ jr $ra /* 005B0 80977940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s index 0c5da05f1d..ce42572273 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s @@ -35,5 +35,3 @@ glabel func_80977450 /* 0013C 809774CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00140 809774D0 03E00008 */ jr $ra /* 00144 809774D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774D8.s index 02324f557b..a432379723 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774D8.s @@ -9,5 +9,3 @@ glabel func_809774D8 .L809774F4: /* 00164 809774F4 03E00008 */ jr $ra /* 00168 809774F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774FC.s index 7a82f9c172..bcc061bc13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809774FC.s @@ -2,5 +2,3 @@ glabel func_809774FC /* 0016C 809774FC AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00170 80977500 03E00008 */ jr $ra /* 00174 80977504 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977508.s index 6dccde0103..7fba58e211 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977508.s @@ -34,5 +34,3 @@ glabel func_80977508 /* 001F4 80977584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001F8 80977588 03E00008 */ jr $ra /* 001FC 8097758C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977590.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977590.s index 6de5ff2009..d0f0b795cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977590.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977590.s @@ -4,5 +4,3 @@ glabel func_80977590 /* 00208 80977598 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0020C 8097759C 03E00008 */ jr $ra /* 00210 809775A0 AC8F0150 */ sw $t7, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s index 14c964f0db..0158e08087 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s @@ -28,5 +28,3 @@ glabel func_809775A4 /* 00274 80977604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00278 80977608 03E00008 */ jr $ra /* 0027C 8097760C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977610.s index 812ec108f2..be57ccbc5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977610.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977610.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80977CB0 + .asciz "Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_80977610 /* 00280 80977610 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00284 80977614 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +60,3 @@ glabel func_80977610 /* 00334 809776C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00338 809776C8 03E00008 */ jr $ra /* 0033C 809776CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s index 1aba1b2873..ec75948eba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s @@ -19,5 +19,3 @@ glabel func_809776D0 /* 00380 80977710 032C6821 */ addu $t5, $t9, $t4 /* 00384 80977714 03E00008 */ jr $ra /* 00388 80977718 A48D0168 */ sh $t5, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s index 52c8b49a96..2bd7cf91c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s @@ -80,5 +80,3 @@ glabel func_8097771C /* 004B8 80977848 46004282 */ mul.s $f10, $f8, $f0 /* 004BC 8097784C 03E00008 */ jr $ra /* 004C0 80977850 E44A0008 */ swc1 $f10, 0x0008($v0) ## 00000180 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977854.s index 046486a385..2b314bd8db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977854.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977854.s @@ -7,5 +7,3 @@ glabel func_80977854 /* 004D8 80977868 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004DC 8097786C 03E00008 */ jr $ra /* 004E0 80977870 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977874.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977874.s index 3b68d32331..aadd485d38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977874.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977874.s @@ -13,5 +13,3 @@ glabel func_80977874 /* 00510 809778A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00514 809778A4 03E00008 */ jr $ra /* 00518 809778A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809778AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809778AC.s index 983900fbcd..bd70e5508d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809778AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809778AC.s @@ -14,5 +14,3 @@ glabel func_809778AC /* 0054C 809778DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00550 809778E0 03E00008 */ jr $ra /* 00554 809778E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977944.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977944.s index ca854e8579..569c5fd6ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977944.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977944.s @@ -2,5 +2,3 @@ glabel func_80977944 /* 005B4 80977944 AFA40000 */ sw $a0, 0x0000($sp) /* 005B8 80977948 03E00008 */ jr $ra /* 005BC 8097794C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 154a5bfb26..02ef062ed6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80977D20 + .asciz "../z_demo_ext.c" + .balign 4 + +glabel D_80977D30 + .asciz "../z_demo_ext.c" + .balign 4 + +glabel D_80977D40 + .asciz "../z_demo_ext.c" + .balign 4 + +.text glabel func_80977950 /* 005C0 80977950 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 005C4 80977954 AFBF003C */ sw $ra, 0x003C($sp) @@ -176,5 +190,3 @@ glabel func_80977950 /* 00874 80977C04 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 00878 80977C08 03E00008 */ jr $ra /* 0087C 80977C0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Destroy.s index 882548fbd0..579d86700f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Destroy.s @@ -14,5 +14,3 @@ glabel DemoGj_Destroy /* 00188 80978AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0018C 80978ABC 03E00008 */ jr $ra /* 00190 80978AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s index 15d53bbdd3..9ea5dcd62a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8097C164 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoGj_Draw /* 0344C 8097BD7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03450 8097BD80 AFBF0014 */ sw $ra, 0x0014($sp) @@ -28,4 +34,3 @@ glabel DemoGj_Draw /* 034A4 8097BDD4 00000000 */ nop /* 034A8 8097BDD8 00000000 */ nop /* 034AC 8097BDDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s index c839e031df..6808f93d98 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s @@ -1,3 +1,31 @@ +.rdata +glabel D_8097C120 + .asciz "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_8097C234 +.word L8097BC98 +.word L8097BD48 +.word L8097BD48 +.word L8097BD48 +.word L8097BCA8 +.word L8097BCB8 +.word L8097BCC8 +.word L8097BCD8 +.word L8097BCE8 +.word L8097BCF8 +.word L8097BD08 +.word L8097BD48 +.word L8097BD18 +.word L8097BD28 +.word L8097BD48 +.word L8097BD48 +.word L8097BD48 +.word L8097BD48 +.word L8097BD38 + +.text glabel DemoGj_Init /* 03328 8097BC58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0332C 8097BC5C AFBF0014 */ sw $ra, 0x0014($sp) @@ -85,5 +113,3 @@ glabel L8097BD48 /* 03434 8097BD64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03438 8097BD68 03E00008 */ jr $ra /* 0343C 8097BD6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Update.s index c36541c50a..0f6db023f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8097C0E4 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoGj_Update /* 032CC 8097BBFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 032D0 8097BC00 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel DemoGj_Update /* 0331C 8097BC4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03320 8097BC50 03E00008 */ jr $ra /* 03324 8097BC54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978930.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978930.s index b5cd4e5404..020c0674c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978930.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978930.s @@ -3,5 +3,3 @@ glabel func_80978930 /* 00004 80978934 00031AC3 */ sra $v1, $v1, 11 /* 00008 80978938 03E00008 */ jr $ra /* 0000C 8097893C 3062001F */ andi $v0, $v1, 0x001F ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978940.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978940.s index 0e069bf436..7abfd1c609 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978940.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978940.s @@ -3,5 +3,3 @@ glabel func_80978940 /* 00014 80978944 00031A03 */ sra $v1, $v1, 8 /* 00018 80978948 03E00008 */ jr $ra /* 0001C 8097894C 30620007 */ andi $v0, $v1, 0x0007 ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978950.s index 3a6ff81e21..146d2d0182 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978950.s @@ -2,5 +2,3 @@ glabel func_80978950 /* 00020 80978950 8483001C */ lh $v1, 0x001C($a0) ## 0000001C /* 00024 80978954 03E00008 */ jr $ra /* 00028 80978958 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s index 6d85d85a4b..6dc91e39ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s @@ -18,5 +18,3 @@ glabel func_8097895C /* 00068 80978998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0006C 8097899C 03E00008 */ jr $ra /* 00070 809789A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s index e96bc84d23..1b229ccfd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s @@ -14,5 +14,3 @@ glabel func_809789A4 .L809789D0: /* 000A0 809789D0 03E00008 */ jr $ra /* 000A4 809789D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s index 6706c8ae77..15abd08259 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s @@ -55,5 +55,3 @@ glabel func_809789D8 /* 00150 80978A80 8FB10018 */ lw $s1, 0x0018($sp) /* 00154 80978A84 03E00008 */ jr $ra /* 00158 80978A88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AC4.s index 9ad805a2f4..e736c1c124 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AC4.s @@ -14,5 +14,3 @@ glabel func_80978AC4 /* 001C0 80978AF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C4 80978AF4 03E00008 */ jr $ra /* 001C8 80978AF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s index 1c9e75af63..ed95566036 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8097C19C + .float 0.2 + +.text glabel func_80978AFC /* 001CC 80978AFC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 001D0 80978B00 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 @@ -37,5 +42,3 @@ glabel func_80978AFC /* 00254 80978B84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00258 80978B88 03E00008 */ jr $ra /* 0025C 80978B8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s index 47b02d2802..bc623543eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978B90.s @@ -38,5 +38,3 @@ glabel func_80978B90 /* 002E4 80978C14 8FB40028 */ lw $s4, 0x0028($sp) /* 002E8 80978C18 03E00008 */ jr $ra /* 002EC 80978C1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s index 87d7257a8a..e94c2e92e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_8097C1A0 + .float 0.6 + +glabel D_8097C1A4 + .float 0.1 + +glabel D_8097C1A8 + .float 0.7 + +.text glabel func_80978C20 /* 002F0 80978C20 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 002F4 80978C24 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -177,5 +188,3 @@ glabel func_80978C20 /* 00580 80978EB0 8FBE0098 */ lw $s8, 0x0098($sp) /* 00584 80978EB4 03E00008 */ jr $ra /* 00588 80978EB8 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s index 635c950ec7..7bba47f455 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s @@ -10,5 +10,3 @@ glabel func_80978EBC .L80978EDC: /* 005AC 80978EDC 03E00008 */ jr $ra /* 005B0 80978EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EE4.s index 9a02139cd2..41be5c8496 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EE4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8097BF90 + .asciz "Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n" + .balign 4 + +glabel D_8097BFC0 + .asciz "Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n" + .balign 4 + +.text glabel func_80978EE4 /* 005B4 80978EE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 005B8 80978EE8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -37,5 +47,3 @@ glabel func_80978EE4 /* 00624 80978F54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00628 80978F58 03E00008 */ jr $ra /* 0062C 80978F5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978F60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978F60.s index cd81b83860..437fd56544 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978F60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978F60.s @@ -31,5 +31,3 @@ glabel func_80978F60 /* 00690 80978FC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00694 80978FC4 03E00008 */ jr $ra /* 00698 80978FC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s index 29f692800e..94308726b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s @@ -27,5 +27,3 @@ glabel func_80978FCC /* 006F4 80979024 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006F8 80979028 03E00008 */ jr $ra /* 006FC 8097902C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s index 8c60654399..aa61a56805 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8097BFF0 + .asciz "../z_demo_gj.c" + .balign 4 + +glabel D_8097C000 + .asciz "../z_demo_gj.c" + .balign 4 + +glabel D_8097C010 + .asciz "../z_demo_gj.c" + .balign 4 + +.text glabel func_80979030 /* 00700 80979030 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00704 80979034 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -59,5 +73,3 @@ glabel func_80979030 /* 007E0 80979110 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 007E4 80979114 03E00008 */ jr $ra /* 007E8 80979118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s index 017026230f..82cb8dd4fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8097C020 + .asciz "../z_demo_gj.c" + .balign 4 + +glabel D_8097C030 + .asciz "../z_demo_gj.c" + .balign 4 + +glabel D_8097C040 + .asciz "../z_demo_gj.c" + .balign 4 + +.text glabel func_8097911C /* 007EC 8097911C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 007F0 80979120 AFBF001C */ sw $ra, 0x001C($sp) @@ -72,5 +86,3 @@ glabel func_8097911C /* 00900 80979230 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00904 80979234 03E00008 */ jr $ra /* 00908 80979238 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s index a8e142236f..7c02625bf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s @@ -1,3 +1,42 @@ +.rdata +glabel D_8097C050 + .asciz "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" + .balign 4 + +.late_rodata +glabel jtbl_8097C1AC +.word L80979288 +.word L80979320 +.word L809793B8 +.word L80979450 +.word L809794E8 +.word L80979580 +.word L80979618 +glabel D_8097C1C8 + .float 0.01 + +glabel D_8097C1CC + .float 0.01 + +glabel D_8097C1D0 + .float 0.01 + +glabel D_8097C1D4 + .float 0.01 + +glabel D_8097C1D8 + .float 0.01 + +glabel D_8097C1DC + .float 0.01 + +glabel D_8097C1E0 + .float 0.01 + +glabel D_8097C1E4 + .word 0x4487C000 + +.text glabel func_8097923C /* 0090C 8097923C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00910 80979240 AFBF0024 */ sw $ra, 0x0024($sp) @@ -373,5 +412,3 @@ glabel L80979618 /* 00EA8 809797D8 D7B60018 */ ldc1 $f22, 0x0018($sp) /* 00EAC 809797DC 03E00008 */ jr $ra /* 00EB0 809797E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809797E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809797E4.s index 54920104ed..fe6a06a07f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809797E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809797E4.s @@ -14,5 +14,3 @@ glabel func_809797E4 .L80979810: /* 00EE0 80979810 03E00008 */ jr $ra /* 00EE4 80979814 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979818.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979818.s index d75aa8237e..499249453a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979818.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979818.s @@ -8,5 +8,3 @@ glabel func_80979818 /* 00F00 80979830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F04 80979834 03E00008 */ jr $ra /* 00F08 80979838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097983C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097983C.s index 883ac86169..23bf25d683 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097983C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097983C.s @@ -8,5 +8,3 @@ glabel func_8097983C /* 00F24 80979854 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F28 80979858 03E00008 */ jr $ra /* 00F2C 8097985C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s index 333ee820d6..d883df9e10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s @@ -1,3 +1,44 @@ +.rdata +glabel D_8097C098 + .asciz "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" + .balign 4 + +.late_rodata +glabel jtbl_8097C1E8 +.word L809798D0 +.word L809799A8 +.word L80979A80 +.word L80979B58 +.word L80979C30 +.word L80979D08 +.word L80979DE0 +glabel D_8097C204 + .float 0.01 + +glabel D_8097C208 + .float 0.01 + +glabel D_8097C20C + .float 0.01 + +glabel D_8097C210 + .float 0.01 + +glabel D_8097C214 + .float 0.01 + +glabel D_8097C218 + .float 0.01 + +glabel D_8097C21C + .float 0.01 + +glabel D_8097C220 + .word 0x4622F983 +glabel D_8097C224 + .word 0x4622F983 + +.text glabel func_80979860 /* 00F30 80979860 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00F34 80979864 AFBF001C */ sw $ra, 0x001C($sp) @@ -476,5 +517,3 @@ glabel L80979DE0 /* 01660 80979F90 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01664 80979F94 03E00008 */ jr $ra /* 01668 80979F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979F9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979F9C.s index f6d02a2009..8f2e88f36d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979F9C.s @@ -13,5 +13,3 @@ glabel func_80979F9C /* 01694 80979FC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01698 80979FC8 03E00008 */ jr $ra /* 0169C 80979FCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s index 2e001f475b..a852f02f1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s @@ -11,5 +11,3 @@ glabel func_80979FD0 /* 016C4 80979FF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016C8 80979FF8 03E00008 */ jr $ra /* 016CC 80979FFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s index 2597482863..4a6b15f11e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s @@ -31,5 +31,3 @@ glabel func_8097A000 /* 01740 8097A070 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01744 8097A074 03E00008 */ jr $ra /* 01748 8097A078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s index b0b1edaf0f..538318c37b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s @@ -27,5 +27,3 @@ glabel func_8097A07C /* 017A8 8097A0D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017AC 8097A0DC 03E00008 */ jr $ra /* 017B0 8097A0E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A0E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A0E4.s index 3bbb38061a..8442ad453e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A0E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A0E4.s @@ -19,5 +19,3 @@ glabel func_8097A0E4 /* 017F4 8097A124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017F8 8097A128 03E00008 */ jr $ra /* 017FC 8097A12C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A130.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A130.s index ce647545a5..a4e9b31039 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A130.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A130.s @@ -13,5 +13,3 @@ glabel func_8097A130 /* 01824 8097A154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01828 8097A158 03E00008 */ jr $ra /* 0182C 8097A15C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s index a95b0108e7..576bebeece 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s @@ -11,5 +11,3 @@ glabel func_8097A160 /* 01854 8097A184 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01858 8097A188 03E00008 */ jr $ra /* 0185C 8097A18C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s index 97e2fb5aa2..cd7a93bdf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s @@ -11,5 +11,3 @@ glabel func_8097A190 /* 01884 8097A1B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01888 8097A1B8 03E00008 */ jr $ra /* 0188C 8097A1BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s index e8c17370e9..ce70f4d6b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s @@ -8,5 +8,3 @@ glabel func_8097A1C0 /* 018A8 8097A1D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018AC 8097A1DC 03E00008 */ jr $ra /* 018B0 8097A1E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s index 65966013e0..da20290884 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s @@ -8,5 +8,3 @@ glabel func_8097A1E4 /* 018CC 8097A1FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018D0 8097A200 03E00008 */ jr $ra /* 018D4 8097A204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s index 2f0392bd9d..787ec42230 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s @@ -11,5 +11,3 @@ glabel func_8097A208 /* 018FC 8097A22C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01900 8097A230 03E00008 */ jr $ra /* 01904 8097A234 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s index e4181d0c6f..65aee0a507 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s @@ -31,5 +31,3 @@ glabel func_8097A238 /* 01978 8097A2A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0197C 8097A2AC 03E00008 */ jr $ra /* 01980 8097A2B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s index d8e12dbd08..823215db2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s @@ -28,5 +28,3 @@ glabel func_8097A2B4 /* 019E4 8097A314 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 019E8 8097A318 03E00008 */ jr $ra /* 019EC 8097A31C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s index ff14811fb7..876c5f9c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s @@ -19,5 +19,3 @@ glabel func_8097A320 /* 01A30 8097A360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A34 8097A364 03E00008 */ jr $ra /* 01A38 8097A368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A36C.s index d65ba7a3f3..5570097964 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A36C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A36C.s @@ -13,5 +13,3 @@ glabel func_8097A36C /* 01A60 8097A390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A64 8097A394 03E00008 */ jr $ra /* 01A68 8097A398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s index b20adcdfa7..d03c20137a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s @@ -11,5 +11,3 @@ glabel func_8097A39C /* 01A90 8097A3C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A94 8097A3C4 03E00008 */ jr $ra /* 01A98 8097A3C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s index 5bfa274114..4cd5ef3fa1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s @@ -11,5 +11,3 @@ glabel func_8097A3CC /* 01AC0 8097A3F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AC4 8097A3F4 03E00008 */ jr $ra /* 01AC8 8097A3F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s index 82e2416fd9..0ef1f5832d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s @@ -8,5 +8,3 @@ glabel func_8097A3FC /* 01AE4 8097A414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AE8 8097A418 03E00008 */ jr $ra /* 01AEC 8097A41C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s index 421e0e8756..a28de33db7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s @@ -8,5 +8,3 @@ glabel func_8097A420 /* 01B08 8097A438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B0C 8097A43C 03E00008 */ jr $ra /* 01B10 8097A440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s index 1693a780fa..29ebb72a42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s @@ -11,5 +11,3 @@ glabel func_8097A444 /* 01B38 8097A468 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B3C 8097A46C 03E00008 */ jr $ra /* 01B40 8097A470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s index 84ba66da13..3cda424389 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s @@ -31,5 +31,3 @@ glabel func_8097A474 /* 01BB4 8097A4E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BB8 8097A4E8 03E00008 */ jr $ra /* 01BBC 8097A4EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s index 95f6a36c24..3f495171be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s @@ -19,5 +19,3 @@ glabel func_8097A4F0 /* 01C00 8097A530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C04 8097A534 03E00008 */ jr $ra /* 01C08 8097A538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A53C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A53C.s index fddfaed8ed..c00de61761 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A53C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A53C.s @@ -13,5 +13,3 @@ glabel func_8097A53C /* 01C30 8097A560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C34 8097A564 03E00008 */ jr $ra /* 01C38 8097A568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s index 7ce0a9cc50..7c474221df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s @@ -11,5 +11,3 @@ glabel func_8097A56C /* 01C60 8097A590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C64 8097A594 03E00008 */ jr $ra /* 01C68 8097A598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s index 5c2b78db70..fcacdd5b96 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s @@ -11,5 +11,3 @@ glabel func_8097A59C /* 01C90 8097A5C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C94 8097A5C4 03E00008 */ jr $ra /* 01C98 8097A5C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s index 73773100f5..56c103be38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s @@ -8,5 +8,3 @@ glabel func_8097A5CC /* 01CB4 8097A5E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CB8 8097A5E8 03E00008 */ jr $ra /* 01CBC 8097A5EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s index 57c49f75d3..c211eaf4d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s @@ -8,5 +8,3 @@ glabel func_8097A5F0 /* 01CD8 8097A608 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CDC 8097A60C 03E00008 */ jr $ra /* 01CE0 8097A610 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s index b29fbcea1f..fbdcbbcc9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s @@ -11,5 +11,3 @@ glabel func_8097A614 /* 01D08 8097A638 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D0C 8097A63C 03E00008 */ jr $ra /* 01D10 8097A640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s index d5b6f8364f..2aa1883b52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s @@ -31,5 +31,3 @@ glabel func_8097A644 /* 01D84 8097A6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D88 8097A6B8 03E00008 */ jr $ra /* 01D8C 8097A6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s index 8aed739e6e..2322cb3de1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s @@ -19,5 +19,3 @@ glabel func_8097A6C0 /* 01DD0 8097A700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DD4 8097A704 03E00008 */ jr $ra /* 01DD8 8097A708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A70C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A70C.s index 8111c94165..f6d5bed47e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A70C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A70C.s @@ -13,5 +13,3 @@ glabel func_8097A70C /* 01E00 8097A730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E04 8097A734 03E00008 */ jr $ra /* 01E08 8097A738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s index 90b1439a88..4622a9e198 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s @@ -11,5 +11,3 @@ glabel func_8097A73C /* 01E30 8097A760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E34 8097A764 03E00008 */ jr $ra /* 01E38 8097A768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s index 6c37cf2bec..09df6c1eae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s @@ -11,5 +11,3 @@ glabel func_8097A76C /* 01E60 8097A790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E64 8097A794 03E00008 */ jr $ra /* 01E68 8097A798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s index 6657286807..26878fee2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s @@ -8,5 +8,3 @@ glabel func_8097A79C /* 01E84 8097A7B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E88 8097A7B8 03E00008 */ jr $ra /* 01E8C 8097A7BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s index 1f1ba14994..de1c3eab71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s @@ -8,5 +8,3 @@ glabel func_8097A7C0 /* 01EA8 8097A7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01EAC 8097A7DC 03E00008 */ jr $ra /* 01EB0 8097A7E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s index e88904e283..7d4dc7593b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s @@ -11,5 +11,3 @@ glabel func_8097A7E4 /* 01ED8 8097A808 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EDC 8097A80C 03E00008 */ jr $ra /* 01EE0 8097A810 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s index b0c2cf3f47..23debe9110 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s @@ -31,5 +31,3 @@ glabel func_8097A814 /* 01F54 8097A884 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F58 8097A888 03E00008 */ jr $ra /* 01F5C 8097A88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s index 2f09d78a92..c2b1f67948 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s @@ -19,5 +19,3 @@ glabel func_8097A890 /* 01FA0 8097A8D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FA4 8097A8D4 03E00008 */ jr $ra /* 01FA8 8097A8D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A8DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A8DC.s index 34648879e9..35cc4db6f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A8DC.s @@ -13,5 +13,3 @@ glabel func_8097A8DC /* 01FD0 8097A900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FD4 8097A904 03E00008 */ jr $ra /* 01FD8 8097A908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s index e497a3bde9..ed4594fe3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s @@ -11,5 +11,3 @@ glabel func_8097A90C /* 02000 8097A930 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02004 8097A934 03E00008 */ jr $ra /* 02008 8097A938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s index 62f9243f56..e083b48767 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s @@ -11,5 +11,3 @@ glabel func_8097A93C /* 02030 8097A960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02034 8097A964 03E00008 */ jr $ra /* 02038 8097A968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s index fb334b453c..354a0772d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s @@ -8,5 +8,3 @@ glabel func_8097A96C /* 02054 8097A984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02058 8097A988 03E00008 */ jr $ra /* 0205C 8097A98C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s index 290f82464b..91d43794e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s @@ -8,5 +8,3 @@ glabel func_8097A990 /* 02078 8097A9A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0207C 8097A9AC 03E00008 */ jr $ra /* 02080 8097A9B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s index 09fb0267a6..05b551ac1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s @@ -11,5 +11,3 @@ glabel func_8097A9B4 /* 020A8 8097A9D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 020AC 8097A9DC 03E00008 */ jr $ra /* 020B0 8097A9E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s index d19d67a722..ba56d744be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s @@ -31,5 +31,3 @@ glabel func_8097A9E4 /* 02124 8097AA54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02128 8097AA58 03E00008 */ jr $ra /* 0212C 8097AA5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s index 1b8e0d3294..f88f00ce10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s @@ -19,5 +19,3 @@ glabel func_8097AA60 /* 02170 8097AAA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02174 8097AAA4 03E00008 */ jr $ra /* 02178 8097AAA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AAAC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AAAC.s index 64d09acf10..ceac2fb1dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AAAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AAAC.s @@ -13,5 +13,3 @@ glabel func_8097AAAC /* 021A0 8097AAD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021A4 8097AAD4 03E00008 */ jr $ra /* 021A8 8097AAD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s index eb4c040527..5a2495bfda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s @@ -11,5 +11,3 @@ glabel func_8097AADC /* 021D0 8097AB00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021D4 8097AB04 03E00008 */ jr $ra /* 021D8 8097AB08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s index 9010a71d9a..3eae982ee4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s @@ -11,5 +11,3 @@ glabel func_8097AB0C /* 02200 8097AB30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02204 8097AB34 03E00008 */ jr $ra /* 02208 8097AB38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s index 09b4e8e1b5..5bc86abb56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s @@ -8,5 +8,3 @@ glabel func_8097AB3C /* 02224 8097AB54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02228 8097AB58 03E00008 */ jr $ra /* 0222C 8097AB5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s index 8c639259af..d00f353439 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s @@ -8,5 +8,3 @@ glabel func_8097AB60 /* 02248 8097AB78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0224C 8097AB7C 03E00008 */ jr $ra /* 02250 8097AB80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s index 1d9f8acdd5..a34955c3ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s @@ -11,5 +11,3 @@ glabel func_8097AB84 /* 02278 8097ABA8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0227C 8097ABAC 03E00008 */ jr $ra /* 02280 8097ABB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s index e0027e441f..f420b14bc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s @@ -31,5 +31,3 @@ glabel func_8097ABB4 /* 022F4 8097AC24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 022F8 8097AC28 03E00008 */ jr $ra /* 022FC 8097AC2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s index 0a4041bdf2..1a1bcf5fe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s @@ -28,5 +28,3 @@ glabel func_8097AC30 /* 02360 8097AC90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02364 8097AC94 03E00008 */ jr $ra /* 02368 8097AC98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC9C.s index 1b27343371..5f775d43d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC9C.s @@ -19,5 +19,3 @@ glabel func_8097AC9C /* 023AC 8097ACDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023B0 8097ACE0 03E00008 */ jr $ra /* 023B4 8097ACE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ACE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ACE8.s index e0cd9b3222..2e21554c35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ACE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ACE8.s @@ -13,5 +13,3 @@ glabel func_8097ACE8 /* 023DC 8097AD0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023E0 8097AD10 03E00008 */ jr $ra /* 023E4 8097AD14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s index c8b1da000a..a94f2b2b14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s @@ -11,5 +11,3 @@ glabel func_8097AD18 /* 0240C 8097AD3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02410 8097AD40 03E00008 */ jr $ra /* 02414 8097AD44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s index 1e8c4c13e7..14fe2f7755 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s @@ -11,5 +11,3 @@ glabel func_8097AD48 /* 0243C 8097AD6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02440 8097AD70 03E00008 */ jr $ra /* 02444 8097AD74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s index 3deb1f845a..4a7a199f73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s @@ -8,5 +8,3 @@ glabel func_8097AD78 /* 02460 8097AD90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02464 8097AD94 03E00008 */ jr $ra /* 02468 8097AD98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s index 6a271bb815..ccd01c7810 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s @@ -8,5 +8,3 @@ glabel func_8097AD9C /* 02484 8097ADB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02488 8097ADB8 03E00008 */ jr $ra /* 0248C 8097ADBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s index f5e59422b3..73957e0c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s @@ -11,5 +11,3 @@ glabel func_8097ADC0 /* 024B4 8097ADE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024B8 8097ADE8 03E00008 */ jr $ra /* 024BC 8097ADEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s index 24eeb0b907..2d9116f702 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s @@ -17,5 +17,3 @@ glabel func_8097ADF0 /* 024FC 8097AE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02500 8097AE30 03E00008 */ jr $ra /* 02504 8097AE34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s index 8d2f61e723..6a462e7904 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s @@ -8,5 +8,3 @@ glabel func_8097AE38 /* 02520 8097AE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02524 8097AE54 03E00008 */ jr $ra /* 02528 8097AE58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s index 87b22ab2c5..44ac0a1af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s @@ -31,5 +31,3 @@ glabel func_8097AE5C /* 025A0 8097AED0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 025A4 8097AED4 03E00008 */ jr $ra /* 025A8 8097AED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEDC.s index 39628ed157..b69f7a5390 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEDC.s @@ -2,5 +2,3 @@ glabel func_8097AEDC /* 025AC 8097AEDC AFA40000 */ sw $a0, 0x0000($sp) /* 025B0 8097AEE0 03E00008 */ jr $ra /* 025B4 8097AEE4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s index 7f3975cd7e..aafe1fa97c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s @@ -103,5 +103,3 @@ glabel func_8097AEE8 /* 02744 8097B074 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02748 8097B078 03E00008 */ jr $ra /* 0274C 8097B07C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s index 6b32b92610..48dde65292 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s @@ -29,5 +29,3 @@ glabel func_8097B080 /* 027B0 8097B0E0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 027B4 8097B0E4 03E00008 */ jr $ra /* 027B8 8097B0E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B0EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B0EC.s index d5f42445e4..05852598e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B0EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B0EC.s @@ -14,5 +14,3 @@ glabel func_8097B0EC /* 027EC 8097B11C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 027F0 8097B120 03E00008 */ jr $ra /* 027F4 8097B124 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s index c695317528..a8aa671bf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8097C228 + .float 0.8 + +.text glabel func_8097B128 /* 027F8 8097B128 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 027FC 8097B12C AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,5 +40,3 @@ glabel func_8097B128 /* 02878 8097B1A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0287C 8097B1AC 03E00008 */ jr $ra /* 02880 8097B1B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s index 56172b7c4c..40c044e5b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s @@ -32,5 +32,3 @@ glabel func_8097B1B4 /* 028F0 8097B220 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028F4 8097B224 03E00008 */ jr $ra /* 028F8 8097B228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s index 6556a29ae7..0a880f3be3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s @@ -74,5 +74,3 @@ glabel func_8097B22C /* 02A04 8097B334 8FB10018 */ lw $s1, 0x0018($sp) /* 02A08 8097B338 03E00008 */ jr $ra /* 02A0C 8097B33C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s index 6414662713..cde1a84c95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s @@ -11,5 +11,3 @@ glabel func_8097B340 /* 02A34 8097B364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A38 8097B368 03E00008 */ jr $ra /* 02A3C 8097B36C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s index ebbdda129c..296f6fb2ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s @@ -11,5 +11,3 @@ glabel func_8097B370 /* 02A64 8097B394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A68 8097B398 03E00008 */ jr $ra /* 02A6C 8097B39C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s index 3c8cea1775..4c660b4ba4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s @@ -8,5 +8,3 @@ glabel func_8097B3A0 /* 02A88 8097B3B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A8C 8097B3BC 03E00008 */ jr $ra /* 02A90 8097B3C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s index 63cd9f7671..202a659323 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s @@ -31,5 +31,3 @@ glabel func_8097B3C4 /* 02B08 8097B438 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02B0C 8097B43C 03E00008 */ jr $ra /* 02B10 8097B440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B444.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B444.s index 424b50c726..b86661ce70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B444.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B444.s @@ -2,5 +2,3 @@ glabel func_8097B444 /* 02B14 8097B444 AFA40000 */ sw $a0, 0x0000($sp) /* 02B18 8097B448 03E00008 */ jr $ra /* 02B1C 8097B44C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s index d7e4286215..bbed9a3d3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s @@ -86,5 +86,3 @@ glabel func_8097B450 /* 02C68 8097B598 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02C6C 8097B59C 03E00008 */ jr $ra /* 02C70 8097B5A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s index 68cd89f51f..c03389363c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s @@ -29,5 +29,3 @@ glabel func_8097B5A4 /* 02CD4 8097B604 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02CD8 8097B608 03E00008 */ jr $ra /* 02CDC 8097B60C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B610.s index c3363941d6..cdabadf8d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B610.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B610.s @@ -32,5 +32,3 @@ glabel func_8097B610 /* 02D4C 8097B67C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D50 8097B680 03E00008 */ jr $ra /* 02D54 8097B684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B688.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B688.s index d3d92d2d1a..034e18c3d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B688.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B688.s @@ -14,5 +14,3 @@ glabel func_8097B688 /* 02D88 8097B6B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02D8C 8097B6BC 03E00008 */ jr $ra /* 02D90 8097B6C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s index 3cf88989d3..8fc0de9237 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8097C22C + .float 0.8 + +.text glabel func_8097B6C4 /* 02D94 8097B6C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02D98 8097B6C8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,5 +40,3 @@ glabel func_8097B6C4 /* 02E14 8097B744 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E18 8097B748 03E00008 */ jr $ra /* 02E1C 8097B74C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s index eb62865202..3160788d69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s @@ -74,5 +74,3 @@ glabel func_8097B750 /* 02F28 8097B858 8FB10018 */ lw $s1, 0x0018($sp) /* 02F2C 8097B85C 03E00008 */ jr $ra /* 02F30 8097B860 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s index 65f366109a..a782d64a89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s @@ -11,5 +11,3 @@ glabel func_8097B864 /* 02F58 8097B888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F5C 8097B88C 03E00008 */ jr $ra /* 02F60 8097B890 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s index 4dc83b8ea6..22439862bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s @@ -11,5 +11,3 @@ glabel func_8097B894 /* 02F88 8097B8B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F8C 8097B8BC 03E00008 */ jr $ra /* 02F90 8097B8C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s index 98c2e28369..0ed7b33f31 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s @@ -8,5 +8,3 @@ glabel func_8097B8C4 /* 02FAC 8097B8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02FB0 8097B8E0 03E00008 */ jr $ra /* 02FB4 8097B8E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s index cade261248..e85560c921 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s @@ -17,5 +17,3 @@ glabel func_8097B8E8 /* 02FF4 8097B924 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02FF8 8097B928 03E00008 */ jr $ra /* 02FFC 8097B92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B930.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B930.s index 12fd8f6b6f..cc76039464 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B930.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B930.s @@ -2,5 +2,3 @@ glabel func_8097B930 /* 03000 8097B930 AFA40000 */ sw $a0, 0x0000($sp) /* 03004 8097B934 03E00008 */ jr $ra /* 03008 8097B938 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B93C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B93C.s index 7216f981cd..7837370f13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B93C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B93C.s @@ -31,5 +31,3 @@ glabel func_8097B93C /* 03080 8097B9B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03084 8097B9B4 03E00008 */ jr $ra /* 03088 8097B9B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s index f122c4f43e..fff3817fdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8097C230 + .float 0.8 + +.text glabel func_8097B9BC /* 0308C 8097B9BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03090 8097B9C0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,5 +40,3 @@ glabel func_8097B9BC /* 0310C 8097BA3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03110 8097BA40 03E00008 */ jr $ra /* 03114 8097BA44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s index 8c079d9d97..6ed6366d38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s @@ -84,5 +84,3 @@ glabel func_8097BA48 /* 0323C 8097BB6C 8FB20020 */ lw $s2, 0x0020($sp) /* 03240 8097BB70 03E00008 */ jr $ra /* 03244 8097BB74 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s index 5142f9f2f9..dd720a039f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s @@ -11,5 +11,3 @@ glabel func_8097BB78 /* 0326C 8097BB9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03270 8097BBA0 03E00008 */ jr $ra /* 03274 8097BBA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s index 4ef8833eed..5a307540b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s @@ -11,5 +11,3 @@ glabel func_8097BBA8 /* 0329C 8097BBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032A0 8097BBD0 03E00008 */ jr $ra /* 032A4 8097BBD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s index 4b9cf98e1e..73b8ce64a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s @@ -8,5 +8,3 @@ glabel func_8097BBD8 /* 032C0 8097BBF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032C4 8097BBF4 03E00008 */ jr $ra /* 032C8 8097BBF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BD70.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BD70.s index 0a3546e0af..a853831994 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BD70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BD70.s @@ -2,5 +2,3 @@ glabel func_8097BD70 /* 03440 8097BD70 AFA40000 */ sw $a0, 0x0000($sp) /* 03444 8097BD74 03E00008 */ jr $ra /* 03448 8097BD78 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CDB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CDB0.s index 95fcf9f1ce..640df68c23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CDB0.s @@ -24,5 +24,3 @@ glabel func_8097CDB0 .L8097CE08: /* 00598 8097CE08 03E00008 */ jr $ra /* 0059C 8097CE0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s index a7f66901d1..2b0ab92ee5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s @@ -19,5 +19,3 @@ glabel DemoGt_Destroy /* 00038 8097D6A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0003C 8097D6AC 03E00008 */ jr $ra /* 00040 8097D6B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s index a40fe72a5e..06f4291094 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80982A3C + .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.text glabel DemoGt_Draw /* 04EE8 80982558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 04EEC 8098255C AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,4 +35,3 @@ glabel DemoGt_Draw /* 04F44 809825B4 00000000 */ nop /* 04F48 809825B8 00000000 */ nop /* 04F4C 809825BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s index 3a72959aed..dca52c2dd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s @@ -1,3 +1,38 @@ +.rdata +glabel D_809829FC + .asciz "Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.late_rodata +.late_rodata_alignment 4 +glabel jtbl_80982B54 +.word L809824A4 +.word L809824B4 +.word L809824C4 +.word L80982524 +.word L80982524 +.word L809824D4 +.word L809824E4 +.word L809824F4 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982524 +.word L80982504 +.word L80982514 + +.text glabel DemoGt_Init /* 04E04 80982474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 04E08 80982478 AFBF0014 */ sw $ra, 0x0014($sp) @@ -66,5 +101,3 @@ glabel L80982524 /* 04ED0 80982540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04ED4 80982544 03E00008 */ jr $ra /* 04ED8 80982548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s index 156fee7c9b..b8534883bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s @@ -1,3 +1,11 @@ +.rdata +glabel D_809829C0 + .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.balign 4 + +.text glabel DemoGt_Update /* 04DA8 80982418 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 04DAC 8098241C AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +34,3 @@ glabel DemoGt_Update /* 04DF8 80982468 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04DFC 8098246C 03E00008 */ jr $ra /* 04E00 80982470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s index 60b0d67a5e..cefc49da66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s @@ -7,5 +7,3 @@ glabel func_8097D6B4 /* 00058 8097D6C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0005C 8097D6CC 03E00008 */ jr $ra /* 00060 8097D6D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s index 3db58c5c66..8683111417 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s @@ -9,5 +9,3 @@ glabel func_8097D6D4 /* 0007C 8097D6EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00080 8097D6F0 03E00008 */ jr $ra /* 00084 8097D6F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s index 396acd6c8e..c5d52f5282 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s @@ -9,5 +9,3 @@ glabel func_8097D6F8 /* 000A0 8097D710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000A4 8097D714 03E00008 */ jr $ra /* 000A8 8097D718 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s index 47a8212105..55c47e74d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s @@ -11,5 +11,3 @@ glabel func_8097D71C /* 000D0 8097D740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D4 8097D744 03E00008 */ jr $ra /* 000D8 8097D748 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s index 99ab355ae6..863792cee4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982A74 + .float 0.2 + +.text glabel func_8097D74C /* 000DC 8097D74C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 000E0 8097D750 AFBF002C */ sw $ra, 0x002C($sp) @@ -35,5 +40,3 @@ glabel func_8097D74C /* 0015C 8097D7CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00160 8097D7D0 03E00008 */ jr $ra /* 00164 8097D7D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s index 47d1935ca8..e6fca6ae2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s @@ -103,5 +103,3 @@ glabel func_8097D7D8 /* 002E8 8097D958 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 002EC 8097D95C 03E00008 */ jr $ra /* 002F0 8097D960 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s index 4070b09fdc..e66badca30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s @@ -24,5 +24,3 @@ glabel func_8097D964 /* 00348 8097D9B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0034C 8097D9BC 03E00008 */ jr $ra /* 00350 8097D9C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s index 32a08004f4..7e5d17499f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s @@ -44,5 +44,3 @@ glabel func_8097D9C4 /* 003FC 8097DA6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00400 8097DA70 03E00008 */ jr $ra /* 00404 8097DA74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s index 613dba62de..823dea4949 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s @@ -19,5 +19,3 @@ glabel func_8097DA78 /* 0044C 8097DABC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00450 8097DAC0 03E00008 */ jr $ra /* 00454 8097DAC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s index ed0013cbc7..69ac04e0c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982A78 + .float 0.1 + +glabel D_80982A7C + .float 0.7 + +.text glabel func_8097DAC8 /* 00458 8097DAC8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 0045C 8097DACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -162,5 +170,3 @@ glabel func_8097DAC8 /* 006AC 8097DD1C 8FBE0098 */ lw $s8, 0x0098($sp) /* 006B0 8097DD20 03E00008 */ jr $ra /* 006B4 8097DD24 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s index d8e7dea079..3a91819b02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982A80 + .float 0.1 + +glabel D_80982A84 + .float 0.7 + +.text glabel func_8097DD28 /* 006B8 8097DD28 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 006BC 8097DD2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -156,5 +164,3 @@ glabel func_8097DD28 /* 008F4 8097DF64 8FBE0098 */ lw $s8, 0x0098($sp) /* 008F8 8097DF68 03E00008 */ jr $ra /* 008FC 8097DF6C 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s index 9d1ac632e3..8d186e0490 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80982A88 + .float 0.6 + +glabel D_80982A8C + .float 0.1 + +glabel D_80982A90 + .float 0.7 + +.text glabel func_8097DF70 /* 00900 8097DF70 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00904 8097DF74 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -163,5 +174,3 @@ glabel func_8097DF70 /* 00B58 8097E1C8 8FBE0098 */ lw $s8, 0x0098($sp) /* 00B5C 8097E1CC 03E00008 */ jr $ra /* 00B60 8097E1D0 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s index 9752c1e426..73c6c78cb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982A94 + .float 0.1 + +glabel D_80982A98 + .float 0.7 + +.text glabel func_8097E1D4 /* 00B64 8097E1D4 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00B68 8097E1D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -172,5 +180,3 @@ glabel func_8097E1D4 /* 00DD8 8097E448 8FBE0098 */ lw $s8, 0x0098($sp) /* 00DDC 8097E44C 03E00008 */ jr $ra /* 00DE0 8097E450 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s index 7df86d39a6..9bafe46f7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982A9C + .float 0.05 + +.text glabel func_8097E454 /* 00DE4 8097E454 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00DE8 8097E458 AFBF0064 */ sw $ra, 0x0064($sp) @@ -158,5 +163,3 @@ glabel func_8097E454 /* 01020 8097E690 8FBE0060 */ lw $s8, 0x0060($sp) /* 01024 8097E694 03E00008 */ jr $ra /* 01028 8097E698 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s index c6528107c0..08e0d05ab2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s @@ -8,5 +8,3 @@ glabel func_8097E69C .L8097E6B4: /* 01044 8097E6B4 03E00008 */ jr $ra /* 01048 8097E6B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s index b25738977b..8b4d667b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s @@ -18,5 +18,3 @@ glabel func_8097E6BC /* 01088 8097E6F8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 0108C 8097E6FC 03E00008 */ jr $ra /* 01090 8097E700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s index 57bf272360..84f0ca193b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s @@ -17,5 +17,3 @@ glabel func_8097E704 .L8097E73C: /* 010CC 8097E73C 03E00008 */ jr $ra /* 010D0 8097E740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s index c0696715ed..2a1a773365 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s @@ -56,5 +56,3 @@ glabel func_8097E744 /* 011A8 8097E818 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 011AC 8097E81C 03E00008 */ jr $ra /* 011B0 8097E820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s index c5c4d5803e..99163ebe74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s @@ -1,3 +1,29 @@ +.late_rodata +glabel D_80982AA0 + .float 0.1 + +glabel D_80982AA4 + .float 0.1 + +glabel D_80982AA8 + .float 0.1 + +glabel D_80982AAC + .float 0.1 + +glabel D_80982AB0 + .float 0.1 + +glabel D_80982AB4 + .float 0.1 + +glabel D_80982AB8 + .float 0.1 + +glabel D_80982ABC + .float 0.1 + +.text glabel func_8097E824 /* 011B4 8097E824 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 011B8 8097E828 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -346,5 +372,3 @@ glabel func_8097E824 /* 016E8 8097ED58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 016EC 8097ED5C 03E00008 */ jr $ra /* 016F0 8097ED60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s index 1e9a9271ee..db3edb1f97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s @@ -11,5 +11,3 @@ glabel func_8097ED64 /* 01718 8097ED88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0171C 8097ED8C 03E00008 */ jr $ra /* 01720 8097ED90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s index 2131425c0b..c765809e8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s @@ -18,5 +18,3 @@ glabel func_8097ED94 .L8097EDD0: /* 01760 8097EDD0 03E00008 */ jr $ra /* 01764 8097EDD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s index 675f72e530..905657ee67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s @@ -31,5 +31,3 @@ glabel func_8097EDD8 /* 017C8 8097EE38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017CC 8097EE3C 03E00008 */ jr $ra /* 017D0 8097EE40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s index 7aaf86d3bf..5ae88bda9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s @@ -27,5 +27,3 @@ glabel func_8097EE44 /* 0182C 8097EE9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01830 8097EEA0 03E00008 */ jr $ra /* 01834 8097EEA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s index 9c0d0c1fa0..42bfe38913 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s @@ -21,5 +21,3 @@ glabel func_8097EEA8 /* 01884 8097EEF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01888 8097EEF8 03E00008 */ jr $ra /* 0188C 8097EEFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s index 44afca3032..aee9f6cbe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s @@ -13,5 +13,3 @@ glabel func_8097EF00 /* 018B8 8097EF28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018BC 8097EF2C 03E00008 */ jr $ra /* 018C0 8097EF30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s index 4e05c7ffa4..1da9369116 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s @@ -2,5 +2,3 @@ glabel func_8097EF34 /* 018C4 8097EF34 AFA40000 */ sw $a0, 0x0000($sp) /* 018C8 8097EF38 03E00008 */ jr $ra /* 018CC 8097EF3C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s index d779fa449b..a2111a8d22 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80982AC0 + .float 679.0 + +glabel D_80982AC4 + .float 1700.0 + +glabel D_80982AC8 + .float 679.0 + +glabel D_80982ACC + .float 1700.0 + +.text glabel func_8097EF40 /* 018D0 8097EF40 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 018D4 8097EF44 3C0F8098 */ lui $t7, %hi(D_809825FC) ## $t7 = 80980000 @@ -92,5 +106,3 @@ glabel func_8097EF40 /* 01A30 8097F0A0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 01A34 8097F0A4 03E00008 */ jr $ra /* 01A38 8097F0A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s index 44baf9e821..ab7d05ba1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s @@ -62,5 +62,3 @@ glabel func_8097F0AC /* 01B20 8097F190 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01B24 8097F194 03E00008 */ jr $ra /* 01B28 8097F198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s index 7eefbd0d9b..674ad85137 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s @@ -14,5 +14,3 @@ glabel func_8097F19C /* 01B5C 8097F1CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B60 8097F1D0 03E00008 */ jr $ra /* 01B64 8097F1D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s index 63104045bd..59e2400175 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982AD0 + .float 0.001 + +glabel D_80982AD4 + .float 0.048 + +.text glabel func_8097F1D8 /* 01B68 8097F1D8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 01B6C 8097F1DC 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 @@ -42,5 +50,3 @@ glabel func_8097F1D8 .L8097F278: /* 01C08 8097F278 03E00008 */ jr $ra /* 01C0C 8097F27C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s index ac6dbc5e37..48fd55557f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s @@ -93,5 +93,3 @@ glabel func_8097F280 /* 01D70 8097F3E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D74 8097F3E4 03E00008 */ jr $ra /* 01D78 8097F3E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s index f85aca07f0..98675a64ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s @@ -15,5 +15,3 @@ glabel func_8097F3EC /* 01DAC 8097F41C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DB0 8097F420 03E00008 */ jr $ra /* 01DB4 8097F424 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s index 058d1c5213..d9c9cb65d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s @@ -27,5 +27,3 @@ glabel func_8097F428 /* 01E1C 8097F48C 8FB10018 */ lw $s1, 0x0018($sp) /* 01E20 8097F490 03E00008 */ jr $ra /* 01E24 8097F494 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s index 849bec3423..74b865e3e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s @@ -27,5 +27,3 @@ glabel func_8097F498 /* 01E8C 8097F4FC 8FB10018 */ lw $s1, 0x0018($sp) /* 01E90 8097F500 03E00008 */ jr $ra /* 01E94 8097F504 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s index bbbbfd3d78..202bfc9e1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80982780 + .asciz "../z_demo_gt_part1.c" + .balign 4 + +glabel D_80982798 + .asciz "../z_demo_gt_part1.c" + .balign 4 + +glabel D_809827B0 + .asciz "../z_demo_gt_part1.c" + .balign 4 + +.late_rodata +glabel D_80982AD8 + .float 9.58738019108e-05 + +.text glabel func_8097F508 /* 01E98 8097F508 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 01E9C 8097F50C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -261,5 +279,3 @@ glabel func_8097F508 /* 02288 8097F8F8 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 /* 0228C 8097F8FC 03E00008 */ jr $ra /* 02290 8097F900 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s index f8c5ebe1ba..a7ded0b614 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s @@ -22,5 +22,3 @@ glabel func_8097F904 /* 022E4 8097F954 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022E8 8097F958 03E00008 */ jr $ra /* 022EC 8097F95C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s index ba3c0404f5..0791471378 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s @@ -2,5 +2,3 @@ glabel func_8097F960 /* 022F0 8097F960 AFA40000 */ sw $a0, 0x0000($sp) /* 022F4 8097F964 03E00008 */ jr $ra /* 022F8 8097F968 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s index ac28593f81..1996658262 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s @@ -48,5 +48,3 @@ glabel func_8097F96C /* 023A0 8097FA10 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 023A4 8097FA14 03E00008 */ jr $ra /* 023A8 8097FA18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s index c265bbafcd..c0f016e5fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982ADC + .float 377.0 + +.text glabel func_8097FA1C /* 023AC 8097FA1C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 023B0 8097FA20 3C0F8098 */ lui $t7, %hi(D_80982618) ## $t7 = 80980000 @@ -58,5 +63,3 @@ glabel func_8097FA1C /* 02480 8097FAF0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02484 8097FAF4 03E00008 */ jr $ra /* 02488 8097FAF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s index ebfca73ef5..240745723b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s @@ -76,5 +76,3 @@ glabel func_8097FAFC /* 025A0 8097FC10 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 025A4 8097FC14 03E00008 */ jr $ra /* 025A8 8097FC18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s index c09bcddc92..00ff5f9042 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s @@ -51,5 +51,3 @@ glabel func_8097FC1C /* 02668 8097FCD8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0266C 8097FCDC 03E00008 */ jr $ra /* 02670 8097FCE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s index 80fba41db8..0acb447593 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982AE0 + .float 377.0 + +.text glabel func_8097FCE4 /* 02674 8097FCE4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02678 8097FCE8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -36,5 +41,3 @@ glabel func_8097FCE4 /* 026F4 8097FD64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 026F8 8097FD68 03E00008 */ jr $ra /* 026FC 8097FD6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s index 5d49615a7e..8946c5a52d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s @@ -26,5 +26,3 @@ glabel func_8097FD70 /* 02760 8097FDD0 8FB10018 */ lw $s1, 0x0018($sp) /* 02764 8097FDD4 03E00008 */ jr $ra /* 02768 8097FDD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s index 6a6aaa31f5..8ab73de01b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s @@ -65,5 +65,3 @@ glabel func_8097FDDC /* 0285C 8097FECC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02860 8097FED0 03E00008 */ jr $ra /* 02864 8097FED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s index 395d382077..4ce5f47e1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s @@ -15,5 +15,3 @@ glabel func_8097FED8 /* 02898 8097FF08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0289C 8097FF0C 03E00008 */ jr $ra /* 028A0 8097FF10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s index a7cc664f58..e4c331b6be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s @@ -17,5 +17,3 @@ glabel func_8097FF14 /* 028E0 8097FF50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028E4 8097FF54 03E00008 */ jr $ra /* 028E8 8097FF58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s index cdf49cd142..580c5bd47c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s @@ -15,5 +15,3 @@ glabel func_8097FF5C /* 02920 8097FF90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02924 8097FF94 03E00008 */ jr $ra /* 02928 8097FF98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s index 26588eabc8..b3bbb5f7b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809827C8 + .asciz "../z_demo_gt_part2.c" + .balign 4 + +glabel D_809827E0 + .asciz "../z_demo_gt_part2.c" + .balign 4 + +glabel D_809827F8 + .asciz "../z_demo_gt_part2.c" + .balign 4 + +.text glabel func_8097FF9C /* 0292C 8097FF9C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02930 8097FFA0 AFBF004C */ sw $ra, 0x004C($sp) @@ -92,5 +106,3 @@ glabel func_8097FF9C /* 02A94 80980104 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 02A98 80980108 03E00008 */ jr $ra /* 02A9C 8098010C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s index ba69871d05..35472158ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s @@ -22,5 +22,3 @@ glabel func_80980110 /* 02AF0 80980160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02AF4 80980164 03E00008 */ jr $ra /* 02AF8 80980168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s index 776453adef..9da8a533f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s @@ -2,5 +2,3 @@ glabel func_8098016C /* 02AFC 8098016C AFA40000 */ sw $a0, 0x0000($sp) /* 02B00 80980170 03E00008 */ jr $ra /* 02B04 80980174 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s index 6a3c56ebfb..4736ec4b09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s @@ -2,5 +2,3 @@ glabel func_80980178 /* 02B08 80980178 AFA40000 */ sw $a0, 0x0000($sp) /* 02B0C 8098017C 03E00008 */ jr $ra /* 02B10 80980180 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s index 596e535772..39dcf5eeaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s @@ -39,5 +39,3 @@ glabel func_80980184 /* 02B9C 8098020C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02BA0 80980210 03E00008 */ jr $ra /* 02BA4 80980214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s index e4af5a307f..5bfa1abf86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s @@ -39,5 +39,3 @@ glabel func_80980218 /* 02C30 809802A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02C34 809802A4 03E00008 */ jr $ra /* 02C38 809802A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s index 96daa93475..311bbcf5c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982AE4 + .float 1260.0 + +glabel D_80982AE8 + .float 323.0 + +.text glabel func_809802AC /* 02C3C 809802AC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02C40 809802B0 3C0F8098 */ lui $t7, %hi(D_80982664) ## $t7 = 80980000 @@ -48,5 +56,3 @@ glabel func_809802AC /* 02CF0 80980360 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02CF4 80980364 03E00008 */ jr $ra /* 02CF8 80980368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s index 0db23a0076..ce57ddfc3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s @@ -49,5 +49,3 @@ glabel func_8098036C /* 02DB4 80980424 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02DB8 80980428 03E00008 */ jr $ra /* 02DBC 8098042C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s index 322f4d8642..2b7559d2bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s @@ -54,5 +54,3 @@ glabel func_80980430 /* 02E88 809804F8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02E8C 809804FC 03E00008 */ jr $ra /* 02E90 80980500 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s index bf53cfc76b..1ec5d490ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982AEC + .float 830.0 + +.text glabel func_80980504 /* 02E94 80980504 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02E98 80980508 3C0F8098 */ lui $t7, %hi(D_80982688) ## $t7 = 80980000 @@ -54,5 +59,3 @@ glabel func_80980504 /* 02F5C 809805CC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 02F60 809805D0 03E00008 */ jr $ra /* 02F64 809805D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s index f7a5f5a98f..4d2d8be73e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982AF0 + .float 550.0 + +.text glabel func_809805D8 /* 02F68 809805D8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02F6C 809805DC 3C0F8098 */ lui $t7, %hi(D_80982694) ## $t7 = 80980000 @@ -58,5 +63,3 @@ glabel func_809805D8 /* 0303C 809806AC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 03040 809806B0 03E00008 */ jr $ra /* 03044 809806B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s index 6f6c1bcbb4..a218485ef9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s @@ -54,5 +54,3 @@ glabel func_809806B8 /* 03110 80980780 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 03114 80980784 03E00008 */ jr $ra /* 03118 80980788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s index 20ed84451f..bcda87ba89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s @@ -53,5 +53,3 @@ glabel func_8098078C /* 031E0 80980850 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 031E4 80980854 03E00008 */ jr $ra /* 031E8 80980858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s index 984c527b6c..8e7b6f26a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80982AF4 + .float 810.0 + +glabel D_80982AF8 + .float 1350.0 + +glabel D_80982AFC + .float 287.0 + +.text glabel func_8098085C /* 031EC 8098085C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 031F0 80980860 AFBF0014 */ sw $ra, 0x0014($sp) @@ -93,5 +104,3 @@ glabel func_8098085C /* 03344 809809B4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03348 809809B8 03E00008 */ jr $ra /* 0334C 809809BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s index 3dad98dcc4..a7242c4030 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982B00 + .float 790.0 + +.text glabel func_809809C0 /* 03350 809809C0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 03354 809809C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -73,5 +78,3 @@ glabel func_809809C0 /* 03458 80980AC8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 0345C 80980ACC 03E00008 */ jr $ra /* 03460 80980AD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s index b07c1b8f76..b5b1db6791 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982B04 + .float 790.0 + +.text glabel func_80980AD4 /* 03464 80980AD4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03468 80980AD8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -38,5 +43,3 @@ glabel func_80980AD4 /* 034EC 80980B5C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 034F0 80980B60 03E00008 */ jr $ra /* 034F4 80980B64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s index c3ccd760f0..1f5d9f09df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s @@ -38,5 +38,3 @@ glabel func_80980B68 /* 03580 80980BF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03584 80980BF4 03E00008 */ jr $ra /* 03588 80980BF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s index 296e29b6d4..f92c25555a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982B08 + .float 790.0 + +.text glabel func_80980BFC /* 0358C 80980BFC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03590 80980C00 AFBF0014 */ sw $ra, 0x0014($sp) @@ -38,5 +43,3 @@ glabel func_80980BFC /* 03614 80980C84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03618 80980C88 03E00008 */ jr $ra /* 0361C 80980C8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s index 335d527713..763075aedb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s @@ -56,5 +56,3 @@ glabel func_80980C90 /* 036F8 80980D68 8FB10018 */ lw $s1, 0x0018($sp) /* 036FC 80980D6C 03E00008 */ jr $ra /* 03700 80980D70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s index cbfad4a246..2993732e3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s @@ -15,5 +15,3 @@ glabel func_80980D74 /* 03734 80980DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03738 80980DA8 03E00008 */ jr $ra /* 0373C 80980DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s index 7681da6ef1..af5af6717e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s @@ -15,5 +15,3 @@ glabel func_80980DB0 /* 03774 80980DE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03778 80980DE8 03E00008 */ jr $ra /* 0377C 80980DEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s index 89126a5c9b..d9704fbdf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s @@ -12,5 +12,3 @@ glabel func_80980DF0 /* 037A8 80980E18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 037AC 80980E1C 03E00008 */ jr $ra /* 037B0 80980E20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s index 23aa674616..42b78d4157 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80982810 + .asciz "../z_demo_gt_part3.c" + .balign 4 + +glabel D_80982828 + .asciz "../z_demo_gt_part3.c" + .balign 4 + +glabel D_80982840 + .asciz "../z_demo_gt_part3.c" + .balign 4 + +.text glabel func_80980E24 /* 037B4 80980E24 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 037B8 80980E28 AFBF001C */ sw $ra, 0x001C($sp) @@ -54,5 +68,3 @@ glabel func_80980E24 /* 03884 80980EF4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 03888 80980EF8 03E00008 */ jr $ra /* 0388C 80980EFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s index 91f3b8c9f2..e851c73cac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s @@ -21,5 +21,3 @@ glabel func_80980F00 /* 038DC 80980F4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 038E0 80980F50 03E00008 */ jr $ra /* 038E4 80980F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s index 4b7632f859..99d31b6a0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s @@ -13,5 +13,3 @@ glabel func_80980F58 /* 03910 80980F80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03914 80980F84 03E00008 */ jr $ra /* 03918 80980F88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s index c0c6e8857d..7d2d70ed52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80982B0C + .float 2100.0 + +.text glabel func_80980F8C /* 0391C 80980F8C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 03920 80980F90 AFBF0024 */ sw $ra, 0x0024($sp) @@ -44,5 +49,3 @@ glabel func_80980F8C /* 039C0 80981030 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 039C4 80981034 03E00008 */ jr $ra /* 039C8 80981038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s index 7f34948d1a..35a1806043 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s @@ -26,5 +26,3 @@ glabel func_8098103C /* 03A24 80981094 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A28 80981098 03E00008 */ jr $ra /* 03A2C 8098109C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s index 1f51737a25..3a02ef056a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s @@ -15,5 +15,3 @@ glabel func_809810A0 /* 03A64 809810D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A68 809810D8 03E00008 */ jr $ra /* 03A6C 809810DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s index c541ad7f22..e7973b3c56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s @@ -12,5 +12,3 @@ glabel func_809810E0 /* 03A98 80981108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A9C 8098110C 03E00008 */ jr $ra /* 03AA0 80981110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s index bd7fc483d2..67918ab59b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982B10 + .float 0.001 + +glabel D_80982B14 + .float 0.048 + +.text glabel func_80981114 /* 03AA4 80981114 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03AA8 80981118 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 @@ -38,5 +46,3 @@ glabel func_80981114 .L809811A4: /* 03B34 809811A4 03E00008 */ jr $ra /* 03B38 809811A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s index 5b52337e93..6708df03cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80982858 + .asciz "../z_demo_gt_part4_1.c" + .balign 4 + +glabel D_80982870 + .asciz "../z_demo_gt_part4_1.c" + .balign 4 + +glabel D_80982888 + .asciz "../z_demo_gt_part4_1.c" + .balign 4 + +.late_rodata +glabel D_80982B18 + .float 9.58738019108e-05 + +.text glabel func_809811AC /* 03B3C 809811AC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 03B40 809811B0 AFBF001C */ sw $ra, 0x001C($sp) @@ -144,5 +162,3 @@ glabel func_809811AC /* 03D50 809813C0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 03D54 809813C4 03E00008 */ jr $ra /* 03D58 809813C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s index 44f2935192..12a43baa93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s @@ -21,5 +21,3 @@ glabel func_809813CC /* 03DA8 80981418 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03DAC 8098141C 03E00008 */ jr $ra /* 03DB0 80981420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s index 540278cffc..1a98638a86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s @@ -13,5 +13,3 @@ glabel func_80981424 /* 03DDC 8098144C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03DE0 80981450 03E00008 */ jr $ra /* 03DE4 80981454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s index 6c564872e7..238a8ed9b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982B1C + .float 1170.0 + +glabel D_80982B20 + .float -1100.0 + +.text glabel func_80981458 /* 03DE8 80981458 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 03DEC 8098145C AFBF0024 */ sw $ra, 0x0024($sp) @@ -53,5 +61,3 @@ glabel func_80981458 /* 03EA8 80981518 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 03EAC 8098151C 03E00008 */ jr $ra /* 03EB0 80981520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s index 913154868b..f8c620e750 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s @@ -26,5 +26,3 @@ glabel func_80981524 /* 03F0C 8098157C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F10 80981580 03E00008 */ jr $ra /* 03F14 80981584 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s index 4a56a0d92b..1a25d0c808 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s @@ -15,5 +15,3 @@ glabel func_80981588 /* 03F4C 809815BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F50 809815C0 03E00008 */ jr $ra /* 03F54 809815C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s index d89aa112f6..9990f1fae3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s @@ -12,5 +12,3 @@ glabel func_809815C8 /* 03F80 809815F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F84 809815F4 03E00008 */ jr $ra /* 03F88 809815F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s index 494bb289e9..801aeb9c67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982B24 + .float 0.001 + +glabel D_80982B28 + .float 0.048 + +.text glabel func_809815FC /* 03F8C 809815FC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03F90 80981600 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 @@ -38,5 +46,3 @@ glabel func_809815FC .L8098168C: /* 0401C 8098168C 03E00008 */ jr $ra /* 04020 80981690 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s index 61ec8460a8..f96103224d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809828A0 + .asciz "../z_demo_gt_part4_2.c" + .balign 4 + +glabel D_809828B8 + .asciz "../z_demo_gt_part4_2.c" + .balign 4 + +glabel D_809828D0 + .asciz "../z_demo_gt_part4_2.c" + .balign 4 + +.late_rodata +glabel D_80982B2C + .float 9.58738019108e-05 + +.text glabel func_80981694 /* 04024 80981694 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 04028 80981698 AFBF001C */ sw $ra, 0x001C($sp) @@ -139,5 +157,3 @@ glabel func_80981694 /* 04228 80981898 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0422C 8098189C 03E00008 */ jr $ra /* 04230 809818A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s index a163fa023d..0f176094ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s @@ -21,5 +21,3 @@ glabel func_809818A4 /* 04280 809818F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04284 809818F4 03E00008 */ jr $ra /* 04288 809818F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s index 9b01ee66ab..1ae597f18c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s @@ -13,5 +13,3 @@ glabel func_809818FC /* 042B4 80981924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 042B8 80981928 03E00008 */ jr $ra /* 042BC 8098192C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s index d1eeaaab99..196e424d13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s @@ -26,5 +26,3 @@ glabel func_80981930 /* 04318 80981988 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0431C 8098198C 03E00008 */ jr $ra /* 04320 80981990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s index 429641f035..a4606d4f09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s @@ -15,5 +15,3 @@ glabel func_80981994 /* 04358 809819C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0435C 809819CC 03E00008 */ jr $ra /* 04360 809819D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s index a5986c5fdd..db61d2faa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s @@ -12,5 +12,3 @@ glabel func_809819D4 /* 0438C 809819FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04390 80981A00 03E00008 */ jr $ra /* 04394 80981A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s index 4ff89b91a9..a976e4f118 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982B30 + .float 0.001 + +glabel D_80982B34 + .float 0.005 + +.text glabel func_80981A08 /* 04398 80981A08 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 0439C 80981A0C 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 @@ -38,5 +46,3 @@ glabel func_80981A08 .L80981A98: /* 04428 80981A98 03E00008 */ jr $ra /* 0442C 80981A9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s index cc0d827541..4f2b647fd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809828E8 + .asciz "../z_demo_gt_part4_3.c" + .balign 4 + +glabel D_80982900 + .asciz "../z_demo_gt_part4_3.c" + .balign 4 + +glabel D_80982918 + .asciz "../z_demo_gt_part4_3.c" + .balign 4 + +.late_rodata +glabel D_80982B38 + .float 9.58738019108e-05 + +.text glabel func_80981AA0 /* 04430 80981AA0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 04434 80981AA4 AFBF001C */ sw $ra, 0x001C($sp) @@ -131,5 +149,3 @@ glabel func_80981AA0 /* 04618 80981C88 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0461C 80981C8C 03E00008 */ jr $ra /* 04620 80981C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s index e8c2aac42f..bc49fbdea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s @@ -21,5 +21,3 @@ glabel func_80981C94 /* 04670 80981CE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04674 80981CE4 03E00008 */ jr $ra /* 04678 80981CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s index 89cd054329..78d73b8729 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s @@ -13,5 +13,3 @@ glabel func_80981CEC /* 046A4 80981D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 046A8 80981D18 03E00008 */ jr $ra /* 046AC 80981D1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s index 54c6ff6d8e..c9e9d30b8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982B3C + .float 0.001 + +glabel D_80982B40 + .float 0.048 + +.text glabel func_80981D20 /* 046B0 80981D20 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 046B4 80981D24 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 @@ -42,5 +50,3 @@ glabel func_80981D20 .L80981DC0: /* 04750 80981DC0 03E00008 */ jr $ra /* 04754 80981DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s index 29c98a556e..8ddf3d2439 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s @@ -15,5 +15,3 @@ glabel func_80981DC8 /* 04788 80981DF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0478C 80981DFC 03E00008 */ jr $ra /* 04790 80981E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s index 0a5f1286e2..2c35af6dfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s @@ -15,5 +15,3 @@ glabel func_80981E04 /* 047C8 80981E38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 047CC 80981E3C 03E00008 */ jr $ra /* 047D0 80981E40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s index f1dfa4c2f0..dbecb8e819 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s @@ -15,5 +15,3 @@ glabel func_80981E44 /* 04808 80981E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0480C 80981E7C 03E00008 */ jr $ra /* 04810 80981E80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s index 649ac670d6..aea26f7f76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80982930 + .asciz "../z_demo_gt_part5.c" + .balign 4 + +glabel D_80982948 + .asciz "../z_demo_gt_part5.c" + .balign 4 + +glabel D_80982960 + .asciz "../z_demo_gt_part5.c" + .balign 4 + +.late_rodata +glabel D_80982B44 + .float 9.58738019108e-05 + +.text glabel func_80981E84 /* 04814 80981E84 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 04818 80981E88 AFBF001C */ sw $ra, 0x001C($sp) @@ -122,5 +140,3 @@ glabel func_80981E84 /* 049D8 80982048 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 049DC 8098204C 03E00008 */ jr $ra /* 049E0 80982050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s index 1ce7d6e596..56c2aa5868 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s @@ -21,5 +21,3 @@ glabel func_80982054 /* 04A30 809820A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04A34 809820A4 03E00008 */ jr $ra /* 04A38 809820A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s index 5188466be0..55dadd57fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s @@ -13,5 +13,3 @@ glabel func_809820AC /* 04A64 809820D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04A68 809820D8 03E00008 */ jr $ra /* 04A6C 809820DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s index 6290bcbd49..9fd76a0eee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80982B48 + .float 0.001 + +glabel D_80982B4C + .float 0.048 + +.text glabel func_809820E0 /* 04A70 809820E0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 04A74 809820E4 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 @@ -42,5 +50,3 @@ glabel func_809820E0 .L80982180: /* 04B10 80982180 03E00008 */ jr $ra /* 04B14 80982184 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s index 94b37dbd6f..d79751c02f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s @@ -15,5 +15,3 @@ glabel func_80982188 /* 04B48 809821B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B4C 809821BC 03E00008 */ jr $ra /* 04B50 809821C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s index f59c3909b1..411fed9e3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s @@ -15,5 +15,3 @@ glabel func_809821C4 /* 04B88 809821F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B8C 809821FC 03E00008 */ jr $ra /* 04B90 80982200 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s index 87f94203c7..6c27cbf2a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s @@ -15,5 +15,3 @@ glabel func_80982204 /* 04BC8 80982238 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04BCC 8098223C 03E00008 */ jr $ra /* 04BD0 80982240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s index 2d66168225..333aa75b8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80982978 + .asciz "../z_demo_gt_part6.c" + .balign 4 + +glabel D_80982990 + .asciz "../z_demo_gt_part6.c" + .balign 4 + +glabel D_809829A8 + .asciz "../z_demo_gt_part6.c" + .balign 4 + +.late_rodata +glabel D_80982B50 + .float 9.58738019108e-05 + +.text glabel func_80982244 /* 04BD4 80982244 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 04BD8 80982248 AFBF001C */ sw $ra, 0x001C($sp) @@ -123,5 +141,3 @@ glabel func_80982244 /* 04D9C 8098240C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 04DA0 80982410 03E00008 */ jr $ra /* 04DA4 80982414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s index 133d4c8334..c022fe8b70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s @@ -2,5 +2,3 @@ glabel func_8098254C /* 04EDC 8098254C AFA40000 */ sw $a0, 0x0000($sp) /* 04EE0 80982550 03E00008 */ jr $ra /* 04EE4 80982554 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s index 31e0bfc585..9d130718f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s @@ -2,5 +2,3 @@ glabel DemoIk_Destroy /* 00000 80983300 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80983304 03E00008 */ jr $ra /* 00008 80983308 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s index ec2f7adbc1..291cb7a52a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809849A8 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoIk_Draw /* 0131C 8098461C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01320 80984620 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel DemoIk_Draw /* 0136C 8098466C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01370 80984670 03E00008 */ jr $ra /* 01374 80984674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s index 2d2a2f9339..a8b6f4f19e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s @@ -24,4 +24,3 @@ glabel DemoIk_Init /* 013C4 809846C4 00000000 */ nop /* 013C8 809846C8 00000000 */ nop /* 013CC 809846CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s index d5f0dc3857..c1d15ecc3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s @@ -1,3 +1,11 @@ +.rdata +glabel D_8098496C + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.balign 4 + +.text glabel DemoIk_Update /* 012B4 809845B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 012B8 809845B8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +34,3 @@ glabel DemoIk_Update /* 01304 80984604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01308 80984608 03E00008 */ jr $ra /* 0130C 8098460C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s index 316f6309cc..337d754c1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s @@ -17,5 +17,3 @@ glabel func_8098330C /* 00048 80983348 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0004C 8098334C 03E00008 */ jr $ra /* 00050 80983350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s index d405ecad06..86b974bc5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s @@ -8,5 +8,3 @@ glabel func_80983354 /* 00068 80983368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0006C 8098336C 03E00008 */ jr $ra /* 00070 80983370 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s index 22d96bdae2..a1b16037b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s @@ -9,5 +9,3 @@ glabel func_80983374 .L80983390: /* 00090 80983390 03E00008 */ jr $ra /* 00094 80983394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s index d0cdacffc7..5280981b1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s @@ -17,5 +17,3 @@ glabel func_80983398 .L809833D0: /* 000D0 809833D0 03E00008 */ jr $ra /* 000D4 809833D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s index eb0de7523a..5b92c87f23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s @@ -15,5 +15,3 @@ glabel func_809833D8 /* 0010C 8098340C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00110 80983410 03E00008 */ jr $ra /* 00114 80983414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s index e32e394a39..0fdb312d52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s @@ -3,5 +3,3 @@ glabel func_80983418 /* 0011C 8098341C 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 00120 80983420 03E00008 */ jr $ra /* 00124 80983424 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s index d7cd848789..cad682bf0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s @@ -1,5 +1,3 @@ glabel func_80983428 /* 00128 80983428 03E00008 */ jr $ra /* 0012C 8098342C C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s index 6d8f1ac3eb..bba0b05011 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s @@ -42,5 +42,3 @@ glabel func_80983430 /* 001CC 809834CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001D0 809834D0 03E00008 */ jr $ra /* 001D4 809834D4 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s index d5b53e14e5..2234d033f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s @@ -11,5 +11,3 @@ glabel func_809834D8 .L809834F8: /* 001F8 809834F8 03E00008 */ jr $ra /* 001FC 809834FC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000007 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s index 9e3fa7ee3b..d4bb5d26f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s @@ -70,5 +70,3 @@ glabel func_80983500 /* 002F0 809835F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002F4 809835F4 03E00008 */ jr $ra /* 002F8 809835F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s index 30890d6c9f..3b1c865a60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s @@ -109,5 +109,3 @@ glabel func_809835FC /* 00494 80983794 8FB60060 */ lw $s6, 0x0060($sp) /* 00498 80983798 03E00008 */ jr $ra /* 0049C 8098379C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s index f0abffb703..d15397110e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s @@ -32,5 +32,3 @@ glabel func_809837A0 /* 00514 80983814 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00518 80983818 03E00008 */ jr $ra /* 0051C 8098381C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s index cd7db76bb9..e49f5be008 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s @@ -78,5 +78,3 @@ glabel func_80983820 /* 00630 80983930 8FB10028 */ lw $s1, 0x0028($sp) /* 00634 80983934 03E00008 */ jr $ra /* 00638 80983938 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s index 576c4e0fb8..64cdf19cb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s @@ -3,5 +3,3 @@ glabel func_8098393C /* 00640 80983940 AC8001AC */ sw $zero, 0x01AC($a0) ## 000001AC /* 00644 80983944 03E00008 */ jr $ra /* 00648 80983948 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s index 6043e488d6..c52989f6a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s @@ -23,5 +23,3 @@ glabel func_8098394C /* 006A0 809839A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006A4 809839A4 03E00008 */ jr $ra /* 006A8 809839A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s index b94086b255..c5bdf555ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s @@ -8,5 +8,3 @@ glabel func_809839AC /* 006C4 809839C4 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 /* 006C8 809839C8 03E00008 */ jr $ra /* 006CC 809839CC E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s index b6cca445a3..f0276e6a99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809847B0 + .asciz "Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.balign 4 + +.late_rodata +glabel jtbl_809849E0 +.word L80983A3C +.word L80983A4C +.word L80983A60 +.word L80983A70 +.word L80983A88 +.word L80983A88 +.word 0x00000000, 0x00000000 + +.text glabel func_809839D0 /* 006D0 809839D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006D4 809839D4 AFB00018 */ sw $s0, 0x0018($sp) @@ -62,5 +80,3 @@ glabel L80983A88 /* 00798 80983A98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0079C 80983A9C 03E00008 */ jr $ra /* 007A0 80983AA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s index 65519e991e..096c23f662 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s @@ -7,5 +7,3 @@ glabel func_80983AA4 /* 007B8 80983AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007BC 80983ABC 03E00008 */ jr $ra /* 007C0 80983AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s index b936ceb8b0..a4ba4a01f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s @@ -11,5 +11,3 @@ glabel func_80983AC4 /* 007E8 80983AE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007EC 80983AEC 03E00008 */ jr $ra /* 007F0 80983AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s index 5e563b672f..3dd2a679d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s @@ -24,5 +24,3 @@ glabel func_80983AF4 /* 0084C 80983B4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00850 80983B50 03E00008 */ jr $ra /* 00854 80983B54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s index 2922d30d51..fc97129a04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809847E4 + .asciz "../z_demo_ik_inArmer.c" + .balign 4 + +glabel D_809847FC + .asciz "../z_demo_ik_inArmer.c" + .balign 4 + +glabel D_80984814 + .asciz "../z_demo_ik_inArmer.c" + .balign 4 + +glabel D_8098482C + .asciz "../z_demo_ik_inArmer.c" + .balign 4 + +.text glabel func_80983B58 /* 00858 80983B58 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0085C 80983B5C AFBF001C */ sw $ra, 0x001C($sp) @@ -83,5 +101,3 @@ glabel func_80983B58 /* 00990 80983C90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00994 80983C94 03E00008 */ jr $ra /* 00998 80983C98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s index 7745b6a11b..6f080bca73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80984844 + .asciz "../z_demo_ik_inArmer.c" + .balign 4 + +glabel D_8098485C + .asciz "../z_demo_ik_inArmer.c" + .balign 4 + +.text glabel func_80983C9C /* 0099C 80983C9C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 009A0 80983CA0 AFBF002C */ sw $ra, 0x002C($sp) @@ -99,5 +109,3 @@ glabel func_80983C9C /* 00B1C 80983E1C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00B20 80983E20 03E00008 */ jr $ra /* 00B24 80983E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s index 7a0ae3046d..388bca5489 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s @@ -72,5 +72,3 @@ glabel func_80983E28 /* 00C24 80983F24 8FB00024 */ lw $s0, 0x0024($sp) /* 00C28 80983F28 03E00008 */ jr $ra /* 00C2C 80983F2C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s index 18543789fc..99281f1f8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s @@ -24,5 +24,3 @@ glabel func_80983F30 /* 00C80 80983F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C84 80983F84 03E00008 */ jr $ra /* 00C88 80983F88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s index 51ad388224..5e9b998355 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s @@ -22,5 +22,3 @@ glabel func_80983F8C /* 00CD0 80983FD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CD4 80983FD4 03E00008 */ jr $ra /* 00CD8 80983FD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s index 7d9bd719e4..35319c9d7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s @@ -3,5 +3,3 @@ glabel func_80983FDC /* 00CE0 80983FE0 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 00CE4 80983FE4 03E00008 */ jr $ra /* 00CE8 80983FE8 AC8001AC */ sw $zero, 0x01AC($a0) ## 000001AC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s index 9ea32702cb..3df8a2d491 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s @@ -15,5 +15,3 @@ glabel func_80983FEC /* 00D20 80984020 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D24 80984024 03E00008 */ jr $ra /* 00D28 80984028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s index 0bfc87f4f3..412ee5dd17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s @@ -6,5 +6,3 @@ glabel func_8098402C /* 00D3C 8098403C AC8F01AC */ sw $t7, 0x01AC($a0) ## 000001AC /* 00D40 80984040 03E00008 */ jr $ra /* 00D44 80984044 E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s index f6b86fc6a5..04b427b19a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80984874 + .asciz "Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_80984048 /* 00D48 80984048 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00D4C 8098404C AFB00018 */ sw $s0, 0x0018($sp) @@ -63,5 +69,3 @@ glabel func_80984048 /* 00E18 80984118 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E1C 8098411C 03E00008 */ jr $ra /* 00E20 80984120 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s index 19954352b7..69b99b51f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s @@ -7,5 +7,3 @@ glabel func_80984124 /* 00E38 80984138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E3C 8098413C 03E00008 */ jr $ra /* 00E40 80984140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s index 38f7585e35..6cd402a5e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s @@ -7,5 +7,3 @@ glabel func_80984144 /* 00E58 80984158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E5C 8098415C 03E00008 */ jr $ra /* 00E60 80984160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s index a1478e6405..54cca8c817 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s @@ -13,5 +13,3 @@ glabel func_80984164 /* 00E90 80984190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E94 80984194 03E00008 */ jr $ra /* 00E98 80984198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s index 33411f55ce..47fec97599 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s @@ -23,5 +23,3 @@ glabel func_8098419C /* 00EE8 809841E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00EEC 809841EC 03E00008 */ jr $ra /* 00EF0 809841F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s index c126f09881..5bc7486a42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s @@ -1,3 +1,29 @@ +.rdata +glabel D_809848AC + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +glabel D_809848C4 + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +glabel D_809848DC + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +glabel D_809848F4 + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +glabel D_8098490C + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +glabel D_80984924 + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +.text glabel func_809841F4 /* 00EF4 809841F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00EF8 809841F8 AFBF001C */ sw $ra, 0x001C($sp) @@ -142,5 +168,3 @@ glabel func_809841F4 /* 01110 80984410 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 01114 80984414 03E00008 */ jr $ra /* 01118 80984418 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s index c5cb91ea78..58d18ef8d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8098493C + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +glabel D_80984954 + .asciz "../z_demo_ik_inFace.c" + .balign 4 + +.text glabel func_8098441C /* 0111C 8098441C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01120 80984420 AFBF002C */ sw $ra, 0x002C($sp) @@ -101,5 +111,3 @@ glabel func_8098441C /* 012A8 809845A8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 012AC 809845AC 03E00008 */ jr $ra /* 012B0 809845B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s index 1997557b79..17ccfeef6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s @@ -2,5 +2,3 @@ glabel func_80984610 /* 01310 80984610 AFA40000 */ sw $a0, 0x0000($sp) /* 01314 80984614 03E00008 */ jr $ra /* 01318 80984618 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s index 16ee0a7a32..1ecc3d9eb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s @@ -7,5 +7,3 @@ glabel DemoIm_Destroy /* 02928 80987508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0292C 8098750C 03E00008 */ jr $ra /* 02930 80987510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s index ea3fea88d3..06a9d89880 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809889A0 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoIm_Draw /* 02BEC 809877CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02BF0 809877D0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -28,4 +34,3 @@ glabel DemoIm_Draw /* 02C44 80987824 00000000 */ nop /* 02C48 80987828 00000000 */ nop /* 02C4C 8098782C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s index e16cf3cb9c..5014887186 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_80988A04 +.word L80987470 +.word L80987484 +.word L80987498 +.word L809874AC +.word L809874C0 +.word 0x00000000, 0x00000000 + +.text glabel DemoIm_Init /* 027EC 809873CC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 027F0 809873D0 AFB10028 */ sw $s1, 0x0028($sp) @@ -81,5 +91,3 @@ glabel L809874C0 /* 02908 809874E8 8FB10028 */ lw $s1, 0x0028($sp) /* 0290C 809874EC 03E00008 */ jr $ra /* 02910 809874F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s index 450127ded0..72153601f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80988944 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoIm_Update /* 02790 80987370 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02794 80987374 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel DemoIm_Update /* 027E0 809873C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 027E4 809873C4 03E00008 */ jr $ra /* 027E8 809873C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s index 67ff688aeb..0ab9ed13f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s @@ -38,5 +38,3 @@ glabel func_80984BE0 /* 0007C 80984C5C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 80984C60 03E00008 */ jr $ra /* 00084 80984C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s index c7cca4599c..7fe7feb269 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s @@ -8,5 +8,3 @@ glabel func_80984C68 /* 000A0 80984C80 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 000A4 80984C84 03E00008 */ jr $ra /* 000A8 80984C88 E4840268 */ swc1 $f4, 0x0268($a0) ## 00000268 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s index 36d0b731b5..172d9c6710 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s @@ -32,5 +32,3 @@ glabel func_80984C8C /* 00114 80984CF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00118 80984CF8 03E00008 */ jr $ra /* 0011C 80984CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s index 9ab37f9f9e..e12d1a3edb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s @@ -19,5 +19,3 @@ glabel func_80984D00 /* 00160 80984D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00164 80984D44 03E00008 */ jr $ra /* 00168 80984D48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s index 092102c78a..11f3ac4bf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s @@ -10,5 +10,3 @@ glabel func_80984D4C /* 00188 80984D68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0018C 80984D6C 03E00008 */ jr $ra /* 00190 80984D70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s index 7655cb99c3..e17d36f839 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s @@ -18,5 +18,3 @@ glabel func_80984D74 /* 001CC 80984DAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001D0 80984DB0 03E00008 */ jr $ra /* 001D4 80984DB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s index 16094d4cc5..38309d4bc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s @@ -43,5 +43,3 @@ glabel func_80984DB8 /* 0026C 80984E4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00270 80984E50 03E00008 */ jr $ra /* 00274 80984E54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s index f9fa1d68f1..08cd86d9a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s @@ -47,5 +47,3 @@ glabel func_80984E58 /* 00324 80984F04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00328 80984F08 03E00008 */ jr $ra /* 0032C 80984F0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s index f3fe54f5eb..f9af979c53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s @@ -32,5 +32,3 @@ glabel func_80984F10 /* 003A8 80984F88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003AC 80984F8C 03E00008 */ jr $ra /* 003B0 80984F90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s index ef0f70fbbe..c1f584ed08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s @@ -32,5 +32,3 @@ glabel func_80984F94 /* 0042C 8098500C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00430 80985010 03E00008 */ jr $ra /* 00434 80985014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s index af56695744..73ef62762d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s @@ -17,5 +17,3 @@ glabel func_80985018 /* 00474 80985054 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00478 80985058 03E00008 */ jr $ra /* 0047C 8098505C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s index 69a580d467..487f3aae91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s @@ -8,5 +8,3 @@ glabel func_80985060 /* 00494 80985074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00498 80985078 03E00008 */ jr $ra /* 0049C 8098507C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s index c4bc7aeb4d..09a09f9eef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s @@ -8,5 +8,3 @@ glabel func_80985080 .L80985098: /* 004B8 80985098 03E00008 */ jr $ra /* 004BC 8098509C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s index d02acae150..66aafebe4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s @@ -18,5 +18,3 @@ glabel func_809850A0 /* 004FC 809850DC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00500 809850E0 03E00008 */ jr $ra /* 00504 809850E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s index 1c3fcdeabc..a33b3214a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s @@ -20,5 +20,3 @@ glabel func_809850E8 .L8098512C: /* 0054C 8098512C 03E00008 */ jr $ra /* 00550 80985130 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s index 49a21de86e..d24ecea9d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s @@ -20,5 +20,3 @@ glabel func_80985134 .L80985178: /* 00598 80985178 03E00008 */ jr $ra /* 0059C 8098517C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s index 922c0b5d3b..aa9e3426b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s @@ -32,5 +32,3 @@ glabel func_80985180 /* 00614 809851F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00618 809851F8 03E00008 */ jr $ra /* 0061C 809851FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s index 8062767b5d..e28982402f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s @@ -32,5 +32,3 @@ glabel func_80985200 /* 00694 80985274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00698 80985278 03E00008 */ jr $ra /* 0069C 8098527C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s index 7aee70c699..56d9fe3040 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s @@ -39,5 +39,3 @@ glabel func_80985280 /* 00724 80985304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00728 80985308 03E00008 */ jr $ra /* 0072C 8098530C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s index 81afe7a8f0..1a8f9e6c77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809889D8 + .word 0xC61C4000 + +.text glabel func_80985310 /* 00730 80985310 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00734 80985314 AFA50024 */ sw $a1, 0x0024($sp) @@ -17,5 +22,3 @@ glabel func_80985310 /* 0076C 8098534C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00770 80985350 03E00008 */ jr $ra /* 00774 80985354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s index 48f415071e..1fdd09c995 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s @@ -23,5 +23,3 @@ glabel func_80985358 /* 007C8 809853A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 007CC 809853AC 03E00008 */ jr $ra /* 007D0 809853B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s index 1ae6d9c40b..5bf24d1a53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s @@ -31,5 +31,3 @@ glabel func_809853B4 /* 00844 80985424 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00848 80985428 03E00008 */ jr $ra /* 0084C 8098542C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s index 58c33be917..93b605db30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809889DC + .word 0x42A6AAAB + +.text glabel func_80985430 /* 00850 80985430 AFA50004 */ sw $a1, 0x0004($sp) /* 00854 80985434 3C018099 */ lui $at, %hi(D_809889DC) ## $at = 80990000 @@ -6,5 +11,3 @@ glabel func_80985430 /* 00860 80985440 46062200 */ add.s $f8, $f4, $f6 /* 00864 80985444 03E00008 */ jr $ra /* 00868 80985448 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s index c7fa0863b9..e3b794b8ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s @@ -36,5 +36,3 @@ glabel func_8098544C /* 008F0 809854D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008F4 809854D4 03E00008 */ jr $ra /* 008F8 809854D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s index ef1e59cd07..0a40c7cd2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s @@ -43,5 +43,3 @@ glabel func_809854DC /* 00990 80985570 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00994 80985574 03E00008 */ jr $ra /* 00998 80985578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s index 60921acd12..48ab52a1ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s @@ -11,5 +11,3 @@ glabel func_8098557C .L809855A0: /* 009C0 809855A0 03E00008 */ jr $ra /* 009C4 809855A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s index 9f85dc9b8d..666cc3c37a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s @@ -40,5 +40,3 @@ glabel func_809855A8 /* 00A54 80985634 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A58 80985638 03E00008 */ jr $ra /* 00A5C 8098563C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s index 6ccc1b905e..ea984da9b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s @@ -29,5 +29,3 @@ glabel func_80985640 /* 00AC0 809856A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AC4 809856A4 03E00008 */ jr $ra /* 00AC8 809856A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s index 2855ab7e15..9978dad7f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s @@ -19,5 +19,3 @@ glabel func_809856AC /* 00B0C 809856EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B10 809856F0 03E00008 */ jr $ra /* 00B14 809856F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s index d2f8c10d83..aff586e7de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s @@ -7,5 +7,3 @@ glabel func_809856F8 /* 00B2C 8098570C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B30 80985710 03E00008 */ jr $ra /* 00B34 80985714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s index 851824a04a..8a082278ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s @@ -7,5 +7,3 @@ glabel func_80985718 /* 00B4C 8098572C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B50 80985730 03E00008 */ jr $ra /* 00B54 80985734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s index 403a000db0..5b209b356c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s @@ -13,5 +13,3 @@ glabel func_80985738 /* 00B84 80985764 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B88 80985768 03E00008 */ jr $ra /* 00B8C 8098576C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s index 6c329f94a3..49f50585ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s @@ -15,5 +15,3 @@ glabel func_80985770 /* 00BC4 809857A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BC8 809857A8 03E00008 */ jr $ra /* 00BCC 809857AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s index 2b8ae4fe7d..7d9547c953 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s @@ -15,5 +15,3 @@ glabel func_809857B0 /* 00C04 809857E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C08 809857E8 03E00008 */ jr $ra /* 00C0C 809857EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s index 8d21e2bbda..74c3736773 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s @@ -15,5 +15,3 @@ glabel func_809857F0 /* 00C44 80985824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C48 80985828 03E00008 */ jr $ra /* 00C4C 8098582C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s index cf9060987e..0f4462d3af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s @@ -11,5 +11,3 @@ glabel func_80985830 /* 00C74 80985854 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C78 80985858 03E00008 */ jr $ra /* 00C7C 8098585C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s index 53f62eb560..bb3a31d650 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s @@ -17,5 +17,3 @@ glabel func_80985860 /* 00CBC 8098589C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CC0 809858A0 03E00008 */ jr $ra /* 00CC4 809858A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s index c40e3c3306..a0c98d3050 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s @@ -7,5 +7,3 @@ glabel func_809858A8 /* 00CDC 809858BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CE0 809858C0 03E00008 */ jr $ra /* 00CE4 809858C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s index 55c6c8a346..dee201aac6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s @@ -32,5 +32,3 @@ glabel func_809858C8 /* 00D5C 8098593C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00D60 80985940 03E00008 */ jr $ra /* 00D64 80985944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s index 6095ac198e..7cbd00f27a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s @@ -40,5 +40,3 @@ glabel func_80985948 /* 00DF4 809859D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00DF8 809859D8 03E00008 */ jr $ra /* 00DFC 809859DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s index 95166b5531..a147466f0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s @@ -87,5 +87,3 @@ glabel func_809859E0 /* 00F48 80985B28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F4C 80985B2C 03E00008 */ jr $ra /* 00F50 80985B30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s index 747768ba5c..8cfd61fa21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s @@ -58,5 +58,3 @@ glabel func_80985B34 /* 01024 80985C04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01028 80985C08 03E00008 */ jr $ra /* 0102C 80985C0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s index 32fb1d1123..de22285c0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s @@ -11,5 +11,3 @@ glabel func_80985C10 /* 01054 80985C34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01058 80985C38 03E00008 */ jr $ra /* 0105C 80985C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s index c3b9f5fff7..d91b57df21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s @@ -20,5 +20,3 @@ glabel func_80985C40 /* 010A8 80985C88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 010AC 80985C8C 03E00008 */ jr $ra /* 010B0 80985C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s index d10dec0ff5..739207ca3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s @@ -20,5 +20,3 @@ glabel func_80985C94 /* 010FC 80985CDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01100 80985CE0 03E00008 */ jr $ra /* 01104 80985CE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s index 6ad258b256..2f2440f9be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80988810 + .asciz "../z_demo_im_inKenjyanomaDemo02.c" + .balign 4 + +glabel D_80988834 + .asciz "../z_demo_im_inKenjyanomaDemo02.c" + .balign 4 + +.text glabel func_80985CE8 /* 01108 80985CE8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0110C 80985CEC AFBF002C */ sw $ra, 0x002C($sp) @@ -93,5 +103,3 @@ glabel func_80985CE8 /* 01274 80985E54 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 01278 80985E58 03E00008 */ jr $ra /* 0127C 80985E5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s index 16a372d707..bdb28304cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s @@ -18,5 +18,3 @@ glabel func_80985E60 /* 012C0 80985EA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 012C4 80985EA4 03E00008 */ jr $ra /* 012C8 80985EA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s index cf47057e43..f7fb607129 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s @@ -19,5 +19,3 @@ glabel func_80985EAC /* 01308 80985EE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0130C 80985EEC 03E00008 */ jr $ra /* 01310 80985EF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s index 0e4a851f37..f90d46fc96 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s @@ -25,5 +25,3 @@ glabel func_80985EF4 /* 01368 80985F48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0136C 80985F4C 03E00008 */ jr $ra /* 01370 80985F50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s index a266bc6f7d..01f25769a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s @@ -3,5 +3,3 @@ glabel func_80985F54 /* 01378 80985F58 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 /* 0137C 80985F5C 03E00008 */ jr $ra /* 01380 80985F60 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s index d06303b8c0..1b3d0924c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s @@ -34,5 +34,3 @@ glabel func_80985F64 /* 013FC 80985FDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01400 80985FE0 03E00008 */ jr $ra /* 01404 80985FE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s index fd8567688f..de63c39e52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s @@ -27,5 +27,3 @@ glabel func_80985FE8 /* 01460 80986040 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01464 80986044 03E00008 */ jr $ra /* 01468 80986048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s index df08c022bd..839a5b2821 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s @@ -32,5 +32,3 @@ glabel func_8098604C /* 014DC 809860BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014E0 809860C0 03E00008 */ jr $ra /* 014E4 809860C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s index e46090c000..77143c55ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s @@ -4,5 +4,3 @@ glabel func_809860C8 /* 014F0 809860D0 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 /* 014F4 809860D4 03E00008 */ jr $ra /* 014F8 809860D8 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s index 7778730be3..ef335c8b46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s @@ -29,5 +29,3 @@ glabel func_809860DC /* 0155C 8098613C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01560 80986140 03E00008 */ jr $ra /* 01564 80986144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s index 6f98c9ea93..040ebecaf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s @@ -32,5 +32,3 @@ glabel func_80986148 /* 015D8 809861B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 015DC 809861BC 03E00008 */ jr $ra /* 015E0 809861C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s index 9b232dc892..dbfcdeefc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80988858 + .asciz "Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_809861C4 /* 015E4 809861C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 015E8 809861C8 AFB00028 */ sw $s0, 0x0028($sp) @@ -60,5 +66,3 @@ glabel func_809861C4 /* 016B0 80986290 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 016B4 80986294 03E00008 */ jr $ra /* 016B8 80986298 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s index d25311fabb..abd278e305 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s @@ -17,5 +17,3 @@ glabel func_8098629C /* 016F4 809862D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016F8 809862D8 03E00008 */ jr $ra /* 016FC 809862DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s index 0141459903..3430f9c316 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80988894 + .asciz "Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_809889E0 +.word L80986340 +.word L80986350 +.word L80986394 +.word L80986394 +.word L80986394 +.word L80986394 +.word L80986364 +.word L80986374 +.word L80986384 + +.text glabel func_809862E0 /* 01700 809862E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01704 809862E4 AFB00018 */ sw $s0, 0x0018($sp) @@ -64,5 +82,3 @@ glabel L80986394 /* 017D0 809863B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017D4 809863B4 03E00008 */ jr $ra /* 017D8 809863B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s index 2a5f13ab8e..24e4cbb97e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s @@ -7,5 +7,3 @@ glabel func_809863BC /* 017F0 809863D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017F4 809863D4 03E00008 */ jr $ra /* 017F8 809863D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s index 1ec8e59c6a..e70e9007a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s @@ -20,5 +20,3 @@ glabel func_809863DC /* 01844 80986424 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01848 80986428 03E00008 */ jr $ra /* 0184C 8098642C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s index 0e07c735fd..5cbc579a61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s @@ -24,5 +24,3 @@ glabel func_80986430 /* 018A8 80986488 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 018AC 8098648C 03E00008 */ jr $ra /* 018B0 80986490 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s index 3f5234cfcf..1bea6be1bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s @@ -15,5 +15,3 @@ glabel func_80986494 /* 018E8 809864C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018EC 809864CC 03E00008 */ jr $ra /* 018F0 809864D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s index 7a08f23e49..bbcc3eb687 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s @@ -21,5 +21,3 @@ glabel func_809864D4 /* 01940 80986520 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01944 80986524 03E00008 */ jr $ra /* 01948 80986528 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s index c86b0d589c..6f27c9a255 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s @@ -16,5 +16,3 @@ glabel func_8098652C /* 01984 80986564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01988 80986568 03E00008 */ jr $ra /* 0198C 8098656C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s index d2bc979726..f059af22cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s @@ -36,5 +36,3 @@ glabel func_80986570 /* 01A0C 809865EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A10 809865F0 03E00008 */ jr $ra /* 01A14 809865F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s index f4049f3e3a..06ebaa7adc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s @@ -71,5 +71,3 @@ glabel func_809865F8 /* 01B14 809866F4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01B18 809866F8 03E00008 */ jr $ra /* 01B1C 809866FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s index aeadaf35fb..a3d8922f79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s @@ -3,5 +3,3 @@ glabel func_80986700 /* 01B24 80986704 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 /* 01B28 80986708 03E00008 */ jr $ra /* 01B2C 8098670C AC800264 */ sw $zero, 0x0264($a0) ## 00000264 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s index 431e2c65e4..12202992c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s @@ -34,5 +34,3 @@ glabel func_80986710 /* 01BA8 80986788 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BAC 8098678C 03E00008 */ jr $ra /* 01BB0 80986790 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s index f95955e577..6ef3eec747 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s @@ -31,5 +31,3 @@ glabel func_80986794 /* 01C20 80986800 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C24 80986804 03E00008 */ jr $ra /* 01C28 80986808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s index 1105ffac28..6a0f83cf81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809888D0 + .asciz "Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_8098680C /* 01C2C 8098680C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01C30 80986810 AFB00018 */ sw $s0, 0x0018($sp) @@ -63,5 +69,3 @@ glabel func_8098680C /* 01CFC 809868DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D00 809868E0 03E00008 */ jr $ra /* 01D04 809868E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s index 205ebcc617..b4be5afdc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s @@ -7,5 +7,3 @@ glabel func_809868E8 /* 01D1C 809868FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D20 80986900 03E00008 */ jr $ra /* 01D24 80986904 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s index 7737cc0dc4..111fe3a0b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s @@ -15,5 +15,3 @@ glabel func_80986908 /* 01D5C 8098693C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D60 80986940 03E00008 */ jr $ra /* 01D64 80986944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s index 087ec563eb..9e4b0eec35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s @@ -25,5 +25,3 @@ glabel func_80986948 /* 01DC4 809869A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01DC8 809869A8 03E00008 */ jr $ra /* 01DCC 809869AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s index 43870ca422..dff1e7c09c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s @@ -17,5 +17,3 @@ glabel func_809869B0 /* 01E0C 809869EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E10 809869F0 03E00008 */ jr $ra /* 01E14 809869F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s index e446747db9..e226e56441 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s @@ -25,5 +25,3 @@ glabel func_809869F8 .L80986A54: /* 01E74 80986A54 03E00008 */ jr $ra /* 01E78 80986A58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s index f865d888c3..c2e6674d86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s @@ -29,5 +29,3 @@ glabel func_80986A5C /* 01EE4 80986AC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01EE8 80986AC8 03E00008 */ jr $ra /* 01EEC 80986ACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s index 140cee219a..bab5071cc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s @@ -24,5 +24,3 @@ glabel func_80986AD0 /* 01F40 80986B20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F44 80986B24 03E00008 */ jr $ra /* 01F48 80986B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s index 69a5091d93..0c7ce87739 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s @@ -29,5 +29,3 @@ glabel func_80986B2C /* 01FB4 80986B94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FB8 80986B98 03E00008 */ jr $ra /* 01FBC 80986B9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s index 0a252b7e05..a55dc40bd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s @@ -17,5 +17,3 @@ glabel func_80986BA0 /* 01FF8 80986BD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FFC 80986BDC 03E00008 */ jr $ra /* 02000 80986BE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s index 5426e2e665..e28d59b307 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s @@ -5,5 +5,3 @@ glabel func_80986BE4 .L80986BF0: /* 02010 80986BF0 03E00008 */ jr $ra /* 02014 80986BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s index 488f9d08aa..c91a2746bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s @@ -14,5 +14,3 @@ glabel func_80986BF8 .L80986C28: /* 02048 80986C28 03E00008 */ jr $ra /* 0204C 80986C2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s index 6b61ce6f23..97de7300df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s @@ -38,5 +38,3 @@ glabel func_80986C30 /* 020DC 80986CBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 020E0 80986CC0 03E00008 */ jr $ra /* 020E4 80986CC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s index c9ac90fa2f..c50f5296df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s @@ -13,5 +13,3 @@ glabel func_80986CC8 .L80986CF4: /* 02114 80986CF4 03E00008 */ jr $ra /* 02118 80986CF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s index 8cf08d97c4..4f9f77a0ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s @@ -17,5 +17,3 @@ glabel func_80986CFC /* 02154 80986D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02158 80986D38 03E00008 */ jr $ra /* 0215C 80986D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s index 28938aaba2..186f1962e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s @@ -38,5 +38,3 @@ glabel func_80986D40 /* 021DC 80986DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021E0 80986DC0 03E00008 */ jr $ra /* 021E4 80986DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s index f445026ce1..a6a2b79c70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s @@ -21,5 +21,3 @@ glabel func_80986DC8 /* 02234 80986E14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02238 80986E18 03E00008 */ jr $ra /* 0223C 80986E1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s index b95bcd4d86..21e4c3601d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s @@ -7,5 +7,3 @@ glabel func_80986E20 /* 02254 80986E34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02258 80986E38 03E00008 */ jr $ra /* 0225C 80986E3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s index 5631210b65..4acf5218bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s @@ -26,5 +26,3 @@ glabel func_80986E40 /* 022C0 80986EA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022C4 80986EA4 03E00008 */ jr $ra /* 022C8 80986EA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s index fd8674d11b..8982f75a57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s @@ -22,5 +22,3 @@ glabel func_80986EAC /* 0231C 80986EFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02320 80986F00 03E00008 */ jr $ra /* 02324 80986F04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s index bd501765f3..ef24434bd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s @@ -7,5 +7,3 @@ glabel func_80986F08 /* 0233C 80986F1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02340 80986F20 03E00008 */ jr $ra /* 02344 80986F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s index 39ac641bc0..f491bd89ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s @@ -23,5 +23,3 @@ glabel func_80986F28 /* 0239C 80986F7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 023A0 80986F80 03E00008 */ jr $ra /* 023A4 80986F84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s index d7edf4f886..ba0ffb6104 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s @@ -7,5 +7,3 @@ glabel func_80986F88 /* 023BC 80986F9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023C0 80986FA0 03E00008 */ jr $ra /* 023C4 80986FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s index 11d476840c..b74bf5449d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s @@ -27,5 +27,3 @@ glabel func_80986FA8 /* 0242C 8098700C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02430 80987010 03E00008 */ jr $ra /* 02434 80987014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s index da9dee61cc..a55e64ebce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s @@ -18,5 +18,3 @@ glabel func_80987018 /* 02478 80987058 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0247C 8098705C 03E00008 */ jr $ra /* 02480 80987060 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s index 869c1eaf7e..58c092e657 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s @@ -36,5 +36,3 @@ glabel func_80987064 /* 02504 809870E4 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 /* 02508 809870E8 03E00008 */ jr $ra /* 0250C 809870EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s index a81fc6b25f..7075674332 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s @@ -13,5 +13,3 @@ glabel func_809870F0 /* 0253C 8098711C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02540 80987120 03E00008 */ jr $ra /* 02544 80987124 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s index b2d219d99d..7b2cfaee54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s @@ -19,5 +19,3 @@ glabel func_80987128 .L8098716C: /* 0258C 8098716C 03E00008 */ jr $ra /* 02590 80987170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s index 53c134affa..24b9760e4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s @@ -15,5 +15,3 @@ glabel func_80987174 /* 025C8 809871A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 025CC 809871AC 03E00008 */ jr $ra /* 025D0 809871B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s index abad4f5a85..dd37c42608 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s @@ -13,5 +13,3 @@ glabel func_809871B4 /* 025FC 809871DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02600 809871E0 03E00008 */ jr $ra /* 02604 809871E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s index 339094e416..a3de378aea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80988908 + .asciz "Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_809871E8 /* 02608 809871E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0260C 809871EC AFA40020 */ sw $a0, 0x0020($sp) @@ -46,5 +52,3 @@ glabel func_809871E8 /* 0269C 8098727C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 026A0 80987280 03E00008 */ jr $ra /* 026A4 80987284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s index f5b79631ab..560ee13c89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s @@ -7,5 +7,3 @@ glabel func_80987288 /* 026BC 8098729C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 026C0 809872A0 03E00008 */ jr $ra /* 026C4 809872A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s index b047048d37..8bba5fc8b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s @@ -17,5 +17,3 @@ glabel func_809872A8 /* 02704 809872E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02708 809872E8 03E00008 */ jr $ra /* 0270C 809872EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s index 73a8e8e474..adc9b6d011 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s @@ -15,5 +15,3 @@ glabel func_809872F0 /* 02744 80987324 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02748 80987328 03E00008 */ jr $ra /* 0274C 8098732C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s index 3516cc7663..e765b5ac9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s @@ -15,5 +15,3 @@ glabel func_80987330 /* 02784 80987364 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02788 80987368 03E00008 */ jr $ra /* 0278C 8098736C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s index df44e8bed0..2e11250d61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s @@ -47,5 +47,3 @@ glabel func_80987514 .L809875B8: /* 029D8 809875B8 03E00008 */ jr $ra /* 029DC 809875BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s index df4101eb13..e3a2e3eb83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s @@ -35,5 +35,3 @@ glabel func_809875C0 /* 02A60 80987640 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02A64 80987644 03E00008 */ jr $ra /* 02A68 80987648 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s index 439338d092..f974aef88e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s @@ -2,5 +2,3 @@ glabel func_8098764C /* 02A6C 8098764C AFA40000 */ sw $a0, 0x0000($sp) /* 02A70 80987650 03E00008 */ jr $ra /* 02A74 80987654 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s index b20ef84a8f..a6d33af9bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80988980 + .asciz "../z_demo_im.c" + .balign 4 + +glabel D_80988990 + .asciz "../z_demo_im.c" + .balign 4 + +.text glabel func_80987658 /* 02A78 80987658 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02A7C 8098765C AFBF0024 */ sw $ra, 0x0024($sp) @@ -92,5 +102,3 @@ glabel func_80987658 /* 02BE0 809877C0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 02BE4 809877C4 03E00008 */ jr $ra /* 02BE8 809877C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s index 329428b294..ff781f5503 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s @@ -1,5 +1,3 @@ glabel DemoKankyo_Destroy /* 0041C 8098929C 03E00008 */ jr $ra /* 00420 809892A0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s index ebbda14f74..e147e3f2c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s @@ -1,3 +1,25 @@ +.late_rodata +glabel jtbl_8098CAE4 +.word L809899F8 +.word L809899F8 +.word L80989AA8 +.word L80989AA8 +.word L80989AA8 +.word L80989AA8 +.word L80989AA8 +.word L80989ABC +.word L80989B1C +.word L80989B1C +.word L80989B1C +.word L80989B1C +.word L80989B1C +.word L80989AD0 +.word L80989AE4 +.word L80989AF8 +.word L80989AF8 +.word L80989B0C + +.text glabel DemoKankyo_Draw /* 00B2C 809899AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00B30 809899B0 AFBF001C */ sw $ra, 0x001C($sp) @@ -123,5 +145,3 @@ glabel L80989B1C /* 00CC8 80989B48 8FB10018 */ lw $s1, 0x0018($sp) /* 00CCC 80989B4C 03E00008 */ jr $ra /* 00CD0 80989B50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s index 94da963f2d..29ca3b873b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s @@ -1,3 +1,40 @@ +.rdata +glabel D_8098C870 + .asciz "bank_ID = %d\n" + .balign 4 + +glabel D_8098C880 + .asciz "0" + .balign 4 + +glabel D_8098C884 + .asciz "../z_demo_kankyo.c" + .balign 4 + +.late_rodata +glabel jtbl_8098CA50 +.word L80988F2C +.word L80988F2C +.word L80988FCC +.word L80988FCC +.word L80988FCC +.word L80988FCC +.word L80988FCC +.word L8098906C +.word L80989244 +.word L80989244 +.word L80989244 +.word L80989244 +.word L80989244 +.word L809890DC +.word L8098916C +.word L80989190 +.word L80989190 +.word L8098921C +glabel D_8098CA98 + .word 0x477FFF00 + +.text glabel DemoKankyo_Init /* 00008 80988E88 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0000C 80988E8C AFB30040 */ sw $s3, 0x0040($sp) @@ -294,5 +331,3 @@ glabel L80989244 /* 00410 80989290 8FB30040 */ lw $s3, 0x0040($sp) /* 00414 80989294 03E00008 */ jr $ra /* 00418 80989298 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s index 3bfaf825c8..ac916d6235 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s @@ -8,5 +8,3 @@ glabel DemoKankyo_Update /* 00B20 809899A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B24 809899A4 03E00008 */ jr $ra /* 00B28 809899A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s index fb11e15f37..68d7677fba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s @@ -1,5 +1,3 @@ glabel func_80988E80 /* 00000 80988E80 03E00008 */ jr $ra /* 00004 80988E84 AC850600 */ sw $a1, 0x0600($a0) ## 00000600 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s index d04d1132e1..2ca6763498 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s @@ -1,3 +1,25 @@ +.late_rodata +glabel jtbl_8098CA9C +.word L809896CC +.word L809896CC +.word L809892E8 +.word L809892E8 +.word L809892E8 +.word L809892E8 +.word L809892E8 +.word L80989300 +.word L809896CC +.word L809896CC +.word L809896CC +.word L809896CC +.word L809896CC +.word L80989318 +.word L809896CC +.word L80989348 +.word L8098964C +.word L809896CC + +.text glabel func_809892A4 /* 00424 809892A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00428 809892A8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -300,5 +322,3 @@ glabel L809896CC /* 00850 809896D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00854 809896D4 03E00008 */ jr $ra /* 00858 809896D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s index c5a6dd2361..63c6aa76a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s @@ -2,5 +2,3 @@ glabel func_809896DC /* 0085C 809896DC AFA40000 */ sw $a0, 0x0000($sp) /* 00860 809896E0 03E00008 */ jr $ra /* 00864 809896E4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s index 748110672a..d7a4d3e869 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s @@ -9,5 +9,3 @@ glabel func_809896E8 /* 00884 80989704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00888 80989708 03E00008 */ jr $ra /* 0088C 8098970C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s index c353f40283..c4ae5c043c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s @@ -59,5 +59,3 @@ glabel func_80989710 /* 00974 809897F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00978 809897F8 03E00008 */ jr $ra /* 0097C 809897FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s index 1cf70a1ac6..f4b1c75e86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s @@ -31,5 +31,3 @@ glabel func_80989800 /* 009F0 80989870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009F4 80989874 03E00008 */ jr $ra /* 009F8 80989878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s index 53fd13deeb..656684e6f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s @@ -19,5 +19,3 @@ glabel func_8098987C /* 00A3C 809898BC A46A0170 */ sh $t2, 0x0170($v1) ## 00000170 /* 00A40 809898C0 03E00008 */ jr $ra /* 00A44 809898C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s index 12bed17afa..463c4a4d56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s @@ -41,5 +41,3 @@ glabel func_809898C8 /* 00AD4 80989954 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AD8 80989958 03E00008 */ jr $ra /* 00ADC 8098995C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s index 437c2eb073..dc48c40de6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s @@ -10,5 +10,3 @@ glabel func_80989960 /* 00AFC 8098997C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B00 80989980 03E00008 */ jr $ra /* 00B04 80989984 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s index 9a7d9cb272..750bd506f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s @@ -126,5 +126,3 @@ glabel func_80989B54 /* 00E98 80989D18 8FB00014 */ lw $s0, 0x0014($sp) /* 00E9C 80989D1C 03E00008 */ jr $ra /* 00EA0 80989D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s index a204245981..f430f05c85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s @@ -1,3 +1,27 @@ +.rdata +glabel D_8098C898 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C8AC + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C8C0 + .asciz "../z_demo_kankyo.c" + .balign 4 + +.late_rodata +glabel D_8098CB2C + .float 1500.0 + +glabel D_8098CB30 + .float 3.14159274101 + +glabel D_8098CB34 + .float 0.001 + +.text glabel func_80989D24 /* 00EA4 80989D24 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 00EA8 80989D28 AFB5005C */ sw $s5, 0x005C($sp) @@ -427,5 +451,3 @@ glabel func_80989D24 /* 014E0 8098A360 8FBE0068 */ lw $s8, 0x0068($sp) /* 014E4 8098A364 03E00008 */ jr $ra /* 014E8 8098A368 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s index 1bd9a40c07..8a5aba9d62 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s @@ -1,3 +1,25 @@ +.rdata +glabel D_8098C8D4 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C8E8 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C8FC + .asciz "../z_demo_kankyo.c" + .balign 4 + +.late_rodata +glabel D_8098CB38 + .word 0x3C8EFA35 +glabel D_8098CB3C + .word 0x3C8EFA35 +glabel D_8098CB40 + .word 0x3C8EFA35 + +.text glabel func_8098A36C /* 014EC 8098A36C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 014F0 8098A370 AFBF001C */ sw $ra, 0x001C($sp) @@ -96,5 +118,3 @@ glabel func_8098A36C /* 01664 8098A4E4 8FB10018 */ lw $s1, 0x0018($sp) /* 01668 8098A4E8 03E00008 */ jr $ra /* 0166C 8098A4EC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s index aa407d9244..5f851e3a2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8098C910 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C924 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C938 + .asciz "../z_demo_kankyo.c" + .balign 4 + +.text glabel func_8098A4F0 /* 01670 8098A4F0 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 01674 8098A4F4 AFB30054 */ sw $s3, 0x0054($sp) @@ -220,5 +234,3 @@ glabel func_8098A4F0 /* 019C8 8098A848 8FBE0068 */ lw $s8, 0x0068($sp) /* 019CC 8098A84C 03E00008 */ jr $ra /* 019D0 8098A850 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s index fb209bb3ea..90ef4573bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8098C94C + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C960 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C974 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C988 + .asciz "../z_demo_kankyo.c" + .balign 4 + +.text glabel func_8098A854 /* 019D4 8098A854 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 019D8 8098A858 AFB10018 */ sw $s1, 0x0018($sp) @@ -83,5 +101,3 @@ glabel func_8098A854 /* 01B18 8098A998 8FB10018 */ lw $s1, 0x0018($sp) /* 01B1C 8098A99C 03E00008 */ jr $ra /* 01B20 8098A9A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s index dfdfcc7715..b0d0d36151 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8098C99C + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C9B0 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C9C4 + .asciz "../z_demo_kankyo.c" + .balign 4 + +.text glabel func_8098A9A4 /* 01B24 8098A9A4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01B28 8098A9A8 AFB10020 */ sw $s1, 0x0020($sp) @@ -74,5 +88,3 @@ glabel func_8098A9A4 /* 01C3C 8098AABC 8FB10020 */ lw $s1, 0x0020($sp) /* 01C40 8098AAC0 03E00008 */ jr $ra /* 01C44 8098AAC4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s index 66fcd62bad..9fb1fd618c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s @@ -6,5 +6,3 @@ glabel func_8098AAC8 /* 01C58 8098AAD8 C4880008 */ lwc1 $f8, 0x0008($a0) ## 00000008 /* 01C5C 8098AADC 03E00008 */ jr $ra /* 01C60 8098AAE0 E4A80008 */ swc1 $f8, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s index f642d5dfcf..72a23ac8d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s @@ -32,5 +32,3 @@ glabel func_8098AAE4 /* 01CDC 8098AB5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01CE0 8098AB60 03E00008 */ jr $ra /* 01CE4 8098AB64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s index db29b3d22d..aea531e4b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s @@ -21,5 +21,3 @@ glabel func_8098AB68 /* 01D34 8098ABB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01D38 8098ABB8 03E00008 */ jr $ra /* 01D3C 8098ABBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s index a9e6851498..ceee0f97d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s @@ -1,3 +1,29 @@ +.rdata +glabel D_8098C9D8 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098C9EC + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098CA00 + .asciz "../z_demo_kankyo.c" + .balign 4 + +.late_rodata +glabel D_8098CB44 + .float 0.2 + +glabel D_8098CB48 + .float 0.2 + +glabel D_8098CB4C + .word 0x3C9374BC +glabel D_8098CB50 + .word 0x3C8EFA35 + +.text glabel func_8098ABC0 /* 01D40 8098ABC0 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 /* 01D44 8098ABC4 AFBF006C */ sw $ra, 0x006C($sp) @@ -519,5 +545,3 @@ glabel func_8098ABC0 /* 024C8 8098B348 8FB60068 */ lw $s6, 0x0068($sp) /* 024CC 8098B34C 03E00008 */ jr $ra /* 024D0 8098B350 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s index f8c2dcfbb7..d8f62623d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s @@ -1,3 +1,27 @@ +.rdata +glabel D_8098CA14 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098CA28 + .asciz "../z_demo_kankyo.c" + .balign 4 + +glabel D_8098CA3C + .asciz "../z_demo_kankyo.c" + .balign 4 + +.late_rodata +glabel D_8098CB54 + .float 0.2 + +glabel D_8098CB58 + .float 0.02 + +glabel D_8098CB5C + .word 0x3C8EFA35 + +.text glabel func_8098B354 /* 024D4 8098B354 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 024D8 8098B358 AFB60068 */ sw $s6, 0x0068($sp) @@ -391,4 +415,3 @@ glabel func_8098B354 /* 02A84 8098B904 03E00008 */ jr $ra /* 02A88 8098B908 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 /* 02A8C 8098B90C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s index 38b6038cc3..39bb91e37d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s @@ -17,5 +17,3 @@ glabel DemoKekkai_Destroy /* 002A4 8098D274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A8 8098D278 03E00008 */ jr $ra /* 002AC 8098D27C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s index f1c16cd25e..cda4292ef7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8098E254 + .asciz "../z_demo_kekkai.c" + .balign 4 + +glabel D_8098E268 + .asciz "../z_demo_kekkai.c" + .balign 4 + +glabel D_8098E27C + .asciz "../z_demo_kekkai.c" + .balign 4 + +.text glabel DemoKekkai_Draw /* 00F50 8098DF20 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00F54 8098DF24 AFBF003C */ sw $ra, 0x003C($sp) @@ -91,4 +105,3 @@ glabel DemoKekkai_Draw /* 010B4 8098E084 03E00008 */ jr $ra /* 010B8 8098E088 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 010BC 8098E08C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s index e822f094b5..58586cf7d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s @@ -1,3 +1,18 @@ +.late_rodata +glabel jtbl_8098E290 +.word L8098D0F0 +.word L8098D148 +.word L8098D148 +.word L8098D148 +.word L8098D148 +.word L8098D148 +.word L8098D148 +glabel D_8098E2AC + .float 6100.0 +glabel D_8098E2B0 + .float 5000.0 + +.text glabel DemoKekkai_Init /* 00044 8098D014 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00048 8098D018 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -152,5 +167,3 @@ glabel L8098D148 /* 00264 8098D234 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00268 8098D238 03E00008 */ jr $ra /* 0026C 8098D23C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s index e8000f40a8..0ba38535f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8098E2C0 + .float 0.99 + +.text glabel DemoKekkai_Update /* 00620 8098D5F0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00624 8098D5F4 AFBF002C */ sw $ra, 0x002C($sp) @@ -82,5 +87,3 @@ glabel DemoKekkai_Update /* 00740 8098D710 8FB20028 */ lw $s2, 0x0028($sp) /* 00744 8098D714 03E00008 */ jr $ra /* 00748 8098D718 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098CFD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098CFD0.s index 3df9b10e45..b830cc5d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098CFD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098CFD0.s @@ -20,5 +20,3 @@ glabel func_8098CFD0 /* 00038 8098D008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0003C 8098D00C 03E00008 */ jr $ra /* 00040 8098D010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s index 249b55a55a..d324a014d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8098E2B4 + .float 65535.0 + +.text glabel func_8098D280 /* 002B0 8098D280 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 002B4 8098D284 F7BE0050 */ sdc1 $f30, 0x0050($sp) @@ -160,5 +165,3 @@ glabel func_8098D280 /* 004F8 8098D4C8 8FBE0078 */ lw $s8, 0x0078($sp) /* 004FC 8098D4CC 03E00008 */ jr $ra /* 00500 8098D4D0 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D4D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D4D4.s index 670bc3ee8e..32fe5e7536 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D4D4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8098E2B8 + .float 0.2 + +glabel D_8098E2BC + .float 0.003 + +.text glabel func_8098D4D4 /* 00504 8098D4D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00508 8098D4D8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -78,5 +86,3 @@ glabel func_8098D4D4 /* 00614 8098D5E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00618 8098D5E8 03E00008 */ jr $ra /* 0061C 8098D5EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D71C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D71C.s index dcbad23b62..84f6ab1829 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D71C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D71C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8098E2C4 + .float 0.05 + +glabel D_8098E2C8 + .float 6.25e-4 + +.text glabel func_8098D71C /* 0074C 8098D71C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00750 8098D720 AFBF001C */ sw $ra, 0x001C($sp) @@ -98,5 +106,3 @@ glabel func_8098D71C /* 008A0 8098D870 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008A4 8098D874 03E00008 */ jr $ra /* 008A8 8098D878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s index e44e3b67ce..e643663793 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8098E1D0 + .asciz "../z_demo_kekkai.c" + .balign 4 + +glabel D_8098E1E4 + .asciz "\"当ったよ\" = %s\n" + .balign 4 + +glabel D_8098E1F8 + .asciz "当ったよ" + .balign 4 + +.text glabel func_8098D87C /* 008AC 8098D87C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 008B0 8098D880 AFBF0024 */ sw $ra, 0x0024($sp) @@ -87,5 +101,3 @@ glabel func_8098D87C /* 009E4 8098D9B4 8FB10020 */ lw $s1, 0x0020($sp) /* 009E8 8098D9B8 03E00008 */ jr $ra /* 009EC 8098D9BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s index ca0878cc0b..ae0d1e6145 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8098E204 + .asciz "../z_demo_kekkai.c" + .balign 4 + +glabel D_8098E218 + .asciz "../z_demo_kekkai.c" + .balign 4 + +glabel D_8098E22C + .asciz "../z_demo_kekkai.c" + .balign 4 + +glabel D_8098E240 + .asciz "../z_demo_kekkai.c" + .balign 4 + +.text glabel func_8098D9C0 /* 009F0 8098D9C0 27BDFEE0 */ addiu $sp, $sp, 0xFEE0 ## $sp = FFFFFEE0 /* 009F4 8098D9C4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -346,5 +364,3 @@ glabel func_8098D9C0 /* 00F44 8098DF14 27BD0120 */ addiu $sp, $sp, 0x0120 ## $sp = 00000000 /* 00F48 8098DF18 03E00008 */ jr $ra /* 00F4C 8098DF1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s index aec9c036ef..b3fd8a5cdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s @@ -7,5 +7,3 @@ glabel DemoSa_Destroy /* 00014 8098E474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00018 8098E478 03E00008 */ jr $ra /* 0001C 8098E47C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s index d79f8ad5c5..7d596f83d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80990EFC + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoSa_Draw /* 01C18 80990078 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01C1C 8099007C AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,4 +35,3 @@ glabel DemoSa_Draw /* 01C74 809900D4 00000000 */ nop /* 01C78 809900D8 00000000 */ nop /* 01C7C 809900DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s index 7b5926ec54..0650b6ea67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s @@ -56,5 +56,3 @@ glabel DemoSa_Init /* 01A08 8098FE68 8FB10018 */ lw $s1, 0x0018($sp) /* 01A0C 8098FE6C 03E00008 */ jr $ra /* 01A10 8098FE70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s index bc529cde7d..d2fe71e814 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80990EA0 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel DemoSa_Update /* 018F0 8098FD50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 018F4 8098FD54 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel DemoSa_Update /* 01940 8098FDA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01944 8098FDA4 03E00008 */ jr $ra /* 01948 8098FDA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s index 364afabaab..09a7f09f9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s @@ -38,5 +38,3 @@ glabel func_8098E480 /* 0009C 8098E4FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000A0 8098E500 03E00008 */ jr $ra /* 000A4 8098E504 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s index e8e2789343..6b327e4797 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s @@ -4,5 +4,3 @@ glabel func_8098E508 /* 000B0 8098E510 00052C03 */ sra $a1, $a1, 16 /* 000B4 8098E514 03E00008 */ jr $ra /* 000B8 8098E518 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s index 7a36224c06..3f8cd6e5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s @@ -4,5 +4,3 @@ glabel func_8098E51C /* 000C4 8098E524 00052C03 */ sra $a1, $a1, 16 /* 000C8 8098E528 03E00008 */ jr $ra /* 000CC 8098E52C A4850194 */ sh $a1, 0x0194($a0) ## 00000194 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s index 9ff86ea61e..bd3e2a1c8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s @@ -8,5 +8,3 @@ glabel func_8098E530 /* 000E8 8098E548 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 000EC 8098E54C 03E00008 */ jr $ra /* 000F0 8098E550 E48401A0 */ swc1 $f4, 0x01A0($a0) ## 000001A0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s index ec3f394c66..6a06a71d21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s @@ -32,5 +32,3 @@ glabel func_8098E554 /* 0015C 8098E5BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00160 8098E5C0 03E00008 */ jr $ra /* 00164 8098E5C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s index 797a4dbc50..275fa0dba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s @@ -17,5 +17,3 @@ glabel func_8098E5C8 /* 001A4 8098E604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001A8 8098E608 03E00008 */ jr $ra /* 001AC 8098E60C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s index 3318b7f474..a7a9f235dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s @@ -8,5 +8,3 @@ glabel func_8098E610 /* 001C4 8098E624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C8 8098E628 03E00008 */ jr $ra /* 001CC 8098E62C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s index d50a5043c8..a3ede9690b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s @@ -9,5 +9,3 @@ glabel func_8098E630 .L8098E64C: /* 001EC 8098E64C 03E00008 */ jr $ra /* 001F0 8098E650 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s index fa01f91ffd..e4a9852ceb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s @@ -20,5 +20,3 @@ glabel func_8098E654 .L8098E698: /* 00238 8098E698 03E00008 */ jr $ra /* 0023C 8098E69C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s index 1141873814..22a21ae7ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s @@ -20,5 +20,3 @@ glabel func_8098E6A0 .L8098E6E4: /* 00284 8098E6E4 03E00008 */ jr $ra /* 00288 8098E6E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s index 37a45e335c..1c11c0fcf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s @@ -32,5 +32,3 @@ glabel func_8098E6EC /* 00300 8098E760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00304 8098E764 03E00008 */ jr $ra /* 00308 8098E768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s index 7070edcc8e..c83b662efd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s @@ -39,5 +39,3 @@ glabel func_8098E76C /* 00390 8098E7F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00394 8098E7F4 03E00008 */ jr $ra /* 00398 8098E7F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s index 2447843bed..427de3c762 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80990F34 + .word 0xC61C4000 + +.text glabel func_8098E7FC /* 0039C 8098E7FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) @@ -27,5 +32,3 @@ glabel func_8098E7FC /* 00400 8098E860 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00404 8098E864 03E00008 */ jr $ra /* 00408 8098E868 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s index eda773b439..fcdf2c0ef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s @@ -23,5 +23,3 @@ glabel func_8098E86C /* 0045C 8098E8BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00460 8098E8C0 03E00008 */ jr $ra /* 00464 8098E8C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s index a0b81d4bc2..9ce213d6bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s @@ -31,5 +31,3 @@ glabel func_8098E8C8 /* 004D8 8098E938 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 004DC 8098E93C 03E00008 */ jr $ra /* 004E0 8098E940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s index 517652d81b..48f4478332 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80990F38 + .word 0x42A6AAAB, 0x00000000 + +.text glabel func_8098E944 /* 004E4 8098E944 AFA50004 */ sw $a1, 0x0004($sp) /* 004E8 8098E948 3C018099 */ lui $at, %hi(D_80990F38) ## $at = 80990000 @@ -6,5 +11,3 @@ glabel func_8098E944 /* 004F4 8098E954 46062200 */ add.s $f8, $f4, $f6 /* 004F8 8098E958 03E00008 */ jr $ra /* 004FC 8098E95C E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s index 2ad7113110..79154836b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s @@ -35,5 +35,3 @@ glabel func_8098E960 /* 00580 8098E9E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00584 8098E9E4 03E00008 */ jr $ra /* 00588 8098E9E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s index 716806b535..d81b00b961 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s @@ -20,5 +20,3 @@ glabel func_8098E9EC /* 005D0 8098EA30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D4 8098EA34 03E00008 */ jr $ra /* 005D8 8098EA38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s index 2c833d8a93..0435307a2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s @@ -11,5 +11,3 @@ glabel func_8098EA3C .L8098EA60: /* 00600 8098EA60 03E00008 */ jr $ra /* 00604 8098EA64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s index b674e1f914..280375226b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s @@ -40,5 +40,3 @@ glabel func_8098EA68 /* 00694 8098EAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00698 8098EAF8 03E00008 */ jr $ra /* 0069C 8098EAFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s index a8f9cbd741..c66830f1af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s @@ -29,5 +29,3 @@ glabel func_8098EB00 /* 00700 8098EB60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00704 8098EB64 03E00008 */ jr $ra /* 00708 8098EB68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s index e462447957..14ff1b41ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s @@ -19,5 +19,3 @@ glabel func_8098EB6C /* 0074C 8098EBAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00750 8098EBB0 03E00008 */ jr $ra /* 00754 8098EBB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s index 845ceb0a46..85261851a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s @@ -7,5 +7,3 @@ glabel func_8098EBB8 /* 0076C 8098EBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00770 8098EBD0 03E00008 */ jr $ra /* 00774 8098EBD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s index 8f8c1e6591..05e98bd0f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s @@ -7,5 +7,3 @@ glabel func_8098EBD8 /* 0078C 8098EBEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00790 8098EBF0 03E00008 */ jr $ra /* 00794 8098EBF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s index e12eb98e7a..50200ac757 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s @@ -11,5 +11,3 @@ glabel func_8098EBF8 /* 007BC 8098EC1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007C0 8098EC20 03E00008 */ jr $ra /* 007C4 8098EC24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s index 7e5e4857ba..b9aec7996a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s @@ -13,5 +13,3 @@ glabel func_8098EC28 /* 007F4 8098EC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F8 8098EC58 03E00008 */ jr $ra /* 007FC 8098EC5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s index 92d1bfc87e..11844bc17c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s @@ -12,5 +12,3 @@ glabel func_8098EC60 /* 00828 8098EC88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0082C 8098EC8C 03E00008 */ jr $ra /* 00830 8098EC90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s index 28e6253762..46b69f810f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s @@ -13,5 +13,3 @@ glabel func_8098EC94 /* 00860 8098ECC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00864 8098ECC4 03E00008 */ jr $ra /* 00868 8098ECC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s index f122442ed4..67db0d921a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s @@ -9,5 +9,3 @@ glabel func_8098ECCC /* 00888 8098ECE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0088C 8098ECEC 03E00008 */ jr $ra /* 00890 8098ECF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s index 61e306ae5b..5f51cec9f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s @@ -48,5 +48,3 @@ glabel func_8098ECF4 /* 00944 8098EDA4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00948 8098EDA8 03E00008 */ jr $ra /* 0094C 8098EDAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s index 51c0e67d36..ce469475e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s @@ -23,5 +23,3 @@ glabel func_8098EDB0 /* 0099C 8098EDFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009A0 8098EE00 03E00008 */ jr $ra /* 009A4 8098EE04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s index 8b18b0465d..e5c9c83b0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s @@ -7,5 +7,3 @@ glabel func_8098EE08 /* 009BC 8098EE1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009C0 8098EE20 03E00008 */ jr $ra /* 009C4 8098EE24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s index b212734af8..8b652d1414 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s @@ -32,5 +32,3 @@ glabel func_8098EE28 /* 00A3C 8098EE9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A40 8098EEA0 03E00008 */ jr $ra /* 00A44 8098EEA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s index 3ad47c819b..99bedf2855 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s @@ -21,5 +21,3 @@ glabel func_8098EEA8 /* 00A90 8098EEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A94 8098EEF4 03E00008 */ jr $ra /* 00A98 8098EEF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s index 0e0432a061..5862891523 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s @@ -87,5 +87,3 @@ glabel func_8098EEFC /* 00BE4 8098F044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BE8 8098F048 03E00008 */ jr $ra /* 00BEC 8098F04C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s index b60630fb78..f0bc65c363 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s @@ -39,5 +39,3 @@ glabel func_8098F050 /* 00C7C 8098F0DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C80 8098F0E0 03E00008 */ jr $ra /* 00C84 8098F0E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s index c81f2622fd..7fb1d3e90b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s @@ -11,5 +11,3 @@ glabel func_8098F0E8 /* 00CAC 8098F10C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CB0 8098F110 03E00008 */ jr $ra /* 00CB4 8098F114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s index 69b1a670c3..f57b5f1d57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s @@ -20,5 +20,3 @@ glabel func_8098F118 /* 00D00 8098F160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D04 8098F164 03E00008 */ jr $ra /* 00D08 8098F168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s index aea078c672..e82112e246 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s @@ -20,5 +20,3 @@ glabel func_8098F16C /* 00D54 8098F1B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D58 8098F1B8 03E00008 */ jr $ra /* 00D5C 8098F1BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s index 3edcc96573..b614784c48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80990DE0 + .asciz "../z_demo_sa_inKenjyanomaDemo02.c" + .balign 4 + +glabel D_80990E04 + .asciz "../z_demo_sa_inKenjyanomaDemo02.c" + .balign 4 + +.text glabel func_8098F1C0 /* 00D60 8098F1C0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) @@ -115,5 +125,3 @@ glabel func_8098F1C0 /* 00F24 8098F384 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 00F28 8098F388 03E00008 */ jr $ra /* 00F2C 8098F38C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s index 12795fd6f9..df68cb4a3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s @@ -23,5 +23,3 @@ glabel func_8098F390 /* 00F84 8098F3E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F88 8098F3E8 03E00008 */ jr $ra /* 00F8C 8098F3EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s index 5c04ae56cf..8a68e04134 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s @@ -11,5 +11,3 @@ glabel func_8098F3F0 /* 00FB4 8098F414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FB8 8098F418 03E00008 */ jr $ra /* 00FBC 8098F41C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s index 73b3733a41..2fec2267c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s @@ -23,5 +23,3 @@ glabel func_8098F420 /* 01014 8098F474 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01018 8098F478 03E00008 */ jr $ra /* 0101C 8098F47C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s index 9bc8e2d955..f55abad674 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s @@ -36,5 +36,3 @@ glabel func_8098F480 /* 010A0 8098F500 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 /* 010A4 8098F504 03E00008 */ jr $ra /* 010A8 8098F508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s index 5243927641..a6e7d7140e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s @@ -13,5 +13,3 @@ glabel func_8098F50C /* 010D8 8098F538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010DC 8098F53C 03E00008 */ jr $ra /* 010E0 8098F540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s index 1b0192659e..bf1f3912d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s @@ -19,5 +19,3 @@ glabel func_8098F544 .L8098F588: /* 01128 8098F588 03E00008 */ jr $ra /* 0112C 8098F58C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s index c2ce684180..3dd89376d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s @@ -15,5 +15,3 @@ glabel func_8098F590 /* 01164 8098F5C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01168 8098F5C8 03E00008 */ jr $ra /* 0116C 8098F5CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s index eabed3f11e..3c35d2dcbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s @@ -15,5 +15,3 @@ glabel func_8098F5D0 /* 011A4 8098F604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 011A8 8098F608 03E00008 */ jr $ra /* 011AC 8098F60C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s index 256b266a2f..014b760da3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s @@ -17,5 +17,3 @@ glabel func_8098F610 /* 011E8 8098F648 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 011EC 8098F64C 03E00008 */ jr $ra /* 011F0 8098F650 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s index 8b05bbc49e..8a91cc2ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80990E28 + .asciz "Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_8098F654 /* 011F4 8098F654 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 011F8 8098F658 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +60,3 @@ glabel func_8098F654 /* 012A8 8098F708 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012AC 8098F70C 03E00008 */ jr $ra /* 012B0 8098F710 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s index 3c4d1110d5..ffac5a2226 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s @@ -7,5 +7,3 @@ glabel func_8098F714 /* 012C8 8098F728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012CC 8098F72C 03E00008 */ jr $ra /* 012D0 8098F730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s index 406d01be08..f8c8c5655a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s @@ -17,5 +17,3 @@ glabel func_8098F734 /* 01310 8098F770 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01314 8098F774 03E00008 */ jr $ra /* 01318 8098F778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s index 135e74bec0..c107002763 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s @@ -15,5 +15,3 @@ glabel func_8098F77C /* 01350 8098F7B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01354 8098F7B4 03E00008 */ jr $ra /* 01358 8098F7B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s index 17fa328248..0e662cbb60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s @@ -15,5 +15,3 @@ glabel func_8098F7BC /* 01390 8098F7F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01394 8098F7F4 03E00008 */ jr $ra /* 01398 8098F7F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s index 9d91ecd2ed..19f40e4237 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s @@ -15,5 +15,3 @@ glabel func_8098F7FC /* 013D0 8098F830 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013D4 8098F834 03E00008 */ jr $ra /* 013D8 8098F838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s index 1fb66b1c59..c542919cfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s @@ -47,5 +47,3 @@ glabel func_8098F83C /* 0148C 8098F8EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01490 8098F8F0 03E00008 */ jr $ra /* 01494 8098F8F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s index 92653c28ab..c68eddb722 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s @@ -36,5 +36,3 @@ glabel func_8098F8F8 /* 01518 8098F978 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 /* 0151C 8098F97C 03E00008 */ jr $ra /* 01520 8098F980 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s index 4a27bb96f7..db0efb4441 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s @@ -4,5 +4,3 @@ glabel func_8098F984 /* 0152C 8098F98C AC80019C */ sw $zero, 0x019C($a0) ## 0000019C /* 01530 8098F990 03E00008 */ jr $ra /* 01534 8098F994 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s index a137fa287a..a0579dd32c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s @@ -38,5 +38,3 @@ glabel func_8098F998 /* 015C0 8098FA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 015C4 8098FA24 03E00008 */ jr $ra /* 015C8 8098FA28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s index dcf9ebdf76..6f348777c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s @@ -22,5 +22,3 @@ glabel func_8098FA2C .L8098FA7C: /* 0161C 8098FA7C 03E00008 */ jr $ra /* 01620 8098FA80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s index f65aacef22..b6cd889231 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s @@ -22,5 +22,3 @@ glabel func_8098FA84 /* 01674 8098FAD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01678 8098FAD8 03E00008 */ jr $ra /* 0167C 8098FADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s index da60469911..6a926a8e5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s @@ -20,5 +20,3 @@ glabel func_8098FAE0 /* 016C8 8098FB28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016CC 8098FB2C 03E00008 */ jr $ra /* 016D0 8098FB30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s index 9e1c157204..7d4f5f8ce0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s @@ -13,5 +13,3 @@ glabel func_8098FB34 /* 016FC 8098FB5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01700 8098FB60 03E00008 */ jr $ra /* 01704 8098FB64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s index 3fd86a8537..e3d7b0a511 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80990E64 + .asciz "Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_8098FB68 /* 01708 8098FB68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0170C 8098FB6C AFB00018 */ sw $s0, 0x0018($sp) @@ -62,5 +68,3 @@ glabel func_8098FB68 /* 017D8 8098FC38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017DC 8098FC3C 03E00008 */ jr $ra /* 017E0 8098FC40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s index 0b325e7d2d..b895ecf77e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s @@ -7,5 +7,3 @@ glabel func_8098FC44 /* 017F8 8098FC58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017FC 8098FC5C 03E00008 */ jr $ra /* 01800 8098FC60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s index d1765ed660..2ceaa492cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s @@ -13,5 +13,3 @@ glabel func_8098FC64 /* 01830 8098FC90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01834 8098FC94 03E00008 */ jr $ra /* 01838 8098FC98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s index 717d838622..9f667fd8f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s @@ -13,5 +13,3 @@ glabel func_8098FC9C /* 01868 8098FCC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0186C 8098FCCC 03E00008 */ jr $ra /* 01870 8098FCD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s index b2100a0e37..e8710d10cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s @@ -13,5 +13,3 @@ glabel func_8098FCD4 /* 018A0 8098FD00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018A4 8098FD04 03E00008 */ jr $ra /* 018A8 8098FD08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s index 96095fdfd4..7180d30728 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s @@ -16,5 +16,3 @@ glabel func_8098FD0C /* 018E4 8098FD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018E8 8098FD48 03E00008 */ jr $ra /* 018EC 8098FD4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s index d960318afd..d5119a433e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s @@ -13,5 +13,3 @@ glabel func_8098FE74 .L8098FEA0: /* 01A40 8098FEA0 03E00008 */ jr $ra /* 01A44 8098FEA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s index f23631e82c..274baa2179 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s @@ -2,5 +2,3 @@ glabel func_8098FEA8 /* 01A48 8098FEA8 AFA40000 */ sw $a0, 0x0000($sp) /* 01A4C 8098FEAC 03E00008 */ jr $ra /* 01A50 8098FEB0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s index 327c9f95a3..72662112ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80990EDC + .asciz "../z_demo_sa.c" + .balign 4 + +glabel D_80990EEC + .asciz "../z_demo_sa.c" + .balign 4 + +.text glabel func_8098FEB4 /* 01A54 8098FEB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -112,5 +122,3 @@ glabel func_8098FEB4 /* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 01C10 80990070 03E00008 */ jr $ra /* 01C14 80990074 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s index d871422eee..987989fa09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s @@ -2,5 +2,3 @@ glabel DemoShd_Destroy /* 0005C 8099128C AFA40000 */ sw $a0, 0x0000($sp) /* 00060 80991290 03E00008 */ jr $ra /* 00064 80991294 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s index 0e081a36d6..df5031512b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80993600 + .asciz "../z_demo_shd.c" + .balign 4 + +glabel D_80993610 + .asciz "../z_demo_shd.c" + .balign 4 + +glabel D_80993620 + .asciz "../z_demo_shd.c" + .balign 4 + +.text glabel DemoShd_Draw /* 001E8 80991418 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 001EC 8099141C AFBF003C */ sw $ra, 0x003C($sp) @@ -147,4 +161,3 @@ glabel DemoShd_Draw /* 00424 80991654 00000000 */ nop /* 00428 80991658 00000000 */ nop /* 0042C 8099165C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s index 7123df3701..5039f92f89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s @@ -5,7 +5,7 @@ glabel DemoShd_Init /* 00014 80991244 A480014C */ sh $zero, 0x014C($a0) ## 0000014C /* 00018 80991248 3C058099 */ lui $a1, %hi(func_80991298) ## $a1 = 80990000 /* 0001C 8099124C 24A51298 */ addiu $a1, $a1, %lo(func_80991298) ## $a1 = 80991298 -/* 00020 80991250 0C26448C */ jal func_80991230 +/* 00020 80991250 0C26448C */ jal DemoShd_SetupAction /* 00024 80991254 AFA40018 */ sw $a0, 0x0018($sp) /* 00028 80991258 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 /* 0002C 8099125C 8FA40018 */ lw $a0, 0x0018($sp) @@ -21,5 +21,3 @@ glabel DemoShd_Init /* 00050 80991280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00054 80991284 03E00008 */ jr $ra /* 00058 80991288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991230.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s similarity index 84% rename from asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991230.s rename to asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s index a3f556dc4e..59a9fa87ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991230.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_80991230 +glabel DemoShd_SetupAction /* 00000 80991230 03E00008 */ jr $ra /* 00004 80991234 AC850150 */ sw $a1, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s index 8a93e0979b..f7f1522dd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s @@ -8,5 +8,3 @@ glabel DemoShd_Update /* 001DC 8099140C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001E0 80991410 03E00008 */ jr $ra /* 001E4 80991414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s index bbc80ec71d..5bc9e0d97d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s @@ -98,5 +98,3 @@ glabel func_80991298 /* 001B8 809913E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001BC 809913EC 03E00008 */ jr $ra /* 001C0 809913F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Destroy.s index ee447cc5af..24d7eae14b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Destroy.s @@ -9,5 +9,3 @@ glabel DemoTreLgt_Destroy /* 00088 80993748 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0008C 8099374C 03E00008 */ jr $ra /* 00090 80993750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s index 22419badda..e35c12af32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s @@ -48,4 +48,3 @@ glabel DemoTreLgt_Draw /* 006A4 80993D64 03E00008 */ jr $ra /* 006A8 80993D68 00000000 */ nop /* 006AC 80993D6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Init.s index ab544a0103..57551ddcde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Init.s @@ -28,5 +28,3 @@ glabel DemoTreLgt_Init /* 00060 80993720 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00064 80993724 03E00008 */ jr $ra /* 00068 80993728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Update.s index 1a920896e0..2c11f6a115 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Update.s @@ -12,5 +12,3 @@ glabel DemoTreLgt_Update /* 00460 80993B20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00464 80993B24 03E00008 */ jr $ra /* 00468 80993B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993754.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993754.s index fb45b942a3..baa6b83a6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993754.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993754.s @@ -1,5 +1,3 @@ glabel func_80993754 /* 00094 80993754 03E00008 */ jr $ra /* 00098 80993758 AC80016C */ sw $zero, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_8099375C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_8099375C.s index dee6800968..4360f4807e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_8099375C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_8099375C.s @@ -22,5 +22,3 @@ glabel func_8099375C /* 000E8 809937A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000EC 809937AC 03E00008 */ jr $ra /* 000F0 809937B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s index b047f9a3df..d86426f5dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s @@ -36,5 +36,3 @@ glabel func_809937B4 /* 0017C 8099383C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00180 80993840 03E00008 */ jr $ra /* 00184 80993844 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s index bfd76bdb56..239fdbaabb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s @@ -187,5 +187,3 @@ glabel func_80993848 /* 0042C 80993AEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00430 80993AF0 03E00008 */ jr $ra /* 00434 80993AF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s index 0b7b403f29..692e115ba7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s @@ -100,5 +100,3 @@ glabel func_80993B2C /* 005E4 80993CA4 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 005E8 80993CA8 03E00008 */ jr $ra /* 005EC 80993CAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Destroy.s index 3e94094bda..aa15e99b76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Destroy.s @@ -12,5 +12,3 @@ glabel DoorGerudo_Destroy /* 000D0 809946B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D4 809946B4 03E00008 */ jr $ra /* 000D8 809946B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s index f1a7695004..c3f6732d1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80994B80 + .asciz "../z_door_gerudo.c" + .balign 4 + +glabel D_80994B94 + .asciz "../z_door_gerudo.c" + .balign 4 + +glabel D_80994BA8 + .asciz "../z_door_gerudo.c" + .balign 4 + +.late_rodata +glabel D_80994BC0 + .float 0.01 + +.text glabel DoorGerudo_Draw /* 00468 80994A48 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0046C 80994A4C AFB10018 */ sw $s1, 0x0018($sp) @@ -66,4 +84,3 @@ glabel DoorGerudo_Draw /* 00564 80994B44 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00568 80994B48 00000000 */ nop /* 0056C 80994B4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Init.s index 08bdf6ce69..fb7c976c1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Init.s @@ -48,5 +48,3 @@ glabel DoorGerudo_Init /* 000A0 80994680 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000A4 80994684 03E00008 */ jr $ra /* 000A8 80994688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Update.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Update.s index f049a0b4b8..4dfecffa17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Update.s @@ -8,5 +8,3 @@ glabel DoorGerudo_Update /* 0045C 80994A3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00460 80994A40 03E00008 */ jr $ra /* 00464 80994A44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809946BC.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809946BC.s index 3bd0e9eb0f..83ddc0dfc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809946BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809946BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80994BBC + .word 0x7F7FFFFF # might be a float? + +.text glabel func_809946BC /* 000DC 809946BC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 000E0 809946C0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -38,5 +43,3 @@ glabel func_809946BC .L80994748: /* 00168 80994748 03E00008 */ jr $ra /* 0016C 8099474C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_80994750.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_80994750.s index 025f32a908..c4102291d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_80994750.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_80994750.s @@ -72,5 +72,3 @@ glabel func_80994750 /* 00270 80994850 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00274 80994854 03E00008 */ jr $ra /* 00278 80994858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s index 29a00cbf0b..06d52e7d76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s @@ -75,5 +75,3 @@ glabel func_8099485C /* 00380 80994960 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00384 80994964 03E00008 */ jr $ra /* 00388 80994968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099496C.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099496C.s index 4a7a2cd362..abae31d175 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099496C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099496C.s @@ -26,5 +26,3 @@ glabel func_8099496C /* 003DC 809949BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003E0 809949C0 03E00008 */ jr $ra /* 003E4 809949C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809949C8.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809949C8.s index 2519f0ec7d..ac24596412 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809949C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_809949C8.s @@ -24,5 +24,3 @@ glabel func_809949C8 /* 00438 80994A18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0043C 80994A1C 03E00008 */ jr $ra /* 00440 80994A20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s index fb38e64987..06d53ebed9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s @@ -20,5 +20,3 @@ glabel DoorKiller_Destroy /* 003C4 80995014 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003C8 80995018 03E00008 */ jr $ra /* 003CC 8099501C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s index 6c85e1e5aa..91aee3d6c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80996060 + .asciz "bank_ID = %d\n" + .balign 4 + +glabel D_80996070 + .asciz "status = %d\n" + .balign 4 + +.late_rodata +glabel jtbl_809960A8 +.word L80994D4C +.word L80994E88 +.word L80994E88 +.word L80994E88 +.word L80994E88 +glabel D_809960BC + .word 0xBF19999A + +.text glabel DoorKiller_Init /* 00000 80994C50 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00004 80994C54 AFB10028 */ sw $s1, 0x0028($sp) @@ -248,5 +268,3 @@ glabel L80994E88 /* 00378 80994FC8 8FB50038 */ lw $s5, 0x0038($sp) /* 0037C 80994FCC 03E00008 */ jr $ra /* 00380 80994FD0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Update.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Update.s index 85a80c7de6..69732e42a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Update.s @@ -8,5 +8,3 @@ glabel DoorKiller_Update /* 011E4 80995E34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011E8 80995E38 03E00008 */ jr $ra /* 011EC 80995E3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995020.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995020.s index 3e17cbe7d9..abfaec62c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995020.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995020.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_809960C0 + .word 0x40FC28F6 +glabel D_809960C4 + .word 0x421F3333 +glabel D_809960C8 + .word 0x417DC28F +glabel D_809960CC + .word 0x4277EB85 +glabel D_809960D0 + .word 0x406E147B +glabel D_809960D4 + .word 0x42AA3333 + +.text glabel func_80995020 /* 003D0 80995020 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 003D4 80995024 AFB00030 */ sw $s0, 0x0030($sp) @@ -108,5 +123,3 @@ glabel func_80995020 /* 00568 809951B8 8FB20038 */ lw $s2, 0x0038($sp) /* 0056C 809951BC 03E00008 */ jr $ra /* 00570 809951C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809951C4.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809951C4.s index c36a8fd742..eeca8ac017 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809951C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809951C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809960D8 + .word 0x3F7AE148 + +.text glabel func_809951C4 /* 00574 809951C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00578 809951C8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -51,5 +56,3 @@ glabel func_809951C4 /* 00628 80995278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0062C 8099527C 03E00008 */ jr $ra /* 00630 80995280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995284.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995284.s index e7116fa95a..ca51157f9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995284.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995284.s @@ -13,5 +13,3 @@ glabel func_80995284 .L809952B0: /* 00660 809952B0 03E00008 */ jr $ra /* 00664 809952B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s index 54c1440895..d91f434cbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s @@ -26,5 +26,3 @@ glabel func_809952B8 /* 006BC 8099530C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006C0 80995310 03E00008 */ jr $ra /* 006C4 80995314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995318.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995318.s index 24e213945d..5d7a5e2619 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995318.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995318.s @@ -22,5 +22,3 @@ glabel func_80995318 /* 0070C 8099535C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00710 80995360 03E00008 */ jr $ra /* 00714 80995364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s index a88b5512aa..e711fd90c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s @@ -119,5 +119,3 @@ glabel func_80995368 /* 008BC 8099550C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C0 80995510 03E00008 */ jr $ra /* 008C4 80995514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s index 99bac5d1ca..51e3137cee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809960DC + .float 0.1 + +glabel D_809960E0 + .float 0.2 + +.text glabel func_80995518 /* 008C8 80995518 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 008CC 8099551C AFBF0044 */ sw $ra, 0x0044($sp) @@ -262,5 +270,3 @@ glabel func_80995518 /* 00C88 809958D8 8FB10040 */ lw $s1, 0x0040($sp) /* 00C8C 809958DC 03E00008 */ jr $ra /* 00C90 809958E0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s index d75340f68e..0daefbfe35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s @@ -100,5 +100,3 @@ glabel func_809958E4 /* 00DF4 80995A44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DF8 80995A48 03E00008 */ jr $ra /* 00DFC 80995A4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A50.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A50.s index 79e91ddfcc..7fb42fc9fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A50.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A50.s @@ -13,5 +13,3 @@ glabel func_80995A50 /* 00E28 80995A78 AC980280 */ sw $t8, 0x0280($a0) ## 00000280 /* 00E2C 80995A7C 03E00008 */ jr $ra /* 00E30 80995A80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s index fd4194a50d..07bcce855d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s @@ -162,5 +162,3 @@ glabel func_80995A84 /* 01080 80995CD0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01084 80995CD4 03E00008 */ jr $ra /* 01088 80995CD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s index e40b22bf90..5f57ab69ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s @@ -35,5 +35,3 @@ glabel func_80995CDC /* 01110 80995D60 01876821 */ addu $t5, $t4, $a3 /* 01114 80995D64 03E00008 */ jr $ra /* 01118 80995D68 AC6D0018 */ sw $t5, 0x0018($v1) ## 80166FC0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995D6C.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995D6C.s index 41d95099a3..59acecc560 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995D6C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_809960E4 +.word L80995DD8 +.word L80995DF4 +.word L80995DF4 +.word L80995DF4 +.word L80995DF4 +.word 0x00000000, 0x00000000 + +.text glabel func_80995D6C /* 0111C 80995D6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01120 80995D70 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -47,5 +57,3 @@ glabel L80995DF4 /* 011C0 80995E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011C4 80995E14 03E00008 */ jr $ra /* 011C8 80995E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s index 3839c58bc9..c39e3cc036 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80996080 + .asciz "../z_door_killer.c" + .balign 4 + +glabel D_80996094 + .asciz "../z_door_killer.c" + .balign 4 + +.text glabel func_80995E40 /* 011F0 80995E40 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 011F4 80995E44 AFBF0014 */ sw $ra, 0x0014($sp) @@ -32,5 +42,3 @@ glabel func_80995E40 /* 01268 80995EB8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0126C 80995EBC 03E00008 */ jr $ra /* 01270 80995EC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s index 91d359ef87..334eb28d32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s @@ -21,5 +21,3 @@ glabel func_80995EC4 /* 012C0 80995F10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012C4 80995F14 03E00008 */ jr $ra /* 012C8 80995F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s index 4c33efc925..e967a2ee89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s @@ -31,4 +31,3 @@ glabel func_80995F1C /* 01334 80995F84 00000000 */ nop /* 01338 80995F88 00000000 */ nop /* 0133C 80995F8C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Destroy.s index 2930732080..c778344f28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Destroy.s @@ -29,5 +29,3 @@ glabel DoorShutter_Destroy /* 00460 80996700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00464 80996704 03E00008 */ jr $ra /* 00468 80996708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s index ba8513dff2..5fc9ba8779 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s @@ -1,3 +1,41 @@ +.rdata +glabel D_8099832C + .asciz "../z_door_shutter.c" + .balign 4 + +glabel D_80998340 + .asciz "../z_door_shutter.c" + .balign 4 + +glabel D_80998354 + .asciz "../z_door_shutter.c" + .balign 4 + +glabel D_80998368 + .asciz "../z_door_shutter.c" + .balign 4 + +glabel D_8099837C + .asciz "../z_door_shutter.c" + .balign 4 + +.late_rodata +glabel D_809983A4 + .float 0.01 + +glabel D_809983A8 + .float 3.14159274101 + +glabel D_809983AC + .float 3.14159274101 + +glabel D_809983B0 + .float 0.01 + +glabel D_809983B4 + .float 0.01 + +.text glabel DoorShutter_Draw /* 01840 80997AE0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01844 80997AE4 AFBF001C */ sw $ra, 0x001C($sp) @@ -364,5 +402,3 @@ glabel DoorShutter_Draw /* 01D90 80998030 8FB10018 */ lw $s1, 0x0018($sp) /* 01D94 80998034 03E00008 */ jr $ra /* 01D98 80998038 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Init.s index 4154ba1567..570efeee06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Init.s @@ -152,5 +152,3 @@ glabel DoorShutter_Init /* 003F0 80996690 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 003F4 80996694 03E00008 */ jr $ra /* 003F8 80996698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Update.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Update.s index a4548a1b31..801c4cae97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Update.s @@ -22,5 +22,3 @@ glabel DoorShutter_Update /* 0158C 8099782C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01590 80997830 03E00008 */ jr $ra /* 01594 80997834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962A0.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962A0.s index a282886385..111a6a227e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962A0.s @@ -2,5 +2,3 @@ glabel func_809962A0 /* 00000 809962A0 AC850174 */ sw $a1, 0x0174($a0) ## 00000174 /* 00004 809962A4 03E00008 */ jr $ra /* 00008 809962A8 A080016F */ sb $zero, 0x016F($a0) ## 0000016F - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962AC.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962AC.s index 43c765052e..7cb1dd0c71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809962AC.s @@ -134,5 +134,3 @@ glabel func_809962AC /* 001E4 80996484 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001E8 80996488 03E00008 */ jr $ra /* 001EC 8099648C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099670C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099670C.s index b61776e143..d16aee63ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099670C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099670C.s @@ -88,5 +88,3 @@ glabel func_8099670C /* 00594 80996834 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00598 80996838 03E00008 */ jr $ra /* 0059C 8099683C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996840.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996840.s index 95212cb375..e4a0657a4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996840.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996840.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80998390 + .word 0x7F7FFFFF + +.text glabel func_80996840 /* 005A0 80996840 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 005A4 80996844 AFBF0014 */ sw $ra, 0x0014($sp) @@ -38,5 +43,3 @@ glabel func_80996840 .L809968CC: /* 0062C 809968CC 03E00008 */ jr $ra /* 00630 809968D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s index b56c6c52d1..f6a6557ae7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s @@ -105,5 +105,3 @@ glabel func_809968D4 /* 007A8 80996A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007AC 80996A4C 03E00008 */ jr $ra /* 007B0 80996A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996A54.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996A54.s index b77eae83c8..98d1591c6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996A54.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996A54.s @@ -49,5 +49,3 @@ glabel func_80996A54 /* 00854 80996AF4 8FB10018 */ lw $s1, 0x0018($sp) /* 00858 80996AF8 03E00008 */ jr $ra /* 0085C 80996AFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B00.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B00.s index 4324b7183f..2f4bb5c4e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B00.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B00.s @@ -2,5 +2,3 @@ glabel func_80996B00 /* 00860 80996B00 AFA40000 */ sw $a0, 0x0000($sp) /* 00864 80996B04 03E00008 */ jr $ra /* 00868 80996B08 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s index fdfe3cdac9..a4b0404457 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s @@ -94,5 +94,3 @@ glabel func_80996B0C /* 009B4 80996C54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009B8 80996C58 03E00008 */ jr $ra /* 009BC 80996C5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996C60.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996C60.s index adfb630df1..5e234ad8fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996C60.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996C60.s @@ -46,5 +46,3 @@ glabel func_80996C60 /* 00A68 80996D08 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00A6C 80996D0C 03E00008 */ jr $ra /* 00A70 80996D10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996D14.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996D14.s index e9991fb6dd..45c5e277f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996D14.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996D14.s @@ -69,5 +69,3 @@ glabel func_80996D14 /* 00B5C 80996DFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B60 80996E00 03E00008 */ jr $ra /* 00B64 80996E04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996E08.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996E08.s index 9ba890ccdd..a009b05cb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996E08.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996E08.s @@ -66,5 +66,3 @@ glabel func_80996E08 /* 00C3C 80996EDC 8FB00018 */ lw $s0, 0x0018($sp) /* 00C40 80996EE0 03E00008 */ jr $ra /* 00C44 80996EE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996EE8.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996EE8.s index 02c6e7a473..cc47709b8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996EE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996EE8.s @@ -48,5 +48,3 @@ glabel func_80996EE8 /* 00CEC 80996F8C 8FB10018 */ lw $s1, 0x0018($sp) /* 00CF0 80996F90 03E00008 */ jr $ra /* 00CF4 80996F94 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996F98.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996F98.s index 31c60cc7a0..67df765812 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996F98.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996F98.s @@ -30,5 +30,3 @@ glabel func_80996F98 /* 00D58 80996FF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D5C 80996FFC 03E00008 */ jr $ra /* 00D60 80997000 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997004.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997004.s index 508f48288f..62315d8d8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997004.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997004.s @@ -96,5 +96,3 @@ glabel func_80997004 /* 00EA4 80997144 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EA8 80997148 03E00008 */ jr $ra /* 00EAC 8099714C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997150.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997150.s index 4d480c096d..f5e8efe856 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997150.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997150.s @@ -59,5 +59,3 @@ glabel func_80997150 /* 00F74 80997214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F78 80997218 03E00008 */ jr $ra /* 00F7C 8099721C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s index 96deacbaca..5332fe1c29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s @@ -118,5 +118,3 @@ glabel func_80997220 /* 0113C 809973DC 8FB10018 */ lw $s1, 0x0018($sp) /* 01140 809973E0 03E00008 */ jr $ra /* 01144 809973E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s index e35f3bd1a0..e57e91861e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s @@ -85,5 +85,3 @@ glabel func_809973E8 /* 0127C 8099751C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01280 80997520 03E00008 */ jr $ra /* 01284 80997524 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997528.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997528.s index 88b95bed09..455ffad62a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997528.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997528.s @@ -17,5 +17,3 @@ glabel func_80997528 /* 012BC 8099755C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012C0 80997560 03E00008 */ jr $ra /* 012C4 80997564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997568.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997568.s index 33da9e6ce2..89a0bc6872 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997568.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997568.s @@ -22,5 +22,3 @@ glabel func_80997568 /* 01314 809975B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01318 809975B8 03E00008 */ jr $ra /* 0131C 809975BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s index bb5e87abcc..853474bddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s @@ -64,5 +64,3 @@ glabel func_809975C0 /* 0140C 809976AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01410 809976B0 03E00008 */ jr $ra /* 01414 809976B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809976B8.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809976B8.s index 24a465a04f..19df4c6fbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809976B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809976B8.s @@ -36,5 +36,3 @@ glabel func_809976B8 /* 01498 80997738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0149C 8099773C 03E00008 */ jr $ra /* 014A0 80997740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997744.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997744.s index 697f70df83..34a7707ed1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997744.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997744.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809982F0 + .asciz "FHG SAKU START !!\n" + .balign 4 + +glabel D_80998304 + .asciz "FHG SAKU END !!\n" + .balign 4 + +.text glabel func_80997744 /* 014A4 80997744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 014A8 80997748 AFA40020 */ sw $a0, 0x0020($sp) @@ -45,5 +55,3 @@ glabel func_80997744 /* 01538 809977D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0153C 809977DC 03E00008 */ jr $ra /* 01540 809977E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997838.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997838.s index 58c2c1449c..01a4657392 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997838.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997838.s @@ -1,3 +1,20 @@ +.rdata +glabel D_80998318 + .asciz "../z_door_shutter.c" + .balign 4 + +.late_rodata +glabel D_80998394 + .float 0.01 + +glabel D_80998398 + .word 0x44542148 +glabel D_8099839C + .word 0x3F490FDB +glabel D_809983A0 + .word 0x44777C29 + +.text glabel func_80997838 /* 01598 80997838 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 0159C 8099783C AFBF006C */ sw $ra, 0x006C($sp) @@ -132,5 +149,3 @@ glabel func_80997838 /* 01788 80997A28 8FBE0068 */ lw $s8, 0x0068($sp) /* 0178C 80997A2C 03E00008 */ jr $ra /* 01790 80997A30 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s index a4d57e5173..234ee13dbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s @@ -48,5 +48,3 @@ glabel func_80997A34 /* 01834 80997AD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01838 80997AD8 03E00008 */ jr $ra /* 0183C 80997ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s index 5cf08c88f2..68db0d9eec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s @@ -36,4 +36,3 @@ glabel func_8099803C /* 01E24 809980C4 00000000 */ nop /* 01E28 809980C8 00000000 */ nop /* 01E2C 809980CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Destroy.s index 08a4d9f4f5..ce2341a99a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Destroy.s @@ -36,5 +36,3 @@ glabel DoorWarp1_Destroy /* 00200 80998980 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00204 80998984 03E00008 */ jr $ra /* 00208 80998988 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Draw.s index 5a5937d059..9b53ce04a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Draw.s @@ -41,4 +41,3 @@ glabel L8099C560 /* 03DF4 8099C574 00000000 */ nop /* 03DF8 8099C578 00000000 */ nop /* 03DFC 8099C57C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Init.s index 983f1116c1..93d25c1a1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Init.s @@ -102,5 +102,3 @@ glabel DoorWarp1_Init /* 00178 809988F8 8FB10028 */ lw $s1, 0x0028($sp) /* 0017C 809988FC 03E00008 */ jr $ra /* 00180 80998900 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Update.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Update.s index f83939acbb..1403c0921a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Update.s @@ -26,5 +26,3 @@ glabel DoorWarp1_Update /* 029B4 8099B134 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029B8 8099B138 03E00008 */ jr $ra /* 029BC 8099B13C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998780.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998780.s index e4719dd1af..23b27f57b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998780.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998780.s @@ -1,5 +1,3 @@ glabel func_80998780 /* 00000 80998780 03E00008 */ jr $ra /* 00004 80998784 AC8501C0 */ sw $a1, 0x01C0($a0) ## 000001C0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s index 3fbc7c4719..a4ddf23d4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s @@ -215,5 +215,3 @@ glabel L80998B6C /* 00504 80998C84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00508 80998C88 03E00008 */ jr $ra /* 0050C 80998C8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s index 4426959f0f..ff0504d733 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s @@ -117,5 +117,3 @@ glabel func_80998C90 /* 006D0 80998E50 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 006D4 80998E54 03E00008 */ jr $ra /* 006D8 80998E58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s index d1940a09f1..576b3d61f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s @@ -106,5 +106,3 @@ glabel func_80998E5C /* 00868 80998FE8 8FB10028 */ lw $s1, 0x0028($sp) /* 0086C 80998FEC 03E00008 */ jr $ra /* 00870 80998FF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s index 2170b04430..6765ef8e48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s @@ -110,5 +110,3 @@ glabel func_80998FF4 /* 00A08 80999188 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00A0C 8099918C 03E00008 */ jr $ra /* 00A10 80999190 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999194.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999194.s index 5d8b429f3e..165afbaed1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999194.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999194.s @@ -12,5 +12,3 @@ glabel func_80999194 /* 00A3C 809991BC C492002C */ lwc1 $f18, 0x002C($a0) ## 0000002C /* 00A40 809991C0 03E00008 */ jr $ra /* 00A44 809991C4 E452002C */ swc1 $f18, 0x002C($v0) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809991C8.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809991C8.s index 7d95dbf538..4fd3ca5ddf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809991C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809991C8.s @@ -20,5 +20,3 @@ glabel func_809991C8 /* 00A88 80999208 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A8C 8099920C 03E00008 */ jr $ra /* 00A90 80999210 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s index cfadd9a803..8833814a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s @@ -80,5 +80,3 @@ glabel func_80999214 /* 00BBC 8099933C 8FB10020 */ lw $s1, 0x0020($sp) /* 00BC0 80999340 03E00008 */ jr $ra /* 00BC4 80999344 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s index d4082ab0af..71ff0faf4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s @@ -53,5 +53,3 @@ glabel func_80999348 /* 00C84 80999404 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C88 80999408 03E00008 */ jr $ra /* 00C8C 8099940C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999410.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999410.s index b378c7b7fc..fd423bf95c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999410.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999410.s @@ -5,5 +5,3 @@ glabel func_80999410 /* 00C9C 8099941C C424C744 */ lwc1 $f4, %lo(D_8099C744)($at) /* 00CA0 80999420 03E00008 */ jr $ra /* 00CA4 80999424 E444006C */ swc1 $f4, 0x006C($v0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s index 650c34d207..dd8491e6fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s @@ -60,5 +60,3 @@ glabel func_80999428 /* 00D7C 809994FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D80 80999500 03E00008 */ jr $ra /* 00D84 80999504 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999508.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999508.s index 7755412f1b..c2a15eb2ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999508.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999508.s @@ -35,5 +35,3 @@ glabel L80999568 /* 00DF4 80999574 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DF8 80999578 03E00008 */ jr $ra /* 00DFC 8099957C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s index 077705db5c..7bd859f1ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s @@ -23,5 +23,3 @@ glabel func_80999580 /* 00E48 809995C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E4C 809995CC 03E00008 */ jr $ra /* 00E50 809995D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809995D4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809995D4.s index 46109df5ce..d21a1805aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809995D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809995D4.s @@ -87,5 +87,3 @@ glabel func_809995D4 /* 00F98 80999718 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F9C 8099971C 03E00008 */ jr $ra /* 00FA0 80999720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s index 60ae569562..1d473a3467 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s @@ -109,5 +109,3 @@ glabel func_80999724 /* 01118 80999898 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0111C 8099989C 03E00008 */ jr $ra /* 01120 809998A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s index 70d9b28c0c..390c300919 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s @@ -40,5 +40,3 @@ glabel func_809998A4 /* 011AC 8099992C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 011B0 80999930 03E00008 */ jr $ra /* 011B4 80999934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999938.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999938.s index efcebd1fdc..92c764cecd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999938.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999938.s @@ -26,5 +26,3 @@ glabel func_80999938 .L80999998: /* 01218 80999998 03E00008 */ jr $ra /* 0121C 8099999C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s index 6efc36fe47..428acf1a45 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s @@ -52,5 +52,3 @@ glabel func_809999A0 /* 012DC 80999A5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 012E0 80999A60 03E00008 */ jr $ra /* 012E4 80999A64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s index ff397d74be..1bdc783470 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s @@ -277,5 +277,3 @@ glabel func_80999A68 /* 016D8 80999E58 8FB20030 */ lw $s2, 0x0030($sp) /* 016DC 80999E5C 03E00008 */ jr $ra /* 016E0 80999E60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999E64.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999E64.s index 97445d5be9..5a07f45066 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999E64.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999E64.s @@ -33,5 +33,3 @@ glabel func_80999E64 /* 01754 80999ED4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01758 80999ED8 03E00008 */ jr $ra /* 0175C 80999EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s index 102ad8ed65..3b6e5f1b37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s @@ -65,5 +65,3 @@ glabel func_80999EE0 /* 01858 80999FD8 8FB10018 */ lw $s1, 0x0018($sp) /* 0185C 80999FDC 03E00008 */ jr $ra /* 01860 80999FE0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s index 949956a394..08cb145ff9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s @@ -46,5 +46,3 @@ glabel func_80999FE4 /* 0190C 8099A08C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01910 8099A090 03E00008 */ jr $ra /* 01914 8099A094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s index a8ab22c154..947513da97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s @@ -204,5 +204,3 @@ glabel func_8099A098 /* 01C18 8099A398 8FB20030 */ lw $s2, 0x0030($sp) /* 01C1C 8099A39C 03E00008 */ jr $ra /* 01C20 8099A3A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s index 976590ad2a..abb75050e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s @@ -56,5 +56,3 @@ glabel func_8099A3A4 /* 01CE0 8099A460 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01CE4 8099A464 03E00008 */ jr $ra /* 01CE8 8099A468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A46C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A46C.s index a51d3172a8..491a0a04ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A46C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A46C.s @@ -40,5 +40,3 @@ glabel func_8099A46C /* 01D7C 8099A4FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01D80 8099A500 03E00008 */ jr $ra /* 01D84 8099A504 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s index 02e5bb2f28..6b2fabf584 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s @@ -61,5 +61,3 @@ glabel func_8099A508 /* 01E60 8099A5E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01E64 8099A5E4 03E00008 */ jr $ra /* 01E68 8099A5E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s index d900736238..35bb91db85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s @@ -623,5 +623,3 @@ glabel func_8099A5EC /* 02758 8099AED8 8FB10028 */ lw $s1, 0x0028($sp) /* 0275C 8099AEDC 03E00008 */ jr $ra /* 02760 8099AEE0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099AEE4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099AEE4.s index dc7034a5b6..23f7489d07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099AEE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099AEE4.s @@ -83,5 +83,3 @@ glabel func_8099AEE4 /* 02888 8099B008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0288C 8099B00C 03E00008 */ jr $ra /* 02890 8099B010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B014.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B014.s index bd1193ea6a..e01f0dac01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B014.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B014.s @@ -2,5 +2,3 @@ glabel func_8099B014 /* 02894 8099B014 AFA40000 */ sw $a0, 0x0000($sp) /* 02898 8099B018 03E00008 */ jr $ra /* 0289C 8099B01C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s index 56c5b85b78..ee0f09c1e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s @@ -52,5 +52,3 @@ glabel func_8099B020 /* 02950 8099B0D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02954 8099B0D4 03E00008 */ jr $ra /* 02958 8099B0D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s index b81f64a5fd..880ac2a7bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s @@ -133,5 +133,3 @@ glabel func_8099B140 /* 02BB0 8099B330 8FB10028 */ lw $s1, 0x0028($sp) /* 02BB4 8099B334 03E00008 */ jr $ra /* 02BB8 8099B338 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s index cb7c7d44b8..ba6b30787b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s @@ -181,5 +181,3 @@ glabel func_8099B33C /* 02E60 8099B5E0 8FB20030 */ lw $s2, 0x0030($sp) /* 02E64 8099B5E4 03E00008 */ jr $ra /* 02E68 8099B5E8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s index 0d9a721738..88c76b9886 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s @@ -1015,5 +1015,3 @@ glabel func_8099B5EC /* 03D64 8099C4E4 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 /* 03D68 8099C4E8 03E00008 */ jr $ra /* 03D6C 8099C4EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Destroy.s index da38a930f9..a313998a4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Destroy.s @@ -2,5 +2,3 @@ glabel EfcErupc_Destroy /* 00070 8099CD20 AFA40000 */ sw $a0, 0x0000($sp) /* 00074 8099CD24 03E00008 */ jr $ra /* 00078 8099CD28 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s index eaa8aaf487..7eb12639f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s @@ -1,3 +1,28 @@ +.rdata +glabel D_8099D790 + .asciz "../z_efc_erupc.c" + .balign 4 + +glabel D_8099D7A4 + .asciz "../z_efc_erupc.c" + .balign 4 + +glabel D_8099D7B8 + .asciz "../z_efc_erupc.c" + .balign 4 + +glabel D_8099D7CC + .asciz "../z_efc_erupc.c" + .balign 4 + +.late_rodata +glabel D_8099D820 + .float 0.8 + +glabel D_8099D824 + .word 0x4059999A, 0x00000000, 0x00000000 + +.text glabel EfcErupc_Draw /* 00300 8099CFB0 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00304 8099CFB4 AFB10038 */ sw $s1, 0x0038($sp) @@ -227,5 +252,3 @@ glabel EfcErupc_Draw /* 00678 8099D328 8FB10038 */ lw $s1, 0x0038($sp) /* 0067C 8099D32C 03E00008 */ jr $ra /* 00680 8099D330 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Init.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Init.s index edfa6e9866..8b286e58d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Init.s @@ -26,5 +26,3 @@ glabel EfcErupc_Init /* 00064 8099CD14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00068 8099CD18 03E00008 */ jr $ra /* 0006C 8099CD1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Update.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Update.s index 1feb3f8cfb..783ca1df95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Update.s @@ -13,5 +13,3 @@ glabel EfcErupc_Update /* 002F4 8099CFA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 8099CFA8 03E00008 */ jr $ra /* 002FC 8099CFAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CCB0.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CCB0.s index d4a48f040b..5f61e16b0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CCB0.s @@ -1,5 +1,3 @@ glabel func_8099CCB0 /* 00000 8099CCB0 03E00008 */ jr $ra /* 00004 8099CCB4 AC8518C8 */ sw $a1, 0x18C8($a0) ## 000018C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s index fb3a779bb9..cfd8650aa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8099D81C + .float 0.1 + +.text glabel func_8099CD2C /* 0007C 8099CD2C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00080 8099CD30 AFBF0044 */ sw $ra, 0x0044($sp) @@ -164,5 +169,3 @@ glabel func_8099CD2C /* 002BC 8099CF6C 8FB20040 */ lw $s2, 0x0040($sp) /* 002C0 8099CF70 03E00008 */ jr $ra /* 002C4 8099CF74 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s index adf7fece29..bd7ca9f752 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8099D7E0 + .asciz "../z_efc_erupc.c" + .balign 4 + +glabel D_8099D7F4 + .asciz "../z_efc_erupc.c" + .balign 4 + +glabel D_8099D808 + .asciz "../z_efc_erupc.c" + .balign 4 + +.text glabel func_8099D334 /* 00684 8099D334 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00688 8099D338 AFBF0044 */ sw $ra, 0x0044($sp) @@ -127,5 +141,3 @@ glabel func_8099D334 /* 00870 8099D520 8FBE0040 */ lw $s8, 0x0040($sp) /* 00874 8099D524 03E00008 */ jr $ra /* 00878 8099D528 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D52C.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D52C.s index 9ff9daca9c..8e83501ed7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D52C.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D52C.s @@ -76,5 +76,3 @@ glabel func_8099D52C /* 00994 8099D644 2442003C */ addiu $v0, $v0, 0x003C ## $v0 = 00000194 /* 00998 8099D648 03E00008 */ jr $ra /* 0099C 8099D64C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s index 2c7eebdd0c..07d9e1a261 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s @@ -54,5 +54,3 @@ glabel func_8099D650 /* 00A60 8099D710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A64 8099D714 03E00008 */ jr $ra /* 00A68 8099D718 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D71C.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D71C.s index c1a1cc34af..6b6d463155 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D71C.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D71C.s @@ -13,4 +13,3 @@ glabel func_8099D71C /* 00A94 8099D744 00000000 */ nop /* 00A98 8099D748 00000000 */ nop /* 00A9C 8099D74C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Destroy.s index 5c3be26983..112c139de7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Destroy.s @@ -2,5 +2,3 @@ glabel EffDust_Destroy /* 0024C 8099DB1C AFA40000 */ sw $a0, 0x0000($sp) /* 00250 8099DB20 03E00008 */ jr $ra /* 00254 8099DB24 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s index dbbcb88696..57872cff33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s @@ -8,4 +8,3 @@ glabel EffDust_Draw /* 01264 8099EB34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01268 8099EB38 03E00008 */ jr $ra /* 0126C 8099EB3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Init.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Init.s index 5952ad9efd..6b146b5851 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_8099EB70 + .asciz "../z_eff_dust.c" + .balign 4 + +.late_rodata +glabel jtbl_8099EBE0 +.word L8099D998 +.word L8099D9E4 +.word L8099DA30 +.word L8099DA6C +.word L8099DAA8 +glabel D_8099EBF4 + .float 0.8 + +glabel D_8099EBF8 + .float 0.1 + +glabel D_8099EBFC + .float 0.8 + +.text glabel EffDust_Init /* 00084 8099D954 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00088 8099D958 AFBF001C */ sw $ra, 0x001C($sp) @@ -120,5 +142,3 @@ glabel L8099DAA8 /* 00240 8099DB10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00244 8099DB14 03E00008 */ jr $ra /* 00248 8099DB18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Update.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Update.s index b0cf7292dd..3bba88557c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Update.s @@ -8,5 +8,3 @@ glabel EffDust_Update /* 00C18 8099E4E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C1C 8099E4EC 03E00008 */ jr $ra /* 00C20 8099E4F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s index 349a91e7a6..050ed3c7d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s @@ -1,5 +1,3 @@ glabel func_8099D8D0 /* 00000 8099D8D0 03E00008 */ jr $ra /* 00004 8099D8D4 AC850560 */ sw $a1, 0x0560($a0) ## 00000560 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s index 61c24c0459..d59761185d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s @@ -1,5 +1,3 @@ glabel func_8099D8D8 /* 00008 8099D8D8 03E00008 */ jr $ra /* 0000C 8099D8DC AC850564 */ sw $a1, 0x0564($a0) ## 00000564 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s index c59a1dd8f7..6a76aff8be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s @@ -29,5 +29,3 @@ glabel func_8099D8E0 /* 00078 8099D948 24A50010 */ addiu $a1, $a1, 0x0010 ## $a1 = 00000010 /* 0007C 8099D94C 03E00008 */ jr $ra /* 00080 8099D950 A080054C */ sb $zero, 0x054C($a0) ## 0000054C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s index e8b166cb98..64ec51fd2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8099EC00 + .float 0.05 + +.text glabel func_8099DB28 /* 00258 8099DB28 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0025C 8099DB2C F7B60020 */ sdc1 $f22, 0x0020($sp) @@ -160,5 +165,3 @@ glabel func_8099DB28 /* 00498 8099DD68 8FBE0068 */ lw $s8, 0x0068($sp) /* 0049C 8099DD6C 03E00008 */ jr $ra /* 004A0 8099DD70 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s index 118813a7f5..3729343991 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8099EC04 + .float 0.03 + +.text glabel func_8099DD74 /* 004A4 8099DD74 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 004A8 8099DD78 F7B60020 */ sdc1 $f22, 0x0020($sp) @@ -160,5 +165,3 @@ glabel func_8099DD74 /* 006E4 8099DFB4 8FBE0068 */ lw $s8, 0x0068($sp) /* 006E8 8099DFB8 03E00008 */ jr $ra /* 006EC 8099DFBC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s index b8a39153be..72c7e3d257 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_8099EC08 + .float 0.2 + +glabel D_8099EC0C + .float 0.1 + +glabel D_8099EC10 + .float 3000.0 + +glabel D_8099EC14 + .float 4500.0 + +glabel D_8099EC18 + .float 2500.0 + +glabel D_8099EC1C + .word 0x4604D000 +glabel D_8099EC20 + .word 0x44D48000 +glabel D_8099EC24 + .float 5000.0 + +.text glabel func_8099DFC0 /* 006F0 8099DFC0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 006F4 8099DFC4 AFBF005C */ sw $ra, 0x005C($sp) @@ -372,5 +396,3 @@ glabel func_8099DFC0 /* 00BF4 8099E4C4 8FB60058 */ lw $s6, 0x0058($sp) /* 00BF8 8099E4C8 03E00008 */ jr $ra /* 00BFC 8099E4CC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s index 722b8e376e..ae4eaf107e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8099EB80 + .asciz "../z_eff_dust.c" + .balign 4 + +glabel D_8099EB90 + .asciz "../z_eff_dust.c" + .balign 4 + +glabel D_8099EBA0 + .asciz "../z_eff_dust.c" + .balign 4 + +.text glabel func_8099E4F4 /* 00C24 8099E4F4 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 00C28 8099E4F8 AFBF004C */ sw $ra, 0x004C($sp) @@ -165,5 +179,3 @@ glabel func_8099E4F4 /* 00EA8 8099E778 8FBE0048 */ lw $s8, 0x0048($sp) /* 00EAC 8099E77C 03E00008 */ jr $ra /* 00EB0 8099E780 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s index 283d5c8d60..080680d4b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8099EBB0 + .asciz "../z_eff_dust.c" + .balign 4 + +glabel D_8099EBC0 + .asciz "../z_eff_dust.c" + .balign 4 + +glabel D_8099EBD0 + .asciz "../z_eff_dust.c" + .balign 4 + +.late_rodata +glabel D_8099EC28 + .float 0.85 + +.text glabel func_8099E784 /* 00EB4 8099E784 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00EB8 8099E788 AFBF0064 */ sw $ra, 0x0064($sp) @@ -236,5 +254,3 @@ glabel func_8099E784 /* 01240 8099EB10 8FBE0060 */ lw $s8, 0x0060($sp) /* 01244 8099EB14 03E00008 */ jr $ra /* 01248 8099EB18 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Destroy.s index 6bb4c13d1e..99378daf95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Destroy.s @@ -2,5 +2,3 @@ glabel ElfMsg_Destroy /* 002A0 809ACDC0 AFA40000 */ sw $a0, 0x0000($sp) /* 002A4 809ACDC4 03E00008 */ jr $ra /* 002A8 809ACDC8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s index 7d54a789a4..e0541f41eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809AD5C0 + .asciz "../z_elf_msg.c" + .balign 4 + +glabel D_809AD5D0 + .asciz "../z_elf_msg.c" + .balign 4 + +glabel D_809AD5E0 + .asciz "../z_elf_msg.c" + .balign 4 + +.text glabel ElfMsg_Draw /* 00570 809AD090 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00574 809AD094 AFBF0014 */ sw $ra, 0x0014($sp) @@ -116,4 +130,3 @@ glabel ElfMsg_Draw /* 00724 809AD244 00000000 */ nop /* 00728 809AD248 00000000 */ nop /* 0072C 809AD24C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Init.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Init.s index d45c0a4891..8c1a6af2b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Init.s @@ -1,3 +1,30 @@ +.rdata +glabel D_809AD550 + .asciz "\nエルフ タグ 消える条件 %d\n" + .balign 4 + +glabel D_809AD574 + .asciz "\nthisx->shape.angle.sy = %d\n" + .balign 4 + +glabel D_809AD59C + .asciz "\nエルフ タグ 出現条件 %d\n" + .balign 4 + +.late_rodata +glabel D_809AD5F0 + .float 0.4 + +glabel D_809AD5F4 + .float 0.04 + +glabel D_809AD5F8 + .float 0.4 + +glabel D_809AD5FC + .float 0.04 + +.text glabel ElfMsg_Init /* 0015C 809ACC7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00160 809ACC80 AFB00018 */ sw $s0, 0x0018($sp) @@ -92,5 +119,3 @@ glabel ElfMsg_Init /* 00294 809ACDB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00298 809ACDB8 03E00008 */ jr $ra /* 0029C 809ACDBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Update.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Update.s index b0dc611e1a..8acbe9d3e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Update.s @@ -52,5 +52,3 @@ glabel ElfMsg_Update /* 00564 809AD084 8FB10018 */ lw $s1, 0x0018($sp) /* 00568 809AD088 03E00008 */ jr $ra /* 0056C 809AD08C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB20.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB20.s index 23e032f578..e3100b65ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB20.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB20.s @@ -1,5 +1,3 @@ glabel func_809ACB20 /* 00000 809ACB20 03E00008 */ jr $ra /* 00004 809ACB24 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB28.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB28.s index d2899a57f6..4cf195bb58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB28.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACB28.s @@ -1,3 +1,29 @@ +.rdata +glabel D_809AD500 + .asciz "../z_elf_msg.c" + .balign 4 + +glabel D_809AD510 + .asciz "\"共倒れ\" = %s\n" + .balign 4 + +glabel D_809AD520 + .asciz "共倒れ" + .balign 4 + +glabel D_809AD528 + .asciz "../z_elf_msg.c" + .balign 4 + +glabel D_809AD538 + .asciz "\"共倒れ\" = %s\n" + .balign 4 + +glabel D_809AD548 + .asciz "共倒れ" + .balign 4 + +.text glabel func_809ACB28 /* 00008 809ACB28 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0000C 809ACB2C AFBF001C */ sw $ra, 0x001C($sp) @@ -103,5 +129,3 @@ glabel func_809ACB28 /* 00150 809ACC70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00154 809ACC74 03E00008 */ jr $ra /* 00158 809ACC78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDCC.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDCC.s index bbc8c1eb91..4650dd689b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDCC.s @@ -11,5 +11,3 @@ glabel func_809ACDCC /* 002CC 809ACDEC 030F1023 */ subu $v0, $t8, $t7 /* 002D0 809ACDF0 03E00008 */ jr $ra /* 002D4 809ACDF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDF8.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDF8.s index 56baba851c..51d70a7d77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACDF8.s @@ -52,5 +52,3 @@ glabel func_809ACDF8 /* 0039C 809ACEBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003A0 809ACEC0 03E00008 */ jr $ra /* 003A4 809ACEC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACEC8.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACEC8.s index d63602224c..26ca38904d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACEC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACEC8.s @@ -20,5 +20,3 @@ glabel func_809ACEC8 .L809ACF10: /* 003F0 809ACF10 03E00008 */ jr $ra /* 003F4 809ACF14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACF18.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACF18.s index bab5a0ac63..9ef510238a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACF18.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/func_809ACF18.s @@ -50,5 +50,3 @@ glabel func_809ACF18 /* 004B0 809ACFD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004B4 809ACFD4 03E00008 */ jr $ra /* 004B8 809ACFD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Destroy.s index 99b76ed2ab..82f26d7ebe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Destroy.s @@ -2,5 +2,3 @@ glabel ElfMsg2_Destroy /* 0025C 809AD95C AFA40000 */ sw $a0, 0x0000($sp) /* 00260 809AD960 03E00008 */ jr $ra /* 00264 809AD964 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s index de9371c9c6..e5ba1c215f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809ADDE4 + .asciz "../z_elf_msg2.c" + .balign 4 + +glabel D_809ADDF4 + .asciz "../z_elf_msg2.c" + .balign 4 + +glabel D_809ADE04 + .asciz "../z_elf_msg2.c" + .balign 4 + +.text glabel ElfMsg2_Draw /* 003DC 809ADADC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 003E0 809ADAE0 AFBF001C */ sw $ra, 0x001C($sp) @@ -77,4 +91,3 @@ glabel ElfMsg2_Draw /* 00504 809ADC04 00000000 */ nop /* 00508 809ADC08 00000000 */ nop /* 0050C 809ADC0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Init.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Init.s index 280fdbb6d6..f7e25ad778 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809ADDC0 + .asciz " Elf_Msg2_Actor_ct %04x\n\n" + .balign 4 + +.text glabel ElfMsg2_Init /* 00184 809AD884 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00188 809AD888 AFB00018 */ sw $s0, 0x0018($sp) @@ -59,5 +65,3 @@ glabel ElfMsg2_Init /* 00250 809AD950 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00254 809AD954 03E00008 */ jr $ra /* 00258 809AD958 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Update.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Update.s index 95a007bfc9..e9c5e88e34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Update.s @@ -15,5 +15,3 @@ glabel ElfMsg2_Update /* 003D0 809ADAD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003D4 809ADAD4 03E00008 */ jr $ra /* 003D8 809ADAD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD700.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD700.s index ed04c17cd8..b11347fc9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD700.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD700.s @@ -1,5 +1,3 @@ glabel func_809AD700 /* 00000 809AD700 03E00008 */ jr $ra /* 00004 809AD704 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD708.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD708.s index 5ef4fe9f9f..a473aa44a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD708.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD708.s @@ -1,3 +1,41 @@ +.rdata +glabel D_809ADD40 + .asciz "../z_elf_msg2.c" + .balign 4 + +glabel D_809ADD50 + .asciz "\"共倒れ\" = %s\n" + .balign 4 + +glabel D_809ADD60 + .asciz "共倒れ" + .balign 4 + +glabel D_809ADD68 + .asciz "../z_elf_msg2.c" + .balign 4 + +glabel D_809ADD78 + .asciz "\"共倒れ２\" = %s\n" + .balign 4 + +glabel D_809ADD8C + .asciz "共倒れ２" + .balign 4 + +glabel D_809ADD98 + .asciz "../z_elf_msg2.c" + .balign 4 + +glabel D_809ADDA8 + .asciz "\"共倒れ\" = %s\n" + .balign 4 + +glabel D_809ADDB8 + .asciz "共倒れ" + .balign 4 + +.text glabel func_809AD708 /* 00008 809AD708 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0000C 809AD70C AFBF0014 */ sw $ra, 0x0014($sp) @@ -116,5 +154,3 @@ glabel func_809AD708 /* 00178 809AD878 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0017C 809AD87C 03E00008 */ jr $ra /* 00180 809AD880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD968.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD968.s index 30350501af..6c405aa290 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD968.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD968.s @@ -3,5 +3,3 @@ glabel func_809AD968 /* 0026C 809AD96C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 /* 00270 809AD970 03E00008 */ jr $ra /* 00274 809AD974 24420100 */ addiu $v0, $v0, 0x0100 ## $v0 = 00000100 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD978.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD978.s index fa232cc684..b8766f34a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD978.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD978.s @@ -35,5 +35,3 @@ glabel func_809AD978 /* 002E8 809AD9E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002EC 809AD9EC 03E00008 */ jr $ra /* 002F0 809AD9F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD9F4.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD9F4.s index 2b1508d7ef..f78976b4b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD9F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD9F4.s @@ -13,5 +13,3 @@ glabel func_809AD9F4 /* 0031C 809ADA1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00320 809ADA20 03E00008 */ jr $ra /* 00324 809ADA24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809ADA28.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809ADA28.s index 1cfbd69873..de6c539d9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809ADA28.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809ADA28.s @@ -31,5 +31,3 @@ glabel func_809ADA28 /* 00394 809ADA94 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00398 809ADA98 03E00008 */ jr $ra /* 0039C 809ADA9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s index 9759b2cfa7..d25f53d45a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s @@ -24,5 +24,3 @@ glabel EnAm_Destroy /* 00344 809AE264 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00348 809AE268 03E00008 */ jr $ra /* 0034C 809AE26C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s index 55cedeb8db..c4d2ebc57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809B0160 + .asciz "../z_en_am.c" + .balign 4 + +glabel D_809B0170 + .asciz "../z_en_am.c" + .balign 4 + +.late_rodata +glabel D_809B0184 + .float 1.4 + +.text glabel EnAm_Draw /* 01EC4 809AFDE4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 01EC8 809AFDE8 AFB10038 */ sw $s1, 0x0038($sp) @@ -96,4 +110,3 @@ glabel EnAm_Draw /* 02034 809AFF54 03E00008 */ jr $ra /* 02038 809AFF58 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 0203C 809AFF5C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s index d6f770830a..c305fdef74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s @@ -128,5 +128,3 @@ glabel EnAm_Init /* 002EC 809AE20C 8FB00024 */ lw $s0, 0x0024($sp) /* 002F0 809AE210 03E00008 */ jr $ra /* 002F4 809AE214 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s index 3d8ef91b91..4f2240fb8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B0180 + .float 4500.0 + +.text glabel EnAm_Update /* 01ADC 809AF9FC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 01AE0 809AFA00 AFBF004C */ sw $ra, 0x004C($sp) @@ -261,5 +266,3 @@ glabel EnAm_Update /* 01E70 809AFD90 8FB30048 */ lw $s3, 0x0048($sp) /* 01E74 809AFD94 03E00008 */ jr $ra /* 01E78 809AFD98 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF20.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF20.s index ae2200d0b3..dc5485113b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF20.s @@ -1,5 +1,3 @@ glabel func_809ADF20 /* 00000 809ADF20 03E00008 */ jr $ra /* 00004 809ADF24 AC850254 */ sw $a1, 0x0254($a0) ## 00000254 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s index 67b51dfd3f..cc28d1ce2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s @@ -76,5 +76,3 @@ glabel func_809ADF28 /* 00124 809AE044 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00128 809AE048 03E00008 */ jr $ra /* 0012C 809AE04C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s index b27ff182f9..bab98e744e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s @@ -107,5 +107,3 @@ glabel func_809AE270 /* 004E0 809AE400 8FB70068 */ lw $s7, 0x0068($sp) /* 004E4 809AE404 03E00008 */ jr $ra /* 004E8 809AE408 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s index 5bdaf9cbf3..2e3d9012c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s @@ -42,5 +42,3 @@ glabel func_809AE40C /* 0057C 809AE49C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00580 809AE4A0 03E00008 */ jr $ra /* 00584 809AE4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s index 269fba4b6e..ba905869c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s @@ -37,5 +37,3 @@ glabel func_809AE4A8 /* 0060C 809AE52C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00610 809AE530 03E00008 */ jr $ra /* 00614 809AE534 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s index b246a78566..3d24a9e9fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s @@ -24,5 +24,3 @@ glabel func_809AE538 /* 00670 809AE590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00674 809AE594 03E00008 */ jr $ra /* 00678 809AE598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s index 6520213c07..0ab2a87dab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s @@ -26,5 +26,3 @@ glabel func_809AE59C /* 006DC 809AE5FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E0 809AE600 03E00008 */ jr $ra /* 006E4 809AE604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s index bf6548664d..ead41652fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s @@ -22,5 +22,3 @@ glabel func_809AE608 /* 00738 809AE658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0073C 809AE65C 03E00008 */ jr $ra /* 00740 809AE660 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s index eb6abb7515..0fd4e54312 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s @@ -22,5 +22,3 @@ glabel func_809AE664 /* 00794 809AE6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00798 809AE6B8 03E00008 */ jr $ra /* 0079C 809AE6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s index 380b57e367..1d29016730 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s @@ -22,5 +22,3 @@ glabel func_809AE6C0 /* 007F0 809AE710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F4 809AE714 03E00008 */ jr $ra /* 007F8 809AE718 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s index b8c4aed7fa..9dae26ae79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s @@ -57,5 +57,3 @@ glabel func_809AE71C /* 008C8 809AE7E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 008CC 809AE7EC 03E00008 */ jr $ra /* 008D0 809AE7F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s index ed98992773..6c2c2a97ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s @@ -46,5 +46,3 @@ glabel func_809AE7F4 /* 0097C 809AE89C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00980 809AE8A0 03E00008 */ jr $ra /* 00984 809AE8A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s index 565e18a404..4744b00ebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s @@ -174,5 +174,3 @@ glabel func_809AE8A8 /* 00BE8 809AEB08 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00BEC 809AEB0C 03E00008 */ jr $ra /* 00BF0 809AEB10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s index c103b41256..cf736c42d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s @@ -73,5 +73,3 @@ glabel func_809AEB14 /* 00CF0 809AEC10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00CF4 809AEC14 03E00008 */ jr $ra /* 00CF8 809AEC18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s index 37e851cac6..56f476ccb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s @@ -103,5 +103,3 @@ glabel func_809AEC1C /* 00E60 809AED80 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E64 809AED84 03E00008 */ jr $ra /* 00E68 809AED88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s index 943ced7072..16b7e2017c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s @@ -102,5 +102,3 @@ glabel func_809AED8C /* 00FD4 809AEEF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00FD8 809AEEF8 03E00008 */ jr $ra /* 00FDC 809AEEFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEF00.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEF00.s index 85964bee5a..2a473c1c59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEF00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEF00.s @@ -44,5 +44,3 @@ glabel func_809AEF00 /* 01078 809AEF98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0107C 809AEF9C 03E00008 */ jr $ra /* 01080 809AEFA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s index 4f25dac87b..9b6230bf70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s @@ -88,5 +88,3 @@ glabel func_809AEFA4 /* 011B0 809AF0D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 011B4 809AF0D4 03E00008 */ jr $ra /* 011B8 809AF0D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s index f97fd5c9bf..6e02fd1513 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s @@ -155,5 +155,3 @@ glabel func_809AF0DC /* 013E0 809AF300 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 013E4 809AF304 03E00008 */ jr $ra /* 013E8 809AF308 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s index 82fed8fc41..ab11260f79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s @@ -161,5 +161,3 @@ glabel func_809AF30C /* 0162C 809AF54C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01630 809AF550 03E00008 */ jr $ra /* 01634 809AF554 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s index 29f76d6e4c..5a9ee4cb2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s @@ -63,5 +63,3 @@ glabel func_809AF558 /* 01718 809AF638 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0171C 809AF63C 03E00008 */ jr $ra /* 01720 809AF640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s index 98d8b060ce..9cb0031b3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s @@ -57,5 +57,3 @@ glabel func_809AF644 /* 017EC 809AF70C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017F0 809AF710 03E00008 */ jr $ra /* 017F4 809AF714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF718.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF718.s index c19d0e3122..0a285bc7f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF718.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF718.s @@ -48,5 +48,3 @@ glabel func_809AF718 /* 018A0 809AF7C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 018A4 809AF7C4 03E00008 */ jr $ra /* 018A8 809AF7C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF7CC.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF7CC.s index 55b1a9d53f..d60f94fa59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF7CC.s @@ -37,5 +37,3 @@ glabel func_809AF7CC /* 01938 809AF858 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0193C 809AF85C 03E00008 */ jr $ra /* 01940 809AF860 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF864.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF864.s index 01dc084939..8101dcc6dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF864.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF864.s @@ -110,5 +110,3 @@ glabel func_809AF864 /* 01AD0 809AF9F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01AD4 809AF9F4 03E00008 */ jr $ra /* 01AD8 809AF9F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AFD9C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AFD9C.s index ea4444ab7e..402be59b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AFD9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AFD9C.s @@ -19,5 +19,3 @@ glabel func_809AFD9C /* 01EB8 809AFDD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01EBC 809AFDDC 03E00008 */ jr $ra /* 01EC0 809AFDE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s index 2dd4250f5c..f5aef9694d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s @@ -23,5 +23,3 @@ glabel EnAnubice_Destroy /* 00300 809B1420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00304 809B1424 03E00008 */ jr $ra /* 00308 809B1428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Draw.s index 4e6c4fdf81..65437046fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Draw.s @@ -23,4 +23,3 @@ glabel EnAnubice_Draw /* 01184 809B22A4 00000000 */ nop /* 01188 809B22A8 00000000 */ nop /* 0118C 809B22AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s index 6e98da5d74..79c4f8a420 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809B2340 + .asciz "\n\n" + .balign 4 + +glabel D_809B2344 + .asciz "☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel D_809B241C + .float -4230.0 + +.text glabel EnAnubice_Init /* 00184 809B12A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00188 809B12A8 AFB00028 */ sw $s0, 0x0028($sp) @@ -82,5 +96,3 @@ glabel EnAnubice_Init /* 002A8 809B13C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 002AC 809B13CC 03E00008 */ jr $ra /* 002B0 809B13D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s index 7fd4cbf23b..4671df41a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B2438 + .float 3.1415927 + +.text glabel EnAnubice_Update /* 00BE8 809B1D08 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00BEC 809B1D0C 3C0E809B */ lui $t6, %hi(func_809B1984) ## $t6 = 809B0000 @@ -278,5 +283,3 @@ glabel EnAnubice_Update /* 00FD8 809B20F8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00FDC 809B20FC 03E00008 */ jr $ra /* 00FE0 809B2100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s index 9ad1e8da3b..cf70703b0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B2410 + .float 1500.0 + +.text glabel func_809B1120 /* 00000 809B1120 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809B1124 AFBF001C */ sw $ra, 0x001C($sp) @@ -42,5 +47,3 @@ glabel func_809B1120 /* 00094 809B11B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00098 809B11B8 03E00008 */ jr $ra /* 0009C 809B11BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s index 87b0d8af60..d5c880e974 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B2414 + .float 10430.378 +glabel D_809B2418 + .float 10430.378 + +.text glabel func_809B11C0 /* 000A0 809B11C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 000A4 809B11C4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -56,5 +63,3 @@ glabel func_809B11C0 /* 00178 809B1298 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0017C 809B129C 03E00008 */ jr $ra /* 00180 809B12A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B142C.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B142C.s index d7ae863383..3a12d0089b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B142C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B142C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809B2374 + .asciz "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_809B23A4 + .asciz "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %x\n" + .balign 4 + +.text glabel func_809B142C /* 0030C 809B142C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00310 809B1430 AFBF0034 */ sw $ra, 0x0034($sp) @@ -69,5 +79,3 @@ glabel func_809B142C /* 003F8 809B1518 8FB60030 */ lw $s6, 0x0030($sp) /* 003FC 809B151C 03E00008 */ jr $ra /* 00400 809B1520 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s index 642e5896ae..a6a494f8bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s @@ -43,5 +43,3 @@ glabel func_809B1524 /* 004A0 809B15C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004A4 809B15C4 03E00008 */ jr $ra /* 004A8 809B15C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s index ca15d154b1..27aa0cc4c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s @@ -63,5 +63,3 @@ glabel func_809B15CC /* 00580 809B16A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00584 809B16A4 03E00008 */ jr $ra /* 00588 809B16A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s index 9d7087b9e6..d8d631a885 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B2420 + .float -4220.0 +glabel D_809B2424 + .float -4230.0 + +.text glabel func_809B16AC /* 0058C 809B16AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00590 809B16B0 AFB00020 */ sw $s0, 0x0020($sp) @@ -91,5 +98,3 @@ glabel func_809B16AC /* 006D0 809B17F0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 006D4 809B17F4 03E00008 */ jr $ra /* 006D8 809B17F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s index 4e783a9d94..cee3ce2ad7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s @@ -35,5 +35,3 @@ glabel func_809B17FC /* 00758 809B1878 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0075C 809B187C 03E00008 */ jr $ra /* 00760 809B1880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s index 5b5e47a6de..f1593dc0bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s @@ -69,5 +69,3 @@ glabel func_809B1884 /* 00858 809B1978 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0085C 809B197C 03E00008 */ jr $ra /* 00860 809B1980 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s index 7a49704ed7..35ff6ab2ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s @@ -54,5 +54,3 @@ glabel func_809B1984 /* 00928 809B1A48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0092C 809B1A4C 03E00008 */ jr $ra /* 00930 809B1A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s index 7207128986..f100c20670 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809B2428 + .float -11000.0 +glabel D_809B242C + .float -3000.0 +glabel D_809B2430 + .float 3.1415927 # pi +glabel D_809B2434 + .float 3.1415927 # pi + +.text glabel func_809B1A54 /* 00934 809B1A54 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00938 809B1A58 3C0F809B */ lui $t7, %hi(D_809B231C) ## $t7 = 809B0000 @@ -186,5 +197,3 @@ glabel func_809B1A54 /* 00BDC 809B1CFC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00BE0 809B1D00 03E00008 */ jr $ra /* 00BE4 809B1D04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2104.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2104.s index c23cd77514..ab3a86d643 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2104.s @@ -19,5 +19,3 @@ glabel func_809B2104 .L809B2148: /* 01028 809B2148 03E00008 */ jr $ra /* 0102C 809B214C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s index 329213a1a6..954e4e455f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809B23D4 + .asciz "../z_en_anubice.c" + .balign 4 + +glabel D_809B23E8 + .asciz "../z_en_anubice.c" + .balign 4 + +glabel D_809B23FC + .asciz "../z_en_anubice.c" + .balign 4 + +.text glabel func_809B2150 /* 01030 809B2150 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01034 809B2154 3C0F809B */ lui $t7, %hi(D_809B2334) ## $t7 = 809B0000 @@ -65,5 +79,3 @@ glabel func_809B2150 /* 01128 809B2248 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0112C 809B224C 03E00008 */ jr $ra /* 01130 809B2250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s index 81ec0d200c..3bc7ac79fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s @@ -10,5 +10,3 @@ glabel EnAnubiceFire_Destroy /* 00140 809B26E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00144 809B26E4 03E00008 */ jr $ra /* 00148 809B26E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s index ba0445baf1..462ea21ae5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s @@ -1,3 +1,23 @@ +.rdata +glabel D_809B3290 + .asciz "../z_en_anubice_fire.c" + .balign 4 + +glabel D_809B32A8 + .asciz "../z_en_anubice_fire.c" + .balign 4 + +glabel D_809B32C0 + .asciz "../z_en_anubice_fire.c" + .balign 4 + +.late_rodata +glabel D_809B32EC + .float 0.2 +glabel D_809B32F0 + .float 0.1 + +.text glabel EnAnubiceFire_Draw /* 0094C 809B2EEC 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 00950 809B2EF0 AFB5005C */ sw $s5, 0x005C($sp) @@ -184,4 +204,3 @@ glabel EnAnubiceFire_Draw /* 00C14 809B31B4 00000000 */ nop /* 00C18 809B31B8 00000000 */ nop /* 00C1C 809B31BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s index c280ae90f5..2d60b66824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s @@ -74,5 +74,3 @@ glabel EnAnubiceFire_Init /* 00118 809B26B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0011C 809B26BC 03E00008 */ jr $ra /* 00120 809B26C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s index 3dcb972ca8..3595580217 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B32E8 + .float 0.6 + +.text glabel EnAnubiceFire_Update /* 00754 809B2CF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00758 809B2CF8 AFB00020 */ sw $s0, 0x0020($sp) @@ -135,5 +140,3 @@ glabel EnAnubiceFire_Update /* 00940 809B2EE0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00944 809B2EE4 03E00008 */ jr $ra /* 00948 809B2EE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B26EC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B26EC.s index 1440973949..de583a6e44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B26EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B26EC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B32D8 + .float 3.1415927 # pi +glabel D_809B32DC + .float 3.1415927 # pi + +.text glabel func_809B26EC /* 0014C 809B26EC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00150 809B26F0 3C0F809B */ lui $t7, %hi(D_809B320C) ## $t7 = 809B0000 @@ -58,5 +65,3 @@ glabel func_809B26EC /* 0022C 809B27CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00230 809B27D0 03E00008 */ jr $ra /* 00234 809B27D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s index e23eac1c47..fc31237daf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B32E0 + .float 0.1 +glabel D_809B32E4 + .float 0.4 + +.text glabel func_809B27D8 /* 00238 809B27D8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 0023C 809B27DC 3C0E809B */ lui $t6, %hi(D_809B3218) ## $t6 = 809B0000 @@ -233,5 +240,3 @@ glabel func_809B27D8 /* 0059C 809B2B3C 8FBE0058 */ lw $s8, 0x0058($sp) /* 005A0 809B2B40 03E00008 */ jr $ra /* 005A4 809B2B44 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s index 0c903347a9..13cb39dbec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s @@ -112,5 +112,3 @@ glabel func_809B2B48 /* 00748 809B2CE8 8FBE0058 */ lw $s8, 0x0058($sp) /* 0074C 809B2CEC 03E00008 */ jr $ra /* 00750 809B2CF0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s index e9bef8871f..afdf20b2b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s @@ -35,5 +35,3 @@ glabel EnArrow_Destroy /* 002A8 809B3BC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002AC 809B3BCC 03E00008 */ jr $ra /* 002B0 809B3BD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index 8cd475946b..68a0606129 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s @@ -1,3 +1,23 @@ +.rdata +glabel D_809B4EF0 + .asciz "../z_en_arrow.c" + .balign 4 + +glabel D_809B4F00 + .asciz "../z_en_arrow.c" + .balign 4 + +glabel D_809B4F10 + .asciz "../z_en_arrow.c" + .balign 4 + +.late_rodata +glabel D_809B4F5C + .float 0.0000958738 +glabel D_809B4F60 + .float 0.0000958738 + +.text glabel EnArrow_Draw /* 01048 809B4968 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0104C 809B496C AFBF002C */ sw $ra, 0x002C($sp) @@ -253,4 +273,3 @@ glabel EnArrow_Draw /* 01404 809B4D24 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 01408 809B4D28 03E00008 */ jr $ra /* 0140C 809B4D2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s index 62ff221b70..bc43bb5c76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809B4EB0 + .asciz "../z_en_arrow.c" + .balign 4 + +glabel D_809B4EC0 + .asciz "this->at_info.cl_elem.at_btl_info.at_type = %x\n" + .balign 4 + +.text glabel EnArrow_Init /* 00008 809B3928 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 809B392C AFA5003C */ sw $a1, 0x003C($sp) @@ -156,5 +166,3 @@ glabel EnArrow_Init /* 00220 809B3B40 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00224 809B3B44 03E00008 */ jr $ra /* 00228 809B3B48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s index d637c57845..3a6d3626de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s @@ -93,5 +93,3 @@ glabel EnArrow_Update /* 00ED4 809B47F4 8FB10038 */ lw $s1, 0x0038($sp) /* 00ED8 809B47F8 03E00008 */ jr $ra /* 00EDC 809B47FC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3920.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3920.s index 8120da2e20..5b44bb3560 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3920.s @@ -1,5 +1,3 @@ glabel func_809B3920 /* 00000 809B3920 03E00008 */ jr $ra /* 00004 809B3924 AC85025C */ sw $a1, 0x025C($a0) ## 0000025C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3BD4.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3BD4.s index 34d1b4c715..4610e7b521 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3BD4.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_809B4F20 +.word L809B3C50 +.word L809B3C50 +.word L809B3C50 +.word L809B3C64 +.word L809B3C64 +.word L809B3C64 +.word L809B3C70 +.word L809B3C70 +.word L809B3C70 +.word L809B3C3C + +.text glabel func_809B3BD4 /* 002B4 809B3BD4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 002B8 809B3BD8 AFBF001C */ sw $ra, 0x001C($sp) @@ -81,5 +95,3 @@ glabel L809B3C70 /* 003C0 809B3CE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003C4 809B3CE4 03E00008 */ jr $ra /* 003C8 809B3CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s index 87e7485aeb..79989a0ad1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809B4F48 + .float 0.4 +glabel D_809B4F4C + .float 0.04 +glabel D_809B4F50 + .float 0.3 + +.text glabel func_809B3CEC /* 003CC 809B3CEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 003D0 809B3CF0 AFB00018 */ sw $s0, 0x0018($sp) @@ -61,5 +70,3 @@ glabel func_809B3CEC /* 004AC 809B3DCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004B0 809B3DD0 03E00008 */ jr $ra /* 004B4 809B3DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3DD8.s index 953b598bcb..ba29018c42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3DD8.s @@ -139,5 +139,3 @@ glabel func_809B3DD8 /* 006B0 809B3FD0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 006B4 809B3FD4 03E00008 */ jr $ra /* 006B8 809B3FD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s index e74a257e45..76837370cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B4F54 + .float 7.2000003 +glabel D_809B4F58 + .float -0.4 + +.text glabel func_809B3FDC /* 006BC 809B3FDC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 006C0 809B3FE0 AFBF0034 */ sw $ra, 0x0034($sp) @@ -428,5 +435,3 @@ glabel func_809B3FDC /* 00CB4 809B45D4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 00CB8 809B45D8 03E00008 */ jr $ra /* 00CBC 809B45DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B45E0.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B45E0.s index 048a9d96d7..704737f8f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B45E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B45E0.s @@ -28,5 +28,3 @@ glabel func_809B45E0 /* 00D14 809B4634 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D18 809B4638 03E00008 */ jr $ra /* 00D1C 809B463C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4640.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4640.s index 7d2939dd52..2c5e0f5d83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4640.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4640.s @@ -31,5 +31,3 @@ glabel func_809B4640 /* 00D7C 809B469C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D80 809B46A0 03E00008 */ jr $ra /* 00D84 809B46A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s index e9bfe2ba31..2067e27b26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s @@ -93,5 +93,3 @@ glabel func_809B4800 /* 0103C 809B495C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01040 809B4960 03E00008 */ jr $ra /* 01044 809B4964 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Destroy.s index 3cf7c5b04a..4812a3435a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Destroy.s @@ -13,5 +13,3 @@ glabel EnAttackNiw_Destroy .L809B5260: /* 00160 809B5260 03E00008 */ jr $ra /* 00164 809B5264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s index 66144c5c94..79218d6223 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s @@ -23,4 +23,3 @@ glabel EnAttackNiw_Draw /* 01044 809B6144 00000000 */ nop /* 01048 809B6148 00000000 */ nop /* 0104C 809B614C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s index 3bb2eae2ae..4ab29499e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B6190 + .float 60000.0 + +.text glabel EnAttackNiw_Init /* 00000 809B5100 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 809B5104 AFA50034 */ sw $a1, 0x0034($sp) @@ -85,5 +90,3 @@ glabel EnAttackNiw_Init /* 00128 809B5228 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0012C 809B522C 03E00008 */ jr $ra /* 00130 809B5230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Update.s index 97b2fdb76f..70b7fac2c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B61F4 + .float 5000.0 + +.text glabel EnAttackNiw_Update /* 00BD4 809B5CD4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00BD8 809B5CD8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -198,5 +203,3 @@ glabel EnAttackNiw_Update /* 00E8C 809B5F8C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00E90 809B5F90 03E00008 */ jr $ra /* 00E94 809B5F94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5268.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5268.s index 4107086d2d..1f8b70f1d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5268.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5268.s @@ -1,3 +1,35 @@ +.late_rodata +glabel D_809B6194 + .float -10000 +glabel jtbl_809B6198 +.word L809B5348 +.word L809B5354 +.word L809B5388 +.word L809B53E8 +.word L809B541C +.word L809B5430 +glabel D_809B61B0 + .float 7000 +glabel D_809B61B4 + .float 7000 +glabel D_809B61B8 + .float 25000 +glabel D_809B61BC + .float 6000 +glabel D_809B61C0 + .float -10000 +glabel D_809B61C4 + .float -10000 +glabel D_809B61C8 + .float 10000 +glabel D_809B61CC + .float 3000 +glabel D_809B61D0 + .float 14000.0 +glabel D_809B61D4 + .float 10000 + +.text glabel func_809B5268 /* 00168 809B5268 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0016C 809B526C AFBF001C */ sw $ra, 0x001C($sp) @@ -253,5 +285,3 @@ glabel L809B5430 /* 004E0 809B55E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004E4 809B55E4 03E00008 */ jr $ra /* 004E8 809B55E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B55EC.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B55EC.s index 42832f37ca..c4e2b4ce82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B55EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B55EC.s @@ -35,5 +35,3 @@ glabel func_809B55EC .L809B5668: /* 00568 809B5668 03E00008 */ jr $ra /* 0056C 809B566C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5670.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5670.s index 87ecedb65a..b578644f21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5670.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_809B61D8 + .float 3000.0 +glabel D_809B61DC + .float -0.2 +glabel D_809B61E0 + .float -0.2 +glabel D_809B61E4 + .float -10000 +glabel D_809B61E8 + .float -3000 + +.text glabel func_809B5670 /* 00570 809B5670 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00574 809B5674 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -218,5 +231,3 @@ glabel func_809B5670 /* 008A4 809B59A4 8FB10020 */ lw $s1, 0x0020($sp) /* 008A8 809B59A8 03E00008 */ jr $ra /* 008AC 809B59AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B59B0.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B59B0.s index 468967240f..a51177dfbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B59B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B59B0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B61EC + .float 14000.0 +glabel D_809B61F0 + .float 5000.0 + +.text glabel func_809B59B0 /* 008B0 809B59B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 008B4 809B59B4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -168,5 +175,3 @@ glabel func_809B59B0 /* 00B0C 809B5C0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B10 809B5C10 03E00008 */ jr $ra /* 00B14 809B5C14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5C18.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5C18.s index c16a967153..35ffd2c3bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5C18.s @@ -52,5 +52,3 @@ glabel func_809B5C18 /* 00BC8 809B5CC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BCC 809B5CCC 03E00008 */ jr $ra /* 00BD0 809B5CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5F98.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5F98.s index b8446a58f7..d7eefc8ae8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5F98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/func_809B5F98.s @@ -89,5 +89,3 @@ glabel func_809B5F98 .L809B60E8: /* 00FE8 809B60E8 03E00008 */ jr $ra /* 00FEC 809B60EC 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s index 5d0fb0061b..5519973c76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s @@ -9,5 +9,3 @@ glabel EnBa_Destroy /* 0020C 809B655C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00210 809B6560 03E00008 */ jr $ra /* 00214 809B6564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index 5f6e7be4e7..aa60856dfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_809B8130 + .asciz "../z_en_ba.c" + .balign 4 + +glabel D_809B8140 + .asciz "../z_en_ba.c" + .balign 4 + +glabel D_809B8150 + .asciz "../z_en_ba.c" + .balign 4 + +glabel D_809B8160 + .asciz "../z_en_ba.c" + .balign 4 + +glabel D_809B8170 + .asciz "../z_en_ba.c" + .balign 4 + +.text glabel EnBa_Draw /* 018D8 809B7C28 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 018DC 809B7C2C AFB20048 */ sw $s2, 0x0048($sp) @@ -276,4 +298,3 @@ glabel EnBa_Draw /* 01D04 809B8054 8FB60058 */ lw $s6, 0x0058($sp) /* 01D08 809B8058 03E00008 */ jr $ra /* 01D0C 809B805C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s index 26ec8793f6..2ee52bb1f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s @@ -131,5 +131,3 @@ glabel EnBa_Init /* 001E4 809B6534 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 001E8 809B6538 03E00008 */ jr $ra /* 001EC 809B653C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s index e3e89a052a..280ab808d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s @@ -59,5 +59,3 @@ glabel EnBa_Update /* 018CC 809B7C1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 018D0 809B7C20 03E00008 */ jr $ra /* 018D4 809B7C24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6350.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6350.s index 1f52fd2315..a0707590e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6350.s @@ -1,5 +1,3 @@ glabel func_809B6350 /* 00000 809B6350 03E00008 */ jr $ra /* 00004 809B6354 AC850150 */ sw $a1, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6568.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6568.s index 53116154d2..f65a022fec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6568.s @@ -15,5 +15,3 @@ glabel func_809B6568 /* 0024C 809B659C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00250 809B65A0 03E00008 */ jr $ra /* 00254 809B65A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s index dcc2114f5e..a3e1f70297 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s @@ -281,5 +281,3 @@ glabel func_809B65A8 /* 00678 809B69C8 8FB70038 */ lw $s7, 0x0038($sp) /* 0067C 809B69CC 03E00008 */ jr $ra /* 00680 809B69D0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s index 5645bd4a9e..22247652c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809B8180 + .float 65535.0 + +.text glabel func_809B69D4 /* 00684 809B69D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00688 809B69D8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +34,3 @@ glabel func_809B69D4 /* 006E8 809B6A38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006EC 809B6A3C 03E00008 */ jr $ra /* 006F0 809B6A40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6A44.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6A44.s index 44e5ca794e..0944f0e6d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6A44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6A44.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809B8184 + .float 0.0005 +glabel D_809B8188 + .float 0.001 + +.text glabel func_809B6A44 /* 006F4 809B6A44 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006F8 809B6A48 AFBF0024 */ sw $ra, 0x0024($sp) @@ -52,5 +59,3 @@ glabel func_809B6A44 /* 007A8 809B6AF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007AC 809B6AFC 03E00008 */ jr $ra /* 007B0 809B6B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B04.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B04.s index 9a8a924416..5498f432ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B04.s @@ -20,5 +20,3 @@ glabel func_809B6B04 /* 007FC 809B6B4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00800 809B6B50 03E00008 */ jr $ra /* 00804 809B6B54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s index 35416071e7..d2a79a7b09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s @@ -426,5 +426,3 @@ glabel func_809B6B58 /* 00E18 809B7168 8FBE0040 */ lw $s8, 0x0040($sp) /* 00E1C 809B716C 03E00008 */ jr $ra /* 00E20 809B7170 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B7174.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B7174.s index 6b9e01b9ce..d4cee6d559 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B7174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B7174.s @@ -31,5 +31,3 @@ glabel func_809B7174 /* 00E94 809B71E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E98 809B71E8 03E00008 */ jr $ra /* 00E9C 809B71EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s index 708e2b650a..8e95a027c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s @@ -246,5 +246,3 @@ glabel func_809B71F0 /* 01244 809B7594 8FBE0040 */ lw $s8, 0x0040($sp) /* 01248 809B7598 03E00008 */ jr $ra /* 0124C 809B759C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s index e632705e5f..f72e220a55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s @@ -166,5 +166,3 @@ glabel func_809B75A0 /* 014C0 809B7810 8FBE0050 */ lw $s8, 0x0050($sp) /* 014C4 809B7814 03E00008 */ jr $ra /* 014C8 809B7818 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s index 3ed4555a8e..ea4c7a9b90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s @@ -217,5 +217,3 @@ glabel func_809B781C /* 017F0 809B7B40 8FBE0040 */ lw $s8, 0x0040($sp) /* 017F4 809B7B44 03E00008 */ jr $ra /* 017F8 809B7B48 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s index 5706b25620..3a6c3abeb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s @@ -9,5 +9,3 @@ glabel EnBb_Destroy /* 00644 809B8924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00648 809B8928 03E00008 */ jr $ra /* 0064C 809B892C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s index afa41f03cd..fb88e3797d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_809BBC30 + .asciz "../z_en_bb.c" + .balign 4 + +glabel D_809BBC40 + .asciz "../z_en_bb.c" + .balign 4 + +glabel D_809BBC50 + .asciz "../z_en_bb.c" + .balign 4 + +.late_rodata +glabel D_809BBCFC + .float 0.8 +glabel D_809BBD00 + .float 0.0000958738019107841 +glabel D_809BBD04 + .float 0.009999999776482582 + +.text glabel EnBb_Draw /* 03264 809BB544 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 03268 809BB548 3C0F809C */ lui $t7, %hi(D_809BBC18) ## $t7 = 809C0000 @@ -345,4 +367,3 @@ glabel EnBb_Draw /* 03794 809BBA74 00000000 */ nop /* 03798 809BBA78 00000000 */ nop /* 0379C 809BBA7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s index cd26fdf2ed..a4d3dc16cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_809BBC6C +.word L809B882C +.word L809B8858 +.word L809B8764 +.word L809B872C +.word L809B86E4 + +.text glabel EnBb_Init /* 00280 809B8560 27BDFE18 */ addiu $sp, $sp, 0xFE18 ## $sp = FFFFFE18 /* 00284 809B8564 AFA501EC */ sw $a1, 0x01EC($sp) @@ -250,5 +259,3 @@ glabel L809B8858 /* 0061C 809B88FC 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 /* 00620 809B8900 03E00008 */ jr $ra /* 00624 809B8904 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s index f72e150b34..8f8ce19498 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s @@ -172,5 +172,3 @@ glabel EnBb_Update /* 03208 809BB4E8 8FB10020 */ lw $s1, 0x0020($sp) /* 0320C 809BB4EC 03E00008 */ jr $ra /* 03210 809BB4F0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E0.s index ffb7f80538..2cb274fc1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E0.s @@ -1,5 +1,3 @@ glabel func_809B82E0 /* 00000 809B82E0 03E00008 */ jr $ra /* 00004 809B82E4 AC850258 */ sw $a1, 0x0258($a0) ## 00000258 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E8.s index c3f41d3ce4..ed417d0353 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B82E8.s @@ -40,5 +40,3 @@ glabel func_809B82E8 /* 00090 809B8370 8FB10020 */ lw $s1, 0x0020($sp) /* 00094 809B8374 03E00008 */ jr $ra /* 00098 809B8378 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B837C.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B837C.s index 2a0ba708df..6652288b97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B837C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B837C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809BBC60 + .float 0.09399999678134918 +glabel D_809BBC64 + .float 0.075 +glabel D_809BBC68 + .float 0.8 + +.text glabel func_809B837C /* 0009C 809B837C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 000A0 809B8380 F7BC0050 */ sdc1 $f28, 0x0050($sp) @@ -106,5 +115,3 @@ glabel func_809B837C /* 0022C 809B850C 8FBE0078 */ lw $s8, 0x0078($sp) /* 00230 809B8510 03E00008 */ jr $ra /* 00234 809B8514 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8518.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8518.s index 2a1488e5b7..55711f04b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8518.s @@ -20,5 +20,3 @@ glabel func_809B8518 .L809B8558: /* 00278 809B8558 03E00008 */ jr $ra /* 0027C 809B855C AC80011C */ sw $zero, 0x011C($a0) ## 0000011C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8930.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8930.s index cddd69e4f3..9599b89458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8930.s @@ -20,5 +20,3 @@ glabel func_809B8930 /* 00698 809B8978 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0069C 809B897C 03E00008 */ jr $ra /* 006A0 809B8980 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s index 0033d244a8..63113e8d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809BBC80 + .float 0.1 +glabel D_809BBC84 + .float 0.1 + +.text glabel func_809B8984 /* 006A4 809B8984 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006A8 809B8988 AFBF0024 */ sw $ra, 0x0024($sp) @@ -105,5 +112,3 @@ glabel func_809B8984 /* 00814 809B8AF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00818 809B8AF8 03E00008 */ jr $ra /* 0081C 809B8AFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B00.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B00.s index 72aa1d79c0..f82b7f9557 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B00.s @@ -37,5 +37,3 @@ glabel func_809B8B00 /* 008A8 809B8B88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008AC 809B8B8C 03E00008 */ jr $ra /* 008B0 809B8B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s index 736c05dc9b..486fb97e73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s @@ -106,5 +106,3 @@ glabel func_809B8B94 /* 00A24 809B8D04 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00A28 809B8D08 03E00008 */ jr $ra /* 00A2C 809B8D0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8D10.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8D10.s index e20d4b0a3f..8d224ae724 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8D10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8D10.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BBC88 + .float 1500.0 + +.text glabel func_809B8D10 /* 00A30 809B8D10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A34 809B8D14 AFBF0024 */ sw $ra, 0x0024($sp) @@ -50,5 +55,3 @@ glabel func_809B8D10 /* 00AE0 809B8DC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AE4 809B8DC4 03E00008 */ jr $ra /* 00AE8 809B8DC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s index 71f64e29f0..afa2512066 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s @@ -27,5 +27,3 @@ glabel func_809B8DCC /* 00B48 809B8E28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B4C 809B8E2C 03E00008 */ jr $ra /* 00B50 809B8E30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s index 08da5c8e03..f3247f06af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s @@ -50,5 +50,3 @@ glabel func_809B8E34 /* 00C08 809B8EE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C0C 809B8EEC 03E00008 */ jr $ra /* 00C10 809B8EF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s index f950a52e36..a19351857f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809BBC8C + .float 0.2 +glabel D_809BBC90 + .float 65535.0 +glabel D_809BBC94 + .float 0.1 + +.text glabel func_809B8EF4 /* 00C14 809B8EF4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00C18 809B8EF8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -572,5 +581,3 @@ glabel func_809B8EF4 /* 01400 809B96E0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01404 809B96E4 03E00008 */ jr $ra /* 01408 809B96E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s index 112448b5f4..9285edd197 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s @@ -36,5 +36,3 @@ glabel func_809B96EC /* 01490 809B9770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01494 809B9774 03E00008 */ jr $ra /* 01498 809B9778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s index adaeb00c7d..2d476bc83b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BBC98 + .float -0.699999988079071 + +.text glabel func_809B977C /* 0149C 809B977C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 014A0 809B9780 AFBF0034 */ sw $ra, 0x0034($sp) @@ -201,5 +206,3 @@ glabel func_809B977C /* 01768 809B9A48 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0176C 809B9A4C 03E00008 */ jr $ra /* 01770 809B9A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s index 51892fb5a1..6728d92480 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s @@ -69,5 +69,3 @@ glabel func_809B9A54 /* 01878 809B9B58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0187C 809B9B5C 03E00008 */ jr $ra /* 01880 809B9B60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s index 00d2ab3290..d3d4ba86b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809BBC9C + .float -1.059999942779541 +glabel D_809BBCA0 + .float 65535.0 + +.text glabel func_809B9B64 /* 01884 809B9B64 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01888 809B9B68 AFBF0024 */ sw $ra, 0x0024($sp) @@ -266,5 +273,3 @@ glabel func_809B9B64 /* 01C3C 809B9F1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01C40 809B9F20 03E00008 */ jr $ra /* 01C44 809B9F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F28.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F28.s index 3c0dcc0afb..1d0b2cf0f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F28.s @@ -14,5 +14,3 @@ glabel func_809B9F28 /* 01C74 809B9F54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C78 809B9F58 03E00008 */ jr $ra /* 01C7C 809B9F5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s index 301da4a6b7..ddc711f64e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s @@ -51,5 +51,3 @@ glabel func_809B9F60 /* 01D3C 809BA01C 468084A0 */ cvt.s.w $f18, $f16 /* 01D40 809BA020 03E00008 */ jr $ra /* 01D44 809BA024 E4920298 */ swc1 $f18, 0x0298($a0) ## 00000298 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s index e083b6b496..830599c35a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s @@ -44,5 +44,3 @@ glabel func_809BA028 /* 01DEC 809BA0CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DF0 809BA0D0 03E00008 */ jr $ra /* 01DF4 809BA0D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s index 86ba21423f..374b71ea1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809BBCA4 + .float 0.05 +glabel D_809BBCA8 + .float 0.009999999776482582 +glabel D_809BBCAC + .float 0.1 + +.text glabel func_809BA0D8 /* 01DF8 809BA0D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01DFC 809BA0DC AFBF0024 */ sw $ra, 0x0024($sp) @@ -257,5 +266,3 @@ glabel func_809BA0D8 /* 0216C 809BA44C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02170 809BA450 03E00008 */ jr $ra /* 02174 809BA454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index 6ce202d346..3ce7a6b8e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -80,5 +80,3 @@ glabel func_809BA458 /* 022A4 809BA584 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 022A8 809BA588 03E00008 */ jr $ra /* 022AC 809BA58C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s index 7e5c480e2a..cb7434bf9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s @@ -38,5 +38,3 @@ glabel func_809BA590 /* 0233C 809BA61C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02340 809BA620 03E00008 */ jr $ra /* 02344 809BA624 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s index 7a62a7f6f5..38fa70ba8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_809BBCB0 + .float 0.05 +glabel D_809BBCB4 + .float 0.009999999776482582 +glabel D_809BBCB8 + .float 0.002 +glabel D_809BBCBC + .float 0.05 +glabel D_809BBCC0 + .float 0.1 +glabel D_809BBCC4 + .float 0.1 + +.text glabel func_809BA628 /* 02348 809BA628 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0234C 809BA62C 3C18809C */ lui $t8, %hi(D_809BBB5C) ## $t8 = 809C0000 @@ -466,5 +481,3 @@ glabel func_809BA628 /* 029A4 809BAC84 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 029A8 809BAC88 03E00008 */ jr $ra /* 029AC 809BAC8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAC90.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAC90.s index 6e4f690efa..5cfc8c1f0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAC90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAC90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BBCC8 + .float 1500.0 + +.text glabel func_809BAC90 /* 029B0 809BAC90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 029B4 809BAC94 AFBF0024 */ sw $ra, 0x0024($sp) @@ -76,5 +81,3 @@ glabel func_809BAC90 /* 02AB8 809BAD98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02ABC 809BAD9C 03E00008 */ jr $ra /* 02AC0 809BADA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BADA4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BADA4.s index d12ea9febc..6c9be07e40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BADA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BADA4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BBCCC + .float -0.4 + +.text glabel func_809BADA4 /* 02AC4 809BADA4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02AC8 809BADA8 AFBF0034 */ sw $ra, 0x0034($sp) @@ -115,5 +120,3 @@ glabel func_809BADA4 /* 02C58 809BAF38 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02C5C 809BAF3C 03E00008 */ jr $ra /* 02C60 809BAF40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAF44.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAF44.s index 9d1139add9..e073647ca0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAF44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BAF44.s @@ -1,3 +1,18 @@ +.late_rodata +glabel jtbl_809BBCD0 +.word L809BB034 +.word L809BB044 +.word L809BB024 +.word L809BB058 +.word L809BB058 +.word L809BB080 +.word L809BB080 +.word L809BB080 +.word L809BB268 +.word L809BB080 +.word L809BB058 + +.text glabel func_809BAF44 /* 02C64 809BAF44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02C68 809BAF48 AFBF001C */ sw $ra, 0x001C($sp) @@ -236,5 +251,3 @@ glabel L809BB268 /* 02F8C 809BB26C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02F90 809BB270 03E00008 */ jr $ra /* 02F94 809BB274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BB4F4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BB4F4.s index e36a0f21c2..d25adecc8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BB4F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BB4F4.s @@ -19,5 +19,3 @@ glabel func_809BB4F4 /* 03258 809BB538 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0325C 809BB53C 03E00008 */ jr $ra /* 03260 809BB540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Destroy.s index b371ab588b..84c788c8b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Destroy.s @@ -14,5 +14,3 @@ glabel EnBdfire_Destroy /* 00268 809BC298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0026C 809BC29C 03E00008 */ jr $ra /* 00270 809BC2A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Draw.s index 9bec07a19f..a5dee1a97e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Draw.s @@ -10,4 +10,3 @@ glabel EnBdfire_Draw /* 00AB4 809BCAE4 00000000 */ nop /* 00AB8 809BCAE8 00000000 */ nop /* 00ABC 809BCAEC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s index 146c4dc377..3bed19086b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_809BCB74 + .word 0x40333333 +glabel D_809BCB78 + .float 0.8 + +glabel D_809BCB7C + .word 0x3F666667 +glabel D_809BCB80 + .float 0.6 + +glabel D_809BCB84 + .word 0x40866667 + +.text glabel EnBdfire_Init /* 00010 809BC040 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00014 809BC044 AFA50044 */ sw $a1, 0x0044($sp) @@ -146,5 +161,3 @@ glabel EnBdfire_Init /* 00230 809BC260 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00234 809BC264 03E00008 */ jr $ra /* 00238 809BC268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Update.s index 76eaed6ac4..1b77b83f2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Update.s @@ -15,5 +15,3 @@ glabel EnBdfire_Update /* 0088C 809BC8BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00890 809BC8C0 03E00008 */ jr $ra /* 00894 809BC8C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC030.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC030.s index ddaad9bf9a..4e34a2ae36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC030.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC030.s @@ -1,5 +1,3 @@ glabel func_809BC030 /* 00000 809BC030 03E00008 */ jr $ra /* 00004 809BC034 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC038.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC038.s index ce1117edd1..100def968b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC038.s @@ -1,5 +1,3 @@ glabel func_809BC038 /* 00008 809BC038 03E00008 */ jr $ra /* 0000C 809BC03C AC850150 */ sw $a1, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s index 0092eee605..fbf3a8569f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s @@ -213,5 +213,3 @@ glabel func_809BC2A4 /* 0055C 809BC58C 8FB00028 */ lw $s0, 0x0028($sp) /* 00560 809BC590 03E00008 */ jr $ra /* 00564 809BC594 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s index ac38909948..cea9f18f94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s @@ -1,3 +1,19 @@ +.rdata +glabel D_809BCB30 + .asciz "POWER\n" + .balign 4 + +.late_rodata +glabel D_809BCB88 + .word 0xC4ADC000 +glabel D_809BCB8C + .word 0xC52F4000 +glabel D_809BCB90 + .word 0xC56DC000 +glabel D_809BCB94 + .word 0x40866667, 0x00000000, 0x00000000 + +.text glabel func_809BC598 /* 00568 809BC598 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0056C 809BC59C AFBF0024 */ sw $ra, 0x0024($sp) @@ -209,5 +225,3 @@ glabel func_809BC598 /* 00850 809BC880 8FB10020 */ lw $s1, 0x0020($sp) /* 00854 809BC884 03E00008 */ jr $ra /* 00858 809BC888 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s index 8a94af8479..db2b642d12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809BCB38 + .asciz "../z_en_bdfire.c" + .balign 4 + +glabel D_809BCB4C + .asciz "../z_en_bdfire.c" + .balign 4 + +glabel D_809BCB60 + .asciz "../z_en_bdfire.c" + .balign 4 + +.text glabel func_809BC8C8 /* 00898 809BC8C8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0089C 809BC8CC AFBF001C */ sw $ra, 0x001C($sp) @@ -126,5 +140,3 @@ glabel func_809BC8C8 /* 00A88 809BCAB8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00A8C 809BCABC 03E00008 */ jr $ra /* 00A90 809BCAC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s index 60c69e57c4..738ff41d3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s @@ -30,5 +30,3 @@ glabel EnBigokuta_Destroy /* 001D0 809BCE30 8FB40028 */ lw $s4, 0x0028($sp) /* 001D4 809BCE34 03E00008 */ jr $ra /* 001D8 809BCE38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s index 4100856e60..cee1bb2767 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s @@ -1,3 +1,28 @@ +.rdata +glabel D_809BF500 + .asciz "../z_en_bigokuta.c" + .balign 4 + +glabel D_809BF514 + .asciz "../z_en_bigokuta.c" + .balign 4 + +.late_rodata +glabel D_809BF580 + .float 6.28318548203 + +glabel D_809BF584 + .float 6.28318548203 + +glabel D_809BF588 + .word 0x3F4A3D70 +glabel D_809BF58C + .float 1.3 + +glabel D_809BF590 + .word 0x45F17A2F, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnBigokuta_Draw /* 0244C 809BF0AC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02450 809BF0B0 AFBF002C */ sw $ra, 0x002C($sp) @@ -201,4 +226,3 @@ glabel EnBigokuta_Draw /* 02734 809BF394 00000000 */ nop /* 02738 809BF398 00000000 */ nop /* 0273C 809BF39C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s index abb1fbb57f..85b5c24f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BF528 + .word 0xC4802000 + +.text glabel EnBigokuta_Init /* 00000 809BCC60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 809BCC64 AFB30034 */ sw $s3, 0x0034($sp) @@ -96,5 +101,3 @@ glabel EnBigokuta_Init /* 0015C 809BCDBC 8FB40038 */ lw $s4, 0x0038($sp) /* 00160 809BCDC0 03E00008 */ jr $ra /* 00164 809BCDC4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s index 949b533ab5..56251c48c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s @@ -138,5 +138,3 @@ glabel EnBigokuta_Update /* 01F50 809BEBB0 8FB50028 */ lw $s5, 0x0028($sp) /* 01F54 809BEBB4 03E00008 */ jr $ra /* 01F58 809BEBB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s index e230d7ec25..870f84aa85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809BF52C + .word 0x43838000 +glabel D_809BF530 + .word 0x43838000 + +.text glabel func_809BCE3C /* 001DC 809BCE3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001E0 809BCE40 AFBF0014 */ sw $ra, 0x0014($sp) @@ -33,5 +40,3 @@ glabel func_809BCE3C /* 00250 809BCEB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00254 809BCEB4 03E00008 */ jr $ra /* 00258 809BCEB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s index 5dcdff4147..6e946ce971 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s @@ -43,5 +43,3 @@ glabel func_809BCEBC /* 002FC 809BCF5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00300 809BCF60 03E00008 */ jr $ra /* 00304 809BCF64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s index e5a841a233..654eee9b2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s @@ -167,5 +167,3 @@ glabel func_809BCF68 /* 0055C 809BD1BC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00560 809BD1C0 03E00008 */ jr $ra /* 00564 809BD1C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s index 9080ccd219..23073ec62c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s @@ -75,5 +75,3 @@ glabel func_809BD1C8 /* 00678 809BD2D8 8FB40038 */ lw $s4, 0x0038($sp) /* 0067C 809BD2DC 03E00008 */ jr $ra /* 00680 809BD2E0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s index b6df99254d..32d9d23032 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s @@ -14,5 +14,3 @@ glabel func_809BD2E4 /* 006AC 809BD30C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006B0 809BD310 03E00008 */ jr $ra /* 006B4 809BD314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s index 66bd3290b7..feea8a0c1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BF534 + .word 0xC4802000 + +.text glabel func_809BD318 /* 006B8 809BD318 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) @@ -21,5 +26,3 @@ glabel func_809BD318 /* 00704 809BD364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00708 809BD368 03E00008 */ jr $ra /* 0070C 809BD36C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s index 0678f15a1a..f3e27b7267 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s @@ -15,5 +15,3 @@ glabel func_809BD370 /* 00740 809BD3A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00744 809BD3A4 03E00008 */ jr $ra /* 00748 809BD3A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s index 2800a6c663..50cd5cb17c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BF538 + .word 0x43838000 + +.text glabel func_809BD3AC /* 0074C 809BD3AC 3C01809C */ lui $at, %hi(D_809BF538) ## $at = 809C0000 /* 00750 809BD3B0 C426F538 */ lwc1 $f6, %lo(D_809BF538)($at) @@ -12,5 +17,3 @@ glabel func_809BD3AC /* 00774 809BD3D4 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 /* 00778 809BD3D8 03E00008 */ jr $ra /* 0077C 809BD3DC E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s index 2f0db26c35..1a867f2f5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s @@ -5,5 +5,3 @@ glabel func_809BD3E0 /* 0078C 809BD3EC A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 /* 00790 809BD3F0 03E00008 */ jr $ra /* 00794 809BD3F4 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s index 3ed15e472e..92cb213894 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s @@ -32,5 +32,3 @@ glabel func_809BD3F8 /* 00810 809BD470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00814 809BD474 03E00008 */ jr $ra /* 00818 809BD478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s index edecf18007..2f5c3438a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s @@ -9,5 +9,3 @@ glabel func_809BD47C /* 00838 809BD498 A0800114 */ sb $zero, 0x0114($a0) ## 00000114 /* 0083C 809BD49C 03E00008 */ jr $ra /* 00840 809BD4A0 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s index 6e2cebad64..bcf0105b67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s @@ -31,5 +31,3 @@ glabel func_809BD4A4 /* 008B8 809BD518 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008BC 809BD51C 03E00008 */ jr $ra /* 008C0 809BD520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s index db54922686..3553bd0a26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s @@ -49,5 +49,3 @@ glabel func_809BD524 /* 00974 809BD5D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00978 809BD5D8 03E00008 */ jr $ra /* 0097C 809BD5DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s index f452820521..bd2474aa51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s @@ -29,5 +29,3 @@ glabel func_809BD5E0 /* 009EC 809BD64C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009F0 809BD650 03E00008 */ jr $ra /* 009F4 809BD654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s index 5beac5e1db..25acddd21a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s @@ -24,5 +24,3 @@ glabel func_809BD658 /* 00A4C 809BD6AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A50 809BD6B0 03E00008 */ jr $ra /* 00A54 809BD6B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s index 2e873965b0..b2ab122ff8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s @@ -48,5 +48,3 @@ glabel func_809BD6B8 /* 00AFC 809BD75C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B00 809BD760 03E00008 */ jr $ra /* 00B04 809BD764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s index cc094e1ba4..3e49f0c610 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s @@ -36,5 +36,3 @@ glabel func_809BD768 /* 00B84 809BD7E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B88 809BD7E8 03E00008 */ jr $ra /* 00B8C 809BD7EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s index 079f2de91a..e665a6cabc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s @@ -22,5 +22,3 @@ glabel func_809BD7F0 /* 00BE0 809BD840 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BE4 809BD844 03E00008 */ jr $ra /* 00BE8 809BD848 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s index 38456657e2..9807d5f372 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s @@ -41,5 +41,3 @@ glabel func_809BD84C /* 00C70 809BD8D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C74 809BD8D4 03E00008 */ jr $ra /* 00C78 809BD8D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s index d2d1256bec..72d779360f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809BF53C + .word 0x43838000 +glabel D_809BF540 + .word 0x3DE5C8FA +glabel D_809BF544 + .word 0x3E65C8FA +glabel D_809BF548 + .word 0x3EA0D97C + +.text glabel func_809BD8DC /* 00C7C 809BD8DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00C80 809BD8E0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -141,5 +152,3 @@ glabel func_809BD8DC /* 00E7C 809BDADC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00E80 809BDAE0 03E00008 */ jr $ra /* 00E84 809BDAE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s index 7027b439df..8832ada0f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s @@ -46,5 +46,3 @@ glabel func_809BDAE8 /* 00F24 809BDB84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F28 809BDB88 03E00008 */ jr $ra /* 00F2C 809BDB8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s index 7b292f5f30..030b2d585b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s @@ -33,5 +33,3 @@ glabel func_809BDB90 /* 00F9C 809BDBFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FA0 809BDC00 03E00008 */ jr $ra /* 00FA4 809BDC04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s index eb24667607..2d0b5165b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_809BF54C + .word 0x3F088889 +glabel D_809BF550 + .word 0x43838000 +glabel D_809BF554 + .float 1.1 + +glabel D_809BF558 + .float 0.6 + +.text glabel func_809BDC08 /* 00FA8 809BDC08 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00FAC 809BDC0C AFB00018 */ sw $s0, 0x0018($sp) @@ -223,5 +235,3 @@ glabel func_809BDC08 /* 012C8 809BDF28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 012CC 809BDF2C 03E00008 */ jr $ra /* 012D0 809BDF30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s index 2df296b85b..322496cfa8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BF55C + .word 0x3E490FDB + +.text glabel func_809BDF34 /* 012D4 809BDF34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 012D8 809BDF38 AFB00018 */ sw $s0, 0x0018($sp) @@ -40,5 +45,3 @@ glabel func_809BDF34 /* 0135C 809BDFBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01360 809BDFC0 03E00008 */ jr $ra /* 01364 809BDFC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s index f7277ee28d..3a54fe4b90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s @@ -42,5 +42,3 @@ glabel func_809BDFC8 /* 013EC 809BE04C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013F0 809BE050 03E00008 */ jr $ra /* 013F4 809BE054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s index 1a5367bf1f..aa684aef7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s @@ -82,5 +82,3 @@ glabel func_809BE058 /* 01514 809BE174 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01518 809BE178 03E00008 */ jr $ra /* 0151C 809BE17C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s index 7662aa50fe..cf1236b62e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809BF560 + .word 0x3E490FDB + +.text glabel func_809BE180 /* 01520 809BE180 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01524 809BE184 AFB00018 */ sw $s0, 0x0018($sp) @@ -65,5 +70,3 @@ glabel func_809BE180 /* 01600 809BE260 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01604 809BE264 03E00008 */ jr $ra /* 01608 809BE268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s index 434e66fce2..dcc378b835 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s @@ -106,5 +106,3 @@ glabel func_809BE26C /* 01778 809BE3D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0177C 809BE3DC 03E00008 */ jr $ra /* 01780 809BE3E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s index 6a41ed05e5..4321064ea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s @@ -52,5 +52,3 @@ glabel func_809BE3E4 /* 01838 809BE498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0183C 809BE49C 03E00008 */ jr $ra /* 01840 809BE4A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s index dff6b689b2..5fd18d74d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s @@ -29,5 +29,3 @@ glabel func_809BE4A4 /* 018AC 809BE50C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018B0 809BE510 03E00008 */ jr $ra /* 018B4 809BE514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s index 99a7c492ab..e134f19136 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s @@ -21,5 +21,3 @@ glabel func_809BE518 /* 018FC 809BE55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01900 809BE560 03E00008 */ jr $ra /* 01904 809BE564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s index 9cb285be7a..4302ecebd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s @@ -143,5 +143,3 @@ glabel func_809BE568 /* 01B2C 809BE78C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B30 809BE790 03E00008 */ jr $ra /* 01B34 809BE794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s index 768256ace6..b5542b82f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s @@ -88,5 +88,3 @@ glabel func_809BE798 /* 01C70 809BE8D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C74 809BE8D4 03E00008 */ jr $ra /* 01C78 809BE8D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s index d5df0b5e78..41f7b7c847 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s @@ -68,5 +68,3 @@ glabel func_809BE8DC /* 01D60 809BE9C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D64 809BE9C4 03E00008 */ jr $ra /* 01D68 809BE9C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s index b0064c1f16..b3600b2dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s @@ -1,3 +1,38 @@ +.rdata +glabel D_809BF4B0 + .asciz "../z_en_bigokuta.c" + .balign 4 + +glabel D_809BF4C4 + .asciz "../z_en_bigokuta.c" + .balign 4 + +glabel D_809BF4D8 + .asciz "../z_en_bigokuta.c" + .balign 4 + +glabel D_809BF4EC + .asciz "../z_en_bigokuta.c" + .balign 4 + +.late_rodata +glabel D_809BF564 + .word 0x3EC90FDB +glabel D_809BF568 + .word 0x3E490FDB +glabel D_809BF56C + .word 0x3F490FDB +glabel D_809BF570 + .word 0x3EC90FDB +glabel D_809BF574 + .word 0x40D6BCA2 +glabel D_809BF578 + .float 0.2 + +glabel D_809BF57C + .word 0x3DAAAAAB + +.text glabel func_809BEBBC /* 01F5C 809BEBBC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01F60 809BEBC0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -338,5 +373,3 @@ glabel func_809BEBBC /* 02440 809BF0A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02444 809BF0A4 03E00008 */ jr $ra /* 02448 809BF0A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s index 81874bd653..0f53367813 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s @@ -10,5 +10,3 @@ glabel EnBili_Destroy /* 00110 809BF9B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00114 809BF9B4 03E00008 */ jr $ra /* 00118 809BF9B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s index 45d33d5574..215593ed3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809C1710 + .asciz "../z_en_bili.c" + .balign 4 + +glabel D_809C1720 + .asciz "../z_en_bili.c" + .balign 4 + +.text glabel EnBili_Draw /* 01BF8 809C1498 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01BFC 809C149C AFBF002C */ sw $ra, 0x002C($sp) @@ -102,4 +112,3 @@ glabel EnBili_Draw /* 01D74 809C1614 03E00008 */ jr $ra /* 01D78 809C1618 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01D7C 809C161C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s index 8b5fca8eb6..c1fe5f7e6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s @@ -67,5 +67,3 @@ glabel EnBili_Init /* 000E8 809BF988 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000EC 809BF98C 03E00008 */ jr $ra /* 000F0 809BF990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s index 9eb43d1f83..c2235449f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s @@ -131,5 +131,3 @@ glabel EnBili_Update /* 0155C 809C0DFC 8FB10020 */ lw $s1, 0x0020($sp) /* 01560 809C0E00 03E00008 */ jr $ra /* 01564 809C0E04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BF9BC.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BF9BC.s index aa849dfeaa..7d4c4a5383 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BF9BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BF9BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C1730 + .float 0.7 + +.text glabel func_809BF9BC /* 0011C 809BF9BC 3C01809C */ lui $at, %hi(D_809C1730) ## $at = 809C0000 /* 00120 809BF9C0 C4241730 */ lwc1 $f4, %lo(D_809C1730)($at) @@ -21,5 +26,3 @@ glabel func_809BF9BC /* 00168 809BFA08 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C /* 0016C 809BFA0C 03E00008 */ jr $ra /* 00170 809BFA10 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s index bae576b6e8..8dbea8408a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C1734 + .word 0xBE99999A + +.text glabel func_809BFA14 /* 00174 809BFA14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00178 809BFA18 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +34,3 @@ glabel func_809BFA14 /* 001E0 809BFA80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001E4 809BFA84 03E00008 */ jr $ra /* 001E8 809BFA88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s index aa3cd69a17..2243de8b52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s @@ -22,5 +22,3 @@ glabel func_809BFA8C /* 0023C 809BFADC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00240 809BFAE0 03E00008 */ jr $ra /* 00244 809BFAE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s index 8465027a26..e05eecff22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s @@ -21,5 +21,3 @@ glabel func_809BFAE8 /* 00294 809BFB34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00298 809BFB38 03E00008 */ jr $ra /* 0029C 809BFB3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB40.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB40.s index 9f733fa19a..7ddd620c64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB40.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C1738 + .float 1.2 + +.text glabel func_809BFB40 /* 002A0 809BFB40 3C01809C */ lui $at, %hi(D_809C1738) ## $at = 809C0000 /* 002A4 809BFB44 C4241738 */ lwc1 $f4, %lo(D_809C1738)($at) @@ -6,5 +11,3 @@ glabel func_809BFB40 /* 002B0 809BFB50 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 002B4 809BFB54 03E00008 */ jr $ra /* 002B8 809BFB58 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s index c6057aa37c..71a53114aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C173C + .float 0.9 + +.text glabel func_809BFB5C /* 002BC 809BFB5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002C0 809BFB60 AFBF0014 */ sw $ra, 0x0014($sp) @@ -25,5 +30,3 @@ glabel func_809BFB5C /* 00318 809BFBB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0031C 809BFBBC 03E00008 */ jr $ra /* 00320 809BFBC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s index 904cd0cbff..ae8ddab242 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s @@ -33,5 +33,3 @@ glabel func_809BFBC4 /* 0039C 809BFC3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003A0 809BFC40 03E00008 */ jr $ra /* 003A4 809BFC44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s index 85c7a0fee8..c00974ea40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s @@ -40,5 +40,3 @@ glabel func_809BFC48 /* 0043C 809BFCDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00440 809BFCE0 03E00008 */ jr $ra /* 00444 809BFCE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFCE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFCE8.s index d92d5253dc..74930ffcae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFCE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFCE8.s @@ -11,5 +11,3 @@ glabel func_809BFCE8 /* 0046C 809BFD0C AC990190 */ sw $t9, 0x0190($a0) ## 00000190 /* 00470 809BFD10 03E00008 */ jr $ra /* 00474 809BFD14 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD18.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD18.s index 9c38a00318..20ee470c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD18.s @@ -31,5 +31,3 @@ glabel func_809BFD18 /* 004E8 809BFD88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004EC 809BFD8C 03E00008 */ jr $ra /* 004F0 809BFD90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s index 7c8b8e6491..b17ee0719f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809C1740 + .float 0.7 + +glabel D_809C1744 + .float 0.2 + +.text glabel func_809BFD94 /* 004F4 809BFD94 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 004F8 809BFD98 AFBF0074 */ sw $ra, 0x0074($sp) @@ -123,5 +131,3 @@ glabel func_809BFD94 /* 006C0 809BFF60 D7B40038 */ ldc1 $f20, 0x0038($sp) /* 006C4 809BFF64 03E00008 */ jr $ra /* 006C8 809BFF68 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFF6C.s index e544e3bc38..144bbd9c9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFF6C.s @@ -80,5 +80,3 @@ glabel func_809BFF6C /* 007E0 809C0080 A08A0194 */ sb $t2, 0x0194($a0) ## 00000194 /* 007E4 809C0084 03E00008 */ jr $ra /* 007E8 809C0088 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s index bba4a887db..3570ec2133 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C1748 + .word 0x3E490FDB + +.text glabel func_809C008C /* 007EC 809C008C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007F0 809C0090 AFBF0014 */ sw $ra, 0x0014($sp) @@ -63,5 +68,3 @@ glabel func_809C008C /* 008C8 809C0168 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008CC 809C016C 03E00008 */ jr $ra /* 008D0 809C0170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s index 624718285e..27cffa03d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C174C + .word 0x44E38000 + +.text glabel func_809C0174 /* 008D4 809C0174 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 008D8 809C0178 AFB00018 */ sw $s0, 0x0018($sp) @@ -65,5 +70,3 @@ glabel func_809C0174 /* 009B4 809C0254 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009B8 809C0258 03E00008 */ jr $ra /* 009BC 809C025C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0260.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0260.s index a1e87c7533..da95a29ba4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0260.s @@ -24,5 +24,3 @@ glabel func_809C0260 /* 00A0C 809C02AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A10 809C02B0 03E00008 */ jr $ra /* 00A14 809C02B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s index fe3757ed18..50673108bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s @@ -138,5 +138,3 @@ glabel func_809C02B8 /* 00C08 809C04A8 8FBE0060 */ lw $s8, 0x0060($sp) /* 00C0C 809C04AC 03E00008 */ jr $ra /* 00C10 809C04B0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s index e5318460ec..0e5e689ab2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s @@ -52,5 +52,3 @@ glabel func_809C04B4 /* 00CC4 809C0564 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00CC8 809C0568 03E00008 */ jr $ra /* 00CCC 809C056C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s index e3321fd076..933f7af0e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s @@ -40,5 +40,3 @@ glabel func_809C0570 /* 00D54 809C05F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D58 809C05F8 03E00008 */ jr $ra /* 00D5C 809C05FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s index cae8aa3cee..bf54613bcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s @@ -34,5 +34,3 @@ glabel func_809C0600 /* 00DD0 809C0670 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DD4 809C0674 03E00008 */ jr $ra /* 00DD8 809C0678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s index 43e02e770a..9bbfbe9b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s @@ -27,5 +27,3 @@ glabel func_809C067C /* 00E34 809C06D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E38 809C06D8 03E00008 */ jr $ra /* 00E3C 809C06DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C06E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C06E0.s index 8906107090..d6d8ce9a25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C06E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C06E0.s @@ -33,5 +33,3 @@ glabel func_809C06E0 /* 00EA8 809C0748 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EAC 809C074C 03E00008 */ jr $ra /* 00EB0 809C0750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s index afeab144c5..506e5e0f3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C1750 + .float 0.7 + +.text glabel func_809C0754 /* 00EB4 809C0754 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00EB8 809C0758 AFBF006C */ sw $ra, 0x006C($sp) @@ -156,5 +161,3 @@ glabel func_809C0754 /* 010D4 809C0974 8FB70068 */ lw $s7, 0x0068($sp) /* 010D8 809C0978 03E00008 */ jr $ra /* 010DC 809C097C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0980.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0980.s index 5eb1f9ad89..721dbe6be5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0980.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0980.s @@ -27,5 +27,3 @@ glabel func_809C0980 /* 01134 809C09D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01138 809C09D8 03E00008 */ jr $ra /* 0113C 809C09DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C09E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C09E0.s index 6e62de6f84..48e5810c11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C09E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C09E0.s @@ -40,5 +40,3 @@ glabel func_809C09E0 /* 011C4 809C0A64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011C8 809C0A68 03E00008 */ jr $ra /* 011CC 809C0A6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0A70.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0A70.s index 9287af2b52..5f09e691db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0A70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0A70.s @@ -128,5 +128,3 @@ glabel func_809C0A70 /* 0138C 809C0C2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01390 809C0C30 03E00008 */ jr $ra /* 01394 809C0C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0E08.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0E08.s index b7204f0d24..9a4d305252 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0E08.s @@ -1,3 +1,47 @@ +.late_rodata +glabel D_809C1754 + .word 0x3F060B41 +glabel D_809C1758 + .word 0x3E851EB8 +glabel D_809C175C + .word 0x3EC90FDB +glabel D_809C1760 + .float 0.15 + +glabel D_809C1764 + .float 0.85 + +glabel D_809C1768 + .word 0x3EA0D97C +glabel D_809C176C + .float 0.3 + +glabel D_809C1770 + .float 0.2 + +glabel D_809C1774 + .float 0.8 + +glabel D_809C1778 + .word 0x3D920D28 +glabel D_809C177C + .word 0x3E9EB852 +glabel D_809C1780 + .float 0.4 + +glabel D_809C1784 + .word 0x3EA0D97C +glabel D_809C1788 + .float 0.08 + +glabel D_809C178C + .word 0x3EC90FDB +glabel D_809C1790 + .word 0x3E051EB8 +glabel D_809C1794 + .word 0x3F5EB852 + +.text glabel func_809C0E08 /* 01568 809C0E08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0156C 809C0E0C AFBF001C */ sw $ra, 0x001C($sp) @@ -146,5 +190,3 @@ glabel func_809C0E08 /* 01774 809C1014 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01778 809C1018 03E00008 */ jr $ra /* 0177C 809C101C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1020.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1020.s index ffdb132588..12e380ce6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1020.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1020.s @@ -1,3 +1,38 @@ +.late_rodata +glabel D_809C1798 + .word 0x3F060B41 +glabel D_809C179C + .float 0.2 + +glabel D_809C17A0 + .word 0x3EC90FDB +glabel D_809C17A4 + .word 0x3EA0D97C +glabel D_809C17A8 + .word 0x3E8CCCCD +glabel D_809C17AC + .word 0x3F79999A +glabel D_809C17B0 + .word 0x3D920D28 +glabel D_809C17B4 + .float 0.3 + +glabel D_809C17B8 + .word 0x3EF5C28F +glabel D_809C17BC + .word 0x3EA0D97C +glabel D_809C17C0 + .float 0.08 + +glabel D_809C17C4 + .word 0x3EC90FDB +glabel D_809C17C8 + .float 1.1 + +glabel D_809C17CC + .float 0.1 + +.text glabel func_809C1020 /* 01780 809C1020 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01784 809C1024 AFBF001C */ sw $ra, 0x001C($sp) @@ -148,5 +183,3 @@ glabel func_809C1020 /* 01994 809C1234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01998 809C1238 03E00008 */ jr $ra /* 0199C 809C123C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1240.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1240.s index 0683f1b78a..9510803c37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C1240.s @@ -1,3 +1,31 @@ +.late_rodata +glabel D_809C17D0 + .word 0x3EC90FDB +glabel D_809C17D4 + .float 0.3 + +glabel D_809C17D8 + .float 0.7 + +glabel D_809C17DC + .word 0x3EA0D97C +glabel D_809C17E0 + .word 0x3EA66666 +glabel D_809C17E4 + .word 0x3F6CCCCD +glabel D_809C17E8 + .word 0x3F733333 +glabel D_809C17EC + .word 0x3F0CCCCD +glabel D_809C17F0 + .word 0x3D920D28 +glabel D_809C17F4 + .float 0.4 + +glabel D_809C17F8 + .word 0x3F051EB8, 0x00000000 + +.text glabel func_809C1240 /* 019A0 809C1240 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 019A4 809C1244 AFBF0014 */ sw $ra, 0x0014($sp) @@ -96,5 +124,3 @@ glabel func_809C1240 /* 01AFC 809C139C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B00 809C13A0 03E00008 */ jr $ra /* 01B04 809C13A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C13A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C13A8.s index 5a497cff97..3a6029a19c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C13A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C13A8.s @@ -62,5 +62,3 @@ glabel func_809C13A8 /* 01BEC 809C148C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 01BF0 809C1490 03E00008 */ jr $ra /* 01BF4 809C1494 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s index 1e2b977812..ed4a657053 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s @@ -12,5 +12,3 @@ glabel EnBlkobj_Destroy /* 000DC 809C213C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E0 809C2140 03E00008 */ jr $ra /* 000E4 809C2144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s index eb4eafb0d1..fd4d9c1b79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809C25D8 + .asciz "../z_en_blkobj.c" + .balign 4 + +glabel D_809C25EC + .asciz "../z_en_blkobj.c" + .balign 4 + +glabel D_809C2600 + .asciz "../z_en_blkobj.c" + .balign 4 + +.text glabel EnBlkobj_Draw /* 00398 809C23F8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0039C 809C23FC AFB10038 */ sw $s1, 0x0038($sp) @@ -91,4 +105,3 @@ glabel EnBlkobj_Draw /* 004F4 809C2554 00000000 */ nop /* 004F8 809C2558 00000000 */ nop /* 004FC 809C255C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s index 0392fa69ec..ee14d968aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s @@ -49,5 +49,3 @@ glabel EnBlkobj_Init /* 000AC 809C210C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000B0 809C2110 03E00008 */ jr $ra /* 000B4 809C2114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s index 8bee94d144..8727b18949 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s @@ -8,5 +8,3 @@ glabel EnBlkobj_Update /* 002B8 809C2318 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002BC 809C231C 03E00008 */ jr $ra /* 002C0 809C2320 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s index 8508703994..ea2a29337a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s @@ -2,5 +2,3 @@ glabel func_809C2060 /* 00000 809C2060 AC850168 */ sw $a1, 0x0168($a0) ## 00000168 /* 00004 809C2064 03E00008 */ jr $ra /* 00008 809C2068 A4800166 */ sh $zero, 0x0166($a0) ## 00000166 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s index a0d7878bdd..d8f1d91bd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s @@ -22,5 +22,3 @@ glabel func_809C2148 /* 00134 809C2194 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00138 809C2198 03E00008 */ jr $ra /* 0013C 809C219C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s index cddbef9a57..32a313427d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s @@ -31,5 +31,3 @@ glabel func_809C21A0 /* 001AC 809C220C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001B0 809C2210 03E00008 */ jr $ra /* 001B4 809C2214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s index 1d22417a29..5a9176ce46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s @@ -61,5 +61,3 @@ glabel func_809C2218 /* 00288 809C22E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0028C 809C22EC 03E00008 */ jr $ra /* 00290 809C22F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s index 99ea118234..ce94644a09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s @@ -2,5 +2,3 @@ glabel func_809C22F4 /* 00294 809C22F4 AFA40000 */ sw $a0, 0x0000($sp) /* 00298 809C22F8 03E00008 */ jr $ra /* 0029C 809C22FC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s index c46039c60a..af0a78e1b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809C25B0 + .asciz "../z_en_blkobj.c" + .balign 4 + +glabel D_809C25C4 + .asciz "../z_en_blkobj.c" + .balign 4 + +.text glabel func_809C2324 /* 002C4 809C2324 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 002C8 809C2328 AFBF0014 */ sw $ra, 0x0014($sp) @@ -54,5 +64,3 @@ glabel func_809C2324 /* 0038C 809C23EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00390 809C23F0 03E00008 */ jr $ra /* 00394 809C23F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s index 86efe508e5..3266988c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s @@ -16,5 +16,3 @@ glabel EnBom_Destroy /* 00150 809C2820 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00154 809C2824 03E00008 */ jr $ra /* 00158 809C2828 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s index c534c37556..7eb26142ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809C34D0 + .asciz "../z_en_bom.c" + .balign 4 + +glabel D_809C34E0 + .asciz "../z_en_bom.c" + .balign 4 + +glabel D_809C34F0 + .asciz "../z_en_bom.c" + .balign 4 + +glabel D_809C3500 + .asciz "../z_en_bom.c" + .balign 4 + +.text glabel EnBom_Draw /* 00B48 809C3218 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00B4C 809C321C AFBF001C */ sw $ra, 0x001C($sp) @@ -126,4 +144,3 @@ glabel EnBom_Draw /* 00D34 809C3404 03E00008 */ jr $ra /* 00D38 809C3408 00000000 */ nop /* 00D3C 809C340C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s index f5064256e3..d7f131b826 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s @@ -73,5 +73,3 @@ glabel EnBom_Init /* 00110 809C27E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00114 809C27E4 03E00008 */ jr $ra /* 00118 809C27E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s index cbf15390c1..b223dd080a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_809C3518 + .float -1.2 + +glabel D_809C351C + .float 0.2 + +glabel D_809C3520 + .float 0.2 + +glabel D_809C3524 + .float 0.002 + +glabel D_809C3528 + .float 0.01 + +.text glabel EnBom_Update /* 004B8 809C2B88 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 004BC 809C2B8C 3C0F809C */ lui $t7, %hi(D_809C349C) ## $t7 = 809C0000 @@ -457,5 +474,3 @@ glabel EnBom_Update /* 00B3C 809C320C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 00B40 809C3210 03E00008 */ jr $ra /* 00B44 809C3214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C26D0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C26D0.s index 0ba620e560..9dc978e7e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C26D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C26D0.s @@ -1,5 +1,3 @@ glabel func_809C26D0 /* 00000 809C26D0 03E00008 */ jr $ra /* 00004 809C26D4 AC850204 */ sw $a1, 0x0204($a0) ## 00000204 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C282C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C282C.s index 57bd2ffb6e..a435c63407 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C282C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C282C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809C3510 + .float 0.7 + +glabel D_809C3514 + .word 0xBE99999A + +.text glabel func_809C282C /* 0015C 809C282C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00160 809C2830 AFBF001C */ sw $ra, 0x001C($sp) @@ -127,5 +135,3 @@ glabel func_809C282C /* 00318 809C29E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0031C 809C29EC 03E00008 */ jr $ra /* 00320 809C29F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C29F4.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C29F4.s index 7a24c7189f..347777a9cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C29F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C29F4.s @@ -17,5 +17,3 @@ glabel func_809C29F4 /* 0035C 809C2A2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00360 809C2A30 03E00008 */ jr $ra /* 00364 809C2A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s index 0844f67dde..1c0d06a5ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s @@ -95,5 +95,3 @@ glabel func_809C2A38 /* 004AC 809C2B7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004B0 809C2B80 03E00008 */ jr $ra /* 004B4 809C2B84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Destroy.s index 3b9725ebfa..ae434a37a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Destroy.s @@ -2,5 +2,3 @@ glabel EnBomBowlMan_Destroy /* 001E4 809C3814 AFA40000 */ sw $a0, 0x0000($sp) /* 001E8 809C3818 03E00008 */ jr $ra /* 001EC 809C381C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s index ddb0f1c32f..250435f91c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809C4C44 + .asciz "../z_en_bom_bowl_man.c" + .balign 4 + +glabel D_809C4C5C + .asciz "../z_en_bom_bowl_man.c" + .balign 4 + +.text glabel EnBomBowlMan_Draw /* 012BC 809C48EC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 012C0 809C48F0 AFBF002C */ sw $ra, 0x002C($sp) @@ -64,4 +74,3 @@ glabel EnBomBowlMan_Draw /* 013B4 809C49E4 00000000 */ nop /* 013B8 809C49E8 00000000 */ nop /* 013BC 809C49EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s index 61fd8fb8f1..e9f16250e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809C4AC0 + .asciz "☆ もー 肩こっちゃうよねぇ〜 ☆ \n" + .balign 4 + +glabel D_809C4AF0 + .asciz "☆ もっとラクしてもうかるバイトないかしら？ ☆ %d\n" + .balign 4 + +.late_rodata +glabel D_809C4C74 + .word 0x409FAE14 + +.text glabel EnBomBowlMan_Init /* 00000 809C3630 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00004 809C3634 AFBE0050 */ sw $s8, 0x0050($sp) @@ -128,5 +142,3 @@ glabel EnBomBowlMan_Init /* 001D8 809C3808 8FB00030 */ lw $s0, 0x0030($sp) /* 001DC 809C380C 03E00008 */ jr $ra /* 001E0 809C3810 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Update.s index a451bf5465..38f18fc2d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Update.s @@ -106,5 +106,3 @@ glabel EnBomBowlMan_Update /* 0126C 809C489C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01270 809C48A0 03E00008 */ jr $ra /* 01274 809C48A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s index 3c53e59e84..01982a0378 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s @@ -35,5 +35,3 @@ glabel func_809C3820 /* 0026C 809C389C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00270 809C38A0 03E00008 */ jr $ra /* 00274 809C38A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C38A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C38A8.s index 765a8940f0..9713879c27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C38A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C38A8.s @@ -50,5 +50,3 @@ glabel func_809C38A8 /* 00320 809C3950 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00324 809C3954 03E00008 */ jr $ra /* 00328 809C3958 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C395C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C395C.s index 3372b84095..7b58525210 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C395C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C395C.s @@ -31,5 +31,3 @@ glabel func_809C395C /* 00394 809C39C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00398 809C39C8 03E00008 */ jr $ra /* 0039C 809C39CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s index 91ffdc321e..7fd68ac09b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s @@ -34,5 +34,3 @@ glabel func_809C39D0 /* 00418 809C3A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0041C 809C3A4C 03E00008 */ jr $ra /* 00420 809C3A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s index a900d6851b..130767d71c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s @@ -67,5 +67,3 @@ glabel func_809C3A54 /* 00514 809C3B44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00518 809C3B48 03E00008 */ jr $ra /* 0051C 809C3B4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s index f9d34d6edd..a440d78380 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s @@ -81,5 +81,3 @@ glabel func_809C3B50 /* 00640 809C3C70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00644 809C3C74 03E00008 */ jr $ra /* 00648 809C3C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3C7C.s index ba22bc6b90..384dfaa53b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3C7C.s @@ -24,5 +24,3 @@ glabel func_809C3C7C /* 00698 809C3CC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0069C 809C3CCC 03E00008 */ jr $ra /* 006A0 809C3CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3CD4.s index 82560b2af4..20dd4ecf95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3CD4.s @@ -28,5 +28,3 @@ glabel func_809C3CD4 /* 00704 809C3D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00708 809C3D38 03E00008 */ jr $ra /* 0070C 809C3D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3D40.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3D40.s index 51dfe533bd..1b5da4d46c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3D40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3D40.s @@ -36,5 +36,3 @@ glabel func_809C3D40 /* 00788 809C3DB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0078C 809C3DBC 03E00008 */ jr $ra /* 00790 809C3DC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s index 1c7bd83bd5..7f3394a4eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s @@ -1,3 +1,33 @@ +.rdata +glabel D_809C4B2C + .asciz "☆ game_play->bomchu_game_flag ☆ %d\n" + .balign 4 + +glabel D_809C4B5C + .asciz "☆ 壁１の状態どう？ ☆ %d\n" + .balign 4 + +glabel D_809C4B80 + .asciz "☆ 壁２の状態どう？ ☆ %d\n" + .balign 4 + +glabel D_809C4BA4 + .asciz "☆ 穴情報 ☆ %d\n" + .balign 4 + +glabel D_809C4BC4 + .asciz "\n\n" + .balign 4 + +glabel D_809C4BC8 + .asciz "☆☆☆☆☆ 中央ＨＩＴ！！！！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809C4BFC + .asciz "☆☆☆☆☆ ボムチュウ消化 ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_809C3DC4 /* 00794 809C3DC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00798 809C3DC8 AFB00018 */ sw $s0, 0x0018($sp) @@ -181,5 +211,3 @@ glabel func_809C3DC4 /* 00A04 809C4034 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A08 809C4038 03E00008 */ jr $ra /* 00A0C 809C403C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s index 3c247a7a9e..96eb6e11c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s @@ -118,5 +118,3 @@ glabel func_809C4040 /* 00BC0 809C41F0 8FB10020 */ lw $s1, 0x0020($sp) /* 00BC4 809C41F4 03E00008 */ jr $ra /* 00BC8 809C41F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C41FC.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C41FC.s index 907f595a7c..2fd1d02c41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C41FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C41FC.s @@ -80,5 +80,3 @@ glabel func_809C41FC /* 00CDC 809C430C 8FB10020 */ lw $s1, 0x0020($sp) /* 00CE0 809C4310 03E00008 */ jr $ra /* 00CE4 809C4314 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4318.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4318.s index e30c1226ea..0e4148998e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4318.s @@ -68,5 +68,3 @@ glabel func_809C4318 /* 00DE0 809C4410 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00DE4 809C4414 03E00008 */ jr $ra /* 00DE8 809C4418 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s index c16699c72f..f6caf9969a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_809C4C78 +.word L809C4468 +.word L809C448C +.word L809C4498 +.word L809C44A4 +.word L809C44C8 +.word 0x00000000 + +.text glabel func_809C441C /* 00DEC 809C441C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00DF0 809C4420 AFB00038 */ sw $s0, 0x0038($sp) @@ -161,5 +171,3 @@ glabel L809C44C8 /* 01028 809C4658 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0102C 809C465C 03E00008 */ jr $ra /* 01030 809C4660 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s index 10fa19f2ca..6636afdc90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809C4C2C + .asciz "☆ わー ☆ %d\n" + .balign 4 + +.text glabel func_809C4664 /* 01034 809C4664 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01038 809C4668 AFBF001C */ sw $ra, 0x001C($sp) @@ -55,5 +61,3 @@ glabel func_809C4664 /* 010F8 809C4728 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 010FC 809C472C 03E00008 */ jr $ra /* 01100 809C4730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C48A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C48A8.s index 2e9808ad0b..f885b78bcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C48A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C48A8.s @@ -17,5 +17,3 @@ glabel func_809C48A8 .L809C48E4: /* 012B4 809C48E4 03E00008 */ jr $ra /* 012B8 809C48E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Destroy.s index eabf32e618..94be0317e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Destroy.s @@ -2,5 +2,3 @@ glabel EnBomBowlPit_Destroy /* 00014 809C4E54 AFA40000 */ sw $a0, 0x0000($sp) /* 00018 809C4E58 03E00008 */ jr $ra /* 0001C 809C4E5C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Init.s index 9c58c1cd32..057dd0cbf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Init.s @@ -4,5 +4,3 @@ glabel EnBomBowlPit_Init /* 00008 809C4E48 25CE4E60 */ addiu $t6, $t6, %lo(func_809C4E60) ## $t6 = 809C4E60 /* 0000C 809C4E4C 03E00008 */ jr $ra /* 00010 809C4E50 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Update.s index ba1d1b48ed..e98a1724f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/EnBomBowlPit_Update.s @@ -18,4 +18,3 @@ glabel EnBomBowlPit_Update /* 00894 809C56D4 00000000 */ nop /* 00898 809C56D8 00000000 */ nop /* 0089C 809C56DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E60.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E60.s index 0a90ceb69c..d2bbe2361a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E60.s @@ -11,5 +11,3 @@ glabel func_809C4E60 .L809C4E84: /* 00044 809C4E84 03E00008 */ jr $ra /* 00048 809C4E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s index 5e804aa42b..373237d95b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809C5778 + .float 0.1 + +glabel D_809C577C + .float 0.02 + +glabel D_809C5780 + .word 0xC3F28000, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_809C4E8C /* 0004C 809C4E8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00050 809C4E90 AFBF001C */ sw $ra, 0x001C($sp) @@ -198,5 +209,3 @@ glabel func_809C4E8C /* 00338 809C5178 8FB10018 */ lw $s1, 0x0018($sp) /* 0033C 809C517C 03E00008 */ jr $ra /* 00340 809C5180 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5184.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5184.s index b89be09b55..ab9e5aaa6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5184.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5184.s @@ -127,5 +127,3 @@ glabel func_809C5184 /* 00514 809C5354 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00518 809C5358 03E00008 */ jr $ra /* 0051C 809C535C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s index 2757b32423..26b00b7ce6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s @@ -38,5 +38,3 @@ glabel func_809C5360 /* 005A4 809C53E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 005A8 809C53E8 03E00008 */ jr $ra /* 005AC 809C53EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s index 535cdaa839..2ec884241f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s @@ -50,5 +50,3 @@ glabel func_809C53F0 /* 0065C 809C549C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00660 809C54A0 03E00008 */ jr $ra /* 00664 809C54A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s index 9928b0a475..5b8cc5d1b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s @@ -67,5 +67,3 @@ glabel func_809C54A8 /* 00764 809C55A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00768 809C55A8 03E00008 */ jr $ra /* 0076C 809C55AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s index 0a95cf4747..6fa8da6395 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s @@ -23,5 +23,3 @@ glabel func_809C55B0 /* 007BC 809C55FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007C0 809C5600 03E00008 */ jr $ra /* 007C4 809C5604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s index 0093100e9a..63945f8c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809C5720 + .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809C574C + .asciz "☆☆☆☆☆ あぁ回復！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_809C5608 /* 007C8 809C5608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007CC 809C560C AFBF0014 */ sw $ra, 0x0014($sp) @@ -40,5 +50,3 @@ glabel func_809C5608 /* 0084C 809C568C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00850 809C5690 03E00008 */ jr $ra /* 00854 809C5694 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s index 511181eb05..86c56461fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s @@ -19,5 +19,3 @@ glabel EnBomChu_Destroy /* 001E0 809C5A10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001E4 809C5A14 03E00008 */ jr $ra /* 001E8 809C5A18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s index 9647ff3ab0..6760fcc1f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809C6DA0 + .asciz "../z_en_bom_chu.c" + .balign 4 + +glabel D_809C6DB4 + .asciz "../z_en_bom_chu.c" + .balign 4 + +glabel D_809C6DC8 + .asciz "../z_en_bom_chu.c" + .balign 4 + +.text glabel EnBomChu_Draw /* 01164 809C6994 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01168 809C6998 AFBF001C */ sw $ra, 0x001C($sp) @@ -235,4 +249,3 @@ glabel EnBomChu_Draw /* 014D4 809C6D04 00000000 */ nop /* 014D8 809C6D08 00000000 */ nop /* 014DC 809C6D0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s index 6c7666fdbe..449a4ca4a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s @@ -105,5 +105,3 @@ glabel EnBomChu_Init /* 00190 809C59C0 27BD01D8 */ addiu $sp, $sp, 0x01D8 ## $sp = 00000000 /* 00194 809C59C4 03E00008 */ jr $ra /* 00198 809C59C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s index ce2eb65fb8..81c28381b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s @@ -257,5 +257,3 @@ glabel EnBomChu_Update /* 01158 809C6988 8FB10020 */ lw $s1, 0x0020($sp) /* 0115C 809C698C 03E00008 */ jr $ra /* 01160 809C6990 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s index 71fd8bfe99..b278980f65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s @@ -74,5 +74,3 @@ glabel func_809C5A1C /* 002FC 809C5B2C D7B40030 */ ldc1 $f20, 0x0030($sp) /* 00300 809C5B30 03E00008 */ jr $ra /* 00304 809C5B34 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5B38.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5B38.s index dd7df92aaf..bfe8bf9f14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5B38.s @@ -27,5 +27,3 @@ glabel func_809C5B38 /* 0036C 809C5B9C 46069281 */ sub.s $f10, $f18, $f6 /* 00370 809C5BA0 03E00008 */ jr $ra /* 00374 809C5BA4 E4CA0008 */ swc1 $f10, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s index 50fe411b1a..bb93a35222 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_809C6DDC + .word 0x38000100 +glabel D_809C6DE0 + .float 0.001 + +glabel D_809C6DE4 + .float 0.001 + +.text glabel func_809C5BA8 /* 00378 809C5BA8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0037C 809C5BAC 3C01809C */ lui $at, %hi(D_809C6DDC) ## $at = 809C0000 @@ -143,5 +153,3 @@ glabel func_809C5BA8 /* 005A0 809C5DD0 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 005A4 809C5DD4 03E00008 */ jr $ra /* 005A8 809C5DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s index 0fe02644ff..ca975cfd98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s @@ -98,5 +98,3 @@ glabel func_809C5DDC /* 0070C 809C5F3C 8FB10028 */ lw $s1, 0x0028($sp) /* 00710 809C5F40 03E00008 */ jr $ra /* 00714 809C5F44 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s index a224eb6826..8190416bec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s @@ -342,5 +342,3 @@ glabel func_809C5F48 /* 00C20 809C6450 8FB20040 */ lw $s2, 0x0040($sp) /* 00C24 809C6454 03E00008 */ jr $ra /* 00C28 809C6458 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C645C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C645C.s index 60d10c7d68..1847276a7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C645C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C645C.s @@ -18,5 +18,3 @@ glabel func_809C645C /* 00C60 809C6490 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C64 809C6494 03E00008 */ jr $ra /* 00C68 809C6498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C649C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C649C.s index 07b5ddaa0e..9036c3721e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C649C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C649C.s @@ -42,5 +42,3 @@ glabel func_809C649C /* 00D0C 809C653C 46088280 */ add.s $f10, $f16, $f8 /* 00D10 809C6540 03E00008 */ jr $ra /* 00D14 809C6544 E4CA0008 */ swc1 $f10, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s index b048971ebd..6a1b454a6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s @@ -33,5 +33,3 @@ glabel func_809C6548 /* 00D94 809C65C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D98 809C65C8 03E00008 */ jr $ra /* 00D9C 809C65CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s index 79be76238f..b32b250039 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s @@ -16,5 +16,3 @@ glabel EnBombf_Destroy /* 00214 809C7174 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00218 809C7178 03E00008 */ jr $ra /* 0021C 809C717C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s index 5f63422a3d..d4a32f22e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809C8310 + .asciz "../z_en_bombf.c" + .balign 4 + +glabel D_809C8320 + .asciz "../z_en_bombf.c" + .balign 4 + +glabel D_809C8330 + .asciz "../z_en_bombf.c" + .balign 4 + +glabel D_809C8340 + .asciz "../z_en_bombf.c" + .balign 4 + +.text glabel EnBombf_Draw /* 01054 809C7FB4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01058 809C7FB8 AFBF001C */ sw $ra, 0x001C($sp) @@ -165,4 +183,3 @@ glabel EnBombf_Draw /* 012D4 809C8234 03E00008 */ jr $ra /* 012D8 809C8238 00000000 */ nop /* 012DC 809C823C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s index def41eab64..df30b7771c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809C8350 + .float 10000.0 + +glabel D_809C8354 + .word 0x46F23000 + +.text glabel EnBombf_Init /* 00008 809C6F68 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0000C 809C6F6C AFB10020 */ sw $s1, 0x0020($sp) @@ -127,5 +135,3 @@ glabel EnBombf_Init /* 001D4 809C7134 8FB0001C */ lw $s0, 0x001C($sp) /* 001D8 809C7138 03E00008 */ jr $ra /* 001DC 809C713C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s index 10cc0b9bde..79e6d8a5f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809C835C + .float 0.7 + +glabel D_809C8360 + .float 0.2 + +glabel D_809C8364 + .float 0.002 + +glabel D_809C8368 + .float 0.01 + +.text glabel EnBombf_Update /* 00818 809C7778 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0081C 809C777C 3C0F809D */ lui $t7, %hi(D_809C82C0) ## $t7 = 809D0000 @@ -534,5 +548,3 @@ glabel EnBombf_Update /* 00FB8 809C7F18 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 00FBC 809C7F1C 03E00008 */ jr $ra /* 00FC0 809C7F20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C6F60.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C6F60.s index 3f8ffc4ab5..4dc51153ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C6F60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C6F60.s @@ -1,5 +1,3 @@ glabel func_809C6F60 /* 00000 809C6F60 03E00008 */ jr $ra /* 00004 809C6F64 AC8501FC */ sw $a1, 0x01FC($a0) ## 000001FC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7180.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7180.s index 329438b353..8277159b4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7180.s @@ -9,5 +9,3 @@ glabel func_809C7180 /* 0023C 809C719C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00240 809C71A0 03E00008 */ jr $ra /* 00244 809C71A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C71A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C71A8.s index fb404e2a7d..0e907b45a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C71A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C71A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809C8358 + .float 0.05 + +.text glabel func_809C71A8 /* 00248 809C71A8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0024C 809C71AC AFBF0034 */ sw $ra, 0x0034($sp) @@ -205,5 +210,3 @@ glabel func_809C71A8 /* 00540 809C74A0 8FB10030 */ lw $s1, 0x0030($sp) /* 00544 809C74A4 03E00008 */ jr $ra /* 00548 809C74A8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C74AC.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C74AC.s index 9c67b6be78..b7d47152df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C74AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C74AC.s @@ -77,5 +77,3 @@ glabel func_809C74AC /* 0065C 809C75BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00660 809C75C0 03E00008 */ jr $ra /* 00664 809C75C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C75C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C75C8.s index f300bef742..2593c7fc31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C75C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C75C8.s @@ -24,5 +24,3 @@ glabel func_809C75C8 /* 006B8 809C7618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006BC 809C761C 03E00008 */ jr $ra /* 006C0 809C7620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s index 3b641ba258..07e88bf479 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s @@ -96,5 +96,3 @@ glabel func_809C7624 /* 0080C 809C776C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00810 809C7770 03E00008 */ jr $ra /* 00814 809C7774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7F24.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7F24.s index 7db1fbeed4..f3edb292bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7F24.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809C8300 + .asciz "../z_en_bombf.c" + .balign 4 + +.text glabel func_809C7F24 /* 00FC4 809C7F24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00FC8 809C7F28 AFBF0014 */ sw $ra, 0x0014($sp) @@ -36,5 +42,3 @@ glabel func_809C7F24 /* 01048 809C7FA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0104C 809C7FAC 03E00008 */ jr $ra /* 01050 809C7FB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s index 0b48aa2d38..0aeaf3f9fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s @@ -12,5 +12,3 @@ glabel EnBox_Destroy /* 00528 809C92E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0052C 809C92EC 03E00008 */ jr $ra /* 00530 809C92F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s index b3c073095e..75e702008e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809CA8D0 + .asciz "../z_en_box.c" + .balign 4 + +glabel D_809CA8E0 + .asciz "../z_en_box.c" + .balign 4 + +.text glabel EnBox_Draw /* 017D0 809CA590 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 017D4 809CA594 AFBF002C */ sw $ra, 0x002C($sp) @@ -157,4 +167,3 @@ glabel EnBox_Draw /* 01A14 809CA7D4 8FB10028 */ lw $s1, 0x0028($sp) /* 01A18 809CA7D8 03E00008 */ jr $ra /* 01A1C 809CA7DC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s index 33ff9b203b..04ce99ac5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s @@ -316,5 +316,3 @@ glabel EnBox_Init /* 004F8 809C92B8 8FB10028 */ lw $s1, 0x0028($sp) /* 004FC 809C92BC 03E00008 */ jr $ra /* 00500 809C92C0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s index c47f4960ab..75e0df342c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s @@ -87,5 +87,3 @@ glabel EnBox_Update /* 0150C 809CA2CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01510 809CA2D0 03E00008 */ jr $ra /* 01514 809CA2D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s index f1fb4428c5..4d62602504 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s @@ -1,5 +1,3 @@ glabel func_809C8DC0 /* 00000 809C8DC0 03E00008 */ jr $ra /* 00004 809C8DC4 AC8501B4 */ sw $a1, 0x01B4($a0) ## 000001B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s index 8291521a3d..60aa4734fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s @@ -35,5 +35,3 @@ glabel func_809C8DC8 /* 00088 809C8E48 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0008C 809C8E4C 03E00008 */ jr $ra /* 00090 809C8E50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s index 26ad5bfaba..bc68a9d04f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s @@ -70,5 +70,3 @@ glabel func_809C92F4 /* 0062C 809C93EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00630 809C93F0 03E00008 */ jr $ra /* 00634 809C93F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s index 0aabd6d305..b214dd48ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s @@ -45,5 +45,3 @@ glabel func_809C93F8 /* 006E0 809C94A0 8FB60040 */ lw $s6, 0x0040($sp) /* 006E4 809C94A4 03E00008 */ jr $ra /* 006E8 809C94A8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s index ba31a98c1b..44511dbd5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809CA8F0 + .word 0x3F0CCCCD +glabel D_809CA8F4 + .word 0x3F266666 + +.text glabel func_809C94AC /* 006EC 809C94AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006F0 809C94B0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -105,5 +112,3 @@ glabel func_809C94AC /* 00864 809C9624 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00868 809C9628 03E00008 */ jr $ra /* 0086C 809C962C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s index 95650808a9..baa4e60cf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s @@ -58,5 +58,3 @@ glabel func_809C9630 /* 00934 809C96F4 8FB10020 */ lw $s1, 0x0020($sp) /* 00938 809C96F8 03E00008 */ jr $ra /* 0093C 809C96FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s index 2f4154ac98..f718bed4f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CA8F8 + .word 0x46AFC800 + +.text glabel func_809C9700 /* 00940 809C9700 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00944 809C9704 AFBF001C */ sw $ra, 0x001C($sp) @@ -108,5 +113,3 @@ glabel func_809C9700 /* 00AC0 809C9880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AC4 809C9884 03E00008 */ jr $ra /* 00AC8 809C9888 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s index c572ae3a35..fbcb3e7512 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s @@ -35,5 +35,3 @@ glabel func_809C988C /* 00B40 809C9900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B44 809C9904 03E00008 */ jr $ra /* 00B48 809C9908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s index 7741386408..78ccba2dfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s @@ -52,5 +52,3 @@ glabel func_809C990C /* 00BF8 809C99B8 8FB10018 */ lw $s1, 0x0018($sp) /* 00BFC 809C99BC 03E00008 */ jr $ra /* 00C00 809C99C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s index 7a1a2e4b95..1afb9e0ba9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s @@ -49,5 +49,3 @@ glabel func_809C99C4 /* 00CB0 809C9A70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00CB4 809C9A74 03E00008 */ jr $ra /* 00CB8 809C9A78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s index 74578dc995..ece24c5def 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s @@ -46,5 +46,3 @@ glabel func_809C9A7C /* 00D5C 809C9B1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D60 809C9B20 03E00008 */ jr $ra /* 00D64 809C9B24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s index 8fd433b19d..d74db5685f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809CA830 + .asciz "Actor_Environment_Tbox_On() %d\n" + .balign 4 + +.text glabel func_809C9B28 /* 00D68 809C9B28 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00D6C 809C9B2C AFBF003C */ sw $ra, 0x003C($sp) @@ -159,5 +165,3 @@ glabel func_809C9B28 /* 00FA4 809C9D64 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00FA8 809C9D68 03E00008 */ jr $ra /* 00FAC 809C9D6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s index 20032bbf36..a261148432 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CA8FC + .word 0x387BA882 + +.text glabel func_809C9D70 /* 00FB0 809C9D70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00FB4 809C9D74 AFBF0024 */ sw $ra, 0x0024($sp) @@ -111,5 +116,3 @@ glabel func_809C9D70 /* 0112C 809C9EEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01130 809C9EF0 03E00008 */ jr $ra /* 01134 809C9EF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s index 92bddaa2b9..fdbd73035a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_809CA900 + .float 0.3 + +glabel D_809CA904 + .float 0.8 + +glabel D_809CA908 + .word 0x3FE66666 +glabel D_809CA90C + .float 1.6 + +glabel D_809CA910 + .word 0x3FE66666, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_809C9EF8 /* 01138 809C9EF8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0113C 809C9EFC 3C0F809D */ lui $t7, %hi(D_809CA814) ## $t7 = 809D0000 @@ -185,5 +201,3 @@ glabel func_809C9EF8 /* 013D4 809CA194 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 013D8 809CA198 03E00008 */ jr $ra /* 013DC 809CA19C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s index 69d7b774b7..8155708c2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809CA850 + .asciz "../z_en_box.c" + .balign 4 + +glabel D_809CA860 + .asciz "../z_en_box.c" + .balign 4 + +.text glabel func_809CA2D8 /* 01518 809CA2D8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0151C 809CA2DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -95,5 +105,3 @@ glabel func_809CA2D8 /* 0167C 809CA43C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01680 809CA440 03E00008 */ jr $ra /* 01684 809CA444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s index f50e783ada..723a8b525e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809CA870 + .asciz "gfxp != NULL" + .balign 4 + +glabel D_809CA880 + .asciz "../z_en_box.c" + .balign 4 + +.text glabel func_809CA448 /* 01688 809CA448 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0168C 809CA44C AFBF0014 */ sw $ra, 0x0014($sp) @@ -24,5 +34,3 @@ glabel func_809CA448 /* 016D4 809CA494 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016D8 809CA498 03E00008 */ jr $ra /* 016DC 809CA49C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s index 35aaa50a03..4741d7cdcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809CA890 + .asciz "gfxp != NULL" + .balign 4 + +glabel D_809CA8A0 + .asciz "../z_en_box.c" + .balign 4 + +.text glabel func_809CA4A0 /* 016E0 809CA4A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 016E4 809CA4A4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -32,5 +42,3 @@ glabel func_809CA4A0 /* 0174C 809CA50C 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 01750 809CA510 03E00008 */ jr $ra /* 01754 809CA514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s index 57ab8921e3..35290c8943 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809CA8B0 + .asciz "gfxp != NULL" + .balign 4 + +glabel D_809CA8C0 + .asciz "../z_en_box.c" + .balign 4 + +.text glabel func_809CA518 /* 01758 809CA518 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0175C 809CA51C AFBF0014 */ sw $ra, 0x0014($sp) @@ -32,5 +42,3 @@ glabel func_809CA518 /* 017C4 809CA584 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 017C8 809CA588 03E00008 */ jr $ra /* 017CC 809CA58C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s index 8b64707eaf..a8131c134d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s @@ -24,5 +24,3 @@ glabel EnBrob_Destroy /* 002C0 809CADD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002C4 809CADD4 03E00008 */ jr $ra /* 002C8 809CADD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s index 875c976745..86f10ba885 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s @@ -31,4 +31,3 @@ glabel EnBrob_Draw /* 00F44 809CBA54 00000000 */ nop /* 00F48 809CBA58 00000000 */ nop /* 00F4C 809CBA5C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s index 4b5ce0b40f..16d4f17278 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809CBAC0 + .float 0.033333335 +glabel D_809CBAC4 + .float 0.06666667 +glabel D_809CBAC8 + .float 12000.0 + +.text glabel EnBrob_Init /* 00000 809CAB10 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 809CAB14 AFB00024 */ sw $s0, 0x0024($sp) @@ -167,5 +176,3 @@ glabel EnBrob_Init /* 00268 809CAD78 8FB10028 */ lw $s1, 0x0028($sp) /* 0026C 809CAD7C 03E00008 */ jr $ra /* 00270 809CAD80 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s index a7fd5f6b88..a7646ccde8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s @@ -186,5 +186,3 @@ glabel EnBrob_Update /* 00DF0 809CB900 8FB10020 */ lw $s1, 0x0020($sp) /* 00DF4 809CB904 03E00008 */ jr $ra /* 00DF8 809CB908 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CADDC.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CADDC.s index 1a4b4009b3..64b534741d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CADDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CADDC.s @@ -27,5 +27,3 @@ glabel func_809CADDC /* 00328 809CAE38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0032C 809CAE3C 03E00008 */ jr $ra /* 00330 809CAE40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s index c73f98262f..f791ad43bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s @@ -22,5 +22,3 @@ glabel func_809CAE44 /* 00384 809CAE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00388 809CAE98 03E00008 */ jr $ra /* 0038C 809CAE9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s index 83d8ed950f..ca2ea83b36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s @@ -20,5 +20,3 @@ glabel func_809CAEA0 /* 003D8 809CAEE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003DC 809CAEEC 03E00008 */ jr $ra /* 003E0 809CAEF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s index 3a82824222..1ea64c8af9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s @@ -37,5 +37,3 @@ glabel func_809CAEF4 /* 0046C 809CAF7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00470 809CAF80 03E00008 */ jr $ra /* 00474 809CAF84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s index 1a908d8f60..1f94ff0a8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s @@ -33,5 +33,3 @@ glabel func_809CAF88 /* 004EC 809CAFFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004F0 809CB000 03E00008 */ jr $ra /* 004F4 809CB004 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s index d1a4d55556..2a54cf998c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s @@ -18,5 +18,3 @@ glabel func_809CB008 /* 00538 809CB048 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0053C 809CB04C 03E00008 */ jr $ra /* 00540 809CB050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB054.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB054.s index 4b8190d8e4..9e86eefcfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB054.s @@ -52,5 +52,3 @@ glabel func_809CB054 /* 005F8 809CB108 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005FC 809CB10C 03E00008 */ jr $ra /* 00600 809CB110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB114.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB114.s index c08a8c62d3..c6908b1d96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB114.s @@ -70,5 +70,3 @@ glabel func_809CB114 /* 006FC 809CB20C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00700 809CB210 03E00008 */ jr $ra /* 00704 809CB214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB218.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB218.s index e217f39e37..36d682b60c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB218.s @@ -45,5 +45,3 @@ glabel func_809CB218 /* 0079C 809CB2AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007A0 809CB2B0 03E00008 */ jr $ra /* 007A4 809CB2B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB2B8.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB2B8.s index 6c15b35dae..4c2aa880b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB2B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB2B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CBACC + .float 1250.0 + +.text glabel func_809CB2B8 /* 007A8 809CB2B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007AC 809CB2BC AFBF0014 */ sw $ra, 0x0014($sp) @@ -42,5 +47,3 @@ glabel func_809CB2B8 /* 00838 809CB348 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0083C 809CB34C 03E00008 */ jr $ra /* 00840 809CB350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB354.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB354.s index 1fba6087c2..bcb1cd190b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB354.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB354.s @@ -70,5 +70,3 @@ glabel func_809CB354 /* 0093C 809CB44C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00940 809CB450 03E00008 */ jr $ra /* 00944 809CB454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s index 9a6e9c6834..a3f26b6988 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_809CBAD0 + .float 5500.0 +glabel D_809CBAD4 + .float 5500.0 +glabel D_809CBAD8 + .float 15000.0 + +.text glabel func_809CB458 /* 00948 809CB458 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0094C 809CB45C AFB1005C */ sw $s1, 0x005C($sp) @@ -144,5 +153,3 @@ glabel func_809CB458 /* 00B54 809CB664 8FB60070 */ lw $s6, 0x0070($sp) /* 00B58 809CB668 03E00008 */ jr $ra /* 00B5C 809CB66C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB90C.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB90C.s index a336d8e581..9b1d1eb143 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB90C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB90C.s @@ -54,5 +54,3 @@ glabel func_809CB90C /* 00EC4 809CB9D4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00EC8 809CB9D8 03E00008 */ jr $ra /* 00ECC 809CB9DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s index 774407004e..0d2248106c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s @@ -9,5 +9,3 @@ glabel EnBubble_Destroy /* 00DA8 809CC9A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DAC 809CC9AC 03E00008 */ jr $ra /* 00DB0 809CC9B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s index 68fd3d7c39..8677d880b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_809CCEB0 + .asciz "../z_en_bubble.c" + .balign 4 + +glabel D_809CCEC4 + .asciz "../z_en_bubble.c" + .balign 4 + +glabel D_809CCED8 + .asciz "../z_en_bubble.c" + .balign 4 + +.late_rodata +glabel D_809CCF14 + .word 0x3C8EFA35 +glabel D_809CCF18 + .word 0x3C8EFA35 +glabel D_809CCF1C + .float 0.2 + +.text glabel EnBubble_Draw /* 00FD0 809CCBD0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00FD4 809CCBD4 AFB10020 */ sw $s1, 0x0020($sp) @@ -149,4 +171,3 @@ glabel EnBubble_Draw /* 01204 809CCE04 00000000 */ nop /* 01208 809CCE08 00000000 */ nop /* 0120C 809CCE0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s index 5d75700d81..6ede302bae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s @@ -68,5 +68,3 @@ glabel EnBubble_Init /* 00D80 809CC980 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00D84 809CC984 03E00008 */ jr $ra /* 00D88 809CC988 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Update.s index 2df06422a4..ba01b89a07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Update.s @@ -30,5 +30,3 @@ glabel EnBubble_Update /* 00FC4 809CCBC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FC8 809CCBC8 03E00008 */ jr $ra /* 00FCC 809CCBCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s index e24f046719..591a83162a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CCEEC + .float 0.08 + +.text glabel func_809CBC00 /* 00000 809CBC00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00004 809CBC04 AFBF001C */ sw $ra, 0x001C($sp) @@ -50,5 +55,3 @@ glabel func_809CBC00 /* 000B0 809CBCB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000B4 809CBCB4 03E00008 */ jr $ra /* 000B8 809CBCB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCBC.s index 59650052c1..1fe427d636 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCBC.s @@ -11,5 +11,3 @@ glabel func_809CBCBC /* 000E0 809CBCE0 24020006 */ addiu $v0, $zero, 0x0006 ## $v0 = 00000006 /* 000E4 809CBCE4 03E00008 */ jr $ra /* 000E8 809CBCE8 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCEC.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCEC.s index 7c62ce5a19..05b4ffd405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBCEC.s @@ -8,5 +8,3 @@ glabel func_809CBCEC /* 00104 809CBD04 2402000C */ addiu $v0, $zero, 0x000C ## $v0 = 0000000C /* 00108 809CBD08 03E00008 */ jr $ra /* 0010C 809CBD0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD10.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD10.s index e00955f6c6..f3f3f41791 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD10.s @@ -25,5 +25,3 @@ glabel func_809CBD10 /* 0016C 809CBD6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00170 809CBD70 03E00008 */ jr $ra /* 00174 809CBD74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s index edb3420826..dc09112b5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CCEF0 + .float 0.1 + +.text glabel func_809CBD78 /* 00178 809CBD78 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 0017C 809CBD7C 3C0E809D */ lui $t6, %hi(D_809CCE94) ## $t6 = 809D0000 @@ -165,5 +170,3 @@ glabel func_809CBD78 /* 003C8 809CBFC8 8FBE0060 */ lw $s8, 0x0060($sp) /* 003CC 809CBFCC 03E00008 */ jr $ra /* 003D0 809CBFD0 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBFD4.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBFD4.s index 922ddf999d..807c8093c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBFD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBFD4.s @@ -22,5 +22,3 @@ glabel func_809CBFD4 /* 00414 809CC014 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00418 809CC018 03E00008 */ jr $ra /* 0041C 809CC01C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC020.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC020.s index bbaa9b69fd..0570ab0405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC020.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC020.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CCEF4 + .word 0x3DAAAAAB + +.text glabel func_809CC020 /* 00420 809CC020 3C01809D */ lui $at, %hi(D_809CCEF4) ## $at = 809D0000 /* 00424 809CC024 C420CEF4 */ lwc1 $f0, %lo(D_809CCEF4)($at) @@ -23,5 +28,3 @@ glabel func_809CC020 .L809CC06C: /* 0046C 809CC06C 03E00008 */ jr $ra /* 00470 809CC070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC074.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC074.s index 2aa78b3ee2..ea4f86b5c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC074.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC074.s @@ -35,5 +35,3 @@ glabel func_809CC074 /* 004F0 809CC0F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F4 809CC0F4 03E00008 */ jr $ra /* 004F8 809CC0F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC0FC.s index d1a96d26c9..61fd29bdc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC0FC.s @@ -29,5 +29,3 @@ glabel func_809CC0FC /* 00560 809CC160 E4920000 */ swc1 $f18, 0x0000($a0) ## 00000000 /* 00564 809CC164 03E00008 */ jr $ra /* 00568 809CC168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s index cb33e2c0d7..a5929dd5fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_809CCEF8 + .float 0.1 + +glabel D_809CCEFC + .word 0x38000100 +glabel D_809CCF00 + .word 0x40666667 +glabel D_809CCF04 + .word 0x3EF5C28F +glabel D_809CCF08 + .word 0x40666667 +glabel D_809CCF0C + .word 0x3EF5C28F + +.text glabel func_809CC16C /* 0056C 809CC16C 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00570 809CC170 AFBF003C */ sw $ra, 0x003C($sp) @@ -328,5 +344,3 @@ glabel func_809CC16C /* 00A3C 809CC63C 8FB00038 */ lw $s0, 0x0038($sp) /* 00A40 809CC640 03E00008 */ jr $ra /* 00A44 809CC644 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC648.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC648.s index d57041c9bd..57f52fece2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC648.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC648.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CCF10 + .word 0x3EF5C28F + +.text glabel func_809CC648 /* 00A48 809CC648 90820161 */ lbu $v0, 0x0161($a0) ## 00000161 /* 00A4C 809CC64C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 @@ -42,5 +47,3 @@ glabel func_809CC648 .L809CC6DC: /* 00ADC 809CC6DC 03E00008 */ jr $ra /* 00AE0 809CC6E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC6E4.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC6E4.s index abc9995c71..37761e7e42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC6E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC6E4.s @@ -41,5 +41,3 @@ glabel func_809CC6E4 /* 00B68 809CC768 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B6C 809CC76C 03E00008 */ jr $ra /* 00B70 809CC770 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC774.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC774.s index 94eff9b90b..4cb74f65bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC774.s @@ -69,5 +69,3 @@ glabel func_809CC774 /* 00C80 809CC880 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C84 809CC884 03E00008 */ jr $ra /* 00C88 809CC888 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s index e9f4428b43..ed93af0520 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s @@ -46,5 +46,3 @@ glabel func_809CC9B4 /* 00E54 809CCA54 8FB10018 */ lw $s1, 0x0018($sp) /* 00E58 809CCA58 03E00008 */ jr $ra /* 00E5C 809CCA5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCA60.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCA60.s index 1f64c84106..d0b084ad17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCA60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCA60.s @@ -20,5 +20,3 @@ glabel func_809CCA60 /* 00E9C 809CCA9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EA0 809CCAA0 03E00008 */ jr $ra /* 00EA4 809CCAA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s index 7fc790fb8a..6bcd7f75c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s @@ -18,5 +18,3 @@ glabel func_809CCAA8 /* 00EE4 809CCAE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EE8 809CCAE8 03E00008 */ jr $ra /* 00EEC 809CCAEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s index e65357814d..3c28469eb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s @@ -28,5 +28,3 @@ glabel func_809CCAF0 /* 00F4C 809CCB4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F50 809CCB50 03E00008 */ jr $ra /* 00F54 809CCB54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s index b341bd7919..77ae3b9018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s @@ -9,5 +9,3 @@ glabel EnButte_Destroy /* 004F0 809CD560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F4 809CD564 03E00008 */ jr $ra /* 004F8 809CD568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Draw.s index 69f8e983e4..2a100af928 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Draw.s @@ -40,4 +40,3 @@ glabel EnButte_Draw /* 01274 809CE2E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01278 809CE2E8 03E00008 */ jr $ra /* 0127C 809CE2EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s index f1959b404c..f6affddfdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809CE450 + .asciz "(field keep 蝶)(%x)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel D_809CE48C + .word 0x477FFF00 +glabel D_809CE490 + .word 0x477FFF00 +glabel D_809CE494 + .word 0x477FFF00 + +.text glabel EnButte_Init /* 0034C 809CD3BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00350 809CD3C0 AFBF002C */ sw $ra, 0x002C($sp) @@ -106,5 +120,3 @@ glabel EnButte_Init /* 004C8 809CD538 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 004CC 809CD53C 03E00008 */ jr $ra /* 004D0 809CD540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s index d3777d4b5d..fa5c700be4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CE4C8 + .float 5000.0 + +.text glabel EnButte_Update /* 010AC 809CE11C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 010B0 809CE120 AFBF001C */ sw $ra, 0x001C($sp) @@ -88,5 +93,3 @@ glabel EnButte_Update /* 011E0 809CE250 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 011E4 809CE254 03E00008 */ jr $ra /* 011E8 809CE258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD070.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD070.s index 702571391e..d5a209f234 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD070.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CE478 + .float 0.6 + +.text glabel func_809CD070 /* 00000 809CD070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 809CD074 AFBF0014 */ sw $ra, 0x0014($sp) @@ -37,5 +42,3 @@ glabel func_809CD070 /* 0007C 809CD0EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00080 809CD0F0 03E00008 */ jr $ra /* 00084 809CD0F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD0F8.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD0F8.s index e45dd2cbac..489a6436d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD0F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD0F8.s @@ -5,5 +5,3 @@ glabel func_809CD0F8 /* 00094 809CD104 3C01809D */ lui $at, %hi(D_809CE3C0) ## $at = 809D0000 /* 00098 809CD108 03E00008 */ jr $ra /* 0009C 809CD10C A420E3C0 */ sh $zero, %lo(D_809CE3C0)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD110.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD110.s index 6ad5f2746c..9f5db7d439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD110.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809CE47C + .word 0x3B449BA6 + +.text glabel func_809CD110 /* 000A0 809CD110 3C02809D */ lui $v0, %hi(D_809CE3BC) ## $v0 = 809D0000 /* 000A4 809CD114 2442E3BC */ addiu $v0, $v0, %lo(D_809CE3BC) ## $v0 = 809CE3BC @@ -12,5 +17,3 @@ glabel func_809CD110 /* 000C8 809CD138 A46F0000 */ sh $t7, 0x0000($v1) ## 809CE3C0 /* 000CC 809CD13C 03E00008 */ jr $ra /* 000D0 809CD140 E4480000 */ swc1 $f8, 0x0000($v0) ## 809CE3BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s index 39e20be2eb..7b4f65250b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809CE420 + .asciz "../z_en_choo.c" + .balign 4 + +glabel D_809CE430 + .asciz "../z_en_choo.c" + .balign 4 + +glabel D_809CE440 + .asciz "../z_en_choo.c" + .balign 4 + +.late_rodata +glabel D_809CE480 + .float 9.58738019108e-05 + +glabel D_809CE484 + .float 9.58738019108e-05 + +glabel D_809CE488 + .float 9.58738019108e-05 + +.text glabel func_809CD144 /* 000D4 809CD144 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 000D8 809CD148 AFBF001C */ sw $ra, 0x001C($sp) @@ -161,5 +185,3 @@ glabel func_809CD144 /* 00340 809CD3B0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00344 809CD3B4 03E00008 */ jr $ra /* 00348 809CD3B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD56C.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD56C.s index f8d4a55680..04d7fefa3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD56C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD56C.s @@ -54,5 +54,3 @@ glabel func_809CD56C /* 005B8 809CD628 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005BC 809CD62C 03E00008 */ jr $ra /* 005C0 809CD630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD634.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD634.s index 4445579699..308c3dc2fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD634.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD634.s @@ -54,5 +54,3 @@ glabel func_809CD634 /* 00680 809CD6F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00684 809CD6F4 03E00008 */ jr $ra /* 00688 809CD6F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD6FC.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD6FC.s index 971c09e89b..0e7cadba2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD6FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD6FC.s @@ -43,5 +43,3 @@ glabel func_809CD6FC /* 00720 809CD790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00724 809CD794 03E00008 */ jr $ra /* 00728 809CD798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD79C.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD79C.s index cd74a61bda..8de57daf23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD79C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD79C.s @@ -18,5 +18,3 @@ glabel func_809CD79C /* 0076C 809CD7DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00770 809CD7E0 03E00008 */ jr $ra /* 00774 809CD7E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD7E8.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD7E8.s index 5e6080aff1..379bf40185 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD7E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD7E8.s @@ -1,3 +1,25 @@ +.late_rodata +glabel D_809CE498 + .float 10000.0 + +glabel D_809CE49C + .word 0x44992000 +glabel D_809CE4A0 + .float 0.3 + +glabel D_809CE4A4 + .float 0.4 + +glabel D_809CE4A8 + .float 0.2 + +glabel D_809CE4AC + .float 0.15 + +glabel D_809CE4B0 + .float 0.3 + +.text glabel func_809CD7E8 /* 00778 809CD7E8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0077C 809CD7EC AFBF0024 */ sw $ra, 0x0024($sp) @@ -275,5 +297,3 @@ glabel func_809CD7E8 /* 00B50 809CDBC0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00B54 809CDBC4 03E00008 */ jr $ra /* 00B58 809CDBC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDBCC.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDBCC.s index bfdbbb71ac..66c3f5df63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDBCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDBCC.s @@ -18,5 +18,3 @@ glabel func_809CDBCC /* 00B9C 809CDC0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BA0 809CDC10 03E00008 */ jr $ra /* 00BA4 809CDC14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDC18.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDC18.s index d04a0e988f..1bd754ce64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDC18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDC18.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_809CE4B4 + .float 0.3 + +glabel D_809CE4B8 + .float 0.2 + +glabel D_809CE4BC + .float 0.15 + +glabel D_809CE4C0 + .float 0.3 + +glabel D_809CE4C4 + .word 0x3FE66666 + +.text glabel func_809CDC18 /* 00BA8 809CDC18 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00BAC 809CDC1C AFBF0024 */ sw $ra, 0x0024($sp) @@ -256,5 +273,3 @@ glabel func_809CDC18 /* 00F48 809CDFB8 8FB10020 */ lw $s1, 0x0020($sp) /* 00F4C 809CDFBC 03E00008 */ jr $ra /* 00F50 809CDFC0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDFC4.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDFC4.s index 5cd81c6c73..bacf335140 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDFC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CDFC4.s @@ -19,5 +19,3 @@ glabel func_809CDFC4 /* 00F98 809CE008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F9C 809CE00C 03E00008 */ jr $ra /* 00FA0 809CE010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE014.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE014.s index 366cd719e4..386a153db4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE014.s @@ -53,5 +53,3 @@ glabel func_809CE014 /* 01054 809CE0C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01058 809CE0C8 03E00008 */ jr $ra /* 0105C 809CE0CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0D0.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0D0.s index 2759d07274..478be2ca8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0D0.s @@ -6,5 +6,3 @@ glabel func_809CE0D0 /* 01070 809CE0E0 AC8F0250 */ sw $t7, 0x0250($a0) ## 00000250 /* 01074 809CE0E4 03E00008 */ jr $ra /* 01078 809CE0E8 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0EC.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0EC.s index 5aa23160e1..8130d76564 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CE0EC.s @@ -13,5 +13,3 @@ glabel func_809CE0EC /* 010A0 809CE110 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010A4 809CE114 03E00008 */ jr $ra /* 010A8 809CE118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s index a0945ade36..a999824014 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s @@ -17,5 +17,3 @@ glabel EnBw_Destroy /* 00198 809CE878 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0019C 809CE87C 03E00008 */ jr $ra /* 001A0 809CE880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index af7a717ed5..024a66382a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -1,3 +1,32 @@ +.rdata +glabel D_809D1570 + .asciz "../z_en_bw.c" + .balign 4 + +glabel D_809D1580 + .asciz "../z_en_bw.c" + .balign 4 + +glabel D_809D1590 + .asciz "../z_en_bw.c" + .balign 4 + +.late_rodata +glabel D_809D16CC + .word 0x48B71B00 +glabel D_809D16D0 + .word 0x48127C00 +glabel D_809D16D4 + .word 0x49064700 +glabel D_809D16D8 + .word 0x3C54FDF4 +glabel D_809D16DC + .float 0.01 + +glabel D_809D16E0 + .float 1.3 + +.text glabel EnBw_Draw /* 02858 809D0F38 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0285C 809D0F3C 3C0F809D */ lui $t7, %hi(D_809D1554) ## $t7 = 809D0000 @@ -321,4 +350,3 @@ glabel EnBw_Draw /* 02D44 809D1424 8FB20040 */ lw $s2, 0x0040($sp) /* 02D48 809D1428 03E00008 */ jr $ra /* 02D4C 809D142C 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s index 146a98da70..c0b6274e2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809D15A0 + .float 0.6 + +.text glabel EnBw_Init /* 00008 809CE6E8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 809CE6EC AFA5003C */ sw $a1, 0x003C($sp) @@ -92,5 +97,3 @@ glabel EnBw_Init /* 00158 809CE838 AC4B0000 */ sw $t3, 0x0000($v0) ## 809D14C8 /* 0015C 809CE83C 03E00008 */ jr $ra /* 00160 809CE840 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s index 2db8c71923..6d7b88586e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809D16A0 + .word 0xBD99999A +glabel D_809D16A4 + .float 0.4 + +glabel D_809D16A8 + .word 0xBDCCCCCD +glabel D_809D16AC + .word 0xBDCCCCCD +glabel D_809D16B0 + .float 0.4 + +.text glabel EnBw_Update /* 021B0 809D0890 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 021B4 809D0894 3C0F809D */ lui $t7, %hi(D_809D14CC) ## $t7 = 809D0000 @@ -315,5 +329,3 @@ glabel EnBw_Update /* 0262C 809D0D0C 8FB0002C */ lw $s0, 0x002C($sp) /* 02630 809D0D10 03E00008 */ jr $ra /* 02634 809D0D14 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE6E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE6E0.s index a28a7d9d2f..6351f1c65f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE6E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE6E0.s @@ -1,5 +1,3 @@ glabel func_809CE6E0 /* 00000 809CE6E0 03E00008 */ jr $ra /* 00004 809CE6E4 AC850228 */ sw $a1, 0x0228($a0) ## 00000228 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s index 6467b054ab..d0cfd73077 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_809D15A4 + .float 0.001 + +glabel D_809D15A8 + .word 0x3BE56041 +glabel D_809D15AC + .word 0x3C54FDF4 +glabel D_809D15B0 + .float 0.001 + +glabel D_809D15B4 + .word 0x3C54FDF4 +glabel D_809D15B8 + .word 0x3BE56041 +glabel D_809D15BC + .float 0.001 + +glabel D_809D15C0 + .word 0x3BE56041 +glabel D_809D15C4 + .word 0x3C54FDF4 + +.text glabel func_809CE884 /* 001A4 809CE884 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001A8 809CE888 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 @@ -74,5 +98,3 @@ glabel func_809CE884 /* 002BC 809CE99C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002C0 809CE9A0 03E00008 */ jr $ra /* 002C4 809CE9A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s index c9d13b1afe..d897ab8b82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s @@ -31,5 +31,3 @@ glabel func_809CE9A8 /* 00338 809CEA18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0033C 809CEA1C 03E00008 */ jr $ra /* 00340 809CEA20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s index b39b41277a..839b6bcf3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s @@ -1,3 +1,40 @@ +.late_rodata +glabel D_809D15C8 + .float 0.1 + +glabel D_809D15CC + .float 0.8 + +glabel D_809D15D0 + .float 0.1 + +glabel D_809D15D4 + .word 0x3B83126F +glabel D_809D15D8 + .word 0x3C54FDF4 +glabel D_809D15DC + .word 0x3B83126F +glabel D_809D15E0 + .word 0x3C54FDF4 +glabel D_809D15E4 + .word 0x3B83126F +glabel D_809D15E8 + .word 0x3C54FDF4 +glabel D_809D15EC + .word 0x4622F983 +glabel jtbl_809D15F0 +.word L809CEEB0 +.word L809CEEC0 +.word L809CEF60 +.word L809CEF70 +.word L809CEF7C +.word L809CEF8C +.word L809CEF9C +.word L809CEF98 +glabel D_809D1610 + .word 0x4622F983 + +.text glabel func_809CEA24 /* 00344 809CEA24 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00348 809CEA28 AFBF0034 */ sw $ra, 0x0034($sp) @@ -914,5 +951,3 @@ glabel L809CEF9C /* 01040 809CF720 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 01044 809CF724 03E00008 */ jr $ra /* 01048 809CF728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s index a2af8709c5..171e315aaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809D1614 + .float 0.6 + +.text glabel func_809CF72C /* 0104C 809CF72C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01050 809CF730 AFBF0014 */ sw $ra, 0x0014($sp) @@ -32,5 +37,3 @@ glabel func_809CF72C /* 010C0 809CF7A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010C4 809CF7A4 03E00008 */ jr $ra /* 010C8 809CF7A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s index 02e9b4f06c..a821d8a16f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_809D1618 + .float 0.001 + +glabel D_809D161C + .word 0x3C54FDF4 +glabel D_809D1620 + .word 0x3B656041 +glabel D_809D1624 + .float 0.001 + +glabel D_809D1628 + .word 0x3CC8B439 +glabel D_809D162C + .word 0x3C54FDF4 +glabel D_809D1630 + .float 0.001 + +glabel D_809D1634 + .word 0x3C54FDF4 +glabel D_809D1638 + .word 0x3B656041 + +.text glabel func_809CF7AC /* 010CC 809CF7AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 010D0 809CF7B0 AFB00018 */ sw $s0, 0x0018($sp) @@ -86,5 +110,3 @@ glabel func_809CF7AC /* 01204 809CF8E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01208 809CF8E8 03E00008 */ jr $ra /* 0120C 809CF8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s index 8cadb6b90d..d184ed0b99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s @@ -37,5 +37,3 @@ glabel func_809CF8F0 /* 01298 809CF978 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0129C 809CF97C 03E00008 */ jr $ra /* 012A0 809CF980 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s index d7c7aace8e..8c0ba63955 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_809D163C + .float 0.001 + +glabel D_809D1640 + .word 0x3C54FDF4 +glabel D_809D1644 + .word 0x3B656041 +glabel D_809D1648 + .float 0.001 + +glabel D_809D164C + .word 0x3CC8B439 +glabel D_809D1650 + .word 0x3C54FDF4 +glabel D_809D1654 + .float 0.001 + +glabel D_809D1658 + .word 0x3C54FDF4 +glabel D_809D165C + .word 0x3B656041 + +.text glabel func_809CF984 /* 012A4 809CF984 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 012A8 809CF988 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -146,5 +170,3 @@ glabel func_809CF984 /* 014BC 809CFB9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 014C0 809CFBA0 03E00008 */ jr $ra /* 014C4 809CFBA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s index 6cc7c6d3a2..51ade3ef20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s @@ -42,5 +42,3 @@ glabel func_809CFBA8 /* 01560 809CFC40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01564 809CFC44 03E00008 */ jr $ra /* 01568 809CFC48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s index 19f601c909..800ba3eac0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s @@ -1,3 +1,30 @@ +.late_rodata +glabel D_809D1660 + .float 0.7 + +glabel D_809D1664 + .float 0.001 + +glabel D_809D1668 + .word 0x3BE56041 +glabel D_809D166C + .word 0x3C54FDF4 +glabel D_809D1670 + .float 0.001 + +glabel D_809D1674 + .word 0x3C54FDF4 +glabel D_809D1678 + .word 0x3BE56041 +glabel D_809D167C + .float 0.001 + +glabel D_809D1680 + .word 0x3BE56041 +glabel D_809D1684 + .word 0x3C54FDF4 + +.text glabel func_809CFC4C /* 0156C 809CFC4C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01570 809CFC50 AFB00030 */ sw $s0, 0x0030($sp) @@ -191,5 +218,3 @@ glabel func_809CFC4C /* 01824 809CFF04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01828 809CFF08 03E00008 */ jr $ra /* 0182C 809CFF0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s index fe0dcd87ac..c7f5bc45a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s @@ -34,5 +34,3 @@ glabel func_809CFF10 /* 018AC 809CFF8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018B0 809CFF90 03E00008 */ jr $ra /* 018B4 809CFF94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s index d1414f6ce1..4ed5e7dc50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s @@ -98,5 +98,3 @@ glabel func_809CFF98 /* 01A08 809D00E8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01A0C 809D00EC 03E00008 */ jr $ra /* 01A10 809D00F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D00F4.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D00F4.s index 3fe1e644fb..567f1d3a11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D00F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D00F4.s @@ -22,5 +22,3 @@ glabel func_809D00F4 /* 01A60 809D0140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A64 809D0144 03E00008 */ jr $ra /* 01A68 809D0148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D014C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D014C.s index 32b11b58fc..588ff718f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D014C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D014C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809D1688 + .word 0x3951B717 + +.text glabel func_809D014C /* 01A6C 809D014C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01A70 809D0150 AFBF0014 */ sw $ra, 0x0014($sp) @@ -34,5 +39,3 @@ glabel func_809D014C /* 01AE0 809D01C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AE4 809D01C4 03E00008 */ jr $ra /* 01AE8 809D01C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s index 5f9f6bfbe1..73a1e64b1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s @@ -41,5 +41,3 @@ glabel func_809D01CC /* 01B7C 809D025C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B80 809D0260 03E00008 */ jr $ra /* 01B84 809D0264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s index 62e69e979f..8ae0e9cd95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809D168C + .float 0.7 + +.text glabel func_809D0268 /* 01B88 809D0268 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01B8C 809D026C AFBF0024 */ sw $ra, 0x0024($sp) @@ -96,5 +101,3 @@ glabel func_809D0268 /* 01CE0 809D03C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01CE4 809D03C4 03E00008 */ jr $ra /* 01CE8 809D03C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D03CC.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D03CC.s index bd886c0bcf..cb00dedd6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D03CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D03CC.s @@ -23,5 +23,3 @@ glabel func_809D03CC /* 01D38 809D0418 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D3C 809D041C 03E00008 */ jr $ra /* 01D40 809D0420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0424.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0424.s index ba6d93753c..91b4bcb0fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0424.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809D1690 + .float 0.7 + +glabel D_809D1694 + .word 0x3C1374BC + +.text glabel func_809D0424 /* 01D44 809D0424 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01D48 809D0428 AFBF0034 */ sw $ra, 0x0034($sp) @@ -95,5 +103,3 @@ glabel func_809D0424 /* 01E98 809D0578 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01E9C 809D057C 03E00008 */ jr $ra /* 01EA0 809D0580 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0584.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0584.s index 7406a882e1..a7ea143728 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0584.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0584.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809D1698 + .word 0x3C1374BC +glabel D_809D169C + .word 0x3C1374BC + +.text glabel func_809D0584 /* 01EA4 809D0584 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01EA8 809D0588 AFBF0034 */ sw $ra, 0x0034($sp) @@ -212,5 +219,3 @@ glabel func_809D0584 /* 021A4 809D0884 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 021A8 809D0888 03E00008 */ jr $ra /* 021AC 809D088C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s index 3d9f5395a5..9c77b9c50c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s @@ -1,3 +1,25 @@ +.rdata +glabel D_809D1560 + .asciz "../z_en_bw.c" + .balign 4 + +.late_rodata +glabel D_809D16B4 + .word 0x3DEB851F +glabel D_809D16B8 + .word 0x3E051EB8 +glabel D_809D16BC + .float 0.1 + +glabel D_809D16C0 + .float 0.1 + +glabel D_809D16C4 + .word 0x3E051EB8 +glabel D_809D16C8 + .word 0x3DEB851F + +.text glabel func_809D0D18 /* 02638 809D0D18 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0263C 809D0D1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -138,5 +160,3 @@ glabel func_809D0D18 /* 0284C 809D0F2C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 02850 809D0F30 03E00008 */ jr $ra /* 02854 809D0F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s index a1c4a74b54..eed51e663c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s @@ -10,5 +10,3 @@ glabel EnBx_Destroy /* 00220 809D1D00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00224 809D1D04 03E00008 */ jr $ra /* 00228 809D1D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index 5867fcc545..d115d57e2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809D2570 + .asciz "../z_en_bx.c" + .balign 4 + +glabel D_809D2580 + .asciz "../z_en_bx.c" + .balign 4 + +glabel D_809D2590 + .asciz "../z_en_bx.c" + .balign 4 + +glabel D_809D25A0 + .asciz "../z_en_bx.c" + .balign 4 + +.late_rodata +glabel D_809D25B8 + .word 0x3BF5C28F +glabel D_809D25BC + .word 0x3C75C28F + +.text glabel EnBx_Draw /* 0061C 809D20FC 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 00620 809D2100 AFB2004C */ sw $s2, 0x004C($sp) @@ -226,4 +250,3 @@ glabel EnBx_Draw /* 00984 809D2464 03E00008 */ jr $ra /* 00988 809D2468 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 0098C 809D246C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s index 0132d49350..6ccc264748 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809D25B0 + .float 0.01 + +glabel D_809D25B4 + .float 0.03 + +.text glabel EnBx_Init /* 00000 809D1AE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00004 809D1AE4 3C0E809D */ lui $t6, %hi(D_809D250C) ## $t6 = 809D0000 @@ -137,5 +145,3 @@ glabel EnBx_Init /* 001F8 809D1CD8 8FB00014 */ lw $s0, 0x0014($sp) /* 001FC 809D1CDC 03E00008 */ jr $ra /* 00200 809D1CE0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s index 2c6f1d7d0e..38c9564bf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s @@ -221,5 +221,3 @@ glabel EnBx_Update /* 00610 809D20F0 8FB40040 */ lw $s4, 0x0040($sp) /* 00614 809D20F4 03E00008 */ jr $ra /* 00618 809D20F8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/func_809D1D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/func_809D1D0C.s index 0939ec873e..a5a8288552 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/func_809D1D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/func_809D1D0C.s @@ -51,5 +51,3 @@ glabel func_809D1D0C /* 002F0 809D1DD0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 002F4 809D1DD4 03E00008 */ jr $ra /* 002F8 809D1DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Destroy.s index 7f530b5458..d6f9fda910 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Destroy.s @@ -2,5 +2,3 @@ glabel EnChanger_Destroy /* 00000 809D2690 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809D2694 03E00008 */ jr $ra /* 00008 809D2698 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s index f190f88baa..9fc27b36c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s @@ -1,3 +1,81 @@ +.rdata +glabel D_809D3180 + .asciz "\n\n" + .balign 4 + +glabel D_809D3184 + .asciz "☆☆☆☆☆ 宝発生(部屋はどれ？) %d\n" + .balign 4 + +glabel D_809D31B0 + .asciz "☆☆☆☆☆ ビットは？ %x\n" + .balign 4 + +glabel D_809D31D8 + .asciz "☆☆☆☆☆ セーブＢＩＴは？ %x\n" + .balign 4 + +glabel D_809D3204 + .asciz "☆☆☆☆☆ もう、ゾンビ？ %d\n" + .balign 4 + +glabel D_809D3230 + .asciz "\n\n" + .balign 4 + +glabel D_809D3234 + .asciz "☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_809D3270 + .asciz "☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_809D32B4 + .asciz "☆☆☆☆☆ 部屋番号は？ %x\n" + .balign 4 + +glabel D_809D32DC + .asciz "☆☆☆☆☆ ビットはなぁに？ %x\n" + .balign 4 + +glabel D_809D3308 + .asciz "☆☆☆☆☆ すけすけ君？ %x\n" + .balign 4 + +glabel D_809D332C + .asciz "\n\n" + .balign 4 + +glabel D_809D3330 + .asciz "☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_809D3374 + .asciz "☆☆☆☆☆ 部屋番号は？ %d\n" + .balign 4 + +glabel D_809D339C + .asciz "☆☆☆☆☆ ビットはなぁに？ %x\n" + .balign 4 + +glabel D_809D33C8 + .asciz "☆☆☆☆☆ すけすけ君？ %x\n" + .balign 4 + +glabel D_809D33EC + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel D_809D3448 + .word 0xC51C4000 +glabel D_809D344C + .word 0xC51C4000 +glabel D_809D3450 + .float 1.99000000954 + +.text glabel EnChanger_Init /* 0000C 809D269C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00010 809D26A0 AFB20040 */ sw $s2, 0x0040($sp) @@ -441,5 +519,3 @@ glabel EnChanger_Init /* 00630 809D2CC0 8FB20040 */ lw $s2, 0x0040($sp) /* 00634 809D2CC4 03E00008 */ jr $ra /* 00638 809D2CC8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s index f002615b89..01208be3a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s @@ -49,4 +49,3 @@ glabel EnChanger_Update /* 009E4 809D3074 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 009E8 809D3078 03E00008 */ jr $ra /* 009EC 809D307C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2CCC.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2CCC.s index 22c3636a78..87aa343920 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2CCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2CCC.s @@ -45,5 +45,3 @@ glabel func_809D2CCC /* 006D4 809D2D64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006D8 809D2D68 03E00008 */ jr $ra /* 006DC 809D2D6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2D70.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2D70.s index 568f9e65ab..ffb0c5078c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2D70.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809D33F0 + .asciz "☆☆☆☆☆ 右宝開く ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_809D341C + .asciz "☆☆☆☆☆ 左宝開く ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel func_809D2D70 /* 006E0 809D2D70 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 006E4 809D2D74 AFBF003C */ sw $ra, 0x003C($sp) @@ -143,5 +153,3 @@ glabel func_809D2D70 /* 008D8 809D2F68 8FB20038 */ lw $s2, 0x0038($sp) /* 008DC 809D2F6C 03E00008 */ jr $ra /* 008E0 809D2F70 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s index 14b3375e68..54c66a078f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s @@ -22,5 +22,3 @@ glabel func_809D2F74 /* 00928 809D2FB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0092C 809D2FBC 03E00008 */ jr $ra /* 00930 809D2FC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s index 1afdb78b72..c673962a44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s @@ -10,5 +10,3 @@ glabel EnClearTag_Destroy /* 00400 809D39B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00404 809D39B4 03E00008 */ jr $ra /* 00408 809D39B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s index cf177e111a..daf7dd9014 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s @@ -1,3 +1,56 @@ +.rdata +glabel D_809DBFC0 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DBFD4 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DBFE8 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DBFFC + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC010 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC024 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC038 + .asciz "../z_en_clear_tag.c" + .balign 4 + +.late_rodata +glabel D_809DC110 + .float 0.05 + +glabel D_809DC114 + .float 1.3 + +glabel D_809DC118 + .word 0x3F933333 +glabel D_809DC11C + .word 0x3EB33333 +glabel D_809DC120 + .float 3.14159274101 + +glabel D_809DC124 + .float 3.14159274101 + +glabel D_809DC128 + .float 3.14159274101 + +glabel D_809DC12C + .float 0.05 + +.text glabel EnClearTag_Draw /* 01450 809D4A00 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01454 809D4A04 AFBF001C */ sw $ra, 0x001C($sp) @@ -394,5 +447,3 @@ glabel EnClearTag_Draw /* 01A48 809D4FF8 8FB10018 */ lw $s1, 0x0018($sp) /* 01A4C 809D4FFC 03E00008 */ jr $ra /* 01A50 809D5000 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s index 237248b3dd..bc0bb95f1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809DC0E4 + .float 0.4 + +.text glabel EnClearTag_Init /* 0040C 809D39BC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00410 809D39C0 AFB10018 */ sw $s1, 0x0018($sp) @@ -122,5 +127,3 @@ glabel EnClearTag_Init /* 005C4 809D3B74 8FB10018 */ lw $s1, 0x0018($sp) /* 005C8 809D3B78 03E00008 */ jr $ra /* 005CC 809D3B7C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s index 9ff80e744e..9733dfc789 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s @@ -1,3 +1,38 @@ +.rdata +glabel D_809DBFA0 + .asciz "DEMO_MODE %d\n" + .balign 4 + +glabel D_809DBFB0 + .asciz "CAMERA_NO %d\n" + .balign 4 + +.late_rodata +glabel D_809DC0EC + .float 6.28318548203 + +glabel D_809DC0F0 + .word 0x4622F983 +glabel D_809DC0F4 + .word 0x4622F983 +glabel D_809DC0F8 + .float 0.2 + +glabel D_809DC0FC + .word 0x3FD33333 +glabel D_809DC100 + .float 0.3 + +glabel D_809DC104 + .float 0.3 + +glabel D_809DC108 + .float 0.15 + +glabel D_809DC10C + .float 0.075 + +.text glabel EnClearTag_Update /* 00688 809D3C38 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 0068C 809D3C3C AFBF0034 */ sw $ra, 0x0034($sp) @@ -985,5 +1020,3 @@ glabel EnClearTag_Update /* 01444 809D49F4 8FB10030 */ lw $s1, 0x0030($sp) /* 01448 809D49F8 03E00008 */ jr $ra /* 0144C 809D49FC 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s index 6bf564adf4..1b90a517d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809DC0D8 + .float 6.28318548203 + +glabel D_809DC0DC + .float 6.28318548203 + +.text glabel func_809D35B0 /* 00000 809D35B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809D35B4 AFB00018 */ sw $s0, 0x0018($sp) @@ -67,5 +75,3 @@ glabel func_809D35B0 /* 000EC 809D369C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000F0 809D36A0 03E00008 */ jr $ra /* 000F4 809D36A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s index d782d63a20..b375cdfb81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809DC0E0 + .float 0.15 + +.text glabel func_809D36A8 /* 000F8 809D36A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000FC 809D36AC 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 @@ -63,5 +68,3 @@ glabel func_809D36A8 /* 001DC 809D378C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001E0 809D3790 03E00008 */ jr $ra /* 001E4 809D3794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s index deabbb7213..35bfafde48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s @@ -76,5 +76,3 @@ glabel func_809D3798 /* 00300 809D38B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00304 809D38B4 03E00008 */ jr $ra /* 00308 809D38B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D38BC.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D38BC.s index 1257913e21..c0a92513ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D38BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D38BC.s @@ -55,5 +55,3 @@ glabel func_809D38BC /* 003D8 809D3988 2442006C */ addiu $v0, $v0, 0x006C ## $v0 = 0001006C /* 003DC 809D398C 03E00008 */ jr $ra /* 003E0 809D3990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s index fa0ae54944..7f2f829b0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809DC0E8 + .word 0x38000100 + +.text glabel func_809D3B80 /* 005D0 809D3B80 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 005D4 809D3B84 AFBF0014 */ sw $ra, 0x0014($sp) @@ -46,5 +51,3 @@ glabel func_809D3B80 /* 0067C 809D3C2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00680 809D3C30 03E00008 */ jr $ra /* 00684 809D3C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s index 96bf8aea9e..456050d7ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809DC130 + .word 0x3EB33333, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_809D5004 /* 01A54 809D5004 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01A58 809D5008 F7BC0038 */ sdc1 $f28, 0x0038($sp) @@ -266,5 +271,3 @@ glabel func_809D5004 /* 01E10 809D53C0 8FB40050 */ lw $s4, 0x0050($sp) /* 01E14 809D53C4 03E00008 */ jr $ra /* 01E18 809D53C8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s index ea154ffa2e..044390cf43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s @@ -1,3 +1,33 @@ +.rdata +glabel D_809DC04C + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC060 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC074 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC088 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC09C + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC0B0 + .asciz "../z_en_clear_tag.c" + .balign 4 + +glabel D_809DC0C4 + .asciz "../z_en_clear_tag.c" + .balign 4 + +.text glabel func_809D53CC /* 01E1C 809D53CC 27BDFEF0 */ addiu $sp, $sp, 0xFEF0 ## $sp = FFFFFEF0 /* 01E20 809D53D0 AFB1004C */ sw $s1, 0x004C($sp) @@ -543,4 +573,3 @@ glabel func_809D53CC /* 02654 809D5C04 00000000 */ nop /* 02658 809D5C08 00000000 */ nop /* 0265C 809D5C0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s index 4899121486..418879a0f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s @@ -20,5 +20,3 @@ glabel EnCow_Destroy /* 00688 809DF488 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0068C 809DF48C 03E00008 */ jr $ra /* 00690 809DF490 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s index ef97dc040a..6f58920c3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s @@ -22,5 +22,3 @@ glabel EnCow_Draw /* 01264 809E0064 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01268 809E0068 03E00008 */ jr $ra /* 0126C 809E006C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index 0cfe94afeb..61f156ad05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s @@ -298,5 +298,3 @@ glabel EnCow_Init /* 00640 809DF440 8FB10038 */ lw $s1, 0x0038($sp) /* 00644 809DF444 03E00008 */ jr $ra /* 00648 809DF448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s index b3e7786e66..25ea7bc45a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s @@ -185,5 +185,3 @@ glabel EnCow_Update /* 0108C 809DFE8C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01090 809DFE90 03E00008 */ jr $ra /* 01094 809DFE94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE00.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE00.s index 60f12ceb87..e2743d31a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE00.s @@ -42,5 +42,3 @@ glabel func_809DEE00 /* 00090 809DEE90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00094 809DEE94 03E00008 */ jr $ra /* 00098 809DEE98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE9C.s index 9d984dcdce..f66f5a68e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEE9C.s @@ -61,5 +61,3 @@ glabel func_809DEE9C /* 00188 809DEF88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0018C 809DEF8C 03E00008 */ jr $ra /* 00190 809DEF90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEF94.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEF94.s index f7d7847cd1..d3eaad4382 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEF94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DEF94.s @@ -31,5 +31,3 @@ glabel func_809DEF94 /* 00208 809DF008 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0020C 809DF00C 03E00008 */ jr $ra /* 00210 809DF010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s index 4674788017..e28fa597f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_809E0120 + .float 0.01 +glabel D_809E0124 + .float 0.01 +glabel D_809E0128 + .float 0.01 +glabel D_809E012C + .float 0.01 +glabel D_809E0130 + .float 0.01 + +.text glabel func_809DF494 /* 00694 809DF494 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00698 809DF498 AFBF002C */ sw $ra, 0x002C($sp) @@ -154,5 +167,3 @@ glabel func_809DF494 /* 008B0 809DF6B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 008B4 809DF6B4 03E00008 */ jr $ra /* 008B8 809DF6B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF6BC.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF6BC.s index 02e1fd5105..82666585bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF6BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF6BC.s @@ -29,5 +29,3 @@ glabel func_809DF6BC /* 00924 809DF724 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00928 809DF728 03E00008 */ jr $ra /* 0092C 809DF72C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF730.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF730.s index 29ae514508..6602e3cb04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF730.s @@ -18,5 +18,3 @@ glabel func_809DF730 /* 0096C 809DF76C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00970 809DF770 03E00008 */ jr $ra /* 00974 809DF774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF778.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF778.s index 36b7909952..d46339f909 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF778.s @@ -25,5 +25,3 @@ glabel func_809DF778 /* 009CC 809DF7CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009D0 809DF7D0 03E00008 */ jr $ra /* 009D4 809DF7D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF7D8.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF7D8.s index aaeaec5c22..1eea5ac988 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF7D8.s @@ -38,5 +38,3 @@ glabel func_809DF7D8 /* 00A64 809DF864 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A68 809DF868 03E00008 */ jr $ra /* 00A6C 809DF86C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF870.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF870.s index a27bef7612..27eca70c71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF870.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF870.s @@ -37,5 +37,3 @@ glabel func_809DF870 /* 00AF0 809DF8F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AF4 809DF8F4 03E00008 */ jr $ra /* 00AF8 809DF8F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF8FC.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF8FC.s index 5025f40bea..253cc1dca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF8FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF8FC.s @@ -29,5 +29,3 @@ glabel func_809DF8FC /* 00B60 809DF960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B64 809DF964 03E00008 */ jr $ra /* 00B68 809DF968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s index aedc2bc363..ecc7872bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s @@ -76,5 +76,3 @@ glabel func_809DF96C /* 00C78 809DFA78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C7C 809DFA7C 03E00008 */ jr $ra /* 00C80 809DFA80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s index 75fb148d58..9765e9719d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s @@ -112,5 +112,3 @@ glabel func_809DFA84 /* 00E10 809DFC10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E14 809DFC14 03E00008 */ jr $ra /* 00E18 809DFC18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s index f139308b82..d93c16339d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s @@ -65,5 +65,3 @@ glabel func_809DFE98 /* 01178 809DFF78 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0117C 809DFF7C 03E00008 */ jr $ra /* 01180 809DFF80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFF84.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFF84.s index 912e49addd..5aaf143c44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFF84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFF84.s @@ -21,5 +21,3 @@ glabel func_809DFF84 .L809DFFCC: /* 011CC 809DFFCC 03E00008 */ jr $ra /* 011D0 809DFFD0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFFD4.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFFD4.s index 0b9e8156d0..20617953a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFFD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFFD4.s @@ -16,5 +16,3 @@ glabel func_809DFFD4 /* 01208 809E0008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0120C 809E000C 03E00008 */ jr $ra /* 01210 809E0010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s index 8b04f983dd..e116661483 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s @@ -19,4 +19,3 @@ glabel func_809E0070 /* 012B4 809E00B4 03E00008 */ jr $ra /* 012B8 809E00B8 00000000 */ nop /* 012BC 809E00BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s index cd8d2fec04..f8108d440b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s @@ -9,5 +9,3 @@ glabel EnCrow_Destroy /* 00108 809E0348 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0010C 809E034C 03E00008 */ jr $ra /* 00110 809E0350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s index 1bff8bad0f..d33905495e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s @@ -23,4 +23,3 @@ glabel EnCrow_Draw /* 013F4 809E1634 03E00008 */ jr $ra /* 013F8 809E1638 00000000 */ nop /* 013FC 809E163C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s index 0107a44945..c27a7903af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s @@ -60,5 +60,3 @@ glabel EnCrow_Init /* 000E0 809E0320 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000E4 809E0324 03E00008 */ jr $ra /* 000E8 809E0328 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s index 2ae503eba8..38610f3be1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s @@ -147,5 +147,3 @@ glabel EnCrow_Update /* 011E8 809E1428 8FB10020 */ lw $s1, 0x0020($sp) /* 011EC 809E142C 03E00008 */ jr $ra /* 011F0 809E1430 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0354.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0354.s index 99ff23ca08..ea9f27b6dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0354.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0354.s @@ -11,5 +11,3 @@ glabel func_809E0354 /* 00138 809E0378 AC9901C0 */ sw $t9, 0x01C0($a0) ## 000001C0 /* 0013C 809E037C 03E00008 */ jr $ra /* 00140 809E0380 E4840198 */ swc1 $f4, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0384.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0384.s index 48bfd2a4dd..8832d92981 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0384.s @@ -11,5 +11,3 @@ glabel func_809E0384 /* 00168 809E03A8 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 0016C 809E03AC 03E00008 */ jr $ra /* 00170 809E03B0 E4860198 */ swc1 $f6, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s index b8cfbff913..3bb11fc00f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809E16F0 + .float 0.85 + +glabel D_809E16F4 + .float 0.15 + +.text glabel func_809E03B4 /* 00174 809E03B4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00178 809E03B8 AFB10060 */ sw $s1, 0x0060($sp) @@ -214,5 +222,3 @@ glabel func_809E03B4 /* 00488 809E06C8 D7B40030 */ ldc1 $f20, 0x0030($sp) /* 0048C 809E06CC 03E00008 */ jr $ra /* 00490 809E06D0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06D4.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06D4.s index bf660467b6..d882515270 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06D4.s @@ -4,5 +4,3 @@ glabel func_809E06D4 /* 0049C 809E06DC A0800114 */ sb $zero, 0x0114($a0) ## 00000114 /* 004A0 809E06E0 03E00008 */ jr $ra /* 004A4 809E06E4 AC8E01C0 */ sw $t6, 0x01C0($a0) ## 000001C0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06E8.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06E8.s index 16dd823fa0..22326f97a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E06E8.s @@ -34,5 +34,3 @@ glabel func_809E06E8 /* 00524 809E0764 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00528 809E0768 03E00008 */ jr $ra /* 0052C 809E076C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s index 5f98a8bfe5..011192fd5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E16F8 + .float 0.03 + +.text glabel func_809E0770 /* 00530 809E0770 3C02809E */ lui $v0, %hi(D_809E16C8) ## $v0 = 809E0000 /* 00534 809E0774 244216C8 */ addiu $v0, $v0, %lo(D_809E16C8) ## $v0 = 809E16C8 @@ -63,5 +68,3 @@ glabel func_809E0770 /* 00618 809E0858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0061C 809E085C 03E00008 */ jr $ra /* 00620 809E0860 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s index d076d422bb..c52c4f9419 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809E16FC + .float 0.1 + +glabel D_809E1700 + .float 0.1 + +.text glabel func_809E0864 /* 00624 809E0864 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00628 809E0868 AFB00020 */ sw $s0, 0x0020($sp) @@ -299,5 +307,3 @@ glabel func_809E0864 /* 00A40 809E0C80 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00A44 809E0C84 03E00008 */ jr $ra /* 00A48 809E0C88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s index 19a8108867..9b627b0bb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s @@ -117,5 +117,3 @@ glabel func_809E0C8C /* 00BE0 809E0E20 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00BE4 809E0E24 03E00008 */ jr $ra /* 00BE8 809E0E28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s index 868e8fe522..90f19c54b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E1704 + .float 10000.0 + +.text glabel func_809E0E2C /* 00BEC 809E0E2C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00BF0 809E0E30 AFB00048 */ sw $s0, 0x0048($sp) @@ -79,5 +84,3 @@ glabel func_809E0E2C /* 00D08 809E0F48 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00D0C 809E0F4C 03E00008 */ jr $ra /* 00D10 809E0F50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0F54.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0F54.s index 5a8a3a7717..d6354962f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0F54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0F54.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809E1708 + .word 0x3BC49BA6 +glabel D_809E170C + .float 0.002 + +.text glabel func_809E0F54 /* 00D14 809E0F54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00D18 809E0F58 AFBF001C */ sw $ra, 0x001C($sp) @@ -51,5 +58,3 @@ glabel func_809E0F54 /* 00DB8 809E0FF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DBC 809E0FFC 03E00008 */ jr $ra /* 00DC0 809E1000 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1004.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1004.s index 2171dfad03..6de1504b62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1004.s @@ -47,5 +47,3 @@ glabel func_809E1004 /* 00E5C 809E109C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E60 809E10A0 03E00008 */ jr $ra /* 00E64 809E10A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E10A8.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E10A8.s index 6024590ed2..e3aa05a8ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E10A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E10A8.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809E1710 + .float 0.03 + +glabel D_809E1714 + .float 0.01 + +glabel D_809E1718 + .float 0.1 + +.text glabel func_809E10A8 /* 00E68 809E10A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00E6C 809E10AC AFBF001C */ sw $ra, 0x001C($sp) @@ -57,5 +68,3 @@ glabel func_809E10A8 /* 00F28 809E1168 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F2C 809E116C 03E00008 */ jr $ra /* 00F30 809E1170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1174.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1174.s index 8d459557b5..8f07b717b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1174.s @@ -47,5 +47,3 @@ glabel func_809E1174 /* 00FD4 809E1214 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FD8 809E1218 03E00008 */ jr $ra /* 00FDC 809E121C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1434.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1434.s index 8c16cd2ef6..c4f32c5c17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1434.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809E171C + .word 0x3F490FDB +glabel D_809E1720 + .word 0x3F490FDB, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_809E1434 /* 011F4 809E1434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 011F8 809E1438 AFA40018 */ sw $a0, 0x0018($sp) @@ -63,5 +70,3 @@ glabel func_809E1434 /* 012D4 809E1514 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 012D8 809E1518 03E00008 */ jr $ra /* 012DC 809E151C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1520.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1520.s index b181196a0e..51f8657deb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1520.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E1520.s @@ -50,5 +50,3 @@ glabel func_809E1520 /* 01394 809E15D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01398 809E15D8 03E00008 */ jr $ra /* 0139C 809E15DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s index 5be6d03ef1..0cd54a3bb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s @@ -10,5 +10,3 @@ glabel EnCs_Destroy /* 002D0 809E1B80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002D4 809E1B84 03E00008 */ jr $ra /* 002D8 809E1B88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s index 0137503e37..a4b2d95913 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809E2980 + .asciz "../z_en_cs.c" + .balign 4 + +glabel D_809E2990 + .asciz "../z_en_cs.c" + .balign 4 + +glabel D_809E29A0 + .asciz "../z_en_cs.c" + .balign 4 + +.text glabel EnCs_Draw /* 00CE4 809E2594 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00CE8 809E2598 AFB1002C */ sw $s1, 0x002C($sp) @@ -125,5 +139,3 @@ glabel EnCs_Draw /* 00EC8 809E2778 8FB20030 */ lw $s2, 0x0030($sp) /* 00ECC 809E277C 03E00008 */ jr $ra /* 00ED0 809E2780 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s index 6d597b4d5c..09c86bce16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s @@ -108,5 +108,3 @@ glabel EnCs_Init /* 002A8 809E1B58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 002AC 809E1B5C 03E00008 */ jr $ra /* 002B0 809E1B60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s index 8c6ab91047..e46fb4bbdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s @@ -103,5 +103,3 @@ glabel EnCs_Update /* 00CD8 809E2588 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00CDC 809E258C 03E00008 */ jr $ra /* 00CE0 809E2590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s index 641a0dae0b..57c8304941 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s @@ -80,5 +80,3 @@ glabel func_809E18B0 /* 00114 809E19C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00118 809E19C8 03E00008 */ jr $ra /* 0011C 809E19CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s index 2d88c1bacb..49bddfec87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_809E29B0 +.word L809E1CA4 +.word L809E1CA4 +.word L809E1CA4 +.word L809E1CA4 +.word L809E1BD4 +.word L809E1CA4 +.word L809E1C3C + +.text glabel func_809E1B8C /* 002DC 809E1B8C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 002E0 809E1B90 AFB00018 */ sw $s0, 0x0018($sp) @@ -79,5 +90,3 @@ glabel L809E1CA4 /* 003FC 809E1CAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00400 809E1CB0 03E00008 */ jr $ra /* 00404 809E1CB4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000002 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s index 608e7d4775..aaafbcc7a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s @@ -35,5 +35,3 @@ glabel func_809E1CB8 .L809E1D30: /* 00480 809E1D30 03E00008 */ jr $ra /* 00484 809E1D34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s index 51db5f9936..96794d8557 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s @@ -91,5 +91,3 @@ glabel func_809E1D38 /* 005C4 809E1E74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005C8 809E1E78 03E00008 */ jr $ra /* 005CC 809E1E7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s index f5dd6c958c..056aac8cca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s @@ -3,5 +3,3 @@ glabel func_809E1E80 /* 005D4 809E1E84 01C47821 */ addu $t7, $t6, $a0 /* 005D8 809E1E88 03E00008 */ jr $ra /* 005DC 809E1E8C 91E20000 */ lbu $v0, 0x0000($t7) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s index 301d96d799..b0529b1508 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s @@ -35,5 +35,3 @@ glabel func_809E1E90 /* 00664 809E1F14 468084A0 */ cvt.s.w $f18, $f16 /* 00668 809E1F18 03E00008 */ jr $ra /* 0066C 809E1F1C E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s index 61bbbdeab4..06a84b16d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809E29CC + .word 0x4622F983 +glabel D_809E29D0 + .word 0x41270A3D + +.text glabel func_809E1F20 /* 00670 809E1F20 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00674 809E1F24 AFBF004C */ sw $ra, 0x004C($sp) @@ -138,5 +145,3 @@ glabel func_809E1F20 /* 00878 809E2128 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 0087C 809E212C 03E00008 */ jr $ra /* 00880 809E2130 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s index 05fe6d05c5..786670faca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s @@ -123,5 +123,3 @@ glabel func_809E2134 /* 00A18 809E22C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A1C 809E22CC 03E00008 */ jr $ra /* 00A20 809E22D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s index ef75fb108f..c97a04f27b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s @@ -39,5 +39,3 @@ glabel func_809E22D4 /* 00AA4 809E2354 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AA8 809E2358 03E00008 */ jr $ra /* 00AAC 809E235C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s index 97604c4cd6..141dc82c1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s @@ -51,5 +51,3 @@ glabel func_809E2360 /* 00B68 809E2418 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B6C 809E241C 03E00008 */ jr $ra /* 00B70 809E2420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s index bf4b1f2e4b..dc374461ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s @@ -38,5 +38,3 @@ glabel func_809E2784 .L809E280C: /* 00F5C 809E280C 03E00008 */ jr $ra /* 00F60 809E2810 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s index bc53fde94d..e93d5f5925 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E29D4 + .word 0x3FDF66F3, 0x00000000, 0x00000000 + +.text glabel func_809E2814 /* 00F64 809E2814 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00F68 809E2818 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -35,4 +40,3 @@ glabel func_809E2814 /* 00FE4 809E2894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FE8 809E2898 03E00008 */ jr $ra /* 00FEC 809E289C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s index 56b985497a..2f1acc4ac3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s @@ -10,5 +10,3 @@ glabel EnDaiku_Destroy /* 00414 809E2F44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00418 809E2F48 03E00008 */ jr $ra /* 0041C 809E2F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s index 8b20a23350..4d57c25480 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809E4170 + .asciz "../z_en_daiku.c" + .balign 4 + +glabel D_809E4180 + .asciz "../z_en_daiku.c" + .balign 4 + +.text glabel EnDaiku_Draw /* 01278 809E3DA8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0127C 809E3DAC AFBF0024 */ sw $ra, 0x0024($sp) @@ -87,5 +97,3 @@ glabel EnDaiku_Draw /* 013BC 809E3EEC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 013C0 809E3EF0 03E00008 */ jr $ra /* 013C4 809E3EF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s index f6754c59c5..40d0642abf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s @@ -232,5 +232,3 @@ glabel EnDaiku_Init /* 003EC 809E2F1C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 003F0 809E2F20 03E00008 */ jr $ra /* 003F4 809E2F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s index 745434663f..3a24ea3d09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s @@ -75,5 +75,3 @@ glabel EnDaiku_Update /* 0126C 809E3D9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01270 809E3DA0 03E00008 */ jr $ra /* 01274 809E3DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s index b5718c2333..a0c80c7b13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s @@ -48,5 +48,3 @@ glabel func_809E2B30 /* 000A4 809E2BD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000A8 809E2BD8 03E00008 */ jr $ra /* 000AC 809E2BDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s index 0b5b65717b..fbc53bb83e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s @@ -75,5 +75,3 @@ glabel func_809E2F50 /* 0052C 809E305C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00530 809E3060 03E00008 */ jr $ra /* 00534 809E3064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s index 695284b655..ce818a4413 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s @@ -202,5 +202,3 @@ glabel func_809E3068 /* 007FC 809E332C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00800 809E3330 03E00008 */ jr $ra /* 00804 809E3334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3338.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3338.s index 8e80bb32ba..2d7cfb3f4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3338.s @@ -13,5 +13,3 @@ glabel func_809E3338 /* 00830 809E3360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00834 809E3364 03E00008 */ jr $ra /* 00838 809E3368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E336C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E336C.s index e5db637d6e..3ad7636f11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E336C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E336C.s @@ -56,5 +56,3 @@ glabel func_809E336C /* 008FC 809E342C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00900 809E3430 03E00008 */ jr $ra /* 00904 809E3434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3438.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3438.s index a91874dde2..6b0b226707 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3438.s @@ -27,5 +27,3 @@ glabel func_809E3438 /* 00960 809E3490 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00964 809E3494 03E00008 */ jr $ra /* 00968 809E3498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s index bfff7e6157..e13bc6e845 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E41B0 + .word 0x4622F983 + +.text glabel func_809E349C /* 0096C 809E349C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00970 809E34A0 AFB00038 */ sw $s0, 0x0038($sp) @@ -132,5 +137,3 @@ glabel func_809E349C /* 00B68 809E3698 D7B40018 */ ldc1 $f20, 0x0018($sp) /* 00B6C 809E369C 03E00008 */ jr $ra /* 00B70 809E36A0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E36A4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E36A4.s index 0fffe799c0..86c27d6c41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E36A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E36A4.s @@ -29,5 +29,3 @@ glabel func_809E36A4 /* 00BD4 809E3704 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00BD8 809E3708 03E00008 */ jr $ra /* 00BDC 809E370C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s index 31adb84423..49d8da199a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E41B4 + .float 9.58738019108e-05 + +.text glabel func_809E3710 /* 00BE0 809E3710 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00BE4 809E3714 AFBF001C */ sw $ra, 0x001C($sp) @@ -98,5 +103,3 @@ glabel func_809E3710 /* 00D60 809E3890 8FB10018 */ lw $s1, 0x0018($sp) /* 00D64 809E3894 03E00008 */ jr $ra /* 00D68 809E3898 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E389C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E389C.s index 435d0903ef..9d6f31d8bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E389C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E389C.s @@ -48,5 +48,3 @@ glabel func_809E389C /* 00E18 809E3948 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E1C 809E394C 03E00008 */ jr $ra /* 00E20 809E3950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s index 978b835a6c..8d2337b87f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809E41B8 + .float 9.58738019108e-05 + +glabel D_809E41BC + .word 0x4622F983 + +.text glabel func_809E3954 /* 00E24 809E3954 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00E28 809E3958 AFB0002C */ sw $s0, 0x002C($sp) @@ -81,5 +89,3 @@ glabel func_809E3954 /* 00F50 809E3A80 8FB10030 */ lw $s1, 0x0030($sp) /* 00F54 809E3A84 03E00008 */ jr $ra /* 00F58 809E3A88 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s index b41d06b505..b4a8f4ad3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809E41C0 + .word 0x4622F983 +glabel D_809E41C4 + .word 0x41A70A3D, 0x00000000, 0x00000000 + +.text glabel func_809E3A8C /* 00F5C 809E3A8C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00F60 809E3A90 AFBF0024 */ sw $ra, 0x0024($sp) @@ -138,5 +145,3 @@ glabel func_809E3A8C /* 01158 809E3C88 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0115C 809E3C8C 03E00008 */ jr $ra /* 01160 809E3C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3EF8.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3EF8.s index bbbbfc0266..b929ecb80d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3EF8.s @@ -34,5 +34,3 @@ glabel func_809E3EF8 /* 01440 809E3F70 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 /* 01444 809E3F74 03E00008 */ jr $ra /* 01448 809E3F78 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s index acaacb57d2..844c56722f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809E4190 + .asciz "../z_en_daiku.c" + .balign 4 + +glabel D_809E41A0 + .asciz "../z_en_daiku.c" + .balign 4 + +.text glabel func_809E3F7C /* 0144C 809E3F7C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01450 809E3F80 AFBF0014 */ sw $ra, 0x0014($sp) @@ -49,4 +59,3 @@ glabel func_809E3F7C /* 01504 809E4034 00000000 */ nop /* 01508 809E4038 00000000 */ nop /* 0150C 809E403C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s index efe0d02495..4901f07a33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s @@ -10,5 +10,3 @@ glabel EnDaikuKakariko_Destroy /* 00420 809E4740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00424 809E4744 03E00008 */ jr $ra /* 00428 809E4748 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s index 86a6322a8e..e5ae03343a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809E55E0 + .asciz "../z_en_daiku_kakariko.c" + .balign 4 + +glabel D_809E55FC + .asciz "../z_en_daiku_kakariko.c" + .balign 4 + +.text glabel EnDaikuKakariko_Draw /* 01020 809E5340 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01024 809E5344 AFBF0024 */ sw $ra, 0x0024($sp) @@ -87,4 +97,3 @@ glabel EnDaikuKakariko_Draw /* 01164 809E5484 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01168 809E5488 03E00008 */ jr $ra /* 0116C 809E548C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s index e0c69880cf..9bd1e66d59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s @@ -236,5 +236,3 @@ glabel EnDaikuKakariko_Init /* 003F8 809E4718 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 003FC 809E471C 03E00008 */ jr $ra /* 00400 809E4720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s index 8571fcb4fd..acc3471248 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s @@ -102,5 +102,3 @@ glabel EnDaikuKakariko_Update /* 00D88 809E50A8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00D8C 809E50AC 03E00008 */ jr $ra /* 00D90 809E50B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s index 98d9ea9460..2346bae8e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s @@ -48,5 +48,3 @@ glabel func_809E4320 /* 000A4 809E43C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000A8 809E43C8 03E00008 */ jr $ra /* 000AC 809E43CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s index eb8e0487d4..8642376424 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s @@ -44,5 +44,3 @@ glabel func_809E474C /* 004C0 809E47E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004C4 809E47E4 03E00008 */ jr $ra /* 004C8 809E47E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s index 85ed73e028..1fd044c14d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s @@ -121,5 +121,3 @@ glabel func_809E47EC /* 0067C 809E499C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00680 809E49A0 03E00008 */ jr $ra /* 00684 809E49A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s index 3b4a5c23fa..915b225298 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s @@ -59,5 +59,3 @@ glabel func_809E49A8 /* 00750 809E4A70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00754 809E4A74 03E00008 */ jr $ra /* 00758 809E4A78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s index e03dddd6b7..3bff57f0c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s @@ -42,5 +42,3 @@ glabel func_809E4A7C /* 007E8 809E4B08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007EC 809E4B0C 03E00008 */ jr $ra /* 007F0 809E4B10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s index 0f051fad5e..bbc9db8325 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s @@ -48,5 +48,3 @@ glabel func_809E4B14 /* 00898 809E4BB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0089C 809E4BBC 03E00008 */ jr $ra /* 008A0 809E4BC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s index 73f1909b44..eb9233a394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E5618 + .word 0x4622F983 + +.text glabel func_809E4BC4 /* 008A4 809E4BC4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 008A8 809E4BC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -240,5 +245,3 @@ glabel func_809E4BC4 /* 00C14 809E4F34 8FB30038 */ lw $s3, 0x0038($sp) /* 00C18 809E4F38 03E00008 */ jr $ra /* 00C1C 809E4F3C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s index 8e17e46376..b864ef7796 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s @@ -1,3 +1,28 @@ +.rdata +glabel D_809E55A0 + .asciz "<%d>\n" + .balign 4 + +.late_rodata +glabel D_809E561C + .float 9.58738019108e-05 + +glabel D_809E5620 + .float 9.58738019108e-05 + +glabel D_809E5624 + .float 9.58738019108e-05 + +glabel D_809E5628 + .float 9.58738019108e-05 + +glabel D_809E562C + .float 9.58738019108e-05 + +glabel D_809E5630 + .float 9.58738019108e-05 + +.text glabel func_809E50B4 /* 00D94 809E50B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00D98 809E50B8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 @@ -122,5 +147,3 @@ glabel func_809E50B4 /* 00F5C 809E527C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00F60 809E5280 03E00008 */ jr $ra /* 00F64 809E5284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s index 547fb50c00..ed08f0a495 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809E55A8 + .asciz "../z_en_daiku_kakariko.c" + .balign 4 + +glabel D_809E55C4 + .asciz "../z_en_daiku_kakariko.c" + .balign 4 + +.text glabel func_809E5288 /* 00F68 809E5288 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00F6C 809E528C AFBF0014 */ sw $ra, 0x0014($sp) @@ -46,5 +56,3 @@ glabel func_809E5288 /* 01014 809E5334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01018 809E5338 03E00008 */ jr $ra /* 0101C 809E533C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s index 17a963e585..4d6913fae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s @@ -9,5 +9,3 @@ glabel EnDekubaba_Destroy /* 0025C 809E5A2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00260 809E5A30 03E00008 */ jr $ra /* 00264 809E5A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s index 8ea3cf4d1b..9c312beb49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s @@ -1,3 +1,28 @@ +.rdata +glabel D_809E9130 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E9144 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E9158 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E916C + .asciz "../z_en_dekubaba.c" + .balign 4 + +.late_rodata +glabel D_809E91D4 + .float 0.01 + +glabel D_809E91D8 + .float 9.58738019108e-05 + +.text glabel EnDekubaba_Draw /* 03478 809E8C48 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0347C 809E8C4C AFB10020 */ sw $s1, 0x0020($sp) @@ -156,4 +181,3 @@ glabel EnDekubaba_Draw /* 036C4 809E8E94 03E00008 */ jr $ra /* 036C8 809E8E98 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 036CC 809E8E9C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s index 7e23215aed..8b74d4dd55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s @@ -154,5 +154,3 @@ glabel EnDekubaba_Init /* 00234 809E5A04 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00238 809E5A08 03E00008 */ jr $ra /* 0023C 809E5A0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s index 3c4b49d77f..38ba4d2ca7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s @@ -113,5 +113,3 @@ glabel EnDekubaba_Update /* 02DB0 809E8580 8FB10020 */ lw $s1, 0x0020($sp) /* 02DB4 809E8584 03E00008 */ jr $ra /* 02DB8 809E8588 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5A38.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5A38.s index dd7cc8e1af..de26476983 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5A38.s @@ -32,5 +32,3 @@ glabel func_809E5A38 /* 002E0 809E5AB0 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 /* 002E4 809E5AB4 03E00008 */ jr $ra /* 002E8 809E5AB8 A0A900D6 */ sb $t1, 0x00D6($a1) ## 000000D6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5ABC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5ABC.s index 17eb423d90..96c794f85c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5ABC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5ABC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E9180 + .float 0.01 + +.text glabel func_809E5ABC /* 002EC 809E5ABC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002F0 809E5AC0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -155,5 +160,3 @@ glabel func_809E5ABC /* 0054C 809E5D1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00550 809E5D20 03E00008 */ jr $ra /* 00554 809E5D24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s index 66400550ec..b668c9832d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E9184 + .word 0x3D888889 + +.text glabel func_809E5D28 /* 00558 809E5D28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0055C 809E5D2C AFB00028 */ sw $s0, 0x0028($sp) @@ -79,5 +84,3 @@ glabel func_809E5D28 /* 0067C 809E5E4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00680 809E5E50 03E00008 */ jr $ra /* 00684 809E5E54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s index ebf9a60edb..5a397c55b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s @@ -60,5 +60,3 @@ glabel func_809E5E58 /* 00768 809E5F38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0076C 809E5F3C 03E00008 */ jr $ra /* 00770 809E5F40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s index 9f04fb728d..7d9c17e4b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s @@ -22,5 +22,3 @@ glabel func_809E5F44 /* 007C0 809E5F90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007C4 809E5F94 03E00008 */ jr $ra /* 007C8 809E5F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F9C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F9C.s index 409425256a..37d4cbe7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F9C.s @@ -7,5 +7,3 @@ glabel func_809E5F9C /* 007E0 809E5FB0 AC8F01C0 */ sw $t7, 0x01C0($a0) ## 000001C0 /* 007E4 809E5FB4 03E00008 */ jr $ra /* 007E8 809E5FB8 E4840198 */ swc1 $f4, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s index 0d5d0e6932..74e86345f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s @@ -16,5 +16,3 @@ glabel func_809E5FBC /* 00824 809E5FF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00828 809E5FF8 03E00008 */ jr $ra /* 0082C 809E5FFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s index 688ad47215..42a3e77fb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s @@ -31,5 +31,3 @@ glabel func_809E6000 /* 0089C 809E606C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008A0 809E6070 03E00008 */ jr $ra /* 008A4 809E6074 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6078.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6078.s index 152b547c47..7cad9c8521 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6078.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6078.s @@ -11,5 +11,3 @@ glabel func_809E6078 /* 008CC 809E609C AC9901C0 */ sw $t9, 0x01C0($a0) ## 000001C0 /* 008D0 809E60A0 03E00008 */ jr $ra /* 008D4 809E60A4 E4840198 */ swc1 $f4, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s index 6d7f4dc2e8..b5260504eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E9188 + .float 0.01 + +.text glabel func_809E60A8 /* 008D8 809E60A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 008DC 809E60AC AFB00020 */ sw $s0, 0x0020($sp) @@ -52,5 +57,3 @@ glabel func_809E60A8 /* 00994 809E6164 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00998 809E6168 03E00008 */ jr $ra /* 0099C 809E616C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6170.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6170.s index 4601bd869d..f0cbd822d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6170.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6170.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E918C + .float -0.8 + +.text glabel func_809E6170 /* 009A0 809E6170 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 009A4 809E6174 A48001C6 */ sh $zero, 0x01C6($a0) ## 000001C6 @@ -27,5 +32,3 @@ glabel func_809E6170 /* 00A04 809E61D4 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C /* 00A08 809E61D8 03E00008 */ jr $ra /* 00A0C 809E61DC E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s index c2774fc748..606b155db3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s @@ -34,5 +34,3 @@ glabel func_809E61E0 /* 00A88 809E6258 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A8C 809E625C 03E00008 */ jr $ra /* 00A90 809E6260 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s index 35c79f8b02..4a0bb4374b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s @@ -103,5 +103,3 @@ glabel func_809E6264 /* 00C10 809E63E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C14 809E63E4 03E00008 */ jr $ra /* 00C18 809E63E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E63EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E63EC.s index 14bfff4947..8c985285af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E63EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E63EC.s @@ -27,5 +27,3 @@ glabel func_809E63EC /* 00C80 809E6450 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C84 809E6454 03E00008 */ jr $ra /* 00C88 809E6458 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E645C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E645C.s index 40dc7375a4..bb7da8cd72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E645C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E645C.s @@ -39,5 +39,3 @@ glabel func_809E645C /* 00D18 809E64E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D1C 809E64EC 03E00008 */ jr $ra /* 00D20 809E64F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E64F4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E64F4.s index 761b819b91..c5705e049a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E64F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E64F4.s @@ -45,5 +45,3 @@ glabel func_809E64F4 /* 00DC4 809E6594 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DC8 809E6598 03E00008 */ jr $ra /* 00DCC 809E659C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s index dddfe548ed..cbe640d03b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_809E9190 + .float 0.01 + +glabel D_809E9194 + .float 0.7 + +glabel D_809E9198 + .word 0x3D888889 +glabel D_809E919C + .float 3.14159274101 + +.text glabel func_809E65A0 /* 00DD0 809E65A0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00DD4 809E65A4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -319,5 +332,3 @@ glabel func_809E65A0 /* 01228 809E69F8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0122C 809E69FC 03E00008 */ jr $ra /* 01230 809E6A00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s index e65e2361aa..8b35fce91b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_809E91A0 + .float 0.01 + +glabel D_809E91A4 + .word 0x3D088889 +glabel D_809E91A8 + .float 0.7 + +glabel D_809E91AC + .word 0x3D072B02 +glabel D_809E91B0 + .float 3.14159274101 + +.text glabel func_809E6A04 /* 01234 809E6A04 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01238 809E6A08 AFBF0034 */ sw $ra, 0x0034($sp) @@ -274,5 +289,3 @@ glabel func_809E6A04 /* 015F0 809E6DC0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 015F4 809E6DC4 03E00008 */ jr $ra /* 015F8 809E6DC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s index aced6588db..415ab5aa0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s @@ -73,5 +73,3 @@ glabel func_809E6DCC /* 016F8 809E6EC8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 016FC 809E6ECC 03E00008 */ jr $ra /* 01700 809E6ED0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s index c7ab3168c7..68a16b4d97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s @@ -156,5 +156,3 @@ glabel func_809E6ED4 /* 01928 809E70F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0192C 809E70FC 03E00008 */ jr $ra /* 01930 809E7100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s index c21fc2797e..8b9b54e354 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s @@ -182,5 +182,3 @@ glabel func_809E7104 /* 01BB0 809E7380 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01BB4 809E7384 03E00008 */ jr $ra /* 01BB8 809E7388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s index 5862a3a442..2ee21994d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s @@ -58,5 +58,3 @@ glabel func_809E738C /* 01C7C 809E744C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C80 809E7450 03E00008 */ jr $ra /* 01C84 809E7454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s index 8d28ced74b..16c15d4cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s @@ -264,5 +264,3 @@ glabel func_809E7458 /* 02008 809E77D8 8FB10020 */ lw $s1, 0x0020($sp) /* 0200C 809E77DC 03E00008 */ jr $ra /* 02010 809E77E0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s index f10fbb5adf..3ac1c2f993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s @@ -69,5 +69,3 @@ glabel func_809E77E4 /* 02100 809E78D0 8FB10020 */ lw $s1, 0x0020($sp) /* 02104 809E78D4 03E00008 */ jr $ra /* 02108 809E78D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s index efc2d02e2b..8eff03bba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s @@ -76,5 +76,3 @@ glabel func_809E78DC /* 02210 809E79E0 8FB10018 */ lw $s1, 0x0018($sp) /* 02214 809E79E4 03E00008 */ jr $ra /* 02218 809E79E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E79EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E79EC.s index 7099ef3145..dcb8ab2ced 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E79EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E79EC.s @@ -42,5 +42,3 @@ glabel func_809E79EC /* 022AC 809E7A7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 022B0 809E7A80 03E00008 */ jr $ra /* 022B4 809E7A84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s index 9e0b3187d5..253e8a7d8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809E91B4 + .float 0.8 + +.text glabel func_809E7A88 /* 022B8 809E7A88 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 022BC 809E7A8C AFB00018 */ sw $s0, 0x0018($sp) @@ -82,5 +87,3 @@ glabel func_809E7A88 /* 023D4 809E7BA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 023D8 809E7BA8 03E00008 */ jr $ra /* 023DC 809E7BAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s index f37e3da2f2..fc71cdf76c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809E91B8 + .float 0.1 + +glabel D_809E91BC + .float 0.005 + +.text glabel func_809E7BB0 /* 023E0 809E7BB0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 023E4 809E7BB4 AFB30050 */ sw $s3, 0x0050($sp) @@ -232,5 +240,3 @@ glabel func_809E7BB0 /* 02738 809E7F08 8FB50058 */ lw $s5, 0x0058($sp) /* 0273C 809E7F0C 03E00008 */ jr $ra /* 02740 809E7F10 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s index c12c53364f..d769d4b8ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809E91C0 + .float 0.1 + +glabel D_809E91C4 + .float 0.01 + +.text glabel func_809E7F14 /* 02744 809E7F14 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02748 809E7F18 AFB0002C */ sw $s0, 0x002C($sp) @@ -122,5 +130,3 @@ glabel func_809E7F14 /* 028FC 809E80CC 8FB10030 */ lw $s1, 0x0030($sp) /* 02900 809E80D0 03E00008 */ jr $ra /* 02904 809E80D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s index a08ec47ae7..a7cc148a6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s @@ -30,5 +30,3 @@ glabel func_809E80D8 /* 02964 809E8134 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02968 809E8138 03E00008 */ jr $ra /* 0296C 809E813C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s index ced56842e0..4316aa08a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s @@ -196,5 +196,3 @@ glabel func_809E8140 /* 02C14 809E83E4 8FB10028 */ lw $s1, 0x0028($sp) /* 02C18 809E83E8 03E00008 */ jr $ra /* 02C1C 809E83EC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s index e4597b32fb..e498317708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809E9040 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E9054 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E9068 + .asciz "../z_en_dekubaba.c" + .balign 4 + +.late_rodata +glabel D_809E91C8 + .float 0.01 + +.text glabel func_809E858C /* 02DBC 809E858C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02DC0 809E8590 AFBF001C */ sw $ra, 0x001C($sp) @@ -75,5 +93,3 @@ glabel func_809E858C /* 02EDC 809E86AC 8FB10018 */ lw $s1, 0x0018($sp) /* 02EE0 809E86B0 03E00008 */ jr $ra /* 02EE4 809E86B4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s index 9ad8ca1a28..497a552c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809E907C + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E9090 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E90A4 + .asciz "../z_en_dekubaba.c" + .balign 4 + +.late_rodata +glabel D_809E91CC + .float 0.01 + +.text glabel func_809E86B8 /* 02EE8 809E86B8 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 /* 02EEC 809E86BC AFBF005C */ sw $ra, 0x005C($sp) @@ -214,5 +232,3 @@ glabel func_809E86B8 /* 03208 809E89D8 8FBE0058 */ lw $s8, 0x0058($sp) /* 0320C 809E89DC 03E00008 */ jr $ra /* 03210 809E89E0 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s index e58d535ffb..621ca18b01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809E90B8 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E90CC + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E90E0 + .asciz "../z_en_dekubaba.c" + .balign 4 + +.text glabel func_809E89E4 /* 03214 809E89E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 03218 809E89E8 AFBF001C */ sw $ra, 0x001C($sp) @@ -60,5 +74,3 @@ glabel func_809E89E4 /* 032FC 809E8ACC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03300 809E8AD0 03E00008 */ jr $ra /* 03304 809E8AD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s index dbfb8250f4..25511cc79a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809E90F4 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E9108 + .asciz "../z_en_dekubaba.c" + .balign 4 + +glabel D_809E911C + .asciz "../z_en_dekubaba.c" + .balign 4 + +.late_rodata +glabel D_809E91D0 + .float 0.15 + +.text glabel func_809E8AD8 /* 03308 809E8AD8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0330C 809E8ADC AFBF0024 */ sw $ra, 0x0024($sp) @@ -76,5 +94,3 @@ glabel func_809E8AD8 /* 03430 809E8C00 8FB10020 */ lw $s1, 0x0020($sp) /* 03434 809E8C04 03E00008 */ jr $ra /* 03438 809E8C08 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8C0C.s index 6bfab5f993..1b5746ae94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8C0C.s @@ -15,5 +15,3 @@ glabel func_809E8C0C /* 0346C 809E8C3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03470 809E8C40 03E00008 */ jr $ra /* 03474 809E8C44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s index b4eeadc338..3af77e69b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s @@ -14,5 +14,3 @@ glabel EnDekunuts_Destroy /* 00190 809E96F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00194 809E96F4 03E00008 */ jr $ra /* 00198 809E96F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s index 4aa4f45b4a..2de66d9295 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s @@ -30,4 +30,3 @@ glabel EnDekunuts_Draw /* 015C4 809EAB24 03E00008 */ jr $ra /* 015C8 809EAB28 00000000 */ nop /* 015CC 809EAB2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s index 8f8104af2d..fbf6d672bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s @@ -99,5 +99,3 @@ glabel EnDekunuts_Init /* 0015C 809E96BC 8FB10038 */ lw $s1, 0x0038($sp) /* 00160 809E96C0 03E00008 */ jr $ra /* 00164 809E96C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s index 58c33f57ca..c75bfff273 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s @@ -100,5 +100,3 @@ glabel EnDekunuts_Update /* 01420 809EA980 8FB10020 */ lw $s1, 0x0020($sp) /* 01424 809EA984 03E00008 */ jr $ra /* 01428 809EA988 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s index 9c04eabeb1..bf240428a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s @@ -30,5 +30,3 @@ glabel func_809E96FC /* 00204 809E9764 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00208 809E9768 03E00008 */ jr $ra /* 0020C 809E976C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s index 66cceb1e38..1ae7fa1b98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s @@ -17,5 +17,3 @@ glabel func_809E9770 /* 0024C 809E97AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00250 809E97B0 03E00008 */ jr $ra /* 00254 809E97B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s index 552bfde68b..7a9ce53e26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s @@ -17,5 +17,3 @@ glabel func_809E97B8 /* 00294 809E97F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00298 809E97F8 03E00008 */ jr $ra /* 0029C 809E97FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s index 0d104b23aa..53cb3548b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s @@ -27,5 +27,3 @@ glabel func_809E9800 /* 002FC 809E985C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00300 809E9860 03E00008 */ jr $ra /* 00304 809E9864 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s index e2bcf42598..0edfac8c86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s @@ -19,5 +19,3 @@ glabel func_809E9868 /* 00348 809E98A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0034C 809E98AC 03E00008 */ jr $ra /* 00350 809E98B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s index e3a319c44f..d950059518 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s @@ -27,5 +27,3 @@ glabel func_809E98B4 /* 003B4 809E9914 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B8 809E9918 03E00008 */ jr $ra /* 003BC 809E991C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s index 22e1e20911..f71d10e830 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s @@ -21,5 +21,3 @@ glabel func_809E9920 /* 0040C 809E996C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00410 809E9970 03E00008 */ jr $ra /* 00414 809E9974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s index 0065a80c91..d35cfc0023 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s @@ -24,5 +24,3 @@ glabel func_809E9978 /* 0046C 809E99CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00470 809E99D0 03E00008 */ jr $ra /* 00474 809E99D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s index 04d44cb857..1c001e530c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s @@ -59,5 +59,3 @@ glabel func_809E99D8 /* 00548 809E9AA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0054C 809E9AAC 03E00008 */ jr $ra /* 00550 809E9AB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s index dc020aafcd..24a9c09cf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s @@ -38,5 +38,3 @@ glabel func_809E9AB4 /* 005DC 809E9B3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005E0 809E9B40 03E00008 */ jr $ra /* 005E4 809E9B44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s index a6a82a8435..39f1f9f8f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s @@ -20,5 +20,3 @@ glabel func_809E9B48 /* 0062C 809E9B8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00630 809E9B90 03E00008 */ jr $ra /* 00634 809E9B94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B98.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B98.s index 2e2079ec80..a0986db909 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B98.s @@ -170,5 +170,3 @@ glabel func_809E9B98 /* 00890 809E9DF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00894 809E9DF4 03E00008 */ jr $ra /* 00898 809E9DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9DFC.s index c9d32517ad..56222333dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9DFC.s @@ -36,5 +36,3 @@ glabel func_809E9DFC /* 00914 809E9E74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00918 809E9E78 03E00008 */ jr $ra /* 0091C 809E9E7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s index ce141c7878..d02021a6e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s @@ -66,5 +66,3 @@ glabel func_809E9E80 /* 00A00 809E9F60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A04 809E9F64 03E00008 */ jr $ra /* 00A08 809E9F68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s index 2125a145d6..37b672f7f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s @@ -95,5 +95,3 @@ glabel func_809E9F6C /* 00B58 809EA0B8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00B5C 809EA0BC 03E00008 */ jr $ra /* 00B60 809EA0C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s index ebd08b278e..087c4e04e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s @@ -77,5 +77,3 @@ glabel func_809EA0C4 /* 00C6C 809EA1CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C70 809EA1D0 03E00008 */ jr $ra /* 00C74 809EA1D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s index 70f04de203..019f443b8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s @@ -28,5 +28,3 @@ glabel func_809EA1D8 /* 00CD4 809EA234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CD8 809EA238 03E00008 */ jr $ra /* 00CDC 809EA23C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s index 235ea6db32..b73d3ec967 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s @@ -161,5 +161,3 @@ glabel func_809EA240 /* 00F14 809EA474 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F18 809EA478 03E00008 */ jr $ra /* 00F1C 809EA47C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA480.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA480.s index ab0fab06b5..3af5ae7c12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA480.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA480.s @@ -28,5 +28,3 @@ glabel func_809EA480 /* 00F7C 809EA4DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F80 809EA4E0 03E00008 */ jr $ra /* 00F84 809EA4E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s index b9c32ed654..d4ebd95504 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s @@ -21,5 +21,3 @@ glabel func_809EA4E8 /* 00FC8 809EA528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FCC 809EA52C 03E00008 */ jr $ra /* 00FD0 809EA530 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA534.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA534.s index 1af18dc4e0..64b40bd743 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA534.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA534.s @@ -36,5 +36,3 @@ glabel func_809EA534 /* 01044 809EA5A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01048 809EA5A8 03E00008 */ jr $ra /* 0104C 809EA5AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s index 4705b58d00..5de6855dbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s @@ -92,5 +92,3 @@ glabel func_809EA5B0 /* 011A0 809EA700 8FB10048 */ lw $s1, 0x0048($sp) /* 011A4 809EA704 03E00008 */ jr $ra /* 011A8 809EA708 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s index f630c4a5ea..641dc47c88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s @@ -79,5 +79,3 @@ glabel func_809EA70C /* 012C0 809EA820 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012C4 809EA824 03E00008 */ jr $ra /* 012C8 809EA828 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA98C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA98C.s index 0481c419ca..55179c6664 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA98C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA98C.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_809EABC0 + .float 0.0833 +glabel D_809EABC4 + .float 0.1167 +glabel D_809EABC8 + .float 1.7 +glabel D_809EABCC + .float 0.7 +glabel D_809EABD0 + .float 0.1667 + +.text glabel func_809EA98C /* 0142C 809EA98C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01430 809EA990 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -83,5 +96,3 @@ glabel func_809EA98C /* 01558 809EAAB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0155C 809EAABC 03E00008 */ jr $ra /* 01560 809EAAC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s index 72dc64c3a4..0abe5b7fa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s @@ -17,5 +17,3 @@ glabel EnDh_Destroy /* 00178 809EAEB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0017C 809EAEBC 03E00008 */ jr $ra /* 00180 809EAEC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s index 0a08ebc2f0..3435752220 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809EC680 + .asciz "../z_en_dh.c" + .balign 4 + +glabel D_809EC690 + .asciz "../z_en_dh.c" + .balign 4 + +glabel D_809EC6A0 + .asciz "../z_en_dh.c" + .balign 4 + +.late_rodata +glabel D_809EC6EC + .float 0.01 + +.text glabel EnDh_Draw /* 014F0 809EC230 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 014F4 809EC234 AFB20040 */ sw $s2, 0x0040($sp) @@ -225,4 +243,3 @@ glabel EnDh_Draw /* 01854 809EC594 8FB20040 */ lw $s2, 0x0040($sp) /* 01858 809EC598 03E00008 */ jr $ra /* 0185C 809EC59C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s index aff50d5f7e..7a6970701d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s @@ -83,5 +83,3 @@ glabel EnDh_Init /* 00134 809EAE74 8FB10028 */ lw $s1, 0x0028($sp) /* 00138 809EAE78 03E00008 */ jr $ra /* 0013C 809EAE7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s index 55f54e23a7..52241b226d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s @@ -121,5 +121,3 @@ glabel EnDh_Update /* 01454 809EC194 8FB20028 */ lw $s2, 0x0028($sp) /* 01458 809EC198 03E00008 */ jr $ra /* 0145C 809EC19C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAD40.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAD40.s index 761c204a59..0e08633df6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAD40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAD40.s @@ -1,5 +1,3 @@ glabel func_809EAD40 /* 00000 809EAD40 03E00008 */ jr $ra /* 00004 809EAD44 AC850254 */ sw $a1, 0x0254($a0) ## 00000254 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s index 33af875e69..2ce9d55334 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809EC6B0 + .float 6.28 + +.text glabel func_809EAEC4 /* 00184 809EAEC4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00188 809EAEC8 3C0F809F */ lui $t7, %hi(D_809EC650) ## $t7 = 809F0000 @@ -106,5 +111,3 @@ glabel func_809EAEC4 /* 00310 809EB050 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00314 809EB054 03E00008 */ jr $ra /* 00318 809EB058 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s index 43b22180ed..d44c0c6621 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809EC6B4 + .word 0xC66A6000 + +.text glabel func_809EB05C /* 0031C 809EB05C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00320 809EB060 AFB00018 */ sw $s0, 0x0018($sp) @@ -46,5 +51,3 @@ glabel func_809EB05C /* 003C4 809EB104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003C8 809EB108 03E00008 */ jr $ra /* 003CC 809EB10C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s index f01502fd7d..c592595bd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809EC6B8 + .word 0x40033333 +glabel D_809EC6BC + .float 1.2 + +.text glabel func_809EB110 /* 003D0 809EB110 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 003D4 809EB114 AFBF002C */ sw $ra, 0x002C($sp) @@ -152,5 +159,3 @@ glabel func_809EB110 /* 005E8 809EB328 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005EC 809EB32C 03E00008 */ jr $ra /* 005F0 809EB330 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s index a787185925..61eddff210 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s @@ -40,5 +40,3 @@ glabel func_809EB334 /* 00684 809EB3C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00688 809EB3C8 03E00008 */ jr $ra /* 0068C 809EB3CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB3D0.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB3D0.s index 149a35b5da..3bb5bae8f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB3D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB3D0.s @@ -73,5 +73,3 @@ glabel func_809EB3D0 /* 0078C 809EB4CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00790 809EB4D0 03E00008 */ jr $ra /* 00794 809EB4D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s index d40e813f16..8c4b050343 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s @@ -24,5 +24,3 @@ glabel func_809EB4D8 /* 007F0 809EB530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F4 809EB534 03E00008 */ jr $ra /* 007F8 809EB538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB53C.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB53C.s index fa53e57227..c626652be8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB53C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB53C.s @@ -37,5 +37,3 @@ glabel func_809EB53C /* 00878 809EB5B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0087C 809EB5BC 03E00008 */ jr $ra /* 00880 809EB5C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s index 61bbdff968..5b97dad24f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s @@ -23,5 +23,3 @@ glabel func_809EB5C4 /* 008D8 809EB618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008DC 809EB61C 03E00008 */ jr $ra /* 008E0 809EB620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s index 7713365438..a6e557fa96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_809EC6C0 +.word L809EB730 +.word L809EB708 +.word L809EB750 +.word L809EB81C +.word L809EB918 +.word L809EB910 + +.text glabel func_809EB624 /* 008E4 809EB624 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 008E8 809EB628 AFB00028 */ sw $s0, 0x0028($sp) @@ -217,5 +227,3 @@ glabel L809EB918 /* 00BE8 809EB928 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00BEC 809EB92C 03E00008 */ jr $ra /* 00BF0 809EB930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s index 8b2ed10718..1f8a4fedaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s @@ -33,5 +33,3 @@ glabel func_809EB934 /* 00C6C 809EB9AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C70 809EB9B0 03E00008 */ jr $ra /* 00C74 809EB9B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB9B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB9B8.s index c4bb3ea9a7..9a278cc964 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB9B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB9B8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_809EC6D8 + .word 0x40033333 +glabel D_809EC6DC + .float 1.2 + +glabel D_809EC6E0 + .float 0.6 + +.text glabel func_809EB9B8 /* 00C78 809EB9B8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00C7C 809EB9BC AFBF002C */ sw $ra, 0x002C($sp) @@ -108,5 +118,3 @@ glabel func_809EB9B8 /* 00DFC 809EBB3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E00 809EBB40 03E00008 */ jr $ra /* 00E04 809EBB44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s index 0f83bb41b3..444416de2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s @@ -33,5 +33,3 @@ glabel func_809EBB48 /* 00E7C 809EBBBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E80 809EBBC0 03E00008 */ jr $ra /* 00E84 809EBBC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s index 798a6bbfa7..5a8c50d636 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809EC6E4 + .float 0.15 + +.text glabel func_809EBBC8 /* 00E88 809EBBC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00E8C 809EBBCC AFBF002C */ sw $ra, 0x002C($sp) @@ -81,5 +86,3 @@ glabel func_809EBBC8 /* 00FA4 809EBCE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00FA8 809EBCE8 03E00008 */ jr $ra /* 00FAC 809EBCEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s index 5abd654e2b..44308ae2b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s @@ -34,5 +34,3 @@ glabel func_809EBCF0 /* 0102C 809EBD6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01030 809EBD70 03E00008 */ jr $ra /* 01034 809EBD74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s index fcfe0c8e6a..a9f6ca5f97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809EC6E8 + .word 0x389D4952 + +.text glabel func_809EBD78 /* 01038 809EBD78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0103C 809EBD7C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -87,5 +92,3 @@ glabel func_809EBD78 /* 0115C 809EBE9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01160 809EBEA0 03E00008 */ jr $ra /* 01164 809EBEA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBEA8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBEA8.s index 4604d2ec29..a558f61b7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBEA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBEA8.s @@ -93,5 +93,3 @@ glabel func_809EBEA8 /* 012AC 809EBFEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 012B0 809EBFF0 03E00008 */ jr $ra /* 012B4 809EBFF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EC1A0.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EC1A0.s index 2f9f977622..db41f6e51c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EC1A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EC1A0.s @@ -36,5 +36,3 @@ glabel func_809EC1A0 /* 014E4 809EC224 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014E8 809EC228 03E00008 */ jr $ra /* 014EC 809EC22C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s index d576adc2a8..2b9d7ce5d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s @@ -9,5 +9,3 @@ glabel EnDha_Destroy /* 0013C 809EC9BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00140 809EC9C0 03E00008 */ jr $ra /* 00144 809EC9C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s index f6483f80c4..68a431edfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s @@ -23,4 +23,3 @@ glabel EnDha_Draw /* 00DA4 809ED624 03E00008 */ jr $ra /* 00DA8 809ED628 00000000 */ nop /* 00DAC 809ED62C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s index 56219dd1e2..7198eb7415 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s @@ -71,5 +71,3 @@ glabel EnDha_Init /* 00114 809EC994 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00118 809EC998 03E00008 */ jr $ra /* 0011C 809EC99C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s index 44a1aa0094..5cfdbb76cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809ED788 + .float 10000.0 + +.text glabel EnDha_Update /* 00AEC 809ED36C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00AF0 809ED370 AFBF0024 */ sw $ra, 0x0024($sp) @@ -45,5 +50,3 @@ glabel EnDha_Update /* 00B88 809ED408 8FB10020 */ lw $s1, 0x0020($sp) /* 00B8C 809ED40C 03E00008 */ jr $ra /* 00B90 809ED410 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC880.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC880.s index 85c95ef9fd..51c92bd75e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC880.s @@ -1,5 +1,3 @@ glabel func_809EC880 /* 00000 809EC880 03E00008 */ jr $ra /* 00004 809EC884 AC8501C4 */ sw $a1, 0x01C4($a0) ## 000001C4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s index 2fc8dfae1b..77db92fa3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s @@ -34,5 +34,3 @@ glabel func_809EC9C8 /* 001C4 809ECA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C8 809ECA48 03E00008 */ jr $ra /* 001CC 809ECA4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s index b03252ea6f..b793b4d813 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809ED780 + .float 1820.0 + +.text glabel func_809ECA50 /* 001D0 809ECA50 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 001D4 809ECA54 3C0F809F */ lui $t7, %hi(D_809ED740) ## $t7 = 809F0000 @@ -359,5 +364,3 @@ glabel func_809ECA50 /* 006D4 809ECF54 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 006D8 809ECF58 03E00008 */ jr $ra /* 006DC 809ECF5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF60.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF60.s index 95a59b8716..bc2dd9f080 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF60.s @@ -10,5 +10,3 @@ glabel func_809ECF60 /* 00700 809ECF80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00704 809ECF84 03E00008 */ jr $ra /* 00708 809ECF88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF8C.s index 945cc4e382..7b1a200ee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECF8C.s @@ -56,5 +56,3 @@ glabel func_809ECF8C /* 007C8 809ED048 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007CC 809ED04C 03E00008 */ jr $ra /* 007D0 809ED050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED054.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED054.s index 4ed0ef551c..ac6d2448d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED054.s @@ -30,5 +30,3 @@ glabel func_809ED054 /* 00838 809ED0B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0083C 809ED0BC 03E00008 */ jr $ra /* 00840 809ED0C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED0C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED0C4.s index 5ce1990d6f..f84efd6f69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED0C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809ED784 + .float -12000.0 + +.text glabel func_809ED0C4 /* 00844 809ED0C4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00848 809ED0C8 AFBF002C */ sw $ra, 0x002C($sp) @@ -118,5 +123,3 @@ glabel func_809ED0C4 /* 009F0 809ED270 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 009F4 809ED274 03E00008 */ jr $ra /* 009F8 809ED278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED27C.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED27C.s index 67b25cc106..de3b2ddbf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED27C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED27C.s @@ -66,5 +66,3 @@ glabel func_809ED27C /* 00AE0 809ED360 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AE4 809ED364 03E00008 */ jr $ra /* 00AE8 809ED368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED414.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED414.s index 59929a6b14..25d07ee74a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED414.s @@ -43,5 +43,3 @@ glabel func_809ED414 .L809ED4B0: /* 00C30 809ED4B0 03E00008 */ jr $ra /* 00C34 809ED4B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED4B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED4B8.s index 9985d5bb29..81226e8f6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED4B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ED4B8.s @@ -73,5 +73,3 @@ glabel func_809ED4B8 /* 00D44 809ED5C4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00D48 809ED5C8 03E00008 */ jr $ra /* 00D4C 809ED5CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s index ac285b6993..60c77a2260 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s @@ -16,5 +16,3 @@ glabel EnDivingGame_Destroy /* 00164 809ED9D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00168 809ED9D8 03E00008 */ jr $ra /* 0016C 809ED9DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s index a964b7a47d..fe04587804 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809EF17C + .asciz "../z_en_diving_game.c" + .balign 4 + +glabel D_809EF194 + .asciz "../z_en_diving_game.c" + .balign 4 + +.text glabel EnDivingGame_Draw /* 016D4 809EEF44 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 016D8 809EEF48 AFB20030 */ sw $s2, 0x0030($sp) @@ -82,4 +92,3 @@ glabel EnDivingGame_Draw /* 01814 809EF084 00000000 */ nop /* 01818 809EF088 00000000 */ nop /* 0181C 809EF08C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s index aaf483eb35..7e90f039c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s @@ -1,3 +1,26 @@ +.rdata +glabel D_809EF0F0 + .asciz "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" + .balign 4 + +.balign 4 + +glabel D_809EF120 + .asciz "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" + .balign 4 + +.balign 4 + +.late_rodata +glabel D_809EF1AC + .float 0.01 + +glabel D_809EF1B0 + .word 0x3C54FDF3 +glabel D_809EF1B4 + .word 0x3C656041 + +.text glabel EnDivingGame_Init /* 00000 809ED870 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809ED874 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 @@ -84,5 +107,3 @@ glabel EnDivingGame_Init /* 00128 809ED998 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0012C 809ED99C 03E00008 */ jr $ra /* 00130 809ED9A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s index 27a8aa6dee..dc26be4166 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s @@ -149,5 +149,3 @@ glabel EnDivingGame_Update /* 0153C 809EEDAC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01540 809EEDB0 03E00008 */ jr $ra /* 01544 809EEDB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s index e9f85eb88f..f9259215bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809EF1B8 + .word 0x455AC000 + +.text glabel func_809ED9E0 /* 00170 809ED9E0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00174 809ED9E4 AFBF003C */ sw $ra, 0x003C($sp) @@ -79,5 +84,3 @@ glabel func_809ED9E0 /* 0028C 809EDAFC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00290 809EDB00 03E00008 */ jr $ra /* 00294 809EDB04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s index dc7f6581e9..506adff521 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s @@ -111,5 +111,3 @@ glabel func_809EDB08 /* 00434 809EDCA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00438 809EDCA8 03E00008 */ jr $ra /* 0043C 809EDCAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s index d4ba3dd932..9bca983535 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s @@ -40,5 +40,3 @@ glabel func_809EDCB0 /* 004D0 809EDD40 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004D4 809EDD44 03E00008 */ jr $ra /* 004D8 809EDD48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s index 66f336ea7f..56fc7344c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s @@ -114,5 +114,3 @@ glabel func_809EDD4C /* 00660 809EDED0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00664 809EDED4 03E00008 */ jr $ra /* 00668 809EDED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s index ec0262f200..2b822b771a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s @@ -99,5 +99,3 @@ glabel func_809EDEDC /* 007CC 809EE03C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007D0 809EE040 03E00008 */ jr $ra /* 007D4 809EE044 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s index bc71f7fe46..fb1cb98c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s @@ -48,5 +48,3 @@ glabel func_809EE048 /* 00880 809EE0F0 8FB10018 */ lw $s1, 0x0018($sp) /* 00884 809EE0F4 03E00008 */ jr $ra /* 00888 809EE0F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s index 7cda987fa5..5457a5a2e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s @@ -39,5 +39,3 @@ glabel func_809EE0FC /* 00918 809EE188 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0091C 809EE18C 03E00008 */ jr $ra /* 00920 809EE190 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s index c3d196ca08..704d503bd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s @@ -25,5 +25,3 @@ glabel func_809EE194 /* 00978 809EE1E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0097C 809EE1EC 03E00008 */ jr $ra /* 00980 809EE1F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s index b0367dbca1..8e88721588 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809EF1BC + .float 0.1 + +glabel D_809EF1C0 + .float 0.04 + +.text glabel func_809EE1F4 /* 00984 809EE1F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00988 809EE1F8 AFB00014 */ sw $s0, 0x0014($sp) @@ -134,5 +142,3 @@ glabel func_809EE1F4 /* 00B8C 809EE3FC 8FB00014 */ lw $s0, 0x0014($sp) /* 00B90 809EE400 03E00008 */ jr $ra /* 00B94 809EE404 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s index 6d56fb51fa..89d9a354cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s @@ -190,5 +190,3 @@ glabel func_809EE408 /* 00E4C 809EE6BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E50 809EE6C0 03E00008 */ jr $ra /* 00E54 809EE6C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s index 57b4591016..2d3698e651 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s @@ -47,5 +47,3 @@ glabel func_809EE6C8 /* 00F04 809EE774 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F08 809EE778 03E00008 */ jr $ra /* 00F0C 809EE77C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s index 560b42fad6..a4be7c97a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s @@ -33,5 +33,3 @@ glabel func_809EE780 /* 00F84 809EE7F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F88 809EE7F8 03E00008 */ jr $ra /* 00F8C 809EE7FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s index 0147cfcdc6..1f1e0ce3cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s @@ -63,5 +63,3 @@ glabel func_809EE800 /* 01074 809EE8E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01078 809EE8E8 03E00008 */ jr $ra /* 0107C 809EE8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s index 0b0a3a5ed7..1bfa8b49ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s @@ -33,5 +33,3 @@ glabel func_809EE8F0 /* 010F0 809EE960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010F4 809EE964 03E00008 */ jr $ra /* 010F8 809EE968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s index eacac36655..6ddae7c7fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s @@ -38,5 +38,3 @@ glabel func_809EE96C /* 01184 809EE9F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01188 809EE9F8 03E00008 */ jr $ra /* 0118C 809EE9FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s index df35e3687d..29b40847a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s @@ -37,5 +37,3 @@ glabel func_809EEA00 /* 01214 809EEA84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01218 809EEA88 03E00008 */ jr $ra /* 0121C 809EEA8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s index 49592e85c1..9c4b067469 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s @@ -28,5 +28,3 @@ glabel func_809EEA90 /* 0127C 809EEAEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01280 809EEAF0 03E00008 */ jr $ra /* 01284 809EEAF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s index b8c7670de7..41ef3ca905 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s @@ -1,3 +1,11 @@ +.rdata +glabel D_809EF150 + .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" + .balign 4 + +.balign 4 + +.text glabel func_809EEAF8 /* 01288 809EEAF8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0128C 809EEAFC AFB00018 */ sw $s0, 0x0018($sp) @@ -41,5 +49,3 @@ glabel func_809EEAF8 /* 01314 809EEB84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01318 809EEB88 03E00008 */ jr $ra /* 0131C 809EEB8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s index 741f74678a..b5bbfd3d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s @@ -11,5 +11,3 @@ glabel func_809EEDB8 /* 01568 809EEDD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0156C 809EEDDC 03E00008 */ jr $ra /* 01570 809EEDE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s index c1b044a001..9b1a04b693 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s @@ -93,5 +93,3 @@ glabel func_809EEDE4 /* 016C8 809EEF38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 016CC 809EEF3C 03E00008 */ jr $ra /* 016D0 809EEF40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s index def9c720ab..482ae10393 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s @@ -10,5 +10,3 @@ glabel EnDns_Destroy /* 001C0 809EF510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C4 809EF514 03E00008 */ jr $ra /* 001C8 809EF518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s index 9799d86a93..4ddd9feebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s @@ -20,4 +20,3 @@ glabel EnDns_Draw /* 01064 809F03B4 00000000 */ nop /* 01068 809F03B8 00000000 */ nop /* 0106C 809F03BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s index 4f355702ed..b9c2ee8d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s @@ -1,3 +1,57 @@ +.rdata +glabel D_809F0560 + .asciz "デクの実売り " + .balign 4 + +glabel D_809F057C + .asciz "デクの棒売り " + .balign 4 + +glabel D_809F0598 + .asciz "ハートの欠片売り " + .balign 4 + +glabel D_809F05B4 + .asciz "デクの種売り " + .balign 4 + +glabel D_809F05D0 + .asciz "デクの盾売り " + .balign 4 + +glabel D_809F05EC + .asciz "バクダン売り " + .balign 4 + +glabel D_809F0608 + .asciz "矢売り " + .balign 4 + +glabel D_809F0624 + .asciz "赤のくすり売り " + .balign 4 + +glabel D_809F0640 + .asciz "緑のくすり売り " + .balign 4 + +glabel D_809F065C + .asciz "デクの棒持てる数を増やす" + .balign 4 + +glabel D_809F0678 + .asciz "デクの実持てる数を増やす" + .balign 4 + +glabel D_809F0694 + .asciz "\x1B[31m引数エラー（売りナッツ）[ arg_data = %d ]\x1B[m\n" + .balign 4 + +glabel D_809F06C8 + .asciz "\x1B[32m◆◆◆ 売りナッツ『%s』 ◆◆◆\x1B[m\n" + .balign 4 + +.text glabel EnDns_Init /* 00000 809EF350 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 809EF354 AFBF002C */ sw $ra, 0x002C($sp) @@ -116,5 +170,3 @@ glabel EnDns_Init /* 00198 809EF4E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0019C 809EF4EC 03E00008 */ jr $ra /* 001A0 809EF4F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s index 636e691b3f..cb92d32019 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s @@ -66,5 +66,3 @@ glabel EnDns_Update /* 01010 809F0360 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01014 809F0364 03E00008 */ jr $ra /* 01018 809F0368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s index e67852436b..6d9977e868 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s @@ -35,5 +35,3 @@ glabel func_809EF51C /* 00248 809EF598 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0024C 809EF59C 03E00008 */ jr $ra /* 00250 809EF5A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s index fcb01b2488..aadb082b63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s @@ -48,5 +48,3 @@ glabel func_809EF5A4 /* 002FC 809EF64C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00300 809EF650 03E00008 */ jr $ra /* 00304 809EF654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s index 7728f1781b..d8b34ca7dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s @@ -48,5 +48,3 @@ glabel func_809EF658 /* 003B0 809EF700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B4 809EF704 03E00008 */ jr $ra /* 003B8 809EF708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s index 8ba7ac272b..34339e9c42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s @@ -12,5 +12,3 @@ glabel func_809EF70C .L809EF734: /* 003E4 809EF734 03E00008 */ jr $ra /* 003E8 809EF738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s index c4184d388f..b7d05dbe23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s @@ -52,5 +52,3 @@ glabel func_809EF73C /* 004A4 809EF7F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A8 809EF7F8 03E00008 */ jr $ra /* 004AC 809EF7FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s index 1ca8c247b5..166b2a19e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s @@ -23,5 +23,3 @@ glabel func_809EF800 .L809EF84C: /* 004FC 809EF84C 03E00008 */ jr $ra /* 00500 809EF850 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s index 69caf43983..06193a284b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s @@ -43,5 +43,3 @@ glabel func_809EF854 .L809EF8EC: /* 0059C 809EF8EC 03E00008 */ jr $ra /* 005A0 809EF8F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s index 5645efa71c..eaac37162d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s @@ -46,5 +46,3 @@ glabel func_809EF8F4 .L809EF99C: /* 0064C 809EF99C 03E00008 */ jr $ra /* 00650 809EF9A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s index a907180594..85e3c05b0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s @@ -22,5 +22,3 @@ glabel func_809EF9A4 .L809EF9F0: /* 006A0 809EF9F0 03E00008 */ jr $ra /* 006A4 809EF9F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9F8.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9F8.s index c67522e09a..9ed8df0c76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9F8.s @@ -11,5 +11,3 @@ glabel func_809EF9F8 /* 006CC 809EFA1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006D0 809EFA20 03E00008 */ jr $ra /* 006D4 809EFA24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA28.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA28.s index 5f2d011893..0916c23daf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA28.s @@ -11,5 +11,3 @@ glabel func_809EFA28 /* 006FC 809EFA4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00700 809EFA50 03E00008 */ jr $ra /* 00704 809EFA54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s index 18ba106f38..2023619476 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s @@ -16,5 +16,3 @@ glabel func_809EFA58 /* 00740 809EFA90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00744 809EFA94 03E00008 */ jr $ra /* 00748 809EFA98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA9C.s index eaa79dfab4..040c2414cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA9C.s @@ -11,5 +11,3 @@ glabel func_809EFA9C /* 00770 809EFAC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00774 809EFAC4 03E00008 */ jr $ra /* 00778 809EFAC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFACC.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFACC.s index 2d60d65394..9c5d11078b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFACC.s @@ -11,5 +11,3 @@ glabel func_809EFACC /* 007A0 809EFAF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007A4 809EFAF4 03E00008 */ jr $ra /* 007A8 809EFAF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s index d77bd4b69a..bbd0b5f84b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s @@ -16,5 +16,3 @@ glabel func_809EFAFC /* 007E4 809EFB34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007E8 809EFB38 03E00008 */ jr $ra /* 007EC 809EFB3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s index 48aa067d8b..507bfc1172 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s @@ -16,5 +16,3 @@ glabel func_809EFB40 /* 00828 809EFB78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0082C 809EFB7C 03E00008 */ jr $ra /* 00830 809EFB80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB84.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB84.s index 73db774379..dd1a96f794 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB84.s @@ -17,5 +17,3 @@ glabel func_809EFB84 /* 0086C 809EFBBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00870 809EFBC0 03E00008 */ jr $ra /* 00874 809EFBC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFBC8.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFBC8.s index 05ad160c72..ef72192489 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFBC8.s @@ -59,5 +59,3 @@ glabel func_809EFBC8 /* 00940 809EFC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00944 809EFC94 03E00008 */ jr $ra /* 00948 809EFC98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFC9C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFC9C.s index f311e1fcaa..fd7add1b8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFC9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFC9C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_809F06F0 +.word L809EFD38 +.word L809EFD54 +.word L809EFD8C +.word L809EFD70 +.word L809EFD8C + +.text glabel func_809EFC9C /* 0094C 809EFC9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00950 809EFCA0 AFB00018 */ sw $s0, 0x0018($sp) @@ -84,5 +93,3 @@ glabel L809EFD8C /* 00A74 809EFDC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A78 809EFDC8 03E00008 */ jr $ra /* 00A7C 809EFDCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s index 226f060e69..3d4dfb1bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s @@ -74,5 +74,3 @@ glabel func_809EFDD0 /* 00B8C 809EFEDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B90 809EFEE0 03E00008 */ jr $ra /* 00B94 809EFEE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFEE8.s index ee8138ae1e..776ee785b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFEE8.s @@ -26,5 +26,3 @@ glabel func_809EFEE8 /* 00BF4 809EFF44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BF8 809EFF48 03E00008 */ jr $ra /* 00BFC 809EFF4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s index 5961f31a3f..5fc574af0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s @@ -19,5 +19,3 @@ glabel func_809EFF50 /* 00C3C 809EFF8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C40 809EFF90 03E00008 */ jr $ra /* 00C44 809EFF94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF98.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF98.s index d3577d9e9a..19d8f6f181 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF98.s @@ -63,5 +63,3 @@ glabel func_809EFF98 /* 00D30 809F0080 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D34 809F0084 03E00008 */ jr $ra /* 00D38 809F0088 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F008C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F008C.s index de8c29eaa9..fb6c7ff972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F008C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F008C.s @@ -30,5 +30,3 @@ glabel func_809F008C /* 00DA4 809F00F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DA8 809F00F8 03E00008 */ jr $ra /* 00DAC 809F00FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F0100.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F0100.s index dc85f2bc4b..d530edd6bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F0100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F0100.s @@ -33,5 +33,3 @@ glabel func_809F0100 /* 00E20 809F0170 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E24 809F0174 03E00008 */ jr $ra /* 00E28 809F0178 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F017C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F017C.s index 4e371ca780..02475fc99d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F017C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809F017C.s @@ -70,5 +70,3 @@ glabel func_809F017C /* 00F24 809F0274 8FB40028 */ lw $s4, 0x0028($sp) /* 00F28 809F0278 03E00008 */ jr $ra /* 00F2C 809F027C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s index f972eba146..3a210a95b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s @@ -2,5 +2,3 @@ glabel EnDntDemo_Destroy /* 00000 809F08E0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809F08E4 03E00008 */ jr $ra /* 00008 809F08E8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s index 60b1021118..7a4f95ae61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809F16B0 + .asciz "\n\n" + .balign 4 + +glabel D_809F16B4 + .asciz "\x1B[32m☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n\x1B[m" + .balign 4 + +.balign 4 + +glabel D_809F16F0 + .asciz "\x1B[32m☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n\x1B[m" + .balign 4 + +glabel D_809F171C + .asciz "\x1B[32m☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n\x1B[m" + .balign 4 + +.late_rodata +glabel D_809F197C + .float 4050.0 + +.text glabel EnDntDemo_Init /* 0000C 809F08EC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00010 809F08F0 AFB30044 */ sw $s3, 0x0044($sp) @@ -118,5 +142,3 @@ glabel EnDntDemo_Init /* 001B8 809F0A98 8FB00038 */ lw $s0, 0x0038($sp) /* 001BC 809F0A9C 03E00008 */ jr $ra /* 001C0 809F0AA0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s index 392c15dcaf..5b435da812 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s @@ -90,4 +90,3 @@ glabel EnDntDemo_Update /* 00CB4 809F1594 03E00008 */ jr $ra /* 00CB8 809F1598 00000000 */ nop /* 00CBC 809F159C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s index 834d7b7c5e..22f6142d2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s @@ -1,3 +1,76 @@ +.rdata +glabel D_809F1758 + .asciz "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F1784 + .asciz "☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F17AC + .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F17DC + .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F180C + .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F183C + .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F186C + .asciz "\n\n" + .balign 4 + +glabel D_809F1870 + .asciz "☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_809F18A4 + .asciz "☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_809F18D8 + .asciz "☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_809F190C + .asciz "\n" + .balign 4 + +glabel D_809F1910 + .asciz "☆☆☆☆☆ どういう評価？ ☆☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_809F1944 + .asciz "☆☆☆☆☆ どういうアクション？ ☆☆☆ %d\n" + .balign 4 + +glabel D_809F1978 + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel jtbl_809F1980 +.word L809F0E1C +.word L809F0D50 +.word L809F0E1C +.word L809F0E1C +.word L809F0E1C +.word L809F0E1C +.word L809F0E1C +.word L809F0D80 +glabel D_809F19A0 + .float 8.99 +glabel D_809F19A4 + .float 7.99 + +.text glabel func_809F0AA4 /* 001C4 809F0AA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 001C8 809F0AA8 AFBF002C */ sw $ra, 0x002C($sp) @@ -460,5 +533,3 @@ glabel L809F0E1C /* 00814 809F10F4 8FB20028 */ lw $s2, 0x0028($sp) /* 00818 809F10F8 03E00008 */ jr $ra /* 0081C 809F10FC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s index eb399866fc..daa423c72a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s @@ -165,5 +165,3 @@ glabel func_809F1100 /* 00A88 809F1368 8FB60048 */ lw $s6, 0x0048($sp) /* 00A8C 809F136C 03E00008 */ jr $ra /* 00A90 809F1370 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s index 41093dade7..c87c9d66ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s @@ -56,5 +56,3 @@ glabel func_809F1374 .L809F1448: /* 00B68 809F1448 03E00008 */ jr $ra /* 00B6C 809F144C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s index 9a7d98ae29..a3ce998fae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s @@ -10,5 +10,3 @@ glabel EnDntJiji_Destroy /* 00118 809F1BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0011C 809F1BFC 03E00008 */ jr $ra /* 00120 809F1C00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s index 43478d7930..0d5087e4da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s @@ -1,3 +1,20 @@ +.rdata +glabel D_809F30B8 + .asciz "../z_en_dnt_jiji.c" + .balign 4 + +glabel D_809F30CC + .asciz "../z_en_dnt_jiji.c" + .balign 4 + +glabel D_809F30E0 + .asciz "../z_en_dnt_jiji.c" + .balign 4 + +.late_rodata +glabel D_809F30F8 + .float 0.01 +.text glabel EnDntJiji_Draw /* 01320 809F2E00 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01324 809F2E04 AFB20028 */ sw $s2, 0x0028($sp) @@ -96,4 +113,3 @@ glabel EnDntJiji_Draw /* 01494 809F2F74 03E00008 */ jr $ra /* 01498 809F2F78 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0149C 809F2F7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s index cb0e20baac..6a1e29462f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809F2FE0 + .asciz "\n\n" + .balign 4 + +glabel D_809F2FE4 + .asciz "\x1B[33m☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n\x1B[m" + .balign 4 + +.text glabel EnDntJiji_Init /* 00000 809F1AE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00004 809F1AE4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 @@ -68,5 +78,3 @@ glabel EnDntJiji_Init /* 000F0 809F1BD0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000F4 809F1BD4 03E00008 */ jr $ra /* 000F8 809F1BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s index 6373cef2c5..d94e034dfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809F3090 + .asciz "\x1B[33m☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n\x1B[m" + .balign 4 + +.text glabel EnDntJiji_Update /* 01128 809F2C08 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0112C 809F2C0C AFA5003C */ sw $a1, 0x003C($sp) @@ -147,5 +153,3 @@ glabel EnDntJiji_Update /* 01314 809F2DF4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01318 809F2DF8 03E00008 */ jr $ra /* 0131C 809F2DFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s index 0b85a19dfd..b769b92f83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s @@ -16,5 +16,3 @@ glabel func_809F1C04 .L809F1C3C: /* 0015C 809F1C3C 03E00008 */ jr $ra /* 00160 809F1C40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s index 5b10f2c5ad..72453d98dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s @@ -45,5 +45,3 @@ glabel func_809F1C44 /* 00208 809F1CE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0020C 809F1CEC 03E00008 */ jr $ra /* 00210 809F1CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s index e81e836c03..4b42133186 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s @@ -47,5 +47,3 @@ glabel func_809F1CF4 /* 002BC 809F1D9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002C0 809F1DA0 03E00008 */ jr $ra /* 002C4 809F1DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s index 543ad4bf11..95b4d13537 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s @@ -59,5 +59,3 @@ glabel func_809F1DA8 /* 003A0 809F1E80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003A4 809F1E84 03E00008 */ jr $ra /* 003A8 809F1E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s index aabb082926..4b831df3be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s @@ -30,5 +30,3 @@ glabel func_809F1E8C /* 00410 809F1EF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00414 809F1EF4 03E00008 */ jr $ra /* 00418 809F1EF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s index c72b63a40f..fd24f1795a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s @@ -59,5 +59,3 @@ glabel func_809F1EFC /* 004F4 809F1FD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 004F8 809F1FD8 03E00008 */ jr $ra /* 004FC 809F1FDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s index 3f2609160c..db6de4efac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s @@ -37,5 +37,3 @@ glabel func_809F1FE0 /* 0057C 809F205C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00580 809F2060 03E00008 */ jr $ra /* 00584 809F2064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s index b365564ada..883c16c360 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s @@ -45,5 +45,3 @@ glabel func_809F2068 /* 0062C 809F210C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00630 809F2110 03E00008 */ jr $ra /* 00634 809F2114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s index 6784d8e6a6..e48cbad645 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s @@ -87,5 +87,3 @@ glabel func_809F2118 /* 00768 809F2248 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0076C 809F224C 03E00008 */ jr $ra /* 00770 809F2250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s index f926c63181..d92b866f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s @@ -63,5 +63,3 @@ glabel func_809F2254 /* 00858 809F2338 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0085C 809F233C 03E00008 */ jr $ra /* 00860 809F2340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s index f15a8ffe47..571cd8e6f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s @@ -10,5 +10,3 @@ glabel func_809F2344 /* 00880 809F2360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00884 809F2364 03E00008 */ jr $ra /* 00888 809F2368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s index 3060f109f7..b4927b8f25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s @@ -85,5 +85,3 @@ glabel func_809F236C /* 009C0 809F24A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 009C4 809F24A4 03E00008 */ jr $ra /* 009C8 809F24A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s index ab16c8fea8..63d93293f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s @@ -45,5 +45,3 @@ glabel func_809F24AC /* 00A64 809F2544 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A68 809F2548 03E00008 */ jr $ra /* 00A6C 809F254C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s index 85dbafbf21..cb973bea76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s @@ -38,5 +38,3 @@ glabel func_809F2550 /* 00AF8 809F25D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AFC 809F25DC 03E00008 */ jr $ra /* 00B00 809F25E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s index c45f1edd76..b010087a72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s @@ -53,5 +53,3 @@ glabel func_809F25E4 /* 00BC4 809F26A4 8FB10020 */ lw $s1, 0x0020($sp) /* 00BC8 809F26A8 03E00008 */ jr $ra /* 00BCC 809F26AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s index 095350356b..18bc4ad840 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s @@ -30,5 +30,3 @@ glabel func_809F26B0 /* 00C34 809F2714 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C38 809F2718 03E00008 */ jr $ra /* 00C3C 809F271C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s index 265e2538ca..7f6b01fe52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s @@ -1,3 +1,48 @@ +.rdata +glabel D_809F3020 + .asciz "実 \n" + .balign 4 +glabel D_809F3028 + .asciz "実 \n" + .balign 4 +glabel D_809F3030 + .asciz "実 \n" + .balign 4 +glabel D_809F3038 + .asciz "実 \n" + .balign 4 +glabel D_809F3040 + .asciz "実 \n" + .balign 4 +glabel D_809F3048 + .asciz "実 \n" + .balign 4 +glabel D_809F3050 + .asciz "実 \n" + .balign 4 +glabel D_809F3058 + .asciz "実 \n" + .balign 4 +glabel D_809F3060 + .asciz "棒 \n" + .balign 4 +glabel D_809F3068 + .asciz "棒 \n" + .balign 4 +glabel D_809F3070 + .asciz "棒 \n" + .balign 4 +glabel D_809F3078 + .asciz "棒 \n" + .balign 4 +glabel D_809F3080 + .asciz "棒 \n" + .balign 4 +glabel D_809F3088 + .asciz "棒 \n" + .balign 4 + +.text glabel func_809F2720 /* 00C40 809F2720 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00C44 809F2724 AFB00018 */ sw $s0, 0x0018($sp) @@ -134,5 +179,3 @@ glabel func_809F2720 /* 00DF0 809F28D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DF4 809F28D4 03E00008 */ jr $ra /* 00DF8 809F28D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s index f6d6443fd0..ed1d300695 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s @@ -39,5 +39,3 @@ glabel func_809F28DC /* 00E88 809F2968 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E8C 809F296C 03E00008 */ jr $ra /* 00E90 809F2970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s index 56f749fbdc..b43a847520 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s @@ -28,5 +28,3 @@ glabel func_809F2974 /* 00EF4 809F29D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EF8 809F29D8 03E00008 */ jr $ra /* 00EFC 809F29DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s index e79af28c9e..388c89dadf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s @@ -45,5 +45,3 @@ glabel func_809F29E0 /* 00FA4 809F2A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00FA8 809F2A88 03E00008 */ jr $ra /* 00FAC 809F2A8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s index c92bd490af..7953cc0ac5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F30F4 + .float 10430.378 + +.text glabel func_809F2A90 /* 00FB0 809F2A90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00FB4 809F2A94 AFB00020 */ sw $s0, 0x0020($sp) @@ -102,5 +107,3 @@ glabel func_809F2A90 /* 0111C 809F2BFC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01120 809F2C00 03E00008 */ jr $ra /* 01124 809F2C04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s index 99f6f49ef2..9c9889ef6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s @@ -20,5 +20,3 @@ glabel EnDntNomal_Destroy /* 001B4 809F3474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001B8 809F3478 03E00008 */ jr $ra /* 001BC 809F347C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s index 2ccca332d8..9a656006c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s @@ -1,3 +1,29 @@ +.rdata +glabel D_809F5EB0 + .asciz "\n\n" + .balign 4 + +glabel D_809F5EB4 + .asciz "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F5EE8 + .asciz "\n\n" + .balign 4 + +glabel D_809F5EEC + .asciz "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_809F5F28 + .asciz " なにみの？ %d\n\n" + .balign 4 + +glabel D_809F5F44 + .asciz " バンクおかしいしぞ！%d\n\n" + .balign 4 + +.text glabel EnDntNomal_Init /* 00000 809F32C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 809F32C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -110,5 +136,3 @@ glabel EnDntNomal_Init /* 0016C 809F342C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00170 809F3430 03E00008 */ jr $ra /* 00174 809F3434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s index acdc7fc195..f89fa7d995 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_809F606C +.word L809F57B0 +.word L809F56EC +.word L809F5714 +.word L809F576C +.word L809F5784 +.word L809F5794 +.word L809F57A4 + +.text glabel EnDntNomal_Update /* 02360 809F5620 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02364 809F5624 AFBF0024 */ sw $ra, 0x0024($sp) @@ -204,5 +215,3 @@ glabel L809F57B0 /* 02618 809F58D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0261C 809F58DC 03E00008 */ jr $ra /* 02620 809F58E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s index d325f0073b..aa8706afab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s @@ -90,5 +90,3 @@ glabel func_809F3480 /* 00300 809F35C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00304 809F35C4 03E00008 */ jr $ra /* 00308 809F35C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s index e54bb50567..6d10412201 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s @@ -23,5 +23,3 @@ glabel func_809F35CC .L809F361C: /* 0035C 809F361C 03E00008 */ jr $ra /* 00360 809F3620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s index 95cdac2508..82e3861757 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s @@ -43,5 +43,3 @@ glabel func_809F3624 /* 00400 809F36C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00404 809F36C4 03E00008 */ jr $ra /* 00408 809F36C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s index a07c2d4e64..c3e48ea4da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s @@ -1,3 +1,15 @@ +.rdata +glabel D_809F5F68 + .asciz "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" + .balign 4 + +.late_rodata +glabel D_809F6034 + .word 0x44A78000 +glabel D_809F6038 + .word 0x44A78000 + +.text glabel func_809F36CC /* 0040C 809F36CC 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00410 809F36D0 3C0F809F */ lui $t7, %hi(D_809F5E70) ## $t7 = 809F0000 @@ -192,5 +204,3 @@ glabel func_809F36CC /* 006EC 809F39AC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 006F0 809F39B0 03E00008 */ jr $ra /* 006F4 809F39B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s index 428886b477..6da6d29993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s @@ -74,5 +74,3 @@ glabel func_809F39B8 /* 00808 809F3AC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0080C 809F3ACC 03E00008 */ jr $ra /* 00810 809F3AD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s index 2e49838d5e..9953e5b39c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s @@ -28,5 +28,3 @@ glabel func_809F3AD4 /* 00874 809F3B34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00878 809F3B38 03E00008 */ jr $ra /* 0087C 809F3B3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s index 493d7beab6..07ae28c471 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s @@ -42,5 +42,3 @@ glabel func_809F3B40 /* 00918 809F3BD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0091C 809F3BDC 03E00008 */ jr $ra /* 00920 809F3BE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s index d7bc837d63..ac25f7ecee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809F603C + .word 0x44A7E000 +glabel D_809F6040 + .word 0x4622F983 + +.text glabel func_809F3BE4 /* 00924 809F3BE4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00928 809F3BE8 AFB00020 */ sw $s0, 0x0020($sp) @@ -64,5 +71,3 @@ glabel func_809F3BE4 /* 00A04 809F3CC4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A08 809F3CC8 03E00008 */ jr $ra /* 00A0C 809F3CCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s index 3cbe7c729d..f867032027 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s @@ -50,5 +50,3 @@ glabel func_809F3CD0 /* 00AB8 809F3D78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00ABC 809F3D7C 03E00008 */ jr $ra /* 00AC0 809F3D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s index 1df945a3d4..c4e51c5d24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s @@ -44,5 +44,3 @@ glabel func_809F3D84 /* 00B64 809F3E24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B68 809F3E28 03E00008 */ jr $ra /* 00B6C 809F3E2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s index d99b52d110..bd559cfc64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s @@ -42,5 +42,3 @@ glabel func_809F3E30 /* 00C08 809F3EC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C0C 809F3ECC 03E00008 */ jr $ra /* 00C10 809F3ED0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s index 94148bfa0b..c22e292269 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s @@ -39,5 +39,3 @@ glabel func_809F3ED4 /* 00CA0 809F3F60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CA4 809F3F64 03E00008 */ jr $ra /* 00CA8 809F3F68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s index fb2b0c0bdb..cac9e9d353 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s @@ -99,5 +99,3 @@ glabel func_809F3F6C /* 00E08 809F40C8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00E0C 809F40CC 03E00008 */ jr $ra /* 00E10 809F40D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s index 0c31a8fedc..5d17e6c8a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809F6044 + .word 0x4622F983 +glabel D_809F6048 + .word 0x4622F983 + +.text glabel func_809F40D4 /* 00E14 809F40D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00E18 809F40D8 AFB10028 */ sw $s1, 0x0028($sp) @@ -124,5 +131,3 @@ glabel func_809F40D4 /* 00FD8 809F4298 8FB10028 */ lw $s1, 0x0028($sp) /* 00FDC 809F429C 03E00008 */ jr $ra /* 00FE0 809F42A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s index f38b58ee03..a1a41f0c0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s @@ -28,5 +28,3 @@ glabel func_809F42A4 /* 01044 809F4304 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01048 809F4308 03E00008 */ jr $ra /* 0104C 809F430C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s index f1a555455b..14ce004162 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s @@ -48,5 +48,3 @@ glabel func_809F4310 /* 010FC 809F43BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01100 809F43C0 03E00008 */ jr $ra /* 01104 809F43C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s index b585e7d8ae..2d4af23734 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s @@ -10,5 +10,3 @@ glabel func_809F43C8 /* 01124 809F43E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01128 809F43E8 03E00008 */ jr $ra /* 0112C 809F43EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s index 35801116d3..e102834c88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s @@ -71,5 +71,3 @@ glabel func_809F43F0 /* 01230 809F44F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01234 809F44F4 03E00008 */ jr $ra /* 01238 809F44F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s index 4e2e720108..a7bc638ca5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F604C + .word 0x4622F983 + +.text glabel func_809F44FC /* 0123C 809F44FC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01240 809F4500 AFBF0024 */ sw $ra, 0x0024($sp) @@ -159,5 +164,3 @@ glabel func_809F44FC /* 01464 809F4724 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01468 809F4728 03E00008 */ jr $ra /* 0146C 809F472C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s index 60f5c69386..cd93efe564 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s @@ -64,5 +64,3 @@ glabel func_809F4730 /* 01558 809F4818 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0155C 809F481C 03E00008 */ jr $ra /* 01560 809F4820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s index 8563d80737..4db99e003b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s @@ -58,5 +58,3 @@ glabel func_809F4824 /* 01630 809F48F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01634 809F48F4 03E00008 */ jr $ra /* 01638 809F48F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s index 8e2f1d3bce..96d953e350 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s @@ -43,5 +43,3 @@ glabel func_809F48FC /* 016D8 809F4998 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 016DC 809F499C 03E00008 */ jr $ra /* 016E0 809F49A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s index 59524f1a0c..fa0c452923 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F6050 + .word 0x4622F983 + +.text glabel func_809F49A4 /* 016E4 809F49A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 016E8 809F49A8 AFB00020 */ sw $s0, 0x0020($sp) @@ -142,5 +147,3 @@ glabel func_809F49A4 /* 018D8 809F4B98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 018DC 809F4B9C 03E00008 */ jr $ra /* 018E0 809F4BA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s index 54717a0b6b..179a9ebb6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F6054 + .float 1.99000000954 + +.text glabel func_809F4BA4 /* 018E4 809F4BA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 018E8 809F4BA8 AFB00028 */ sw $s0, 0x0028($sp) @@ -72,5 +77,3 @@ glabel func_809F4BA4 /* 019E8 809F4CA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 019EC 809F4CAC 03E00008 */ jr $ra /* 019F0 809F4CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s index a66412cee3..e230fbba85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s @@ -97,5 +97,3 @@ glabel func_809F4CB4 /* 01B4C 809F4E0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B50 809F4E10 03E00008 */ jr $ra /* 01B54 809F4E14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s index b5df94ec00..109a6fe9ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s @@ -59,5 +59,3 @@ glabel func_809F4E18 /* 01C28 809F4EE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C2C 809F4EEC 03E00008 */ jr $ra /* 01C30 809F4EF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s index 8b550277cb..fe5d901d5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F6058 + .word 0x407F5C29 + +.text glabel func_809F4EF4 /* 01C34 809F4EF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01C38 809F4EF8 AFBF0034 */ sw $ra, 0x0034($sp) @@ -125,5 +130,3 @@ glabel func_809F4EF4 /* 01DEC 809F50AC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01DF0 809F50B0 03E00008 */ jr $ra /* 01DF4 809F50B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s index 30973cc816..751e5a06a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s @@ -13,5 +13,3 @@ glabel func_809F50B8 .L809F50E4: /* 01E24 809F50E4 03E00008 */ jr $ra /* 01E28 809F50E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s index 87f5cb03a6..bacba0bb85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s @@ -54,5 +54,3 @@ glabel func_809F50EC /* 01EEC 809F51AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01EF0 809F51B0 03E00008 */ jr $ra /* 01EF4 809F51B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s index 1f4d5844a8..369c25187b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_809F605C + .word 0x4622F983 +glabel D_809F6060 + .float 3.14159274101 + +glabel D_809F6064 + .float 3.14159274101 + +.text glabel func_809F51B8 /* 01EF8 809F51B8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01EFC 809F51BC AFBF0034 */ sw $ra, 0x0034($sp) @@ -187,5 +197,3 @@ glabel func_809F51B8 /* 021AC 809F546C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 021B0 809F5470 03E00008 */ jr $ra /* 021B4 809F5474 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s index 29d6d50963..332d806da9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s @@ -42,5 +42,3 @@ glabel func_809F5478 /* 02250 809F5510 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02254 809F5514 03E00008 */ jr $ra /* 02258 809F5518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s index 50451e6230..a5ba2077a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F6068 + .word 0x4622F983 + +.text glabel func_809F551C /* 0225C 809F551C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 02260 809F5520 AFB00020 */ sw $s0, 0x0020($sp) @@ -70,5 +75,3 @@ glabel func_809F551C /* 02354 809F5614 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02358 809F5618 03E00008 */ jr $ra /* 0235C 809F561C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s index c5b6e90e63..244e0bc80a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809F5F94 + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +glabel D_809F5FA8 + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +.text glabel func_809F58E4 /* 02624 809F58E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02628 809F58E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -65,5 +75,3 @@ glabel func_809F58E4 /* 02718 809F59D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0271C 809F59DC 03E00008 */ jr $ra /* 02720 809F59E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s index 40ce27922b..9f8ce3be64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s @@ -35,5 +35,3 @@ glabel func_809F59E4 /* 027A0 809F5A60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 027A4 809F5A64 03E00008 */ jr $ra /* 027A8 809F5A68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s index 4a28bd9d6b..71ba0fbdeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809F5FBC + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +glabel D_809F5FD0 + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +glabel D_809F5FE4 + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +.late_rodata +glabel D_809F6088 + .float 0.01 + +.text glabel func_809F5A6C /* 027AC 809F5A6C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 027B0 809F5A70 3C0F809F */ lui $t7, %hi(D_809F5E94) ## $t7 = 809F0000 @@ -140,5 +158,3 @@ glabel func_809F5A6C /* 029CC 809F5C8C 8FB20028 */ lw $s2, 0x0028($sp) /* 029D0 809F5C90 03E00008 */ jr $ra /* 029D4 809F5C94 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s index 60acf0d0c5..ad2dd1be96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809F5FF8 + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +glabel D_809F600C + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +glabel D_809F6020 + .asciz "../z_en_dnt_nomal.c" + .balign 4 + +.late_rodata +glabel D_809F608C + .float 0.01 + +.text glabel func_809F5C98 /* 029D8 809F5C98 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 029DC 809F5C9C AFB20028 */ sw $s2, 0x0028($sp) @@ -70,4 +88,3 @@ glabel func_809F5C98 /* 02AE4 809F5DA4 03E00008 */ jr $ra /* 02AE8 809F5DA8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 02AEC 809F5DAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s index d9b75984ad..ba1c2a8634 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s @@ -10,5 +10,3 @@ glabel EnDodojr_Destroy /* 00104 809F64C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00108 809F64C8 03E00008 */ jr $ra /* 0010C 809F64CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s index 3cc351a38b..0dbf4b20f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s @@ -34,4 +34,3 @@ glabel EnDodojr_Draw /* 01AC4 809F7E84 00000000 */ nop /* 01AC8 809F7E88 00000000 */ nop /* 01ACC 809F7E8C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s index fc35d989f9..3b9965c1ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s @@ -63,5 +63,3 @@ glabel EnDodojr_Init /* 000DC 809F649C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000E0 809F64A0 03E00008 */ jr $ra /* 000E4 809F64A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s index 631e709cab..6c4f7868d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s @@ -51,5 +51,3 @@ glabel EnDodojr_Update /* 01984 809F7D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01988 809F7D48 03E00008 */ jr $ra /* 0198C 809F7D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s index f6a25f1aea..f0f6095371 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s @@ -16,5 +16,3 @@ glabel func_809F64D0 /* 00144 809F6504 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00148 809F6508 03E00008 */ jr $ra /* 0014C 809F650C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s index b530d3ea50..e9080da218 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s @@ -144,5 +144,3 @@ glabel func_809F6510 /* 00364 809F6724 8FBE0068 */ lw $s8, 0x0068($sp) /* 00368 809F6728 03E00008 */ jr $ra /* 0036C 809F672C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s index cb754c42e9..73b34bf195 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s @@ -100,5 +100,3 @@ glabel func_809F6730 /* 004E4 809F68A4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 004E8 809F68A8 03E00008 */ jr $ra /* 004EC 809F68AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s index fbe2baf037..506006d569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s @@ -61,5 +61,3 @@ glabel func_809F68B0 /* 005C8 809F6988 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005CC 809F698C 03E00008 */ jr $ra /* 005D0 809F6990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s index 701d6b8224..e64d0c5624 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_809F7F70 + .word 0x40266666 +glabel D_809F7F74 + .float -0.8 + +.text glabel func_809F6994 /* 005D4 809F6994 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 005D8 809F6998 AFA40028 */ sw $a0, 0x0028($sp) @@ -36,5 +43,3 @@ glabel func_809F6994 /* 00654 809F6A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00658 809F6A18 03E00008 */ jr $ra /* 0065C 809F6A1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s index d57a7cc05c..c83c08bd12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F78 + .float -0.8 + +.text glabel func_809F6A20 /* 00660 809F6A20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00664 809F6A24 AFB00028 */ sw $s0, 0x0028($sp) @@ -43,5 +48,3 @@ glabel func_809F6A20 /* 006F8 809F6AB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 006FC 809F6ABC 03E00008 */ jr $ra /* 00700 809F6AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s index 20457c5aa6..6bddd3bc99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F7C + .float -0.8 + +.text glabel func_809F6AC4 /* 00704 809F6AC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00708 809F6AC8 AFA40028 */ sw $a0, 0x0028($sp) @@ -30,5 +35,3 @@ glabel func_809F6AC4 /* 0076C 809F6B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00770 809F6B30 03E00008 */ jr $ra /* 00774 809F6B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s index b03d56ec9a..91e7cb51b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F80 + .float -0.8 + +.text glabel func_809F6B38 /* 00778 809F6B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0077C 809F6B3C AFA40028 */ sw $a0, 0x0028($sp) @@ -34,5 +39,3 @@ glabel func_809F6B38 /* 007F0 809F6BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007F4 809F6BB4 03E00008 */ jr $ra /* 007F8 809F6BB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s index 826e8df94b..322a32879c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F84 + .float -0.8 + +.text glabel func_809F6BBC /* 007FC 809F6BBC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 00800 809F6BC0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE @@ -25,5 +30,3 @@ glabel func_809F6BBC /* 00858 809F6C18 8C4A0008 */ lw $t2, 0x0008($v0) ## 0000002C /* 0085C 809F6C1C 03E00008 */ jr $ra /* 00860 809F6C20 AC8A01F8 */ sw $t2, 0x01F8($a0) ## 000001F8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s index 4698bfb039..db789f418c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F88 + .float -0.8 + +.text glabel func_809F6C24 /* 00864 809F6C24 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00868 809F6C28 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -33,5 +38,3 @@ glabel func_809F6C24 /* 008D8 809F6C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 008DC 809F6C9C 03E00008 */ jr $ra /* 008E0 809F6CA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s index 09cbde6676..6339c9a6b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s @@ -82,5 +82,3 @@ glabel func_809F6CA4 .L809F6DC8: /* 00A08 809F6DC8 03E00008 */ jr $ra /* 00A0C 809F6DCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s index b7e5993acc..4f29589629 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s @@ -37,5 +37,3 @@ glabel func_809F6DD0 /* 00A88 809F6E48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A8C 809F6E4C 03E00008 */ jr $ra /* 00A90 809F6E50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s index d9fcc02cc1..c9efb69945 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s @@ -147,5 +147,3 @@ glabel func_809F6E54 /* 00CA0 809F7060 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 00CA4 809F7064 03E00008 */ jr $ra /* 00CA8 809F7068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s index eb5c9cde59..2fe07df412 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s @@ -12,5 +12,3 @@ glabel func_809F706C .L809F7094: /* 00CD4 809F7094 03E00008 */ jr $ra /* 00CD8 809F7098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s index 4ceb5bc738..d09352435f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s @@ -19,5 +19,3 @@ glabel func_809F709C /* 00D1C 809F70DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D20 809F70E0 03E00008 */ jr $ra /* 00D24 809F70E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s index 217bcbb80f..cce2a99a81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s @@ -122,5 +122,3 @@ glabel func_809F70E8 /* 00ED8 809F7298 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00EDC 809F729C 03E00008 */ jr $ra /* 00EE0 809F72A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s index 29b24c1c97..4b04c1a1a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s @@ -75,5 +75,3 @@ glabel func_809F72A4 /* 00FE0 809F73A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FE4 809F73A4 03E00008 */ jr $ra /* 00FE8 809F73A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s index 32cd3047d3..86a6030b1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s @@ -74,5 +74,3 @@ glabel func_809F73AC /* 010F8 809F74B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 010FC 809F74BC 03E00008 */ jr $ra /* 01100 809F74C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s index eaf7b3e0f4..a5175e02d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F8C + .word 0x40266666 + +.text glabel func_809F74C4 /* 01104 809F74C4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01108 809F74C8 AFB00020 */ sw $s0, 0x0020($sp) @@ -51,5 +56,3 @@ glabel func_809F74C4 /* 011C0 809F7580 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 011C4 809F7584 03E00008 */ jr $ra /* 011C8 809F7588 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s index d715987a0d..45d2895c23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s @@ -73,5 +73,3 @@ glabel func_809F758C /* 012C0 809F7680 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 012C4 809F7684 03E00008 */ jr $ra /* 012C8 809F7688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s index c4ed626748..006d4c3947 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s @@ -47,5 +47,3 @@ glabel func_809F768C /* 01370 809F7730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01374 809F7734 03E00008 */ jr $ra /* 01378 809F7738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s index bde0078404..5ccdc1e522 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s @@ -30,5 +30,3 @@ glabel func_809F773C /* 013E0 809F77A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013E4 809F77A4 03E00008 */ jr $ra /* 013E8 809F77A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s index 99e241f318..9e7c24afb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809F7F90 + .float 1.2 + +.text glabel func_809F77AC /* 013EC 809F77AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 013F0 809F77B0 AFBF001C */ sw $ra, 0x001C($sp) @@ -41,5 +46,3 @@ glabel func_809F77AC /* 01480 809F7840 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01484 809F7844 03E00008 */ jr $ra /* 01488 809F7848 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s index c19d546b27..3a4533f71e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s @@ -7,5 +7,3 @@ glabel func_809F784C /* 014A0 809F7860 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014A4 809F7864 03E00008 */ jr $ra /* 014A8 809F7868 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s index e1c123abbf..c55e5659a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s @@ -33,5 +33,3 @@ glabel func_809F786C /* 01520 809F78E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01524 809F78E4 03E00008 */ jr $ra /* 01528 809F78E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s index 380b4aaf80..7282647454 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s @@ -48,5 +48,3 @@ glabel func_809F78EC /* 015D0 809F7990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015D4 809F7994 03E00008 */ jr $ra /* 015D8 809F7998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s index 4cfecb877e..36a004eb4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s @@ -25,5 +25,3 @@ glabel func_809F799C /* 01634 809F79F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01638 809F79F8 03E00008 */ jr $ra /* 0163C 809F79FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s index bc311fea76..97b3b45ebb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s @@ -51,5 +51,3 @@ glabel func_809F7A00 /* 016EC 809F7AAC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 016F0 809F7AB0 03E00008 */ jr $ra /* 016F4 809F7AB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s index ffca235339..2e73b2bc4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s @@ -34,5 +34,3 @@ glabel func_809F7AB8 /* 01770 809F7B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01774 809F7B34 03E00008 */ jr $ra /* 01778 809F7B38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s index 1466211820..7cb2366496 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s @@ -45,5 +45,3 @@ glabel func_809F7B3C /* 01818 809F7BD8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0181C 809F7BDC 03E00008 */ jr $ra /* 01820 809F7BE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s index a5ce059e6d..ea31351c45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s @@ -29,5 +29,3 @@ glabel func_809F7BE4 /* 0187C 809F7C3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01880 809F7C40 03E00008 */ jr $ra /* 01884 809F7C44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s index 8006b490bb..79e8e9617f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s @@ -20,5 +20,3 @@ glabel func_809F7C48 /* 018C4 809F7C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018C8 809F7C88 03E00008 */ jr $ra /* 018CC 809F7C8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s index f1173f1984..b90be2a9f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s @@ -44,5 +44,3 @@ glabel func_809F7D50 /* 01A30 809F7DF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 01A34 809F7DF4 03E00008 */ jr $ra /* 01A38 809F7DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s index 8446b99de0..e87e501eef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s @@ -4,5 +4,3 @@ glabel func_809F7DFC /* 01A44 809F7E04 AFA60008 */ sw $a2, 0x0008($sp) /* 01A48 809F7E08 03E00008 */ jr $ra /* 01A4C 809F7E0C AFA7000C */ sw $a3, 0x000C($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s index e9d6dd7ed5..1f880aeec8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s @@ -23,5 +23,3 @@ glabel EnDodongo_Destroy /* 00770 809F89C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00774 809F89C4 03E00008 */ jr $ra /* 00778 809F89C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s index 282f17cdb6..6892bdac72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809FAC74 + .word 0x3FE66666, 0x00000000, 0x00000000 + +.text glabel EnDodongo_Draw /* 02338 809FA588 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0233C 809FA58C AFB00038 */ sw $s0, 0x0038($sp) @@ -61,5 +66,3 @@ glabel EnDodongo_Draw /* 02418 809FA668 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0241C 809FA66C 03E00008 */ jr $ra /* 02420 809FA670 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s index c5bd59c09e..4b2a59a503 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s @@ -141,5 +141,3 @@ glabel EnDodongo_Init /* 00710 809F8960 8FB10028 */ lw $s1, 0x0028($sp) /* 00714 809F8964 03E00008 */ jr $ra /* 00718 809F8968 27BD01F8 */ addiu $sp, $sp, 0x01F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s index 32256e16ed..6862b2c73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s @@ -126,5 +126,3 @@ glabel EnDodongo_Update /* 01E9C 809FA0EC 8FB0001C */ lw $s0, 0x001C($sp) /* 01EA0 809FA0F0 03E00008 */ jr $ra /* 01EA4 809FA0F4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8250.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8250.s index 65837e4372..dff644fc3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8250.s @@ -1,5 +1,3 @@ glabel func_809F8250 /* 00000 809F8250 03E00008 */ jr $ra /* 00004 809F8254 AC850308 */ sw $a1, 0x0308($a0) ## 00000308 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8258.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8258.s index 3b870c0dd3..30602fef72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8258.s @@ -1,3 +1,50 @@ +.late_rodata +glabel D_809FAB60 + .float 0.02 + +glabel D_809FAB64 + .float 0.1 + +glabel D_809FAB68 + .float 0.15 + +glabel D_809FAB6C + .float 0.1 + +glabel D_809FAB70 + .float 0.15 + +glabel D_809FAB74 + .float 0.02 + +glabel D_809FAB78 + .float 0.1 + +glabel D_809FAB7C + .float 0.15 + +glabel D_809FAB80 + .float 0.1 + +glabel D_809FAB84 + .float 0.15 + +glabel D_809FAB88 + .float 0.02 + +glabel D_809FAB8C + .float 0.1 + +glabel D_809FAB90 + .float 0.15 + +glabel D_809FAB94 + .float 0.1 + +glabel D_809FAB98 + .float 0.15 + +.text glabel func_809F8258 /* 00008 809F8258 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 0000C 809F825C 3C0F80A0 */ lui $t7, %hi(D_809FA9FC) ## $t7 = 80A00000 @@ -337,5 +384,3 @@ glabel func_809F8258 /* 004EC 809F873C 8FB00040 */ lw $s0, 0x0040($sp) /* 004F0 809F8740 03E00008 */ jr $ra /* 004F4 809F8744 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s index afede657dd..841c78c217 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s @@ -26,5 +26,3 @@ glabel func_809F89CC /* 007D8 809F8A28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007DC 809F8A2C 03E00008 */ jr $ra /* 007E0 809F8A30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s index 58ce759861..139278b8cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s @@ -43,5 +43,3 @@ glabel func_809F8A34 /* 0087C 809F8ACC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00880 809F8AD0 03E00008 */ jr $ra /* 00884 809F8AD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s index 273a6a8487..1da7daf87f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s @@ -20,5 +20,3 @@ glabel func_809F8AD8 /* 008D0 809F8B20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008D4 809F8B24 03E00008 */ jr $ra /* 008D8 809F8B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s index e714078bdb..3007eded02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s @@ -19,5 +19,3 @@ glabel func_809F8B2C /* 00920 809F8B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00924 809F8B74 03E00008 */ jr $ra /* 00928 809F8B78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s index d363280790..2a7489e032 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s @@ -32,5 +32,3 @@ glabel func_809F8B7C /* 009A0 809F8BF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 009A4 809F8BF4 03E00008 */ jr $ra /* 009A8 809F8BF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s index f6431fa2cc..cc2b74a5a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s @@ -40,5 +40,3 @@ glabel func_809F8BFC /* 00A38 809F8C88 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A3C 809F8C8C 03E00008 */ jr $ra /* 00A40 809F8C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8C94.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8C94.s index 91da534c63..8c226dc053 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8C94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8C94.s @@ -34,5 +34,3 @@ glabel func_809F8C94 /* 00AB0 809F8D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AB4 809F8D04 03E00008 */ jr $ra /* 00AB8 809F8D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D0C.s index 681c77eeb2..9584685a6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D0C.s @@ -21,5 +21,3 @@ glabel func_809F8D0C /* 00AFC 809F8D4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B00 809F8D50 03E00008 */ jr $ra /* 00B04 809F8D54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s index 8327f60158..decda74532 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s @@ -124,5 +124,3 @@ glabel func_809F8D58 /* 00CD0 809F8F20 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00CD4 809F8F24 03E00008 */ jr $ra /* 00CD8 809F8F28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8F2C.s index c53c25d916..6c6254f5ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8F2C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809FAB9C + .word 0xBDCCCCCD + +.text glabel func_809F8F2C /* 00CDC 809F8F2C 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00CE0 809F8F30 3C0F80A0 */ lui $t7, %hi(D_809FAA38) ## $t7 = 80A00000 @@ -344,5 +349,3 @@ glabel func_809F8F2C /* 011C8 809F9418 8FB30048 */ lw $s3, 0x0048($sp) /* 011CC 809F941C 03E00008 */ jr $ra /* 011D0 809F9420 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9424.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9424.s index 54a3117288..b63f9449b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9424.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809FABA0 + .float 0.7 + +.text glabel func_809F9424 /* 011D4 809F9424 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 011D8 809F9428 AFBF0034 */ sw $ra, 0x0034($sp) @@ -231,5 +236,3 @@ glabel func_809F9424 /* 01504 809F9754 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01508 809F9758 03E00008 */ jr $ra /* 0150C 809F975C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s index 4711e272cb..ccaf188499 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s @@ -24,5 +24,3 @@ glabel func_809F9760 /* 01564 809F97B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01568 809F97B8 03E00008 */ jr $ra /* 0156C 809F97BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s index cff26824a9..43794b0982 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s @@ -191,5 +191,3 @@ glabel func_809F97C0 /* 01824 809F9A74 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01828 809F9A78 03E00008 */ jr $ra /* 0182C 809F9A7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s index d1e9240312..0f0fd6ce54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s @@ -30,5 +30,3 @@ glabel func_809F9A80 /* 0189C 809F9AEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018A0 809F9AF0 03E00008 */ jr $ra /* 018A4 809F9AF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9AF8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9AF8.s index af74ab357f..04206dcfc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9AF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9AF8.s @@ -91,5 +91,3 @@ glabel func_809F9AF8 /* 019E0 809F9C30 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 019E4 809F9C34 03E00008 */ jr $ra /* 019E8 809F9C38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9C3C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9C3C.s index 373231fb3d..dc5efcd158 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9C3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9C3C.s @@ -27,5 +27,3 @@ glabel func_809F9C3C /* 01A44 809F9C94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A48 809F9C98 03E00008 */ jr $ra /* 01A4C 809F9C9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9CA0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9CA0.s index 083aac2ef1..16bb22978d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9CA0.s @@ -81,5 +81,3 @@ glabel func_809F9CA0 /* 01B6C 809F9DBC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B70 809F9DC0 03E00008 */ jr $ra /* 01B74 809F9DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9DC8.s index f0e95e7b19..8febba1ff3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9DC8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809FABA4 + .float 0.08 + +glabel D_809FABA8 + .word 0x45ABE000 + +.text glabel func_809F9DC8 /* 01B78 809F9DC8 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01B7C 809F9DCC 3C0F80A0 */ lui $t7, %hi(D_809FAA6C) ## $t7 = 80A00000 @@ -90,5 +98,3 @@ glabel func_809F9DC8 /* 01CD8 809F9F28 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 01CDC 809F9F2C 03E00008 */ jr $ra /* 01CE0 809F9F30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA0F8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA0F8.s index a6dd5fa53e..5d208ac87e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA0F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA0F8.s @@ -22,5 +22,3 @@ glabel func_809FA0F8 /* 01EF0 809FA140 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 01EF4 809FA144 03E00008 */ jr $ra /* 01EF8 809FA148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s index f1ccc88cc6..f1e0fefa58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s @@ -1,3 +1,58 @@ +.late_rodata +glabel jtbl_809FABAC +.word L809FA2E4 +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA338 +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA40C +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA494 +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4BC +.word L809FA4AC +glabel jtbl_809FAC18 +.word L809FA4F0 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA504 +.word L809FA50C +.word L809FA514 +.word L809FA51C +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA534 +.word L809FA524 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA540 +.word L809FA53C +.word L809FA52C + +.text glabel func_809FA14C /* 01EFC 809FA14C 27BDFE78 */ addiu $sp, $sp, 0xFE78 ## $sp = FFFFFE78 /* 01F00 809FA150 3C0E80A0 */ lui $t6, %hi(D_809FAA9C) ## $t6 = 80A00000 @@ -295,5 +350,3 @@ glabel L809FA540 /* 0232C 809FA57C 8FB60038 */ lw $s6, 0x0038($sp) /* 02330 809FA580 03E00008 */ jr $ra /* 02334 809FA584 27BD0188 */ addiu $sp, $sp, 0x0188 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA674.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA674.s index 13cf73b228..f4cd421708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA674.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA674.s @@ -26,5 +26,3 @@ glabel func_809FA674 /* 0247C 809FA6CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02480 809FA6D0 03E00008 */ jr $ra /* 02484 809FA6D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA6D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA6D8.s index c7934bed7d..3379a696c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA6D8.s @@ -64,4 +64,3 @@ glabel func_809FA6D8 /* 02564 809FA7B4 00000000 */ nop /* 02568 809FA7B8 00000000 */ nop /* 0256C 809FA7BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Destroy.s index 9cb22ef8a3..724ce687ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Destroy.s @@ -13,5 +13,3 @@ glabel EnDoor_Destroy .L809FC414: /* 00244 809FC414 03E00008 */ jr $ra /* 00248 809FC418 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s index 3555dec3a6..6b3dc04cc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809FCF10 + .asciz "../z_en_door.c" + .balign 4 + +glabel D_809FCF20 + .asciz "../z_en_door.c" + .balign 4 + +.text glabel EnDoor_Draw /* 00B9C 809FCD6C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00BA0 809FCD70 AFBF0024 */ sw $ra, 0x0024($sp) @@ -74,4 +84,3 @@ glabel EnDoor_Draw /* 00CA4 809FCE74 00000000 */ nop /* 00CA8 809FCE78 00000000 */ nop /* 00CAC 809FCE7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s index 493a5ccb58..ef9c665766 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s @@ -151,5 +151,3 @@ glabel EnDoor_Init /* 0020C 809FC3DC 8FB10038 */ lw $s1, 0x0038($sp) /* 00210 809FC3E0 03E00008 */ jr $ra /* 00214 809FC3E4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Update.s index e5025ae689..2ba555a01d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Update.s @@ -8,5 +8,3 @@ glabel EnDoor_Update /* 00A60 809FCC30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A64 809FCC34 03E00008 */ jr $ra /* 00A68 809FCC38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s index 39eb363db1..e4bc5631fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s @@ -118,5 +118,3 @@ glabel func_809FC41C /* 003F4 809FC5C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003F8 809FC5C8 03E00008 */ jr $ra /* 003FC 809FC5CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s index 86edd0606e..6ae0fa2a1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s @@ -185,5 +185,3 @@ glabel func_809FC5D0 /* 0069C 809FC86C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 006A0 809FC870 03E00008 */ jr $ra /* 006A4 809FC874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC878.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC878.s index fb20203099..33d48e5fae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC878.s @@ -19,5 +19,3 @@ glabel func_809FC878 /* 006E4 809FC8B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E8 809FC8B8 03E00008 */ jr $ra /* 006EC 809FC8BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8C0.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8C0.s index ecd9bc04ed..b70efb9417 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8C0.s @@ -13,5 +13,3 @@ glabel func_809FC8C0 /* 00718 809FC8E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0071C 809FC8EC 03E00008 */ jr $ra /* 00720 809FC8F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8F4.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8F4.s index 2f3106105b..caa806b534 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC8F4.s @@ -13,5 +13,3 @@ glabel func_809FC8F4 .L809FC920: /* 00750 809FC920 03E00008 */ jr $ra /* 00754 809FC924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC928.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC928.s index 464aafa6d4..a26e10257f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC928.s @@ -30,5 +30,3 @@ glabel func_809FC928 /* 007BC 809FC98C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007C0 809FC990 03E00008 */ jr $ra /* 007C4 809FC994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC998.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC998.s index 106b4ca5f2..94b4ef6b02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC998.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC998.s @@ -18,5 +18,3 @@ glabel func_809FC998 /* 00800 809FC9D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00804 809FC9D4 03E00008 */ jr $ra /* 00808 809FC9D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s index 7b2c21e1e2..fda03cac05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809FCF30 + .float 0.15 + +.text glabel func_809FC9DC /* 0080C 809FC9DC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00810 809FC9E0 AFBF0054 */ sw $ra, 0x0054($sp) @@ -159,5 +164,3 @@ glabel func_809FC9DC /* 00A3C 809FCC0C 8FB40050 */ lw $s4, 0x0050($sp) /* 00A40 809FCC10 03E00008 */ jr $ra /* 00A44 809FCC14 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FCC3C.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FCC3C.s index 6cc07da817..fab3774ab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FCC3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FCC3C.s @@ -82,5 +82,3 @@ glabel func_809FCC3C /* 00B90 809FCD60 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00B94 809FCD64 03E00008 */ jr $ra /* 00B98 809FCD68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s index ffe7e0b9c4..ac77f15396 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s @@ -14,5 +14,3 @@ glabel EnDu_Destroy /* 00778 809FE3A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0077C 809FE3AC 03E00008 */ jr $ra /* 00780 809FE3B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s index c8f0f9709a..46195d543a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809FF440 + .asciz "../z_en_du.c" + .balign 4 + +glabel D_809FF450 + .asciz "../z_en_du.c" + .balign 4 + +.text glabel EnDu_Draw /* 01444 809FF074 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01448 809FF078 AFBF0024 */ sw $ra, 0x0024($sp) @@ -102,4 +112,3 @@ glabel EnDu_Draw /* 015D4 809FF204 00000000 */ nop /* 015D8 809FF208 00000000 */ nop /* 015DC 809FF20C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s index 5688b34b71..e459191dc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s @@ -126,5 +126,3 @@ glabel EnDu_Init /* 00740 809FE370 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00744 809FE374 03E00008 */ jr $ra /* 00748 809FE378 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s index d164e7a99e..338a5c2afa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s @@ -104,5 +104,3 @@ glabel EnDu_Update /* 01268 809FEE98 8FB10020 */ lw $s1, 0x0020($sp) /* 0126C 809FEE9C 03E00008 */ jr $ra /* 01270 809FEEA0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s index 61c165d6b8..a1f3ff2d44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s @@ -1,5 +1,3 @@ glabel func_809FDC30 /* 00000 809FDC30 03E00008 */ jr $ra /* 00004 809FDC34 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s index d953409013..aab0db27f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s @@ -44,5 +44,3 @@ glabel func_809FDC38 /* 000A0 809FDCD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000A4 809FDCD4 03E00008 */ jr $ra /* 000A8 809FDCD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s index 73dcc797a9..777aca98df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_809FF460 +.word L809FDDA0 +.word L809FDDA0 +.word L809FDD14 +.word L809FDDA0 +.word L809FDDA0 +.word L809FDDA0 +.word L809FDD88 +.word L809FDDA0 +.word L809FDDA0 +.word L809FDDA0 + +.text glabel func_809FDCDC /* 000AC 809FDCDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 000B0 809FDCE0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -61,5 +75,3 @@ glabel L809FDDA0 /* 00178 809FDDA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0017C 809FDDAC 03E00008 */ jr $ra /* 00180 809FDDB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s index 723e4b2497..9b4ae98902 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s @@ -30,5 +30,3 @@ glabel func_809FDDB4 .L809FDE1C: /* 001EC 809FDE1C 03E00008 */ jr $ra /* 001F0 809FDE20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s index a056bf898c..af9e75bc7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s @@ -31,5 +31,3 @@ glabel func_809FDE24 /* 00260 809FDE90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00264 809FDE94 03E00008 */ jr $ra /* 00268 809FDE98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s index 9622228164..0f09f09617 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s @@ -88,5 +88,3 @@ glabel func_809FDE9C /* 00384 809FDFB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00388 809FDFB8 03E00008 */ jr $ra /* 0038C 809FDFBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s index 3d3d4140a7..7c1eaac142 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s @@ -15,5 +15,3 @@ glabel func_809FDFC0 /* 003C4 809FDFF4 468084A0 */ cvt.s.w $f18, $f16 /* 003C8 809FDFF8 03E00008 */ jr $ra /* 003CC 809FDFFC E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s index 8120250038..0a0a62ca07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s @@ -15,5 +15,3 @@ glabel func_809FE000 /* 00404 809FE034 468084A0 */ cvt.s.w $f18, $f16 /* 00408 809FE038 03E00008 */ jr $ra /* 0040C 809FE03C E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s index e6390684f3..405e7253f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s @@ -50,5 +50,3 @@ glabel func_809FE040 /* 004C8 809FE0F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 004CC 809FE0FC 03E00008 */ jr $ra /* 004D0 809FE100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s index 9cca870760..09ffff1946 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s @@ -43,5 +43,3 @@ glabel func_809FE104 /* 00570 809FE1A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00574 809FE1A4 03E00008 */ jr $ra /* 00578 809FE1A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s index f11d119679..dfac861173 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s @@ -2,5 +2,3 @@ glabel func_809FE3B4 /* 00784 809FE3B4 AFA40000 */ sw $a0, 0x0000($sp) /* 00788 809FE3B8 03E00008 */ jr $ra /* 0078C 809FE3BC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s index 62ee25fe69..90cd0b7296 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s @@ -59,5 +59,3 @@ glabel func_809FE3C0 /* 00868 809FE498 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0086C 809FE49C 03E00008 */ jr $ra /* 00870 809FE4A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s index 7caa05153a..aaf114968b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s @@ -106,5 +106,3 @@ glabel func_809FE4A4 /* 009FC 809FE62C 8FB10020 */ lw $s1, 0x0020($sp) /* 00A00 809FE630 03E00008 */ jr $ra /* 00A04 809FE634 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s index 7c6208175a..736f3c18e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s @@ -37,5 +37,3 @@ glabel func_809FE638 /* 00A90 809FE6C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A94 809FE6C4 03E00008 */ jr $ra /* 00A98 809FE6C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s index 9a06a07487..d677ddd43c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s @@ -31,5 +31,3 @@ glabel func_809FE6CC /* 00B04 809FE734 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B08 809FE738 03E00008 */ jr $ra /* 00B0C 809FE73C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s index 9968a01cf6..2150ba21b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s @@ -22,5 +22,3 @@ glabel func_809FE740 /* 00B5C 809FE78C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B60 809FE790 03E00008 */ jr $ra /* 00B64 809FE794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s index 508a1c5cf4..4753ed1c2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s @@ -74,5 +74,3 @@ glabel func_809FE798 /* 00C54 809FE884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C58 809FE888 03E00008 */ jr $ra /* 00C5C 809FE88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s index 7dc574dd2b..fa276c5a97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s @@ -170,5 +170,3 @@ glabel func_809FE890 /* 00ECC 809FEAFC 8FB10018 */ lw $s1, 0x0018($sp) /* 00ED0 809FEB00 03E00008 */ jr $ra /* 00ED4 809FEB04 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s index ab32e1a453..bab0150196 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s @@ -70,5 +70,3 @@ glabel func_809FEB08 /* 00FD8 809FEC08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FDC 809FEC0C 03E00008 */ jr $ra /* 00FE0 809FEC10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s index ec208d6351..2ac8bad56d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s @@ -23,5 +23,3 @@ glabel func_809FEC14 /* 01034 809FEC64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01038 809FEC68 03E00008 */ jr $ra /* 0103C 809FEC6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s index 61f2edb209..b880423608 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s @@ -30,5 +30,3 @@ glabel func_809FEC70 /* 010A8 809FECD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 010AC 809FECDC 03E00008 */ jr $ra /* 010B0 809FECE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s index dc39281574..57054716ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s @@ -14,5 +14,3 @@ glabel func_809FECE4 /* 010E0 809FED10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010E4 809FED14 03E00008 */ jr $ra /* 010E8 809FED18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s index 80c2bf024d..2186238a48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809FF488 + .float 3.14159274101 + +glabel D_809FF48C + .float 3.14159274101 + +glabel D_809FF490 + .float 3.14159274101 + +glabel D_809FF494 + .float 3.14159274101 + +.text glabel func_809FEEA4 /* 01274 809FEEA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01278 809FEEA8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 @@ -94,5 +108,3 @@ glabel func_809FEEA4 /* 013DC 809FF00C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 013E0 809FF010 03E00008 */ jr $ra /* 013E4 809FF014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s index 1a086fea42..e70e7d1efa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s @@ -23,5 +23,3 @@ glabel func_809FF018 /* 01438 809FF068 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0143C 809FF06C 03E00008 */ jr $ra /* 01440 809FF070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Destroy.s index ff95ee12f5..f50309172f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Destroy.s @@ -2,5 +2,3 @@ glabel EnDyExtra_Destroy /* 00000 809FF6F0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 809FF6F4 03E00008 */ jr $ra /* 00008 809FF6F8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s index 9ac1a88bd8..37d30324d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809FFCA4 + .asciz "../z_en_dy_extra.c" + .balign 4 + +glabel D_809FFCB8 + .asciz "../z_en_dy_extra.c" + .balign 4 + +glabel D_809FFCCC + .asciz "../z_en_dy_extra.c" + .balign 4 + +.text glabel EnDyExtra_Draw /* 00274 809FF964 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 /* 00278 809FF968 24E7BFB0 */ addiu $a3, $a3, 0xBFB0 ## $a3 = 0601BFB0 @@ -176,4 +190,3 @@ glabel EnDyExtra_Draw /* 00524 809FFC14 00000000 */ nop /* 00528 809FFC18 00000000 */ nop /* 0052C 809FFC1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Init.s index 1d7ffb4096..b52c83a5c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Init.s @@ -1,3 +1,22 @@ +.rdata +glabel D_809FFC70 + .asciz "\n\n" + .balign 4 + +glabel D_809FFC74 + .asciz "☆☆☆☆☆ 大妖精効果 ☆☆☆☆☆ %d\n" + .balign 4 + +.late_rodata +glabel D_809FFCE0 + .float 0.025 + +glabel D_809FFCE4 + .word 0x3D1FBE77 +glabel D_809FFCE8 + .word 0xBE4CCCCD + +.text glabel EnDyExtra_Init /* 0000C 809FF6FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00010 809FF700 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -45,5 +64,3 @@ glabel EnDyExtra_Init /* 000B0 809FF7A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B4 809FF7A4 03E00008 */ jr $ra /* 000B8 809FF7A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Update.s index 70eec2e8d0..8bbdbcd3c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Update.s @@ -29,5 +29,3 @@ glabel EnDyExtra_Update /* 00268 809FF958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0026C 809FF95C 03E00008 */ jr $ra /* 00270 809FF960 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF7AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF7AC.s index d5dc9bf74f..ebde193528 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF7AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF7AC.s @@ -40,5 +40,3 @@ glabel func_809FF7AC /* 00144 809FF834 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00148 809FF838 03E00008 */ jr $ra /* 0014C 809FF83C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF840.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF840.s index cf957a18b3..969b1aa454 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF840.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/func_809FF840.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809FFCEC + .float 0.02 + +.text glabel func_809FF840 /* 00150 809FF840 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00154 809FF844 AFB00018 */ sw $s0, 0x0018($sp) @@ -51,5 +56,3 @@ glabel func_809FF840 /* 001FC 809FF8EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00200 809FF8F0 03E00008 */ jr $ra /* 00204 809FF8F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s index 2fbec8e4a5..f2239ec4ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s @@ -10,5 +10,3 @@ glabel EnEiyer_Destroy /* 001F8 80A00198 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001FC 80A0019C 03E00008 */ jr $ra /* 00200 80A001A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s index 226326c8c6..25dcfa4e88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A019D0 + .asciz "../z_en_eiyer.c" + .balign 4 + +glabel D_80A019E0 + .asciz "../z_en_eiyer.c" + .balign 4 + +.text glabel EnEiyer_Draw /* 0183C 80A017DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01840 80A017E0 AFB20030 */ sw $s2, 0x0030($sp) @@ -94,4 +104,3 @@ glabel EnEiyer_Draw /* 019A4 80A01944 03E00008 */ jr $ra /* 019A8 80A01948 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 019AC 80A0194C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s index 0a8126d5be..68c9fa996e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s @@ -136,5 +136,3 @@ glabel EnEiyer_Init /* 001D0 80A00170 8FB10038 */ lw $s1, 0x0038($sp) /* 001D4 80A00174 03E00008 */ jr $ra /* 001D8 80A00178 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s index c275bfcfaa..fd03afdb61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s @@ -154,5 +154,3 @@ glabel EnEiyer_Update /* 017E0 80A01780 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 017E4 80A01784 03E00008 */ jr $ra /* 017E8 80A01788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s index 57d7d4adfe..267a42a6f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s @@ -30,5 +30,3 @@ glabel func_80A001A4 /* 0026C 80A0020C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00270 80A00210 03E00008 */ jr $ra /* 00274 80A00214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s index 4e1a7d9142..b826d03ad9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s @@ -85,5 +85,3 @@ glabel func_80A00218 /* 003AC 80A0034C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003B0 80A00350 03E00008 */ jr $ra /* 003B4 80A00354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00358.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00358.s index 11591bfe6e..2ba787a7a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00358.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00358.s @@ -24,5 +24,3 @@ glabel func_80A00358 /* 00408 80A003A8 A0880299 */ sb $t0, 0x0299($a0) ## 00000299 /* 0040C 80A003AC 03E00008 */ jr $ra /* 00410 80A003B0 AC8C0004 */ sw $t4, 0x0004($a0) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003B4.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003B4.s index 44f71821b4..fa72d92719 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003B4.s @@ -9,5 +9,3 @@ glabel func_80A003B4 /* 00430 80A003D0 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 /* 00434 80A003D4 03E00008 */ jr $ra /* 00438 80A003D8 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s index d8dd88c611..d41da200f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s @@ -56,5 +56,3 @@ glabel func_80A003DC /* 00510 80A004B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00514 80A004B4 03E00008 */ jr $ra /* 00518 80A004B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s index 0310dfee90..644719f19a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A019F0 + .word 0xBEC90FDB + +.text glabel func_80A004BC /* 0051C 80A004BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00520 80A004C0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -30,5 +35,3 @@ glabel func_80A004BC /* 00588 80A00528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0058C 80A0052C 03E00008 */ jr $ra /* 00590 80A00530 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00534.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00534.s index afbcf62b87..ccd6ad9d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00534.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00534.s @@ -3,5 +3,3 @@ glabel func_80A00534 /* 00598 80A00538 25CE0E8C */ addiu $t6, $t6, %lo(func_80A00E8C) ## $t6 = 80A00E8C /* 0059C 80A0053C 03E00008 */ jr $ra /* 005A0 80A00540 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00544.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00544.s index 35442aa9c6..1be1ff1676 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00544.s @@ -16,5 +16,3 @@ glabel func_80A00544 /* 005DC 80A0057C A0990298 */ sb $t9, 0x0298($a0) ## 00000298 /* 005E0 80A00580 03E00008 */ jr $ra /* 005E4 80A00584 AC880190 */ sw $t0, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s index 642c0c0aff..f92b2ca4f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s @@ -29,5 +29,3 @@ glabel func_80A00588 /* 00654 80A005F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00658 80A005F8 03E00008 */ jr $ra /* 0065C 80A005FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s index b985adb8d5..6a0a2f62b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s @@ -44,5 +44,3 @@ glabel func_80A00600 /* 00704 80A006A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00708 80A006A8 03E00008 */ jr $ra /* 0070C 80A006AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s index c273b83170..e62f17c76f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s @@ -48,5 +48,3 @@ glabel func_80A006B0 /* 007C0 80A00760 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007C4 80A00764 03E00008 */ jr $ra /* 007C8 80A00768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0076C.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0076C.s index 11f185798e..e75931b26c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0076C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0076C.s @@ -9,5 +9,3 @@ glabel func_80A0076C /* 007E8 80A00788 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 007EC 80A0078C 03E00008 */ jr $ra /* 007F0 80A00790 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s index 7a8d9b5442..c78c015114 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s @@ -50,5 +50,3 @@ glabel func_80A00794 /* 008AC 80A0084C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 008B0 80A00850 03E00008 */ jr $ra /* 008B4 80A00854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s index 392f49a380..f650eaf4cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s @@ -21,5 +21,3 @@ glabel func_80A00858 /* 008F8 80A00898 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008FC 80A0089C 03E00008 */ jr $ra /* 00900 80A008A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008A4.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008A4.s index a1adc9b38f..959580833d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008A4.s @@ -12,5 +12,3 @@ glabel func_80A008A4 /* 00928 80A008C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0092C 80A008CC 03E00008 */ jr $ra /* 00930 80A008D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008D4.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008D4.s index 082adcf3aa..cba1ea0bb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A008D4.s @@ -32,5 +32,3 @@ glabel func_80A008D4 /* 009A4 80A00944 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009A8 80A00948 03E00008 */ jr $ra /* 009AC 80A0094C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s index a7815b9932..e11a095501 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A019F4 + .word 0x3F7D70A4 + +.text glabel func_80A00950 /* 009B0 80A00950 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 009B4 80A00954 AFB00018 */ sw $s0, 0x0018($sp) @@ -85,5 +90,3 @@ glabel func_80A00950 /* 00AD8 80A00A78 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00ADC 80A00A7C 03E00008 */ jr $ra /* 00AE0 80A00A80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00A84.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00A84.s index 4e4b16aa3b..f1e6cbe4a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00A84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00A84.s @@ -40,5 +40,3 @@ glabel func_80A00A84 /* 00B6C 80A00B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B70 80A00B10 03E00008 */ jr $ra /* 00B74 80A00B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s index a934711516..6d2718f49b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A019F8 + .word 0x3E858150 +glabel D_80A019FC + .float 0.8 + +.text glabel func_80A00B18 /* 00B78 80A00B18 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00B7C 80A00B1C AFB00020 */ sw $s0, 0x0020($sp) @@ -95,5 +102,3 @@ glabel func_80A00B18 /* 00CC4 80A00C64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00CC8 80A00C68 03E00008 */ jr $ra /* 00CCC 80A00C6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s index 656df3aa39..92f5f6719d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A01A00 + .word 0x3DA0D97C +glabel D_80A01A04 + .float 0.05 + +.text glabel func_80A00C70 /* 00CD0 80A00C70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00CD4 80A00C74 AFB00018 */ sw $s0, 0x0018($sp) @@ -153,5 +160,3 @@ glabel func_80A00C70 /* 00EE0 80A00E80 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00EE4 80A00E84 03E00008 */ jr $ra /* 00EE8 80A00E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s index f8ffea31da..d4bed04642 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s @@ -69,5 +69,3 @@ glabel func_80A00E8C /* 00FD8 80A00F78 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00FDC 80A00F7C 03E00008 */ jr $ra /* 00FE0 80A00F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00F84.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00F84.s index 23f4265cde..0a0dccfbbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00F84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A01A08 + .float 1.1 + +.text glabel func_80A00F84 /* 00FE4 80A00F84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00FE8 80A00F88 AFBF0014 */ sw $ra, 0x0014($sp) @@ -38,5 +43,3 @@ glabel func_80A00F84 /* 01064 80A01004 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01068 80A01008 03E00008 */ jr $ra /* 0106C 80A0100C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s index e70ce961ec..87b2ba6cec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s @@ -69,5 +69,3 @@ glabel func_80A01010 /* 01158 80A010F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0115C 80A010FC 03E00008 */ jr $ra /* 01160 80A01100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s index b9ac4d2223..473425ec56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A01A0C + .word 0x3F20D97C + +.text glabel func_80A01104 /* 01164 80A01104 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01168 80A01108 AFB00018 */ sw $s0, 0x0018($sp) @@ -87,5 +92,3 @@ glabel func_80A01104 /* 01294 80A01234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01298 80A01238 03E00008 */ jr $ra /* 0129C 80A0123C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s index 6e8066245d..fb237ce42b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s @@ -52,5 +52,3 @@ glabel func_80A01240 /* 01348 80A012E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0134C 80A012EC 03E00008 */ jr $ra /* 01350 80A012F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A012F4.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A012F4.s index ed3fc746b8..2b62e9e248 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A012F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A012F4.s @@ -36,5 +36,3 @@ glabel func_80A012F4 /* 013C8 80A01368 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013CC 80A0136C 03E00008 */ jr $ra /* 013D0 80A01370 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s index a757cc7266..b55da4f9c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s @@ -53,5 +53,3 @@ glabel func_80A01374 /* 01480 80A01420 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01484 80A01424 03E00008 */ jr $ra /* 01488 80A01428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0142C.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0142C.s index f9610d5fdb..7dd25fd71c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0142C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0142C.s @@ -91,5 +91,3 @@ glabel func_80A0142C /* 015C4 80A01564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 015C8 80A01568 03E00008 */ jr $ra /* 015CC 80A0156C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0178C.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0178C.s index c7d00da678..30a6430545 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0178C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0178C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A01A10 + .float 2500.0 + +.text glabel func_80A0178C /* 017EC 80A0178C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 017F0 80A01790 14A10006 */ bne $a1, $at, .L80A017AC @@ -21,5 +26,3 @@ glabel func_80A0178C .L80A017D4: /* 01834 80A017D4 03E00008 */ jr $ra /* 01838 80A017D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s index 437b5e68e5..264d6a08c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s @@ -21,5 +21,3 @@ glabel EnElf_Destroy /* 00DE4 80A02A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DE8 80A02A18 03E00008 */ jr $ra /* 00DEC 80A02A1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s index 4cd4bc52cd..54d813c2a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s @@ -462,5 +462,3 @@ glabel EnElf_Draw /* 042D4 80A05F04 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 042D8 80A05F08 03E00008 */ jr $ra /* 042DC 80A05F0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s index 112782382a..9bc4b2e131 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s @@ -382,5 +382,3 @@ glabel L80A02804 /* 00D60 80A02990 8FB10030 */ lw $s1, 0x0030($sp) /* 00D64 80A02994 03E00008 */ jr $ra /* 00D68 80A02998 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s index 9a3f9ddc5a..00d74b2af6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s @@ -22,5 +22,3 @@ glabel EnElf_Update /* 03AF8 80A05728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03AFC 80A0572C 03E00008 */ jr $ra /* 03B00 80A05730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s index e42064f13c..e02dc557e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s @@ -1,5 +1,3 @@ glabel func_80A01C30 /* 00000 80A01C30 03E00008 */ jr $ra /* 00004 80A01C34 AC8502CC */ sw $a1, 0x02CC($a0) ## 000002CC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s index 597ceee4d1..ea7a1cc820 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s @@ -29,5 +29,3 @@ glabel L80A01C60 /* 00070 80A01CA0 E48402B4 */ swc1 $f4, 0x02B4($a0) ## 000002B4 /* 00074 80A01CA4 03E00008 */ jr $ra /* 00078 80A01CA8 E48602B8 */ swc1 $f6, 0x02B8($a0) ## 000002B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s index dcd8e63525..8446151940 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s @@ -16,5 +16,3 @@ glabel func_80A01CAC /* 000B4 80A01CE4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 /* 000B8 80A01CE8 03E00008 */ jr $ra /* 000BC 80A01CEC E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s index c8208bb54f..0bb7be66f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s @@ -14,5 +14,3 @@ glabel func_80A01CF0 /* 000F0 80A01D20 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 /* 000F4 80A01D24 03E00008 */ jr $ra /* 000F8 80A01D28 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s index 747f36df55..6da08eb970 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s @@ -16,5 +16,3 @@ glabel func_80A01D2C /* 00134 80A01D64 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 /* 00138 80A01D68 03E00008 */ jr $ra /* 0013C 80A01D6C E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s index 2abfc27334..961f17b30b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s @@ -13,5 +13,3 @@ glabel func_80A01D70 /* 0016C 80A01D9C E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 /* 00170 80A01DA0 03E00008 */ jr $ra /* 00174 80A01DA4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s index 8aea496613..2fd06d8dad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s @@ -13,5 +13,3 @@ glabel func_80A01DA8 /* 001A4 80A01DD4 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 /* 001A8 80A01DD8 03E00008 */ jr $ra /* 001AC 80A01DDC E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s index 4db34cf04d..7345887a0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s @@ -16,5 +16,3 @@ glabel func_80A01DE0 /* 001E8 80A01E18 E48402B8 */ swc1 $f4, 0x02B8($a0) ## 000002B8 /* 001EC 80A01E1C 03E00008 */ jr $ra /* 001F0 80A01E20 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s index b429049b83..96a1f00811 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s @@ -16,5 +16,3 @@ glabel func_80A01E24 /* 0022C 80A01E5C E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 /* 00230 80A01E60 03E00008 */ jr $ra /* 00234 80A01E64 E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s index 3aac261aa4..add0a00a0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s @@ -10,5 +10,3 @@ glabel func_80A01E68 /* 00258 80A01E88 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 /* 0025C 80A01E8C 03E00008 */ jr $ra /* 00260 80A01E90 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s index 9ceb5863a1..76317d806d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s @@ -14,5 +14,3 @@ glabel func_80A01E94 /* 00294 80A01EC4 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 /* 00298 80A01EC8 03E00008 */ jr $ra /* 0029C 80A01ECC E4920168 */ swc1 $f18, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s index 6aad4b2d78..ca5ef72add 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s @@ -12,5 +12,3 @@ glabel func_80A01ED0 /* 002C8 80A01EF8 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 /* 002CC 80A01EFC 03E00008 */ jr $ra /* 002D0 80A01F00 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s index 4b707a6017..e184ab26d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s @@ -16,5 +16,3 @@ glabel func_80A01F04 /* 0030C 80A01F3C E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 /* 00310 80A01F40 03E00008 */ jr $ra /* 00314 80A01F44 E48A0168 */ swc1 $f10, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s index 4015be5f46..b378e25bb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s @@ -18,5 +18,3 @@ glabel func_80A01F48 .L80A01F88: /* 00358 80A01F88 03E00008 */ jr $ra /* 0035C 80A01F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s index a42101ad88..f4ae6c5a77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s @@ -20,5 +20,3 @@ glabel func_80A01F90 .L80A01FD8: /* 003A8 80A01FD8 03E00008 */ jr $ra /* 003AC 80A01FDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s index 68469836ca..342ef573e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s @@ -54,5 +54,3 @@ glabel func_80A01FE0 /* 00468 80A02098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0046C 80A0209C 03E00008 */ jr $ra /* 00470 80A020A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s index 164053e3e4..7101031191 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s @@ -46,5 +46,3 @@ glabel func_80A020A4 /* 00510 80A02140 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00514 80A02144 03E00008 */ jr $ra /* 00518 80A02148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s index 66f461e3c0..60a8c70b44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s @@ -133,5 +133,3 @@ glabel func_80A0214C /* 006F0 80A02320 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006F4 80A02324 03E00008 */ jr $ra /* 006F8 80A02328 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s index 6ce8398b62..884209a795 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s @@ -31,5 +31,3 @@ glabel func_80A0232C /* 00768 80A02398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0076C 80A0239C 03E00008 */ jr $ra /* 00770 80A023A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s index a9a98ffec1..bf071d5e12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s @@ -33,5 +33,3 @@ glabel func_80A023A4 /* 007D8 80A02408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007DC 80A0240C 03E00008 */ jr $ra /* 007E0 80A02410 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s index c6bf9a7d66..5cb201abdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s @@ -2,5 +2,3 @@ glabel func_80A0299C /* 00D6C 80A0299C AFA40000 */ sw $a0, 0x0000($sp) /* 00D70 80A029A0 03E00008 */ jr $ra /* 00D74 80A029A4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s index d91fab7d68..0bc0b997b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s @@ -10,5 +10,3 @@ glabel func_80A029A8 .L80A029C8: /* 00D98 80A029C8 03E00008 */ jr $ra /* 00D9C 80A029CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s index e2594a57a6..f26a2c3d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s @@ -35,5 +35,3 @@ glabel func_80A02A20 /* 00E68 80A02A98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E6C 80A02A9C 03E00008 */ jr $ra /* 00E70 80A02AA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s index 7c8012338e..859d2a9e33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s @@ -39,5 +39,3 @@ glabel func_80A02AA4 /* 00EFC 80A02B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F00 80A02B30 03E00008 */ jr $ra /* 00F04 80A02B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s index 7136163a7e..50484070e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s @@ -43,5 +43,3 @@ glabel func_80A02B38 /* 00F9C 80A02BCC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FA0 80A02BD0 03E00008 */ jr $ra /* 00FA4 80A02BD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s index a05aba42a6..f391bba2cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s @@ -53,5 +53,3 @@ glabel func_80A02BD8 /* 0105C 80A02C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01060 80A02C90 03E00008 */ jr $ra /* 01064 80A02C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s index 95183ec4c7..bf7fb0a524 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s @@ -113,5 +113,3 @@ glabel func_80A02C98 /* 011F4 80A02E24 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 011F8 80A02E28 03E00008 */ jr $ra /* 011FC 80A02E2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s index bcc0a73f6d..ad2eb4e17a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s @@ -35,5 +35,3 @@ glabel func_80A02E30 /* 01284 80A02EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01288 80A02EB8 03E00008 */ jr $ra /* 0128C 80A02EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s index 5276634941..e38ddaf1e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s @@ -26,5 +26,3 @@ glabel func_80A02EC0 /* 012F0 80A02F20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012F4 80A02F24 03E00008 */ jr $ra /* 012F8 80A02F28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s index 076e6d60b0..775cf8d450 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s @@ -65,5 +65,3 @@ glabel func_80A02F2C /* 013DC 80A0300C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013E0 80A03010 03E00008 */ jr $ra /* 013E4 80A03014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s index 1556ab2e93..5583f9d53e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s @@ -85,5 +85,3 @@ glabel func_80A03018 /* 0150C 80A0313C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01510 80A03140 03E00008 */ jr $ra /* 01514 80A03144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03148.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03148.s index ae2c4da724..505ebcc9df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03148.s @@ -90,5 +90,3 @@ glabel func_80A03148 /* 01660 80A03290 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01664 80A03294 03E00008 */ jr $ra /* 01668 80A03298 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s index ab3ffd652f..e17cf9c25e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s @@ -187,5 +187,3 @@ glabel func_80A0329C /* 01900 80A03530 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01904 80A03534 03E00008 */ jr $ra /* 01908 80A03538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s index 033d5ec767..9e881e4f19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s @@ -54,5 +54,3 @@ glabel func_80A0353C /* 019C8 80A035F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 019CC 80A035FC 03E00008 */ jr $ra /* 019D0 80A03600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s index 9ffc5cf424..ea33693541 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s @@ -2,5 +2,3 @@ glabel func_80A03604 /* 019D4 80A03604 AFA40000 */ sw $a0, 0x0000($sp) /* 019D8 80A03608 03E00008 */ jr $ra /* 019DC 80A0360C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s index abf20a75b0..da97386977 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s @@ -143,5 +143,3 @@ glabel func_80A03610 /* 01BD8 80A03808 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01BDC 80A0380C 03E00008 */ jr $ra /* 01BE0 80A03810 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s index 9dab350487..d5de5e917c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s @@ -105,5 +105,3 @@ glabel func_80A03814 /* 01D54 80A03984 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D58 80A03988 03E00008 */ jr $ra /* 01D5C 80A0398C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s index 828386cbca..a51418bfbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s @@ -76,5 +76,3 @@ glabel func_80A03990 /* 01E74 80A03AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01E78 80A03AA8 03E00008 */ jr $ra /* 01E7C 80A03AAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s index 20554e3b80..c059e7f107 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s @@ -33,5 +33,3 @@ glabel func_80A03AB0 /* 01EEC 80A03B1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EF0 80A03B20 03E00008 */ jr $ra /* 01EF4 80A03B24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s index f3f127e16d..8fd34b638b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s @@ -123,5 +123,3 @@ glabel func_80A03B28 /* 020BC 80A03CEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 020C0 80A03CF0 03E00008 */ jr $ra /* 020C4 80A03CF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s index e0bc172cdc..f65d168c3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s @@ -456,5 +456,3 @@ glabel func_80A03CF8 /* 02750 80A04380 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 02754 80A04384 03E00008 */ jr $ra /* 02758 80A04388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s index 83743f759e..f6f51d0571 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s @@ -33,5 +33,3 @@ glabel func_80A0438C /* 027D8 80A04408 46125400 */ add.s $f16, $f10, $f18 /* 027DC 80A0440C 03E00008 */ jr $ra /* 027E0 80A04410 E490000C */ swc1 $f16, 0x000C($a0) ## 0000000C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s index f9b9f02c60..87e1827a39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s @@ -146,5 +146,3 @@ glabel func_80A04414 /* 029E0 80A04610 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 029E4 80A04614 03E00008 */ jr $ra /* 029E8 80A04618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s index 56cfe2c956..a18d61feac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s @@ -260,5 +260,3 @@ glabel func_80A0461C /* 02D78 80A049A8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02D7C 80A049AC 03E00008 */ jr $ra /* 02D80 80A049B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s index 904ee86545..5eeb813436 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s @@ -267,5 +267,3 @@ glabel func_80A049B4 /* 03154 80A04D84 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 03158 80A04D88 03E00008 */ jr $ra /* 0315C 80A04D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s index 9fd046f7b8..9c7c4d09d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s @@ -20,5 +20,3 @@ glabel func_80A04D90 /* 031A8 80A04DD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 031AC 80A04DDC 03E00008 */ jr $ra /* 031B0 80A04DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s index 2c9cea7611..695baccda2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s @@ -114,5 +114,3 @@ glabel func_80A04DE4 /* 03358 80A04F88 8FB10020 */ lw $s1, 0x0020($sp) /* 0335C 80A04F8C 03E00008 */ jr $ra /* 03360 80A04F90 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s index 8afb7852b6..a6e082382d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s @@ -44,5 +44,3 @@ glabel func_80A04F94 /* 03404 80A05034 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03408 80A05038 03E00008 */ jr $ra /* 0340C 80A0503C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s index 98cad4d3c3..59b9b12eef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s @@ -56,5 +56,3 @@ glabel func_80A05040 /* 034D8 80A05108 8FB10018 */ lw $s1, 0x0018($sp) /* 034DC 80A0510C 03E00008 */ jr $ra /* 034E0 80A05110 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s index 8cf633a184..ae59db0543 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s @@ -30,5 +30,3 @@ glabel func_80A05114 /* 0354C 80A0517C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03550 80A05180 03E00008 */ jr $ra /* 03554 80A05184 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s index 9be1706cce..0ede140826 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s @@ -32,5 +32,3 @@ glabel func_80A05188 /* 035CC 80A051FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 035D0 80A05200 03E00008 */ jr $ra /* 035D4 80A05204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s index 71cbb064cd..97c2c8ca17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s @@ -64,5 +64,3 @@ glabel func_80A05208 /* 036B8 80A052E8 8FB10018 */ lw $s1, 0x0018($sp) /* 036BC 80A052EC 03E00008 */ jr $ra /* 036C0 80A052F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s index 98b2195279..f4cf6cba59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s @@ -67,5 +67,3 @@ glabel func_80A052F4 /* 037B4 80A053E4 8FB10018 */ lw $s1, 0x0018($sp) /* 037B8 80A053E8 03E00008 */ jr $ra /* 037BC 80A053EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s index 35c9df9098..25c440578f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s @@ -204,5 +204,3 @@ glabel func_80A053F0 /* 03AA0 80A056D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03AA4 80A056D4 03E00008 */ jr $ra /* 03AA8 80A056D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s index 15a044aa02..81b167bee0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s @@ -77,5 +77,3 @@ glabel func_80A05734 /* 03C1C 80A0584C 8FB00020 */ lw $s0, 0x0020($sp) /* 03C20 80A05850 03E00008 */ jr $ra /* 03C24 80A05854 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s index 0876afcff4..7baeb26ecf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s @@ -59,4 +59,3 @@ glabel func_80A05F10 /* 043C4 80A05FF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 043C8 80A05FF8 03E00008 */ jr $ra /* 043CC 80A05FFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Init.s index 4251657dca..00228e30d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Init.s @@ -1,3 +1,61 @@ +.rdata +glabel D_80A07490 + .asciz "\n\n" + .balign 4 + +glabel D_80A07494 + .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A074C8 + .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A074FC + .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A07530 + .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A07564 + .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A07598 + .asciz "\n\n" + .balign 4 + +glabel D_80A0759C + .asciz "\n\n" + .balign 4 + +glabel D_80A075A0 + .asciz "☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80A075D8 + .asciz "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A07604 + .asciz "☆☆☆☆☆ 最大同時発生数 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A0763C + .asciz "☆☆☆☆☆ 最大発生数 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A07670 + .asciz "☆☆☆☆☆ 発生チェック範囲 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A076A8 + .asciz "\n\n" + .balign 4 + +.text glabel EnEncount1_Init /* 00000 80A06720 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 80A06724 AFBF001C */ sw $ra, 0x001C($sp) @@ -158,5 +216,3 @@ glabel EnEncount1_Init /* 00210 80A06930 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00214 80A06934 03E00008 */ jr $ra /* 00218 80A06938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s index cda826798f..81a7dcd439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s @@ -87,4 +87,3 @@ glabel EnEncount1_Update /* 00D24 80A07444 00000000 */ nop /* 00D28 80A07448 00000000 */ nop /* 00D2C 80A0744C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s index fd0b4d8eef..d72d223943 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s @@ -1,3 +1,26 @@ +.rdata +glabel D_80A076AC + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A076DC + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A0770C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +.late_rodata +glabel D_80A0785C + .float 1300.0 + +glabel D_80A07860 + .word 0x407F5C29 +glabel D_80A07864 + .word 0x403F5C29, 0x00000000, 0x00000000 + +.text glabel func_80A0693C /* 0021C 80A0693C 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00220 80A06940 AFBF005C */ sw $ra, 0x005C($sp) @@ -251,5 +274,3 @@ glabel func_80A0693C /* 005A4 80A06CC4 8FB60058 */ lw $s6, 0x0058($sp) /* 005A8 80A06CC8 03E00008 */ jr $ra /* 005AC 80A06CCC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s index 8a5f73688d..1ebe48c576 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A0773C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A0776C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A0779C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +.text glabel func_80A06CD0 /* 005B0 80A06CD0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 005B4 80A06CD4 AFBF003C */ sw $ra, 0x003C($sp) @@ -120,5 +134,3 @@ glabel func_80A06CD0 /* 0075C 80A06E7C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00760 80A06E80 03E00008 */ jr $ra /* 00764 80A06E84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s index 76c288cfd9..38a109588d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A077CC + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A077FC + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A0782C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +.text glabel func_80A06E88 /* 00768 80A06E88 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0076C 80A06E8C AFBF0074 */ sw $ra, 0x0074($sp) @@ -321,5 +335,3 @@ glabel func_80A06E88 /* 00BDC 80A072FC 8FB60070 */ lw $s6, 0x0070($sp) /* 00BE0 80A07300 03E00008 */ jr $ra /* 00BE4 80A07304 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Draw.s index f4b397e46f..0e9eda28d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Draw.s @@ -7,5 +7,3 @@ glabel EnEncount2_Draw /* 00CF8 80A08688 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CFC 80A0868C 03E00008 */ jr $ra /* 00D00 80A08690 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s index 833d6531a9..b9f2e8cfc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A08B70 + .asciz "\n\n" + .balign 4 + +glabel D_80A08B74 + .asciz "☆☆☆☆☆ デスマウンテンエンカウント２セットされました ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A08BC4 + .asciz "\n\n" + .balign 4 + +glabel D_80A08BC8 + .asciz "☆☆☆☆☆ ガノンタワー脱出エンカウント２セットされました ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel EnEncount2_Init /* 00000 80A07990 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 80A07994 AFBF001C */ sw $ra, 0x001C($sp) @@ -54,5 +72,3 @@ glabel EnEncount2_Init /* 000B0 80A07A40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000B4 80A07A44 03E00008 */ jr $ra /* 000B8 80A07A48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Update.s index 66bb777467..62698ac5cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Update.s @@ -258,5 +258,3 @@ glabel EnEncount2_Update /* 00CD8 80A08668 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CDC 80A0866C 03E00008 */ jr $ra /* 00CE0 80A08670 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s index 6ccf4c161b..8ba9621956 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A08D4C + .float 1500.0 + +glabel D_80A08D50 + .word 0xC4A14000 + +.text glabel func_80A07A4C /* 000BC 80A07A4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 000C0 80A07A50 AFBF0024 */ sw $ra, 0x0024($sp) @@ -160,5 +168,3 @@ glabel func_80A07A4C /* 00308 80A07C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0030C 80A07C9C 03E00008 */ jr $ra /* 00310 80A07CA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s index b48fa6de69..2c686d2f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s @@ -1,3 +1,44 @@ +.rdata +glabel D_80A08C1C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A08C4C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A08C7C + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A08CAC + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" + .balign 4 + +glabel D_80A08CDC + .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n" + .balign 4 + +.late_rodata +glabel D_80A08D54 + .float 1500.0 + +glabel D_80A08D58 + .word 0xC4A14000 +glabel D_80A08D5C + .word 0xC5714000 +glabel D_80A08D60 + .float 0.005 + +glabel D_80A08D64 + .word 0x3BE56042 +glabel D_80A08D68 + .float 1.99000000954 + +glabel D_80A08D6C + .word 0x407F5C29 + +.text glabel func_80A07CA4 /* 00314 80A07CA4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00318 80A07CA8 AFBF003C */ sw $ra, 0x003C($sp) @@ -426,5 +467,3 @@ glabel func_80A07CA4 /* 0090C 80A0829C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 00910 80A082A0 03E00008 */ jr $ra /* 00914 80A082A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s index 2e21fe4dd8..f673cb95b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s @@ -49,5 +49,3 @@ glabel func_80A08694 /* 00DAC 80A0873C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DB0 80A08740 03E00008 */ jr $ra /* 00DB4 80A08744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s index 697f7e73ce..e67d7ab957 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A08D70 + .float 0.8 + +glabel D_80A08D74 + .float 0.3 + +glabel D_80A08D78 + .float 1500.0 + +.text glabel func_80A08748 /* 00DB8 80A08748 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00DBC 80A0874C F7BE0040 */ sdc1 $f30, 0x0040($sp) @@ -127,5 +138,3 @@ glabel func_80A08748 /* 00F80 80A08910 8FB40058 */ lw $s4, 0x0058($sp) /* 00F84 80A08914 03E00008 */ jr $ra /* 00F88 80A08918 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s index b25c4089b4..012b6640e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A08D10 + .asciz "../z_en_encount2.c" + .balign 4 + +glabel D_80A08D24 + .asciz "../z_en_encount2.c" + .balign 4 + +glabel D_80A08D38 + .asciz "../z_en_encount2.c" + .balign 4 + +.late_rodata +glabel D_80A08D7C + .word 0x3C8EFA35 + +.text glabel func_80A0891C /* 00F8C 80A0891C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00F90 80A08920 AFBF0044 */ sw $ra, 0x0044($sp) @@ -144,4 +162,3 @@ glabel func_80A0891C /* 011B4 80A08B44 8FBE0040 */ lw $s8, 0x0040($sp) /* 011B8 80A08B48 03E00008 */ jr $ra /* 011BC 80A08B4C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Destroy.s index ceb9635174..e72b7d5f66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Destroy.s @@ -2,5 +2,3 @@ glabel EnExItem_Destroy /* 00000 80A08EA0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80A08EA4 03E00008 */ jr $ra /* 00008 80A08EA8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Draw.s index 01e96b284e..56b6491b29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Draw.s @@ -1,3 +1,28 @@ +.late_rodata +.late_rodata_alignment 8 +glabel jtbl_80A0A130 +.word L80A09B04 +.word L80A09B14 +.word L80A09B04 +.word L80A09B04 +.word L80A09B24 +.word L80A09B04 +.word L80A09B14 +.word L80A09B04 +.word L80A09B04 +.word L80A09B24 +.word L80A09B24 +.word L80A09B24 +.word L80A09B24 +.word L80A09B24 +.word L80A09B24 +.word L80A09B34 +.word L80A09B48 +.word L80A09B48 +.word L80A09B48 +.word L80A09B04 + +.text glabel EnExItem_Draw /* 00C1C 80A09ABC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00C20 80A09AC0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -51,5 +76,3 @@ glabel L80A09B48 /* 00CC0 80A09B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CC4 80A09B64 03E00008 */ jr $ra /* 00CC8 80A09B68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Init.s index 319c7bda4a..46c7fd4ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Init.s @@ -1,3 +1,50 @@ +.rdata +glabel D_80A09E10 + .asciz "\n\n" + .balign 4 + +glabel D_80A09E14 + .asciz "\x1b[32m☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n\x1b[m" + .balign 4 + +glabel D_80A09E48 + .asciz "\x1b[33m☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n\x1b[m" + .balign 4 + +glabel D_80A09E7C + .asciz "なにみの？ %d\n" + .balign 4 + +glabel D_80A09E8C + .asciz "\x1b[35m バンクおかしいしぞ！%d\n\x1b[m\n" + .balign 4 + +.late_rodata +glabel jtbl_80A0A084 +.word L80A08F58 +.word L80A08F64 +.word L80A08F70 +.word L80A08F7C +.word L80A08F88 +.word L80A08F58 +.word L80A08F64 +.word L80A08F70 +.word L80A08F7C +.word L80A08F88 +.word L80A08F88 +.word L80A08F88 +.word L80A08F88 +.word L80A08F88 +.word L80A08F88 +.word L80A08F94 +.word L80A08FC4 +.word L80A08FC4 +.word L80A08FC4 +.word L80A08FD0 +glabel D_80A0A0D4 + .float 0.05 + +.text glabel EnExItem_Init /* 0000C 80A08EAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00010 80A08EB0 AFBF001C */ sw $ra, 0x001C($sp) @@ -124,5 +171,3 @@ glabel L80A08FD0 /* 001A8 80A09048 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001AC 80A0904C 03E00008 */ jr $ra /* 001B0 80A09050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Update.s index 676e773a1d..81ea5d3afc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/EnExItem_Update.s @@ -23,5 +23,3 @@ glabel EnExItem_Update /* 00C10 80A09AB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C14 80A09AB4 03E00008 */ jr $ra /* 00C18 80A09AB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s index 193e585f93..d4aedcad6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s @@ -1,3 +1,52 @@ +.rdata +glabel D_80A09EB0 + .asciz "\x1b[32m☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\x1b[m" + .balign 4 + +glabel D_80A09EDC + .asciz "\x1b[33m☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\x1b[m" + .balign 4 + +glabel D_80A09F08 + .asciz "\x1b[34m☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\x1b[m" + .balign 4 + +glabel D_80A09F34 + .asciz "\x1b[35m☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\x1b[m" + .balign 4 + +glabel D_80A09F60 + .asciz "\x1b[36m☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\n\x1b[m" + .balign 4 + +.late_rodata +glabel jtbl_80A0A0D8 +.word L80A0912C +.word L80A09190 +.word L80A091FC +.word L80A09250 +.word L80A092B8 +.word L80A09128 +.word L80A0918C +.word L80A091F8 +.word L80A09250 +.word L80A092B8 +.word L80A0932C +.word L80A0932C +.word L80A0932C +.word L80A0932C +.word L80A0932C +.word L80A09424 +.word L80A093CC +.word L80A093CC +.word L80A093CC +.word L80A093E8 +glabel D_80A0A128 + .word 0x3EB33333 +glabel D_80A0A12C + .float 0.1 + +.text glabel func_80A09054 /* 001B4 80A09054 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 001B8 80A09058 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 @@ -276,5 +325,3 @@ glabel L80A09424 /* 00588 80A09428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0058C 80A0942C 03E00008 */ jr $ra /* 00590 80A09430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s index ff136aba04..a07564ff06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A09F8C + .asciz "\x1b[32m ☆☆☆☆☆ 母親ー？ ☆☆☆☆☆ %x\n\x1b[m" + .balign 4 + +glabel D_80A09FBC + .asciz "\x1b[32m ☆☆☆☆☆ 動いてねー？ ☆☆☆☆☆ %x\n\x1b[m" + .balign 4 + +glabel D_80A09FEC + .asciz "\x1b[32m ☆☆☆☆☆ さぁきえるぞ！ ☆☆☆☆☆ \n\x1b[m" + .balign 4 + +.text glabel func_80A09434 /* 00594 80A09434 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00598 80A09438 AFBF0024 */ sw $ra, 0x0024($sp) @@ -146,5 +160,3 @@ glabel func_80A09434 /* 007A0 80A09640 8FB10020 */ lw $s1, 0x0020($sp) /* 007A4 80A09644 03E00008 */ jr $ra /* 007A8 80A09648 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A0964C.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A0964C.s index 1a818302fb..c4f4f3b127 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A0964C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A0964C.s @@ -8,5 +8,3 @@ glabel func_80A0964C /* 007C4 80A09664 AC98014C */ sw $t8, 0x014C($a0) ## 0000014C /* 007C8 80A09668 03E00008 */ jr $ra /* 007CC 80A0966C A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09670.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09670.s index fa002c402c..da36546b99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09670.s @@ -15,5 +15,3 @@ glabel func_80A09670 /* 007FC 80A0969C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00800 80A096A0 03E00008 */ jr $ra /* 00804 80A096A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A096A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A096A8.s index a59a5e248a..ab3b02b9f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A096A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A096A8.s @@ -29,5 +29,3 @@ glabel func_80A096A8 /* 00864 80A09704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00868 80A09708 03E00008 */ jr $ra /* 0086C 80A0970C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09710.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09710.s index 740a3c2a7b..b2c7fdf946 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09710.s @@ -4,5 +4,3 @@ glabel func_80A09710 /* 00878 80A09718 25CF0800 */ addiu $t7, $t6, 0x0800 ## $t7 = 00000800 /* 0087C 80A0971C 03E00008 */ jr $ra /* 00880 80A09720 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s index ffc8c3ce83..8f5cba7618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s @@ -158,5 +158,3 @@ glabel func_80A09724 /* 00ACC 80A0996C 8FB10020 */ lw $s1, 0x0020($sp) /* 00AD0 80A09970 03E00008 */ jr $ra /* 00AD4 80A09974 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s index d520c9a141..664ecbe695 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s @@ -37,5 +37,3 @@ glabel func_80A09978 /* 00B54 80A099F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B58 80A099F8 03E00008 */ jr $ra /* 00B5C 80A099FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s index 41327ad128..8e1b933739 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A0A01C + .asciz "\x1b[32m☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n\x1b[m" + .balign 4 + +.text glabel func_80A09A00 /* 00B60 80A09A00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B64 80A09A04 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +35,3 @@ glabel func_80A09A00 /* 00BBC 80A09A5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BC0 80A09A60 03E00008 */ jr $ra /* 00BC4 80A09A64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09B6C.s index e84517925b..deb0fdf02c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09B6C.s @@ -24,5 +24,3 @@ glabel func_80A09B6C /* 00D20 80A09BC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D24 80A09BC4 03E00008 */ jr $ra /* 00D28 80A09BC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BCC.s index 3e0caebbf3..8b8dc05220 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BCC.s @@ -11,5 +11,3 @@ glabel func_80A09BCC /* 00D50 80A09BF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D54 80A09BF4 03E00008 */ jr $ra /* 00D58 80A09BF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BFC.s index 35176301d1..e9f68c75b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09BFC.s @@ -16,5 +16,3 @@ glabel func_80A09BFC /* 00D94 80A09C34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D98 80A09C38 03E00008 */ jr $ra /* 00D9C 80A09C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s index 1903379dd5..2a0c0a4659 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A0A048 + .asciz "../z_en_ex_item.c" + .balign 4 + +glabel D_80A0A05C + .asciz "../z_en_ex_item.c" + .balign 4 + +glabel D_80A0A070 + .asciz "../z_en_ex_item.c" + .balign 4 + +.text glabel func_80A09C40 /* 00DA0 80A09C40 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00DA4 80A09C44 AFBF001C */ sw $ra, 0x001C($sp) @@ -74,5 +88,3 @@ glabel func_80A09C40 /* 00EC0 80A09D60 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00EC4 80A09D64 03E00008 */ jr $ra /* 00EC8 80A09D68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09D6C.s index 1f77051c3b..8f7c24f638 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09D6C.s @@ -30,4 +30,3 @@ glabel func_80A09D6C /* 00F34 80A09DD4 00000000 */ nop /* 00F38 80A09DD8 00000000 */ nop /* 00F3C 80A09DDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Destroy.s index 52da0e6db3..de06b568e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Destroy.s @@ -2,5 +2,3 @@ glabel EnExRuppy_Destroy /* 00404 80A0A814 AFA40000 */ sw $a0, 0x0000($sp) /* 00408 80A0A818 03E00008 */ jr $ra /* 0040C 80A0A81C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s index a2265aab60..54e91529a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A0B4D0 + .asciz "../z_en_ex_ruppy.c" + .balign 4 + +glabel D_80A0B4E4 + .asciz "../z_en_ex_ruppy.c" + .balign 4 + +glabel D_80A0B4F8 + .asciz "../z_en_ex_ruppy.c" + .balign 4 + +.text glabel EnExRuppy_Draw /* 00DCC 80A0B1DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00DD0 80A0B1E0 AFBF001C */ sw $ra, 0x001C($sp) @@ -81,4 +95,3 @@ glabel EnExRuppy_Draw /* 00F04 80A0B314 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00F08 80A0B318 00000000 */ nop /* 00F0C 80A0B31C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s index 9ce0144447..c855728f49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s @@ -1,3 +1,45 @@ +.rdata +glabel D_80A0B3D0 + .asciz "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80A0B400 + .asciz "☆☆☆☆☆ わーなーコイン ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A0B430 + .asciz "☆☆☆☆☆ ノーマルルピー ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel jtbl_80A0B50C +.word L80A0A478 +.word L80A0A634 +.word L80A0A634 +.word L80A0A6E0 +.word L80A0A7AC +glabel D_80A0B520 + .float 0.01 + +glabel D_80A0B524 + .word 0x4348FD71 +glabel D_80A0B528 + .float 0.02 + +glabel D_80A0B52C + .float 0.02 + +glabel D_80A0B530 + .word 0x407F5C29 +glabel D_80A0B534 + .float 0.02 + +glabel D_80A0B538 + .word 0x41F7EB85 +glabel D_80A0B53C + .float 0.01 + +.text glabel EnExRuppy_Init /* 00000 80A0A410 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 80A0A414 AFBF001C */ sw $ra, 0x001C($sp) @@ -288,5 +330,3 @@ glabel L80A0A7AC /* 003F8 80A0A808 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003FC 80A0A80C 03E00008 */ jr $ra /* 00400 80A0A810 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Update.s index e2d0397e69..4b98b86bd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Update.s @@ -36,5 +36,3 @@ glabel EnExRuppy_Update /* 00DC0 80A0B1D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DC4 80A0B1D4 03E00008 */ jr $ra /* 00DC8 80A0B1D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0A820.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0A820.s index 8b3b427610..ac76c25c0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0A820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0A820.s @@ -143,5 +143,3 @@ glabel func_80A0A820 /* 00620 80A0AA30 8FBE0068 */ lw $s8, 0x0068($sp) /* 00624 80A0AA34 03E00008 */ jr $ra /* 00628 80A0AA38 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AA3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AA3C.s index ee6ff48f0f..04f941b200 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AA3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AA3C.s @@ -58,5 +58,3 @@ glabel func_80A0AA3C /* 00700 80A0AB10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00704 80A0AB14 03E00008 */ jr $ra /* 00708 80A0AB18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s index 7b0eed77a5..78d708766b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s @@ -97,5 +97,3 @@ glabel func_80A0AB1C /* 0086C 80A0AC7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00870 80A0AC80 03E00008 */ jr $ra /* 00874 80A0AC84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AC88.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AC88.s index a1e8436f96..9e45475d66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AC88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AC88.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0B540 + .word 0xBE4CCCCD + +.text glabel func_80A0AC88 /* 00878 80A0AC88 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0087C 80A0AC8C AFBF0024 */ sw $ra, 0x0024($sp) @@ -66,5 +71,3 @@ glabel func_80A0AC88 /* 0096C 80A0AD7C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00970 80A0AD80 03E00008 */ jr $ra /* 00974 80A0AD84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AD88.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AD88.s index 2a75bdf39c..209881c508 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AD88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AD88.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A0B544 + .float 0.03 + +glabel D_80A0B548 + .word 0x3D8F5C29, 0x00000000 + +.text glabel func_80A0AD88 /* 00978 80A0AD88 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0097C 80A0AD8C 3C0F80A1 */ lui $t7, %hi(D_80A0B388) ## $t7 = 80A10000 @@ -93,5 +101,3 @@ glabel func_80A0AD88 /* 00AC4 80A0AED4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00AC8 80A0AED8 03E00008 */ jr $ra /* 00ACC 80A0AEDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AEE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AEE0.s index 2fdbe9c8a2..a9a82e6948 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AEE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AEE0.s @@ -18,5 +18,3 @@ glabel func_80A0AEE0 /* 00B08 80A0AF18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B0C 80A0AF1C 03E00008 */ jr $ra /* 00B10 80A0AF20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AF24.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AF24.s index c9298a380a..038847a237 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AF24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AF24.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A0B460 + .asciz "☆☆☆☆☆ そ、そんなばかな！エラー！！！！！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A0B4A4 + .asciz "☆☆☆☆☆ バカめ！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A0AF24 /* 00B14 80A0AF24 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00B18 80A0AF28 3C0F80A1 */ lui $t7, %hi(D_80A0B3A0) ## $t7 = 80A10000 @@ -91,5 +101,3 @@ glabel func_80A0AF24 /* 00C54 80A0B064 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00C58 80A0B068 03E00008 */ jr $ra /* 00C5C 80A0B06C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B070.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B070.s index 56472d2bdc..7268679614 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B070.s @@ -35,5 +35,3 @@ glabel func_80A0B070 /* 00CD8 80A0B0E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CDC 80A0B0EC 03E00008 */ jr $ra /* 00CE0 80A0B0F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B0F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B0F4.s index 772cdc8fc6..82d6c40e7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B0F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B0F4.s @@ -26,5 +26,3 @@ glabel func_80A0B0F4 /* 00D34 80A0B144 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D38 80A0B148 03E00008 */ jr $ra /* 00D3C 80A0B14C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s index f74d7134c7..50df030809 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s @@ -9,5 +9,3 @@ glabel EnFd_Destroy /* 00C44 80A0C304 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C48 80A0C308 03E00008 */ jr $ra /* 00C4C 80A0C30C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s index fb3a2fa162..6b61f051a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A0E120 + .asciz "../z_en_fd.c" + .balign 4 + +glabel D_80A0E130 + .asciz "../z_en_fd.c" + .balign 4 + +.late_rodata +glabel D_80A0E1D8 + .float 0.9 + +.text glabel EnFd_Draw /* 0195C 80A0D01C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01960 80A0D020 3C0F80A1 */ lui $t7, %hi(D_80A0E0D0) ## $t7 = 80A10000 @@ -263,5 +277,3 @@ glabel EnFd_Draw /* 01D40 80A0D400 8FB10038 */ lw $s1, 0x0038($sp) /* 01D44 80A0D404 03E00008 */ jr $ra /* 01D48 80A0D408 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s index 33f60c136f..de23de7457 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s @@ -83,5 +83,3 @@ glabel EnFd_Init /* 00C1C 80A0C2DC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00C20 80A0C2E0 03E00008 */ jr $ra /* 00C24 80A0C2E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s index 5289e61603..fd9e7ec68f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s @@ -143,5 +143,3 @@ glabel EnFd_Update /* 015EC 80A0CCAC 8FB10020 */ lw $s1, 0x0020($sp) /* 015F0 80A0CCB0 03E00008 */ jr $ra /* 015F4 80A0CCB4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s index b5f2cb4b8b..cd8a179143 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s @@ -68,5 +68,3 @@ glabel func_80A0B6C0 /* 000EC 80A0B7AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000F0 80A0B7B0 03E00008 */ jr $ra /* 000F4 80A0B7B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s index b000f21eda..609a6f864a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0E1A0 + .word 0x43360B61 + +.text glabel func_80A0B7B8 /* 000F8 80A0B7B8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 000FC 80A0B7BC AFB20054 */ sw $s2, 0x0054($sp) @@ -74,5 +79,3 @@ glabel func_80A0B7B8 /* 0020C 80A0B8CC 8FB50060 */ lw $s5, 0x0060($sp) /* 00210 80A0B8D0 03E00008 */ jr $ra /* 00214 80A0B8D4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B8D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B8D8.s index bc5afad243..0c8b09e32a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B8D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B8D8.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80A0E1A4 + .float 0.2 + +glabel D_80A0E1A8 + .float 0.3 + +glabel D_80A0E1AC + .float 0.6 + +glabel D_80A0E1B0 + .float 0.2 + +.text glabel func_80A0B8D8 /* 00218 80A0B8D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0021C 80A0B8DC 3C0F80A1 */ lui $t7, %hi(D_80A0E064) ## $t7 = 80A10000 @@ -95,5 +109,3 @@ glabel func_80A0B8D8 /* 00378 80A0BA38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0037C 80A0BA3C 03E00008 */ jr $ra /* 00380 80A0BA40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BA44.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BA44.s index b39c7a9d52..2f6f563a43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BA44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BA44.s @@ -42,5 +42,3 @@ glabel func_80A0BA44 .L80A0BAD8: /* 00418 80A0BAD8 03E00008 */ jr $ra /* 0041C 80A0BADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BAE0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BAE0.s index 93c565d4d8..022e2890c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BAE0.s @@ -111,5 +111,3 @@ glabel func_80A0BAE0 /* 005A4 80A0BC64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005A8 80A0BC68 03E00008 */ jr $ra /* 005AC 80A0BC6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BC70.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BC70.s index 6e74a0e221..1ee763f78d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BC70.s @@ -71,5 +71,3 @@ glabel func_80A0BC70 /* 006AC 80A0BD6C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 006B0 80A0BD70 03E00008 */ jr $ra /* 006B4 80A0BD74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BD78.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BD78.s index e5587ea6c4..68269b936a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BD78.s @@ -54,5 +54,3 @@ glabel func_80A0BD78 /* 00768 80A0BE28 8FB40028 */ lw $s4, 0x0028($sp) /* 0076C 80A0BE2C 03E00008 */ jr $ra /* 00770 80A0BE30 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BE34.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BE34.s index 148e95bf13..e0807c0213 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BE34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BE34.s @@ -31,5 +31,3 @@ glabel func_80A0BE34 /* 007D4 80A0BE94 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007D8 80A0BE98 03E00008 */ jr $ra /* 007DC 80A0BE9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BEA0.s index c80153049e..4336c8dc8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BEA0.s @@ -53,5 +53,3 @@ glabel func_80A0BEA0 /* 008A0 80A0BF60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 008A4 80A0BF64 03E00008 */ jr $ra /* 008A8 80A0BF68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BF6C.s index 242b7b7018..5f88695d46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0BF6C.s @@ -83,5 +83,3 @@ glabel func_80A0BF6C /* 009D4 80A0C094 8FB10030 */ lw $s1, 0x0030($sp) /* 009D8 80A0C098 03E00008 */ jr $ra /* 009DC 80A0C09C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C0A0.s index e4ab4ed3c9..878f7a674a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C0A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C0A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0E1B4 + .float 0.9 + +.text glabel func_80A0C0A0 /* 009E0 80A0C0A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 009E4 80A0C0A4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -72,5 +77,3 @@ glabel func_80A0C0A0 /* 00AE0 80A0C1A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AE4 80A0C1A4 03E00008 */ jr $ra /* 00AE8 80A0C1A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C310.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C310.s index 6f2856b783..b992503cf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C310.s @@ -36,5 +36,3 @@ glabel func_80A0C310 /* 00CD4 80A0C394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CD8 80A0C398 03E00008 */ jr $ra /* 00CDC 80A0C39C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C3A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C3A0.s index 158b17926c..4ab9e8ec50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C3A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C3A0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A0E1B8 + .float 0.01 + +glabel D_80A0E1BC + .float 0.01 + +.text glabel func_80A0C3A0 /* 00CE0 80A0C3A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00CE4 80A0C3A4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 @@ -54,5 +62,3 @@ glabel func_80A0C3A0 /* 00DA8 80A0C468 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DAC 80A0C46C 03E00008 */ jr $ra /* 00DB0 80A0C470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C474.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C474.s index 0fe2e0438f..786c5c466d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C474.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C474.s @@ -31,5 +31,3 @@ glabel func_80A0C474 /* 00E24 80A0C4E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E28 80A0C4E8 03E00008 */ jr $ra /* 00E2C 80A0C4EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s index 23be35d824..e337b2ba7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0E1C0 + .word 0x4622F983 + +.text glabel func_80A0C4F0 /* 00E30 80A0C4F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00E34 80A0C4F4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -59,5 +64,3 @@ glabel func_80A0C4F0 /* 00F04 80A0C5C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F08 80A0C5C8 03E00008 */ jr $ra /* 00F0C 80A0C5CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C5D0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C5D0.s index 6394442813..9e8b29fe4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C5D0.s @@ -147,5 +147,3 @@ glabel func_80A0C5D0 /* 01120 80A0C7E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01124 80A0C7E4 03E00008 */ jr $ra /* 01128 80A0C7E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s index ba241de404..428ce04116 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0E1C4 + .word 0x4622F983 + +.text glabel func_80A0C7EC /* 0112C 80A0C7EC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01130 80A0C7F0 AFB00020 */ sw $s0, 0x0020($sp) @@ -166,5 +171,3 @@ glabel func_80A0C7EC /* 01378 80A0CA38 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0137C 80A0CA3C 03E00008 */ jr $ra /* 01380 80A0CA40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CA44.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CA44.s index b975724d9b..0654c7f14a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CA44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CA44.s @@ -34,5 +34,3 @@ glabel func_80A0CA44 /* 013F0 80A0CAB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013F4 80A0CAB4 03E00008 */ jr $ra /* 013F8 80A0CAB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCB8.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCB8.s index 6412305e8d..a3fa55e228 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCB8.s @@ -15,5 +15,3 @@ glabel func_80A0CCB8 .L80A0CCE8: /* 01628 80A0CCE8 03E00008 */ jr $ra /* 0162C 80A0CCEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCF0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCF0.s index 89766fd179..d4389499c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0CCF0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80A0E1C8 + .float 0.6 + +glabel D_80A0E1CC + .float 0.2 + +glabel D_80A0E1D0 + .float 0.4 + +glabel D_80A0E1D4 + .word 0x3BC49BA6 + +.text glabel func_80A0CCF0 /* 01630 80A0CCF0 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 01634 80A0CCF4 3C0F80A1 */ lui $t7, %hi(D_80A0E088) ## $t7 = 80A10000 @@ -213,5 +227,3 @@ glabel func_80A0CCF0 /* 01950 80A0D010 8FB70070 */ lw $s7, 0x0070($sp) /* 01954 80A0D014 03E00008 */ jr $ra /* 01958 80A0D018 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D40C.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D40C.s index 525dc684dc..4f3fd46c68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D40C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D40C.s @@ -63,5 +63,3 @@ glabel func_80A0D40C /* 01E30 80A0D4F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E34 80A0D4F4 03E00008 */ jr $ra /* 01E38 80A0D4F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D4FC.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D4FC.s index 7a454bcd05..d287f32ce5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D4FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D4FC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A0E1DC + .float 0.2 + +glabel D_80A0E1E0 + .float 0.4 + +.text glabel func_80A0D4FC /* 01E3C 80A0D4FC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01E40 80A0D500 F7B60020 */ sdc1 $f22, 0x0020($sp) @@ -74,5 +82,3 @@ glabel func_80A0D4FC /* 01F48 80A0D608 8FB20030 */ lw $s2, 0x0030($sp) /* 01F4C 80A0D60C 03E00008 */ jr $ra /* 01F50 80A0D610 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D614.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D614.s index 4096b2d422..19a87e8cea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D614.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D614.s @@ -74,5 +74,3 @@ glabel func_80A0D614 /* 02064 80A0D724 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 00000658 /* 02068 80A0D728 03E00008 */ jr $ra /* 0206C 80A0D72C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s index ef4f56e189..13d940ce79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A0E140 + .asciz "../z_en_fd.c" + .balign 4 + +glabel D_80A0E150 + .asciz "../z_en_fd.c" + .balign 4 + +glabel D_80A0E160 + .asciz "../z_en_fd.c" + .balign 4 + +.text glabel func_80A0D730 /* 02070 80A0D730 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 02074 80A0D734 AFBF005C */ sw $ra, 0x005C($sp) @@ -271,5 +285,3 @@ glabel func_80A0D730 /* 02478 80A0DB38 8FBE0058 */ lw $s8, 0x0058($sp) /* 0247C 80A0DB3C 03E00008 */ jr $ra /* 02480 80A0DB40 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s index 218bc627b5..67e3cfcbe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A0E170 + .asciz "../z_en_fd.c" + .balign 4 + +glabel D_80A0E180 + .asciz "../z_en_fd.c" + .balign 4 + +glabel D_80A0E190 + .asciz "../z_en_fd.c" + .balign 4 + +.text glabel func_80A0DB44 /* 02484 80A0DB44 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 02488 80A0DB48 AFB5003C */ sw $s5, 0x003C($sp) @@ -181,4 +195,3 @@ glabel func_80A0DB44 /* 02734 80A0DDF4 03E00008 */ jr $ra /* 02738 80A0DDF8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0273C 80A0DDFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s index f855114221..d24933edb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s @@ -10,5 +10,3 @@ glabel EnFdFire_Destroy /* 00250 80A0E700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00254 80A0E704 03E00008 */ jr $ra /* 00258 80A0E708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s index 328a5dc018..b2246bc57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s @@ -1,3 +1,32 @@ +.rdata +glabel D_80A0F0F0 + .asciz "../z_en_fd_fire.c" + .balign 4 + +glabel D_80A0F104 + .asciz "../z_en_fd_fire.c" + .balign 4 + +glabel D_80A0F118 + .asciz "../z_en_fd_fire.c" + .balign 4 + +.late_rodata +glabel D_80A0F138 + .float 9.58738019108e-05 + +glabel D_80A0F13C + .word 0x3C8EFA35 +glabel D_80A0F140 + .float 0.001 + +glabel D_80A0F144 + .float 0.1 + +glabel D_80A0F148 + .word 0xBE199999, 0x00000000 + +.text glabel EnFdFire_Draw /* 00730 80A0EBE0 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 00734 80A0EBE4 3C0F80A1 */ lui $t7, %hi(D_80A0F0C4) ## $t7 = 80A10000 @@ -272,4 +301,3 @@ glabel EnFdFire_Draw /* 00B54 80A0F004 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 00B58 80A0F008 00000000 */ nop /* 00B5C 80A0F00C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s index a8c5927d95..c7813b6823 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0F12C + .word 0xBF19999A + +.text glabel EnFdFire_Init /* 0012C 80A0E5DC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00130 80A0E5E0 AFBF001C */ sw $ra, 0x001C($sp) @@ -70,5 +75,3 @@ glabel EnFdFire_Init /* 00228 80A0E6D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0022C 80A0E6DC 03E00008 */ jr $ra /* 00230 80A0E6E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s index dace8f3ee0..665815c843 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s @@ -67,5 +67,3 @@ glabel EnFdFire_Update /* 00724 80A0EBD4 8FB10020 */ lw $s1, 0x0020($sp) /* 00728 80A0EBD8 03E00008 */ jr $ra /* 0072C 80A0EBDC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E4B0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E4B0.s index d3c085c0e1..c0ca666997 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E4B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E4B0.s @@ -52,5 +52,3 @@ glabel func_80A0E4B0 .L80A0E570: /* 000C0 80A0E570 03E00008 */ jr $ra /* 000C4 80A0E574 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E578.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E578.s index ed5d9b97b4..cda65fa522 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E578.s @@ -28,5 +28,3 @@ glabel func_80A0E578 .L80A0E5D4: /* 00124 80A0E5D4 03E00008 */ jr $ra /* 00128 80A0E5D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E70C.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E70C.s index 4919e5c10c..fa948fdf86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E70C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E70C.s @@ -83,5 +83,3 @@ glabel func_80A0E70C /* 0038C 80A0E83C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00390 80A0E840 03E00008 */ jr $ra /* 00394 80A0E844 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E848.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E848.s index 30eb78fdc6..35c5999137 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E848.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E848.s @@ -17,5 +17,3 @@ glabel func_80A0E848 .L80A0E87C: /* 003CC 80A0E87C 03E00008 */ jr $ra /* 003D0 80A0E880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E884.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E884.s index f2b1367f21..a4266aaaa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0E884.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0F130 + .float 0.1 + +.text glabel func_80A0E884 /* 003D4 80A0E884 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 003D8 80A0E888 AFB00020 */ sw $s0, 0x0020($sp) @@ -118,5 +123,3 @@ glabel func_80A0E884 /* 00578 80A0EA28 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0057C 80A0EA2C 03E00008 */ jr $ra /* 00580 80A0EA30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0EA34.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0EA34.s index 0e0ed00c62..ca788d8186 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0EA34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/func_80A0EA34.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A0F134 + .float 0.01 + +.text glabel func_80A0EA34 /* 00584 80A0EA34 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00588 80A0EA38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 @@ -48,5 +53,3 @@ glabel func_80A0EA34 /* 0062C 80A0EADC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00630 80A0EAE0 03E00008 */ jr $ra /* 00634 80A0EAE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s index 93d4737e53..67972da0a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s @@ -31,5 +31,3 @@ glabel EnFhgFire_Destroy /* 0048C 80A0F6EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00490 80A0F6F0 03E00008 */ jr $ra /* 00494 80A0F6F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s index dbddfe353a..b02d61ea27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s @@ -1,3 +1,45 @@ +.rdata +glabel D_80A11920 + .asciz "../z_en_fhg_fire.c" + .balign 4 + +glabel D_80A11934 + .asciz "../z_en_fhg_fire.c" + .balign 4 + +glabel D_80A11948 + .asciz "yari hikari draw 1\n" + .balign 4 + +glabel D_80A1195C + .asciz "../z_en_fhg_fire.c" + .balign 4 + +glabel D_80A11970 + .asciz "../z_en_fhg_fire.c" + .balign 4 + +glabel D_80A11984 + .asciz "FF DRAW 1\n" + .balign 4 + +glabel D_80A11990 + .asciz "../z_en_fhg_fire.c" + .balign 4 + +glabel D_80A119A4 + .asciz "FF DRAW 2\n" + .balign 4 + +glabel D_80A119B0 + .asciz "../z_en_fhg_fire.c" + .balign 4 + +.late_rodata +glabel D_80A11A04 + .word 0x40490FF9, 0x00000000, 0x00000000 + +.text glabel EnFhgFire_Draw /* 01ED8 80A11138 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 01EDC 80A1113C AFBF003C */ sw $ra, 0x003C($sp) @@ -411,4 +453,3 @@ glabel EnFhgFire_Draw /* 02504 80A11764 00000000 */ nop /* 02508 80A11768 00000000 */ nop /* 0250C 80A1176C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s index 2390aaf8a0..d0b4cb9e6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A11840 + .asciz "yari hikari ct 1\n" + .balign 4 + +glabel D_80A11854 + .asciz "yari hikari ct 2\n" + .balign 4 + +.late_rodata +glabel D_80A119C4 + .word 0x3E051EB8 +glabel D_80A119C8 + .word 0x4622F983 +glabel D_80A119CC + .word 0x4622F983 + +.text glabel EnFhgFire_Init /* 00008 80A0F268 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0000C 80A0F26C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -291,5 +309,3 @@ glabel EnFhgFire_Init /* 00420 80A0F680 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00424 80A0F684 03E00008 */ jr $ra /* 00428 80A0F688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s index 44a1cc18e0..e680213d19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s @@ -21,5 +21,3 @@ glabel EnFhgFire_Update /* 01ECC 80A1112C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01ED0 80A11130 03E00008 */ jr $ra /* 01ED4 80A11134 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s index 7e36df08cf..c4e857ed23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s @@ -1,5 +1,3 @@ glabel func_80A0F260 /* 00000 80A0F260 03E00008 */ jr $ra /* 00004 80A0F264 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s index 8d566cf20e..a2fd095578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A119D0 + .word 0xBE4CCCCD + +.text glabel func_80A0F6F8 /* 00498 80A0F6F8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0049C 80A0F6FC AFB10044 */ sw $s1, 0x0044($sp) @@ -251,5 +256,3 @@ glabel func_80A0F6F8 /* 00824 80A0FA84 8FB40050 */ lw $s4, 0x0050($sp) /* 00828 80A0FA88 03E00008 */ jr $ra /* 0082C 80A0FA8C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s index 7661677c7b..0996d40288 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A11868 + .asciz "FF MOVE 1\n" + .balign 4 + +glabel D_80A11874 + .asciz "FF MOVE 2\n" + .balign 4 + +.text glabel func_80A0FA90 /* 00830 80A0FA90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00834 80A0FA94 AFB00018 */ sw $s0, 0x0018($sp) @@ -125,5 +135,3 @@ glabel func_80A0FA90 /* 009DC 80A0FC3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009E0 80A0FC40 03E00008 */ jr $ra /* 009E4 80A0FC44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s index a9325f9270..309ccbe865 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s @@ -90,5 +90,3 @@ glabel func_80A0FC48 /* 00B20 80A0FD80 8FB10020 */ lw $s1, 0x0020($sp) /* 00B24 80A0FD84 03E00008 */ jr $ra /* 00B28 80A0FD88 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s index f980f5f196..01051b5261 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s @@ -178,5 +178,3 @@ glabel func_80A0FD8C /* 00D9C 80A0FFFC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00DA0 80A10000 03E00008 */ jr $ra /* 00DA4 80A10004 A420FD0C */ sh $zero, -0x02F4($at) ## 8015FD0C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s index 665201f5a9..16235991cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80A11880 + .asciz "yari hikari 1\n" + .balign 4 + +glabel D_80A11890 + .asciz "yari hikari 2\n" + .balign 4 + +glabel D_80A118A0 + .asciz "FLASH !!\n" + .balign 4 + +.late_rodata +glabel D_80A119D4 + .word 0x469C4000 +glabel D_80A119D8 + .word 0xBDA3D70A + +.text glabel func_80A10008 /* 00DA8 80A10008 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00DAC 80A1000C AFB10038 */ sw $s1, 0x0038($sp) @@ -149,5 +169,3 @@ glabel func_80A10008 /* 00FB4 80A10214 8FB50048 */ lw $s5, 0x0048($sp) /* 00FB8 80A10218 03E00008 */ jr $ra /* 00FBC 80A1021C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index 31e226a05c..59fe766655 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -1,3 +1,47 @@ +.rdata +glabel D_80A118AC + .asciz "F_FIRE_MODE %d\n" + .balign 4 + +glabel D_80A118BC + .asciz "fly_mode %d\n" + .balign 4 + +glabel D_80A118CC + .asciz "BEFORE setAC %d\n" + .balign 4 + +glabel D_80A118E0 + .asciz "AFTER setAC\n" + .balign 4 + +glabel D_80A118F0 + .asciz "なぜだああああああああ %d\n" + .balign 4 + +.late_rodata +glabel D_80A119DC + .word 0x469C4000 +glabel D_80A119E0 + .word 0xBDA3D70A +glabel D_80A119E4 + .word 0x4622F983 +glabel D_80A119E8 + .word 0x4622F983 +glabel D_80A119EC + .word 0x4622F983 +glabel D_80A119F0 + .word 0x4622F983 +glabel D_80A119F4 + .word 0x4622F983 +glabel D_80A119F8 + .word 0x4622F983 +glabel D_80A119FC + .word 0x4622F983 +glabel D_80A11A00 + .word 0xBDCCCCCD + +.text glabel func_80A10220 /* 00FC0 80A10220 27BDFEF0 */ addiu $sp, $sp, 0xFEF0 ## $sp = FFFFFEF0 /* 00FC4 80A10224 AFBF0044 */ sw $ra, 0x0044($sp) @@ -909,5 +953,3 @@ glabel func_80A10220 /* 01CAC 80A10F0C 8FB10040 */ lw $s1, 0x0040($sp) /* 01CB0 80A10F10 03E00008 */ jr $ra /* 01CB4 80A10F14 27BD0110 */ addiu $sp, $sp, 0x0110 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s index 7aee5b136d..93f4fca3bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A11910 + .asciz "EFC 1\n" + .balign 4 + +glabel D_80A11918 + .asciz "EFC 2\n" + .balign 4 + +.text glabel func_80A10F18 /* 01CB8 80A10F18 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01CBC 80A10F1C AFBF001C */ sw $ra, 0x001C($sp) @@ -133,5 +143,3 @@ glabel func_80A10F18 /* 01E7C 80A110DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01E80 80A110E0 03E00008 */ jr $ra /* 01E84 80A110E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s index fc1e4afa20..edd300c7eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A12D90 + .asciz "\n\n" + .balign 4 + +glabel D_80A12D94 + .asciz "☆☆☆☆☆ 発生数回復 ☆☆☆☆☆%d\n" + .balign 4 + +glabel D_80A12DC0 + .asciz "\n\n" + .balign 4 + +.text glabel EnFireRock_Destroy /* 00410 80A12030 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00414 80A12034 AFBF0014 */ sw $ra, 0x0014($sp) @@ -44,5 +58,3 @@ glabel EnFireRock_Destroy /* 004A0 80A120C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004A4 80A120C4 03E00008 */ jr $ra /* 004A8 80A120C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s index 044dc803bd..1575b463da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80A12E58 + .asciz "../z_en_fire_rock.c" + .balign 4 + +glabel D_80A12E6C + .asciz "../z_en_fire_rock.c" + .balign 4 + +glabel D_80A12E80 + .asciz "../z_en_fire_rock.c" + .balign 4 + +.late_rodata +glabel D_80A12EE0 + .word 0x3C8EFA35 +glabel D_80A12EE4 + .word 0x3C8EFA35 +glabel D_80A12EE8 + .word 0x3C8EFA35, 0x00000000 + +.text glabel EnFireRock_Draw /* 00EB0 80A12AD0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00EB4 80A12AD4 AFBF001C */ sw $ra, 0x001C($sp) @@ -107,4 +129,3 @@ glabel EnFireRock_Draw /* 01054 80A12C74 00000000 */ nop /* 01058 80A12C78 00000000 */ nop /* 0105C 80A12C7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s index cd043a9ad5..a1bd7ab187 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s @@ -1,3 +1,45 @@ +.rdata +glabel D_80A12D00 + .asciz "☆☆☆☆☆ 天井待ち岩 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A12D2C + .asciz "☆☆☆☆☆ 床岩 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A12D54 + .asciz "☆☆☆☆☆ そんな岩はねぇ！ERR!!!!!! ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel jtbl_80A12E94 +.word L80A11D9C +.word L80A11E70 +.word L80A11F50 +.word L80A11DD8 +.word L80A12008 +.word L80A11CF4 +.word L80A11D14 +glabel D_80A12EB0 + .float 0.02 + +glabel D_80A12EB4 + .word 0x477FFF00 +glabel D_80A12EB8 + .float 0.02 + +glabel D_80A12EBC + .word 0x477FFF00 +glabel D_80A12EC0 + .float 0.01 + +glabel D_80A12EC4 + .float -1.2 + +glabel D_80A12EC8 + .word 0x477FFF00 + +.text glabel EnFireRock_Init /* 00000 80A11C20 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80A11C24 AFBF001C */ sw $ra, 0x001C($sp) @@ -301,5 +343,3 @@ glabel L80A12008 /* 00404 80A12024 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00408 80A12028 03E00008 */ jr $ra /* 0040C 80A1202C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s index 155cc9d777..8960e5e361 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A12E24 + .asciz "☆☆☆☆☆ シールド防御 Lv１ ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel D_80A12EDC + .word 0xBE99999A + +.text glabel EnFireRock_Update /* 00BF4 80A12814 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00BF8 80A12818 AFBF0024 */ sw $ra, 0x0024($sp) @@ -195,5 +205,3 @@ glabel EnFireRock_Update /* 00EA4 80A12AC4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00EA8 80A12AC8 03E00008 */ jr $ra /* 00EAC 80A12ACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s index 8a2d56299c..d0411c2290 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A12ECC + .word 0xC61C4000 +glabel D_80A12ED0 + .word 0xC4A14000 +glabel D_80A12ED4 + .word 0xC5728000 + +.text glabel func_80A120CC /* 004AC 80A120CC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 004B0 80A120D0 AFBF0044 */ sw $ra, 0x0044($sp) @@ -237,5 +246,3 @@ glabel func_80A120CC /* 007F0 80A12410 8FB20040 */ lw $s2, 0x0040($sp) /* 007F4 80A12414 03E00008 */ jr $ra /* 007F8 80A12418 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s index 4687eb086b..1f9b5cf785 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A12DC4 + .asciz "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel D_80A12ED8 + .float 0.01 + +.text glabel func_80A1241C /* 007FC 80A1241C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00800 80A12420 AFBF0074 */ sw $ra, 0x0074($sp) @@ -117,5 +127,3 @@ glabel func_80A1241C /* 0098C 80A125AC 8FB60070 */ lw $s6, 0x0070($sp) /* 00990 80A125B0 03E00008 */ jr $ra /* 00994 80A125B4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s index 2f2b512106..11696f8195 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A12DF4 + .asciz "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A125B8 /* 00998 80A125B8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0099C 80A125BC AFBF004C */ sw $ra, 0x004C($sp) @@ -103,5 +109,3 @@ glabel func_80A125B8 /* 00B04 80A12724 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00B08 80A12728 03E00008 */ jr $ra /* 00B0C 80A1272C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s index aed8034242..e9589bafb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s @@ -62,5 +62,3 @@ glabel func_80A12730 /* 00BE8 80A12808 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00BEC 80A1280C 03E00008 */ jr $ra /* 00BF0 80A12810 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s index c14bd8cb7b..593f0eb08a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s @@ -9,5 +9,3 @@ glabel EnFirefly_Destroy /* 00278 80A132E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0027C 80A132EC 03E00008 */ jr $ra /* 00280 80A132F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s index 347d94f1e6..d8d8eda1bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A14FE0 + .asciz "../z_en_firefly.c" + .balign 4 + +glabel D_80A14FF4 + .asciz "../z_en_firefly.c" + .balign 4 + +.text glabel EnFirefly_Draw /* 01CD0 80A14D40 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01CD4 80A14D44 AFBF002C */ sw $ra, 0x002C($sp) @@ -59,5 +69,3 @@ glabel EnFirefly_Draw /* 01DAC 80A14E1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01DB0 80A14E20 03E00008 */ jr $ra /* 01DB4 80A14E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s index d999ddecf2..4d448bf2ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s @@ -139,5 +139,3 @@ glabel EnFirefly_Init /* 00250 80A132C0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00254 80A132C4 03E00008 */ jr $ra /* 00258 80A132C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s index ff551494ac..6a0ac7ba22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s @@ -191,5 +191,3 @@ glabel EnFirefly_Update /* 018E4 80A14954 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 018E8 80A14958 03E00008 */ jr $ra /* 018EC 80A1495C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13070.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13070.s index e6073d3e7b..907408a0e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13070.s @@ -9,5 +9,3 @@ glabel func_80A13070 /* 0001C 80A1308C A08001B9 */ sb $zero, 0x01B9($a0) ## 000001B9 /* 00020 80A13090 03E00008 */ jr $ra /* 00024 80A13094 A0990117 */ sb $t9, 0x0117($a0) ## 00000117 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13098.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13098.s index eef443d384..fe97efb082 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13098.s @@ -16,5 +16,3 @@ glabel func_80A13098 /* 00058 80A130C8 A08201B9 */ sb $v0, 0x01B9($a0) ## 000001B9 /* 0005C 80A130CC 03E00008 */ jr $ra /* 00060 80A130D0 A0980117 */ sb $t8, 0x0117($a0) ## 00000117 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A132F4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A132F4.s index 9def4e4be0..cf269e2dcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A132F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A132F4.s @@ -46,5 +46,3 @@ glabel func_80A132F4 /* 00324 80A13394 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00328 80A13398 03E00008 */ jr $ra /* 0032C 80A1339C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s index dd28398c5f..9e8bf09bc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s @@ -42,5 +42,3 @@ glabel func_80A133A0 /* 003C8 80A13438 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003CC 80A1343C 03E00008 */ jr $ra /* 003D0 80A13440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13444.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13444.s index 2a91a0f812..eed61d2432 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13444.s @@ -7,5 +7,3 @@ glabel func_80A13444 /* 003E8 80A13458 AC8F01B4 */ sw $t7, 0x01B4($a0) ## 000001B4 /* 003EC 80A1345C 03E00008 */ jr $ra /* 003F0 80A13460 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13464.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13464.s index b5a30cdb4c..b55866559a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13464.s @@ -13,5 +13,3 @@ glabel func_80A13464 /* 00420 80A13490 E484018C */ swc1 $f4, 0x018C($a0) ## 0000018C /* 00424 80A13494 03E00008 */ jr $ra /* 00428 80A13498 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1349C.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1349C.s index 4e39540349..6148ac61d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1349C.s @@ -29,5 +29,3 @@ glabel func_80A1349C /* 00490 80A13500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00494 80A13504 03E00008 */ jr $ra /* 00498 80A13508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1350C.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1350C.s index f4fd88f5b3..8c7b571036 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1350C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1350C.s @@ -10,5 +10,3 @@ glabel func_80A1350C /* 004BC 80A1352C AC9801B4 */ sw $t8, 0x01B4($a0) ## 000001B4 /* 004C0 80A13530 03E00008 */ jr $ra /* 004C4 80A13534 E484018C */ swc1 $f4, 0x018C($a0) ## 0000018C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13538.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13538.s index 0c32aa04f0..0c3e386d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13538.s @@ -28,5 +28,3 @@ glabel func_80A13538 /* 0052C 80A1359C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00530 80A135A0 03E00008 */ jr $ra /* 00534 80A135A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s index 7ce88b7513..965ff0fe0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A15030 + .float 0.85 + +glabel D_80A15034 + .float 0.15 + +.text glabel func_80A135A8 /* 00538 80A135A8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 0053C 80A135AC AFBF006C */ sw $ra, 0x006C($sp) @@ -110,5 +118,3 @@ glabel func_80A135A8 /* 006C8 80A13738 D7B40038 */ ldc1 $f20, 0x0038($sp) /* 006CC 80A1373C 03E00008 */ jr $ra /* 006D0 80A13740 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13744.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13744.s index 4f5a0edbb2..9c01c89381 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13744.s @@ -7,5 +7,3 @@ glabel func_80A13744 /* 006E8 80A13758 AC8F01B4 */ sw $t7, 0x01B4($a0) ## 000001B4 /* 006EC 80A1375C 03E00008 */ jr $ra /* 006F0 80A13760 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13764.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13764.s index d0e7dc0beb..3dd5886311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13764.s @@ -13,5 +13,3 @@ glabel func_80A13764 /* 00720 80A13790 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 /* 00724 80A13794 03E00008 */ jr $ra /* 00728 80A13798 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1379C.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1379C.s index cb55a6a3b7..f05176f8b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1379C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1379C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A15038 + .float 0.05 + +.text glabel func_80A1379C /* 0072C 80A1379C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00730 80A137A0 AFBF001C */ sw $ra, 0x001C($sp) @@ -76,5 +81,3 @@ glabel func_80A1379C /* 0083C 80A138AC 8FB10018 */ lw $s1, 0x0018($sp) /* 00840 80A138B0 03E00008 */ jr $ra /* 00844 80A138B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A138B8.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A138B8.s index 999ef0f736..2430004b6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A138B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A138B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1503C + .word 0x4708B800 + +.text glabel func_80A138B8 /* 00848 80A138B8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0084C 80A138BC AFBF002C */ sw $ra, 0x002C($sp) @@ -90,5 +95,3 @@ glabel func_80A138B8 /* 0098C 80A139FC 8FB30028 */ lw $s3, 0x0028($sp) /* 00990 80A13A00 03E00008 */ jr $ra /* 00994 80A13A04 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s index 41545d5105..53df3e91b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A15040 + .float 0.8 + +glabel D_80A15044 + .word 0x3EB33333 + +.text glabel func_80A13A08 /* 00998 80A13A08 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0099C 80A13A0C AFB00020 */ sw $s0, 0x0020($sp) @@ -188,5 +196,3 @@ glabel func_80A13A08 /* 00C1C 80A13C8C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00C20 80A13C90 03E00008 */ jr $ra /* 00C24 80A13C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13C98.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13C98.s index bff7bcaf85..8ceb5b41af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13C98.s @@ -60,5 +60,3 @@ glabel func_80A13C98 /* 00CEC 80A13D5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CF0 80A13D60 03E00008 */ jr $ra /* 00CF4 80A13D64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13D68.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13D68.s index 817c6859ce..bd82559b1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13D68.s @@ -35,5 +35,3 @@ glabel func_80A13D68 /* 00D68 80A13DD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D6C 80A13DDC 03E00008 */ jr $ra /* 00D70 80A13DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s index edb2c90985..34377ebdc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s @@ -150,5 +150,3 @@ glabel func_80A13DE4 /* 00F78 80A13FE8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00F7C 80A13FEC 03E00008 */ jr $ra /* 00F80 80A13FF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13FF4.s index 19a32f5da7..2e66cc4529 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13FF4.s @@ -42,5 +42,3 @@ glabel func_80A13FF4 /* 0100C 80A1407C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01010 80A14080 03E00008 */ jr $ra /* 01014 80A14084 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14088.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14088.s index 9f17f9dbfb..346e549c50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14088.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14088.s @@ -105,5 +105,3 @@ glabel func_80A14088 /* 01174 80A141E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01178 80A141E8 03E00008 */ jr $ra /* 0117C 80A141EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A141F0.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A141F0.s index 191fa260df..efeffd2f0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A141F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A141F0.s @@ -47,5 +47,3 @@ glabel func_80A141F0 /* 01218 80A14288 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0121C 80A1428C 03E00008 */ jr $ra /* 01220 80A14290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14294.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14294.s index 3ba5f45370..8b5468cf3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14294.s @@ -26,5 +26,3 @@ glabel func_80A14294 /* 01278 80A142E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0127C 80A142EC 03E00008 */ jr $ra /* 01280 80A142F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A142F4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A142F4.s index f3871b396c..2a7cb6da6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A142F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A142F4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A15048 + .float 0.02 + +.text glabel func_80A142F4 /* 01284 80A142F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01288 80A142F8 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +59,3 @@ glabel func_80A142F4 /* 01338 80A143A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0133C 80A143AC 03E00008 */ jr $ra /* 01340 80A143B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A143B4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A143B4.s index 9169d2cfaa..5ab1558323 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A143B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A143B4.s @@ -61,5 +61,3 @@ glabel func_80A143B4 /* 01410 80A14480 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01414 80A14484 03E00008 */ jr $ra /* 01418 80A14488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s index 59236bc3b7..a99f7d0e77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s @@ -32,5 +32,3 @@ glabel func_80A1448C /* 01490 80A14500 8FB00028 */ lw $s0, 0x0028($sp) /* 01494 80A14504 03E00008 */ jr $ra /* 01498 80A14508 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1450C.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1450C.s index 07b82d0586..55582e4c75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1450C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1450C.s @@ -117,5 +117,3 @@ glabel func_80A1450C /* 0163C 80A146AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01640 80A146B0 03E00008 */ jr $ra /* 01644 80A146B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14960.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14960.s index f0dfebdbcb..f10e79b1b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14960.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14960.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1504C + .word 0x450FC000 + +.text glabel func_80A14960 /* 018F0 80A14960 8FAF0014 */ lw $t7, 0x0014($sp) /* 018F4 80A14964 3C0E80A1 */ lui $t6, %hi(func_80A14E28) ## $t6 = 80A10000 @@ -22,5 +27,3 @@ glabel func_80A14960 .L80A149AC: /* 0193C 80A149AC 03E00008 */ jr $ra /* 01940 80A149B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A149B4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A149B4.s index 901eab6c4f..a0eedc13c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A149B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A149B4.s @@ -249,5 +249,3 @@ glabel func_80A149B4 /* 01CC4 80A14D34 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 01CC8 80A14D38 03E00008 */ jr $ra /* 01CCC 80A14D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s index b00bf1885c..f2b5634ee2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A15008 + .asciz "../z_en_firefly.c" + .balign 4 + +glabel D_80A1501C + .asciz "../z_en_firefly.c" + .balign 4 + +.text glabel func_80A14E28 /* 01DB8 80A14E28 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01DBC 80A14E2C AFBF002C */ sw $ra, 0x002C($sp) @@ -59,4 +69,3 @@ glabel func_80A14E28 /* 01E94 80A14F04 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01E98 80A14F08 03E00008 */ jr $ra /* 01E9C 80A14F0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s index 5f672806d5..0e8f6a7ac9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s @@ -9,5 +9,3 @@ glabel EnFish_Destroy /* 00344 80A155C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00348 80A155C8 03E00008 */ jr $ra /* 0034C 80A155CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s index dcf7ca467f..434dfbed64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s @@ -24,4 +24,3 @@ glabel EnFish_Draw /* 01D84 80A17004 00000000 */ nop /* 01D88 80A17008 00000000 */ nop /* 01D8C 80A1700C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s index 6628950a41..c51f9130ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A17194 + .float 65535.5 +glabel D_80A17198 + .float 65535.5 + +.text glabel EnFish_Init /* 001E8 80A15468 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 001EC 80A1546C AFBF002C */ sw $ra, 0x002C($sp) @@ -86,5 +93,3 @@ glabel EnFish_Init /* 0031C 80A1559C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00320 80A155A0 03E00008 */ jr $ra /* 00324 80A155A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Update.s index b6bf632b11..0da2349439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Update.s @@ -46,5 +46,3 @@ glabel EnFish_Update /* 01D20 80A16FA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D24 80A16FA4 03E00008 */ jr $ra /* 01D28 80A16FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15280.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15280.s index bb63354163..8dab53dcfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15280.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15280.s @@ -10,5 +10,3 @@ glabel func_80A15280 /* 00020 80A152A0 460C6482 */ mul.s $f18, $f12, $f12 /* 00024 80A152A4 03E00008 */ jr $ra /* 00028 80A152A8 46128000 */ add.s $f0, $f16, $f18 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s index b956e0d83c..380a8b4f74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s @@ -26,5 +26,3 @@ glabel func_80A152AC /* 00084 80A15304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00088 80A15308 03E00008 */ jr $ra /* 0008C 80A1530C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s index d6cea708b1..175e0a97f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s @@ -26,5 +26,3 @@ glabel func_80A15310 /* 000E8 80A15368 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000EC 80A1536C 03E00008 */ jr $ra /* 000F0 80A15370 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15374.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15374.s index d78ab0eee5..ee3f9ecc03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15374.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15374.s @@ -14,5 +14,3 @@ glabel func_80A15374 /* 00120 80A153A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00124 80A153A4 03E00008 */ jr $ra /* 00128 80A153A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A153AC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A153AC.s index 26a2195287..696facc0fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A153AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A153AC.s @@ -39,5 +39,3 @@ glabel func_80A153AC /* 001B8 80A15438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001BC 80A1543C 03E00008 */ jr $ra /* 001C0 80A15440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15444.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15444.s index 2131bde75d..57d283625f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15444.s @@ -8,5 +8,3 @@ glabel func_80A15444 /* 001DC 80A1545C AFA40000 */ sw $a0, 0x0000($sp) /* 001E0 80A15460 03E00008 */ jr $ra /* 001E4 80A15464 E4207018 */ swc1 $f0, %lo(D_80A17018)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s index 6235255568..f72ddf9c01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s @@ -50,5 +50,3 @@ glabel func_80A155D0 /* 003FC 80A1567C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00400 80A15680 03E00008 */ jr $ra /* 00404 80A15684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s index 280ac9cae2..5e69dc1bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s @@ -61,5 +61,3 @@ glabel func_80A15688 /* 004E8 80A15768 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004EC 80A1576C 03E00008 */ jr $ra /* 004F0 80A15770 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15774.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15774.s index 52342d87f2..3acd248b7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15774.s @@ -12,5 +12,3 @@ glabel func_80A15774 .L80A1579C: /* 0051C 80A1579C 03E00008 */ jr $ra /* 00520 80A157A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s index 72ad6b81b9..9bd3bc7ecd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s @@ -22,5 +22,3 @@ glabel func_80A157A4 /* 00570 80A157F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00574 80A157F4 03E00008 */ jr $ra /* 00578 80A157F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s index 05f52edb07..e7392d30bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A1719C + .float 1.4 + +glabel D_80A171A0 + .float 0.8 + +.text glabel func_80A157FC /* 0057C 80A157FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00580 80A15800 AFBF0024 */ sw $ra, 0x0024($sp) @@ -65,5 +73,3 @@ glabel func_80A157FC /* 00660 80A158E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00664 80A158E4 03E00008 */ jr $ra /* 00668 80A158E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s index 0820f727e6..fd3bb4e7e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s @@ -22,5 +22,3 @@ glabel func_80A158EC /* 006B8 80A15938 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006BC 80A1593C 03E00008 */ jr $ra /* 006C0 80A15940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s index 498c014ea0..946f64b02b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A171A4 + .float 0.8 + +.text glabel func_80A15944 /* 006C4 80A15944 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 006C8 80A15948 AFBF0024 */ sw $ra, 0x0024($sp) @@ -110,5 +115,3 @@ glabel func_80A15944 /* 00848 80A15AC8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0084C 80A15ACC 03E00008 */ jr $ra /* 00850 80A15AD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s index 5e0b6548a5..58faecf505 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s @@ -22,5 +22,3 @@ glabel func_80A15AD4 /* 008A0 80A15B20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008A4 80A15B24 03E00008 */ jr $ra /* 008A8 80A15B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s index d103ebf502..460550e8be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A171A8 + .float 0.8 + +.text glabel func_80A15B2C /* 008AC 80A15B2C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 008B0 80A15B30 AFBF0024 */ sw $ra, 0x0024($sp) @@ -137,5 +142,3 @@ glabel func_80A15B2C /* 00A8C 80A15D0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00A90 80A15D10 03E00008 */ jr $ra /* 00A94 80A15D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s index f82ee1cd91..5b90be2a26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s @@ -20,5 +20,3 @@ glabel func_80A15D18 /* 00ADC 80A15D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AE0 80A15D60 03E00008 */ jr $ra /* 00AE4 80A15D64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s index f8f8338693..400e0d5c4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A171AC + .float 0.8 + +.text glabel func_80A15D68 /* 00AE8 80A15D68 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00AEC 80A15D6C AFBF0024 */ sw $ra, 0x0024($sp) @@ -122,5 +127,3 @@ glabel func_80A15D68 /* 00C98 80A15F18 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00C9C 80A15F1C 03E00008 */ jr $ra /* 00CA0 80A15F20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F24.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F24.s index e52735c461..ebb68e3c8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F24.s @@ -23,5 +23,3 @@ glabel func_80A15F24 /* 00CF8 80A15F78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CFC 80A15F7C 03E00008 */ jr $ra /* 00D00 80A15F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s index 341a8a47d2..1a15d3adf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s @@ -1,3 +1,27 @@ +.rdata +glabel D_80A170A0 + .asciz "\x1B[43;30m" + .balign 4 + +glabel D_80A170AC + .asciz "BG 抜け？ Actor_delete します(%s %d)\n" + .balign 4 + +glabel D_80A170D4 + .asciz "../z_en_sakana.c" + .balign 4 + +glabel D_80A170E8 + .asciz "\x1b[m" + .balign 4 +.late_rodata +glabel D_80A171B0 + .float 0.1 + +glabel D_80A171B4 + .float -31990.0 + +.text glabel func_80A15F84 /* 00D04 80A15F84 3C0180A1 */ lui $at, %hi(D_80A171B0) ## $at = 80A10000 /* 00D08 80A15F88 C42271B0 */ lwc1 $f2, %lo(D_80A171B0)($at) @@ -86,5 +110,3 @@ glabel func_80A15F84 /* 00E30 80A160B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E34 80A160B4 03E00008 */ jr $ra /* 00E38 80A160B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s index e69d64e17e..6491fa9035 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80A171B8 + .float 0.1 + +glabel D_80A171BC + .float 0.2 + +glabel D_80A171C0 + .float 1.2 + +glabel D_80A171C4 + .float 0.2 + +glabel D_80A171C8 + .float 0.2 + +.text glabel func_80A160BC /* 00E3C 80A160BC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00E40 80A160C0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -90,5 +107,3 @@ glabel func_80A160BC /* 00F74 80A161F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F78 80A161F8 03E00008 */ jr $ra /* 00F7C 80A161FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s index 72f01505d8..4b26179d34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A171CC + .float 0.1 + +glabel D_80A171D0 + .float 0.2 + +glabel D_80A171D4 + .float 0.3 + +.text glabel func_80A16200 /* 00F80 80A16200 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00F84 80A16204 AFBF0024 */ sw $ra, 0x0024($sp) @@ -132,5 +143,3 @@ glabel func_80A16200 /* 01150 80A163D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01154 80A163D4 03E00008 */ jr $ra /* 01158 80A163D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A163DC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A163DC.s index cd88a38123..9782acb806 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A163DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A163DC.s @@ -28,5 +28,3 @@ glabel func_80A163DC /* 011C4 80A16444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011C8 80A16448 03E00008 */ jr $ra /* 011CC 80A1644C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s index 6bd40dbbb2..bbe9c5bd9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A171D8 + .float 0.982 + +.text glabel func_80A16450 /* 011D0 80A16450 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 011D4 80A16454 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -127,5 +132,3 @@ glabel func_80A16450 /* 0138C 80A1660C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01390 80A16610 03E00008 */ jr $ra /* 01394 80A16614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s index 5eda87bb7f..c959d5fa46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s @@ -22,5 +22,3 @@ glabel func_80A16618 /* 013E4 80A16664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013E8 80A16668 03E00008 */ jr $ra /* 013EC 80A1666C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s index 4c5f52bb38..21e96b80d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A171DC + .float 1.2 + +glabel D_80A171E0 + .float 0.2 + +.text glabel func_80A16670 /* 013F0 80A16670 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 013F4 80A16674 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -152,5 +160,3 @@ glabel func_80A16670 /* 0160C 80A1688C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01610 80A16890 03E00008 */ jr $ra /* 01614 80A16894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s index 97ecbe658c..decc2cb657 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A171E4 + .float 0.1 + +glabel D_80A171E8 + .float 0.4 + +.text glabel func_80A16898 /* 01618 80A16898 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0161C 80A1689C AFB00018 */ sw $s0, 0x0018($sp) @@ -85,5 +93,3 @@ glabel func_80A16898 /* 0173C 80A169BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01740 80A169C0 03E00008 */ jr $ra /* 01744 80A169C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s index 856c854fc4..89adfc0708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s @@ -42,5 +42,3 @@ glabel func_80A169C8 /* 017D8 80A16A58 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 017DC 80A16A5C 03E00008 */ jr $ra /* 017E0 80A16A60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16A64.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16A64.s index 702317e0d0..5ecf012c65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16A64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16A64.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80A170EC + .asciz "Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80A17138 + .asciz "../z_en_sakana.c" + .balign 4 + +glabel D_80A1714C + .asciz "デモ魚消滅\n" + .balign 4 + +glabel D_80A17158 + .asciz "不正なデモ動作(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80A17180 + .asciz "../z_en_sakana.c" + .balign 4 + +.text glabel func_80A16A64 /* 017E4 80A16A64 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 017E8 80A16A68 AFBF0024 */ sw $ra, 0x0024($sp) @@ -140,5 +162,3 @@ glabel func_80A16A64 /* 019DC 80A16C5C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 019E0 80A16C60 03E00008 */ jr $ra /* 019E4 80A16C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s index 2c6f42d7d7..8ac340aff4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A171EC + .float 0.01 + +.text glabel func_80A16C68 /* 019E8 80A16C68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 019EC 80A16C6C AFBF0024 */ sw $ra, 0x0024($sp) @@ -110,5 +115,3 @@ glabel func_80A16C68 /* 01B60 80A16DE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B64 80A16DE4 03E00008 */ jr $ra /* 01B68 80A16DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16DEC.s index 637b3695b4..157b2bdbdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16DEC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A171F0 + .float 0.01 + +glabel D_80A171F4 + .float 0.01 + +glabel D_80A171F8 + .float 0.001 + +.text glabel func_80A16DEC /* 01B6C 80A16DEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01B70 80A16DF0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -80,5 +91,3 @@ glabel func_80A16DEC /* 01C74 80A16EF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C78 80A16EF8 03E00008 */ jr $ra /* 01C7C 80A16EFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s index 458b1ceae3..8f411d2efb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s @@ -10,5 +10,3 @@ glabel EnFloormas_Destroy /* 0022C 80A1773C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00230 80A17740 03E00008 */ jr $ra /* 00234 80A17744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s index 4378a440bd..4ada824a4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A1A514 + .asciz "../z_en_floormas.c" + .balign 4 + +glabel D_80A1A528 + .asciz "../z_en_floormas.c" + .balign 4 + +.text glabel EnFloormas_Draw /* 02D44 80A1A254 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02D48 80A1A258 AFB10028 */ sw $s1, 0x0028($sp) @@ -64,5 +74,3 @@ glabel EnFloormas_Draw /* 02E34 80A1A344 8FB10028 */ lw $s1, 0x0028($sp) /* 02E38 80A1A348 03E00008 */ jr $ra /* 02E3C 80A1A34C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s index a6fb262a8e..46d7824b84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s @@ -146,5 +146,3 @@ glabel EnFloormas_Init /* 00204 80A17714 8FB10030 */ lw $s1, 0x0030($sp) /* 00208 80A17718 03E00008 */ jr $ra /* 0020C 80A1771C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s index 7e72d7333d..e2f139ebe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A1A5B4 + .float 3000.0 + +glabel D_80A1A5B8 + .float 2500.0 + +.text glabel EnFloormas_Update /* 029B4 80A19EC4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 029B8 80A19EC8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -169,5 +177,3 @@ glabel EnFloormas_Update /* 02C0C 80A1A11C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02C10 80A1A120 03E00008 */ jr $ra /* 02C14 80A1A124 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s index a6549a5053..bc74db7ff1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s @@ -7,5 +7,3 @@ glabel func_80A17748 /* 0024C 80A1775C A09802D9 */ sb $t8, 0x02D9($a0) ## 000002D9 /* 00250 80A17760 03E00008 */ jr $ra /* 00254 80A17764 A4990196 */ sh $t9, 0x0196($a0) ## 00000196 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s index f2e46eb557..6468d84888 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s @@ -5,5 +5,3 @@ glabel func_80A17768 /* 00264 80A17774 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 /* 00268 80A17778 03E00008 */ jr $ra /* 0026C 80A1777C A08F02D9 */ sb $t7, 0x02D9($a0) ## 000002D9 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s index 0e38da5d10..2da717db50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s @@ -17,5 +17,3 @@ glabel func_80A17780 /* 002AC 80A177BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002B0 80A177C0 03E00008 */ jr $ra /* 002B4 80A177C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s index 9d467de615..37829b9846 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s @@ -15,5 +15,3 @@ glabel func_80A177C8 /* 002EC 80A177FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F0 80A17800 03E00008 */ jr $ra /* 002F4 80A17804 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s index 6e69bd4083..d4e8dbb69a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s @@ -37,5 +37,3 @@ glabel func_80A17808 /* 00378 80A17888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0037C 80A1788C 03E00008 */ jr $ra /* 00380 80A17890 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s index a9977f3445..79c8e0fd13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s @@ -17,5 +17,3 @@ glabel func_80A17894 /* 003C0 80A178D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003C4 80A178D4 03E00008 */ jr $ra /* 003C8 80A178D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s index 7fa5e5b6ad..0cd51db45c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s @@ -10,5 +10,3 @@ glabel func_80A178DC /* 003EC 80A178FC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 003F0 80A17900 03E00008 */ jr $ra /* 003F4 80A17904 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s index 02cb4f0e17..ea2ae2319b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A1A564 + .word 0x3B83126F +glabel D_80A1A568 + .word 0x3D888889 +glabel D_80A1A56C + .word 0x3E088889 + +.text glabel func_80A17908 /* 003F8 80A17908 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 003FC 80A1790C AFBF002C */ sw $ra, 0x002C($sp) @@ -81,5 +90,3 @@ glabel func_80A17908 /* 0051C 80A17A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00520 80A17A30 03E00008 */ jr $ra /* 00524 80A17A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s index 45f5d484dc..97d4fd7cc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s @@ -56,5 +56,3 @@ glabel func_80A17A38 /* 005F4 80A17B04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 005F8 80A17B08 03E00008 */ jr $ra /* 005FC 80A17B0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s index 75f2f8fb87..6787a43fb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A570 + .word 0xBE19999A + +.text glabel func_80A17B10 /* 00600 80A17B10 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 00604 80A17B14 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 @@ -11,5 +16,3 @@ glabel func_80A17B10 /* 00624 80A17B34 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C /* 00628 80A17B38 03E00008 */ jr $ra /* 0062C 80A17B3C E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s index b00d50fbfe..b7112b5555 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s @@ -46,5 +46,3 @@ glabel func_80A17B40 /* 006D0 80A17BE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 006D4 80A17BE4 03E00008 */ jr $ra /* 006D8 80A17BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s index d786f2dad3..986e4c2ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A574 + .float 0.6 + +.text glabel func_80A17BEC /* 006DC 80A17BEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 006E0 80A17BF0 AFBF002C */ sw $ra, 0x002C($sp) @@ -92,5 +97,3 @@ glabel func_80A17BEC /* 00830 80A17D40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00834 80A17D44 03E00008 */ jr $ra /* 00838 80A17D48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s index 8608a330d9..eacf43c02c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s @@ -19,5 +19,3 @@ glabel func_80A17D4C /* 00880 80A17D90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00884 80A17D94 03E00008 */ jr $ra /* 00888 80A17D98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s index a14133b207..748df73e6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s @@ -24,5 +24,3 @@ glabel func_80A17D9C /* 008E0 80A17DF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008E4 80A17DF4 03E00008 */ jr $ra /* 008E8 80A17DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s index b005a65292..88f15160bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s @@ -53,5 +53,3 @@ glabel func_80A17DFC /* 009B8 80A17EC8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 009BC 80A17ECC 03E00008 */ jr $ra /* 009C0 80A17ED0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s index 2b7afb3bf1..a486129aec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s @@ -26,5 +26,3 @@ glabel func_80A17ED4 /* 00A20 80A17F30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A24 80A17F34 03E00008 */ jr $ra /* 00A28 80A17F38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s index cdf02fdd20..bc5ed4de2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s @@ -26,5 +26,3 @@ glabel func_80A17F3C /* 00A88 80A17F98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A8C 80A17F9C 03E00008 */ jr $ra /* 00A90 80A17FA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s index 894db06fe4..9ba3c835f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A578 + .float 0.1 + +.text glabel func_80A17FA4 /* 00A94 80A17FA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00A98 80A17FA8 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -127,5 +132,3 @@ glabel func_80A17FA4 /* 00C60 80A18170 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00C64 80A18174 03E00008 */ jr $ra /* 00C68 80A18178 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s index b1677a05f6..4ccc654b16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s @@ -21,5 +21,3 @@ glabel func_80A1817C /* 00CB8 80A181C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CBC 80A181CC 03E00008 */ jr $ra /* 00CC0 80A181D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s index 1bccdb91e9..69045b6016 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s @@ -37,5 +37,3 @@ glabel func_80A181D4 /* 00D38 80A18248 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D3C 80A1824C 03E00008 */ jr $ra /* 00D40 80A18250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s index bf3618cd75..d4f2c94076 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s @@ -48,5 +48,3 @@ glabel func_80A18254 /* 00DF4 80A18304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DF8 80A18308 03E00008 */ jr $ra /* 00DFC 80A1830C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s index 1f89ba882c..bef1e99e9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s @@ -20,5 +20,3 @@ glabel func_80A18310 /* 00E48 80A18358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E4C 80A1835C 03E00008 */ jr $ra /* 00E50 80A18360 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s index 1dbb8f7e7d..9bbec5df9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A57C + .word 0x3B83126F + +.text glabel func_80A18364 /* 00E54 80A18364 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00E58 80A18368 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 @@ -69,5 +74,3 @@ glabel func_80A18364 /* 00F48 80A18458 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F4C 80A1845C 03E00008 */ jr $ra /* 00F50 80A18460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s index 7e40942fa9..e7694c7f7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A580 + .word 0x3B83126F + +.text glabel func_80A18464 /* 00F54 80A18464 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00F58 80A18468 AFBF001C */ sw $ra, 0x001C($sp) @@ -42,5 +47,3 @@ glabel func_80A18464 /* 00FE4 80A184F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FE8 80A184F8 03E00008 */ jr $ra /* 00FEC 80A184FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s index 4136fdcfec..a346f072c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s @@ -53,5 +53,3 @@ glabel func_80A18500 /* 010A8 80A185B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 010AC 80A185BC 03E00008 */ jr $ra /* 010B0 80A185C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s index 3d65e5a4b7..9b4c4a4f95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A584 + .word 0x3B83126F + +.text glabel func_80A185C4 /* 010B4 80A185C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 010B8 80A185C8 AFA5001C */ sw $a1, 0x001C($sp) @@ -39,5 +44,3 @@ glabel func_80A185C4 /* 01134 80A18644 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01138 80A18648 03E00008 */ jr $ra /* 0113C 80A1864C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s index 4f97b14edb..f8ab3fc95b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s @@ -96,5 +96,3 @@ glabel func_80A18650 /* 01290 80A187A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01294 80A187A4 03E00008 */ jr $ra /* 01298 80A187A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s index 63b401cd50..6535b7f514 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s @@ -15,5 +15,3 @@ glabel func_80A187AC /* 012C8 80A187D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012CC 80A187DC 03E00008 */ jr $ra /* 012D0 80A187E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s index 1c7c112106..eec52f046d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s @@ -73,5 +73,3 @@ glabel func_80A187E4 /* 013D4 80A188E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 013D8 80A188E8 03E00008 */ jr $ra /* 013DC 80A188EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s index fe159a309d..22c5517b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A1A588 + .word 0x3B83126F +glabel D_80A1A58C + .word 0x4528C000 +glabel D_80A1A590 + .word 0x4528C000 + +.text glabel func_80A188F0 /* 013E0 80A188F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 013E4 80A188F4 AFB00018 */ sw $s0, 0x0018($sp) @@ -126,5 +135,3 @@ glabel func_80A188F0 /* 01598 80A18AA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0159C 80A18AAC 03E00008 */ jr $ra /* 015A0 80A18AB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s index 9aea129829..9f97c5fc5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s @@ -36,5 +36,3 @@ glabel func_80A18AB4 /* 0161C 80A18B2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01620 80A18B30 03E00008 */ jr $ra /* 01624 80A18B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s index 2640e35e26..ca45e13f7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s @@ -83,5 +83,3 @@ glabel func_80A18B38 /* 0175C 80A18C6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01760 80A18C70 03E00008 */ jr $ra /* 01764 80A18C74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s index a7b2934a0a..11d3876156 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A594 + .word 0x3EAAAAAB + +.text glabel func_80A18C78 /* 01768 80A18C78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0176C 80A18C7C AFBF001C */ sw $ra, 0x001C($sp) @@ -66,5 +71,3 @@ glabel func_80A18C78 /* 0184C 80A18D5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01850 80A18D60 03E00008 */ jr $ra /* 01854 80A18D64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s index 6ed1b8eb90..06873ede56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A598 + .word 0x3B83126F + +.text glabel func_80A18D68 /* 01858 80A18D68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0185C 80A18D6C AFBF001C */ sw $ra, 0x001C($sp) @@ -140,5 +145,3 @@ glabel func_80A18D68 /* 01A34 80A18F44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A38 80A18F48 03E00008 */ jr $ra /* 01A3C 80A18F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s index 91cb9c0749..8241424019 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s @@ -39,5 +39,3 @@ glabel func_80A18F50 /* 01ABC 80A18FCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01AC0 80A18FD0 03E00008 */ jr $ra /* 01AC4 80A18FD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s index 23d99728db..a52c610adf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s @@ -68,5 +68,3 @@ glabel func_80A18FD8 /* 01BAC 80A190BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BB0 80A190C0 03E00008 */ jr $ra /* 01BB4 80A190C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s index a8de244b78..b11c1316b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s @@ -102,5 +102,3 @@ glabel func_80A190C8 /* 01D14 80A19224 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01D18 80A19228 03E00008 */ jr $ra /* 01D1C 80A1922C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s index e6e803fe4d..30c8717713 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s @@ -24,5 +24,3 @@ glabel func_80A19230 /* 01D70 80A19280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D74 80A19284 03E00008 */ jr $ra /* 01D78 80A19288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s index 0011b2c090..f7f76b8a82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s @@ -85,5 +85,3 @@ glabel func_80A1928C /* 01EA8 80A193B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01EAC 80A193BC 03E00008 */ jr $ra /* 01EB0 80A193C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s index a239ce6040..56445fd4a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A59C + .float 0.1 + +.text glabel func_80A193C4 /* 01EB4 80A193C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01EB8 80A193C8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -220,5 +225,3 @@ glabel func_80A193C4 /* 021C0 80A196D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 021C4 80A196D4 03E00008 */ jr $ra /* 021C8 80A196D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s index e5fa9c7206..6d84be86bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s @@ -144,5 +144,3 @@ glabel func_80A196DC /* 023D0 80A198E0 8FB10018 */ lw $s1, 0x0018($sp) /* 023D4 80A198E4 03E00008 */ jr $ra /* 023D8 80A198E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s index ff44e6082c..88ba453391 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A1A5A0 + .word 0x3BE56042 +glabel D_80A1A5A4 + .word 0x3B83126F +glabel D_80A1A5A8 + .float 0.01 + +.text glabel func_80A198EC /* 023DC 80A198EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 023E0 80A198F0 AFBF001C */ sw $ra, 0x001C($sp) @@ -190,5 +199,3 @@ glabel func_80A198EC /* 02680 80A19B90 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02684 80A19B94 03E00008 */ jr $ra /* 02688 80A19B98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s index 8676683a30..6999c23697 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s @@ -2,5 +2,3 @@ glabel func_80A19B9C /* 0268C 80A19B9C AFA40000 */ sw $a0, 0x0000($sp) /* 02690 80A19BA0 03E00008 */ jr $ra /* 02694 80A19BA4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s index 83afdba84c..3f6dcae43f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A5AC + .word 0x3B83126F + +.text glabel func_80A19BA8 /* 02698 80A19BA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0269C 80A19BAC AFB00018 */ sw $s0, 0x0018($sp) @@ -57,5 +62,3 @@ glabel func_80A19BA8 /* 02750 80A19C60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02754 80A19C64 03E00008 */ jr $ra /* 02758 80A19C68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s index 81034b964f..9a47683c80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s @@ -15,5 +15,3 @@ glabel func_80A19C6C /* 02788 80A19C98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0278C 80A19C9C 03E00008 */ jr $ra /* 02790 80A19CA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s index fb0514dc4d..24755cbff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s @@ -32,5 +32,3 @@ glabel func_80A19CA4 /* 027FC 80A19D0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02800 80A19D10 03E00008 */ jr $ra /* 02804 80A19D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s index db2dc0e8a4..1c3b28173b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1A5B0 + .float 0.01 + +.text glabel func_80A19D18 /* 02808 80A19D18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0280C 80A19D1C AFBF0024 */ sw $ra, 0x0024($sp) @@ -123,5 +128,3 @@ glabel func_80A19D18 /* 029A8 80A19EB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 029AC 80A19EBC 03E00008 */ jr $ra /* 029B0 80A19EC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s index 223eb15ed9..6bc8263581 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s @@ -14,5 +14,3 @@ glabel func_80A1A128 .L80A1A158: /* 02C48 80A1A158 03E00008 */ jr $ra /* 02C4C 80A1A15C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s index bb1a7047f8..e5531d1ccb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s @@ -1,3 +1,15 @@ +.rdata +glabel D_80A1A500 + .asciz "../z_en_floormas.c" + .balign 4 + +.late_rodata +glabel D_80A1A5BC + .word 0x3F860A92 +glabel D_80A1A5C0 + .word 0x3E860A92, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80A1A160 /* 02C50 80A1A160 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02C54 80A1A164 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -61,5 +73,3 @@ glabel func_80A1A160 /* 02D38 80A1A248 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D3C 80A1A24C 03E00008 */ jr $ra /* 02D40 80A1A250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s index 6291db7113..3cb87446ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A1A53C + .asciz "../z_en_floormas.c" + .balign 4 + +glabel D_80A1A550 + .asciz "../z_en_floormas.c" + .balign 4 + +.text glabel func_80A1A350 /* 02E40 80A1A350 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02E44 80A1A354 AFB10028 */ sw $s1, 0x0028($sp) @@ -65,4 +75,3 @@ glabel func_80A1A350 /* 02F34 80A1A444 03E00008 */ jr $ra /* 02F38 80A1A448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02F3C 80A1A44C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s index e67ac9f0ee..6eb67381a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s @@ -12,5 +12,3 @@ glabel EnFr_Destroy /* 005C0 80A1AF60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005C4 80A1AF64 03E00008 */ jr $ra /* 005C8 80A1AF68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s index 512fbea3f8..c0ebe02274 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s @@ -1,3 +1,53 @@ +.rdata +glabel D_80A1D110 + .asciz "" + .balign 4 + +glabel D_80A1D11C + .asciz "%s[%d] : 引数が間違っている！！(%d)\n" + .balign 4 + +glabel D_80A1D144 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D154 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A1D158 + .asciz "0" + .balign 4 + +glabel D_80A1D15C + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D16C + .asciz "" + .balign 4 + +glabel D_80A1D178 + .asciz "%s[%d] : バンクが無いよ！！\n" + .balign 4 + +glabel D_80A1D198 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D1A8 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A1D1AC + .asciz "0" + .balign 4 + +glabel D_80A1D1B0 + .asciz "../z_en_fr.c" + .balign 4 + +.text glabel EnFr_Init /* 00114 80A1AAB4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00118 80A1AAB8 AFBF001C */ sw $ra, 0x001C($sp) @@ -101,5 +151,3 @@ glabel EnFr_Init /* 00260 80A1AC00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00264 80A1AC04 03E00008 */ jr $ra /* 00268 80A1AC08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s index 42cfe0e635..bac4f46255 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A1D28C + .word 0x38D1B717 +glabel D_80A1D290 + .word 0xC61C3C00 + +.text glabel EnFr_Update /* 002A4 80A1AC44 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 002A8 80A1AC48 AFB00024 */ sw $s0, 0x0024($sp) @@ -201,5 +208,3 @@ glabel EnFr_Update /* 00590 80A1AF30 8FB10028 */ lw $s1, 0x0028($sp) /* 00594 80A1AF34 03E00008 */ jr $ra /* 00598 80A1AF38 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s index ac46971aa8..7387a94df2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1D288 + .word 0x4622F983 + +.text glabel func_80A1A9A0 /* 00000 80A1A9A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00004 80A1A9A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 @@ -68,5 +73,3 @@ glabel func_80A1A9A0 /* 00108 80A1AAA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0010C 80A1AAAC 03E00008 */ jr $ra /* 00110 80A1AAB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s index 701dc025ed..62c8d83d02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s @@ -10,5 +10,3 @@ glabel func_80A1AC0C /* 00288 80A1AC28 AC8F0134 */ sw $t7, 0x0134($a0) ## 00000134 /* 0028C 80A1AC2C 03E00008 */ jr $ra /* 00290 80A1AC30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s index 15185750bf..17f140e8b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s @@ -3,5 +3,3 @@ glabel func_80A1AC34 /* 00298 80A1AC38 25CECD24 */ addiu $t6, $t6, %lo(func_80A1CD24) ## $t6 = 80A1CD24 /* 0029C 80A1AC3C 03E00008 */ jr $ra /* 002A0 80A1AC40 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s index 6a4394be03..3b3fb57950 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s @@ -34,5 +34,3 @@ glabel func_80A1AF6C /* 00644 80A1AFE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00648 80A1AFE8 03E00008 */ jr $ra /* 0064C 80A1AFEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s index 59909db6c7..0bb601aeba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s @@ -46,5 +46,3 @@ glabel func_80A1AFF0 /* 006F0 80A1B090 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 006F4 80A1B094 03E00008 */ jr $ra /* 006F8 80A1B098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s index db9b260d86..6e45728e40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s @@ -23,5 +23,3 @@ glabel func_80A1B09C .L80A1B0F0: /* 00750 80A1B0F0 03E00008 */ jr $ra /* 00754 80A1B0F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s index a2b66008fc..044c576cce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s @@ -32,5 +32,3 @@ glabel func_80A1B0F8 .L80A1B16C: /* 007CC 80A1B16C 03E00008 */ jr $ra /* 007D0 80A1B170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s index a7af3940aa..b26ef517c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s @@ -10,5 +10,3 @@ glabel func_80A1B174 /* 007F0 80A1B190 AC8F0374 */ sw $t7, 0x0374($a0) ## 00000374 /* 007F4 80A1B194 03E00008 */ jr $ra /* 007F8 80A1B198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s index 495a6ac12c..8b23e55cd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s @@ -39,5 +39,3 @@ glabel func_80A1B19C /* 00880 80A1B220 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00884 80A1B224 03E00008 */ jr $ra /* 00888 80A1B228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s index 2ee646bd02..e1b3977582 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s @@ -41,5 +41,3 @@ glabel func_80A1B22C /* 0091C 80A1B2BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00920 80A1B2C0 03E00008 */ jr $ra /* 00924 80A1B2C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s index 774bd5c94a..03fc3d5bc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1D294 + .float 3.14159274101 + +.text glabel func_80A1B2C8 /* 00928 80A1B2C8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0092C 80A1B2CC AFBF0024 */ sw $ra, 0x0024($sp) @@ -109,5 +114,3 @@ glabel func_80A1B2C8 /* 00AB8 80A1B458 8FB00020 */ lw $s0, 0x0020($sp) /* 00ABC 80A1B45C 03E00008 */ jr $ra /* 00AC0 80A1B460 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s index ddd8b64e81..3884837dfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s @@ -52,5 +52,3 @@ glabel func_80A1B464 /* 00B78 80A1B518 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B7C 80A1B51C 03E00008 */ jr $ra /* 00B80 80A1B520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s index 35185d0856..665a1c2322 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1D298 + .word 0x4622F983 + +.text glabel func_80A1B524 /* 00B84 80A1B524 3C0E80A2 */ lui $t6, %hi(D_80A1CFF0) ## $t6 = 80A20000 /* 00B88 80A1B528 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) @@ -75,5 +80,3 @@ glabel func_80A1B524 /* 00C8C 80A1B62C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C90 80A1B630 03E00008 */ jr $ra /* 00C94 80A1B634 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s index fff8f26c1d..935f05ccd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s @@ -88,5 +88,3 @@ glabel func_80A1B638 /* 00DCC 80A1B76C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00DD0 80A1B770 03E00008 */ jr $ra /* 00DD4 80A1B774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s index e531dd61e8..ac0095cd15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s @@ -92,5 +92,3 @@ glabel func_80A1B778 /* 00F24 80A1B8C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F28 80A1B8C8 03E00008 */ jr $ra /* 00F2C 80A1B8CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s index 0710ff0c10..58d3513a4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s @@ -73,5 +73,3 @@ glabel func_80A1B8D0 /* 0102C 80A1B9CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01030 80A1B9D0 03E00008 */ jr $ra /* 01034 80A1B9D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s index 658566ed54..a3a4dee0d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s @@ -90,5 +90,3 @@ glabel func_80A1B9D8 /* 01188 80A1BB28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0118C 80A1BB2C 03E00008 */ jr $ra /* 01190 80A1BB30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s index a5a920063b..be64974371 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A1D29C + .word 0x38D1B717 + +.text glabel func_80A1BB34 /* 01194 80A1BB34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01198 80A1BB38 AFBF001C */ sw $ra, 0x001C($sp) @@ -62,5 +67,3 @@ glabel func_80A1BB34 /* 01268 80A1BC08 8FB10018 */ lw $s1, 0x0018($sp) /* 0126C 80A1BC0C 03E00008 */ jr $ra /* 01270 80A1BC10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s index c6d3b76dd4..c9080787dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s @@ -43,5 +43,3 @@ glabel func_80A1BC14 /* 01308 80A1BCA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0130C 80A1BCAC 03E00008 */ jr $ra /* 01310 80A1BCB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s index 2ec840911d..630e9cba9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s @@ -58,5 +58,3 @@ glabel func_80A1BCB4 /* 013E8 80A1BD88 8FB10020 */ lw $s1, 0x0020($sp) /* 013EC 80A1BD8C 03E00008 */ jr $ra /* 013F0 80A1BD90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s index f57ce4ef30..67f4b14d7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s @@ -27,5 +27,3 @@ glabel func_80A1BD94 .L80A1BDF4: /* 01454 80A1BDF4 03E00008 */ jr $ra /* 01458 80A1BDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s index d07235248d..c3476f6b1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s @@ -41,5 +41,3 @@ glabel func_80A1BDFC /* 014EC 80A1BE8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014F0 80A1BE90 03E00008 */ jr $ra /* 014F4 80A1BE94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s index d6647bd496..6501f39b4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s @@ -31,5 +31,3 @@ glabel func_80A1BE98 /* 01564 80A1BF04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01568 80A1BF08 03E00008 */ jr $ra /* 0156C 80A1BF0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s index 987b5aa74b..9cad7647f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s @@ -1,3 +1,23 @@ +.late_rodata +glabel jtbl_80A1D2A0 +.word L80A1BFAC +.word L80A1C02C +.word L80A1C02C +.word L80A1BF9C +.word L80A1BF6C +.word L80A1BF60 +.word L80A1BF58 +.word L80A1BF78 +.word L80A1BF84 +.word L80A1BF90 +glabel jtbl_80A1D2C8 +.word L80A1BFD0 +.word L80A1BFE4 +.word L80A1BFF8 +.word L80A1C00C +.word L80A1C020 + +.text glabel func_80A1BF10 /* 01570 80A1BF10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01574 80A1BF14 AFBF001C */ sw $ra, 0x001C($sp) @@ -99,5 +119,3 @@ glabel L80A1C02C /* 016B0 80A1C050 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016B4 80A1C054 03E00008 */ jr $ra /* 016B8 80A1C058 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s index d63dc58375..47dd95f2ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s @@ -82,5 +82,3 @@ glabel func_80A1C05C /* 017E0 80A1C180 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 017E4 80A1C184 03E00008 */ jr $ra /* 017E8 80A1C188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s index c875b9a8f3..c5fc11350b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s @@ -22,5 +22,3 @@ glabel func_80A1C18C /* 01838 80A1C1D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0183C 80A1C1DC 03E00008 */ jr $ra /* 01840 80A1C1E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s index be2612d4b7..57127d1b4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s @@ -25,5 +25,3 @@ glabel func_80A1C1E4 /* 0189C 80A1C23C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018A0 80A1C240 03E00008 */ jr $ra /* 018A4 80A1C244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s index 581f4ce101..57e44ec9ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80A1D2DC +.word L80A1C274 +.word L80A1C280 +.word L80A1C288 +.word L80A1C294 +.word L80A1C2A0 + +.text glabel func_80A1C248 /* 018A8 80A1C248 27BDFFF8 */ addiu $sp, $sp, 0xFFF8 ## $sp = FFFFFFF8 /* 018AC 80A1C24C AFA40008 */ sw $a0, 0x0008($sp) @@ -78,5 +87,3 @@ glabel L80A1C2A0 .L80A1C33C: /* 0199C 80A1C33C 03E00008 */ jr $ra /* 019A0 80A1C340 27BD0008 */ addiu $sp, $sp, 0x0008 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s index db27b725af..8c70fbfe04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s @@ -16,5 +16,3 @@ glabel func_80A1C344 /* 019DC 80A1C37C 8C830010 */ lw $v1, 0x0010($a0) ## 00000010 /* 019E0 80A1C380 03E00008 */ jr $ra /* 019E4 80A1C384 A06003A8 */ sb $zero, 0x03A8($v1) ## 80A203A8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s index 0fadf80a1e..74c9edbb3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s @@ -32,5 +32,3 @@ glabel func_80A1C388 /* 01A54 80A1C3F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A58 80A1C3F8 03E00008 */ jr $ra /* 01A5C 80A1C3FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s index 8494e044a6..4b06cb62e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s @@ -30,5 +30,3 @@ glabel func_80A1C400 /* 01AC8 80A1C468 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01ACC 80A1C46C 03E00008 */ jr $ra /* 01AD0 80A1C470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s index b4152e3ae3..bf45f65cdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s @@ -46,5 +46,3 @@ glabel func_80A1C474 /* 01B78 80A1C518 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B7C 80A1C51C 03E00008 */ jr $ra /* 01B80 80A1C520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s index d4cc9cd51c..f1c470ad57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s @@ -22,5 +22,3 @@ glabel func_80A1C524 /* 01BD4 80A1C574 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BD8 80A1C578 03E00008 */ jr $ra /* 01BDC 80A1C57C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s index f607d46821..bf0ec01c37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80A1D2F0 +.word L80A1C680 +.word L80A1C694 +.word L80A1C6A8 +.word L80A1C6BC +.word L80A1C6D0 + +.text glabel func_80A1C580 /* 01BE0 80A1C580 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01BE4 80A1C584 AFBF001C */ sw $ra, 0x001C($sp) @@ -115,5 +124,3 @@ glabel L80A1C6D0 /* 01D6C 80A1C70C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D70 80A1C710 03E00008 */ jr $ra /* 01D74 80A1C714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s index 43563ffbb7..cdf8b717be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s @@ -31,5 +31,3 @@ glabel func_80A1C718 /* 01DE4 80A1C784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DE8 80A1C788 03E00008 */ jr $ra /* 01DEC 80A1C78C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s index 18b498b20a..9d0ac04e1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s @@ -14,5 +14,3 @@ glabel func_80A1C790 /* 01E20 80A1C7C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E24 80A1C7C4 03E00008 */ jr $ra /* 01E28 80A1C7C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s index cfec602caf..b723797e80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s @@ -26,5 +26,3 @@ glabel func_80A1C7CC /* 01E84 80A1C824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E88 80A1C828 03E00008 */ jr $ra /* 01E8C 80A1C82C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s index 31cd382c77..37beb6a1a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s @@ -74,5 +74,3 @@ glabel func_80A1C830 .L80A1C93C: /* 01F9C 80A1C93C 03E00008 */ jr $ra /* 01FA0 80A1C940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s index 9517820294..e3438aae0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80A1D1C0 + .asciz "" + .balign 4 + +glabel D_80A1D1CC + .asciz "%s[%d]カエルがいない！？\n" + .balign 4 + +glabel D_80A1D1E8 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D1F8 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A1D1FC + .asciz "" + .balign 4 + +glabel D_80A1D208 + .asciz "%s[%d]カエルがいない！？\n" + .balign 4 + +glabel D_80A1D224 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D234 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_80A1C944 /* 01FA4 80A1C944 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01FA8 80A1C948 AFBF001C */ sw $ra, 0x001C($sp) @@ -104,5 +138,3 @@ glabel func_80A1C944 /* 02100 80A1CAA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02104 80A1CAA4 03E00008 */ jr $ra /* 02108 80A1CAA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s index b2a1786a4a..5899c41184 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s @@ -24,5 +24,3 @@ glabel func_80A1CAAC /* 0215C 80A1CAFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02160 80A1CB00 03E00008 */ jr $ra /* 02164 80A1CB04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s index 98b54b1b9a..19b67fea5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s @@ -21,5 +21,3 @@ glabel func_80A1CB08 /* 021AC 80A1CB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021B0 80A1CB50 03E00008 */ jr $ra /* 021B4 80A1CB54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s index 2500bcbd29..a5e4745168 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s @@ -44,5 +44,3 @@ glabel func_80A1CB58 /* 02258 80A1CBF8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0225C 80A1CBFC 03E00008 */ jr $ra /* 02260 80A1CC00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s index 69cdbe8666..2dd9c099fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s @@ -11,5 +11,3 @@ glabel func_80A1CC04 .L80A1CC24: /* 02284 80A1CC24 03E00008 */ jr $ra /* 02288 80A1CC28 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s index 54545d4a5d..c047c97e44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A1D238 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D248 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D258 + .asciz "../z_en_fr.c" + .balign 4 + +.text glabel func_80A1CC2C /* 0228C 80A1CC2C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02290 80A1CC30 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -63,5 +77,3 @@ glabel func_80A1CC2C /* 02378 80A1CD18 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0237C 80A1CD1C 03E00008 */ jr $ra /* 02380 80A1CD20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index 04d5a21c2b..efb030ef8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A1D268 + .asciz "../z_en_fr.c" + .balign 4 + +glabel D_80A1D278 + .asciz "../z_en_fr.c" + .balign 4 + +.late_rodata +glabel D_80A1D304 + .word 0x3C75C28F, 0x00000000, 0x00000000 + +.text glabel func_80A1CD24 /* 02384 80A1CD24 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02388 80A1CD28 AFBF002C */ sw $ra, 0x002C($sp) @@ -183,4 +197,3 @@ glabel func_80A1CD24 /* 02644 80A1CFE4 03E00008 */ jr $ra /* 02648 80A1CFE8 00000000 */ nop /* 0264C 80A1CFEC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s index 5c6d0ed807..7310b492e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s @@ -10,5 +10,3 @@ glabel EnFu_Destroy /* 00130 80A1D940 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00134 80A1D944 03E00008 */ jr $ra /* 00138 80A1D948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s index e66e950310..99a3856b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A1E470 + .asciz "../z_en_fu.c" + .balign 4 + +glabel D_80A1E480 + .asciz "../z_en_fu.c" + .balign 4 + +.text glabel EnFu_Draw /* 00A9C 80A1E2AC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00AA0 80A1E2B0 AFBF002C */ sw $ra, 0x002C($sp) @@ -84,4 +94,3 @@ glabel EnFu_Draw /* 00BE4 80A1E3F4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00BE8 80A1E3F8 03E00008 */ jr $ra /* 00BEC 80A1E3FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s index bb4f7b787d..6c4995c21d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s @@ -74,5 +74,3 @@ glabel EnFu_Init /* 00108 80A1D918 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0010C 80A1D91C 03E00008 */ jr $ra /* 00110 80A1D920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s index 1e3fb76e44..8c97e50c9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s @@ -117,5 +117,3 @@ glabel EnFu_Update /* 008F4 80A1E104 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 008F8 80A1E108 03E00008 */ jr $ra /* 008FC 80A1E10C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1D94C.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1D94C.s index f86aa71e86..14674540bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1D94C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1D94C.s @@ -51,5 +51,3 @@ glabel func_80A1D94C /* 001E8 80A1D9F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001EC 80A1D9FC 03E00008 */ jr $ra /* 001F0 80A1DA00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s index e0a3ac6e62..dff5eff0ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s @@ -40,5 +40,3 @@ glabel func_80A1DA04 /* 00280 80A1DA90 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00284 80A1DA94 03E00008 */ jr $ra /* 00288 80A1DA98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s index 8ae5a3df41..0fb327659e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s @@ -52,5 +52,3 @@ glabel func_80A1DA9C /* 00344 80A1DB54 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00348 80A1DB58 03E00008 */ jr $ra /* 0034C 80A1DB5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s index 72fa9219d8..cb697eba37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s @@ -16,5 +16,3 @@ glabel func_80A1DB60 .L80A1DB98: /* 00388 80A1DB98 03E00008 */ jr $ra /* 0038C 80A1DB9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBA0.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBA0.s index cc248e0adb..3b8c9706f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBA0.s @@ -13,5 +13,3 @@ glabel func_80A1DBA0 /* 003B8 80A1DBC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003BC 80A1DBCC 03E00008 */ jr $ra /* 003C0 80A1DBD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s index 2eaede5602..2ce5796147 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s @@ -96,5 +96,3 @@ glabel func_80A1DBD4 /* 00528 80A1DD38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0052C 80A1DD3C 03E00008 */ jr $ra /* 00530 80A1DD40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DD44.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DD44.s index 437d58b68f..4614106dc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DD44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DD44.s @@ -25,5 +25,3 @@ glabel func_80A1DD44 /* 0058C 80A1DD9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00590 80A1DDA0 03E00008 */ jr $ra /* 00594 80A1DDA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DDA8.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DDA8.s index aac002948c..414f167ecc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DDA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DDA8.s @@ -31,5 +31,3 @@ glabel func_80A1DDA8 /* 00608 80A1DE18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0060C 80A1DE1C 03E00008 */ jr $ra /* 00610 80A1DE20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s index 58475f123b..2cb533d2e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s @@ -88,5 +88,3 @@ glabel func_80A1DE24 /* 00750 80A1DF60 8FB10018 */ lw $s1, 0x0018($sp) /* 00754 80A1DF64 03E00008 */ jr $ra /* 00758 80A1DF68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E110.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E110.s index ff7119c0e9..f8e49b36b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E110.s @@ -94,5 +94,3 @@ glabel func_80A1E110 /* 00A50 80A1E260 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A54 80A1E264 03E00008 */ jr $ra /* 00A58 80A1E268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E26C.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E26C.s index ad0930b57c..a5fbdfc5b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E26C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E26C.s @@ -16,5 +16,3 @@ glabel func_80A1E26C /* 00A90 80A1E2A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A94 80A1E2A4 03E00008 */ jr $ra /* 00A98 80A1E2A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s index 75f3415d9a..221a507281 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s @@ -9,5 +9,3 @@ glabel EnFw_Destroy /* 006C4 80A1EC64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006C8 80A1EC68 03E00008 */ jr $ra /* 006CC 80A1EC6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s index be0a35094a..f3942757a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s @@ -32,5 +32,3 @@ glabel EnFw_Draw /* 010B8 80A1F658 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 010BC 80A1F65C 03E00008 */ jr $ra /* 010C0 80A1F660 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s index 265297deca..8696dbddd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s @@ -68,5 +68,3 @@ glabel EnFw_Init /* 0069C 80A1EC3C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 006A0 80A1EC40 03E00008 */ jr $ra /* 006A4 80A1EC44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s index a7c6ed147f..4ca0526caa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s @@ -62,5 +62,3 @@ glabel EnFw_Update /* 00F80 80A1F520 8FB10020 */ lw $s1, 0x0020($sp) /* 00F84 80A1F524 03E00008 */ jr $ra /* 00F88 80A1F528 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E5A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E5A0.s index 3d1ff6b956..d5fe6b8845 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E5A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E5A0.s @@ -55,5 +55,3 @@ glabel func_80A1E5A0 /* 000BC 80A1E65C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000C0 80A1E660 03E00008 */ jr $ra /* 000C4 80A1E664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E668.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E668.s index b5ea1b7950..7407046e5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E668.s @@ -65,5 +65,3 @@ glabel func_80A1E668 /* 001B4 80A1E754 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 001B8 80A1E758 03E00008 */ jr $ra /* 001BC 80A1E75C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E760.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E760.s index e6a4399617..87e08767eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E760.s @@ -56,5 +56,3 @@ glabel func_80A1E760 /* 0028C 80A1E82C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00290 80A1E830 03E00008 */ jr $ra /* 00294 80A1E834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E838.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E838.s index ace669542a..c04ca14812 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E838.s @@ -53,5 +53,3 @@ glabel func_80A1E838 /* 0034C 80A1E8EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00350 80A1E8F0 03E00008 */ jr $ra /* 00354 80A1E8F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E8F8.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E8F8.s index c0f3b79088..d20caa399c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E8F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1E8F8.s @@ -153,5 +153,3 @@ glabel func_80A1E8F8 /* 00594 80A1EB34 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 00598 80A1EB38 03E00008 */ jr $ra /* 0059C 80A1EB3C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1EC70.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1EC70.s index 81191de93a..f2c0f3c45e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1EC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1EC70.s @@ -27,5 +27,3 @@ glabel func_80A1EC70 /* 00728 80A1ECC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0072C 80A1ECCC 03E00008 */ jr $ra /* 00730 80A1ECD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s index 6bcc4b02df..e08d5c09f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_80A1FC70 + .float 0.9 + +glabel D_80A1FC74 + .word 0x45AAA000 +glabel D_80A1FC78 + .word 0x4622F983 +glabel D_80A1FC7C + .float 0.2 + +glabel D_80A1FC80 + .float 0.3 + +.text glabel func_80A1ECD4 /* 00734 80A1ECD4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00738 80A1ECD8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -415,5 +430,3 @@ glabel func_80A1ECD4 /* 00CFC 80A1F29C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00D00 80A1F2A0 03E00008 */ jr $ra /* 00D04 80A1F2A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F2A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F2A8.s index 809ab6d261..cc19d48bbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F2A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F2A8.s @@ -65,5 +65,3 @@ glabel func_80A1F2A8 /* 00DF0 80A1F390 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00DF4 80A1F394 03E00008 */ jr $ra /* 00DF8 80A1F398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F39C.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F39C.s index 1c372cba83..a9d88c953a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F39C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F39C.s @@ -49,5 +49,3 @@ glabel func_80A1F39C /* 00EA0 80A1F440 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00EA4 80A1F444 03E00008 */ jr $ra /* 00EA8 80A1F448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F52C.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F52C.s index 8f2a864a33..698e2923d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F52C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F52C.s @@ -5,5 +5,3 @@ glabel func_80A1F52C /* 00F98 80A1F538 AFA7000C */ sw $a3, 0x000C($sp) /* 00F9C 80A1F53C 03E00008 */ jr $ra /* 00FA0 80A1F540 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F544.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F544.s index 11d844386b..4a8ca89bf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F544.s @@ -40,5 +40,3 @@ glabel func_80A1F544 /* 01034 80A1F5D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01038 80A1F5D8 03E00008 */ jr $ra /* 0103C 80A1F5DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F664.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F664.s index c868f941ef..96ff29d6ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F664.s @@ -42,5 +42,3 @@ glabel func_80A1F664 /* 0115C 80A1F6FC 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 000002D8 /* 01160 80A1F700 03E00008 */ jr $ra /* 01164 80A1F704 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F708.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F708.s index ce9e7a1ef3..1940fe8a01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F708.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F708.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A1FC84 + .float 0.2 + +glabel D_80A1FC88 + .float 0.4 + +.text glabel func_80A1F708 /* 01168 80A1F708 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0116C 80A1F70C F7B60018 */ sdc1 $f22, 0x0018($sp) @@ -71,5 +79,3 @@ glabel func_80A1F708 /* 01268 80A1F808 8FB10028 */ lw $s1, 0x0028($sp) /* 0126C 80A1F80C 03E00008 */ jr $ra /* 01270 80A1F810 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s index 36ad2e3f54..df0d57f954 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A1FC40 + .asciz "../z_en_fw.c" + .balign 4 + +glabel D_80A1FC50 + .asciz "../z_en_fw.c" + .balign 4 + +glabel D_80A1FC60 + .asciz "../z_en_fw.c" + .balign 4 + +.text glabel func_80A1F814 /* 01274 80A1F814 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 01278 80A1F818 AFBE0050 */ sw $s8, 0x0050($sp) @@ -209,4 +223,3 @@ glabel func_80A1F814 /* 01594 80A1FB34 8FBE0050 */ lw $s8, 0x0050($sp) /* 01598 80A1FB38 03E00008 */ jr $ra /* 0159C 80A1FB3C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s index 3da597d946..fedf92796e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s @@ -22,5 +22,3 @@ glabel EnFz_Destroy /* 001C0 80A1FF80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C4 80A1FF84 03E00008 */ jr $ra /* 001C8 80A1FF88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s index a0d0ed2018..c6f8b0a8ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A21C60 + .asciz "../z_en_fz.c" + .balign 4 + +glabel D_80A21C70 + .asciz "../z_en_fz.c" + .balign 4 + +glabel D_80A21C80 + .asciz "../z_en_fz.c" + .balign 4 + +.text glabel EnFz_Draw /* 0148C 80A2124C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01490 80A21250 AFBF003C */ sw $ra, 0x003C($sp) @@ -133,5 +147,3 @@ glabel EnFz_Draw /* 01690 80A21450 8FB10038 */ lw $s1, 0x0038($sp) /* 01694 80A21454 03E00008 */ jr $ra /* 01698 80A21458 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s index 2eb3a22548..6f775e3c2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s @@ -101,5 +101,3 @@ glabel EnFz_Init /* 00170 80A1FF30 8FB10018 */ lw $s1, 0x0018($sp) /* 00174 80A1FF34 03E00008 */ jr $ra /* 00178 80A1FF38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s index 652dfcc657..467b4515d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s @@ -113,5 +113,3 @@ glabel EnFz_Update /* 01480 80A21240 8FB10020 */ lw $s1, 0x0020($sp) /* 01484 80A21244 03E00008 */ jr $ra /* 01488 80A21248 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s index e8e1a83805..9375bdf9ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s @@ -74,5 +74,3 @@ glabel func_80A1FF8C /* 002E4 80A200A4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 002E8 80A200A8 03E00008 */ jr $ra /* 002EC 80A200AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s index b872c9fa58..08ea185e92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s @@ -20,5 +20,3 @@ glabel func_80A200B0 .L80A200F8: /* 00338 80A200F8 03E00008 */ jr $ra /* 0033C 80A200FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s index ea687b50a0..82ba6d313b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A21CC0 + .float 0.6 + +glabel D_80A21CC4 + .float 0.3 + +.text glabel func_80A20100 /* 00340 80A20100 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 00344 80A20104 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -137,5 +145,3 @@ glabel func_80A20100 glabel L80A202F4 /* 00534 80A202F4 03E00008 */ jr $ra /* 00538 80A202F8 AFA40000 */ sw $a0, 0x0000($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s index 1266fa047f..5eba1cb3bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A21CC8 + .float 0.1 + +.text glabel func_80A202FC /* 0053C 80A202FC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00540 80A20300 AFBF0024 */ sw $ra, 0x0024($sp) @@ -60,5 +65,3 @@ glabel func_80A202FC /* 00610 80A203D0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00614 80A203D4 03E00008 */ jr $ra /* 00618 80A203D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s index 99f75c9a23..55c5892558 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A21CCC + .float 0.1 + +.text glabel func_80A203DC /* 0061C 80A203DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00620 80A203E0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -52,5 +57,3 @@ glabel func_80A203DC /* 006D4 80A20494 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 006D8 80A20498 03E00008 */ jr $ra /* 006DC 80A2049C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s index 71b4d65e8a..aa46d57f4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s @@ -168,5 +168,3 @@ glabel func_80A204A0 /* 00938 80A206F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0093C 80A206FC 03E00008 */ jr $ra /* 00940 80A20700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s index 395fab6131..6288730e5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s @@ -17,5 +17,3 @@ glabel func_80A20704 /* 0097C 80A2073C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00980 80A20740 03E00008 */ jr $ra /* 00984 80A20744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s index 2aae656434..2f9fab6637 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s @@ -10,5 +10,3 @@ glabel func_80A20748 /* 009A8 80A20768 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 009AC 80A2076C 03E00008 */ jr $ra /* 009B0 80A20770 AC99014C */ sw $t9, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s index bd8bf354d1..8cf060ef02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s @@ -34,5 +34,3 @@ glabel func_80A20774 /* 00A28 80A207E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A2C 80A207EC 03E00008 */ jr $ra /* 00A30 80A207F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s index c9550de7d6..bb61e83543 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s @@ -14,5 +14,3 @@ glabel func_80A207F4 /* 00A64 80A20824 E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 /* 00A68 80A20828 03E00008 */ jr $ra /* 00A6C 80A2082C E488002C */ swc1 $f8, 0x002C($a0) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s index be6a44f6be..27c1863ffd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s @@ -20,5 +20,3 @@ glabel func_80A20830 /* 00AB4 80A20874 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AB8 80A20878 03E00008 */ jr $ra /* 00ABC 80A2087C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s index e3ea9b2ac2..59c174e217 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s @@ -9,5 +9,3 @@ glabel func_80A20880 /* 00ADC 80A2089C A498025E */ sh $t8, 0x025E($a0) ## 0000025E /* 00AE0 80A208A0 03E00008 */ jr $ra /* 00AE4 80A208A4 AC99014C */ sw $t9, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s index e28d97baa4..fca8d32420 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s @@ -39,5 +39,3 @@ glabel func_80A208A8 /* 00B6C 80A2092C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B70 80A20930 03E00008 */ jr $ra /* 00B74 80A20934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s index 8bb4c1da73..16b7d5d3d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s @@ -15,5 +15,3 @@ glabel func_80A20938 /* 00BAC 80A2096C AC99014C */ sw $t9, 0x014C($a0) ## 0000014C /* 00BB0 80A20970 03E00008 */ jr $ra /* 00BB4 80A20974 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s index 9676fd36ab..efd786a786 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s @@ -15,5 +15,3 @@ glabel func_80A20978 /* 00BE8 80A209A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BEC 80A209AC 03E00008 */ jr $ra /* 00BF0 80A209B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s index c32cd36dec..65c9114e03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s @@ -11,5 +11,3 @@ glabel func_80A209B4 /* 00C18 80A209D8 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C /* 00C1C 80A209DC 03E00008 */ jr $ra /* 00C20 80A209E0 E4840254 */ swc1 $f4, 0x0254($a0) ## 00000254 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s index a90cf9c344..70197f28f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s @@ -16,5 +16,3 @@ glabel func_80A209E4 /* 00C54 80A20A14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C58 80A20A18 03E00008 */ jr $ra /* 00C5C 80A20A1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s index 5774217ac6..368601023e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s @@ -10,5 +10,3 @@ glabel func_80A20A20 /* 00C80 80A20A40 E4800254 */ swc1 $f0, 0x0254($a0) ## 00000254 /* 00C84 80A20A44 03E00008 */ jr $ra /* 00C88 80A20A48 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s index 289cec7a24..6266b380e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s @@ -15,5 +15,3 @@ glabel func_80A20A4C /* 00CBC 80A20A7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CC0 80A20A80 03E00008 */ jr $ra /* 00CC4 80A20A84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s index 6c0ce5ff8e..d1096ef179 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s @@ -13,5 +13,3 @@ glabel func_80A20A88 /* 00CF4 80A20AB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CF8 80A20AB8 03E00008 */ jr $ra /* 00CFC 80A20ABC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s index 41feecac04..7a4a0e7f75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A21CD0 + .float 0.6 + +glabel D_80A21CD4 + .float 3.14159274101 + +.text glabel func_80A20AC0 /* 00D00 80A20AC0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00D04 80A20AC4 AFBF002C */ sw $ra, 0x002C($sp) @@ -127,5 +135,3 @@ glabel func_80A20AC0 /* 00EE0 80A20CA0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00EE4 80A20CA4 03E00008 */ jr $ra /* 00EE8 80A20CA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s index c66180a55f..c7a35900f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s @@ -41,5 +41,3 @@ glabel func_80A20CAC /* 00F80 80A20D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F84 80A20D44 03E00008 */ jr $ra /* 00F88 80A20D48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s index 14e621125c..9626eb2295 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s @@ -13,5 +13,3 @@ glabel func_80A20D4C /* 00FB0 80A20D70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FB4 80A20D74 03E00008 */ jr $ra /* 00FB8 80A20D78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s index b4eb67f38d..60b2ec5339 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s @@ -15,5 +15,3 @@ glabel func_80A20D7C /* 00FF0 80A20DB0 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 00FF4 80A20DB4 03E00008 */ jr $ra /* 00FF8 80A20DB8 E4800254 */ swc1 $f0, 0x0254($a0) ## 00000254 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s index f9e18eb0ed..00b791361a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A21CD8 + .word 0x3BC49BA6 +glabel D_80A21CDC + .word 0x39D1B717 +glabel D_80A21CE0 + .word 0x3B83126F + +.text glabel func_80A20DBC /* 00FFC 80A20DBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01000 80A20DC0 AFA5001C */ sw $a1, 0x001C($sp) @@ -54,5 +63,3 @@ glabel func_80A20DBC /* 010B8 80A20E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010BC 80A20E7C 03E00008 */ jr $ra /* 010C0 80A20E80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s index f7ed112c92..3d783201ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s @@ -15,5 +15,3 @@ glabel func_80A20E84 /* 010F8 80A20EB8 AC99014C */ sw $t9, 0x014C($a0) ## 0000014C /* 010FC 80A20EBC 03E00008 */ jr $ra /* 01100 80A20EC0 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s index 2f797f9d90..52c9c5d9df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A21CE4 + .float 0.6 + +glabel D_80A21CE8 + .float 3.14159274101 + +.text glabel func_80A20EC4 /* 01104 80A20EC4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01108 80A20EC8 AFBF002C */ sw $ra, 0x002C($sp) @@ -129,5 +137,3 @@ glabel func_80A20EC4 /* 012F0 80A210B0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 012F4 80A210B4 03E00008 */ jr $ra /* 012F8 80A210B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s index cfcfd66881..e01fd31ba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s @@ -42,5 +42,3 @@ glabel func_80A2145C /* 01734 80A214F4 2442003C */ addiu $v0, $v0, 0x003C ## $v0 = 000002B0 /* 01738 80A214F8 03E00008 */ jr $ra /* 0173C 80A214FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s index 54daeabc34..5fcf4f9f23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s @@ -48,5 +48,3 @@ glabel func_80A21500 /* 017F0 80A215B0 2442003C */ addiu $v0, $v0, 0x003C ## $v0 = 000002B0 /* 017F4 80A215B4 03E00008 */ jr $ra /* 017F8 80A215B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s index 8d624a27b2..df54ee49bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A21CEC + .float 0.1 + +.text glabel func_80A215BC /* 017FC 80A215BC 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 01800 80A215C0 F7BC0030 */ sdc1 $f28, 0x0030($sp) @@ -197,5 +202,3 @@ glabel func_80A215BC /* 01ADC 80A2189C 8FB70058 */ lw $s7, 0x0058($sp) /* 01AE0 80A218A0 03E00008 */ jr $ra /* 01AE4 80A218A4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s index 66dbd6594a..e7801b85e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A21C90 + .asciz "../z_en_fz.c" + .balign 4 + +glabel D_80A21CA0 + .asciz "../z_en_fz.c" + .balign 4 + +glabel D_80A21CB0 + .asciz "../z_en_fz.c" + .balign 4 + +.text glabel func_80A218A8 /* 01AE8 80A218A8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 01AEC 80A218AC AFBF0064 */ sw $ra, 0x0064($sp) @@ -180,4 +194,3 @@ glabel func_80A218A8 /* 01DA4 80A21B64 8FBE0060 */ lw $s8, 0x0060($sp) /* 01DA8 80A21B68 03E00008 */ jr $ra /* 01DAC 80A21B6C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s index 2a52c2bd9f..94f9ac9585 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s @@ -10,5 +10,3 @@ glabel EnGSwitch_Destroy /* 00384 80A22244 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00388 80A22248 03E00008 */ jr $ra /* 0038C 80A2224C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s index d520fa6fcb..66d782ba3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s @@ -1,3 +1,75 @@ +.rdata +glabel D_80A23780 + .asciz "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80A237B0 + .asciz "☆☆☆☆☆ セーブ ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80A237E0 + .asciz "\n\n" + .balign 4 + +glabel D_80A237E4 + .asciz "☆☆☆☆☆ 親スイッチ発生 ☆☆☆☆☆ %x\n" + .balign 4 + +.balign 4 + +glabel D_80A23818 + .asciz "☆☆☆☆☆ 最大チェック数 ☆☆☆☆☆ %d\n" + .balign 4 + +.balign 4 + +glabel D_80A2384C + .asciz "\n\n" + .balign 4 + +glabel D_80A23850 + .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A23890 + .asciz "\n\n" + .balign 4 + +glabel D_80A23894 + .asciz "☆☆☆☆☆ 子スイッチ発生 ☆☆☆☆☆ %x\n" + .balign 4 + +.balign 4 + +glabel D_80A238C8 + .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A23908 + .asciz "\n\n" + .balign 4 + +glabel D_80A2390C + .asciz "☆☆☆☆☆ やぶさめぶち抜き壷 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A23940 + .asciz " なにみの？ %d\n\n" + .balign 4 + +.balign 4 + +glabel D_80A2395C + .asciz " バンクおかしいしぞ！%d\n\n" + .balign 4 + +.late_rodata +glabel D_80A23B04 + .word 0x403F5C29 +glabel D_80A23B08 + .word 0x3EE66666 + +.text glabel EnGSwitch_Init /* 00000 80A21EC0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80A21EC4 AFBF001C */ sw $ra, 0x001C($sp) @@ -255,5 +327,3 @@ glabel EnGSwitch_Init /* 0035C 80A2221C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00360 80A22220 03E00008 */ jr $ra /* 00364 80A22224 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s index 7f8a53789e..e5fc064d42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s @@ -119,5 +119,3 @@ glabel EnGSwitch_Update /* 01110 80A22FD0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01114 80A22FD4 03E00008 */ jr $ra /* 01118 80A22FD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s index d717aa9a80..8f0e4d86af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s @@ -112,5 +112,3 @@ glabel func_80A22250 /* 0052C 80A223EC 8FB20028 */ lw $s2, 0x0028($sp) /* 00530 80A223F0 03E00008 */ jr $ra /* 00534 80A223F4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s index 9301725ce8..81f5ab6a7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s @@ -38,5 +38,3 @@ glabel func_80A223F8 /* 005C0 80A22480 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005C4 80A22484 03E00008 */ jr $ra /* 005C8 80A22488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s index 03d108bd50..7f78dd0e76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A23980 + .asciz "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A239A8 + .asciz "☆☆☆☆☆ 時はまさに世紀末〜 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A239E0 + .asciz "☆☆☆☆☆ らすとぉ！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A2248C /* 005CC 80A2248C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 005D0 80A22490 AFBF001C */ sw $ra, 0x001C($sp) @@ -76,5 +90,3 @@ glabel func_80A2248C /* 006CC 80A2258C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006D0 80A22590 03E00008 */ jr $ra /* 006D4 80A22594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s index 7a657f1d85..6e9789ad86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s @@ -59,5 +59,3 @@ glabel func_80A22598 /* 007B4 80A22674 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007B8 80A22678 03E00008 */ jr $ra /* 007BC 80A2267C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s index 5436a3987a..b9a96758af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A23B0C + .float 0.3 + +.text glabel func_80A22680 /* 007C0 80A22680 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 007C4 80A22684 AFBF0014 */ sw $ra, 0x0014($sp) @@ -60,5 +65,3 @@ glabel func_80A22680 /* 00898 80A22758 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0089C 80A2275C 03E00008 */ jr $ra /* 008A0 80A22760 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s index 145249b9a4..ae45fa65e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s @@ -1,3 +1,11 @@ +.rdata +glabel D_80A23A14 + .asciz "☆☆☆☆☆ いぇぇーす！ＨＩＴ！！ ☆☆☆☆☆ %d\n" + .balign 4 + +.balign 4 + +.text glabel func_80A22764 /* 008A4 80A22764 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 008A8 80A22768 AFBF001C */ sw $ra, 0x001C($sp) @@ -266,5 +274,3 @@ glabel func_80A22764 /* 00C50 80A22B10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C54 80A22B14 03E00008 */ jr $ra /* 00C58 80A22B18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s index 7f35502bb8..a71f1ecccd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A23B10 + .float 0.2 + +glabel D_80A23B14 + .float 0.6 + +.text glabel func_80A22B1C /* 00C5C 80A22B1C 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 00C60 80A22B20 AFBF009C */ sw $ra, 0x009C($sp) @@ -196,5 +204,3 @@ glabel func_80A22B1C /* 00F34 80A22DF4 8FBE0098 */ lw $s8, 0x0098($sp) /* 00F38 80A22DF8 03E00008 */ jr $ra /* 00F3C 80A22DFC 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22E00.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22E00.s index 4822f44d12..678a9d02c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22E00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22E00.s @@ -13,5 +13,3 @@ glabel func_80A22E00 /* 00F64 80A22E24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F68 80A22E28 03E00008 */ jr $ra /* 00F6C 80A22E2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s index 2bb4b25fcc..ec1ea63377 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A23A50 + .asciz "../z_en_g_switch.c" + .balign 4 + +glabel D_80A23A64 + .asciz "../z_en_g_switch.c" + .balign 4 + +glabel D_80A23A78 + .asciz "../z_en_g_switch.c" + .balign 4 + +.text glabel func_80A22FDC /* 0111C 80A22FDC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01120 80A22FE0 AFBF001C */ sw $ra, 0x001C($sp) @@ -51,5 +65,3 @@ glabel func_80A22FDC /* 011DC 80A2309C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 011E0 80A230A0 03E00008 */ jr $ra /* 011E4 80A230A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s index 5eca74acd8..4823bb6721 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A23A8C + .asciz "../z_en_g_switch.c" + .balign 4 + +glabel D_80A23AA0 + .asciz "../z_en_g_switch.c" + .balign 4 + +glabel D_80A23AB4 + .asciz "../z_en_g_switch.c" + .balign 4 + +.text glabel func_80A230A8 /* 011E8 80A230A8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 011EC 80A230AC AFBF001C */ sw $ra, 0x001C($sp) @@ -88,5 +102,3 @@ glabel func_80A230A8 /* 01338 80A231F8 8FB10018 */ lw $s1, 0x0018($sp) /* 0133C 80A231FC 03E00008 */ jr $ra /* 01340 80A23200 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23204.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23204.s index 83eb630327..145db97bfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23204.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23204.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A23B18 + .word 0x464B2000 +glabel D_80A23B1C + .word 0x477FFF00 + +.text glabel func_80A23204 /* 01344 80A23204 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01348 80A23208 AFBF001C */ sw $ra, 0x001C($sp) @@ -72,5 +79,3 @@ glabel func_80A23204 /* 01448 80A23308 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0144C 80A2330C 03E00008 */ jr $ra /* 01450 80A23310 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23314.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23314.s index 662acb8c56..d3ee7e4b87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23314.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A23314.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A23B20 + .float 0.3 + +.text glabel func_80A23314 /* 01454 80A23314 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01458 80A23318 AFBF0054 */ sw $ra, 0x0054($sp) @@ -124,5 +129,3 @@ glabel func_80A23314 /* 01608 80A234C8 8FB20050 */ lw $s2, 0x0050($sp) /* 0160C 80A234CC 03E00008 */ jr $ra /* 01610 80A234D0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s index 5c5a6d9693..2b6cee1e72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A23AC8 + .asciz "../z_en_g_switch.c" + .balign 4 + +glabel D_80A23ADC + .asciz "../z_en_g_switch.c" + .balign 4 + +glabel D_80A23AF0 + .asciz "../z_en_g_switch.c" + .balign 4 + +.late_rodata +glabel D_80A23B24 + .float 10000.0 + +.text glabel func_80A234D4 /* 01614 80A234D4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 01618 80A234D8 AFBF004C */ sw $ra, 0x004C($sp) @@ -133,4 +151,3 @@ glabel func_80A234D4 /* 01814 80A236D4 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 01818 80A236D8 00000000 */ nop /* 0181C 80A236DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Destroy.s index 8f7d1fd5a7..576d1bdc7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Destroy.s @@ -2,5 +2,3 @@ glabel EnGanonMant_Destroy /* 00018 80A23D78 AFA40000 */ sw $a0, 0x0000($sp) /* 0001C 80A23D7C 03E00008 */ jr $ra /* 00020 80A23D80 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s index 8741177b4a..074d9e5e2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A27EE4 + .float 1.57079637051 + +glabel D_80A27EE8 + .float 3.14159274101 + +.text glabel EnGanonMant_Draw /* 00C6C 80A249CC 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 00C70 80A249D0 AFBF0074 */ sw $ra, 0x0074($sp) @@ -214,4 +222,3 @@ glabel EnGanonMant_Draw /* 00F94 80A24CF4 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 /* 00F98 80A24CF8 00000000 */ nop /* 00F9C 80A24CFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Init.s index 3f913c8721..0514d0eb0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Init.s @@ -5,5 +5,3 @@ glabel EnGanonMant_Init /* 0000C 80A23D6C 01C17824 */ and $t7, $t6, $at /* 00010 80A23D70 03E00008 */ jr $ra /* 00014 80A23D74 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Update.s index 4bd9b55e37..0e8cb71dc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Update.s @@ -51,5 +51,3 @@ glabel EnGanonMant_Update /* 00B18 80A24878 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B1C 80A2487C 03E00008 */ jr $ra /* 00B20 80A24880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s index d45493ebf2..c5e54f2b62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A27EC8 + .float 6.28318548203 + +glabel D_80A27ECC + .word 0x407F5C29 +glabel D_80A27ED0 + .word 0x413E6666 + +.text glabel func_80A23D84 /* 00024 80A23D84 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00028 80A23D88 F7B80028 */ sdc1 $f24, 0x0028($sp) @@ -166,5 +176,3 @@ glabel func_80A23D84 /* 00274 80A23FD4 8FB20040 */ lw $s2, 0x0040($sp) /* 00278 80A23FD8 03E00008 */ jr $ra /* 0027C 80A23FDC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s index 5d5c10ff7b..be68c37c98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80A27ED4 + .float 3.14159274101 + +glabel D_80A27ED8 + .float 6.28318548203 + +glabel D_80A27EDC + .float 2.1 + +glabel D_80A27EE0 + .float 3.14159274101 + +.text glabel func_80A23FE0 /* 00280 80A23FE0 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 00284 80A23FE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -394,5 +408,3 @@ glabel func_80A23FE0 /* 00838 80A24598 D7B40018 */ ldc1 $f20, 0x0018($sp) /* 0083C 80A2459C 03E00008 */ jr $ra /* 00840 80A245A0 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s index 781144975f..7df3e57194 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s @@ -140,5 +140,3 @@ glabel func_80A245A4 /* 00A5C 80A247BC 8FBE0038 */ lw $s8, 0x0038($sp) /* 00A60 80A247C0 03E00008 */ jr $ra /* 00A64 80A247C4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s index 58824df67f..b009eef8b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A27E80 + .asciz "../z_en_ganon_mant.c" + .balign 4 + +glabel D_80A27E98 + .asciz "../z_en_ganon_mant.c" + .balign 4 + +glabel D_80A27EB0 + .asciz "../z_en_ganon_mant.c" + .balign 4 + +.text glabel func_80A24884 /* 00B24 80A24884 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00B28 80A24888 AFBF001C */ sw $ra, 0x001C($sp) @@ -83,5 +97,3 @@ glabel func_80A24884 /* 00C60 80A249C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00C64 80A249C4 03E00008 */ jr $ra /* 00C68 80A249C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s index 0e2298a359..5e69054aa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s @@ -25,5 +25,3 @@ glabel EnGb_Destroy /* 0047C 80A2F5FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00480 80A2F600 03E00008 */ jr $ra /* 00484 80A2F604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s index 5899608c1d..04bc0f51e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s @@ -84,5 +84,3 @@ glabel EnGb_Draw /* 00E70 80A2FFF0 8FB10028 */ lw $s1, 0x0028($sp) /* 00E74 80A2FFF4 03E00008 */ jr $ra /* 00E78 80A2FFF8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 5719db4a97..29601d06c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -272,5 +272,3 @@ glabel EnGb_Init /* 00420 80A2F5A0 D7B40020 */ ldc1 $f20, 0x0020($sp) /* 00424 80A2F5A4 03E00008 */ jr $ra /* 00428 80A2F5A8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s index c7121ffdd4..ab01bfa4f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s @@ -82,5 +82,3 @@ glabel EnGb_Update /* 00D20 80A2FEA0 8FB50028 */ lw $s5, 0x0028($sp) /* 00D24 80A2FEA4 03E00008 */ jr $ra /* 00D28 80A2FEA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s index e8683f033d..b61fc95c2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s @@ -13,5 +13,3 @@ glabel func_80A2F180 .L80A2F1A8: /* 00028 80A2F1A8 03E00008 */ jr $ra /* 0002C 80A2F1AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s index f721750c1a..1d6469003f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s @@ -86,5 +86,3 @@ glabel func_80A2F608 /* 005D4 80A2F754 8FB40028 */ lw $s4, 0x0028($sp) /* 005D8 80A2F758 03E00008 */ jr $ra /* 005DC 80A2F75C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F760.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F760.s index 001a5bc751..215c6de18c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F760.s @@ -30,5 +30,3 @@ glabel func_80A2F760 .L80A2F7B8: /* 00638 80A2F7B8 03E00008 */ jr $ra /* 0063C 80A2F7BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s index fcd9c381fc..6c609dd8c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s @@ -33,5 +33,3 @@ glabel func_80A2F7C0 /* 006B0 80A2F830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006B4 80A2F834 03E00008 */ jr $ra /* 006B8 80A2F838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F83C.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F83C.s index bae217372f..fb93940ca5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F83C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F83C.s @@ -75,5 +75,3 @@ glabel func_80A2F83C /* 007C0 80A2F940 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007C4 80A2F944 03E00008 */ jr $ra /* 007C8 80A2F948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s index 821905f288..9ca36dda0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s @@ -31,5 +31,3 @@ glabel func_80A2F94C /* 00834 80A2F9B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00838 80A2F9B8 03E00008 */ jr $ra /* 0083C 80A2F9BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s index 637f082bba..d0e655884f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s @@ -38,5 +38,3 @@ glabel func_80A2F9C0 /* 008C4 80A2FA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C8 80A2FA48 03E00008 */ jr $ra /* 008CC 80A2FA4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s index c3c547494c..a5cf73345c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s @@ -64,5 +64,3 @@ glabel func_80A2FA50 /* 009B4 80A2FB34 8FB10018 */ lw $s1, 0x0018($sp) /* 009B8 80A2FB38 03E00008 */ jr $ra /* 009BC 80A2FB3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FB40.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FB40.s index 278f4b9f55..ce29524803 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FB40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FB40.s @@ -29,5 +29,3 @@ glabel func_80A2FB40 /* 00A24 80A2FBA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A28 80A2FBA8 03E00008 */ jr $ra /* 00A2C 80A2FBAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s index a55d413386..dff1092742 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s @@ -24,5 +24,3 @@ glabel func_80A2FBB0 /* 00A80 80A2FC00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A84 80A2FC04 03E00008 */ jr $ra /* 00A88 80A2FC08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC0C.s index 939e80defc..2c49b40b37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC0C.s @@ -26,5 +26,3 @@ glabel func_80A2FC0C /* 00AE4 80A2FC64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AE8 80A2FC68 03E00008 */ jr $ra /* 00AEC 80A2FC6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s index 5f75bacfd0..982ada0e25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s @@ -72,5 +72,3 @@ glabel func_80A2FC70 /* 00BE8 80A2FD68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00BEC 80A2FD6C 03E00008 */ jr $ra /* 00BF0 80A2FD70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s index 2ce4626fc4..aa25d8da31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s @@ -235,5 +235,3 @@ glabel func_80A2FFFC /* 011C4 80A30344 8FB60060 */ lw $s6, 0x0060($sp) /* 011C8 80A30348 03E00008 */ jr $ra /* 011CC 80A3034C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index 85821aaef6..a4c1fb797f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -189,4 +189,3 @@ glabel func_80A30350 /* 014B4 80A30634 03E00008 */ jr $ra /* 014B8 80A30638 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 014BC 80A3063C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s index ce8f0cec34..fe35227ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s @@ -10,5 +10,3 @@ glabel EnGe1_Destroy /* 002F4 80A30C64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 80A30C68 03E00008 */ jr $ra /* 002FC 80A30C6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s index a7bb8a689d..226a33463d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A328A8 + .asciz "../z_en_ge1.c" + .balign 4 + +glabel D_80A328B8 + .asciz "../z_en_ge1.c" + .balign 4 + +.text glabel EnGe1_Draw /* 01CD8 80A32648 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01CDC 80A3264C AFBF002C */ sw $ra, 0x002C($sp) @@ -65,4 +75,3 @@ glabel EnGe1_Draw /* 01DD4 80A32744 00000000 */ nop /* 01DD8 80A32748 00000000 */ nop /* 01DDC 80A3274C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s index 7ff16b2da0..ff1ee22404 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A327C0 + .asciz "谷底 ゲルド 撤退 \n" + .balign 4 + +glabel D_80A327DC + .asciz "やぶさめ ゲルド EVENT_INF(0) = %x\n" + .balign 4 + +.text glabel EnGe1_Init /* 00000 80A30970 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 80A30974 AFB00028 */ sw $s0, 0x0028($sp) @@ -207,5 +217,3 @@ glabel EnGe1_Init /* 002CC 80A30C3C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002D0 80A30C40 03E00008 */ jr $ra /* 002D4 80A30C44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s index 87850a2ebc..38a77551e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s @@ -90,5 +90,3 @@ glabel EnGe1_Update /* 01A34 80A323A4 8FB10020 */ lw $s1, 0x0020($sp) /* 01A38 80A323A8 03E00008 */ jr $ra /* 01A3C 80A323AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s index 99c69f9e96..964b900c24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s @@ -57,5 +57,3 @@ glabel func_80A30C70 /* 003CC 80A30D3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003D0 80A30D40 03E00008 */ jr $ra /* 003D4 80A30D44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s index 6f268666dd..78d6963786 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s @@ -34,5 +34,3 @@ glabel func_80A30D48 /* 00450 80A30DC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00454 80A30DC4 03E00008 */ jr $ra /* 00458 80A30DC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s index 7bfa165137..1e3cbb49a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s @@ -16,5 +16,3 @@ glabel func_80A30DCC .L80A30E00: /* 00490 80A30E00 03E00008 */ jr $ra /* 00494 80A30E04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s index 6e9fe2d398..5b6b218d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s @@ -61,5 +61,3 @@ glabel func_80A30E08 /* 0056C 80A30EDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00570 80A30EE0 03E00008 */ jr $ra /* 00574 80A30EE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30EE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30EE8.s index 640034f3ce..b1b8b1fd78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30EE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30EE8.s @@ -23,5 +23,3 @@ glabel func_80A30EE8 /* 005CC 80A30F3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D0 80A30F40 03E00008 */ jr $ra /* 005D4 80A30F44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s index 58940a89c7..6a0b031008 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s @@ -50,5 +50,3 @@ glabel func_80A30F48 /* 00684 80A30FF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00688 80A30FF8 03E00008 */ jr $ra /* 0068C 80A30FFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31000.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31000.s index dfeec22ba3..9626a94260 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31000.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31000.s @@ -40,5 +40,3 @@ glabel func_80A31000 /* 00718 80A31088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0071C 80A3108C 03E00008 */ jr $ra /* 00720 80A31090 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31094.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31094.s index 14997f7ed9..2e0a19b869 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31094.s @@ -11,5 +11,3 @@ glabel func_80A31094 /* 00748 80A310B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0074C 80A310BC 03E00008 */ jr $ra /* 00750 80A310C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s index bf83b39c95..efa5f140c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s @@ -54,5 +54,3 @@ glabel func_80A310C4 /* 00810 80A31180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00814 80A31184 03E00008 */ jr $ra /* 00818 80A31188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s index e0bed1afab..7d379408e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s @@ -21,5 +21,3 @@ glabel func_80A3118C /* 00864 80A311D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00868 80A311D8 03E00008 */ jr $ra /* 0086C 80A311DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A311E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A311E0.s index 7cf920ed2c..3106ffdc94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A311E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A311E0.s @@ -22,5 +22,3 @@ glabel func_80A311E0 /* 008B8 80A31228 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008BC 80A3122C 03E00008 */ jr $ra /* 008C0 80A31230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31234.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31234.s index 72995dc4d6..b562d63a02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31234.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31234.s @@ -48,5 +48,3 @@ glabel func_80A31234 /* 00968 80A312D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0096C 80A312DC 03E00008 */ jr $ra /* 00970 80A312E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s index 2a53b8defa..301b2c10cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s @@ -50,5 +50,3 @@ glabel func_80A312E4 /* 00A24 80A31394 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A28 80A31398 03E00008 */ jr $ra /* 00A2C 80A3139C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313A0.s index 4acef66279..10dda5274a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313A0.s @@ -16,5 +16,3 @@ glabel func_80A313A0 /* 00A64 80A313D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A68 80A313D8 03E00008 */ jr $ra /* 00A6C 80A313DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s index 6f5b8510c8..784f3ca166 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s @@ -64,5 +64,3 @@ glabel func_80A313E0 /* 00B54 80A314C4 8FB10018 */ lw $s1, 0x0018($sp) /* 00B58 80A314C8 03E00008 */ jr $ra /* 00B5C 80A314CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A314D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A314D0.s index 84637d3f8f..f4d77dc0af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A314D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A314D0.s @@ -17,5 +17,3 @@ glabel func_80A314D0 /* 00B98 80A31508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B9C 80A3150C 03E00008 */ jr $ra /* 00BA0 80A31510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s index 929f20f4b3..8aa4933d65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s @@ -27,5 +27,3 @@ glabel func_80A31514 /* 00C00 80A31570 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C04 80A31574 03E00008 */ jr $ra /* 00C08 80A31578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3157C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3157C.s index 959c100438..72d2b45ea1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3157C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3157C.s @@ -29,5 +29,3 @@ glabel func_80A3157C /* 00C74 80A315E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C78 80A315E8 03E00008 */ jr $ra /* 00C7C 80A315EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A315F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A315F0.s index a8ad640c84..db7b77f410 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A315F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A315F0.s @@ -22,5 +22,3 @@ glabel func_80A315F0 /* 00CC8 80A31638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CCC 80A3163C 03E00008 */ jr $ra /* 00CD0 80A31640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31644.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31644.s index 56b108278d..4030490c56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31644.s @@ -48,5 +48,3 @@ glabel func_80A31644 /* 00D78 80A316E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D7C 80A316EC 03E00008 */ jr $ra /* 00D80 80A316F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s index eebc17b992..d5c55da283 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s @@ -54,5 +54,3 @@ glabel func_80A316F4 /* 00E44 80A317B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E48 80A317B8 03E00008 */ jr $ra /* 00E4C 80A317BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A317C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A317C0.s index 3028295251..6ba6138d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A317C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A317C0.s @@ -33,5 +33,3 @@ glabel func_80A317C0 /* 00EC0 80A31830 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EC4 80A31834 03E00008 */ jr $ra /* 00EC8 80A31838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3183C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3183C.s index b293aa4db3..f5bf1625e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3183C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3183C.s @@ -17,5 +17,3 @@ glabel func_80A3183C /* 00F04 80A31874 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F08 80A31878 03E00008 */ jr $ra /* 00F0C 80A3187C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s index 938fbb4438..cc4f7b22e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s @@ -48,5 +48,3 @@ glabel func_80A31880 /* 00FB8 80A31928 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FBC 80A3192C 03E00008 */ jr $ra /* 00FC0 80A31930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31934.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31934.s index 4a0022034b..0e86149185 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31934.s @@ -14,5 +14,3 @@ glabel func_80A31934 /* 00FF0 80A31960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FF4 80A31964 03E00008 */ jr $ra /* 00FF8 80A31968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s index ca37e64877..65929b3a0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s @@ -65,5 +65,3 @@ glabel func_80A3196C /* 010E0 80A31A50 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010E4 80A31A54 03E00008 */ jr $ra /* 010E8 80A31A58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s index 838ed68225..a9bfa9b1bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s @@ -52,5 +52,3 @@ glabel func_80A31A5C /* 011A4 80A31B14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 011A8 80A31B18 03E00008 */ jr $ra /* 011AC 80A31B1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B20.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B20.s index 00fdd22447..8bd266c242 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B20.s @@ -24,5 +24,3 @@ glabel func_80A31B20 /* 01200 80A31B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01204 80A31B74 03E00008 */ jr $ra /* 01208 80A31B78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B7C.s index 070b2a43e4..6f0b4f3263 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31B7C.s @@ -24,5 +24,3 @@ glabel func_80A31B7C /* 01260 80A31BD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01264 80A31BD4 03E00008 */ jr $ra /* 01268 80A31BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BDC.s index 0ed0724c31..d51f5a258c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BDC.s @@ -2,5 +2,3 @@ glabel func_80A31BDC /* 0126C 80A31BDC AFA40000 */ sw $a0, 0x0000($sp) /* 01270 80A31BE0 03E00008 */ jr $ra /* 01274 80A31BE4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s index 1c94a30a0b..e249829fda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s @@ -111,5 +111,3 @@ glabel func_80A31BE8 /* 0140C 80A31D7C 8FB10020 */ lw $s1, 0x0020($sp) /* 01410 80A31D80 03E00008 */ jr $ra /* 01414 80A31D84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31D88.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31D88.s index af86b0052a..bb96015ced 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31D88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31D88.s @@ -24,5 +24,3 @@ glabel func_80A31D88 /* 01468 80A31DD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0146C 80A31DDC 03E00008 */ jr $ra /* 01470 80A31DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31DE4.s index d1f26b4d55..42306b752b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31DE4.s @@ -19,5 +19,3 @@ glabel func_80A31DE4 /* 014B0 80A31E20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014B4 80A31E24 03E00008 */ jr $ra /* 014B8 80A31E28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s index 6f3217e249..6d7767c820 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A32808 + .asciz "../z_en_ge1.c" + .balign 4 + +glabel D_80A32818 + .asciz "z_common_data.yabusame_total = %d\n" + .balign 4 + +glabel D_80A3283C + .asciz "../z_en_ge1.c" + .balign 4 + +glabel D_80A3284C + .asciz "z_common_data.memory.information.room_inf[127][ 0 ] = %d\n" + .balign 4 + +.text glabel func_80A31E2C /* 014BC 80A31E2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 014C0 80A31E30 AFB00018 */ sw $s0, 0x0018($sp) @@ -101,5 +119,3 @@ glabel func_80A31E2C /* 01620 80A31F90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01624 80A31F94 03E00008 */ jr $ra /* 01628 80A31F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31F9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31F9C.s index af759d3112..93bbdbd36a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31F9C.s @@ -17,5 +17,3 @@ glabel func_80A31F9C /* 01664 80A31FD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01668 80A31FD8 03E00008 */ jr $ra /* 0166C 80A31FDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s index 21655aee23..27d0595d5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s @@ -41,5 +41,3 @@ glabel func_80A31FE0 /* 016FC 80A3206C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01700 80A32070 03E00008 */ jr $ra /* 01704 80A32074 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s index cde8fc0892..0cf1a45301 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s @@ -78,5 +78,3 @@ glabel func_80A32078 /* 01814 80A32184 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01818 80A32188 03E00008 */ jr $ra /* 0181C 80A3218C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s index 3b9965a535..17f3bda004 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s @@ -60,5 +60,3 @@ glabel func_80A32190 /* 018F0 80A32260 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 018F4 80A32264 03E00008 */ jr $ra /* 018F8 80A32268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s index f4ed8ba0a0..b37ba19c47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s @@ -16,5 +16,3 @@ glabel func_80A323B0 /* 01A70 80A323E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01A74 80A323E4 03E00008 */ jr $ra /* 01A78 80A323E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323EC.s index ba42a8d706..caa24113af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323EC.s @@ -24,5 +24,3 @@ glabel func_80A323EC /* 01AC8 80A32438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01ACC 80A3243C 03E00008 */ jr $ra /* 01AD0 80A32440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s index c4b84eacee..10f051b751 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s @@ -90,5 +90,3 @@ glabel func_80A32444 /* 01C1C 80A3258C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C20 80A32590 03E00008 */ jr $ra /* 01C24 80A32594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s index df1f86d9e1..63fe15cdff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A32888 + .asciz "../z_en_ge1.c" + .balign 4 + +glabel D_80A32898 + .asciz "../z_en_ge1.c" + .balign 4 + +.text glabel func_80A32598 /* 01C28 80A32598 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01C2C 80A3259C AFBF0014 */ sw $ra, 0x0014($sp) @@ -44,5 +54,3 @@ glabel func_80A32598 /* 01CCC 80A3263C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01CD0 80A32640 03E00008 */ jr $ra /* 01CD4 80A32644 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s index 1e9f5c13a6..443b410e85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s @@ -10,5 +10,3 @@ glabel EnGe2_Destroy /* 002F0 80A32EC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F4 80A32EC4 03E00008 */ jr $ra /* 002F8 80A32EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s index f9b76260c7..84530599c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A3441C + .asciz "../z_en_ge2.c" + .balign 4 + +glabel D_80A3442C + .asciz "../z_en_ge2.c" + .balign 4 + +.text glabel EnGe2_Draw /* 01610 80A341E0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01614 80A341E4 AFB10028 */ sw $s1, 0x0028($sp) @@ -67,4 +77,3 @@ glabel EnGe2_Draw /* 01714 80A342E4 03E00008 */ jr $ra /* 01718 80A342E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0171C 80A342EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s index ef3f027b75..048b8c7768 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A343D0 + .asciz "0" + .balign 4 + +glabel D_80A343D4 + .asciz "../z_en_ge2.c" + .balign 4 + +.text glabel EnGe2_Init /* 000A4 80A32C74 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 000A8 80A32C78 AFB00028 */ sw $s0, 0x0028($sp) @@ -151,5 +161,3 @@ glabel EnGe2_Init /* 002C8 80A32E98 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002CC 80A32E9C 03E00008 */ jr $ra /* 002D0 80A32EA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s index 3510e3717e..f3b4f62d1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A343E4 + .asciz "\x1b[32m発見!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +glabel D_80A34400 + .asciz "\x1b[32m発見!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.text glabel EnGe2_Update /* 01264 80A33E34 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01268 80A33E38 AFBF0024 */ sw $ra, 0x0024($sp) @@ -141,5 +151,3 @@ glabel EnGe2_Update /* 01450 80A34020 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01454 80A34024 03E00008 */ jr $ra /* 01458 80A34028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s index 82a9ffa57b..70fd7dbbbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s @@ -42,5 +42,3 @@ glabel func_80A32BD0 /* 00098 80A32C68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0009C 80A32C6C 03E00008 */ jr $ra /* 000A0 80A32C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s index 4f83460141..023b073e41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s @@ -46,5 +46,3 @@ glabel func_80A32ECC /* 00398 80A32F68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0039C 80A32F6C 03E00008 */ jr $ra /* 003A0 80A32F70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s index 9b7413a0e8..f32a56bfeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s @@ -82,5 +82,3 @@ glabel func_80A32F74 /* 004C4 80A33094 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 004C8 80A33098 03E00008 */ jr $ra /* 004CC 80A3309C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s index 2b342fa16f..48beb7c8a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s @@ -11,5 +11,3 @@ glabel func_80A330A0 .L80A330C4: /* 004F4 80A330C4 03E00008 */ jr $ra /* 004F8 80A330C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s index 819c960c40..d6db63efa2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s @@ -58,5 +58,3 @@ glabel func_80A330CC /* 005C4 80A33194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005C8 80A33198 03E00008 */ jr $ra /* 005CC 80A3319C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s index 1091b1936a..880783f867 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s @@ -84,5 +84,3 @@ glabel func_80A331A0 /* 006F8 80A332C8 8FB10020 */ lw $s1, 0x0020($sp) /* 006FC 80A332CC 03E00008 */ jr $ra /* 00700 80A332D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s index faca588789..05e37eb421 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s @@ -31,5 +31,3 @@ glabel func_80A332D4 /* 00770 80A33340 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00774 80A33344 03E00008 */ jr $ra /* 00778 80A33348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s index 577eac9c91..53fa618889 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s @@ -64,5 +64,3 @@ glabel func_80A3334C /* 00868 80A33438 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0086C 80A3343C 03E00008 */ jr $ra /* 00870 80A33440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s index 230511bc30..cba9f54325 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s @@ -75,5 +75,3 @@ glabel func_80A33444 /* 00970 80A33540 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00974 80A33544 03E00008 */ jr $ra /* 00978 80A33548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s index d0de7b3189..9066c6b594 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s @@ -48,5 +48,3 @@ glabel func_80A3354C /* 00A24 80A335F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A28 80A335F8 03E00008 */ jr $ra /* 00A2C 80A335FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33600.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33600.s index 192ab456d4..f416a5cf0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33600.s @@ -51,5 +51,3 @@ glabel func_80A33600 /* 00AE8 80A336B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AEC 80A336BC 03E00008 */ jr $ra /* 00AF0 80A336C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s index 1285584306..479be053ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s @@ -16,5 +16,3 @@ glabel func_80A336C4 /* 00B28 80A336F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B2C 80A336FC 03E00008 */ jr $ra /* 00B30 80A33700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s index d55b577d7a..bf17d1e652 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s @@ -78,5 +78,3 @@ glabel func_80A33704 /* 00C40 80A33810 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00C44 80A33814 03E00008 */ jr $ra /* 00C48 80A33818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s index 0e6130f6fb..728704fd5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s @@ -76,5 +76,3 @@ glabel func_80A3381C /* 00D54 80A33924 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D58 80A33928 03E00008 */ jr $ra /* 00D5C 80A3392C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33930.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33930.s index 3794af1ac3..b0b6dadf0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33930.s @@ -51,5 +51,3 @@ glabel func_80A33930 /* 00E10 80A339E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E14 80A339E4 03E00008 */ jr $ra /* 00E18 80A339E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A339EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A339EC.s index 864c8a2b3d..0ee53b7b21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A339EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A339EC.s @@ -7,5 +7,3 @@ glabel func_80A339EC /* 00E30 80A33A00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E34 80A33A04 03E00008 */ jr $ra /* 00E38 80A33A08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s index 0314113937..dc9bc01128 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s @@ -25,5 +25,3 @@ glabel func_80A33A0C /* 00E90 80A33A60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E94 80A33A64 03E00008 */ jr $ra /* 00E98 80A33A68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A6C.s index 8eabe9a3e8..6850215218 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A6C.s @@ -36,5 +36,3 @@ glabel func_80A33A6C /* 00F20 80A33AF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F24 80A33AF4 03E00008 */ jr $ra /* 00F28 80A33AF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33AFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33AFC.s index cbf8ee9767..cb9136afa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33AFC.s @@ -33,5 +33,3 @@ glabel func_80A33AFC /* 00FA0 80A33B70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FA4 80A33B74 03E00008 */ jr $ra /* 00FA8 80A33B78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33B7C.s index 8baa7f2b30..94235ec545 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33B7C.s @@ -26,5 +26,3 @@ glabel func_80A33B7C /* 0100C 80A33BDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01010 80A33BE0 03E00008 */ jr $ra /* 01014 80A33BE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s index 18318c15c2..67184b44c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s @@ -44,5 +44,3 @@ glabel func_80A33BE8 /* 010B0 80A33C80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 010B4 80A33C84 03E00008 */ jr $ra /* 010B8 80A33C88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s index 0357e31b53..60c8f2e88b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s @@ -38,5 +38,3 @@ glabel func_80A33C8C /* 01134 80A33D04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01138 80A33D08 03E00008 */ jr $ra /* 0113C 80A33D0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33D10.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33D10.s index fd05b47dad..084b8e8487 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33D10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33D10.s @@ -55,5 +55,3 @@ glabel func_80A33D10 /* 01204 80A33DD4 8FB10018 */ lw $s1, 0x0018($sp) /* 01208 80A33DD8 03E00008 */ jr $ra /* 0120C 80A33DDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33DE0.s index c28d676cd8..2ae8810d5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33DE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33DE0.s @@ -20,5 +20,3 @@ glabel func_80A33DE0 /* 01258 80A33E28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0125C 80A33E2C 03E00008 */ jr $ra /* 01260 80A33E30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s index 6d4903d26d..99ecec401e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s @@ -84,5 +84,3 @@ glabel func_80A3402C /* 01580 80A34150 8FB10020 */ lw $s1, 0x0020($sp) /* 01584 80A34154 03E00008 */ jr $ra /* 01588 80A34158 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3415C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3415C.s index bd4cf69fea..fdf0fa7e5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3415C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3415C.s @@ -17,5 +17,3 @@ glabel func_80A3415C .L80A34198: /* 015C8 80A34198 03E00008 */ jr $ra /* 015CC 80A3419C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A341A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A341A0.s index b264aaf599..22f9fc173a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A341A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A341A0.s @@ -16,5 +16,3 @@ glabel func_80A341A0 /* 01604 80A341D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01608 80A341D8 03E00008 */ jr $ra /* 0160C 80A341DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s index aa5c427ca0..ffbfe5f5fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s @@ -10,5 +10,3 @@ glabel EnGe3_Destroy /* 001C8 80A347E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001CC 80A347EC 03E00008 */ jr $ra /* 001D0 80A347F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s index d40698ea31..07d704a1a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A35200 + .asciz "../z_en_ge3.c" + .balign 4 + +glabel D_80A35210 + .asciz "../z_en_ge3.c" + .balign 4 + +.text glabel EnGe3_Draw /* 00A40 80A35060 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00A44 80A35064 AFB10028 */ sw $s1, 0x0028($sp) @@ -67,4 +77,3 @@ glabel EnGe3_Draw /* 00B44 80A35164 03E00008 */ jr $ra /* 00B48 80A35168 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00B4C 80A3516C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s index 54bfc1a9f2..d81109e7ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s @@ -69,5 +69,3 @@ glabel EnGe3_Init /* 001A0 80A347C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 001A4 80A347C4 03E00008 */ jr $ra /* 001A8 80A347C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s index 6969a61979..11ad1cad8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s @@ -16,5 +16,3 @@ glabel EnGe3_Update /* 0082C 80A34E4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00830 80A34E50 03E00008 */ jr $ra /* 00834 80A34E54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s index fb136beab4..f054af6e08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s @@ -42,5 +42,3 @@ glabel func_80A34620 /* 00098 80A346B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0009C 80A346BC 03E00008 */ jr $ra /* 000A0 80A346C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s index 97edea6f83..cc970083b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s @@ -78,5 +78,3 @@ glabel func_80A347F4 /* 002E0 80A34900 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002E4 80A34904 03E00008 */ jr $ra /* 002E8 80A34908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s index b884f965f7..2b034cd13a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s @@ -76,5 +76,3 @@ glabel func_80A3490C /* 003F4 80A34A14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003F8 80A34A18 03E00008 */ jr $ra /* 003FC 80A34A1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s index 9d13cf798f..f0c3535e05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s @@ -24,5 +24,3 @@ glabel func_80A34A20 /* 00454 80A34A74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00458 80A34A78 03E00008 */ jr $ra /* 0045C 80A34A7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s index e22295129d..964e0cd5a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s @@ -7,5 +7,3 @@ glabel func_80A34A80 /* 00474 80A34A94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00478 80A34A98 03E00008 */ jr $ra /* 0047C 80A34A9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s index c1c6f636d9..a6a1c8a2ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s @@ -25,5 +25,3 @@ glabel func_80A34AA0 /* 004D4 80A34AF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004D8 80A34AF8 03E00008 */ jr $ra /* 004DC 80A34AFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s index 48f3749e56..bfd38f7d58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s @@ -36,5 +36,3 @@ glabel func_80A34B00 /* 00564 80A34B84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00568 80A34B88 03E00008 */ jr $ra /* 0056C 80A34B8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s index c04abaae4f..708a6bc6d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s @@ -46,5 +46,3 @@ glabel func_80A34B90 /* 00614 80A34C34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00618 80A34C38 03E00008 */ jr $ra /* 0061C 80A34C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s index 60bc5baef3..e52d9236b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s @@ -44,5 +44,3 @@ glabel func_80A34C40 /* 006B8 80A34CD8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 006BC 80A34CDC 03E00008 */ jr $ra /* 006C0 80A34CE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s index c7d12146c3..3f5732e8d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s @@ -38,5 +38,3 @@ glabel func_80A34CE4 /* 0073C 80A34D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00740 80A34D60 03E00008 */ jr $ra /* 00744 80A34D64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s index 17bbf20238..bc63fa7274 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s @@ -45,5 +45,3 @@ glabel func_80A34D68 /* 007E8 80A34E08 8FB10018 */ lw $s1, 0x0018($sp) /* 007EC 80A34E0C 03E00008 */ jr $ra /* 007F0 80A34E10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s index b6db670923..b029ad02ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A351E0 + .asciz "../z_en_ge3.c" + .balign 4 + +glabel D_80A351F0 + .asciz "../z_en_ge3.c" + .balign 4 + +.text glabel func_80A34E58 /* 00838 80A34E58 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0083C 80A34E5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 @@ -115,5 +125,3 @@ glabel func_80A34E58 /* 009D8 80A34FF8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 009DC 80A34FFC 03E00008 */ jr $ra /* 009E0 80A35000 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s index 6ca36aa8f4..b5655d1b57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s @@ -23,5 +23,3 @@ glabel func_80A35004 /* 00A34 80A35054 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A38 80A35058 03E00008 */ jr $ra /* 00A3C 80A3505C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s index cb15fe0e61..311a0c4e53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s @@ -25,5 +25,3 @@ glabel EnGeldB_Destroy /* 00280 80A35590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00284 80A35594 03E00008 */ jr $ra /* 00288 80A35598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s index f3a2e267a2..43578762e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A3A200 + .asciz "../z_en_geldB.c" + .balign 4 + +glabel D_80A3A210 + .asciz "../z_en_geldB.c" + .balign 4 + +.text glabel EnGeldB_Draw /* 04788 80A39A98 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 0478C 80A39A9C AFBF004C */ sw $ra, 0x004C($sp) @@ -242,5 +252,3 @@ glabel EnGeldB_Draw /* 04B10 80A39E20 8FB40048 */ lw $s4, 0x0048($sp) /* 04B14 80A39E24 03E00008 */ jr $ra /* 04B18 80A39E28 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s index 5fcfc7351d..56958951f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s @@ -144,5 +144,3 @@ glabel EnGeldB_Init /* 0021C 80A3552C 8FB10028 */ lw $s1, 0x0028($sp) /* 00220 80A35530 03E00008 */ jr $ra /* 00224 80A35534 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s index 009cf3c676..37b360d85b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A270 + .float 0.1 + +.text glabel EnGeldB_Update /* 04194 80A394A4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 04198 80A394A8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -135,5 +140,3 @@ glabel EnGeldB_Update /* 0436C 80A3967C 8FB10020 */ lw $s1, 0x0020($sp) /* 04370 80A39680 03E00008 */ jr $ra /* 04374 80A39684 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35310.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35310.s index d6bc285b8a..8f8968dac8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35310.s @@ -1,5 +1,3 @@ glabel func_80A35310 /* 00000 80A35310 03E00008 */ jr $ra /* 00004 80A35314 AC8502F4 */ sw $a1, 0x02F4($a0) ## 000002F4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3559C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3559C.s index 494b31e52b..fa81e5eb42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3559C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3559C.s @@ -267,5 +267,3 @@ glabel func_80A3559C /* 00658 80A35968 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0065C 80A3596C 03E00008 */ jr $ra /* 00660 80A35970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s index 866db50056..872c742182 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s @@ -36,5 +36,3 @@ glabel func_80A35974 /* 006EC 80A359FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006F0 80A35A00 03E00008 */ jr $ra /* 006F4 80A35A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35A08.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35A08.s index 079ef3eaad..d6c489803b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35A08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35A08.s @@ -105,5 +105,3 @@ glabel func_80A35A08 /* 00870 80A35B80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00874 80A35B84 03E00008 */ jr $ra /* 00878 80A35B88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s index c278e50403..ad7303e477 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s @@ -39,5 +39,3 @@ glabel func_80A35B8C /* 00908 80A35C18 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0090C 80A35C1C 03E00008 */ jr $ra /* 00910 80A35C20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35C24.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35C24.s index 446cf2bb3f..f8994c40e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35C24.s @@ -79,5 +79,3 @@ glabel func_80A35C24 /* 00A2C 80A35D3C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A30 80A35D40 03E00008 */ jr $ra /* 00A34 80A35D44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s index 459df99fde..61991b540a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s @@ -34,5 +34,3 @@ glabel func_80A35D48 /* 00AB4 80A35DC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AB8 80A35DC8 03E00008 */ jr $ra /* 00ABC 80A35DCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35DD0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35DD0.s index dbbfc00cd9..2793c8c134 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35DD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35DD0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A3A220 + .float 0.3 + +glabel D_80A3A224 + .float 0.3 + +.text glabel func_80A35DD0 /* 00AC0 80A35DD0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00AC4 80A35DD4 AFBF001C */ sw $ra, 0x001C($sp) @@ -207,5 +215,3 @@ glabel func_80A35DD0 /* 00D94 80A360A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D98 80A360A8 03E00008 */ jr $ra /* 00D9C 80A360AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s index e780b949fa..3d114f68ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s @@ -33,5 +33,3 @@ glabel func_80A360B0 /* 00E14 80A36124 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E18 80A36128 03E00008 */ jr $ra /* 00E1C 80A3612C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36130.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36130.s index fb9aab1d58..30bbebdb75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36130.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A3A228 + .float 0.7 + +glabel D_80A3A22C + .float 0.03 + +.text glabel func_80A36130 /* 00E20 80A36130 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00E24 80A36134 AFB00020 */ sw $s0, 0x0020($sp) @@ -335,5 +343,3 @@ glabel func_80A36130 /* 012C0 80A365D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 012C4 80A365D4 03E00008 */ jr $ra /* 012C8 80A365D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s index 46138e605f..eb4ff665d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s @@ -47,5 +47,3 @@ glabel func_80A365DC /* 01374 80A36684 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01378 80A36688 03E00008 */ jr $ra /* 0137C 80A3668C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36690.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36690.s index 27bcec8e77..d388615a71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36690.s @@ -96,5 +96,3 @@ glabel func_80A36690 /* 014C8 80A367D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014CC 80A367DC 03E00008 */ jr $ra /* 014D0 80A367E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s index d6f6dcd5e4..8e105925eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s @@ -18,5 +18,3 @@ glabel func_80A367E4 /* 01514 80A36824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01518 80A36828 03E00008 */ jr $ra /* 0151C 80A3682C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36830.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36830.s index c55d3fcc02..df536ba020 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36830.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A230 + .float 0.8 + +.text glabel func_80A36830 /* 01520 80A36830 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01524 80A36834 AFB00018 */ sw $s0, 0x0018($sp) @@ -131,5 +136,3 @@ glabel func_80A36830 /* 016F4 80A36A04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016F8 80A36A08 03E00008 */ jr $ra /* 016FC 80A36A0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s index 67a6bd56b4..555cffad0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s @@ -56,5 +56,3 @@ glabel func_80A36A10 /* 017C8 80A36AD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 017CC 80A36ADC 03E00008 */ jr $ra /* 017D0 80A36AE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36AE4.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36AE4.s index ac7d00a019..b16cd16378 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36AE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36AE4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A3A234 + .float -0.8 + +glabel D_80A3A238 + .float -0.8 + +glabel D_80A3A23C + .float -0.85 + +.text glabel func_80A36AE4 /* 017D4 80A36AE4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 017D8 80A36AE8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -421,5 +432,3 @@ glabel func_80A36AE4 /* 01DA0 80A370B0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01DA4 80A370B4 03E00008 */ jr $ra /* 01DA8 80A370B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s index 1d964c4350..6ae902bb69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s @@ -98,5 +98,3 @@ glabel func_80A370BC /* 01F08 80A37218 8FB00030 */ lw $s0, 0x0030($sp) /* 01F0C 80A3721C 03E00008 */ jr $ra /* 01F10 80A37220 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37224.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37224.s index e9ad6b963f..495052750e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37224.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A240 + .float -0.8 + +.text glabel func_80A37224 /* 01F14 80A37224 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01F18 80A37228 AFBF0024 */ sw $ra, 0x0024($sp) @@ -312,5 +317,3 @@ glabel func_80A37224 /* 02354 80A37664 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02358 80A37668 03E00008 */ jr $ra /* 0235C 80A3766C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s index a5e1e84e51..a2c184e891 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s @@ -27,5 +27,3 @@ glabel func_80A37670 /* 023C4 80A376D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023C8 80A376D8 03E00008 */ jr $ra /* 023CC 80A376DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A376E0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A376E0.s index 73b832e13c..3a6e5b5e8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A376E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A376E0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A3A244 + .float 0.7 + +glabel D_80A3A248 + .float 0.7 + +.text glabel func_80A376E0 /* 023D0 80A376E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 023D4 80A376E4 AFBF001C */ sw $ra, 0x001C($sp) @@ -165,5 +173,3 @@ glabel func_80A376E0 /* 02610 80A37920 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02614 80A37924 03E00008 */ jr $ra /* 02618 80A37928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s index 890c74dc8a..90172a3cae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s @@ -38,5 +38,3 @@ glabel func_80A3792C /* 026A4 80A379B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 026A8 80A379B8 03E00008 */ jr $ra /* 026AC 80A379BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A379C0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A379C0.s index a8d541c39f..730138aa3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A379C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A379C0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A3A24C + .float 0.7 + +glabel D_80A3A250 + .float 0.7 + +.text glabel func_80A379C0 /* 026B0 80A379C0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 026B4 80A379C4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -260,5 +268,3 @@ glabel func_80A379C0 /* 02A54 80A37D64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02A58 80A37D68 03E00008 */ jr $ra /* 02A5C 80A37D6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s index 84f9da715a..37464d64a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s @@ -31,5 +31,3 @@ glabel func_80A37D70 /* 02AD0 80A37DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02AD4 80A37DE4 03E00008 */ jr $ra /* 02AD8 80A37DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37DEC.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37DEC.s index 7b36032e3e..7d060178bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37DEC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A254 + .float 0.2 + +.text glabel func_80A37DEC /* 02ADC 80A37DEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02AE0 80A37DF0 AFB00018 */ sw $s0, 0x0018($sp) @@ -73,5 +78,3 @@ glabel func_80A37DEC /* 02BD4 80A37EE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02BD8 80A37EE8 03E00008 */ jr $ra /* 02BDC 80A37EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s index 127f272122..1f209b373e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s @@ -46,5 +46,3 @@ glabel func_80A37EF0 /* 02C7C 80A37F8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C80 80A37F90 03E00008 */ jr $ra /* 02C84 80A37F94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37F98.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37F98.s index 24e5fc78d0..cccab0d1ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37F98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37F98.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A258 + .float 0.05 + +.text glabel func_80A37F98 /* 02C88 80A37F98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02C8C 80A37F9C AFBF0014 */ sw $ra, 0x0014($sp) @@ -51,5 +56,3 @@ glabel func_80A37F98 /* 02D38 80A38048 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D3C 80A3804C 03E00008 */ jr $ra /* 02D40 80A38050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s index 28af3b1470..28b14f4da8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s @@ -39,5 +39,3 @@ glabel func_80A38054 /* 02DD0 80A380E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DD4 80A380E4 03E00008 */ jr $ra /* 02DD8 80A380E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A380EC.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A380EC.s index 1c7cfd28bb..57c2ac8035 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A380EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A380EC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A25C + .float 0.05 + +.text glabel func_80A380EC /* 02DDC 80A380EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02DE0 80A380F0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -113,5 +118,3 @@ glabel func_80A380EC /* 02F74 80A38284 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02F78 80A38288 03E00008 */ jr $ra /* 02F7C 80A3828C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s index 6130905145..d4c383437f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s @@ -48,5 +48,3 @@ glabel func_80A38290 /* 0302C 80A3833C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03030 80A38340 03E00008 */ jr $ra /* 03034 80A38344 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38348.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38348.s index f654b39594..183ffdf711 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38348.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38348.s @@ -62,5 +62,3 @@ glabel func_80A38348 /* 03114 80A38424 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03118 80A38428 03E00008 */ jr $ra /* 0311C 80A3842C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s index abfad8e096..f7b10e10b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s @@ -49,5 +49,3 @@ glabel func_80A38430 /* 031CC 80A384DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 031D0 80A384E0 03E00008 */ jr $ra /* 031D4 80A384E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A384E8.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A384E8.s index ab30241f65..fa44a2b611 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A384E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A384E8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A260 + .float 0.7 + +.text glabel func_80A384E8 /* 031D8 80A384E8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 031DC 80A384EC AFBF0024 */ sw $ra, 0x0024($sp) @@ -205,5 +210,3 @@ glabel func_80A384E8 /* 034B4 80A387C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 034B8 80A387C8 03E00008 */ jr $ra /* 034BC 80A387CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s index 7dca162303..964f02db11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s @@ -109,5 +109,3 @@ glabel func_80A387D0 /* 03644 80A38954 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03648 80A38958 03E00008 */ jr $ra /* 0364C 80A3895C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38960.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38960.s index 9475235d34..29cec14ef8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38960.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38960.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A3A264 + .float -0.8 + +glabel D_80A3A268 + .float -0.8 + +.text glabel func_80A38960 /* 03650 80A38960 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 03654 80A38964 AFBF0024 */ sw $ra, 0x0024($sp) @@ -513,5 +521,3 @@ glabel func_80A38960 /* 03D60 80A39070 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 03D64 80A39074 03E00008 */ jr $ra /* 03D68 80A39078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s index 2d70fb23f7..b9617d4542 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s @@ -43,5 +43,3 @@ glabel func_80A3907C /* 03E04 80A39114 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03E08 80A39118 03E00008 */ jr $ra /* 03E0C 80A3911C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39120.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39120.s index 31681bd7ec..90a606a4fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39120.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39120.s @@ -52,5 +52,3 @@ glabel func_80A39120 /* 03EBC 80A391CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03EC0 80A391D0 03E00008 */ jr $ra /* 03EC4 80A391D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A391D8.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A391D8.s index 01f29e3b46..45e8b3abdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A391D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A391D8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A26C + .word 0x460B6000 + +.text glabel func_80A391D8 /* 03EC8 80A391D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 03ECC 80A391DC AFBF0024 */ sw $ra, 0x0024($sp) @@ -71,5 +76,3 @@ glabel func_80A391D8 /* 03FBC 80A392CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03FC0 80A392D0 03E00008 */ jr $ra /* 03FC4 80A392D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s index 2b13b6e513..576dc61f03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s @@ -126,5 +126,3 @@ glabel func_80A392D8 /* 04188 80A39498 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0418C 80A3949C 03E00008 */ jr $ra /* 04190 80A394A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s index 4af14feccc..e224bde546 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A3A1E0 + .asciz "../z_en_geldB.c" + .balign 4 + +glabel D_80A3A1F0 + .asciz "../z_en_geldB.c" + .balign 4 + +.text glabel func_80A39688 /* 04378 80A39688 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0437C 80A3968C AFBF0014 */ sw $ra, 0x0014($sp) @@ -107,5 +117,3 @@ glabel func_80A39688 /* 04508 80A39818 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0450C 80A3981C 03E00008 */ jr $ra /* 04510 80A39820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s index e201836814..0bef92db2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s @@ -1,3 +1,30 @@ +.late_rodata +glabel jtbl_80A3A274 +.word L80A39A08 +.word L80A399E0 +.word L80A39A24 +.word L80A39A24 +.word L80A39A24 +.word L80A39A00 +.word L80A39A24 +.word L80A39A24 +.word L80A39A24 +.word L80A399F0 +.word L80A399F8 +.word L80A39A24 +.word L80A39A24 +.word L80A39A24 +.word L80A399E8 +.word L80A39A24 +.word L80A39A24 +.word L80A39A18 +.word L80A39A24 +.word L80A39A24 +.word L80A39A20 +.word L80A39A10 +.word 0x00000000 + +.text glabel func_80A39824 /* 04514 80A39824 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 04518 80A39828 AFB10020 */ sw $s1, 0x0020($sp) @@ -176,5 +203,3 @@ glabel L80A39A24 /* 0477C 80A39A8C 8FB10020 */ lw $s1, 0x0020($sp) /* 04780 80A39A90 03E00008 */ jr $ra /* 04784 80A39A94 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39E2C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39E2C.s index 4ac72dcf06..6f611592af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39E2C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3A2D0 + .word 0x4082C000, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80A39E2C /* 04B1C 80A39E2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 04B20 80A39E30 AFBF0014 */ sw $ra, 0x0014($sp) @@ -111,4 +116,3 @@ glabel func_80A39E2C /* 04CA4 80A39FB4 00000000 */ nop /* 04CA8 80A39FB8 00000000 */ nop /* 04CAC 80A39FBC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s index d9a621439c..55477ff863 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s @@ -11,5 +11,3 @@ glabel EnGirlA_Destroy /* 0034C 80A3AA9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00350 80A3AAA0 03E00008 */ jr $ra /* 00354 80A3AAA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s index 96d8c1be83..0e50e4bd84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A3D088 + .asciz "%s(%2d)初期設定\n" # %s(%2d) Default Settings + .balign 4 + +.text glabel EnGirlA_Init /* 002D8 80A3AA28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002DC 80A3AA2C AFBF0014 */ sw $ra, 0x0014($sp) @@ -21,5 +27,3 @@ glabel EnGirlA_Init /* 00320 80A3AA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00324 80A3AA74 03E00008 */ jr $ra /* 00328 80A3AA78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s index 392c9cab3f..0f7a6f292f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s @@ -8,5 +8,3 @@ glabel EnGirlA_Update /* 01D3C 80A3C48C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D40 80A3C490 03E00008 */ jr $ra /* 01D44 80A3C494 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s index daae0bc1fe..c99c63a545 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s @@ -1,5 +1,3 @@ glabel func_80A3A750 /* 00000 80A3A750 03E00008 */ jr $ra /* 00004 80A3A754 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s index 01cf5648ad..72e7e98ae5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s @@ -1,3 +1,20 @@ +.late_rodata +.late_rodata_alignment 8 +glabel jtbl_80A3D0A8 +.word L80A3A780 +.word L80A3A8C4 +.word L80A3A8C4 +.word L80A3A8C4 +.word func_80A3A858 +.word func_80A3A87C +.word func_80A3A8A0 +.word func_80A3A7A4 +.word func_80A3A7C8 +.word func_80A3A7EC +.word func_80A3A810 +.word func_80A3A834 + +.text glabel func_80A3A758 /* 00008 80A3A758 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 0000C 80A3A75C 25CFFFEF */ addiu $t7, $t6, 0xFFEF ## $t7 = FFFFFFEF @@ -19,5 +36,3 @@ glabel L80A3A780 /* 00048 80A3A798 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0004C 80A3A79C 03E00008 */ jr $ra /* 00050 80A3A7A0 A488001C */ sh $t0, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s index 5d7ca002a4..16b2178902 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s @@ -8,5 +8,3 @@ glabel func_80A3A7A4 /* 0006C 80A3A7BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00070 80A3A7C0 03E00008 */ jr $ra /* 00074 80A3A7C4 A48B001C */ sh $t3, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s index 7ae4d4f4cd..ee5cc6be5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s @@ -8,5 +8,3 @@ glabel func_80A3A7C8 /* 00090 80A3A7E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00094 80A3A7E4 03E00008 */ jr $ra /* 00098 80A3A7E8 A48E001C */ sh $t6, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s index ab10c08033..dffd02bbdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s @@ -8,5 +8,3 @@ glabel func_80A3A7EC /* 000B4 80A3A804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 000B8 80A3A808 03E00008 */ jr $ra /* 000BC 80A3A80C A499001C */ sh $t9, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s index e7e0763f68..ac8caade5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s @@ -8,5 +8,3 @@ glabel func_80A3A810 /* 000D8 80A3A828 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 000DC 80A3A82C 03E00008 */ jr $ra /* 000E0 80A3A830 A48A001C */ sh $t2, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s index b4d1b7c379..06ddad9854 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s @@ -8,5 +8,3 @@ glabel func_80A3A834 /* 000FC 80A3A84C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00100 80A3A850 03E00008 */ jr $ra /* 00104 80A3A854 A48D001C */ sh $t5, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s index ba379d9524..74431e11ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s @@ -8,5 +8,3 @@ glabel func_80A3A858 /* 00120 80A3A870 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00124 80A3A874 03E00008 */ jr $ra /* 00128 80A3A878 A498001C */ sh $t8, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s index 9762570dd5..0d48199f21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s @@ -8,5 +8,3 @@ glabel func_80A3A87C /* 00144 80A3A894 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00148 80A3A898 03E00008 */ jr $ra /* 0014C 80A3A89C A489001C */ sh $t1, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s index 7323f4d307..010187e14b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s @@ -14,5 +14,3 @@ glabel L80A3A8C4 .L80A3A8C8: /* 00178 80A3A8C8 03E00008 */ jr $ra /* 0017C 80A3A8CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s index 31bd74bf7a..e1e4642274 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s @@ -1,3 +1,247 @@ +.rdata +glabel D_80A3CCD0 + .asciz "デクの実×5 " # Deku Fruit * 5 + .balign 4 + +glabel D_80A3CCE0 + .asciz "矢×30 " # Arrow * 30 + .balign 4 + +glabel D_80A3CCF0 + .asciz "矢×50 " # Arrow * 50 + .balign 4 + +glabel D_80A3CD00 + .asciz "爆弾×5 " # Bomb * 5 + .balign 4 + +glabel D_80A3CD10 + .asciz "デクの実×10 " # Deku fruit * 10 + .balign 4 + +glabel D_80A3CD20 + .asciz "デクの棒 " # Deku stick + .balign 4 + +glabel D_80A3CD30 + .asciz "爆弾×10 " # Bomb * 10 + .balign 4 + +glabel D_80A3CD40 + .asciz "さかな " # Fish + .balign 4 + +glabel D_80A3CD50 + .asciz "赤クスリ " # Red potion + .balign 4 + +glabel D_80A3CD60 + .asciz "緑クスリ " # Green potion + .balign 4 + +glabel D_80A3CD70 + .asciz "青クスリ " # Blue potion + .balign 4 + +glabel D_80A3CD80 + .asciz "巨人のナイフ " # Giant knife + .balign 4 + +glabel D_80A3CD90 + .asciz "ハイリアの盾 " # Hylian Shield + .balign 4 + +glabel D_80A3CDA0 + .asciz "デクの盾 " # Deku shield + .balign 4 + +glabel D_80A3CDB0 + .asciz "ゴロンの服 " # Goron tunic + .balign 4 + +glabel D_80A3CDC0 + .asciz "ゾ─ラの服 " # Zora's Tunic + .balign 4 + +glabel D_80A3CDD0 + .asciz "回復のハート " # Healing heart + .balign 4 + +glabel D_80A3CDE0 + .asciz "ロンロン牛乳 " # Lonlon milk + .balign 4 + +glabel D_80A3CDF0 + .asciz "鶏の卵 " # Chicken eggs + .balign 4 + +glabel D_80A3CE00 + .asciz "インゴー牛乳 " # Ingo milk + .balign 4 + +glabel D_80A3CE10 + .asciz "インゴー卵 " # Ingo egg + .balign 4 + +glabel D_80A3CE20 + .asciz "もだえ石 " # Stone of agony + .balign 4 + +glabel D_80A3CE30 + .asciz "大人の財布 " # Adult wallet + .balign 4 + +glabel D_80A3CE40 + .asciz "ハートの欠片 " # Piece of heart + .balign 4 + +glabel D_80A3CE50 + .asciz "ボムチュウ " # Bombchu + .balign 4 + +glabel D_80A3CE60 + .asciz "ボムチュウ " # Bombchu + .balign 4 + +glabel D_80A3CE70 + .asciz "ボムチュウ " # Bombchu + .balign 4 + +glabel D_80A3CE80 + .asciz "ボムチュウ " # Bombchu + .balign 4 + +glabel D_80A3CE90 + .asciz "ボムチュウ " # Bombchu + .balign 4 +glabel D_80A3CEA0 + .asciz "デクのタネ " # Deku seed + .balign 4 + +glabel D_80A3CEB0 + .asciz "キータンのお面" # Mask of Keaton + .balign 4 + +glabel D_80A3CEC0 + .asciz "こわそなお面 " # Spooky mask + .balign 4 + +glabel D_80A3CED0 + .asciz "ドクロのお面 " # Skull mask + .balign 4 + +glabel D_80A3CEE0 + .asciz "ウサギずきん " # Bunny hood + .balign 4 + +glabel D_80A3CEF0 + .asciz "まことの仮面 " # Makoto's Mask / Mask of Truth + .balign 4 + +glabel D_80A3CF00 + .asciz "ゾーラのお面 " # Zora Mask + .balign 4 + +glabel D_80A3CF10 + .asciz "ゴロンのお面 " # Goron Mask + .balign 4 + +glabel D_80A3CF20 + .asciz "ゲルドのお面 " # Gerudo Mask + .balign 4 +glabel D_80A3CF30 + .asciz "ＳＯＬＤＯＵＴ" + .balign 4 + +glabel D_80A3CF40 + .asciz "炎 " # Fire + .balign 4 + +glabel D_80A3CF50 + .asciz "虫 " # Bug + .balign 4 + +glabel D_80A3CF60 + .asciz "チョウチョ " # Butterfly + .balign 4 + +glabel D_80A3CF70 + .asciz "ポウ " # Poe + .balign 4 + +glabel D_80A3CF80 + .asciz "妖精の魂 " # Fairy spirit + .balign 4 + +glabel D_80A3CF90 + .asciz "矢×10 " # Arrows * 10 + .balign 4 + +glabel D_80A3CFA0 + .asciz "爆弾×20 " # Bombs * 20 + .balign 4 + +glabel D_80A3CFB0 + .asciz "爆弾×30 " # Bombs * 30 + .balign 4 + +glabel D_80A3CFC0 + .asciz "爆弾×5 " # Bombs * 5 + .balign 4 + +glabel D_80A3CFD0 + .asciz "赤クスリ " # Red potion + .balign 4 + +glabel D_80A3CFE0 + .asciz "赤クスリ " # Red potion + .balign 4 + +glabel D_80A3CFF0 + .asciz "%s(%2d)初期設定\n" # %s(%2d) Default Settings + .balign 4 + +glabel D_80A3D004 + .asciz "\x1b[41;37m" + .balign 4 + +glabel D_80A3D010 + .asciz "引数がおかしいよ(arg_data=%d)！！\n" # Something's off with the argument (arg_data=%d)!! + .balign 4 + +glabel D_80A3D034 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A3D038 + .asciz "0" + .balign 4 + +glabel D_80A3D03C + .asciz "../z_en_girlA.c" + .balign 4 + +glabel D_80A3D04C + .asciz "\x1b[41;37m" + .balign 4 + +glabel D_80A3D058 + .asciz "バンクが無いよ！！(%s)\n" # No such bank!! (%s) + .balign 4 + +glabel D_80A3D070 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A3D074 + .asciz "0" + .balign 4 + +glabel D_80A3D078 + .asciz "../z_en_girlA.c" + .balign 4 + +.text glabel func_80A3A8D0 /* 00180 80A3A8D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00184 80A3A8D4 AFBF001C */ sw $ra, 0x001C($sp) @@ -101,5 +345,3 @@ glabel func_80A3A8D0 /* 002CC 80A3AA1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002D0 80A3AA20 03E00008 */ jr $ra /* 002D4 80A3AA24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s index 0eb0fefb09..2ef8b1c344 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s @@ -46,5 +46,3 @@ glabel func_80A3AAA8 .L80A3AB50: /* 00400 80A3AB50 03E00008 */ jr $ra /* 00404 80A3AB54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s index 4e494f0b22..cedb177d34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s @@ -43,5 +43,3 @@ glabel func_80A3AB58 .L80A3ABF0: /* 004A0 80A3ABF0 03E00008 */ jr $ra /* 004A4 80A3ABF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s index 0f8b8661cb..b529f90b22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s @@ -48,5 +48,3 @@ glabel func_80A3ABF8 /* 00550 80A3ACA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00554 80A3ACA4 03E00008 */ jr $ra /* 00558 80A3ACA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s index cef3449cb6..acba1174ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s @@ -48,5 +48,3 @@ glabel func_80A3ACAC /* 00604 80A3AD54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00608 80A3AD58 03E00008 */ jr $ra /* 0060C 80A3AD5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s index 08caf62b5c..b703c0511a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s @@ -31,5 +31,3 @@ glabel func_80A3AD60 /* 00678 80A3ADC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0067C 80A3ADCC 03E00008 */ jr $ra /* 00680 80A3ADD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s index 34a889716e..f748248e6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s @@ -31,5 +31,3 @@ glabel func_80A3ADD4 /* 006EC 80A3AE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006F0 80A3AE40 03E00008 */ jr $ra /* 006F4 80A3AE44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s index d59cdd31bb..c8202167c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s @@ -31,5 +31,3 @@ glabel func_80A3AE48 /* 00760 80A3AEB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00764 80A3AEB4 03E00008 */ jr $ra /* 00768 80A3AEB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s index 0f9c0817af..c965b70c96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s @@ -31,5 +31,3 @@ glabel func_80A3AEBC /* 007D4 80A3AF24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007D8 80A3AF28 03E00008 */ jr $ra /* 007DC 80A3AF2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s index 55a40ef289..589a3abeac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s @@ -39,5 +39,3 @@ glabel func_80A3AF30 /* 00868 80A3AFB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0086C 80A3AFBC 03E00008 */ jr $ra /* 00870 80A3AFC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s index 2cc38b510c..ff3cbd9610 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s @@ -33,5 +33,3 @@ glabel func_80A3AFC4 /* 008E4 80A3B034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008E8 80A3B038 03E00008 */ jr $ra /* 008EC 80A3B03C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s index aec43247c4..e2c0847244 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s @@ -33,5 +33,3 @@ glabel func_80A3B040 /* 00960 80A3B0B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00964 80A3B0B4 03E00008 */ jr $ra /* 00968 80A3B0B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s index aa7bf4869f..f4476d2bce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s @@ -46,5 +46,3 @@ glabel func_80A3B0BC /* 00A04 80A3B154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A08 80A3B158 03E00008 */ jr $ra /* 00A0C 80A3B15C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s index 32e05a3a0a..d733be9a65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s @@ -46,5 +46,3 @@ glabel func_80A3B160 /* 00AA8 80A3B1F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AAC 80A3B1FC 03E00008 */ jr $ra /* 00AB0 80A3B200 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s index 351541d76e..ea13bd6e63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s @@ -21,5 +21,3 @@ glabel func_80A3B204 .L80A3B248: /* 00AF8 80A3B248 03E00008 */ jr $ra /* 00AFC 80A3B24C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s index 17ef764277..d04a689705 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s @@ -24,5 +24,3 @@ glabel func_80A3B250 /* 00B50 80A3B2A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B54 80A3B2A4 03E00008 */ jr $ra /* 00B58 80A3B2A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s index 500f3642d6..2dd096ebb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s @@ -24,5 +24,3 @@ glabel func_80A3B2AC /* 00BAC 80A3B2FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BB0 80A3B300 03E00008 */ jr $ra /* 00BB4 80A3B304 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s index 446f5a424c..04db6ece52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s @@ -3,5 +3,3 @@ glabel func_80A3B308 /* 00BBC 80A3B30C AFA50004 */ sw $a1, 0x0004($sp) /* 00BC0 80A3B310 03E00008 */ jr $ra /* 00BC4 80A3B314 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s index 61d423811b..bf7f4ef83a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s @@ -3,5 +3,3 @@ glabel func_80A3B318 /* 00BCC 80A3B31C AFA50004 */ sw $a1, 0x0004($sp) /* 00BD0 80A3B320 03E00008 */ jr $ra /* 00BD4 80A3B324 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s index 7c094b5f9d..d40931193e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s @@ -34,5 +34,3 @@ glabel func_80A3B328 /* 00C4C 80A3B39C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C50 80A3B3A0 03E00008 */ jr $ra /* 00C54 80A3B3A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s index 878ac16e42..46590fe1bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s @@ -45,5 +45,3 @@ glabel func_80A3B3A8 /* 00CF8 80A3B448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CFC 80A3B44C 03E00008 */ jr $ra /* 00D00 80A3B450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s index 3841cd4770..c884935f30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s @@ -3,5 +3,3 @@ glabel func_80A3B454 /* 00D08 80A3B458 AFA50004 */ sw $a1, 0x0004($sp) /* 00D0C 80A3B45C 03E00008 */ jr $ra /* 00D10 80A3B460 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s index dd97d502b7..bf1f3573d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s @@ -31,5 +31,3 @@ glabel func_80A3B464 /* 00D7C 80A3B4CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D80 80A3B4D0 03E00008 */ jr $ra /* 00D84 80A3B4D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s index 82fa55aa2a..d4475e3b8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s @@ -31,5 +31,3 @@ glabel func_80A3B4D8 /* 00DF0 80A3B540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DF4 80A3B544 03E00008 */ jr $ra /* 00DF8 80A3B548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s index 8cc33b48d4..4f3e2e45af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s @@ -31,5 +31,3 @@ glabel func_80A3B54C /* 00E64 80A3B5B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E68 80A3B5B8 03E00008 */ jr $ra /* 00E6C 80A3B5BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s index e304ab5b07..30eaf23547 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s @@ -31,5 +31,3 @@ glabel func_80A3B5C0 /* 00ED8 80A3B628 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EDC 80A3B62C 03E00008 */ jr $ra /* 00EE0 80A3B630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s index eb0a20f074..eaa03677d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s @@ -16,5 +16,3 @@ glabel func_80A3B634 /* 00F1C 80A3B66C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F20 80A3B670 03E00008 */ jr $ra /* 00F24 80A3B674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s index 5fe5677d4d..56d459873f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s @@ -43,5 +43,3 @@ glabel func_80A3B678 /* 00FB8 80A3B708 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FBC 80A3B70C 03E00008 */ jr $ra /* 00FC0 80A3B710 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s index b1af85af89..04bbc6f8f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s @@ -29,5 +29,3 @@ glabel func_80A3B714 /* 01024 80A3B774 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01028 80A3B778 03E00008 */ jr $ra /* 0102C 80A3B77C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s index 84d5bde8c5..ce5c6ea40e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s @@ -14,5 +14,3 @@ glabel func_80A3B780 /* 01060 80A3B7B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01064 80A3B7B4 03E00008 */ jr $ra /* 01068 80A3B7B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s index c2ba808e20..bd08066b68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s @@ -16,5 +16,3 @@ glabel func_80A3B7BC /* 010A4 80A3B7F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010A8 80A3B7F8 03E00008 */ jr $ra /* 010AC 80A3B7FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s index 6e8633dbb1..2aa74b4756 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s @@ -14,5 +14,3 @@ glabel func_80A3B800 /* 010E0 80A3B830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010E4 80A3B834 03E00008 */ jr $ra /* 010E8 80A3B838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s index d7d339447e..23584ad21b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s @@ -14,5 +14,3 @@ glabel func_80A3B83C /* 0111C 80A3B86C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01120 80A3B870 03E00008 */ jr $ra /* 01124 80A3B874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s index 029a9bee25..8c453a38c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s @@ -14,5 +14,3 @@ glabel func_80A3B878 /* 01158 80A3B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0115C 80A3B8AC 03E00008 */ jr $ra /* 01160 80A3B8B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s index 41a2f86607..9b3828b40a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s @@ -14,5 +14,3 @@ glabel func_80A3B8B4 /* 01194 80A3B8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01198 80A3B8E8 03E00008 */ jr $ra /* 0119C 80A3B8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s index 296a628204..f57aace9ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s @@ -14,5 +14,3 @@ glabel func_80A3B8F0 /* 011D0 80A3B920 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011D4 80A3B924 03E00008 */ jr $ra /* 011D8 80A3B928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s index 17c5f6e255..f0adc30441 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s @@ -14,5 +14,3 @@ glabel func_80A3B92C /* 0120C 80A3B95C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01210 80A3B960 03E00008 */ jr $ra /* 01214 80A3B964 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s index 662ddf8f13..edcb07e44d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s @@ -14,5 +14,3 @@ glabel func_80A3B968 /* 01248 80A3B998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0124C 80A3B99C 03E00008 */ jr $ra /* 01250 80A3B9A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s index ab8f5d1de2..d66ef84b82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s @@ -11,5 +11,3 @@ glabel func_80A3B9A4 /* 01278 80A3B9C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0127C 80A3B9CC 03E00008 */ jr $ra /* 01280 80A3B9D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s index b5402896e7..1055b7ca76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s @@ -11,5 +11,3 @@ glabel func_80A3B9D4 /* 012A8 80A3B9F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012AC 80A3B9FC 03E00008 */ jr $ra /* 012B0 80A3BA00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s index 86f54432c7..f2d2874a0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s @@ -14,5 +14,3 @@ glabel func_80A3BA04 /* 012E4 80A3BA34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012E8 80A3BA38 03E00008 */ jr $ra /* 012EC 80A3BA3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s index 88ac604163..50d548b91a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80A3D0D8 +.word L80A3BAFC +.word L80A3BB0C +.word L80A3BB1C +.word L80A3BB2C +.word L80A3BB3C + +.text glabel func_80A3BA40 /* 012F0 80A3BA40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 012F4 80A3BA44 AFBF0014 */ sw $ra, 0x0014($sp) @@ -87,5 +96,3 @@ glabel L80A3BB3C /* 01410 80A3BB60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01414 80A3BB64 03E00008 */ jr $ra /* 01418 80A3BB68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s index 75e17a28b7..a48a9eed11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3D0EC + .float 7.9 + +.text glabel func_80A3BB6C /* 0141C 80A3BB6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01420 80A3BB70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -42,5 +47,3 @@ glabel func_80A3BB6C /* 014B0 80A3BC00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014B4 80A3BC04 03E00008 */ jr $ra /* 014B8 80A3BC08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s index f8093302a3..83c5315d49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s @@ -11,5 +11,3 @@ glabel func_80A3BC0C /* 014E0 80A3BC30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014E4 80A3BC34 03E00008 */ jr $ra /* 014E8 80A3BC38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s index 0e5186f3cb..42cdd43598 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s @@ -11,5 +11,3 @@ glabel func_80A3BC3C /* 01510 80A3BC60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01514 80A3BC64 03E00008 */ jr $ra /* 01518 80A3BC68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s index b165e267e5..9b452b4862 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s @@ -1,3 +1,15 @@ +.late_rodata +glabel jtbl_80A3D0F0 +.word L80A3BD18 +.word L80A3BD30 +.word L80A3BD48 +.word L80A3BCA0 +.word L80A3BCB8 +.word L80A3BCD0 +.word L80A3BCE8 +.word L80A3BD00 + +.text glabel func_80A3BC6C /* 0151C 80A3BC6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01520 80A3BC70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -77,5 +89,3 @@ glabel L80A3BD48 /* 01624 80A3BD74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01628 80A3BD78 03E00008 */ jr $ra /* 0162C 80A3BD7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s index 353208f3df..1a9963fa97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s @@ -2,5 +2,3 @@ glabel func_80A3BD80 /* 01630 80A3BD80 AFA40000 */ sw $a0, 0x0000($sp) /* 01634 80A3BD84 03E00008 */ jr $ra /* 01638 80A3BD88 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s index b34baa8721..a6a9eb50d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80A3D110 +.word L80A3BDE0 +.word L80A3BDFC +.word L80A3BE18 +.word L80A3BE34 +.word L80A3BE50 + +.text glabel func_80A3BD8C /* 0163C 80A3BD8C AFA40000 */ sw $a0, 0x0000($sp) /* 01640 80A3BD90 84A3001C */ lh $v1, 0x001C($a1) ## 0000001C @@ -80,5 +89,3 @@ glabel L80A3BE50 /* 01750 80A3BEA0 A4A001A8 */ sh $zero, 0x01A8($a1) ## 000001A8 /* 01754 80A3BEA4 03E00008 */ jr $ra /* 01758 80A3BEA8 ACAB0134 */ sw $t3, 0x0134($a1) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s index fc510eac53..a06bd5a34e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s @@ -13,5 +13,3 @@ glabel func_80A3BEAC .L80A3BED8: /* 01788 80A3BED8 03E00008 */ jr $ra /* 0178C 80A3BEDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s index 0eb91117cf..571adc2450 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s @@ -30,5 +30,3 @@ glabel func_80A3BEE0 /* 017F8 80A3BF48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017FC 80A3BF4C 03E00008 */ jr $ra /* 01800 80A3BF50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s index 266fc68b80..16cd344713 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s @@ -38,5 +38,3 @@ glabel func_80A3BF54 /* 01888 80A3BFD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0188C 80A3BFDC 03E00008 */ jr $ra /* 01890 80A3BFE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s index ded4df176f..7d8952c972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s @@ -1,3 +1,20 @@ +.rdata +glabel D_80A3D09C + .asciz "%s(%2d)\n" # %s(%2d) + .balign 4 + +.late_rodata +glabel jtbl_80A3D124 +.word L80A3C05C +.word L80A3C0AC +.word L80A3C0FC +.word L80A3C14C +.word L80A3C19C +.word L80A3C1F4 +.word L80A3C218 +.word L80A3C23C + +.text glabel func_80A3BFE4 /* 01894 80A3BFE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01898 80A3BFE8 AFB00018 */ sw $s0, 0x0018($sp) @@ -269,5 +286,3 @@ glabel L80A3C23C /* 01C60 80A3C3B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C64 80A3C3B4 03E00008 */ jr $ra /* 01C68 80A3C3B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s index 24a200edc8..f7d998eb65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s @@ -51,5 +51,3 @@ glabel func_80A3C3BC /* 01D18 80A3C468 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D1C 80A3C46C 03E00008 */ jr $ra /* 01D20 80A3C470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s index 5249feed2d..23f91ad0c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s @@ -14,5 +14,3 @@ glabel func_80A3C498 /* 01D78 80A3C4C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D7C 80A3C4CC 03E00008 */ jr $ra /* 01D80 80A3C4D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s index 81b5ee7c43..48c5bab520 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3D144 + .float 0.017453292 + +.text glabel func_80A3C4D4 /* 01D84 80A3C4D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01D88 80A3C4D8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -39,4 +44,3 @@ glabel func_80A3C4D4 /* 01E14 80A3C564 00000000 */ nop /* 01E18 80A3C568 00000000 */ nop /* 01E1C 80A3C56C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s index a32d95af78..5660cc22a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s @@ -10,5 +10,3 @@ glabel EnGm_Destroy /* 000DC 80A3D7BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E0 80A3D7C0 03E00008 */ jr $ra /* 000E4 80A3D7C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Init.s index 08ec24415e..8672a786ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Init.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80A3E390 + .asciz "\x1B[32m%s[%d] : 中ゴロン[%d]\x1B[m\n" + .balign 4 + +glabel D_80A3E3B0 + .asciz "../z_en_gm.c" + .balign 4 + +glabel D_80A3E3C0 + .asciz "\x1B[41;37m" + .balign 4 + +glabel D_80A3E3CC + .asciz "モデル バンクが無いよ！！（中ゴロン）\n" + .balign 4 + +glabel D_80A3E3F4 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A3E3F8 + .asciz "0" + .balign 4 + +glabel D_80A3E3FC + .asciz "../z_en_gm.c" + .balign 4 + +.text glabel EnGm_Init /* 00000 80A3D6E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 80A3D6E4 AFA50024 */ sw $a1, 0x0024($sp) @@ -55,5 +85,3 @@ glabel EnGm_Init /* 000B4 80A3D794 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000B8 80A3D798 03E00008 */ jr $ra /* 000BC 80A3D79C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Update.s index 8040b680c3..38913dc147 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Update.s @@ -8,5 +8,3 @@ glabel EnGm_Update /* 009A4 80A3E084 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009A8 80A3E088 03E00008 */ jr $ra /* 009AC 80A3E08C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s index 5ea8195b71..33cac0a120 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s @@ -32,5 +32,3 @@ glabel func_80A3D7C8 .L80A3D830: /* 00150 80A3D830 03E00008 */ jr $ra /* 00154 80A3D834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s index a2a80c34ea..a919504197 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s @@ -110,5 +110,3 @@ glabel func_80A3D838 /* 002EC 80A3D9CC 8FB10028 */ lw $s1, 0x0028($sp) /* 002F0 80A3D9D0 03E00008 */ jr $ra /* 002F4 80A3D9D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D9D8.s index 0ca88f2227..afac781da9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D9D8.s @@ -32,5 +32,3 @@ glabel func_80A3D9D8 /* 00364 80A3DA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00368 80A3DA48 03E00008 */ jr $ra /* 0036C 80A3DA4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s index d7aa29ab4b..3f7333452c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s @@ -52,5 +52,3 @@ glabel func_80A3DA50 /* 00418 80A3DAF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0041C 80A3DAFC 03E00008 */ jr $ra /* 00420 80A3DB00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DB04.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DB04.s index fa7e9354fe..d12ae7d558 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DB04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DB04.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3E42C + .float 10000.0 + +.text glabel func_80A3DB04 /* 00424 80A3DB04 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00428 80A3DB08 AFBF001C */ sw $ra, 0x001C($sp) @@ -65,5 +70,3 @@ glabel func_80A3DB04 /* 00508 80A3DBE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0050C 80A3DBEC 03E00008 */ jr $ra /* 00510 80A3DBF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DBF4.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DBF4.s index c5c1dd9032..f3f3f1aba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DBF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DBF4.s @@ -21,5 +21,3 @@ glabel func_80A3DBF4 /* 00558 80A3DC38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0055C 80A3DC3C 03E00008 */ jr $ra /* 00560 80A3DC40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s index 7cd6dd9b42..d677e007e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A3E430 + .float 10000.0 + +.text glabel func_80A3DC44 /* 00564 80A3DC44 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00568 80A3DC48 AFBF0014 */ sw $ra, 0x0014($sp) @@ -85,5 +90,3 @@ glabel func_80A3DC44 /* 00690 80A3DD70 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00694 80A3DD74 03E00008 */ jr $ra /* 00698 80A3DD78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DD7C.s index 5cd5380c40..5a07441225 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DD7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DD7C.s @@ -39,5 +39,3 @@ glabel func_80A3DD7C /* 00724 80A3DE04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00728 80A3DE08 03E00008 */ jr $ra /* 0072C 80A3DE0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s index 9d7a532fca..b64deec8be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s @@ -64,5 +64,3 @@ glabel func_80A3DE10 /* 00814 80A3DEF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00818 80A3DEF8 03E00008 */ jr $ra /* 0081C 80A3DEFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s index bae3fcc3f4..bdc9f93d33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s @@ -25,5 +25,3 @@ glabel func_80A3DF00 /* 00874 80A3DF54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00878 80A3DF58 03E00008 */ jr $ra /* 0087C 80A3DF5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF60.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF60.s index 30ef7b6076..e376688afa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF60.s @@ -23,5 +23,3 @@ glabel func_80A3DF60 /* 008D0 80A3DFB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008D4 80A3DFB4 03E00008 */ jr $ra /* 008D8 80A3DFB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s index 1c8e9efecc..bc307f688d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s @@ -45,5 +45,3 @@ glabel func_80A3DFBC /* 00980 80A3E060 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00984 80A3E064 03E00008 */ jr $ra /* 00988 80A3E068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s index c251734a2f..cc8e12bc45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s @@ -86,5 +86,3 @@ glabel func_80A3E090 /* 00B00 80A3E1E0 D7B40018 */ ldc1 $f20, 0x0018($sp) /* 00B04 80A3E1E4 03E00008 */ jr $ra /* 00B08 80A3E1E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s index 05ecb99b04..5581a0a6b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A3E40C + .asciz "../z_en_gm.c" + .balign 4 + +glabel D_80A3E41C + .asciz "../z_en_gm.c" + .balign 4 + +.text glabel func_80A3E1EC /* 00B0C 80A3E1EC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00B10 80A3E1F0 AFBF002C */ sw $ra, 0x002C($sp) @@ -80,4 +90,3 @@ glabel func_80A3E1EC /* 00C44 80A3E324 03E00008 */ jr $ra /* 00C48 80A3E328 00000000 */ nop /* 00C4C 80A3E32C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s index 9b200911ca..7521e1f95a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s @@ -14,5 +14,3 @@ glabel EnGo_Destroy /* 01938 80A3FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0193C 80A3FEAC 03E00008 */ jr $ra /* 01940 80A3FEB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s index 879d53bd80..e2819c6b7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s @@ -119,5 +119,3 @@ glabel EnGo_Draw /* 03088 80A415F8 8FB10028 */ lw $s1, 0x0028($sp) /* 0308C 80A415FC 03E00008 */ jr $ra /* 03090 80A41600 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s index 11f5318a3c..670914cbe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s @@ -238,5 +238,3 @@ glabel L80A3FE60 /* 01900 80A3FE70 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01904 80A3FE74 03E00008 */ jr $ra /* 01908 80A3FE78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s index b591ada728..48f1a1305e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s @@ -73,5 +73,3 @@ glabel EnGo_Update /* 029DC 80A40F4C 8FB10020 */ lw $s1, 0x0020($sp) /* 029E0 80A40F50 03E00008 */ jr $ra /* 029E4 80A40F54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s index 20817e4362..bf8952251b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s @@ -1,5 +1,3 @@ glabel func_80A3E570 /* 00000 80A3E570 03E00008 */ jr $ra /* 00004 80A3E574 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s index 97106e0f7f..774c621dc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s @@ -267,5 +267,3 @@ glabel L80A3E8F4 /* 0038C 80A3E8FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00390 80A3E900 03E00008 */ jr $ra /* 00394 80A3E904 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s index 1887895418..ae03dd998f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s @@ -298,5 +298,3 @@ glabel L80A3ED10 /* 007A8 80A3ED18 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000003 /* 007AC 80A3ED1C 03E00008 */ jr $ra /* 007B0 80A3ED20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s index e621e82b3a..a18e8b6d72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s @@ -50,5 +50,3 @@ glabel func_80A3ED24 /* 00864 80A3EDD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00868 80A3EDD8 03E00008 */ jr $ra /* 0086C 80A3EDDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s index 01beaff0d3..fc884415db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s @@ -46,5 +46,3 @@ glabel func_80A3EDE0 /* 00910 80A3EE80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00914 80A3EE84 03E00008 */ jr $ra /* 00918 80A3EE88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s index 998ec67cc5..bfb8e19e1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s @@ -96,5 +96,3 @@ glabel func_80A3EE8C /* 00A6C 80A3EFDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A70 80A3EFE0 03E00008 */ jr $ra /* 00A74 80A3EFE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s index 110fc0f911..a50c32c979 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s @@ -17,5 +17,3 @@ glabel func_80A3EFE8 /* 00AB0 80A3F020 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 00AB4 80A3F024 03E00008 */ jr $ra /* 00AB8 80A3F028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s index 6b7f3ba4cb..b8ddbc3481 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s @@ -3,5 +3,3 @@ glabel func_80A3F02C /* 00AC0 80A3F030 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 /* 00AC4 80A3F034 03E00008 */ jr $ra /* 00AC8 80A3F038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s index 67334ccfd5..77178167b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s @@ -10,5 +10,3 @@ glabel L80A3F04C /* 00AE4 80A3F054 00000000 */ nop /* 00AE8 80A3F058 03E00008 */ jr $ra /* 00AEC 80A3F05C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s index 31f506b090..5f06bd0eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s @@ -33,5 +33,3 @@ glabel func_80A3F060 /* 00B68 80A3F0D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B6C 80A3F0DC 03E00008 */ jr $ra /* 00B70 80A3F0E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s index b8f8f6e616..50b8a2c2ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s @@ -33,5 +33,3 @@ glabel func_80A3F0E4 /* 00BE0 80A3F150 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BE4 80A3F154 03E00008 */ jr $ra /* 00BE8 80A3F158 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s index 12bf6ab275..d450b054ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s @@ -68,5 +68,3 @@ glabel func_80A3F15C /* 00CE4 80A3F254 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CE8 80A3F258 03E00008 */ jr $ra /* 00CEC 80A3F25C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s index 6c92dd42a4..27c20941ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s @@ -4,5 +4,3 @@ glabel func_80A3F260 /* 00CF8 80A3F268 E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C /* 00CFC 80A3F26C 03E00008 */ jr $ra /* 00D00 80A3F270 E4840158 */ swc1 $f4, 0x0158($a0) ## 00000158 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s index 67c1c4c78d..a612058edb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s @@ -38,5 +38,3 @@ glabel func_80A3F274 /* 00D84 80A3F2F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D88 80A3F2F8 03E00008 */ jr $ra /* 00D8C 80A3F2FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s index 0cd15b0b4c..d32b2d03db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s @@ -118,5 +118,3 @@ glabel func_80A3F300 /* 00F40 80A3F4B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F44 80A3F4B4 03E00008 */ jr $ra /* 00F48 80A3F4B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s index 445d1b43a0..4fe413f509 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s @@ -54,5 +54,3 @@ glabel func_80A3F4BC /* 01018 80A3F588 AC890010 */ sw $t1, 0x0010($a0) ## 00000010 /* 0101C 80A3F58C 03E00008 */ jr $ra /* 01020 80A3F590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s index e2ae0c1801..3f372e13f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s @@ -146,5 +146,3 @@ glabel func_80A3F594 /* 01244 80A3F7B4 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 01248 80A3F7B8 03E00008 */ jr $ra /* 0124C 80A3F7BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s index 34b8914cd6..53132a67f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s @@ -92,5 +92,3 @@ glabel func_80A3F7C0 /* 0138C 80A3F8FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01390 80A3F900 03E00008 */ jr $ra /* 01394 80A3F904 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s index daa3d90edf..bfaef57c9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s @@ -148,5 +148,3 @@ glabel func_80A3F908 /* 015B0 80A3FB20 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 015B4 80A3FB24 03E00008 */ jr $ra /* 015B8 80A3FB28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s index 228f53ba50..1e15d9f29d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s @@ -17,5 +17,3 @@ glabel func_80A3FEB4 /* 0197C 80A3FEEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01980 80A3FEF0 03E00008 */ jr $ra /* 01984 80A3FEF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s index 954f3cb9b0..8bf184f87c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s @@ -108,5 +108,3 @@ glabel func_80A3FEF8 /* 01B10 80A40080 8FB10030 */ lw $s1, 0x0030($sp) /* 01B14 80A40084 03E00008 */ jr $ra /* 01B18 80A40088 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s index 548c177290..23c0f5bb80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s @@ -38,5 +38,3 @@ glabel func_80A4008C /* 01BA0 80A40110 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BA4 80A40114 03E00008 */ jr $ra /* 01BA8 80A40118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s index 00ce5603af..a415337a30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s @@ -62,5 +62,3 @@ glabel func_80A4011C /* 01C90 80A40200 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C94 80A40204 03E00008 */ jr $ra /* 01C98 80A40208 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s index c708d05c1e..c76a270685 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s @@ -2,5 +2,3 @@ glabel func_80A4020C /* 01C9C 80A4020C AFA40000 */ sw $a0, 0x0000($sp) /* 01CA0 80A40210 03E00008 */ jr $ra /* 01CA4 80A40214 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s index 04e8200448..91cd875c5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s @@ -70,5 +70,3 @@ glabel func_80A40218 /* 01D9C 80A4030C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01DA0 80A40310 03E00008 */ jr $ra /* 01DA4 80A40314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s index 88b71ec88a..ad81622a1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s @@ -105,5 +105,3 @@ glabel func_80A40318 /* 01F18 80A40488 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F1C 80A4048C 03E00008 */ jr $ra /* 01F20 80A40490 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s index be1039886d..378532eef5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s @@ -83,5 +83,3 @@ glabel func_80A40494 /* 02050 80A405C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02054 80A405C4 03E00008 */ jr $ra /* 02058 80A405C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s index 523e0e8c7f..2ca15e6169 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s @@ -75,5 +75,3 @@ glabel func_80A405CC /* 02164 80A406D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02168 80A406D8 03E00008 */ jr $ra /* 0216C 80A406DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s index ca2640bea6..ad59be275e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s @@ -136,5 +136,3 @@ glabel func_80A406E0 /* 0235C 80A408CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02360 80A408D0 03E00008 */ jr $ra /* 02364 80A408D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s index 7d625095d1..3c714c30ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s @@ -105,5 +105,3 @@ glabel func_80A408D8 /* 024D8 80A40A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 024DC 80A40A4C 03E00008 */ jr $ra /* 024E0 80A40A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s index f9532a0805..e3986d1607 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s @@ -53,5 +53,3 @@ glabel func_80A40A54 /* 025A0 80A40B10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 025A4 80A40B14 03E00008 */ jr $ra /* 025A8 80A40B18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s index 33bb4cf4de..58540c83c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s @@ -23,5 +23,3 @@ glabel func_80A40B1C /* 025F8 80A40B68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 025FC 80A40B6C 03E00008 */ jr $ra /* 02600 80A40B70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s index 1003482a6b..d7f3119794 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s @@ -70,5 +70,3 @@ glabel func_80A40B74 /* 026FC 80A40C6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02700 80A40C70 03E00008 */ jr $ra /* 02704 80A40C74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s index 14b863d2aa..520de09e54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s @@ -60,5 +60,3 @@ glabel func_80A40C78 /* 027E0 80A40D50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 027E4 80A40D54 03E00008 */ jr $ra /* 027E8 80A40D58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s index d348b44711..e1894f3347 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s @@ -30,5 +30,3 @@ glabel func_80A40D5C /* 02850 80A40DC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02854 80A40DC4 03E00008 */ jr $ra /* 02858 80A40DC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s index 08cadcbe9c..b18790a6d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s @@ -33,5 +33,3 @@ glabel func_80A40DCC /* 028D0 80A40E40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 028D4 80A40E44 03E00008 */ jr $ra /* 028D8 80A40E48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s index f0dba1721f..3b65f27240 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s @@ -67,5 +67,3 @@ glabel func_80A40F58 /* 02AEC 80A4105C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02AF0 80A41060 03E00008 */ jr $ra /* 02AF4 80A41064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s index 576592a62d..cdf563e1b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s @@ -87,5 +87,3 @@ glabel func_80A41068 /* 02C4C 80A411BC 8FB10018 */ lw $s1, 0x0018($sp) /* 02C50 80A411C0 03E00008 */ jr $ra /* 02C54 80A411C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s index 4d86cc1845..cc8cfe4746 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s @@ -138,5 +138,3 @@ glabel func_80A411C8 /* 02E60 80A413D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02E64 80A413D4 03E00008 */ jr $ra /* 02E68 80A413D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s index e630286d72..437c877cf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s @@ -23,5 +23,3 @@ glabel func_80A413DC /* 02EBC 80A4142C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02EC0 80A41430 03E00008 */ jr $ra /* 02EC4 80A41434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s index 429ff8dc39..8a0502b6db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s @@ -42,5 +42,3 @@ glabel func_80A41604 /* 0312C 80A4169C 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 000002A0 /* 03130 80A416A0 03E00008 */ jr $ra /* 03134 80A416A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s index 27fde739bd..902030ab59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s @@ -71,5 +71,3 @@ glabel func_80A416A8 /* 03238 80A417A8 8FB10028 */ lw $s1, 0x0028($sp) /* 0323C 80A417AC 03E00008 */ jr $ra /* 03240 80A417B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s index 18b276d794..bd0e563b07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s @@ -209,4 +209,3 @@ glabel func_80A417B4 /* 03564 80A41AD4 8FBE0050 */ lw $s8, 0x0050($sp) /* 03568 80A41AD8 03E00008 */ jr $ra /* 0356C 80A41ADC 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s index b27565ac24..f7563d3ab3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s @@ -2,5 +2,3 @@ glabel EnGo2_Destroy /* 03C30 80A46960 AFA40000 */ sw $a0, 0x0000($sp) /* 03C34 80A46964 03E00008 */ jr $ra /* 03C38 80A46968 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s index 651bd8123e..7f848b889e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s @@ -147,4 +147,3 @@ glabel EnGo2_Draw /* 05394 80A480C4 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 05398 80A480C8 03E00008 */ jr $ra /* 0539C 80A480CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s index 8acd371999..2811dd4283 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s @@ -320,5 +320,3 @@ glabel L80A46940 /* 03C24 80A46954 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03C28 80A46958 03E00008 */ jr $ra /* 03C2C 80A4695C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s index 967a9e1420..595899b476 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s @@ -70,5 +70,3 @@ glabel EnGo2_Update /* 04C74 80A479A4 8FB10020 */ lw $s1, 0x0020($sp) /* 04C78 80A479A8 03E00008 */ jr $ra /* 04C7C 80A479AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s index 8130a791a6..0bf45dde84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s @@ -42,5 +42,3 @@ glabel func_80A42D30 /* 00098 80A42DC8 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 000002A8 /* 0009C 80A42DCC 03E00008 */ jr $ra /* 000A0 80A42DD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s index 1782154e30..3349b4c19f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s @@ -71,5 +71,3 @@ glabel func_80A42DD4 /* 001A4 80A42ED4 8FB10028 */ lw $s1, 0x0028($sp) /* 001A8 80A42ED8 03E00008 */ jr $ra /* 001AC 80A42EDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s index 85bd1e7a0b..622bc29a65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s @@ -209,5 +209,3 @@ glabel func_80A42EE0 /* 004D0 80A43200 8FBE0050 */ lw $s8, 0x0050($sp) /* 004D4 80A43204 03E00008 */ jr $ra /* 004D8 80A43208 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s index 3109a1f20d..6afd6b4879 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s @@ -140,5 +140,3 @@ glabel func_80A4320C /* 006E8 80A43418 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 006EC 80A4341C 03E00008 */ jr $ra /* 006F0 80A43420 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s index 996ce21307..6cace13c05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s @@ -16,5 +16,3 @@ glabel func_80A43424 /* 0072C 80A4345C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00730 80A43460 03E00008 */ jr $ra /* 00734 80A43464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s index efcdb4b6bb..1e7d7b3a67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s @@ -34,5 +34,3 @@ glabel func_80A43468 /* 007AC 80A434DC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 007B0 80A434E0 03E00008 */ jr $ra /* 007B4 80A434E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s index 9481699dd8..35e3a2bb22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s @@ -40,5 +40,3 @@ glabel L80A43558 /* 00828 80A43558 24023052 */ addiu $v0, $zero, 0x3052 ## $v0 = 00003052 /* 0082C 80A4355C 03E00008 */ jr $ra /* 00830 80A43560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s index 43bfdf8aa3..0ac8b3e988 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s @@ -35,5 +35,3 @@ glabel func_80A43564 .L80A435E0: /* 008B0 80A435E0 03E00008 */ jr $ra /* 008B4 80A435E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s index 756157e2fa..e460fe8fc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s @@ -66,5 +66,3 @@ glabel func_80A435E8 /* 009A0 80A436D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009A4 80A436D4 03E00008 */ jr $ra /* 009A8 80A436D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s index 64ec84b133..4e886c83a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s @@ -14,5 +14,3 @@ glabel func_80A436DC .L80A4370C: /* 009DC 80A4370C 03E00008 */ jr $ra /* 009E0 80A43710 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003027 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s index 0372790fb7..02a9587612 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s @@ -76,5 +76,3 @@ glabel func_80A43714 /* 00AE8 80A43818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AEC 80A4381C 03E00008 */ jr $ra /* 00AF0 80A43820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s index ed17e90468..3055073195 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s @@ -24,5 +24,3 @@ glabel func_80A43824 /* 00B40 80A43870 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003026 /* 00B44 80A43874 03E00008 */ jr $ra /* 00B48 80A43878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s index 11d66099df..af23bcdd0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s @@ -15,5 +15,3 @@ glabel func_80A4387C .L80A438AC: /* 00B7C 80A438AC 03E00008 */ jr $ra /* 00B80 80A438B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s index e888e431ec..aef87d4e82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s @@ -45,5 +45,3 @@ glabel func_80A438B4 /* 00C14 80A43944 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 0000302A /* 00C18 80A43948 03E00008 */ jr $ra /* 00C1C 80A4394C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s index 3d7ad30298..bb5f6d2370 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s @@ -25,5 +25,3 @@ glabel func_80A43950 /* 00C70 80A439A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C74 80A439A4 03E00008 */ jr $ra /* 00C78 80A439A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s index 584bfa3dfb..749ed98ae0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s @@ -36,5 +36,3 @@ glabel func_80A439AC /* 00CF0 80A43A20 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003015 /* 00CF4 80A43A24 03E00008 */ jr $ra /* 00CF8 80A43A28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s index a31e520da5..b27ae10957 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s @@ -25,5 +25,3 @@ glabel func_80A43A2C /* 00D4C 80A43A7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D50 80A43A80 03E00008 */ jr $ra /* 00D54 80A43A84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s index 736b064a8a..b7a5cb4a27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s @@ -36,5 +36,3 @@ glabel func_80A43A88 /* 00DCC 80A43AFC 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003017 /* 00DD0 80A43B00 03E00008 */ jr $ra /* 00DD4 80A43B04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s index ed88f6542c..039b1e9f48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s @@ -25,5 +25,3 @@ glabel func_80A43B08 /* 00E28 80A43B58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E2C 80A43B5C 03E00008 */ jr $ra /* 00E30 80A43B60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s index 13a9b5a106..749dd600df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s @@ -63,5 +63,3 @@ glabel func_80A43B64 /* 00F04 80A43C34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F08 80A43C38 03E00008 */ jr $ra /* 00F0C 80A43C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s index 660ef6676f..0c5c99662d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s @@ -25,5 +25,3 @@ glabel func_80A43C40 /* 00F60 80A43C90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F64 80A43C94 03E00008 */ jr $ra /* 00F68 80A43C98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s index 28180eb13d..cfb521e07a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s @@ -61,5 +61,3 @@ glabel func_80A43C9C .L80A43D70: /* 01040 80A43D70 03E00008 */ jr $ra /* 01044 80A43D74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s index 7ccd35ecd9..95ca8c9ab7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s @@ -150,5 +150,3 @@ glabel func_80A43D78 /* 01254 80A43F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01258 80A43F88 03E00008 */ jr $ra /* 0125C 80A43F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s index d028755b94..88486319c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s @@ -35,5 +35,3 @@ glabel func_80A43F90 /* 012D4 80A44004 24023053 */ addiu $v0, $zero, 0x3053 ## $v0 = 00003053 /* 012D8 80A44008 03E00008 */ jr $ra /* 012DC 80A4400C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s index 7a5a5ac899..700a896fd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s @@ -147,5 +147,3 @@ glabel func_80A44010 /* 014E8 80A44218 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014EC 80A4421C 03E00008 */ jr $ra /* 014F0 80A44220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s index a30072eae0..a5eadedb62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s @@ -15,5 +15,3 @@ glabel func_80A44224 .L80A44250: /* 01520 80A44250 03E00008 */ jr $ra /* 01524 80A44254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s index f1e3e58801..e9dd946219 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s @@ -42,5 +42,3 @@ glabel func_80A44258 /* 015B4 80A442E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015B8 80A442E8 03E00008 */ jr $ra /* 015BC 80A442EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s index 01ad5079dd..611f494b22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s @@ -20,5 +20,3 @@ glabel func_80A442F0 .L80A44334: /* 01604 80A44334 03E00008 */ jr $ra /* 01608 80A44338 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003043 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s index 803bbc98c1..cada9a0bd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s @@ -25,5 +25,3 @@ glabel func_80A4433C /* 0165C 80A4438C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01660 80A44390 03E00008 */ jr $ra /* 01664 80A44394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s index 68189f9909..fef878d406 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s @@ -3,5 +3,3 @@ glabel func_80A44398 /* 0166C 80A4439C AFA50004 */ sw $a1, 0x0004($sp) /* 01670 80A443A0 03E00008 */ jr $ra /* 01674 80A443A4 24027122 */ addiu $v0, $zero, 0x7122 ## $v0 = 00007122 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s index 6e6a84f48d..d6858f9927 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s @@ -15,5 +15,3 @@ glabel func_80A443A8 .L80A443D8: /* 016A8 80A443D8 03E00008 */ jr $ra /* 016AC 80A443DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s index 282e4c67e0..409800d89e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s @@ -31,5 +31,3 @@ glabel func_80A443E0 /* 01710 80A44440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01714 80A44444 03E00008 */ jr $ra /* 01718 80A44448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s index 056da084d7..15753387f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s @@ -25,5 +25,3 @@ glabel func_80A4444C /* 0176C 80A4449C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01770 80A444A0 03E00008 */ jr $ra /* 01774 80A444A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s index 219af1d4ae..7c1fd46bb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s @@ -22,5 +22,3 @@ glabel func_80A444A8 /* 017C0 80A444F0 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 /* 017C4 80A444F4 03E00008 */ jr $ra /* 017C8 80A444F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s index a179355825..dcf47012da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s @@ -15,5 +15,3 @@ glabel func_80A444FC .L80A4452C: /* 017FC 80A4452C 03E00008 */ jr $ra /* 01800 80A44530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s index 5ea3206311..013ceaa551 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s @@ -97,5 +97,3 @@ glabel L80A44660 /* 0193C 80A4466C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01940 80A44670 03E00008 */ jr $ra /* 01944 80A44674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s index 615ac6d533..9c2600b90c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s @@ -85,5 +85,3 @@ glabel L80A44778 /* 01A54 80A44784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A58 80A44788 03E00008 */ jr $ra /* 01A5C 80A4478C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s index aff6f3b12e..0d0fc431ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s @@ -69,5 +69,3 @@ glabel func_80A44790 /* 01B50 80A44880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B54 80A44884 03E00008 */ jr $ra /* 01B58 80A44888 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s index b49dc8cfdd..f801531676 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s @@ -13,5 +13,3 @@ glabel func_80A4488C /* 01B88 80A448B8 84790008 */ lh $t9, 0x0008($v1) ## 00000008 /* 01B8C 80A448BC 03E00008 */ jr $ra /* 01B90 80A448C0 A49901FE */ sh $t9, 0x01FE($a0) ## 000001FE - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s index c73e7f7f58..14c2dbb43a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s @@ -31,5 +31,3 @@ glabel func_80A448C4 /* 01C04 80A44934 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C08 80A44938 03E00008 */ jr $ra /* 01C0C 80A4493C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s index a3719f5722..b1ccb16f46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s @@ -90,5 +90,3 @@ glabel func_80A44940 /* 01D60 80A44A90 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01D64 80A44A94 03E00008 */ jr $ra /* 01D68 80A44A98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s index baafd7dccd..bf75d3d379 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s @@ -4,5 +4,3 @@ glabel func_80A44A9C /* 01D74 80A44AA4 E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C /* 01D78 80A44AA8 03E00008 */ jr $ra /* 01D7C 80A44AAC E4840158 */ swc1 $f4, 0x0158($a0) ## 00000158 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s index 2d8d033698..8108dd4bee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s @@ -120,5 +120,3 @@ glabel func_80A44AB0 /* 01F2C 80A44C5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01F30 80A44C60 03E00008 */ jr $ra /* 01F34 80A44C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s index a7b73d00be..ea863ec780 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s @@ -34,5 +34,3 @@ glabel func_80A44C68 .L80A44CDC: /* 01FAC 80A44CDC 03E00008 */ jr $ra /* 01FB0 80A44CE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s index 9d49909f94..8907249c44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s @@ -42,5 +42,3 @@ glabel func_80A44CE4 /* 02048 80A44D78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0204C 80A44D7C 03E00008 */ jr $ra /* 02050 80A44D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s index beeb0ef6ec..58951c729b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s @@ -14,5 +14,3 @@ glabel func_80A44D84 /* 02084 80A44DB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02088 80A44DB8 03E00008 */ jr $ra /* 0208C 80A44DBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s index 734e33c4f6..7cde17d41e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s @@ -86,5 +86,3 @@ glabel func_80A44DC0 .L80A44EE8: /* 021B8 80A44EE8 03E00008 */ jr $ra /* 021BC 80A44EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s index 8a49ed46c3..a1d333e299 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s @@ -117,5 +117,3 @@ glabel func_80A44EF0 /* 0234C 80A4507C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02350 80A45080 03E00008 */ jr $ra /* 02354 80A45084 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s index e52dee3ebf..0f27590983 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s @@ -146,5 +146,3 @@ glabel func_80A45088 /* 0254C 80A4527C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02550 80A45280 03E00008 */ jr $ra /* 02554 80A45284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s index eedc3850fc..e10483b682 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s @@ -56,5 +56,3 @@ glabel func_80A45288 /* 02624 80A45354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02628 80A45358 03E00008 */ jr $ra /* 0262C 80A4535C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s index d67240b228..b1d544c384 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s @@ -73,5 +73,3 @@ glabel func_80A45360 /* 02730 80A45460 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02734 80A45464 03E00008 */ jr $ra /* 02738 80A45468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s index afcd7399a0..34e1ce19b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s @@ -26,5 +26,3 @@ glabel func_80A4546C /* 02790 80A454C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02794 80A454C4 03E00008 */ jr $ra /* 02798 80A454C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s index f680b7663c..a77b097edc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s @@ -47,5 +47,3 @@ glabel L80A4555C /* 0283C 80A4556C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02840 80A45570 03E00008 */ jr $ra /* 02844 80A45574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s index ca7c5801de..b561ccf421 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s @@ -45,5 +45,3 @@ glabel func_80A45578 /* 028E0 80A45610 46001006 */ mov.s $f0, $f2 /* 028E4 80A45614 03E00008 */ jr $ra /* 028E8 80A45618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s index 8bd5cd2f0e..1da1910dc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s @@ -75,5 +75,3 @@ glabel func_80A4561C .L80A4572C: /* 029FC 80A4572C 03E00008 */ jr $ra /* 02A00 80A45730 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s index a057f3368d..8fca228edf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s @@ -24,5 +24,3 @@ glabel func_80A45734 /* 02A50 80A45780 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A54 80A45784 03E00008 */ jr $ra /* 02A58 80A45788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s index 6ab13ed1ed..9fc4fd57f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s @@ -29,5 +29,3 @@ glabel func_80A4578C .L80A457F0: /* 02AC0 80A457F0 03E00008 */ jr $ra /* 02AC4 80A457F4 A089020F */ sb $t1, 0x020F($a0) ## 0000020F - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s index 86ee3f4d78..92b9cfe85c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s @@ -22,5 +22,3 @@ glabel func_80A457F8 /* 02B0C 80A4583C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02B10 80A45840 03E00008 */ jr $ra /* 02B14 80A45844 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s index 40358f7bce..cfb0c96ac9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s @@ -63,5 +63,3 @@ glabel func_80A45848 /* 02BF0 80A45920 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02BF4 80A45924 03E00008 */ jr $ra /* 02BF8 80A45928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s index 7ddb3de693..9c7d046c33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s @@ -61,5 +61,3 @@ glabel func_80A4592C /* 02CC4 80A459F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02CC8 80A459F8 03E00008 */ jr $ra /* 02CCC 80A459FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s index db55630863..85da73eb18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s @@ -76,5 +76,3 @@ glabel func_80A45A00 /* 02DD8 80A45B08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02DDC 80A45B0C 03E00008 */ jr $ra /* 02DE0 80A45B10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s index e0a3433882..523113fada 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s @@ -35,5 +35,3 @@ glabel func_80A45B14 /* 02E60 80A45B90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02E64 80A45B94 03E00008 */ jr $ra /* 02E68 80A45B98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s index f5f856c16c..7da12d996b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s @@ -46,5 +46,3 @@ glabel func_80A45B9C /* 02F14 80A45C44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02F18 80A45C48 03E00008 */ jr $ra /* 02F1C 80A45C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s index 1757216b1f..a320c5da63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s @@ -64,5 +64,3 @@ glabel func_80A45C50 /* 03004 80A45D34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03008 80A45D38 03E00008 */ jr $ra /* 0300C 80A45D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s index db07f24a27..58958c5396 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s @@ -24,5 +24,3 @@ glabel func_80A45D40 /* 03068 80A45D98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0306C 80A45D9C 03E00008 */ jr $ra /* 03070 80A45DA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s index 366f528960..e74d617228 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s @@ -44,5 +44,3 @@ glabel func_80A45DA4 /* 0310C 80A45E3C AC8A0190 */ sw $t2, 0x0190($a0) ## 00000190 /* 03110 80A45E40 03E00008 */ jr $ra /* 03114 80A45E44 E48A00BC */ swc1 $f10, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s index cc4cefda60..e68a96d0c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s @@ -51,5 +51,3 @@ glabel func_80A45E48 /* 031CC 80A45EFC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 031D0 80A45F00 03E00008 */ jr $ra /* 031D4 80A45F04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s index 1b00b2f079..d6a5c4b9f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s @@ -41,5 +41,3 @@ glabel func_80A45F08 /* 03260 80A45F90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03264 80A45F94 03E00008 */ jr $ra /* 03268 80A45F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s index 78687e52a5..bede681b12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s @@ -34,5 +34,3 @@ glabel func_80A45F9C /* 032E0 80A46010 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032E4 80A46014 03E00008 */ jr $ra /* 032E8 80A46018 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s index 5f2d85d1dc..cec8f4d4ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s @@ -26,5 +26,3 @@ glabel func_80A4601C /* 03340 80A46070 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03344 80A46074 03E00008 */ jr $ra /* 03348 80A46078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s index ec7d38466e..d1b266c972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s @@ -16,5 +16,3 @@ glabel func_80A4607C /* 0337C 80A460AC AC990190 */ sw $t9, 0x0190($a0) ## 00000190 /* 03380 80A460B0 03E00008 */ jr $ra /* 03384 80A460B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s index 6ce180a36d..e302c5277f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s @@ -24,5 +24,3 @@ glabel func_80A460B8 /* 033D8 80A46108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 033DC 80A4610C 03E00008 */ jr $ra /* 033E0 80A46110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s index 3e4163e7e9..94124f59ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s @@ -41,5 +41,3 @@ glabel func_80A46114 /* 0346C 80A4619C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03470 80A461A0 03E00008 */ jr $ra /* 03474 80A461A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s index 0700335098..80133f7597 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s @@ -85,5 +85,3 @@ glabel func_80A461A8 /* 0359C 80A462CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 035A0 80A462D0 03E00008 */ jr $ra /* 035A4 80A462D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s index 3446757b4f..a213d5e5a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s @@ -66,5 +66,3 @@ glabel func_80A462D8 /* 0369C 80A463CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 036A0 80A463D0 03E00008 */ jr $ra /* 036A4 80A463D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s index 6ba9f231b4..4655b042a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s @@ -15,5 +15,3 @@ glabel func_80A463D8 /* 036DC 80A4640C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 036E0 80A46410 03E00008 */ jr $ra /* 036E4 80A46414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s index 371f759417..140c95c612 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s @@ -49,5 +49,3 @@ glabel func_80A46418 /* 03790 80A464C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03794 80A464C4 03E00008 */ jr $ra /* 03798 80A464C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s index 7eaf2d880c..a0d0d75482 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s @@ -124,5 +124,3 @@ glabel func_80A4696C /* 03E04 80A46B34 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03E08 80A46B38 03E00008 */ jr $ra /* 03E0C 80A46B3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s index 453d27547f..a07a45c876 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s @@ -108,5 +108,3 @@ glabel func_80A46B40 /* 03F9C 80A46CCC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03FA0 80A46CD0 03E00008 */ jr $ra /* 03FA4 80A46CD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s index 7860f21294..470e68104b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s @@ -35,5 +35,3 @@ glabel func_80A46CD8 /* 04020 80A46D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04024 80A46D54 03E00008 */ jr $ra /* 04028 80A46D58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s index 61d04c1000..48d9d4a33b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s @@ -24,5 +24,3 @@ glabel func_80A46D5C /* 04080 80A46DB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04084 80A46DB4 03E00008 */ jr $ra /* 04088 80A46DB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s index ec51e2be94..e1f54e53d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s @@ -41,5 +41,3 @@ glabel func_80A46DBC /* 04118 80A46E48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0411C 80A46E4C 03E00008 */ jr $ra /* 04120 80A46E50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s index b00df72f86..9ba4bbe180 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s @@ -83,5 +83,3 @@ glabel func_80A46E54 /* 0424C 80A46F7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04250 80A46F80 03E00008 */ jr $ra /* 04254 80A46F84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s index a3b7e82697..cc479a686e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s @@ -42,5 +42,3 @@ glabel func_80A46F88 /* 042E8 80A47018 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 042EC 80A4701C 03E00008 */ jr $ra /* 042F0 80A47020 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s index 58c98f2ef5..792f94e149 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s @@ -52,5 +52,3 @@ glabel func_80A47024 /* 043AC 80A470DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 043B0 80A470E0 03E00008 */ jr $ra /* 043B4 80A470E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s index 719962fd59..0fef056273 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s @@ -29,5 +29,3 @@ glabel func_80A470E8 /* 0441C 80A4714C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04420 80A47150 03E00008 */ jr $ra /* 04424 80A47154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s index 27f668ca3e..5bcf9694bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s @@ -71,5 +71,3 @@ glabel func_80A47158 /* 04520 80A47250 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04524 80A47254 03E00008 */ jr $ra /* 04528 80A47258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s index 5987b5015a..2086e0820a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s @@ -150,5 +150,3 @@ glabel func_80A4725C /* 04754 80A47484 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04758 80A47488 03E00008 */ jr $ra /* 0475C 80A4748C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s index e4ba741491..a9ecc83d49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s @@ -62,5 +62,3 @@ glabel func_80A47490 /* 0483C 80A4756C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04840 80A47570 03E00008 */ jr $ra /* 04844 80A47574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s index ca8f265cfa..20c2f8ec64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s @@ -226,5 +226,3 @@ glabel L80A4788C /* 04B64 80A47894 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 04B68 80A47898 03E00008 */ jr $ra /* 04B6C 80A4789C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s index 1246dc00f7..9be3de16b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s @@ -63,5 +63,3 @@ glabel func_80A479B0 /* 04D74 80A47AA4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 04D78 80A47AA8 03E00008 */ jr $ra /* 04D7C 80A47AAC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s index e9d939ea0f..8dab238baf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s @@ -93,5 +93,3 @@ glabel func_80A47AB0 /* 04EE4 80A47C14 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 04EE8 80A47C18 03E00008 */ jr $ra /* 04EEC 80A47C1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s index e42c78198d..c870d08d74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s @@ -138,5 +138,3 @@ glabel func_80A47C20 /* 050F8 80A47E28 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 050FC 80A47E2C 03E00008 */ jr $ra /* 05100 80A47E30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s index f2899095cd..efe77984e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s @@ -23,5 +23,3 @@ glabel func_80A47E34 /* 05154 80A47E84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05158 80A47E88 03E00008 */ jr $ra /* 0515C 80A47E8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s index eda825292a..045ad2a590 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s @@ -21,5 +21,3 @@ glabel EnGoma_Destroy /* 003C8 80A49288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003CC 80A4928C 03E00008 */ jr $ra /* 003D0 80A49290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s index f1fb55dd08..198fad549a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s @@ -1,3 +1,61 @@ +.rdata +glabel D_80A4B8A0 + .asciz "../z_en_goma.c" + .balign 4 + +glabel D_80A4B8B0 + .asciz "../z_en_goma.c" + .balign 4 + +glabel D_80A4B8C0 + .asciz "../z_en_goma.c" + .balign 4 + +glabel D_80A4B8D0 + .asciz "../z_en_goma.c" + .balign 4 + +glabel D_80A4B8E0 + .asciz "../z_en_goma.c" + .balign 4 + +.late_rodata +glabel D_80A4B94C + .float 3.14159274101 + +glabel D_80A4B950 + .float 3.14159274101 + +glabel D_80A4B954 + .float 3.14159274101 + +glabel D_80A4B958 + .float 3.14159274101 + +glabel D_80A4B95C + .float 3.14159274101 + +glabel D_80A4B960 + .word 0x40490E56 +glabel D_80A4B964 + .word 0x41FF3333 +glabel D_80A4B968 + .float 0.15 + +glabel D_80A4B96C + .float 0.1 + +glabel D_80A4B970 + .word 0x3F733333 +glabel D_80A4B974 + .word 0x3F866666 +glabel D_80A4B978 + .float 0.1 + +glabel D_80A4B97C + .float 0.15 + +.text glabel EnGoma_Draw /* 02018 80A4AED8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0201C 80A4AEDC AFBF0024 */ sw $ra, 0x0024($sp) @@ -316,5 +374,3 @@ glabel EnGoma_Draw /* 024E0 80A4B3A0 8FB10020 */ lw $s1, 0x0020($sp) /* 024E4 80A4B3A4 03E00008 */ jr $ra /* 024E8 80A4B3A8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index 18facb88f5..d374cbe1bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -1,3 +1,33 @@ +.late_rodata +glabel D_80A4B8F0 + .word 0xBFA66666 +glabel D_80A4B8F4 + .float 2.3 + +glabel D_80A4B8F8 + .float 0.005 + +glabel D_80A4B8FC + .float 0.01 + +glabel D_80A4B900 + .float 0.005 + +glabel D_80A4B904 + .float 0.01 + +glabel D_80A4B908 + .float 0.005 + +glabel D_80A4B90C + .float 0.01 + +glabel D_80A4B910 + .word 0xC4BB8000 +glabel D_80A4B914 + .float 1500.0 + +.text glabel EnGoma_Init /* 00000 80A48EC0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 80A48EC4 AFBF002C */ sw $ra, 0x002C($sp) @@ -254,5 +284,3 @@ glabel EnGoma_Init /* 0037C 80A4923C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00380 80A49240 03E00008 */ jr $ra /* 00384 80A49244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s index 192e2a5b12..a04e85cf0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A4B940 + .float 9.99999997475e-07 + +glabel D_80A4B944 + .float 9.99999997475e-07 + +glabel D_80A4B948 + .float 9.99999997475e-07 + +.text glabel EnGoma_Update /* 01BB4 80A4AA74 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01BB8 80A4AA78 AFBF0024 */ sw $ra, 0x0024($sp) @@ -164,5 +175,3 @@ glabel EnGoma_Update /* 01DF4 80A4ACB4 8FB10020 */ lw $s1, 0x0020($sp) /* 01DF8 80A4ACB8 03E00008 */ jr $ra /* 01DFC 80A4ACBC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s index 54c7e0a018..cdc403d3fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s @@ -46,5 +46,3 @@ glabel func_80A49294 /* 0046C 80A4932C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00470 80A49330 03E00008 */ jr $ra /* 00474 80A49334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s index b5e945426b..3990bd418e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s @@ -44,5 +44,3 @@ glabel func_80A49338 /* 0050C 80A493CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00510 80A493D0 03E00008 */ jr $ra /* 00514 80A493D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s index 37738029c9..23ccf03f51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A4B918 + .word 0xBFA66666 +glabel D_80A4B91C + .float 0.03 + +glabel D_80A4B920 + .float 0.1 + +.text glabel func_80A493D8 /* 00518 80A493D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0051C 80A493DC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -187,5 +197,3 @@ glabel func_80A493D8 /* 0079C 80A4965C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007A0 80A49660 03E00008 */ jr $ra /* 007A4 80A49664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s index 714c80a45b..30f403e452 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s @@ -154,5 +154,3 @@ glabel func_80A49668 /* 009DC 80A4989C 8FBE0060 */ lw $s8, 0x0060($sp) /* 009E0 80A498A0 03E00008 */ jr $ra /* 009E4 80A498A4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s index de4d71db43..b7a4678609 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s @@ -53,5 +53,3 @@ glabel func_80A498A8 /* 00AA8 80A49968 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00AAC 80A4996C 03E00008 */ jr $ra /* 00AB0 80A49970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49974.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49974.s index 546b05d1e5..092c42547d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49974.s @@ -19,5 +19,3 @@ glabel func_80A49974 /* 00AF0 80A499B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AF4 80A499B4 03E00008 */ jr $ra /* 00AF8 80A499B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s index 0b8914b3ad..7da4ed0781 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s @@ -66,5 +66,3 @@ glabel func_80A499BC /* 00BDC 80A49A9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00BE0 80A49AA0 03E00008 */ jr $ra /* 00BE4 80A49AA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s index 5983d42a98..61cf17eb90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s @@ -38,5 +38,3 @@ glabel func_80A49AA8 /* 00C64 80A49B24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C68 80A49B28 03E00008 */ jr $ra /* 00C6C 80A49B2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s index 43bc550c2d..efe97f7573 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s @@ -53,5 +53,3 @@ glabel func_80A49B30 /* 00D24 80A49BE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D28 80A49BE8 03E00008 */ jr $ra /* 00D2C 80A49BEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s index 6862204122..3e809b5a9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s @@ -48,5 +48,3 @@ glabel func_80A49BF0 /* 00DC8 80A49C88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DCC 80A49C8C 03E00008 */ jr $ra /* 00DD0 80A49C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s index 6059cfab48..4fac9f2628 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s @@ -31,5 +31,3 @@ glabel func_80A49C94 /* 00E40 80A49D00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E44 80A49D04 03E00008 */ jr $ra /* 00E48 80A49D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s index c23717b53e..32064b5287 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A4B924 + .float 0.03 + +glabel D_80A4B928 + .float 9.99999974738e-06 + +glabel D_80A4B92C + .float 0.001 + +.text glabel func_80A49D0C /* 00E4C 80A49D0C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00E50 80A49D10 AFB00020 */ sw $s0, 0x0020($sp) @@ -101,5 +112,3 @@ glabel func_80A49D0C /* 00FB4 80A49E74 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00FB8 80A49E78 03E00008 */ jr $ra /* 00FBC 80A49E7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s index d18cf4f76c..e7e8bf4090 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s @@ -38,5 +38,3 @@ glabel func_80A49E80 /* 01044 80A49F04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01048 80A49F08 03E00008 */ jr $ra /* 0104C 80A49F0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s index 3660543cfe..94af787958 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s @@ -35,5 +35,3 @@ glabel func_80A49F10 /* 010C8 80A49F88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010CC 80A49F8C 03E00008 */ jr $ra /* 010D0 80A49F90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s index e64d6be681..41df193669 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s @@ -32,5 +32,3 @@ glabel func_80A49F94 /* 01144 80A4A004 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01148 80A4A008 03E00008 */ jr $ra /* 0114C 80A4A00C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s index 9bbc6afa05..54ac0fd843 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s @@ -42,5 +42,3 @@ glabel func_80A4A010 /* 011DC 80A4A09C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 011E0 80A4A0A0 03E00008 */ jr $ra /* 011E4 80A4A0A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s index ecbd39c2f1..36795556b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s @@ -31,5 +31,3 @@ glabel func_80A4A0A8 /* 01254 80A4A114 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01258 80A4A118 03E00008 */ jr $ra /* 0125C 80A4A11C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s index 3f05c5f542..34c21e338a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s @@ -30,5 +30,3 @@ glabel func_80A4A120 /* 012C0 80A4A180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012C4 80A4A184 03E00008 */ jr $ra /* 012C8 80A4A188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s index e425296222..5d7bdffcd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s @@ -47,5 +47,3 @@ glabel func_80A4A18C /* 01368 80A4A228 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0136C 80A4A22C 03E00008 */ jr $ra /* 01370 80A4A230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s index 3b61836b87..d49e2e0151 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s @@ -51,5 +51,3 @@ glabel func_80A4A234 /* 01420 80A4A2E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01424 80A4A2E4 03E00008 */ jr $ra /* 01428 80A4A2E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s index 4e7a7487bc..591fb152cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s @@ -34,5 +34,3 @@ glabel func_80A4A2EC /* 0149C 80A4A35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 014A0 80A4A360 03E00008 */ jr $ra /* 014A4 80A4A364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s index ccc4aafa6a..d26876c2d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s @@ -76,5 +76,3 @@ glabel func_80A4A368 /* 015A4 80A4A464 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 015A8 80A4A468 03E00008 */ jr $ra /* 015AC 80A4A46C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s index 1046276bcc..e5aa5cdd5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s @@ -43,5 +43,3 @@ glabel func_80A4A470 /* 01640 80A4A500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01644 80A4A504 03E00008 */ jr $ra /* 01648 80A4A508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s index 976f38df1e..ffb8e75805 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s @@ -70,5 +70,3 @@ glabel func_80A4A50C /* 0173C 80A4A5FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01740 80A4A600 03E00008 */ jr $ra /* 01744 80A4A604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s index ebbb06b649..742bc0efc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s @@ -44,5 +44,3 @@ glabel func_80A4A608 /* 017E0 80A4A6A0 8FB10018 */ lw $s1, 0x0018($sp) /* 017E4 80A4A6A4 03E00008 */ jr $ra /* 017E8 80A4A6A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s index abca27231c..64e2656c9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4B930 + .float 3.14159274101 + +.text glabel func_80A4A6AC /* 017EC 80A4A6AC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 017F0 80A4A6B0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -150,5 +155,3 @@ glabel func_80A4A6AC /* 01A08 80A4A8C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01A0C 80A4A8CC 03E00008 */ jr $ra /* 01A10 80A4A8D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s index 18e70ac41c..1116c8a7ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s @@ -38,5 +38,3 @@ glabel func_80A4A8D4 /* 01A98 80A4A958 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01A9C 80A4A95C 03E00008 */ jr $ra /* 01AA0 80A4A960 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s index 7028518d91..376ab66b60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A4B934 + .word 0x38000100 +glabel D_80A4B938 + .word 0x4622F983 +glabel D_80A4B93C + .word 0x4622F983 + +.text glabel func_80A4A964 /* 01AA4 80A4A964 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01AA8 80A4A968 AFBF0014 */ sw $ra, 0x0014($sp) @@ -70,5 +79,3 @@ glabel func_80A4A964 /* 01BA8 80A4AA68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01BAC 80A4AA6C 03E00008 */ jr $ra /* 01BB0 80A4AA70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s index dc06c3f8c5..d7216bd593 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A4B880 + .asciz "../z_en_goma.c" + .balign 4 + +glabel D_80A4B890 + .asciz "../z_en_goma.c" + .balign 4 + +.text glabel func_80A4ACC0 /* 01E00 80A4ACC0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01E04 80A4ACC4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -109,5 +119,3 @@ glabel func_80A4ACC0 /* 01F94 80A4AE54 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 01F98 80A4AE58 03E00008 */ jr $ra /* 01F9C 80A4AE5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4AE60.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4AE60.s index e7adb62410..dcf352f3cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4AE60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4AE60.s @@ -30,5 +30,3 @@ glabel func_80A4AE60 /* 0200C 80A4AECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02010 80A4AED0 03E00008 */ jr $ra /* 02014 80A4AED4 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3AC.s index e18170a34e..7a90f4bc5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3AC.s @@ -18,5 +18,3 @@ glabel func_80A4B3AC /* 02524 80A4B3E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02528 80A4B3E8 03E00008 */ jr $ra /* 0252C 80A4B3EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s index 1b2143ae08..3affb6e61f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4B980 + .word 0x477FFFFD + +.text glabel func_80A4B3F0 /* 02530 80A4B3F0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 02534 80A4B3F4 AFBF0074 */ sw $ra, 0x0074($sp) @@ -98,5 +103,3 @@ glabel func_80A4B3F0 /* 02688 80A4B548 8FB30070 */ lw $s3, 0x0070($sp) /* 0268C 80A4B54C 03E00008 */ jr $ra /* 02690 80A4B550 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s index b8288a7180..61fa387815 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4B984 + .float 0.001 + +.text glabel func_80A4B554 /* 02694 80A4B554 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02698 80A4B558 3C0F80A5 */ lui $t7, %hi(D_80A4B860) ## $t7 = 80A50000 @@ -151,4 +156,3 @@ glabel func_80A4B554 /* 028B4 80A4B774 00000000 */ nop /* 028B8 80A4B778 00000000 */ nop /* 028BC 80A4B77C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s index 75572b3fea..6b70f4d69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s @@ -9,5 +9,3 @@ glabel EnGoroiwa_Destroy /* 01934 80A4D5D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01938 80A4D5D8 03E00008 */ jr $ra /* 0193C 80A4D5DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s index 0a3bd0142a..13f96b01a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s @@ -14,4 +14,3 @@ glabel EnGoroiwa_Draw /* 021B4 80A4DE54 00000000 */ nop /* 021B8 80A4DE58 00000000 */ nop /* 021BC 80A4DE5C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s index 81bd36bf84..61ac52ce32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80A4DF88 + .asciz "Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80A4DFC0 + .asciz "../z_en_gr.c" + .balign 4 + +glabel D_80A4DFD0 + .asciz "Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n" + .balign 4 + +glabel D_80A4DFFC + .asciz "../z_en_gr.c" + .balign 4 + +glabel D_80A4E00C + .asciz "(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n" + .balign 4 + +.text glabel EnGoroiwa_Init /* 01778 80A4D418 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0177C 80A4D41C AFB20028 */ sw $s2, 0x0028($sp) @@ -113,5 +135,3 @@ glabel EnGoroiwa_Init /* 0190C 80A4D5AC 8FB20028 */ lw $s2, 0x0028($sp) /* 01910 80A4D5B0 03E00008 */ jr $ra /* 01914 80A4D5B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s index 4b0dc03f00..0a573ed3b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s @@ -97,5 +97,3 @@ glabel EnGoroiwa_Update /* 0217C 80A4DE1C 8FB10020 */ lw $s1, 0x0020($sp) /* 02180 80A4DE20 03E00008 */ jr $ra /* 02184 80A4DE24 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s index 28adc6f20d..6ffbf21ebc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s @@ -24,5 +24,3 @@ glabel func_80A4BCA0 /* 00058 80A4BCF8 440D3000 */ mfc1 $t5, $f6 /* 0005C 80A4BCFC 03E00008 */ jr $ra /* 00060 80A4BD00 A44D0004 */ sh $t5, 0x0004($v0) ## 00000034 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s index 7047489ef0..60e9a15e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s @@ -26,5 +26,3 @@ glabel func_80A4BD04 /* 000C4 80A4BD64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000C8 80A4BD68 03E00008 */ jr $ra /* 000CC 80A4BD6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s index e580a76aa2..d5b2192a7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s @@ -6,5 +6,3 @@ glabel func_80A4BD70 /* 000E0 80A4BD80 0305C825 */ or $t9, $t8, $a1 ## $t9 = 00000000 /* 000E4 80A4BD84 03E00008 */ jr $ra /* 000E8 80A4BD88 A09901D3 */ sb $t9, 0x01D3($a0) ## 000001D3 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s index c50bd382b5..d186639bad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4E064 + .float 0.001 + +.text glabel func_80A4BD8C /* 000EC 80A4BD8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 000F0 80A4BD90 AFBF0014 */ sw $ra, 0x0014($sp) @@ -34,5 +39,3 @@ glabel func_80A4BD8C /* 00164 80A4BE04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00168 80A4BE08 03E00008 */ jr $ra /* 0016C 80A4BE0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s index 7dae57e064..09551c4e83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s @@ -17,5 +17,3 @@ glabel func_80A4BE10 /* 001A8 80A4BE48 A528116C */ sh $t0, 0x116C($t1) ## 8016116C /* 001AC 80A4BE4C 03E00008 */ jr $ra /* 001B0 80A4BE50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s index c355125e18..ef250869e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s @@ -53,5 +53,3 @@ glabel func_80A4BE54 /* 0027C 80A4BF1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00280 80A4BF20 03E00008 */ jr $ra /* 00284 80A4BF24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s index 65ad055417..5bf2181642 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s @@ -92,5 +92,3 @@ glabel func_80A4BF28 /* 003D4 80A4C074 468084A0 */ cvt.s.w $f18, $f16 /* 003D8 80A4C078 03E00008 */ jr $ra /* 003DC 80A4C07C E4D20008 */ swc1 $f18, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s index 012b591804..5c913e3a78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s @@ -50,5 +50,3 @@ glabel func_80A4C080 .L80A4C12C: /* 0048C 80A4C12C 03E00008 */ jr $ra /* 00490 80A4C130 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s index f91c9d6fa2..2325a0a98f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s @@ -11,5 +11,3 @@ glabel func_80A4C134 /* 004B8 80A4C158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004BC 80A4C15C 03E00008 */ jr $ra /* 004C0 80A4C160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s index df196d9c91..b9c0abccf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s @@ -8,5 +8,3 @@ glabel func_80A4C164 /* 004DC 80A4C17C 0058C821 */ addu $t9, $v0, $t8 /* 004E0 80A4C180 03E00008 */ jr $ra /* 004E4 80A4C184 A49901CE */ sh $t9, 0x01CE($a0) ## 000001CE - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s index ffe7ea287b..86756dd4c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s @@ -14,5 +14,3 @@ glabel func_80A4C188 /* 00518 80A4C1B8 A48201CE */ sh $v0, 0x01CE($a0) ## 000001CE /* 0051C 80A4C1BC 03E00008 */ jr $ra /* 00520 80A4C1C0 A48201D0 */ sh $v0, 0x01D0($a0) ## 000001D0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s index 9648569483..16daf596e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s @@ -39,5 +39,3 @@ glabel func_80A4C1C4 /* 005B8 80A4C258 468084A0 */ cvt.s.w $f18, $f16 /* 005BC 80A4C25C 03E00008 */ jr $ra /* 005C0 80A4C260 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s index 4915c7fbe4..a57d375c43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s @@ -5,5 +5,3 @@ glabel func_80A4C264 /* 005D0 80A4C270 E48001B0 */ swc1 $f0, 0x01B0($a0) ## 000001B0 /* 005D4 80A4C274 03E00008 */ jr $ra /* 005D8 80A4C278 E48001C0 */ swc1 $f0, 0x01C0($a0) ## 000001C0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s index 876d010a13..f97a29e618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A4DF30 + .asciz "Error : レールデータ不正(点が重なっている)" + .balign 4 + +glabel D_80A4DF5C + .asciz "(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80A4DF78 + .asciz "../z_en_gr.c" + .balign 4 + +.text glabel func_80A4C27C /* 005DC 80A4C27C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 005E0 80A4C280 AFBF0014 */ sw $ra, 0x0014($sp) @@ -78,5 +92,3 @@ glabel func_80A4C27C /* 006F8 80A4C398 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006FC 80A4C39C 03E00008 */ jr $ra /* 00700 80A4C3A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s index bddb066d8c..ec613d52a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s @@ -131,5 +131,3 @@ glabel func_80A4C3A4 /* 008E8 80A4C588 8FB70068 */ lw $s7, 0x0068($sp) /* 008EC 80A4C58C 03E00008 */ jr $ra /* 008F0 80A4C590 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s index 15435b5fd0..347db49c65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s @@ -79,5 +79,3 @@ glabel func_80A4C594 /* 00A1C 80A4C6BC 8FB50038 */ lw $s5, 0x0038($sp) /* 00A20 80A4C6C0 03E00008 */ jr $ra /* 00A24 80A4C6C4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s index ec065470b9..5799b9fdfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4E068 + .float 0.01 + +.text glabel func_80A4C6C8 /* 00A28 80A4C6C8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00A2C 80A4C6CC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -85,5 +90,3 @@ glabel func_80A4C6C8 /* 00B68 80A4C808 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B6C 80A4C80C 03E00008 */ jr $ra /* 00B70 80A4C810 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s index 92671f92b2..c145c98eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4E06C + .float 0.01 + +.text glabel func_80A4C814 /* 00B74 80A4C814 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00B78 80A4C818 AFBF001C */ sw $ra, 0x001C($sp) @@ -149,5 +154,3 @@ glabel func_80A4C814 /* 00DA4 80A4CA44 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00DA8 80A4CA48 03E00008 */ jr $ra /* 00DAC 80A4CA4C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s index 56bee03b4a..cf80cf8bd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4E070 + .float 0.01 + +.text glabel func_80A4CA50 /* 00DB0 80A4CA50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00DB4 80A4CA54 AFBF0014 */ sw $ra, 0x0014($sp) @@ -75,5 +80,3 @@ glabel func_80A4CA50 /* 00ECC 80A4CB6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00ED0 80A4CB70 03E00008 */ jr $ra /* 00ED4 80A4CB74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s index e544acf2ac..304a01af5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A4E074 + .word 0xBE99999A +glabel D_80A4E078 + .float 0.3 + +glabel D_80A4E07C + .float 0.2 + +.text glabel func_80A4CB78 /* 00ED8 80A4CB78 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00EDC 80A4CB7C AFBF0024 */ sw $ra, 0x0024($sp) @@ -225,5 +235,3 @@ glabel func_80A4CB78 /* 0122C 80A4CECC 8FB10020 */ lw $s1, 0x0020($sp) /* 01230 80A4CED0 03E00008 */ jr $ra /* 01234 80A4CED4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s index 86c7c273b4..105331064a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80A4E080 + .word 0x3C89AE41 +glabel D_80A4E084 + .float 9.58738019108e-05 + +glabel D_80A4E088 + .float 9.58738019108e-05 + +glabel D_80A4E08C + .float 9.58738019108e-05 + +.text glabel func_80A4CED8 /* 01238 80A4CED8 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0123C 80A4CEDC AFBF001C */ sw $ra, 0x001C($sp) @@ -108,5 +121,3 @@ glabel func_80A4CED8 /* 013C8 80A4D068 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 013CC 80A4D06C 03E00008 */ jr $ra /* 013D0 80A4D070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s index 555534ed83..9f1b548648 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s @@ -36,5 +36,3 @@ glabel func_80A4D074 /* 01450 80A4D0F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01454 80A4D0F4 03E00008 */ jr $ra /* 01458 80A4D0F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s index d8d75ef1b1..a62888e124 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A4E090 + .word 0x477FFF00 +glabel D_80A4E094 + .float 0.2 + +.text glabel func_80A4D0FC /* 0145C 80A4D0FC 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 01460 80A4D100 AFBF009C */ sw $ra, 0x009C($sp) @@ -212,5 +219,3 @@ glabel func_80A4D0FC /* 0176C 80A4D40C 8FBE0098 */ lw $s8, 0x0098($sp) /* 01770 80A4D410 03E00008 */ jr $ra /* 01774 80A4D414 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s index cd0edfe7f5..5b3ef3fe1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s @@ -16,5 +16,3 @@ glabel func_80A4D5E0 /* 01978 80A4D618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0197C 80A4D61C 03E00008 */ jr $ra /* 01980 80A4D620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s index a5425df4e3..9f0da4c98a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A4E044 + .asciz "" + .balign 4 + +glabel D_80A4E04C + .asciz "Player ぶっ飛ばし\n" + .balign 4 + +glabel D_80A4E060 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_80A4D624 /* 01984 80A4D624 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01988 80A4D628 AFBF0024 */ sw $ra, 0x0024($sp) @@ -186,5 +200,3 @@ glabel func_80A4D624 /* 01C20 80A4D8C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C24 80A4D8C4 03E00008 */ jr $ra /* 01C28 80A4D8C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s index 9f9a7487c3..89082bfc3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A4E098 + .word 0xBF5C28F6 +glabel D_80A4E09C + .float 0.15 + +.text glabel func_80A4D8CC /* 01C2C 80A4D8CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01C30 80A4D8D0 3C0E80A5 */ lui $t6, %hi(func_80A4D944) ## $t6 = 80A50000 @@ -29,5 +36,3 @@ glabel func_80A4D8CC /* 01C98 80A4D938 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C9C 80A4D93C 03E00008 */ jr $ra /* 01CA0 80A4D940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s index 74ab3782a0..58876ac760 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s @@ -39,5 +39,3 @@ glabel func_80A4D944 /* 01D30 80A4D9D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D34 80A4D9D4 03E00008 */ jr $ra /* 01D38 80A4D9D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s index 1afaa8096a..5cbcd609d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s @@ -23,5 +23,3 @@ glabel func_80A4D9DC /* 01D90 80A4DA30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D94 80A4DA34 03E00008 */ jr $ra /* 01D98 80A4DA38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s index c56564b972..79db985627 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s @@ -17,5 +17,3 @@ glabel func_80A4DA3C /* 01DD0 80A4DA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DD4 80A4DA74 03E00008 */ jr $ra /* 01DD8 80A4DA78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s index d399d188cf..96358c8e94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A4E0A0 + .float 0.1 + +.text glabel func_80A4DA7C /* 01DDC 80A4DA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01DE0 80A4DA80 3C0E80A5 */ lui $t6, %hi(func_80A4DAD0) ## $t6 = 80A50000 @@ -20,5 +25,3 @@ glabel func_80A4DA7C /* 01E24 80A4DAC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E28 80A4DAC8 03E00008 */ jr $ra /* 01E2C 80A4DACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s index a8558cdfe7..aa4a20c10d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s @@ -50,5 +50,3 @@ glabel func_80A4DAD0 /* 01EE4 80A4DB84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01EE8 80A4DB88 03E00008 */ jr $ra /* 01EEC 80A4DB8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s index b7760de39d..a999815505 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A4E0A4 + .float 0.3 + +glabel D_80A4E0A8 + .word 0xBE99999A, 0x00000000 + +.text glabel func_80A4DB90 /* 01EF0 80A4DB90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01EF4 80A4DB94 3C0E80A5 */ lui $t6, %hi(func_80A4DC00) ## $t6 = 80A50000 @@ -27,5 +35,3 @@ glabel func_80A4DB90 /* 01F54 80A4DBF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F58 80A4DBF8 03E00008 */ jr $ra /* 01F5C 80A4DBFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s index d92a33d4f8..28d2f74c9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s @@ -52,5 +52,3 @@ glabel func_80A4DC00 /* 0201C 80A4DCBC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02020 80A4DCC0 03E00008 */ jr $ra /* 02024 80A4DCC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Destroy.s index 948a9d7705..e25862fa6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Destroy.s @@ -2,5 +2,3 @@ glabel EnGs_Destroy /* 000C0 80A4E3E0 AFA40000 */ sw $a0, 0x0000($sp) /* 000C4 80A4E3E4 03E00008 */ jr $ra /* 000C8 80A4E3E8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s index 0a4145454a..6c40479cf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s @@ -1,3 +1,46 @@ +.rdata +glabel D_80A4FE50 + .asciz "../z_en_gs.c" + .balign 4 + +glabel D_80A4FE60 + .asciz "../z_en_gs.c" + .balign 4 + +glabel D_80A4FE70 + .asciz "../z_en_gs.c" + .balign 4 + +glabel D_80A4FE80 + .asciz "../z_en_gs.c" + .balign 4 + +.late_rodata +glabel D_80A4FF38 + .float 9.58738019108e-05 + +glabel D_80A4FF3C + .float 9.58738019108e-05 + +glabel D_80A4FF40 + .float 9.58738019108e-05 + +glabel D_80A4FF44 + .float 9.58738019108e-05 + +glabel D_80A4FF48 + .float 9.58738019108e-05 + +glabel D_80A4FF4C + .float 9.58738019108e-05 + +glabel D_80A4FF50 + .float 0.05 + +glabel D_80A4FF54 + .word 0xBD4CCCCD, 0x00000000, 0x00000000 + +.text glabel EnGs_Draw /* 01668 80A4F988 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0166C 80A4F98C AFBF003C */ sw $ra, 0x003C($sp) @@ -258,4 +301,3 @@ glabel EnGs_Draw /* 01A54 80A4FD74 8FB10038 */ lw $s1, 0x0038($sp) /* 01A58 80A4FD78 03E00008 */ jr $ra /* 01A5C 80A4FD7C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s index 4efe414ad2..7e95cb75ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s @@ -50,5 +50,3 @@ glabel EnGs_Init /* 000B4 80A4E3D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000B8 80A4E3D8 03E00008 */ jr $ra /* 000BC 80A4E3DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s index 0920442ea8..8ea70aa8ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80A4FF24 +.word L80A4F8F8 +.word L80A4F8D4 +.word L80A4F8B0 +.word L80A4F88C +.word L80A4F868 + +.text glabel EnGs_Update /* 014D4 80A4F7F4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 014D8 80A4F7F8 AFB10018 */ sw $s1, 0x0018($sp) @@ -112,5 +121,3 @@ glabel L80A4F8F8 /* 0165C 80A4F97C 8FB10018 */ lw $s1, 0x0018($sp) /* 01660 80A4F980 03E00008 */ jr $ra /* 01664 80A4F984 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E3EC.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E3EC.s index 951dc0cb37..b214abe6b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E3EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E3EC.s @@ -33,5 +33,3 @@ glabel func_80A4E3EC /* 00144 80A4E464 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 /* 00148 80A4E468 03E00008 */ jr $ra /* 0014C 80A4E46C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s index b04fc10baf..c32c5c80de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s @@ -130,5 +130,3 @@ glabel func_80A4E470 /* 0031C 80A4E63C 8FB10030 */ lw $s1, 0x0030($sp) /* 00320 80A4E640 03E00008 */ jr $ra /* 00324 80A4E644 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E648.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E648.s index 572c34f68e..37baca2759 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E648.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E648.s @@ -72,5 +72,3 @@ glabel func_80A4E648 /* 00428 80A4E748 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0042C 80A4E74C 03E00008 */ jr $ra /* 00430 80A4E750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E754.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E754.s index ea3faff6b7..eefa50d6e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E754.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A4FE90 + .word 0x3C8EFA35 +glabel D_80A4FE94 + .word 0x3C8EFA35 + +.text glabel func_80A4E754 /* 00434 80A4E754 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00438 80A4E758 AFA40030 */ sw $a0, 0x0030($sp) @@ -119,5 +126,3 @@ glabel func_80A4E754 /* 005E4 80A4E904 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005E8 80A4E908 03E00008 */ jr $ra /* 005EC 80A4E90C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s index e918201e0b..a2cafe57ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A4FE98 + .float 0.8 + +glabel D_80A4FE9C + .word 0x3BE56042 +glabel D_80A4FEA0 + .float 0.001 + +.text glabel func_80A4E910 /* 005F0 80A4E910 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 005F4 80A4E914 AFBF0034 */ sw $ra, 0x0034($sp) @@ -66,5 +76,3 @@ glabel func_80A4E910 /* 006DC 80A4E9FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 006E0 80A4EA00 03E00008 */ jr $ra /* 006E4 80A4EA04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EA08.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EA08.s index 12849950a2..35a9548a43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EA08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EA08.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_80A4FEA4 + .float 0.3 + +glabel D_80A4FEA8 + .word 0x43360B61 +glabel D_80A4FEAC + .float 0.8 + +glabel D_80A4FEB0 + .float 0.005 + +glabel D_80A4FEB4 + .float 0.001 + +.text glabel func_80A4EA08 /* 006E8 80A4EA08 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 006EC 80A4EA0C AFBF002C */ sw $ra, 0x002C($sp) @@ -81,5 +97,3 @@ glabel func_80A4EA08 /* 00810 80A4EB30 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00814 80A4EB34 03E00008 */ jr $ra /* 00818 80A4EB38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EB3C.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EB3C.s index c8239f1ef3..9f75772972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EB3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4EB3C.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80A4FEB8 + .float -0.8 + +glabel D_80A4FEBC + .float 0.001 + +glabel D_80A4FEC0 + .float 0.001 + +glabel D_80A4FEC4 + .float 0.03 + +glabel D_80A4FEC8 + .float 0.001 + +.text glabel func_80A4EB3C /* 0081C 80A4EB3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00820 80A4EB40 AFBF0034 */ sw $ra, 0x0034($sp) @@ -134,5 +151,3 @@ glabel func_80A4EB3C /* 00A08 80A4ED28 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A0C 80A4ED2C 03E00008 */ jr $ra /* 00A10 80A4ED30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s index b9dba03ab1..014ec2c1aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A4FECC + .word 0x463B8000 +glabel D_80A4FED0 + .float 0.3 + +glabel D_80A4FED4 + .word 0xC63B8000 + +.text glabel func_80A4ED34 /* 00A14 80A4ED34 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00A18 80A4ED38 AFBF003C */ sw $ra, 0x003C($sp) @@ -280,5 +290,3 @@ glabel func_80A4ED34 /* 00E10 80A4F130 8FB10038 */ lw $s1, 0x0038($sp) /* 00E14 80A4F134 03E00008 */ jr $ra /* 00E18 80A4F138 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F13C.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F13C.s index 0ad63afbea..bddd4e8fd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F13C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F13C.s @@ -1,3 +1,55 @@ +.late_rodata +glabel D_80A4FED8 + .float 0.1 + +glabel D_80A4FEDC + .float 0.001 + +glabel D_80A4FEE0 + .float 0.001 + +glabel D_80A4FEE4 + .word 0x43360B61 +glabel D_80A4FEE8 + .word 0x43360B61 +glabel D_80A4FEEC + .word 0xBE99999A +glabel D_80A4FEF0 + .float 0.001 + +glabel D_80A4FEF4 + .float 0.001 + +glabel D_80A4FEF8 + .word 0x3F32B8C2 +glabel D_80A4FEFC + .word 0x3EB2B8C2 +glabel D_80A4FF00 + .word 0x45638000 +glabel D_80A4FF04 + .float 0.001 + +glabel D_80A4FF08 + .float 0.001 + +glabel D_80A4FF0C + .float 0.001 + +glabel D_80A4FF10 + .float 0.001 + +glabel D_80A4FF14 + .float 0.1 + +glabel D_80A4FF18 + .word 0x3C8EFA35 +glabel D_80A4FF1C + .float 0.1 + +glabel D_80A4FF20 + .word 0x3C8EFA35 + +.text glabel func_80A4F13C /* 00E1C 80A4F13C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00E20 80A4F140 AFBF0024 */ sw $ra, 0x0024($sp) @@ -395,5 +447,3 @@ glabel func_80A4F13C /* 013D4 80A4F6F4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 013D8 80A4F6F8 03E00008 */ jr $ra /* 013DC 80A4F6FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F700.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F700.s index f812823d44..aa2a5be01b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F700.s @@ -14,5 +14,3 @@ glabel func_80A4F700 /* 01408 80A4F728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0140C 80A4F72C 03E00008 */ jr $ra /* 01410 80A4F730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F734.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F734.s index 717fc364aa..585678e633 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F734.s @@ -19,5 +19,3 @@ glabel func_80A4F734 /* 01450 80A4F770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01454 80A4F774 03E00008 */ jr $ra /* 01458 80A4F778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F77C.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F77C.s index 252bbd2234..ab73ed987e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F77C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4F77C.s @@ -31,5 +31,3 @@ glabel func_80A4F77C /* 014C8 80A4F7E8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 014CC 80A4F7EC 03E00008 */ jr $ra /* 014D0 80A4F7F0 A088019C */ sb $t0, 0x019C($a0) ## 0000019C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s index f3ada2c7a0..c51e7f066f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s @@ -10,5 +10,3 @@ glabel EnGuest_Destroy /* 000D0 80A502F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D4 80A502F4 03E00008 */ jr $ra /* 000D8 80A502F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s index 793bea2ff8..535cc2563b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80A50BB0 + .asciz "" + .balign 4 + +glabel D_80A50BBC + .asciz "%s[%d] : バンクが無いよ！！\n" + .balign 4 + +glabel D_80A50BDC + .asciz "../z_en_guest.c" + .balign 4 + +glabel D_80A50BEC + .asciz "\x1b[m" + .balign 4 + +glabel D_80A50BF0 + .asciz "0" + .balign 4 + +glabel D_80A50BF4 + .asciz "../z_en_guest.c" + .balign 4 + +.text glabel EnGuest_Init /* 00000 80A50220 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00004 80A50224 95CEF566 */ lhu $t6, -0x0A9A($t6) ## 8015F566 @@ -52,5 +78,3 @@ glabel EnGuest_Init /* 000A8 80A502C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000AC 80A502CC 03E00008 */ jr $ra /* 000B0 80A502D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s index 542dd8c74a..33b723ff9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s @@ -98,5 +98,3 @@ glabel EnGuest_Update /* 00240 80A50460 8FB10028 */ lw $s1, 0x0028($sp) /* 00244 80A50464 03E00008 */ jr $ra /* 00248 80A50468 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5046C.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5046C.s index 40abc678fb..b993c27396 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5046C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5046C.s @@ -48,5 +48,3 @@ glabel func_80A5046C /* 002EC 80A5050C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F0 80A50510 03E00008 */ jr $ra /* 002F4 80A50514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50518.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50518.s index 982c647652..84d7217af4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50518.s @@ -27,5 +27,3 @@ glabel func_80A50518 /* 00350 80A50570 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00354 80A50574 03E00008 */ jr $ra /* 00358 80A50578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5057C.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5057C.s index 94a6bf916f..824d376412 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5057C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A5057C.s @@ -21,5 +21,3 @@ glabel func_80A5057C /* 003A0 80A505C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003A4 80A505C4 03E00008 */ jr $ra /* 003A8 80A505C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s index aec2a1a506..72699e8d6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s @@ -84,5 +84,3 @@ glabel func_80A505CC /* 004DC 80A506FC 8FB10018 */ lw $s1, 0x0018($sp) /* 004E0 80A50700 03E00008 */ jr $ra /* 004E4 80A50704 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50708.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50708.s index c72e5bade5..0626fae0ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50708.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50708.s @@ -27,5 +27,3 @@ glabel func_80A50708 /* 00548 80A50768 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0054C 80A5076C 03E00008 */ jr $ra /* 00550 80A50770 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s index 2d737b006d..f01cb73879 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s @@ -1,3 +1,26 @@ +.rdata +glabel D_80A50C04 + .asciz "../z_en_guest.c" + .balign 4 + +glabel D_80A50C14 + .asciz "../z_en_guest.c" + .balign 4 + +.late_rodata +glabel D_80A50C44 + .float 3.14159274101 + +glabel D_80A50C48 + .float 3.14159274101 + +glabel D_80A50C4C + .float 3.14159274101 + +glabel D_80A50C50 + .float 3.14159274101 + +.text glabel func_80A50774 /* 00554 80A50774 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00558 80A50778 AFA40048 */ sw $a0, 0x0048($sp) @@ -157,5 +180,3 @@ glabel func_80A50774 /* 007A8 80A509C8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 007AC 80A509CC 03E00008 */ jr $ra /* 007B0 80A509D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s index d605e81bfe..224b03c360 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A50C24 + .asciz "../z_en_guest.c" + .balign 4 + +glabel D_80A50C34 + .asciz "../z_en_guest.c" + .balign 4 + +.text glabel func_80A509D4 /* 007B4 80A509D4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 007B8 80A509D8 AFB1002C */ sw $s1, 0x002C($sp) @@ -94,4 +104,3 @@ glabel func_80A509D4 /* 00924 80A50B44 03E00008 */ jr $ra /* 00928 80A50B48 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0092C 80A50B4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s index a60ad7d2ae..827da6d433 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s @@ -15,5 +15,3 @@ glabel EnHata_Destroy /* 0016C 80A50EBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00170 80A50EC0 03E00008 */ jr $ra /* 00174 80A50EC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Draw.s index 20a97ec881..683a08e787 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Draw.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A5126C + .float 1.1 + +.text glabel EnHata_Draw /* 00428 80A51178 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0042C 80A5117C AFBF001C */ sw $ra, 0x001C($sp) @@ -30,4 +35,3 @@ glabel EnHata_Draw /* 00494 80A511E4 00000000 */ nop /* 00498 80A511E8 00000000 */ nop /* 0049C 80A511EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s index 3419d7cee2..cfa5c1be6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A51260 + .float 550.0 +glabel D_80A51264 + .float 2200.0 +glabel D_80A51268 + .float 65535.0 + +.text glabel EnHata_Init /* 00000 80A50D50 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 80A50D54 AFB00028 */ sw $s0, 0x0028($sp) @@ -86,5 +95,3 @@ glabel EnHata_Init /* 00130 80A50E80 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00134 80A50E84 03E00008 */ jr $ra /* 00138 80A50E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Update.s index b8bb4bbb0b..97a9e6af74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Update.s @@ -145,5 +145,3 @@ glabel EnHata_Update /* 00388 80A510D8 8FB00020 */ lw $s0, 0x0020($sp) /* 0038C 80A510DC 03E00008 */ jr $ra /* 00390 80A510E0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A510E4.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A510E4.s index 68c8ccdaa0..235eea5e04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A510E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A510E4.s @@ -33,5 +33,3 @@ glabel func_80A510E4 .L80A5115C: /* 0040C 80A5115C 03E00008 */ jr $ra /* 00410 80A51160 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A51164.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A51164.s index b3e7815668..21a7a0cb48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A51164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/func_80A51164.s @@ -4,5 +4,3 @@ glabel func_80A51164 /* 0041C 80A5116C AFA60008 */ sw $a2, 0x0008($sp) /* 00420 80A51170 03E00008 */ jr $ra /* 00424 80A51174 AFA7000C */ sw $a3, 0x000C($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s index 7474103e5b..244960a753 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s @@ -2,5 +2,3 @@ glabel EnHeishi1_Destroy /* 00350 80A51620 AFA40000 */ sw $a0, 0x0000($sp) /* 00354 80A51624 03E00008 */ jr $ra /* 00358 80A51628 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s index a0b712cc7a..a9b9a6c37f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s @@ -76,4 +76,3 @@ glabel EnHeishi1_Draw /* 014C4 80A52794 00000000 */ nop /* 014C8 80A52798 00000000 */ nop /* 014CC 80A5279C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s index b23524972b..416b0c8638 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s @@ -1,3 +1,57 @@ +.rdata +glabel D_80A52930 + .asciz " 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A5295C + .asciz " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A52988 + .asciz " anime_frame_speed ☆☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A529B4 + .asciz " 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A529E0 + .asciz " point間の移動スピード目標値 ☆ %f\n" + .balign 4 + +glabel D_80A52A0C + .asciz " point間の移動スピード最大 ☆☆ %f\n" + .balign 4 + +glabel D_80A52A38 + .asciz " (体)反転アングルスピード目標値 %f\n" + .balign 4 + +glabel D_80A52A64 + .asciz " (体)反転アングルスピード最大☆ %f\n" + .balign 4 + +glabel D_80A52A90 + .asciz " (頭)反転アングルスピード加算値 %f\n" + .balign 4 + +glabel D_80A52ABC + .asciz " (頭)反転アングルスピード最大☆ %f\n" + .balign 4 + +glabel D_80A52AE8 + .asciz " 今時間 %d\n" + .balign 4 + +glabel D_80A52AFC + .asciz " チェック時間 %d\n" + .balign 4 + +glabel D_80A52B18 + .asciz "\n\n" + .balign 4 + +.text glabel EnHeishi1_Init /* 00000 80A512D0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00004 80A512D4 AFB20040 */ sw $s2, 0x0040($sp) @@ -239,5 +293,3 @@ glabel EnHeishi1_Init /* 00344 80A51614 8FB20040 */ lw $s2, 0x0040($sp) /* 00348 80A51618 03E00008 */ jr $ra /* 0034C 80A5161C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s index 0ce78ad4e1..e5d80ebe72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s @@ -1,3 +1,18 @@ +.rdata +glabel D_80A52C00 + .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel D_80A52C38 + .word 0x44098000 +glabel D_80A52C3C + .float 3.14159274101 + +glabel D_80A52C40 + .word 0xC079999A, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnHeishi1_Update /* 0104C 80A5231C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 01050 80A52320 AFBF0024 */ sw $ra, 0x0024($sp) @@ -210,5 +225,3 @@ glabel EnHeishi1_Update /* 01360 80A52630 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 01364 80A52634 03E00008 */ jr $ra /* 01368 80A52638 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s index 34d56be0bd..57e4dd4725 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A52C28 + .float 1.99000000954 + +.text glabel func_80A5162C /* 0035C 80A5162C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00360 80A51630 AFB00028 */ sw $s0, 0x0028($sp) @@ -48,5 +53,3 @@ glabel func_80A5162C /* 00408 80A516D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0040C 80A516DC 03E00008 */ jr $ra /* 00410 80A516E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s index 46b1752f34..7799d33755 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s @@ -1,3 +1,35 @@ +.rdata +glabel D_80A52B1C + .asciz " 種類 %d\n" + .balign 4 + +glabel D_80A52B30 + .asciz " ぱす %d\n" + .balign 4 + +glabel D_80A52B44 + .asciz " 反転 %d\n" + .balign 4 + +glabel D_80A52B58 + .asciz " 時間 %d\n" + .balign 4 + +glabel D_80A52B6C + .asciz " 点座 %d\n" + .balign 4 + +glabel D_80A52B80 + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel D_80A52C2C + .word 0x4622F983 +glabel D_80A52C30 + .float 1.99000000954 + +.text glabel func_80A516E4 /* 00414 80A516E4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00418 80A516E8 AFB00020 */ sw $s0, 0x0020($sp) @@ -262,5 +294,3 @@ glabel func_80A516E4 /* 007BC 80A51A8C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 007C0 80A51A90 03E00008 */ jr $ra /* 007C4 80A51A94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s index 63fe3a7aa8..2c33a08e7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s @@ -48,5 +48,3 @@ glabel func_80A51A98 /* 00878 80A51B48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0087C 80A51B4C 03E00008 */ jr $ra /* 00880 80A51B50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s index 764ccdc87b..aec5f504b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s @@ -69,5 +69,3 @@ glabel func_80A51B54 /* 00970 80A51C40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00974 80A51C44 03E00008 */ jr $ra /* 00978 80A51C48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s index 786de4a345..7ecc645efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A52C34 + .float 1.99000000954 + +.text glabel func_80A51C4C /* 0097C 80A51C4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00980 80A51C50 AFB00028 */ sw $s0, 0x0028($sp) @@ -54,5 +59,3 @@ glabel func_80A51C4C /* 00A3C 80A51D0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A40 80A51D10 03E00008 */ jr $ra /* 00A44 80A51D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s index b3bcd384e6..92d9a60aa8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80A52B84 + .asciz " 種類 %d\n" + .balign 4 + +glabel D_80A52B98 + .asciz " ぱす %d\n" + .balign 4 + +glabel D_80A52BAC + .asciz " 反転 %d\n" + .balign 4 + +glabel D_80A52BC0 + .asciz " 時間 %d\n" + .balign 4 + +glabel D_80A52BD4 + .asciz "\n\n" + .balign 4 + +.text glabel func_80A51D18 /* 00A48 80A51D18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00A4C 80A51D1C AFB00018 */ sw $s0, 0x0018($sp) @@ -163,5 +185,3 @@ glabel func_80A51D18 /* 00C74 80A51F44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C78 80A51F48 03E00008 */ jr $ra /* 00C7C 80A51F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s index 4ae77676c3..f945ce797e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s @@ -40,5 +40,3 @@ glabel func_80A51F50 /* 00D10 80A51FE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D14 80A51FE4 03E00008 */ jr $ra /* 00D18 80A51FE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s index 1656636599..2bcd87f50c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s @@ -48,5 +48,3 @@ glabel func_80A51FEC /* 00DBC 80A5208C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DC0 80A52090 03E00008 */ jr $ra /* 00DC4 80A52094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s index 2c1ee94536..7caa148292 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s @@ -38,5 +38,3 @@ glabel func_80A52098 /* 00E50 80A52120 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E54 80A52124 03E00008 */ jr $ra /* 00E58 80A52128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s index 7050fad34d..4f6e675248 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s @@ -54,5 +54,3 @@ glabel func_80A5212C /* 00F20 80A521F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F24 80A521F4 03E00008 */ jr $ra /* 00F28 80A521F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s index 8078dad49a..4a6950ed63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s @@ -38,5 +38,3 @@ glabel func_80A521FC /* 00FB4 80A52284 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FB8 80A52288 03E00008 */ jr $ra /* 00FBC 80A5228C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s index 7787458b07..0cf718db7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A52BD8 + .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A52290 /* 00FC0 80A52290 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00FC4 80A52294 AFB00018 */ sw $s0, 0x0018($sp) @@ -37,5 +43,3 @@ glabel func_80A52290 /* 01040 80A52310 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01044 80A52314 03E00008 */ jr $ra /* 01048 80A52318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s index c0155eff16..d8b8d9884a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s @@ -16,5 +16,3 @@ glabel func_80A5263C .L80A52674: /* 013A4 80A52674 03E00008 */ jr $ra /* 013A8 80A52678 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s index 000d93c36f..5a69d51b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s @@ -18,5 +18,3 @@ glabel EnHeishi2_Destroy /* 00320 80A531C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00324 80A531C4 03E00008 */ jr $ra /* 00328 80A531C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s index 7ff45b836a..bf60263f07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80A55294 + .asciz "../z_en_heishi2.c" + .balign 4 + +glabel D_80A552A8 + .asciz "../z_en_heishi2.c" + .balign 4 + +glabel D_80A552BC + .asciz "../z_en_heishi2.c" + .balign 4 + +.late_rodata +glabel D_80A552FC + .word 0xC40E8000 +glabel D_80A55300 + .word 0x3F9C61AA, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnHeishi2_Draw /* 01E8C 80A54D2C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01E90 80A54D30 AFB10024 */ sw $s1, 0x0024($sp) @@ -115,4 +135,3 @@ glabel EnHeishi2_Draw /* 02044 80A54EE4 03E00008 */ jr $ra /* 02048 80A54EE8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0204C 80A54EEC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s index 9ea578dcd6..a55e815eec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80A54F40 + .asciz "\n\n" + .balign 4 + +glabel D_80A54F44 + .asciz " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A54F7C + .asciz "\n\n" + .balign 4 + +glabel D_80A54F80 + .asciz " ☆☆☆☆☆ 覗き穴奥兵士ふぃ〜 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A54FB4 + .asciz "\n\n" + .balign 4 + +glabel D_80A54FB8 + .asciz " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A54FF0 + .asciz " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A55028 + .asciz " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" + .balign 4 + +.text glabel EnHeishi2_Init /* 00000 80A52EA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 80A52EA4 AFA50044 */ sw $a1, 0x0044($sp) @@ -212,5 +246,3 @@ glabel EnHeishi2_Init /* 002E0 80A53180 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002E4 80A53184 03E00008 */ jr $ra /* 002E8 80A53188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s index f19948dc8a..4c650c9d47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s @@ -91,5 +91,3 @@ glabel EnHeishi2_Update /* 01D14 80A54BB4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01D18 80A54BB8 03E00008 */ jr $ra /* 01D1C 80A54BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s index 15000345f6..59256e3621 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s @@ -2,5 +2,3 @@ glabel func_80A531CC /* 0032C 80A531CC AFA40000 */ sw $a0, 0x0000($sp) /* 00330 80A531D0 03E00008 */ jr $ra /* 00334 80A531D4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s index 641cc4aacf..3fc6957e71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s @@ -2,5 +2,3 @@ glabel func_80A531D8 /* 00338 80A531D8 AFA40000 */ sw $a0, 0x0000($sp) /* 0033C 80A531DC 03E00008 */ jr $ra /* 00340 80A531E0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s index f28c1c848f..2ba34b0060 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s @@ -38,5 +38,3 @@ glabel func_80A531E4 /* 003CC 80A5326C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003D0 80A53270 03E00008 */ jr $ra /* 003D4 80A53274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s index 22bed00708..188c1c0909 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80A55060 + .asciz " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A55094 + .asciz " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A550C8 + .asciz " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A550F8 + .asciz " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A5512C + .asciz " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A55160 + .asciz " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A53278 /* 003D8 80A53278 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 003DC 80A5327C AFB00018 */ sw $s0, 0x0018($sp) @@ -130,5 +156,3 @@ glabel func_80A53278 /* 005A0 80A53440 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005A4 80A53444 03E00008 */ jr $ra /* 005A8 80A53448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s index a9983a5088..0b0bb9434e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s @@ -66,5 +66,3 @@ glabel func_80A5344C /* 0068C 80A5352C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00690 80A53530 03E00008 */ jr $ra /* 00694 80A53534 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s index 270685f49a..c523bf600d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s @@ -35,5 +35,3 @@ glabel func_80A53538 /* 00710 80A535B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00714 80A535B4 03E00008 */ jr $ra /* 00718 80A535B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s index 75cd939119..4c8425ccd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s @@ -32,5 +32,3 @@ glabel func_80A535BC /* 0078C 80A5362C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00790 80A53630 03E00008 */ jr $ra /* 00794 80A53634 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s index 7df82fafc7..cd0354fcd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A55194 + .asciz "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" + .balign 4 + +.text glabel func_80A53638 /* 00798 80A53638 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0079C 80A5363C AFBF001C */ sw $ra, 0x001C($sp) @@ -69,5 +75,3 @@ glabel func_80A53638 /* 00880 80A53720 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00884 80A53724 03E00008 */ jr $ra /* 00888 80A53728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s index b05f51ab4b..b1c999633a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_80A552D0 + .word 0x446CC000 +glabel D_80A552D4 + .word 0x44956000 +glabel D_80A552D8 + .word 0x4527A000 +glabel D_80A552DC + .word 0x44918000 +glabel D_80A552E0 + .word 0x448F2000 +glabel D_80A552E4 + .word 0x453C6000 + +.text glabel func_80A5372C /* 0088C 80A5372C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00890 80A53730 AFB00028 */ sw $s0, 0x0028($sp) @@ -74,5 +89,3 @@ glabel func_80A5372C /* 009A4 80A53844 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 009A8 80A53848 03E00008 */ jr $ra /* 009AC 80A5384C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s index dd49dc9360..5f4c673715 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s @@ -48,5 +48,3 @@ glabel func_80A53850 /* 00A5C 80A538FC 8FB10018 */ lw $s1, 0x0018($sp) /* 00A60 80A53900 03E00008 */ jr $ra /* 00A64 80A53904 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s index 75b1264618..346e03c0f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s @@ -38,5 +38,3 @@ glabel func_80A53908 /* 00AF0 80A53990 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AF4 80A53994 03E00008 */ jr $ra /* 00AF8 80A53998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s index a159461618..37853fc642 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A551C0 + .asciz " ☆☆☆☆☆ とおしゃしねぇちゅーの ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A5399C /* 00AFC 80A5399C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00B00 80A539A0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -86,5 +92,3 @@ glabel func_80A5399C /* 00C28 80A53AC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C2C 80A53ACC 03E00008 */ jr $ra /* 00C30 80A53AD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s index a38ad8bf2f..a670df39e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s @@ -86,5 +86,3 @@ glabel func_80A53AD4 /* 00D60 80A53C00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D64 80A53C04 03E00008 */ jr $ra /* 00D68 80A53C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s index cc2ee4942c..1659c00975 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s @@ -35,5 +35,3 @@ glabel func_80A53C0C /* 00DE4 80A53C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DE8 80A53C88 03E00008 */ jr $ra /* 00DEC 80A53C8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s index 09298f61c1..9587cd46ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s @@ -32,5 +32,3 @@ glabel func_80A53C90 /* 00E60 80A53D00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E64 80A53D04 03E00008 */ jr $ra /* 00E68 80A53D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s index e4d206d9cc..a048a87e72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A551F8 + .asciz "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" + .balign 4 + +.text glabel func_80A53D0C /* 00E6C 80A53D0C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00E70 80A53D10 AFBF001C */ sw $ra, 0x001C($sp) @@ -67,5 +73,3 @@ glabel func_80A53D0C /* 00F4C 80A53DEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F50 80A53DF0 03E00008 */ jr $ra /* 00F54 80A53DF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s index af5983642c..3f2391efba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A552E8 + .word 0x440EC000 +glabel D_80A552EC + .word 0xC4B9E000 +glabel D_80A552F0 + .word 0x43D08000 +glabel D_80A552F4 + .word 0xC486E000 + +.text glabel func_80A53DF8 /* 00F58 80A53DF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00F5C 80A53DFC AFB00028 */ sw $s0, 0x0028($sp) @@ -79,5 +90,3 @@ glabel func_80A53DF8 /* 01084 80A53F24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01088 80A53F28 03E00008 */ jr $ra /* 0108C 80A53F2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s index a7a7224d66..fec4dd051d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s @@ -71,5 +71,3 @@ glabel func_80A53F30 /* 0118C 80A5402C 8FB10018 */ lw $s1, 0x0018($sp) /* 01190 80A54030 03E00008 */ jr $ra /* 01194 80A54034 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s index 06d4cc4f09..539cf88c94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s @@ -36,5 +36,3 @@ glabel func_80A54038 /* 01214 80A540B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01218 80A540B8 03E00008 */ jr $ra /* 0121C 80A540BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s index d4e71e6f35..44466163df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s @@ -85,5 +85,3 @@ glabel func_80A540C0 /* 01350 80A541F0 8FB10018 */ lw $s1, 0x0018($sp) /* 01354 80A541F4 03E00008 */ jr $ra /* 01358 80A541F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s index 0dcbfd95e7..10be9787c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s @@ -34,5 +34,3 @@ glabel func_80A541FC /* 013D0 80A54270 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013D4 80A54274 03E00008 */ jr $ra /* 013D8 80A54278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s index f3be334513..e34ab8813f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s @@ -44,5 +44,3 @@ glabel func_80A5427C /* 01474 80A54314 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01478 80A54318 03E00008 */ jr $ra /* 0147C 80A5431C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s index b7c2354e22..db9a5f38d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s @@ -33,5 +33,3 @@ glabel func_80A54320 /* 014F4 80A54394 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014F8 80A54398 03E00008 */ jr $ra /* 014FC 80A5439C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s index c84167b22d..15cc47c117 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s @@ -76,5 +76,3 @@ glabel func_80A543A0 /* 01600 80A544A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01604 80A544A4 03E00008 */ jr $ra /* 01608 80A544A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s index c70cc29bbb..5b86fc9773 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s @@ -46,5 +46,3 @@ glabel func_80A544AC /* 016B0 80A54550 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 016B4 80A54554 03E00008 */ jr $ra /* 016B8 80A54558 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s index ab52c6e234..fee1d43b12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A55224 + .asciz " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel D_80A552F8 + .float 7000.0 + +.text glabel func_80A5455C /* 016BC 80A5455C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 016C0 80A54560 AFB10030 */ sw $s1, 0x0030($sp) @@ -106,5 +116,3 @@ glabel func_80A5455C /* 01830 80A546D0 8FB10030 */ lw $s1, 0x0030($sp) /* 01834 80A546D4 03E00008 */ jr $ra /* 01838 80A546D8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s index 42e15eadbd..23e2edb40c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s @@ -35,5 +35,3 @@ glabel func_80A546DC /* 018B0 80A54750 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 018B4 80A54754 03E00008 */ jr $ra /* 018B8 80A54758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s index e8317b0999..d59ff848d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s @@ -143,5 +143,3 @@ glabel func_80A5475C /* 01AA8 80A54948 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AAC 80A5494C 03E00008 */ jr $ra /* 01AB0 80A54950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s index 36b2108d1f..73f3ae6604 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s @@ -38,5 +38,3 @@ glabel func_80A54954 /* 01B3C 80A549DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B40 80A549E0 03E00008 */ jr $ra /* 01B44 80A549E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s index 130505410f..fc0d5ac167 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s @@ -39,5 +39,3 @@ glabel func_80A549E8 /* 01BCC 80A54A6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01BD0 80A54A70 03E00008 */ jr $ra /* 01BD4 80A54A74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s index d1c83fcbf9..0ca7f982b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s @@ -30,5 +30,3 @@ glabel func_80A54BC0 .L80A54C2C: /* 01D8C 80A54C2C 03E00008 */ jr $ra /* 01D90 80A54C30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s index 781ffbe7a1..b43212dfe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s @@ -14,5 +14,3 @@ glabel func_80A54C34 /* 01DC0 80A54C60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DC4 80A54C64 03E00008 */ jr $ra /* 01DC8 80A54C68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s index 1b7fa29d37..85a02611ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A55258 + .asciz "../z_en_heishi2.c" + .balign 4 + +glabel D_80A5526C + .asciz "../z_en_heishi2.c" + .balign 4 + +glabel D_80A55280 + .asciz "../z_en_heishi2.c" + .balign 4 + +.text glabel func_80A54C6C /* 01DCC 80A54C6C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01DD0 80A54C70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -47,5 +61,3 @@ glabel func_80A54C6C /* 01E80 80A54D20 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01E84 80A54D24 03E00008 */ jr $ra /* 01E88 80A54D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s index 506524f678..031d4c6a16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s @@ -10,5 +10,3 @@ glabel EnHeishi3_Destroy /* 00154 80A55794 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00158 80A55798 03E00008 */ jr $ra /* 0015C 80A5579C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Draw.s index 354067018b..a6eefc3f7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Draw.s @@ -21,4 +21,3 @@ glabel EnHeishi3_Draw /* 008F4 80A55F34 00000000 */ nop /* 008F8 80A55F38 00000000 */ nop /* 008FC 80A55F3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s index 70ea365391..48b9037e2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A55F90 + .asciz "☆☆☆☆☆ 城門兵パワーアップ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel EnHeishi3_Init /* 00000 80A55640 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80A55644 3C0180A5 */ lui $at, %hi(D_80A55F40) ## $at = 80A50000 @@ -85,5 +91,3 @@ glabel EnHeishi3_Init /* 0012C 80A5576C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00130 80A55770 03E00008 */ jr $ra /* 00134 80A55774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s index f7fbfa7e5e..c173aa82b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s @@ -59,5 +59,3 @@ glabel EnHeishi3_Update /* 0083C 80A55E7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00840 80A55E80 03E00008 */ jr $ra /* 00844 80A55E84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s index 010978cdc2..f076617bbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s @@ -46,5 +46,3 @@ glabel func_80A557A0 /* 00204 80A55844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00208 80A55848 03E00008 */ jr $ra /* 0020C 80A5584C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s index c7c903bd89..423dd9da96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A55FC4 + .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A55850 /* 00210 80A55850 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00214 80A55854 AFBF001C */ sw $ra, 0x001C($sp) @@ -98,5 +104,3 @@ glabel func_80A55850 /* 00368 80A559A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0036C 80A559AC 03E00008 */ jr $ra /* 00370 80A559B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A559B4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A559B4.s index 07061a6246..9ab74749bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A559B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A559B4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A55FEC + .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A559B4 /* 00374 80A559B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00378 80A559B8 AFBF001C */ sw $ra, 0x001C($sp) @@ -98,5 +104,3 @@ glabel func_80A559B4 /* 004E0 80A55B20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004E4 80A55B24 03E00008 */ jr $ra /* 004E8 80A55B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s index 0563e7ad67..80e56da993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s @@ -43,5 +43,3 @@ glabel func_80A55B2C /* 00588 80A55BC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0058C 80A55BCC 03E00008 */ jr $ra /* 00590 80A55BD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55BD4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55BD4.s index b2bee84de0..a4b7c3a2bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55BD4.s @@ -44,5 +44,3 @@ glabel func_80A55BD4 /* 00620 80A55C60 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00624 80A55C64 03E00008 */ jr $ra /* 00628 80A55C68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s index 5ca1abaefb..d4ad6bbfd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s @@ -38,5 +38,3 @@ glabel func_80A55C6C /* 006B4 80A55CF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006B8 80A55CF8 03E00008 */ jr $ra /* 006BC 80A55CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s index 5e00a94c10..7cb0bf57d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s @@ -45,5 +45,3 @@ glabel func_80A55D00 /* 00760 80A55DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00764 80A55DA4 03E00008 */ jr $ra /* 00768 80A55DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55E88.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55E88.s index ad8404f262..7c08a88db3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55E88.s @@ -26,5 +26,3 @@ glabel func_80A55E88 .L80A55EE4: /* 008A4 80A55EE4 03E00008 */ jr $ra /* 008A8 80A55EE8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s index cb51eeda8e..690af7b118 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s @@ -10,5 +10,3 @@ glabel EnHeishi4_Destroy /* 0024C 80A5631C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00250 80A56320 03E00008 */ jr $ra /* 00254 80A56324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Draw.s index aeee73b416..54cc969121 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Draw.s @@ -22,4 +22,3 @@ glabel EnHeishi4_Draw /* 00DF4 80A56EC4 00000000 */ nop /* 00DF8 80A56EC8 00000000 */ nop /* 00DFC 80A56ECC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s index 585fb9647c..094b7354b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80A56F30 + .asciz "\n\n" + .balign 4 + +glabel D_80A56F34 + .asciz " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A56F6C + .asciz " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A56FA0 + .asciz " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" + .balign 4 + +glabel D_80A56FD8 + .asciz "\n\n" + .balign 4 + +.text glabel EnHeishi4_Init /* 00000 80A560D0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 80A560D4 AFA50044 */ sw $a1, 0x0044($sp) @@ -158,5 +180,3 @@ glabel EnHeishi4_Init /* 00224 80A562F4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00228 80A562F8 03E00008 */ jr $ra /* 0022C 80A562FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s index 1e9120e71c..99db4f2809 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s @@ -93,5 +93,3 @@ glabel EnHeishi4_Update /* 00D38 80A56E08 8FB10020 */ lw $s1, 0x0020($sp) /* 00D3C 80A56E0C 03E00008 */ jr $ra /* 00D40 80A56E10 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s index 4ebe2500de..246f749a60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s @@ -38,5 +38,3 @@ glabel func_80A56328 /* 002E0 80A563B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002E4 80A563B4 03E00008 */ jr $ra /* 002E8 80A563B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s index 961f8bc7d2..9d236503d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s @@ -108,5 +108,3 @@ glabel func_80A563BC /* 00468 80A56538 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0046C 80A5653C 03E00008 */ jr $ra /* 00470 80A56540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s index 655c17b874..5e58763b49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A56FDC + .asciz " ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A56544 /* 00474 80A56544 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00478 80A56548 AFA40028 */ sw $a0, 0x0028($sp) @@ -58,5 +64,3 @@ glabel func_80A56544 /* 00538 80A56608 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0053C 80A5660C 03E00008 */ jr $ra /* 00540 80A56610 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s index 01e1132e50..b4ba6b0d51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s @@ -82,5 +82,3 @@ glabel func_80A56614 /* 00660 80A56730 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00664 80A56734 03E00008 */ jr $ra /* 00668 80A56738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s index fa784dc8ce..b3c6302054 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A57010 + .asciz " ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A57048 + .asciz " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A57074 + .asciz " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A5673C /* 0066C 80A5673C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00670 80A56740 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 @@ -90,5 +104,3 @@ glabel func_80A5673C /* 00798 80A56868 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0079C 80A5686C 03E00008 */ jr $ra /* 007A0 80A56870 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56874.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56874.s index 3dcb22d359..8e26e099db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56874.s @@ -39,5 +39,3 @@ glabel func_80A56874 /* 00824 80A568F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00828 80A568F8 03E00008 */ jr $ra /* 0082C 80A568FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s index 51a9237816..c99b397869 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s @@ -38,5 +38,3 @@ glabel func_80A56900 /* 008B8 80A56988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008BC 80A5698C 03E00008 */ jr $ra /* 008C0 80A56990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s index c99ffa4800..e1407f53a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s @@ -48,5 +48,3 @@ glabel func_80A56994 /* 00974 80A56A44 8FB10028 */ lw $s1, 0x0028($sp) /* 00978 80A56A48 03E00008 */ jr $ra /* 0097C 80A56A4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s index 7f89070609..6dd521f2c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s @@ -32,5 +32,3 @@ glabel func_80A56A50 /* 009F0 80A56AC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009F4 80A56AC4 03E00008 */ jr $ra /* 009F8 80A56AC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56ACC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56ACC.s index 88d05110ec..7c08852d5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56ACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56ACC.s @@ -30,5 +30,3 @@ glabel func_80A56ACC /* 00A64 80A56B34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A68 80A56B38 03E00008 */ jr $ra /* 00A6C 80A56B3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s index bc71e115a1..475f517c3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s @@ -106,5 +106,3 @@ glabel func_80A56B40 /* 00BD8 80A56CA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BDC 80A56CAC 03E00008 */ jr $ra /* 00BE0 80A56CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56E14.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56E14.s index bf38a47099..03db174228 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56E14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56E14.s @@ -26,5 +26,3 @@ glabel func_80A56E14 .L80A56E70: /* 00DA0 80A56E70 03E00008 */ jr $ra /* 00DA4 80A56E74 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s index d8f4ce8402..a168e93766 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s @@ -14,5 +14,3 @@ glabel EnHintnuts_Destroy /* 001C4 80A573C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C8 80A573C8 03E00008 */ jr $ra /* 001CC 80A573CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s index 7788cab051..55f5193f86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s @@ -31,4 +31,3 @@ glabel EnHintnuts_Draw /* 017D4 80A589D4 00000000 */ nop /* 017D8 80A589D8 00000000 */ nop /* 017DC 80A589DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s index 5b6cd78667..9b95fd51d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s @@ -115,5 +115,3 @@ glabel EnHintnuts_Init /* 00190 80A57390 8FB10038 */ lw $s1, 0x0038($sp) /* 00194 80A57394 03E00008 */ jr $ra /* 00198 80A57398 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s index 820250a9d3..c8d66218ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s @@ -110,5 +110,3 @@ glabel EnHintnuts_Update /* 0162C 80A5882C 8FB10020 */ lw $s1, 0x0020($sp) /* 01630 80A58830 03E00008 */ jr $ra /* 01634 80A58834 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s index 80f8d33851..dcf61b162e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s @@ -35,5 +35,3 @@ glabel func_80A573D0 /* 00248 80A57448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0024C 80A5744C 03E00008 */ jr $ra /* 00250 80A57450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s index e0a0a64f07..a98ecb582e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s @@ -32,5 +32,3 @@ glabel func_80A57454 /* 002C8 80A574C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002CC 80A574CC 03E00008 */ jr $ra /* 002D0 80A574D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s index 1813649ffa..b07d60bc14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s @@ -17,5 +17,3 @@ glabel func_80A574D4 /* 00310 80A57510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00314 80A57514 03E00008 */ jr $ra /* 00318 80A57518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s index 8c474dd878..065776a659 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s @@ -14,5 +14,3 @@ glabel func_80A5751C /* 0034C 80A5754C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00350 80A57550 03E00008 */ jr $ra /* 00354 80A57554 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s index e0cf19782a..2922f159f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s @@ -27,5 +27,3 @@ glabel func_80A57558 /* 003B4 80A575B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B8 80A575B8 03E00008 */ jr $ra /* 003BC 80A575BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s index 33c37d663c..a6c16f3b4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s @@ -19,5 +19,3 @@ glabel func_80A575C0 /* 00400 80A57600 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00404 80A57604 03E00008 */ jr $ra /* 00408 80A57608 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s index d23c5f28e7..b3aaed4d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s @@ -66,5 +66,3 @@ glabel func_80A5760C /* 004F0 80A576F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F4 80A576F4 03E00008 */ jr $ra /* 004F8 80A576F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s index 3a8a07ec07..51490d04ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s @@ -17,5 +17,3 @@ glabel func_80A576FC /* 00538 80A57738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0053C 80A5773C 03E00008 */ jr $ra /* 00540 80A57740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s index 00d8f35147..d8ac772315 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s @@ -18,5 +18,3 @@ glabel func_80A57744 /* 00584 80A57784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00588 80A57788 03E00008 */ jr $ra /* 0058C 80A5778C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s index a693c25c5d..ed844435d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s @@ -49,5 +49,3 @@ glabel func_80A57790 /* 00644 80A57844 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00648 80A57848 03E00008 */ jr $ra /* 0064C 80A5784C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s index 7604535a80..0cb3407dcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s @@ -44,5 +44,3 @@ glabel func_80A57850 /* 006F0 80A578F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006F4 80A578F4 03E00008 */ jr $ra /* 006F8 80A578F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s index 5b2b708164..fe78b1a405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s @@ -170,5 +170,3 @@ glabel func_80A578FC /* 00954 80A57B54 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00958 80A57B58 03E00008 */ jr $ra /* 0095C 80A57B5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s index 8e203d84ae..e856e6632f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s @@ -36,5 +36,3 @@ glabel func_80A57B60 /* 009D8 80A57BD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009DC 80A57BDC 03E00008 */ jr $ra /* 009E0 80A57BE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s index 05490f7a26..3c018adfc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s @@ -55,5 +55,3 @@ glabel func_80A57BE4 /* 00A9C 80A57C9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AA0 80A57CA0 03E00008 */ jr $ra /* 00AA4 80A57CA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s index 84c9c44e22..75f0d1b93f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s @@ -88,5 +88,3 @@ glabel func_80A57CA8 /* 00BD8 80A57DD8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00BDC 80A57DDC 03E00008 */ jr $ra /* 00BE0 80A57DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s index ad1251dc7e..15421820c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s @@ -77,5 +77,3 @@ glabel func_80A57DE4 /* 00CEC 80A57EEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00CF0 80A57EF0 03E00008 */ jr $ra /* 00CF4 80A57EF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s index e56421f21d..c9d46befc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s @@ -27,5 +27,3 @@ glabel func_80A57EF8 /* 00D50 80A57F50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D54 80A57F54 03E00008 */ jr $ra /* 00D58 80A57F58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s index 4dac721508..40d78c258d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s @@ -15,5 +15,3 @@ glabel func_80A57F5C /* 00D88 80A57F88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D8C 80A57F8C 03E00008 */ jr $ra /* 00D90 80A57F90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s index fce3625561..783df26dbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s @@ -40,5 +40,3 @@ glabel func_80A57F94 /* 00E1C 80A5801C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E20 80A58020 03E00008 */ jr $ra /* 00E24 80A58024 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s index 2f63944b94..097a7c24d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s @@ -184,5 +184,3 @@ glabel func_80A58028 /* 010AC 80A582AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 010B0 80A582B0 03E00008 */ jr $ra /* 010B4 80A582B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s index d5f370a7b2..26d7e5d49c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s @@ -28,5 +28,3 @@ glabel func_80A582B8 /* 01114 80A58314 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01118 80A58318 03E00008 */ jr $ra /* 0111C 80A5831C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s index 77d51ca80a..cae0120362 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s @@ -127,5 +127,3 @@ glabel func_80A58320 /* 012D0 80A584D0 8FB10018 */ lw $s1, 0x0018($sp) /* 012D4 80A584D4 03E00008 */ jr $ra /* 012D8 80A584D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s index 146964996a..28afd07fcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s @@ -86,5 +86,3 @@ glabel func_80A584DC /* 013FC 80A585FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01400 80A58600 03E00008 */ jr $ra /* 01404 80A58604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s index 0059a0de2d..9d168fdda7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s @@ -46,5 +46,3 @@ glabel func_80A58608 /* 014AC 80A586AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 014B0 80A586B0 03E00008 */ jr $ra /* 014B4 80A586B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s index f625abdfec..91c75d5262 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80A58A50 + .float 0.0833 +glabel D_80A58A54 + .float 0.1167 +glabel D_80A58A58 + .float 1.7 +glabel D_80A58A5C + .float 0.7 +glabel D_80A58A60 + .float 0.1667 + +.text glabel func_80A58838 /* 01638 80A58838 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0163C 80A5883C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 @@ -83,5 +96,3 @@ glabel func_80A58838 /* 01764 80A58964 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01768 80A58968 03E00008 */ jr $ra /* 0176C 80A5896C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s index 246891d1e4..04b9a6548b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s @@ -10,5 +10,3 @@ glabel EnHoll_Destroy /* 000FC 80A58D0C 0018C823 */ subu $t9, $zero, $t8 /* 00100 80A58D10 03E00008 */ jr $ra /* 00104 80A58D14 A4790004 */ sh $t9, 0x0004($v1) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s index e6e09c564a..dd3b55d5a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A59AF0 + .asciz "../z_en_holl.c" + .balign 4 + +glabel D_80A59B00 + .asciz "../z_en_holl.c" + .balign 4 + +glabel D_80A59B10 + .asciz "../z_en_holl.c" + .balign 4 + +.late_rodata +glabel D_80A59B2C + .float 3.14159274101 + +.text glabel EnHoll_Draw /* 00CB0 80A598C0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00CB4 80A598C4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -92,4 +110,3 @@ glabel EnHoll_Draw /* 00E04 80A59A14 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00E08 80A59A18 03E00008 */ jr $ra /* 00E0C 80A59A1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s index 6028955567..cc0bd8e104 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s @@ -15,5 +15,3 @@ glabel EnHoll_Init /* 000D0 80A58CE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D4 80A58CE4 03E00008 */ jr $ra /* 000D8 80A58CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s index 820c35c2e1..c73ab1006e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s @@ -8,5 +8,3 @@ glabel EnHoll_Update /* 00CA4 80A598B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CA8 80A598B8 03E00008 */ jr $ra /* 00CAC 80A598BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s index 306c6bc5ef..362e6b2f16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s @@ -1,5 +1,3 @@ glabel func_80A58C10 /* 00000 80A58C10 03E00008 */ jr $ra /* 00004 80A58C14 AC850150 */ sw $a1, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s index cec137bfdd..fa814f85b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s @@ -12,5 +12,3 @@ glabel func_80A58C18 .L80A58C40: /* 00030 80A58C40 03E00008 */ jr $ra /* 00034 80A58C44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s index 5f535c967a..955a0b73ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s @@ -27,5 +27,3 @@ glabel func_80A58C48 /* 00094 80A58CA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00098 80A58CA8 03E00008 */ jr $ra /* 0009C 80A58CAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s index 1ce52f215d..d37537af4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s @@ -46,5 +46,3 @@ glabel func_80A58D18 /* 001B8 80A58DC8 394B0001 */ xori $t3, $t2, 0x0001 ## $t3 = 00010001 /* 001BC 80A58DCC 03E00008 */ jr $ra /* 001C0 80A58DD0 A02B1CEC */ sb $t3, 0x1CEC($at) ## 00011CEC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s index 3489a957e5..6ec141cfaf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s @@ -153,5 +153,3 @@ glabel func_80A58DD4 /* 003F8 80A59008 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 003FC 80A5900C 03E00008 */ jr $ra /* 00400 80A59010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s index d781367ac2..a28b9aeee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s @@ -116,5 +116,3 @@ glabel func_80A59014 /* 005A4 80A591B4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 005A8 80A591B8 03E00008 */ jr $ra /* 005AC 80A591BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s index 382175e3c6..a8c08129c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A59B20 + .word 0x44174000 + +.text glabel func_80A591C0 /* 005B0 80A591C0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 005B4 80A591C4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -129,5 +134,3 @@ glabel func_80A591C0 /* 00788 80A59398 8FB10020 */ lw $s1, 0x0020($sp) /* 0078C 80A5939C 03E00008 */ jr $ra /* 00790 80A593A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s index cb97ec4fec..99ffe8e184 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A59B24 + .float 1.7 + +.text glabel func_80A593A4 /* 00794 80A593A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00798 80A593A8 AFBF001C */ sw $ra, 0x001C($sp) @@ -100,5 +105,3 @@ glabel func_80A593A4 /* 00904 80A59514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00908 80A59518 03E00008 */ jr $ra /* 0090C 80A5951C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s index 08884125ad..83474fa15f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s @@ -64,5 +64,3 @@ glabel func_80A59520 /* 009FC 80A5960C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A00 80A59610 03E00008 */ jr $ra /* 00A04 80A59614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s index 7b76ca8c81..42927e995f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A59B28 + .word 0x40BCCCCD + +.text glabel func_80A59618 /* 00A08 80A59618 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00A0C 80A5961C AFBF001C */ sw $ra, 0x001C($sp) @@ -139,5 +144,3 @@ glabel func_80A59618 /* 00C0C 80A5981C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00C10 80A59820 03E00008 */ jr $ra /* 00C14 80A59824 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s index 1d1a86c862..3b08694ac4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s @@ -30,5 +30,3 @@ glabel func_80A59828 /* 00C80 80A59890 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C84 80A59894 03E00008 */ jr $ra /* 00C88 80A59898 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s index a6f03a1acd..d0983e641f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s @@ -20,5 +20,3 @@ glabel EnHonotrap_Destroy /* 004A8 80A5A0D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004AC 80A5A0DC 03E00008 */ jr $ra /* 004B0 80A5A0E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Draw.s index 356797a481..43792cb5e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Draw.s @@ -27,4 +27,3 @@ glabel EnHonotrap_Draw /* 01324 80A5AF54 00000000 */ nop /* 01328 80A5AF58 00000000 */ nop /* 0132C 80A5AF5C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Init.s index 5e03391228..a269677392 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Init.s @@ -24,5 +24,3 @@ glabel EnHonotrap_Init /* 00460 80A5A090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00464 80A5A094 03E00008 */ jr $ra /* 00468 80A5A098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s index 3674c5acc3..cac2d7b864 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s @@ -92,5 +92,3 @@ glabel EnHonotrap_Update /* 00FC0 80A5ABF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FC4 80A5ABF4 03E00008 */ jr $ra /* 00FC8 80A5ABF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s index bc8118406d..5a83d9e031 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s @@ -39,5 +39,3 @@ glabel func_80A59C30 /* 00084 80A59CB4 8FB00014 */ lw $s0, 0x0014($sp) /* 00088 80A59CB8 03E00008 */ jr $ra /* 0008C 80A59CBC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59CC0.s index 0989f07a1b..0e073abe1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59CC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59CC0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A5B070 + .asciz "Warning : vector size zero (%s %d)\n" + .balign 4 + +glabel D_80A5B094 + .asciz "../z_en_honotrap.c" + .balign 4 + +.late_rodata +glabel D_80A5B120 + .float 0.001 + +.text glabel func_80A59CC0 /* 00090 80A59CC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00094 80A59CC4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -46,5 +60,3 @@ glabel func_80A59CC0 /* 00134 80A59D64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00138 80A59D68 03E00008 */ jr $ra /* 0013C 80A59D6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s index 52f91d7303..37924a5b45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s @@ -108,5 +108,3 @@ glabel func_80A59D70 /* 002CC 80A59EFC 8FBE0050 */ lw $s8, 0x0050($sp) /* 002D0 80A59F00 03E00008 */ jr $ra /* 002D4 80A59F04 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s index 38e187db66..90b5e8fd59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A5B124 + .word 0x43FF8000 + +.text glabel func_80A59F08 /* 002D8 80A59F08 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 002DC 80A59F0C AFA50034 */ sw $a1, 0x0034($sp) @@ -86,5 +91,3 @@ glabel func_80A59F08 /* 00408 80A5A038 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0040C 80A5A03C 03E00008 */ jr $ra /* 00410 80A5A040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0E4.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0E4.s index 4607d3ca5b..2dd07ec55c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0E4.s @@ -5,5 +5,3 @@ glabel func_80A5A0E4 /* 004C0 80A5A0F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 004C4 80A5A0F4 03E00008 */ jr $ra /* 004C8 80A5A0F8 A48F022A */ sh $t7, 0x022A($a0) ## 0000022A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0FC.s index dc6893fc2e..b144698b6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A0FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A5B128 + .word 0x443B8000 + +.text glabel func_80A5A0FC /* 004CC 80A5A0FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 004D0 80A5A100 AFBF0014 */ sw $ra, 0x0014($sp) @@ -48,5 +53,3 @@ glabel func_80A5A0FC /* 00578 80A5A1A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0057C 80A5A1AC 03E00008 */ jr $ra /* 00580 80A5A1B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A1B4.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A1B4.s index 645e3cdc31..f9c4d66b51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A1B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A1B4.s @@ -21,5 +21,3 @@ glabel func_80A5A1B4 /* 005CC 80A5A1FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005D0 80A5A200 03E00008 */ jr $ra /* 005D4 80A5A204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s index 1d47ccc299..2a04e98e14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s @@ -55,5 +55,3 @@ glabel func_80A5A208 /* 0069C 80A5A2CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 006A0 80A5A2D0 03E00008 */ jr $ra /* 006A4 80A5A2D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2D8.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2D8.s index 437d604c45..8604985586 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2D8.s @@ -4,5 +4,3 @@ glabel func_80A5A2D8 /* 006B0 80A5A2E0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 006B4 80A5A2E4 03E00008 */ jr $ra /* 006B8 80A5A2E8 A480022A */ sh $zero, 0x022A($a0) ## 0000022A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2EC.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2EC.s index 53091b407e..09a0a3660d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A2EC.s @@ -12,5 +12,3 @@ glabel func_80A5A2EC /* 006E0 80A5A310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E4 80A5A314 03E00008 */ jr $ra /* 006E8 80A5A318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A31C.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A31C.s index bd60f3cf7a..e5f580bda6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A31C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A31C.s @@ -3,5 +3,3 @@ glabel func_80A5A31C /* 006F0 80A5A320 25CEA32C */ addiu $t6, $t6, %lo(func_80A5A32C) ## $t6 = 80A5A32C /* 006F4 80A5A324 03E00008 */ jr $ra /* 006F8 80A5A328 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A32C.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A32C.s index a1765e96f5..7eb76d4981 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A32C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A32C.s @@ -19,5 +19,3 @@ glabel func_80A5A32C /* 0073C 80A5A36C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00740 80A5A370 03E00008 */ jr $ra /* 00744 80A5A374 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A378.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A378.s index c33e5ff08c..1d1f981b9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A378.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A378.s @@ -3,5 +3,3 @@ glabel func_80A5A378 /* 0074C 80A5A37C 25CEA388 */ addiu $t6, $t6, %lo(func_80A5A388) ## $t6 = 80A5A388 /* 00750 80A5A380 03E00008 */ jr $ra /* 00754 80A5A384 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s index 4d38277ce0..da9a61175e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A5B12C + .word 0x3B83126F +glabel D_80A5B130 + .word 0x3B9D4952 + +.text glabel func_80A5A388 /* 00758 80A5A388 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0075C 80A5A38C AFBF0014 */ sw $ra, 0x0014($sp) @@ -42,5 +49,3 @@ glabel func_80A5A388 /* 007E0 80A5A410 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007E4 80A5A414 03E00008 */ jr $ra /* 007E8 80A5A418 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s index 6fbfd3840d..8a8d8720db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s @@ -27,5 +27,3 @@ glabel func_80A5A41C /* 00848 80A5A478 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0084C 80A5A47C 03E00008 */ jr $ra /* 00850 80A5A480 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s index f2d3bdcb8f..93b9305b00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s @@ -88,5 +88,3 @@ glabel func_80A5A484 /* 0098C 80A5A5BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00990 80A5A5C0 03E00008 */ jr $ra /* 00994 80A5A5C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A5C8.s index f0232e3a26..e2c234af17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A5C8.s @@ -35,5 +35,3 @@ glabel func_80A5A5C8 /* 00A1C 80A5A64C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A20 80A5A650 03E00008 */ jr $ra /* 00A24 80A5A654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s index 039b663820..89213597ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s @@ -123,5 +123,3 @@ glabel func_80A5A658 /* 00BE8 80A5A818 8FB10020 */ lw $s1, 0x0020($sp) /* 00BEC 80A5A81C 03E00008 */ jr $ra /* 00BF0 80A5A820 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A824.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A824.s index 0b5e5a6aa9..3e41f4fd23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A824.s @@ -14,5 +14,3 @@ glabel func_80A5A824 /* 00C24 80A5A854 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 /* 00C28 80A5A858 03E00008 */ jr $ra /* 00C2C 80A5A85C A4820030 */ sh $v0, 0x0030($a0) ## 00000030 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s index 8eceb36f25..9799636dbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_80A5B134 + .float 0.08 + +glabel D_80A5B138 + .word 0xBDA3D70A +glabel D_80A5B13C + .word 0x3F733333 +glabel D_80A5B140 + .float 0.1 + +.text glabel func_80A5A860 /* 00C30 80A5A860 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00C34 80A5A864 AFB00020 */ sw $s0, 0x0020($sp) @@ -118,5 +130,3 @@ glabel func_80A5A860 /* 00DD8 80A5AA08 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00DDC 80A5AA0C 03E00008 */ jr $ra /* 00DE0 80A5AA10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA14.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA14.s index 141495de3a..c6eb5a38c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA14.s @@ -3,5 +3,3 @@ glabel func_80A5AA14 /* 00DE8 80A5AA18 25CEAA24 */ addiu $t6, $t6, %lo(func_80A5AA24) ## $t6 = 80A5AA24 /* 00DEC 80A5AA1C 03E00008 */ jr $ra /* 00DF0 80A5AA20 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s index f33cf99070..a4413baec5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s @@ -39,5 +39,3 @@ glabel func_80A5AA24 /* 00E78 80A5AAA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E7C 80A5AAAC 03E00008 */ jr $ra /* 00E80 80A5AAB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s index 7d3823cab7..5db8d54e88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A5B0A8 + .asciz "../z_en_honotrap.c" + .balign 4 + +glabel D_80A5B0BC + .asciz "../z_en_honotrap.c" + .balign 4 + +glabel D_80A5B0D0 + .asciz "../z_en_honotrap.c" + .balign 4 + +.text glabel func_80A5ABFC /* 00FCC 80A5ABFC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00FD0 80A5AC00 AFBF001C */ sw $ra, 0x001C($sp) @@ -74,5 +88,3 @@ glabel func_80A5ABFC /* 010EC 80A5AD1C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 010F0 80A5AD20 03E00008 */ jr $ra /* 010F4 80A5AD24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s index ee355a29dc..12995790f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A5B0E4 + .asciz "../z_en_honotrap.c" + .balign 4 + +glabel D_80A5B0F8 + .asciz "../z_en_honotrap.c" + .balign 4 + +glabel D_80A5B10C + .asciz "../z_en_honotrap.c" + .balign 4 + +.late_rodata +glabel D_80A5B144 + .float 9.58738019108e-05 + +.text glabel func_80A5AD28 /* 010F8 80A5AD28 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 010FC 80A5AD2C AFB20040 */ sw $s2, 0x0040($sp) @@ -116,5 +134,3 @@ glabel func_80A5AD28 /* 012C0 80A5AEF0 8FB20040 */ lw $s2, 0x0040($sp) /* 012C4 80A5AEF4 03E00008 */ jr $ra /* 012C8 80A5AEF8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s index aab340ce39..e492dfcec7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s @@ -30,5 +30,3 @@ glabel EnHorse_Destroy /* 0158C 80A5C87C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01590 80A5C880 03E00008 */ jr $ra /* 01594 80A5C884 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s index b60f08f15f..94a3028de4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s @@ -53,4 +53,3 @@ glabel EnHorse_Draw /* 0AB14 80A65E04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0AB18 80A65E08 03E00008 */ jr $ra /* 0AB1C 80A65E0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s index 1e31bb9e0a..fa6e8f6305 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A66800 + .asciz "this->race.rider != NULL" + .balign 4 + +glabel D_80A6681C + .asciz "../z_en_horse.c" + .balign 4 + +.late_rodata +glabel D_80A6687C + .word 0x41411EB8 + +.text glabel EnHorse_Init /* 00DE0 80A5C0D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) @@ -529,5 +543,3 @@ glabel EnHorse_Init /* 0151C 80A5C80C 8FB10030 */ lw $s1, 0x0030($sp) /* 01520 80A5C810 03E00008 */ jr $ra /* 01524 80A5C814 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s index 0f287f10a8..176f0b7ccf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A669BC + .float 0.025 + +.text glabel EnHorse_Update /* 093BC 80A646AC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 093C0 80A646B0 3C0F80A6 */ lui $t7, %hi(D_80A66788) ## $t7 = 80A60000 @@ -565,5 +570,3 @@ glabel EnHorse_Update /* 09BD8 80A64EC8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 09BDC 80A64ECC 03E00008 */ jr $ra /* 09BE0 80A64ED0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s index a94035567a..9c76285d4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6684C + .word 0x414CCCCD + +.text glabel func_80A5B2F0 /* 00000 80A5B2F0 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 /* 00004 80A5B2F4 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A @@ -94,5 +99,3 @@ glabel func_80A5B2F0 /* 00154 80A5B444 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00158 80A5B448 03E00008 */ jr $ra /* 0015C 80A5B44C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s index c1f9e87039..e727e7a7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66850 + .word 0x414CCCCD + +.text glabel func_80A5B450 /* 00160 80A5B450 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00164 80A5B454 AFBF0014 */ sw $ra, 0x0014($sp) @@ -84,5 +89,3 @@ glabel func_80A5B450 /* 00294 80A5B584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00298 80A5B588 03E00008 */ jr $ra /* 0029C 80A5B58C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s index 95f1dd6777..3453ccb82f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s @@ -19,5 +19,3 @@ glabel func_80A5B590 /* 002E4 80A5B5D4 468084A0 */ cvt.s.w $f18, $f16 /* 002E8 80A5B5D8 03E00008 */ jr $ra /* 002EC 80A5B5DC E4D20008 */ swc1 $f18, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s index 8ab420846b..605f092a9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s @@ -14,5 +14,3 @@ glabel func_80A5B5E0 /* 00320 80A5B610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00324 80A5B614 03E00008 */ jr $ra /* 00328 80A5B618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s index 905ee4b3b4..49c49fd66a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80A66854 + .word 0x47AFC800 +glabel D_80A66858 + .float 0.8 + +glabel D_80A6685C + .word 0x3EF0A3D7 +glabel D_80A66860 + .word 0x3EF0A3D7 +glabel D_80A66864 + .float 0.4 + +glabel D_80A66868 + .float 0.4 + +.text glabel func_80A5B61C /* 0032C 80A5B61C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00330 80A5B620 AFB00028 */ sw $s0, 0x0028($sp) @@ -254,5 +271,3 @@ glabel func_80A5B61C /* 006CC 80A5B9BC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 006D0 80A5B9C0 03E00008 */ jr $ra /* 006D4 80A5B9C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s index 255d9d108a..82fdef28e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s @@ -50,5 +50,3 @@ glabel func_80A5B9C8 /* 00788 80A5BA78 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0078C 80A5BA7C 03E00008 */ jr $ra /* 00790 80A5BA80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s index 9807c65fe5..7a0c6de87a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s @@ -18,5 +18,3 @@ glabel func_80A5BA84 /* 007D0 80A5BAC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007D4 80A5BAC4 03E00008 */ jr $ra /* 007D8 80A5BAC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s index 7dbf0c16b3..56b5c6505a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s @@ -18,5 +18,3 @@ glabel func_80A5BACC /* 00818 80A5BB08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0081C 80A5BB0C 03E00008 */ jr $ra /* 00820 80A5BB10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s index f1c4872baa..75254d184e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A6686C + .word 0x3F707379 +glabel D_80A66870 + .float 0.7 + +.text glabel func_80A5BB14 /* 00824 80A5BB14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00828 80A5BB18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -33,5 +40,3 @@ glabel func_80A5BB14 /* 00894 80A5BB84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00898 80A5BB88 03E00008 */ jr $ra /* 0089C 80A5BB8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s index 9125a4f88c..6e618be896 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s @@ -10,5 +10,3 @@ glabel func_80A5BB90 /* 008C0 80A5BBB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C4 80A5BBB4 03E00008 */ jr $ra /* 008C8 80A5BBB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s index 0c6bc35539..baf7bad37a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66874 + .float 0.008 + +.text glabel func_80A5BBBC /* 008CC 80A5BBBC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 008D0 80A5BBC0 AFA50034 */ sw $a1, 0x0034($sp) @@ -45,5 +50,3 @@ glabel func_80A5BBBC /* 0096C 80A5BC5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00970 80A5BC60 03E00008 */ jr $ra /* 00974 80A5BC64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s index a582540401..ce81d06e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s @@ -82,5 +82,3 @@ glabel func_80A5BC68 /* 00A98 80A5BD88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A9C 80A5BD8C 03E00008 */ jr $ra /* 00AA0 80A5BD90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s index 8122e52dab..9d32b0ec33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66878 + .word 0x7E967699 + +.text glabel func_80A5BD94 /* 00AA4 80A5BD94 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00AA8 80A5BD98 AFB00028 */ sw $s0, 0x0028($sp) @@ -152,5 +157,3 @@ glabel func_80A5BD94 /* 00CDC 80A5BFCC 8FB70044 */ lw $s7, 0x0044($sp) /* 00CE0 80A5BFD0 03E00008 */ jr $ra /* 00CE4 80A5BFD4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s index dba632be04..b4e50401b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s @@ -4,5 +4,3 @@ glabel func_80A5BFD8 /* 00CF0 80A5BFE0 AC8E0380 */ sw $t6, 0x0380($a0) ## 00000380 /* 00CF4 80A5BFE4 03E00008 */ jr $ra /* 00CF8 80A5BFE8 A4800384 */ sh $zero, 0x0384($a0) ## 00000384 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s index 3f46add029..6833c67d6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s @@ -2,5 +2,3 @@ glabel func_80A5BFEC /* 00CFC 80A5BFEC AFA50004 */ sw $a1, 0x0004($sp) /* 00D00 80A5BFF0 03E00008 */ jr $ra /* 00D04 80A5BFF4 AC800388 */ sw $zero, 0x0388($a0) ## 00000388 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s index 19057f41c8..49f3fbcc67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s @@ -49,5 +49,3 @@ glabel func_80A5BFF8 /* 00DB8 80A5C0A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DBC 80A5C0AC 03E00008 */ jr $ra /* 00DC0 80A5C0B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s index 794f2d7db9..a8283611dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s @@ -4,5 +4,3 @@ glabel func_80A5C0B4 /* 00DCC 80A5C0BC AC8003A0 */ sw $zero, 0x03A0($a0) ## 000003A0 /* 00DD0 80A5C0C0 03E00008 */ jr $ra /* 00DD4 80A5C0C4 AC8003A4 */ sw $zero, 0x03A4($a0) ## 000003A4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s index 51c9ffb92e..3c873fa18b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s @@ -1,5 +1,3 @@ glabel func_80A5C0C8 /* 00DD8 80A5C0C8 03E00008 */ jr $ra /* 00DDC 80A5C0CC A4800000 */ sh $zero, 0x0000($a0) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s index 5743051044..9540d59106 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s @@ -29,5 +29,3 @@ glabel func_80A5C888 /* 01600 80A5C8F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01604 80A5C8F4 03E00008 */ jr $ra /* 01608 80A5C8F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s index 6542787ce6..0df7f21de6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s @@ -33,5 +33,3 @@ glabel func_80A5C8FC .L80A5C974: /* 01684 80A5C974 03E00008 */ jr $ra /* 01688 80A5C978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s index 46c0c0f5f0..f12b942da7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s @@ -101,5 +101,3 @@ glabel func_80A5C97C /* 017F0 80A5CAE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 017F4 80A5CAE4 03E00008 */ jr $ra /* 017F8 80A5CAE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s index ada5a1b15c..f3b570df7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80A66880 + .word 0x3D75C28F +glabel D_80A66884 + .word 0x3C97B426 +glabel D_80A66888 + .float 0.01 + +glabel D_80A6688C + .word 0x38021CC8 +glabel D_80A66890 + .word 0x400CCCCD, 0x00000000 + +.text glabel func_80A5CAEC /* 017FC 80A5CAEC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01800 80A5CAF0 AFBF001C */ sw $ra, 0x001C($sp) @@ -290,5 +304,3 @@ glabel func_80A5CAEC /* 01C2C 80A5CF1C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01C30 80A5CF20 03E00008 */ jr $ra /* 01C34 80A5CF24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s index 161168fdda..db98c0d109 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s @@ -14,5 +14,3 @@ glabel func_80A5CF28 /* 01C68 80A5CF58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C6C 80A5CF5C 03E00008 */ jr $ra /* 01C70 80A5CF60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s index 5cc0b2e239..1b07d7d70e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s @@ -85,5 +85,3 @@ glabel func_80A5CF64 /* 01DA4 80A5D094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01DA8 80A5D098 03E00008 */ jr $ra /* 01DAC 80A5D09C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s index 4a7042d99b..8d184190f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66898 + .word 0x3FE6A090, 0x2DE00D1B + +.text glabel func_80A5D0A0 /* 01DB0 80A5D0A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01DB4 80A5D0A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -70,5 +75,3 @@ glabel func_80A5D0A0 /* 01EA4 80A5D194 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01EA8 80A5D198 03E00008 */ jr $ra /* 01EAC 80A5D19C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s index 21152c5076..3a1cbf72d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s @@ -8,5 +8,3 @@ glabel func_80A5D1A0 /* 01EC8 80A5D1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01ECC 80A5D1BC 03E00008 */ jr $ra /* 01ED0 80A5D1C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s index d7832e4520..71be443a01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s @@ -66,5 +66,3 @@ glabel func_80A5D1C4 /* 01FC4 80A5D2B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01FC8 80A5D2B8 03E00008 */ jr $ra /* 01FCC 80A5D2BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s index f66c0d82fd..cfbcbdba2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668A0 + .word 0x3FE6A090, 0x2DE00D1B + +.text glabel func_80A5D2C0 /* 01FD0 80A5D2C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01FD4 80A5D2C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -70,5 +75,3 @@ glabel func_80A5D2C0 /* 020C4 80A5D3B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 020C8 80A5D3B8 03E00008 */ jr $ra /* 020CC 80A5D3BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s index 8390366a91..7f30e9c76f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s @@ -43,5 +43,3 @@ glabel func_80A5D3C0 /* 0216C 80A5D45C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02170 80A5D460 03E00008 */ jr $ra /* 02174 80A5D464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s index de181d9940..7d985b63a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A668A8 + .word 0x3FE6A090, 0x2DE00D1B +glabel D_80A668B0 + .word 0x3FE6A090, 0x2DE00D1B + +.text glabel func_80A5D468 /* 02178 80A5D468 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0217C 80A5D46C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -124,5 +131,3 @@ glabel func_80A5D468 /* 0232C 80A5D61C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02330 80A5D620 03E00008 */ jr $ra /* 02334 80A5D624 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s index 793f0f712d..f666e2ced1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s @@ -21,5 +21,3 @@ glabel func_80A5D628 /* 0237C 80A5D66C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02380 80A5D670 03E00008 */ jr $ra /* 02384 80A5D674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s index df445ceed4..ee40e3c126 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s @@ -8,5 +8,3 @@ glabel func_80A5D678 /* 023A0 80A5D690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023A4 80A5D694 03E00008 */ jr $ra /* 023A8 80A5D698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s index b292d9d437..0d2a931b38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s @@ -44,5 +44,3 @@ glabel func_80A5D69C /* 0244C 80A5D73C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02450 80A5D740 03E00008 */ jr $ra /* 02454 80A5D744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s index 4cb220458b..dcae92920e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s @@ -20,5 +20,3 @@ glabel func_80A5D748 /* 024A0 80A5D790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 024A4 80A5D794 03E00008 */ jr $ra /* 024A8 80A5D798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s index 5127ea7766..3c7ec28b91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668B8 + .word 0x3D75C28F + +.text glabel func_80A5D79C /* 024AC 80A5D79C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 024B0 80A5D7A0 AFBF002C */ sw $ra, 0x002C($sp) @@ -195,5 +200,3 @@ glabel func_80A5D79C /* 0276C 80A5DA5C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02770 80A5DA60 03E00008 */ jr $ra /* 02774 80A5DA64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s index 5d5943305b..623edc0872 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s @@ -42,5 +42,3 @@ glabel func_80A5DA68 /* 02810 80A5DB00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02814 80A5DB04 03E00008 */ jr $ra /* 02818 80A5DB08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s index 5a4dfa60d0..bf2953b166 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s @@ -18,5 +18,3 @@ glabel func_80A5DB0C /* 0285C 80A5DB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02860 80A5DB50 03E00008 */ jr $ra /* 02864 80A5DB54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s index ee04d1dadb..6ff49f030e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668BC + .word 0x3D75C28F + +.text glabel func_80A5DB58 /* 02868 80A5DB58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0286C 80A5DB5C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -81,5 +86,3 @@ glabel func_80A5DB58 /* 02990 80A5DC80 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02994 80A5DC84 03E00008 */ jr $ra /* 02998 80A5DC88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s index 7b494f24cc..46fe6374e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s @@ -8,5 +8,3 @@ glabel func_80A5DC8C /* 029B4 80A5DCA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029B8 80A5DCA8 03E00008 */ jr $ra /* 029BC 80A5DCAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s index b5aba5add3..dbb5fa5e1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s @@ -43,5 +43,3 @@ glabel func_80A5DCB0 /* 02A5C 80A5DD4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02A60 80A5DD50 03E00008 */ jr $ra /* 02A64 80A5DD54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s index 20ee508ee7..5c1f279225 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s @@ -21,5 +21,3 @@ glabel func_80A5DD58 /* 02AB4 80A5DDA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02AB8 80A5DDA8 03E00008 */ jr $ra /* 02ABC 80A5DDAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s index 92b14bb3ef..d341199f6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668C0 + .float 0.01 + +.text glabel func_80A5DDB0 /* 02AC0 80A5DDB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02AC4 80A5DDB4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -33,5 +38,3 @@ glabel func_80A5DDB0 /* 02B3C 80A5DE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02B40 80A5DE30 03E00008 */ jr $ra /* 02B44 80A5DE34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s index 17b918f2ca..a7905df23a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A668C4 + .word 0x3D75C28F +glabel D_80A668C8 + .float 0.3 + +.text glabel func_80A5DE38 /* 02B48 80A5DE38 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02B4C 80A5DE3C AFB00028 */ sw $s0, 0x0028($sp) @@ -125,5 +132,3 @@ glabel func_80A5DE38 /* 02D10 80A5E000 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02D14 80A5E004 03E00008 */ jr $ra /* 02D18 80A5E008 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s index f3d13f0335..b5579c22f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s @@ -75,5 +75,3 @@ glabel func_80A5E00C /* 02E30 80A5E120 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02E34 80A5E124 03E00008 */ jr $ra /* 02E38 80A5E128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s index a7339c4a43..cc76286d90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s @@ -105,5 +105,3 @@ glabel func_80A5E12C /* 02FAC 80A5E29C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02FB0 80A5E2A0 03E00008 */ jr $ra /* 02FB4 80A5E2A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s index 3a9d8926a1..7db4ab986f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s @@ -63,5 +63,3 @@ glabel func_80A5E2A8 /* 030A0 80A5E390 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 030A4 80A5E394 03E00008 */ jr $ra /* 030A8 80A5E398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s index bc4b63243f..334157d2a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668CC + .float 0.6 + +.text glabel func_80A5E39C /* 030AC 80A5E39C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 030B0 80A5E3A0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -135,5 +140,3 @@ glabel func_80A5E39C /* 0328C 80A5E57C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03290 80A5E580 03E00008 */ jr $ra /* 03294 80A5E584 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s index 3bdc574d2d..3fa48a322a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s @@ -8,5 +8,3 @@ glabel func_80A5E588 /* 032B0 80A5E5A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032B4 80A5E5A4 03E00008 */ jr $ra /* 032B8 80A5E5A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s index 81056c7529..03ae755769 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s @@ -42,5 +42,3 @@ glabel func_80A5E5AC /* 03354 80A5E644 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03358 80A5E648 03E00008 */ jr $ra /* 0335C 80A5E64C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s index 7033eecb36..3faddb1068 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s @@ -253,5 +253,3 @@ glabel func_80A5E650 /* 036FC 80A5E9EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03700 80A5E9F0 03E00008 */ jr $ra /* 03704 80A5E9F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s index 326704058a..05d80d0f03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s @@ -8,5 +8,3 @@ glabel func_80A5E9F8 /* 03720 80A5EA10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03724 80A5EA14 03E00008 */ jr $ra /* 03728 80A5EA18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s index 51943f6a7a..0c4d8815c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668D0 + .float 0.01 + +.text glabel func_80A5EA1C /* 0372C 80A5EA1C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03730 80A5EA20 AFBF002C */ sw $ra, 0x002C($sp) @@ -78,5 +83,3 @@ glabel func_80A5EA1C /* 03850 80A5EB40 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03854 80A5EB44 03E00008 */ jr $ra /* 03858 80A5EB48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s index 8718357923..d13900f7c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s @@ -1,5 +1,3 @@ glabel func_80A5EB4C /* 0385C 80A5EB4C 03E00008 */ jr $ra /* 03860 80A5EB50 AFA40000 */ sw $a0, 0x0000($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s index 1c84ed0240..4653b673b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668D4 + .float 0.01 + +.text glabel func_80A5EB54 /* 03864 80A5EB54 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 03868 80A5EB58 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -121,5 +126,3 @@ glabel func_80A5EB54 /* 03A1C 80A5ED0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03A20 80A5ED10 03E00008 */ jr $ra /* 03A24 80A5ED14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s index db0a3eff9e..7dc54ff66f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s @@ -8,5 +8,3 @@ glabel func_80A5ED18 /* 03A40 80A5ED30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A44 80A5ED34 03E00008 */ jr $ra /* 03A48 80A5ED38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s index c5bd5ffb2f..a6d3523336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668D8 + .float 0.01 + +.text glabel func_80A5ED3C /* 03A4C 80A5ED3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03A50 80A5ED40 AFBF002C */ sw $ra, 0x002C($sp) @@ -81,5 +86,3 @@ glabel func_80A5ED3C /* 03B7C 80A5EE6C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03B80 80A5EE70 03E00008 */ jr $ra /* 03B84 80A5EE74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s index 124dfcb352..d84e84b3ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s @@ -1,5 +1,3 @@ glabel func_80A5EE78 /* 03B88 80A5EE78 03E00008 */ jr $ra /* 03B8C 80A5EE7C AFA40000 */ sw $a0, 0x0000($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s index f668a5e0f5..b0561b78a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668DC + .float 0.01 + +.text glabel func_80A5EE80 /* 03B90 80A5EE80 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 03B94 80A5EE84 3C014150 */ lui $at, 0x4150 ## $at = 41500000 @@ -121,5 +126,3 @@ glabel func_80A5EE80 /* 03D48 80A5F038 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03D4C 80A5F03C 03E00008 */ jr $ra /* 03D50 80A5F040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s index 06a9bc40fa..8bb971a816 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s @@ -17,5 +17,3 @@ glabel func_80A5F044 /* 03D90 80A5F080 AC8D01F0 */ sw $t5, 0x01F0($a0) ## 000001F0 /* 03D94 80A5F084 03E00008 */ jr $ra /* 03D98 80A5F088 A4800250 */ sh $zero, 0x0250($a0) ## 00000250 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s index 9228e39d41..c871b0fbcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s @@ -77,5 +77,3 @@ glabel func_80A5F08C /* 03EB4 80A5F1A4 8FB10028 */ lw $s1, 0x0028($sp) /* 03EB8 80A5F1A8 03E00008 */ jr $ra /* 03EBC 80A5F1AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s index 870b802135..feea57fe7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s @@ -128,5 +128,3 @@ glabel func_80A5F1B0 /* 04084 80A5F374 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04088 80A5F378 03E00008 */ jr $ra /* 0408C 80A5F37C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s index ddfa494e09..5ffc83514a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s @@ -9,5 +9,3 @@ glabel func_80A5F380 /* 040AC 80A5F39C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 040B0 80A5F3A0 03E00008 */ jr $ra /* 040B4 80A5F3A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s index e2efa69aa6..cf7b9b56fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s @@ -12,5 +12,3 @@ glabel func_80A5F3A8 /* 040E0 80A5F3D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 040E4 80A5F3D4 03E00008 */ jr $ra /* 040E8 80A5F3D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s index 5e38c6d572..dc91f9599f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s @@ -13,5 +13,3 @@ glabel func_80A5F3DC /* 04118 80A5F408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0411C 80A5F40C 03E00008 */ jr $ra /* 04120 80A5F410 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s index d44e6a1729..b8befeb9e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s @@ -131,5 +131,3 @@ glabel func_80A5F414 /* 042FC 80A5F5EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 04300 80A5F5F0 03E00008 */ jr $ra /* 04304 80A5F5F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s index 03c7210d71..374ba8bfb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s @@ -97,5 +97,3 @@ glabel func_80A5F5F8 /* 04464 80A5F754 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04468 80A5F758 03E00008 */ jr $ra /* 0446C 80A5F75C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s index 0f6b74592e..a25ce552c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s @@ -84,5 +84,3 @@ glabel func_80A5F760 /* 04594 80A5F884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04598 80A5F888 03E00008 */ jr $ra /* 0459C 80A5F88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s index 4ed75bf0c8..ce0d02664c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80A668E0 + .word 0x46FFFE00 +glabel D_80A668E4 + .word 0x46FFFE00 +glabel D_80A668E8 + .word 0xC6FFFE00 +glabel D_80A668EC + .word 0x46FFFE00 +glabel D_80A668F0 + .float 0.3 + +.text glabel func_80A5F890 /* 045A0 80A5F890 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 045A4 80A5F894 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -284,5 +297,3 @@ glabel func_80A5F890 /* 049B0 80A5FCA0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 049B4 80A5FCA4 03E00008 */ jr $ra /* 049B8 80A5FCA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s index 251b2c3e0c..fe9c3f33d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s @@ -34,5 +34,3 @@ glabel func_80A5FCAC /* 04A34 80A5FD24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04A38 80A5FD28 03E00008 */ jr $ra /* 04A3C 80A5FD2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s index d414ed0c30..55dec45008 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s @@ -44,5 +44,3 @@ glabel func_80A5FD30 .L80A5FDCC: /* 04ADC 80A5FDCC 03E00008 */ jr $ra /* 04AE0 80A5FDD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s index c8945c6158..199b3aa283 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668F4 + .float 0.2 + +.text glabel func_80A5FDD4 /* 04AE4 80A5FDD4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 04AE8 80A5FDD8 AFBF002C */ sw $ra, 0x002C($sp) @@ -215,5 +220,3 @@ glabel func_80A5FDD4 /* 04DEC 80A600DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 04DF0 80A600E0 03E00008 */ jr $ra /* 04DF4 80A600E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s index be3cfa7ff6..35ac6f2142 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668F8 + .float 0.2 + +.text glabel func_80A600E8 /* 04DF8 80A600E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 04DFC 80A600EC AFBF0024 */ sw $ra, 0x0024($sp) @@ -119,5 +124,3 @@ glabel func_80A600E8 /* 04F98 80A60288 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04F9C 80A6028C 03E00008 */ jr $ra /* 04FA0 80A60290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s index 6b09abd57f..d9481a6d48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A668FC + .float 0.3 + +.text glabel func_80A60294 /* 04FA4 80A60294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 04FA8 80A60298 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +31,3 @@ glabel func_80A60294 /* 05004 80A602F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05008 80A602F8 03E00008 */ jr $ra /* 0500C 80A602FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s index 8bfb06bf34..05ec5ecf2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A66900 + .float 0.3 + +glabel D_80A66904 + .float 0.3 + +.text glabel func_80A60300 /* 05010 80A60300 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 05014 80A60304 AFBF001C */ sw $ra, 0x001C($sp) @@ -86,5 +94,3 @@ glabel func_80A60300 /* 05150 80A60440 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 05154 80A60444 03E00008 */ jr $ra /* 05158 80A60448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s index b49a194054..25f633e9e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s @@ -8,5 +8,3 @@ glabel func_80A6044C /* 05174 80A60464 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05178 80A60468 03E00008 */ jr $ra /* 0517C 80A6046C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s index 5168437cb2..f4476a60ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66908 + .float 0.01 + +.text glabel func_80A60470 /* 05180 80A60470 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 05184 80A60474 AFBF002C */ sw $ra, 0x002C($sp) @@ -79,5 +84,3 @@ glabel func_80A60470 /* 052A8 80A60598 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 052AC 80A6059C 03E00008 */ jr $ra /* 052B0 80A605A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s index 559aec27ad..c42d7b9be8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s @@ -14,5 +14,3 @@ glabel func_80A605A4 /* 052E4 80A605D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 052E8 80A605D8 03E00008 */ jr $ra /* 052EC 80A605DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s index 09214e6785..6c37a2fd5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A6690C + .float 0.01 + +glabel D_80A66910 + .float 0.01 + +.text glabel func_80A605E0 /* 052F0 80A605E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 052F4 80A605E4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -158,5 +166,3 @@ glabel func_80A605E0 /* 0553C 80A6082C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 05540 80A60830 03E00008 */ jr $ra /* 05544 80A60834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s index e87ee121c4..bac5965ba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s @@ -74,5 +74,3 @@ glabel func_80A60838 /* 05658 80A60948 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0565C 80A6094C 03E00008 */ jr $ra /* 05660 80A60950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s index 63be830b27..42f036d1c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s @@ -115,5 +115,3 @@ glabel func_80A60954 /* 05800 80A60AF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 05804 80A60AF4 03E00008 */ jr $ra /* 05808 80A60AF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s index 8b20141fd7..2b3788a6b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66914 + .float 0.3 + +.text glabel func_80A60AFC /* 0580C 80A60AFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 05810 80A60B00 AFBF0014 */ sw $ra, 0x0014($sp) @@ -55,5 +60,3 @@ glabel func_80A60AFC /* 058E0 80A60BD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 058E4 80A60BD4 03E00008 */ jr $ra /* 058E8 80A60BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s index fe3e8c962c..5a4109f9b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A66918 + .float 0.3 + +glabel D_80A6691C + .float 0.3 + +.text glabel func_80A60BDC /* 058EC 80A60BDC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 058F0 80A60BE0 AFBF001C */ sw $ra, 0x001C($sp) @@ -86,5 +94,3 @@ glabel func_80A60BDC /* 05A2C 80A60D1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 05A30 80A60D20 03E00008 */ jr $ra /* 05A34 80A60D24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s index f4462bcc9b..4e2298f5b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s @@ -101,5 +101,3 @@ glabel func_80A60D28 /* 05BB4 80A60EA4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 05BB8 80A60EA8 03E00008 */ jr $ra /* 05BBC 80A60EAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s index f150b43c0a..805e0139f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s @@ -115,5 +115,3 @@ glabel func_80A60EB0 /* 05D5C 80A6104C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 05D60 80A61050 03E00008 */ jr $ra /* 05D64 80A61054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s index ae03c11914..8ba508f0d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s @@ -7,5 +7,3 @@ glabel func_80A61058 /* 05D7C 80A6106C AC800380 */ sw $zero, 0x0380($a0) ## 00000380 /* 05D80 80A61070 03E00008 */ jr $ra /* 05D84 80A61074 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s index a88d7e184d..61a8f37bf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s @@ -23,5 +23,3 @@ glabel func_80A61078 /* 05DCC 80A610BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 05DD0 80A610C0 03E00008 */ jr $ra /* 05DD4 80A610C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s index c2f0677858..2acf63fd3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s @@ -89,5 +89,3 @@ glabel func_80A610C8 /* 05F20 80A61210 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05F24 80A61214 03E00008 */ jr $ra /* 05F28 80A61218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s index 908096b2f2..320b5e1011 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A66920 + .float 0.4 + +glabel D_80A66924 + .float 0.4 + +.text glabel func_80A6121C /* 05F2C 80A6121C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 05F30 80A61220 AFB10020 */ sw $s1, 0x0020($sp) @@ -128,5 +136,3 @@ glabel func_80A6121C /* 06110 80A61400 8FB10020 */ lw $s1, 0x0020($sp) /* 06114 80A61404 03E00008 */ jr $ra /* 06118 80A61408 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s index fec63b72f1..457532ab56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s @@ -12,5 +12,3 @@ glabel func_80A6140C /* 06144 80A61434 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06148 80A61438 03E00008 */ jr $ra /* 0614C 80A6143C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s index 64a973f60c..533c3c1626 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66928 + .float 0.2 + +.text glabel func_80A61440 /* 06150 80A61440 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 06154 80A61444 AFBF002C */ sw $ra, 0x002C($sp) @@ -224,5 +229,3 @@ glabel func_80A61440 /* 0647C 80A6176C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 06480 80A61770 03E00008 */ jr $ra /* 06484 80A61774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s index 2cedf5e08f..3b2e507a81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6692C + .float 0.2 + +.text glabel func_80A61778 /* 06488 80A61778 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0648C 80A6177C AFBF0014 */ sw $ra, 0x0014($sp) @@ -180,5 +185,3 @@ glabel func_80A61778 /* 06708 80A619F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0670C 80A619FC 03E00008 */ jr $ra /* 06710 80A61A00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s index 4d72efd731..5df28edbd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s @@ -8,5 +8,3 @@ glabel func_80A61A04 /* 0672C 80A61A1C AC9801F0 */ sw $t8, 0x01F0($a0) ## 000001F0 /* 06730 80A61A20 03E00008 */ jr $ra /* 06734 80A61A24 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s index d353c633e3..5b3691c839 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s @@ -1,3 +1,21 @@ +.late_rodata +glabel D_80A66930 + .float 0.4 + +glabel D_80A66934 + .word 0x3EF0A3D7 +glabel D_80A66938 + .float 0.4 + +glabel D_80A6693C + .word 0x3EF0A3D7 +glabel D_80A66940 + .float 0.3 + +glabel D_80A66944 + .float 0.1 + +.text glabel func_80A61A28 /* 06738 80A61A28 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0673C 80A61A2C AFBF002C */ sw $ra, 0x002C($sp) @@ -586,5 +604,3 @@ glabel func_80A61A28 /* 06F7C 80A6226C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 06F80 80A62270 03E00008 */ jr $ra /* 06F84 80A62274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s index 2519a69bfe..e12e99e93e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A66948 + .float 0.01 + +glabel D_80A6694C + .word 0x4242CCCD + +.text glabel func_80A62278 /* 06F88 80A62278 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 06F8C 80A6227C AFB00028 */ sw $s0, 0x0028($sp) @@ -145,5 +153,3 @@ glabel func_80A62278 /* 071B0 80A624A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 071B4 80A624A4 03E00008 */ jr $ra /* 071B8 80A624A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s index a151b2a27d..0abae48f74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s @@ -44,5 +44,3 @@ glabel func_80A624AC /* 07260 80A62550 A02BFA74 */ sb $t3, -0x058C($at) ## 8015FA74 /* 07264 80A62554 03E00008 */ jr $ra /* 07268 80A62558 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s index 27bad5018d..9513dafcc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A66950 + .word 0xBECCCCCD + +.text glabel func_80A6255C /* 0726C 80A6255C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 07270 80A62560 AFBF0014 */ sw $ra, 0x0014($sp) @@ -88,5 +93,3 @@ glabel func_80A6255C /* 073BC 80A626AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 073C0 80A626B0 03E00008 */ jr $ra /* 073C4 80A626B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s index d92a5a069d..9fde3744f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s @@ -61,5 +61,3 @@ glabel func_80A626B8 /* 074A8 80A62798 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 074AC 80A6279C 03E00008 */ jr $ra /* 074B0 80A627A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s index 54dc77df0a..29a3a5fcc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s @@ -18,5 +18,3 @@ glabel func_80A627A4 /* 074EC 80A627DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 074F0 80A627E0 03E00008 */ jr $ra /* 074F4 80A627E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s index 7f5292367d..72fd4dbbfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s @@ -33,5 +33,3 @@ glabel func_80A627E8 /* 0756C 80A6285C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07570 80A62860 03E00008 */ jr $ra /* 07574 80A62864 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s index 066bd809d1..8c35603234 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A66954 + .word 0x38000100 +glabel D_80A66958 + .word 0x3F51B3F3 + +.text glabel func_80A62868 /* 07578 80A62868 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0757C 80A6286C AFBF0024 */ sw $ra, 0x0024($sp) @@ -83,5 +90,3 @@ glabel func_80A62868 /* 076A8 80A62998 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 076AC 80A6299C 03E00008 */ jr $ra /* 076B0 80A629A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s index 62221c9b8d..1a969c32a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s @@ -82,5 +82,3 @@ glabel func_80A629A4 /* 077D0 80A62AC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 077D4 80A62AC4 03E00008 */ jr $ra /* 077D8 80A62AC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s index b12350d675..0a05e08676 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A6695C + .word 0x4622F983 +glabel D_80A66960 + .word 0x38000100 +glabel D_80A66964 + .word 0x3F51B3F3 +glabel D_80A66968 + .word 0x45FFF800 + +.text glabel func_80A62ACC /* 077DC 80A62ACC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 077E0 80A62AD0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -375,5 +386,3 @@ glabel func_80A62ACC /* 07D50 80A63040 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 07D54 80A63044 03E00008 */ jr $ra /* 07D58 80A63048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s index ceb439ed29..34ca8650f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s @@ -68,5 +68,3 @@ glabel func_80A6304C /* 07E4C 80A6313C 8FB10018 */ lw $s1, 0x0018($sp) /* 07E50 80A63140 03E00008 */ jr $ra /* 07E54 80A63144 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s index 188fd13d70..7ef73146af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6696C + .word 0x4622F983 + +.text glabel func_80A63148 /* 07E58 80A63148 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 07E5C 80A6314C AFBF0014 */ sw $ra, 0x0014($sp) @@ -36,5 +41,3 @@ glabel func_80A63148 /* 07ED8 80A631C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07EDC 80A631CC 03E00008 */ jr $ra /* 07EE0 80A631D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s index e381f0855c..7e35649aad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s @@ -14,5 +14,3 @@ glabel func_80A631D4 /* 07F14 80A63204 468042A0 */ cvt.s.w $f10, $f8 /* 07F18 80A63208 03E00008 */ jr $ra /* 07F1C 80A6320C E48A0268 */ swc1 $f10, 0x0268($a0) ## 00000268 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s index dcb60229fa..ea5c831a18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A66970 + .word 0x38000100 +glabel D_80A66974 + .word 0x4622F983 +glabel D_80A66978 + .word 0x3F350481 + +.text glabel func_80A63210 /* 07F20 80A63210 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 07F24 80A63214 AFBF0034 */ sw $ra, 0x0034($sp) @@ -86,5 +95,3 @@ glabel func_80A63210 /* 08068 80A63358 8FB00030 */ lw $s0, 0x0030($sp) /* 0806C 80A6335C 03E00008 */ jr $ra /* 08070 80A63360 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s index 497008d749..df70bda023 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s @@ -86,5 +86,3 @@ glabel func_80A63364 /* 081A4 80A63494 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 081A8 80A63498 03E00008 */ jr $ra /* 081AC 80A6349C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s index a904455757..8bf66fa69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s @@ -1,3 +1,28 @@ +.late_rodata +glabel D_80A6697C + .word 0xBE99999A +glabel D_80A66980 + .word 0x414CCCCD +glabel D_80A66984 + .word 0x4622F983 +glabel D_80A66988 + .word 0x38000100 +glabel D_80A6698C + .word 0x38000100 +glabel D_80A66990 + .word 0x38000100 +glabel D_80A66994 + .word 0x3F51B3F3 +glabel D_80A66998 + .word 0x38000100 +glabel D_80A6699C + .word 0x3F51B3F3 +glabel D_80A669A0 + .word 0x415CCCCD +glabel D_80A669A4 + .word 0x415CCCCD + +.text glabel func_80A634A0 /* 081B0 80A634A0 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 081B4 80A634A4 AFBF0034 */ sw $ra, 0x0034($sp) @@ -752,5 +777,3 @@ glabel func_80A634A0 /* 08CAC 80A63F9C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 08CB0 80A63FA0 03E00008 */ jr $ra /* 08CB4 80A63FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s index 312945a2c1..223ca54b30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A669A8 + .float 0.1 + +.text glabel func_80A63FA8 /* 08CB8 80A63FA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 08CBC 80A63FAC AFBF0024 */ sw $ra, 0x0024($sp) @@ -114,5 +119,3 @@ glabel func_80A63FA8 /* 08E54 80A64144 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 08E58 80A64148 03E00008 */ jr $ra /* 08E5C 80A6414C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s index c0d6bd5ffd..237b597a02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s @@ -153,5 +153,3 @@ glabel func_80A64150 /* 09080 80A64370 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 09084 80A64374 03E00008 */ jr $ra /* 09088 80A64378 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s index a39ff0b7fe..77f02bd467 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A669AC + .word 0x3F5DB3D7 +glabel D_80A669B0 + .word 0xBF5DB3D7 + +.text glabel func_80A6437C /* 0908C 80A6437C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 09090 80A64380 AFBF001C */ sw $ra, 0x001C($sp) @@ -71,5 +78,3 @@ glabel func_80A6437C /* 09184 80A64474 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 09188 80A64478 03E00008 */ jr $ra /* 0918C 80A6447C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s index b4528cfff6..ea92df1743 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A669B4 + .word 0x43F00001 +glabel D_80A669B8 + .word 0x44E38000 + +.text glabel func_80A64480 /* 09190 80A64480 AFA50004 */ sw $a1, 0x0004($sp) /* 09194 80A64484 8C8E0208 */ lw $t6, 0x0208($a0) ## 00000208 @@ -64,5 +71,3 @@ glabel func_80A64480 /* 0927C 80A6456C 848B0034 */ lh $t3, 0x0034($a0) ## 00000034 /* 09280 80A64570 03E00008 */ jr $ra /* 09284 80A64574 A48B00B8 */ sh $t3, 0x00B8($a0) ## 000000B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s index 3e66743b26..f9c7ec6406 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s @@ -69,5 +69,3 @@ glabel func_80A64578 /* 09380 80A64670 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 09384 80A64674 03E00008 */ jr $ra /* 09388 80A64678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s index 626bbfa54f..335f7888f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s @@ -12,5 +12,3 @@ glabel func_80A6467C /* 093B0 80A646A0 44024000 */ mfc1 $v0, $f8 /* 093B4 80A646A4 03E00008 */ jr $ra /* 093B8 80A646A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s index ef40c887b1..4bae0cee78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s @@ -19,5 +19,3 @@ glabel func_80A64ED4 .L80A64F0C: /* 09C1C 80A64F0C 03E00008 */ jr $ra /* 09C20 80A64F10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s index 20c82d9022..d93fc923e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A669C0 + .word 0x3E31D0D4 + +.text glabel func_80A64F14 /* 09C24 80A64F14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 09C28 80A64F18 AFBF001C */ sw $ra, 0x001C($sp) @@ -69,5 +74,3 @@ glabel func_80A64F14 /* 09D18 80A65008 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 09D1C 80A6500C 03E00008 */ jr $ra /* 09D20 80A65010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s index 3df76c758a..7bc525180c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s @@ -24,5 +24,3 @@ glabel func_80A65014 /* 09D70 80A65060 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09D74 80A65064 03E00008 */ jr $ra /* 09D78 80A65068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s index 4690235949..675c2f2e59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s @@ -41,5 +41,3 @@ glabel func_80A6506C /* 09E0C 80A650FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 09E10 80A65100 03E00008 */ jr $ra /* 09E14 80A65104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s index 62434e49eb..89808dd787 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s @@ -1,3 +1,25 @@ +.late_rodata +glabel D_80A669C4 + .float 0.6 + +glabel D_80A669C8 + .float 0.7 + +glabel D_80A669CC + .float 0.7 + +glabel D_80A669D0 + .float 0.7 + +glabel D_80A669D4 + .float 0.7 + +glabel D_80A669D8 + .word 0x3D70F0F1 +glabel D_80A669DC + .float 0.04 + +.text glabel func_80A65108 /* 09E18 80A65108 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 09E1C 80A6510C 3C0F80A6 */ lui $t7, %hi(D_80A667A0) ## $t7 = 80A60000 @@ -746,5 +768,3 @@ glabel func_80A65108 /* 0A904 80A65BF4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 0A908 80A65BF8 03E00008 */ jr $ra /* 0A90C 80A65BFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s index 5027d1a11c..83a4c6944a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A6682C + .asciz "../z_en_horse.c" + .balign 4 + +glabel D_80A6683C + .asciz "../z_en_horse.c" + .balign 4 + +.text glabel func_80A65C00 /* 0A910 80A65C00 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0A914 80A65C04 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -84,5 +94,3 @@ glabel func_80A65C00 /* 0AA48 80A65D38 8FB00020 */ lw $s0, 0x0020($sp) /* 0AA4C 80A65D3C 03E00008 */ jr $ra /* 0AA50 80A65D40 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Destroy.s index 1cdc99fba2..3b8d2276d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Destroy.s @@ -15,5 +15,3 @@ glabel EnHorseGameCheck_Destroy /* 00E70 80A683C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E74 80A683C4 03E00008 */ jr $ra /* 00E78 80A683C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Draw.s index 44cb5f3299..4e7b21f2bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Draw.s @@ -5,4 +5,3 @@ glabel EnHorseGameCheck_Draw /* 00EC4 80A68414 00000000 */ nop /* 00EC8 80A68418 00000000 */ nop /* 00ECC 80A6841C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s index fa63f33113..ab5991b5b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s @@ -35,5 +35,3 @@ glabel EnHorseGameCheck_Init /* 00E34 80A68384 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E38 80A68388 03E00008 */ jr $ra /* 00E3C 80A6838C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Update.s index a7617f665f..a9ee6f846b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Update.s @@ -15,5 +15,3 @@ glabel EnHorseGameCheck_Update /* 00EAC 80A683FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EB0 80A68400 03E00008 */ jr $ra /* 00EB4 80A68404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67550.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67550.s index bea8f47235..01c144758e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67550.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A68530 + .asciz "../z_en_horse_game_check.c" + .balign 4 + +.late_rodata +glabel D_80A68570 + .float -1650.0 + +.text glabel func_80A67550 /* 00000 80A67550 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80A67554 AFB00030 */ sw $s0, 0x0030($sp) @@ -48,5 +58,3 @@ glabel func_80A67550 /* 000AC 80A675FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000B0 80A67600 03E00008 */ jr $ra /* 000B4 80A67604 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67608.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67608.s index d56e0d2502..b82858ee80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67608.s @@ -3,5 +3,3 @@ glabel func_80A67608 /* 000BC 80A6760C AFA50004 */ sw $a1, 0x0004($sp) /* 000C0 80A67610 03E00008 */ jr $ra /* 000C4 80A67614 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s index 241d07a409..362a85b353 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s @@ -85,5 +85,3 @@ glabel func_80A67618 /* 00208 80A67758 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0020C 80A6775C 03E00008 */ jr $ra /* 00210 80A67760 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s index d77b893440..a970828ba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s @@ -319,5 +319,3 @@ glabel func_80A67764 /* 00680 80A67BD0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00684 80A67BD4 03E00008 */ jr $ra /* 00688 80A67BD8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BDC.s index 2fe00d0da8..6d28fc9ffd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BDC.s @@ -6,5 +6,3 @@ glabel func_80A67BDC /* 0069C 80A67BEC AC800154 */ sw $zero, 0x0154($a0) ## 00000154 /* 006A0 80A67BF0 03E00008 */ jr $ra /* 006A4 80A67BF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BF8.s index 56cd442b04..29a269e99e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67BF8.s @@ -3,5 +3,3 @@ glabel func_80A67BF8 /* 006AC 80A67BFC AFA50004 */ sw $a1, 0x0004($sp) /* 006B0 80A67C00 03E00008 */ jr $ra /* 006B4 80A67C04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C08.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C08.s index 6f09336dad..262954e935 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C08.s @@ -20,5 +20,3 @@ glabel func_80A67C08 /* 006F4 80A67C44 AC8F0154 */ sw $t7, 0x0154($a0) ## 00000154 /* 006F8 80A67C48 03E00008 */ jr $ra /* 006FC 80A67C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C50.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C50.s index 7f3c00301f..f590cd769f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C50.s @@ -5,5 +5,3 @@ glabel func_80A67C50 /* 0070C 80A67C5C AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 00710 80A67C60 03E00008 */ jr $ra /* 00714 80A67C64 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C68.s index 40551070a2..0f048bbf23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C68.s @@ -3,5 +3,3 @@ glabel func_80A67C68 /* 0071C 80A67C6C AFA50004 */ sw $a1, 0x0004($sp) /* 00720 80A67C70 03E00008 */ jr $ra /* 00724 80A67C74 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C78.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C78.s index 2e4f870967..58d811142f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C78.s @@ -3,5 +3,3 @@ glabel func_80A67C78 /* 0072C 80A67C7C AFA50004 */ sw $a1, 0x0004($sp) /* 00730 80A67C80 03E00008 */ jr $ra /* 00734 80A67C84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C88.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C88.s index 9e21d2bfe4..3071003782 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67C88.s @@ -19,5 +19,3 @@ glabel func_80A67C88 /* 00778 80A67CC8 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 /* 0077C 80A67CCC 03E00008 */ jr $ra /* 00780 80A67CD0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CD4.s index 3903e47056..81bd908a65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CD4.s @@ -3,5 +3,3 @@ glabel func_80A67CD4 /* 00788 80A67CD8 AFA50004 */ sw $a1, 0x0004($sp) /* 0078C 80A67CDC 03E00008 */ jr $ra /* 00790 80A67CE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s index a6f6bd8e62..fe68389218 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A6854C + .asciz "En_HGC_Spot20_Ta_end():対応せず\n" + .balign 4 + +.text glabel func_80A67CE4 /* 00794 80A67CE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00798 80A67CE8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -74,5 +80,3 @@ glabel func_80A67CE4 /* 008A0 80A67DF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008A4 80A67DF4 03E00008 */ jr $ra /* 008A8 80A67DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s index 20b46075da..1237eabb19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s @@ -356,5 +356,3 @@ glabel func_80A67DFC /* 00DB4 80A68304 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00DB8 80A68308 03E00008 */ jr $ra /* 00DBC 80A6830C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s index 53152b2210..006620b892 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s @@ -20,5 +20,3 @@ glabel EnHorseGanon_Destroy /* 00458 80A68AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0045C 80A68ABC 03E00008 */ jr $ra /* 00460 80A68AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Draw.s index 3934327740..2b7b405eea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Draw.s @@ -22,4 +22,3 @@ glabel EnHorseGanon_Draw /* 00B24 80A69184 00000000 */ nop /* 00B28 80A69188 00000000 */ nop /* 00B2C 80A6918C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s index eb769b741b..3709d3301e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s @@ -86,5 +86,3 @@ glabel EnHorseGanon_Init /* 00408 80A68A68 8FB10020 */ lw $s1, 0x0020($sp) /* 0040C 80A68A6C 03E00008 */ jr $ra /* 00410 80A68A70 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s index 508cd59ac7..6363bf02e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s @@ -53,5 +53,3 @@ glabel EnHorseGanon_Update /* 0093C 80A68F9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00940 80A68FA0 03E00008 */ jr $ra /* 00944 80A68FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68660.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68660.s index 8c392a1820..7e5c1d315b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68660.s @@ -17,5 +17,3 @@ glabel func_80A68660 /* 0003C 80A6869C 468084A0 */ cvt.s.w $f18, $f16 /* 00040 80A686A0 03E00008 */ jr $ra /* 00044 80A686A4 E4D20008 */ swc1 $f18, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A686A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A686A8.s index 4abb9b2053..ebee958cea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A686A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A686A8.s @@ -124,5 +124,3 @@ glabel func_80A686A8 /* 00204 80A68864 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00208 80A68868 03E00008 */ jr $ra /* 0020C 80A6886C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s index ebf15606e3..de5b47f2c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s @@ -50,5 +50,3 @@ glabel func_80A68870 /* 002C0 80A68920 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002C4 80A68924 03E00008 */ jr $ra /* 002C8 80A68928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s index 38ef1814ae..d58ba6660b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s @@ -10,5 +10,3 @@ glabel func_80A68AC4 /* 00484 80A68AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00488 80A68AE8 03E00008 */ jr $ra /* 0048C 80A68AEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AF0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AF0.s index d4271654f5..573038da14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AF0.s @@ -12,5 +12,3 @@ glabel func_80A68AF0 /* 004B4 80A68B14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004B8 80A68B18 03E00008 */ jr $ra /* 004BC 80A68B1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s index 8414d9d839..2e24790fe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s @@ -180,5 +180,3 @@ glabel func_80A68B20 /* 00744 80A68DA4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00748 80A68DA8 03E00008 */ jr $ra /* 0074C 80A68DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68DB0.s index 977b0f601a..52b4b02537 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68DB0.s @@ -27,5 +27,3 @@ glabel func_80A68DB0 /* 007A8 80A68E08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007AC 80A68E0C 03E00008 */ jr $ra /* 007B0 80A68E10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s index 40ec54b49c..af98746363 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A692D0 + .float 10430.378 + +.text glabel func_80A68E14 /* 007B4 80A68E14 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 007B8 80A68E18 AFB00018 */ sw $s0, 0x0018($sp) @@ -51,5 +56,3 @@ glabel func_80A68E14 /* 00870 80A68ED0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00874 80A68ED4 03E00008 */ jr $ra /* 00878 80A68ED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s index cdb88bbd02..05efd167db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s @@ -101,5 +101,3 @@ glabel func_80A68FA8 /* 00AC8 80A69128 8FB50028 */ lw $s5, 0x0028($sp) /* 00ACC 80A6912C 03E00008 */ jr $ra /* 00AD0 80A69130 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s index 3222046866..e986904c01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s @@ -20,5 +20,3 @@ glabel EnHorseLinkChild_Destroy /* 004B0 80A69880 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004B4 80A69884 03E00008 */ jr $ra /* 004B8 80A69888 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Draw.s index a044ad5129..7420cf4980 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Draw.s @@ -21,4 +21,3 @@ glabel EnHorseLinkChild_Draw /* 01AE4 80A6AEB4 03E00008 */ jr $ra /* 01AE8 80A6AEB8 00000000 */ nop /* 01AEC 80A6AEBC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s index 16f5ce504f..ccb6b84437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s @@ -127,5 +127,3 @@ glabel EnHorseLinkChild_Init /* 00460 80A69830 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00464 80A69834 03E00008 */ jr $ra /* 00468 80A69838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s index a7e517b2a6..b516b82933 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6AFF4 + .float 0.025 + +.text glabel EnHorseLinkChild_Update /* 016D8 80A6AAA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 016DC 80A6AAAC AFB0001C */ sw $s0, 0x001C($sp) @@ -92,5 +97,3 @@ glabel EnHorseLinkChild_Update /* 0181C 80A6ABEC 8FB10020 */ lw $s1, 0x0020($sp) /* 01820 80A6ABF0 03E00008 */ jr $ra /* 01824 80A6ABF4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s index 63f180d655..0dd05b97cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s @@ -50,5 +50,3 @@ glabel func_80A693D0 /* 000B0 80A69480 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000B4 80A69484 03E00008 */ jr $ra /* 000B8 80A69488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s index ee51c1d58e..147bc485e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s @@ -78,5 +78,3 @@ glabel func_80A6948C /* 001C8 80A69598 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001CC 80A6959C 03E00008 */ jr $ra /* 001D0 80A695A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A695A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A695A4.s index bf4b0527c4..eaeec40bb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A695A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A695A4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A6AFE8 + .float 0.33333334 +glabel D_80A6AFEC + .float 0.20 + +.text glabel func_80A695A4 /* 001D4 80A695A4 8C820150 */ lw $v0, 0x0150($a0) ## 00000150 /* 001D8 80A695A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -51,5 +58,3 @@ glabel func_80A695A4 /* 0028C 80A6965C C422AF64 */ lwc1 $f2, %lo(D_80A6AF64)($at) /* 00290 80A69660 03E00008 */ jr $ra /* 00294 80A69664 46001006 */ mov.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s index ae8e84241f..0289bed9d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s @@ -26,5 +26,3 @@ glabel func_80A6988C /* 00518 80A698E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0051C 80A698EC 03E00008 */ jr $ra /* 00520 80A698F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A698F4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A698F4.s index 73e5d62de7..a3370a33e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A698F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A698F4.s @@ -19,5 +19,3 @@ glabel func_80A698F4 /* 00560 80A69930 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00564 80A69934 03E00008 */ jr $ra /* 00568 80A69938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s index 25ac4dae2c..91feb16025 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s @@ -52,5 +52,3 @@ glabel func_80A6993C /* 00620 80A699F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00624 80A699F4 03E00008 */ jr $ra /* 00628 80A699F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s index fafdc85c08..5c355756bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s @@ -105,5 +105,3 @@ glabel func_80A699FC /* 007A0 80A69B70 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 007A4 80A69B74 03E00008 */ jr $ra /* 007A8 80A69B78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s index 17bce06c7b..c59d96fde1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s @@ -40,5 +40,3 @@ glabel func_80A69B7C /* 0083C 80A69C0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00840 80A69C10 03E00008 */ jr $ra /* 00844 80A69C14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s index 8ef24fded4..e9ef5aff97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s @@ -187,5 +187,3 @@ glabel func_80A69C18 /* 00AE4 80A69EB4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00AE8 80A69EB8 03E00008 */ jr $ra /* 00AEC 80A69EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s index 8279e3549f..585fbd57d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s @@ -40,5 +40,3 @@ glabel func_80A69EC0 /* 00B80 80A69F50 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00B84 80A69F54 03E00008 */ jr $ra /* 00B88 80A69F58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69F5C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69F5C.s index 2e37cc620b..38a15e6c0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69F5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69F5C.s @@ -76,5 +76,3 @@ glabel func_80A69F5C /* 00C8C 80A6A05C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C90 80A6A060 03E00008 */ jr $ra /* 00C94 80A6A064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s index cc7c40ad76..0b0098dc97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s @@ -317,5 +317,3 @@ glabel func_80A6A068 /* 01100 80A6A4D0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01104 80A6A4D4 03E00008 */ jr $ra /* 01108 80A6A4D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s index 1a718a999a..7ff92a5d16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s @@ -53,5 +53,3 @@ glabel func_80A6A4DC /* 011C8 80A6A598 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 011CC 80A6A59C 03E00008 */ jr $ra /* 011D0 80A6A5A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s index b35170cb7e..d30930afbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6AFF0 + .float 0.70709997 # cos(pi / 4) + +.text glabel func_80A6A5A4 /* 011D4 80A6A5A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 011D8 80A6A5A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -106,5 +111,3 @@ glabel func_80A6A5A4 /* 01348 80A6A718 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0134C 80A6A71C 03E00008 */ jr $ra /* 01350 80A6A720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s index c4877a64e8..45054acdb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s @@ -44,5 +44,3 @@ glabel func_80A6A724 /* 013F4 80A6A7C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 013F8 80A6A7C8 03E00008 */ jr $ra /* 013FC 80A6A7CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s index e155b74503..11750fa920 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s @@ -201,5 +201,3 @@ glabel func_80A6A7D0 /* 016CC 80A6AA9C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 016D0 80A6AAA0 03E00008 */ jr $ra /* 016D4 80A6AAA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s index 07fcee0e01..f99dd1e511 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s @@ -101,5 +101,3 @@ glabel func_80A6ABF8 /* 019A8 80A6AD78 8FB50028 */ lw $s5, 0x0028($sp) /* 019AC 80A6AD7C 03E00008 */ jr $ra /* 019B0 80A6AD80 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s index 71feb120e7..b8c88d2a91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A6AFB0 + .asciz "../z_en_horse_link_child.c" + .balign 4 + +glabel D_80A6AFCC + .asciz "../z_en_horse_link_child.c" + .balign 4 + +.text glabel func_80A6AD84 /* 019B4 80A6AD84 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 019B8 80A6AD88 AFBF0014 */ sw $ra, 0x0014($sp) @@ -57,5 +67,3 @@ glabel func_80A6AD84 /* 01A8C 80A6AE5C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 01A90 80A6AE60 03E00008 */ jr $ra /* 01A94 80A6AE64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s index 4a398c3667..12bda73241 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s @@ -25,5 +25,3 @@ glabel EnHorseNormal_Destroy /* 006C0 80A6B910 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006C4 80A6B914 03E00008 */ jr $ra /* 006C8 80A6B918 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s index 71c0396c2c..b7e197e901 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s @@ -1,3 +1,32 @@ +.rdata +glabel D_80A6D560 + .asciz "../z_en_horse_normal.c" + .balign 4 + +glabel D_80A6D578 + .asciz "../z_en_horse_normal.c" + .balign 4 + +glabel D_80A6D590 + .asciz "../z_en_horse_normal.c" + .balign 4 + +.late_rodata +glabel D_80A6D5E8 + .word 0x43B18000 +glabel D_80A6D5EC + .word 0xC4368000 +glabel D_80A6D5F0 + .word 0xC4898000 +glabel D_80A6D5F4 + .word 0xC4924000 +glabel D_80A6D5F8 + .float 0.01 + +glabel D_80A6D5FC + .float 9.58738019108e-05 + +.text glabel EnHorseNormal_Draw /* 01C1C 80A6CE6C 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 01C20 80A6CE70 AFB10030 */ sw $s1, 0x0030($sp) @@ -321,4 +350,3 @@ glabel EnHorseNormal_Draw /* 020F4 80A6D344 8FB10030 */ lw $s1, 0x0030($sp) /* 020F8 80A6D348 03E00008 */ jr $ra /* 020FC 80A6D34C 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s index 7413d3492a..6869405a8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_80A6D5B0 + .word 0xC4368000 +glabel D_80A6D5B4 + .word 0xC4898000 +glabel D_80A6D5B8 + .word 0xC4924000 +glabel D_80A6D5BC + .word 0x4567B000 +glabel D_80A6D5C0 + .word 0x44B0A000 +glabel D_80A6D5C4 + .word 0xC4264000 + +.text glabel EnHorseNormal_Init /* 00180 80A6B3D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00184 80A6B3D4 AFA5003C */ sw $a1, 0x003C($sp) @@ -346,5 +361,3 @@ glabel EnHorseNormal_Init /* 00660 80A6B8B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00664 80A6B8B4 03E00008 */ jr $ra /* 00668 80A6B8B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s index fd49ba1770..04807aba5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s @@ -90,5 +90,3 @@ glabel EnHorseNormal_Update /* 018A0 80A6CAF0 8FB10020 */ lw $s1, 0x0020($sp) /* 018A4 80A6CAF4 03E00008 */ jr $ra /* 018A8 80A6CAF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s index 316610b556..15937e27c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s @@ -50,5 +50,3 @@ glabel func_80A6B250 /* 000B0 80A6B300 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000B4 80A6B304 03E00008 */ jr $ra /* 000B8 80A6B308 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B30C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B30C.s index a493bdfbf1..fc1630a9bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B30C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B30C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A6D5A8 + .word 0x3EAAAAAB +glabel D_80A6D5AC + .float 0.2 + +.text glabel func_80A6B30C /* 000BC 80A6B30C 8C820150 */ lw $v0, 0x0150($a0) ## 00000150 /* 000C0 80A6B310 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 @@ -51,5 +58,3 @@ glabel func_80A6B30C /* 00174 80A6B3C4 C422D4C8 */ lwc1 $f2, %lo(D_80A6D4C8)($at) /* 00178 80A6B3C8 03E00008 */ jr $ra /* 0017C 80A6B3CC 46001006 */ mov.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s index b5fc548794..eb5e44a351 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s @@ -46,5 +46,3 @@ glabel func_80A6B91C /* 00774 80A6B9C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00778 80A6B9C8 03E00008 */ jr $ra /* 0077C 80A6B9CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s index 606d59b896..f3f31e8a78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6D5C8 + .word 0x4622F983 + +.text glabel func_80A6B9D0 /* 00780 80A6B9D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00784 80A6B9D4 AFBF002C */ sw $ra, 0x002C($sp) @@ -124,5 +129,3 @@ glabel func_80A6B9D0 /* 00950 80A6BBA0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00954 80A6BBA4 03E00008 */ jr $ra /* 00958 80A6BBA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s index abc5f8ba72..4238fb3b08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s @@ -21,5 +21,3 @@ glabel func_80A6BBAC /* 009A4 80A6BBF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009A8 80A6BBF8 03E00008 */ jr $ra /* 009AC 80A6BBFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC00.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC00.s index 8479507e79..6710fe7370 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC00.s @@ -19,5 +19,3 @@ glabel func_80A6BC00 /* 009EC 80A6BC3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009F0 80A6BC40 03E00008 */ jr $ra /* 009F4 80A6BC44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s index 947b436644..8aefe54f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s @@ -42,5 +42,3 @@ glabel func_80A6BC48 /* 00A90 80A6BCE0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A94 80A6BCE4 03E00008 */ jr $ra /* 00A98 80A6BCE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s index 3f394c2ec2..8327711746 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s @@ -40,5 +40,3 @@ glabel func_80A6BCEC /* 00B20 80A6BD70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B24 80A6BD74 03E00008 */ jr $ra /* 00B28 80A6BD78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s index 3b169f97c9..cf2db0cc22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s @@ -65,5 +65,3 @@ glabel func_80A6BD7C /* 00C10 80A6BE60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C14 80A6BE64 03E00008 */ jr $ra /* 00C18 80A6BE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s index e6c04e777a..10ffa12207 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A6D5CC + .float 0.1 + +glabel D_80A6D5D0 + .float 0.1 + +.text glabel func_80A6BE6C /* 00C1C 80A6BE6C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00C20 80A6BE70 AFBF002C */ sw $ra, 0x002C($sp) @@ -456,5 +464,3 @@ glabel func_80A6BE6C /* 01270 80A6C4C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01274 80A6C4C4 03E00008 */ jr $ra /* 01278 80A6C4C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s index 7c68f06053..6c73b12814 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s @@ -42,5 +42,3 @@ glabel func_80A6C4CC /* 01314 80A6C564 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01318 80A6C568 03E00008 */ jr $ra /* 0131C 80A6C56C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s index 9e5c307b76..dc5a16229f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A6D5D4 + .float 0.4 + +glabel D_80A6D5D8 + .float 0.8 + +.text glabel func_80A6C570 /* 01320 80A6C570 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01324 80A6C574 AFB00028 */ sw $s0, 0x0028($sp) @@ -89,5 +97,3 @@ glabel func_80A6C570 /* 01454 80A6C6A4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01458 80A6C6A8 03E00008 */ jr $ra /* 0145C 80A6C6AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s index 2fc9454ff3..0790b8947a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s @@ -45,5 +45,3 @@ glabel func_80A6C6B0 /* 01504 80A6C754 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01508 80A6C758 03E00008 */ jr $ra /* 0150C 80A6C75C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s index cf027a4769..a7212207c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A6D5DC + .float 0.4 + +glabel D_80A6D5E0 + .float 0.8 + +.text glabel func_80A6C760 /* 01510 80A6C760 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01514 80A6C764 AFBF002C */ sw $ra, 0x002C($sp) @@ -105,5 +113,3 @@ glabel func_80A6C760 /* 01684 80A6C8D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01688 80A6C8D8 03E00008 */ jr $ra /* 0168C 80A6C8DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s index 89ab9c877f..97315153be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6D5E4 + .word 0x4622F983 + +.text glabel func_80A6C8E0 /* 01690 80A6C8E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01694 80A6C8E4 AFB00018 */ sw $s0, 0x0018($sp) @@ -51,5 +56,3 @@ glabel func_80A6C8E0 /* 0174C 80A6C99C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01750 80A6C9A0 03E00008 */ jr $ra /* 01754 80A6C9A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s index ebbb231464..6c941c7cac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s @@ -101,5 +101,3 @@ glabel func_80A6CAFC /* 01A2C 80A6CC7C 8FB50028 */ lw $s5, 0x0028($sp) /* 01A30 80A6CC80 03E00008 */ jr $ra /* 01A34 80A6CC84 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s index 3fa72e3eed..3fcb97b0a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s @@ -129,5 +129,3 @@ glabel func_80A6CC88 /* 01C10 80A6CE60 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01C14 80A6CE64 03E00008 */ jr $ra /* 01C18 80A6CE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s index 286498ef54..8576746b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s @@ -20,5 +20,3 @@ glabel EnHorseZelda_Destroy /* 003A0 80A6DC70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003A4 80A6DC74 03E00008 */ jr $ra /* 003A8 80A6DC78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Draw.s index 6de22ea1fb..7b48b46de2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Draw.s @@ -19,4 +19,3 @@ glabel EnHorseZelda_Draw /* 008D4 80A6E1A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008D8 80A6E1A8 03E00008 */ jr $ra /* 008DC 80A6E1AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s index c81f2baf23..ccaeedfa74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s @@ -86,5 +86,3 @@ glabel EnHorseZelda_Init /* 00350 80A6DC20 8FB10020 */ lw $s1, 0x0020($sp) /* 00354 80A6DC24 03E00008 */ jr $ra /* 00358 80A6DC28 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s index 6e09e90cb4..635e64f955 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s @@ -55,5 +55,3 @@ glabel EnHorseZelda_Update /* 006F8 80A6DFC8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 006FC 80A6DFCC 03E00008 */ jr $ra /* 00700 80A6DFD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D8D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D8D0.s index bdcdc4292a..4d39218985 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D8D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D8D0.s @@ -17,5 +17,3 @@ glabel func_80A6D8D0 /* 0003C 80A6D90C 468084A0 */ cvt.s.w $f18, $f16 /* 00040 80A6D910 03E00008 */ jr $ra /* 00044 80A6D914 E4D20008 */ swc1 $f18, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D918.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D918.s index f2fbc0c4ba..6c316fe64a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D918.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6D918.s @@ -124,5 +124,3 @@ glabel func_80A6D918 /* 00204 80A6DAD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00208 80A6DAD8 03E00008 */ jr $ra /* 0020C 80A6DADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s index 6bfb4a78a4..a9cbfae648 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s @@ -20,5 +20,3 @@ glabel func_80A6DC7C /* 003F0 80A6DCC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F4 80A6DCC4 03E00008 */ jr $ra /* 003F8 80A6DCC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DCCC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DCCC.s index 7a01143891..435282f732 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DCCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DCCC.s @@ -19,5 +19,3 @@ glabel func_80A6DCCC /* 00438 80A6DD08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0043C 80A6DD0C 03E00008 */ jr $ra /* 00440 80A6DD10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s index 857d02bd85..9b11a1b647 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s @@ -60,5 +60,3 @@ glabel func_80A6DD14 /* 00520 80A6DDF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00524 80A6DDF4 03E00008 */ jr $ra /* 00528 80A6DDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DDFC.s index b21cc5f87e..fbe7c3d9d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DDFC.s @@ -16,5 +16,3 @@ glabel func_80A6DDFC /* 0055C 80A6DE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00560 80A6DE30 03E00008 */ jr $ra /* 00564 80A6DE34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s index 1e8a304e7b..0279eab656 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A6E2C0 + .float 10430.378 + +.text glabel func_80A6DE38 /* 00568 80A6DE38 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0056C 80A6DE3C AFB00018 */ sw $s0, 0x0018($sp) @@ -51,5 +56,3 @@ glabel func_80A6DE38 /* 00624 80A6DEF4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00628 80A6DEF8 03E00008 */ jr $ra /* 0062C 80A6DEFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s index 9adff10d01..7a5ab0a39c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s @@ -101,5 +101,3 @@ glabel func_80A6DFD4 /* 00884 80A6E154 8FB50028 */ lw $s5, 0x0028($sp) /* 00888 80A6E158 03E00008 */ jr $ra /* 0088C 80A6E15C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s index 838b215edf..34bbcec851 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s @@ -10,5 +10,3 @@ glabel EnHs_Destroy /* 00190 80A6E530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00194 80A6E534 03E00008 */ jr $ra /* 00198 80A6E538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s index 766412bd50..fee487bd87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s @@ -22,4 +22,3 @@ glabel EnHs_Draw /* 00A04 80A6EDA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A08 80A6EDA8 03E00008 */ jr $ra /* 00A0C 80A6EDAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index 120066bbed..cf7c591e5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A6EE10 + .asciz " ヒヨコの店(大人の時) \n" + .balign 4 + +glabel D_80A6EE30 + .asciz " ヒヨコ屋閉店 \n" + .balign 4 + +glabel D_80A6EE48 + .asciz " ヒヨコの店(子人の時) \n" + .balign 4 + +.text glabel EnHs_Init /* 00008 80A6E3A8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0000C 80A6E3AC AFB00028 */ sw $s0, 0x0028($sp) @@ -101,5 +115,3 @@ glabel EnHs_Init /* 00168 80A6E508 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0016C 80A6E50C 03E00008 */ jr $ra /* 00170 80A6E510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s index da4586cfab..bbde39a68a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s @@ -100,5 +100,3 @@ glabel EnHs_Update /* 008AC 80A6EC4C 8FB10028 */ lw $s1, 0x0028($sp) /* 008B0 80A6EC50 03E00008 */ jr $ra /* 008B4 80A6EC54 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E3A0.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E3A0.s index f9c228ff3e..2d6b96f0ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E3A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E3A0.s @@ -1,5 +1,3 @@ glabel func_80A6E3A0 /* 00000 80A6E3A0 03E00008 */ jr $ra /* 00004 80A6E3A4 AC8502AC */ sw $a1, 0x02AC($a0) ## 000002AC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E53C.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E53C.s index 24b34b3daf..279da54cd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E53C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E53C.s @@ -48,5 +48,3 @@ glabel func_80A6E53C /* 00240 80A6E5E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00244 80A6E5E4 03E00008 */ jr $ra /* 00248 80A6E5E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E5EC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E5EC.s index c92d8cae1a..0e28f72131 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E5EC.s @@ -17,5 +17,3 @@ glabel func_80A6E5EC /* 00284 80A6E624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00288 80A6E628 03E00008 */ jr $ra /* 0028C 80A6E62C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s index 3de0effcf0..24fd5b2fb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s @@ -32,5 +32,3 @@ glabel func_80A6E630 /* 00304 80A6E6A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00308 80A6E6A8 03E00008 */ jr $ra /* 0030C 80A6E6AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6B0.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6B0.s index 706031922c..01e86601af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6B0.s @@ -9,5 +9,3 @@ glabel func_80A6E6B0 /* 0032C 80A6E6CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00330 80A6E6D0 03E00008 */ jr $ra /* 00334 80A6E6D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6D8.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6D8.s index 0d79784413..2290c1bf0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6D8.s @@ -13,5 +13,3 @@ glabel func_80A6E6D8 /* 00360 80A6E700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00364 80A6E704 03E00008 */ jr $ra /* 00368 80A6E708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E70C.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E70C.s index 3b25cead61..980a6baf56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E70C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E70C.s @@ -13,5 +13,3 @@ glabel func_80A6E70C /* 00394 80A6E734 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00398 80A6E738 03E00008 */ jr $ra /* 0039C 80A6E73C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s index 2fe6b77b9b..7d9e383d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s @@ -32,5 +32,3 @@ glabel func_80A6E740 /* 00410 80A6E7B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00414 80A6E7B4 03E00008 */ jr $ra /* 00418 80A6E7B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s index 030a6cbf41..b19c4778e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s @@ -74,5 +74,3 @@ glabel func_80A6E7BC /* 00520 80A6E8C0 8FB00024 */ lw $s0, 0x0024($sp) /* 00524 80A6E8C4 03E00008 */ jr $ra /* 00528 80A6E8C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s index c1d05f8ac0..774609b8e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s @@ -61,5 +61,3 @@ glabel func_80A6E8CC /* 00600 80A6E9A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00604 80A6E9A4 03E00008 */ jr $ra /* 00608 80A6E9A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s index 934ec85f41..a1a6ecd214 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s @@ -87,5 +87,3 @@ glabel func_80A6E9AC /* 00744 80A6EAE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00748 80A6EAE8 03E00008 */ jr $ra /* 0074C 80A6EAEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6EC58.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6EC58.s index 0ca5994c29..7468f46fad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6EC58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6EC58.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_80A6EE68 +.word L80A6EC84 +.word L80A6ECB0 +.word func_80A6ECBC +.word func_80A6ECC8 +.word func_80A6ECE8 +.word 0x00000000 + +.text glabel func_80A6EC58 /* 008B8 80A6EC58 24AEFFF7 */ addiu $t6, $a1, 0xFFF7 ## $t6 = FFFFFFF7 /* 008BC 80A6EC5C 2DC10005 */ sltiu $at, $t6, 0x0005 @@ -26,5 +36,3 @@ glabel L80A6ECB0 /* 00910 80A6ECB0 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 00914 80A6ECB4 03E00008 */ jr $ra /* 00918 80A6ECB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECBC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECBC.s index 493790c4d7..a6684831f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECBC.s @@ -2,5 +2,3 @@ glabel func_80A6ECBC /* 0091C 80A6ECBC ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 00920 80A6ECC0 03E00008 */ jr $ra /* 00924 80A6ECC4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECC8.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECC8.s index 89fd32f9e8..d29c37331a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECC8.s @@ -7,5 +7,3 @@ glabel func_80A6ECC8 /* 0093C 80A6ECDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00940 80A6ECE0 03E00008 */ jr $ra /* 00944 80A6ECE4 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECE8.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECE8.s index 35bb0c1cca..2f5c4caeea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECE8.s @@ -12,5 +12,3 @@ glabel func_80A6ECE8 .L80A6ED0C: /* 0096C 80A6ED0C 03E00008 */ jr $ra /* 00970 80A6ED10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ED14.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ED14.s index 50dd4b9bed..a0226866f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ED14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ED14.s @@ -16,5 +16,3 @@ glabel func_80A6ED14 /* 009A8 80A6ED48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009AC 80A6ED4C 03E00008 */ jr $ra /* 009B0 80A6ED50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s index 5c20cc1a4f..daaf91a710 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s @@ -10,5 +10,3 @@ glabel EnHs2_Destroy /* 00108 80A6F0A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0010C 80A6F0AC 03E00008 */ jr $ra /* 00110 80A6F0B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s index ce1dae7551..4af2623adc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s @@ -23,4 +23,3 @@ glabel EnHs2_Draw /* 004D4 80A6F474 03E00008 */ jr $ra /* 004D8 80A6F478 00000000 */ nop /* 004DC 80A6F47C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index f6d2accc69..a1222630cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A6F4E0 + .asciz " ヒヨコの店(子人の時) \n" + .balign 4 + +.text glabel EnHs2_Init /* 00000 80A6EFA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 80A6EFA4 AFB00028 */ sw $s0, 0x0028($sp) @@ -63,5 +69,3 @@ glabel EnHs2_Init /* 000E0 80A6F080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000E4 80A6F084 03E00008 */ jr $ra /* 000E8 80A6F088 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s index 7c27e9bed1..ae23f173d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s @@ -100,5 +100,3 @@ glabel EnHs2_Update /* 003AC 80A6F34C 8FB10028 */ lw $s1, 0x0028($sp) /* 003B0 80A6F350 03E00008 */ jr $ra /* 003B4 80A6F354 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s index b26067e7f2..84f04d8b6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s @@ -48,5 +48,3 @@ glabel func_80A6F0B4 /* 001B8 80A6F158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001BC 80A6F15C 03E00008 */ jr $ra /* 001C0 80A6F160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s index 3bf512a7fa..079f158130 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s @@ -16,5 +16,3 @@ glabel func_80A6F164 /* 001F8 80A6F198 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001FC 80A6F19C 03E00008 */ jr $ra /* 00200 80A6F1A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s index 8f629cdddc..892f02c6f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s @@ -19,5 +19,3 @@ glabel func_80A6F1A4 /* 00244 80A6F1E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00248 80A6F1E8 03E00008 */ jr $ra /* 0024C 80A6F1EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s index 8f9cb56bac..0c4adb062b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s @@ -1,3 +1,15 @@ +.late_rodata +.late_rodata_alignment 8 + +glabel D_80A6F500 + .word func_80A6F390 +.word L80A6F3BC +.word func_80A6F3C8 +.word L80A6F384 +.word L80A6F384 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80A6F358 /* 003B8 80A6F358 24AEFFF7 */ addiu $t6, $a1, 0xFFF7 ## $t6 = FFFFFFF7 /* 003BC 80A6F35C 2DC10005 */ sltiu $at, $t6, 0x0005 @@ -14,5 +26,3 @@ glabel L80A6F384 /* 003E4 80A6F384 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 003E8 80A6F388 03E00008 */ jr $ra /* 003EC 80A6F38C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s index a727c67567..7660473594 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s @@ -14,5 +14,3 @@ glabel L80A6F3BC /* 0041C 80A6F3BC ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 00420 80A6F3C0 03E00008 */ jr $ra /* 00424 80A6F3C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s index 03a18d40af..44a44482a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s @@ -6,5 +6,3 @@ glabel func_80A6F3C8 /* 00434 80A6F3D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00438 80A6F3D8 03E00008 */ jr $ra /* 0043C 80A6F3DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s index fa43ed90f6..6b6e759dfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s @@ -16,5 +16,3 @@ glabel func_80A6F3E0 /* 00474 80A6F414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00478 80A6F418 03E00008 */ jr $ra /* 0047C 80A6F41C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s index 318278050f..d8bc853e42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s @@ -10,5 +10,3 @@ glabel EnHy_Destroy /* 01878 80A70E28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0187C 80A70E2C 03E00008 */ jr $ra /* 01880 80A70E30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s index a1bccb4e46..e129790dea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s @@ -1,3 +1,35 @@ +.rdata +glabel D_80A72850 + .asciz "../z_en_hy.c" + .balign 4 + +glabel D_80A72860 + .asciz "../z_en_hy.c" + .balign 4 + +.late_rodata +glabel jtbl_80A72AA0 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71E38 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71D08 +.word L80A71E38 +.word L80A71D08 +.word L80A71D08 + +.text glabel EnHy_Draw /* 02678 80A71C28 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 0267C 80A71C2C AFBF002C */ sw $ra, 0x002C($sp) @@ -165,4 +197,3 @@ glabel L80A71E38 /* 028E4 80A71E94 00000000 */ nop /* 028E8 80A71E98 00000000 */ nop /* 028EC 80A71E9C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Init.s index e500b046f5..17b6af422a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Init.s @@ -39,5 +39,3 @@ glabel EnHy_Init /* 01850 80A70E00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01854 80A70E04 03E00008 */ jr $ra /* 01858 80A70E08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s index 5101794c27..7357b2e608 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s @@ -58,5 +58,3 @@ glabel EnHy_Update /* 020FC 80A716AC 8FB10020 */ lw $s1, 0x0020($sp) /* 02100 80A716B0 03E00008 */ jr $ra /* 02104 80A716B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F5B0.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F5B0.s index e9b13b3f7c..7d04873bd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F5B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F5B0.s @@ -73,5 +73,3 @@ glabel func_80A6F5B0 /* 00104 80A6F6B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00108 80A6F6B8 03E00008 */ jr $ra /* 0010C 80A6F6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F6C0.s index a796567b59..366aa03f62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F6C0.s @@ -38,5 +38,3 @@ glabel func_80A6F6C0 /* 00188 80A6F738 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0018C 80A6F73C 03E00008 */ jr $ra /* 00190 80A6F740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F744.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F744.s index 184639037d..720e22be1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F744.s @@ -20,5 +20,3 @@ glabel func_80A6F744 .L80A6F788: /* 001D8 80A6F788 03E00008 */ jr $ra /* 001DC 80A6F78C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F790.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F790.s index 78a8a52d6b..d6e11b57f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F790.s @@ -17,5 +17,3 @@ glabel func_80A6F790 .L80A6F7C4: /* 00214 80A6F7C4 03E00008 */ jr $ra /* 00218 80A6F7C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F7CC.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F7CC.s index 0908f71e2d..abdbe4d2fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F7CC.s @@ -16,5 +16,3 @@ glabel func_80A6F7CC /* 00254 80A6F804 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00258 80A6F808 03E00008 */ jr $ra /* 0025C 80A6F80C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s index 1b13d710e8..4c482314de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s @@ -1,3 +1,28 @@ +.late_rodata +glabel jtbl_80A72870 +.word L80A6F8A0 +.word L80A6F994 +.word L80A6F9FC +.word L80A6FAB0 +.word L80A6FAFC +.word L80A6FB48 +.word L80A6FB58 +.word L80A6FBA4 +.word L80A6FC1C +.word L80A6FC84 +.word L80A6FD50 +.word L80A6FE1C +.word L80A6FE68 +.word L80A6FED0 +.word L80A6FED8 +.word L80A6FEE0 +.word L80A6FEE8 +.word L80A6FEF0 +.word L80A6FF9C +.word L80A70038 +.word L80A70040 + +.text glabel func_80A6F810 /* 00260 80A6F810 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00264 80A6F814 AFBF0014 */ sw $ra, 0x0014($sp) @@ -612,5 +637,3 @@ glabel L80A70040 /* 00A9C 80A7004C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AA0 80A70050 03E00008 */ jr $ra /* 00AA4 80A70054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s index 82b19dde30..a336897f38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s @@ -1,3 +1,57 @@ +.late_rodata +glabel jtbl_80A728C4 +.word L80A700D0 +.word L80A700D0 +.word L80A701B0 +.word L80A700D8 +.word L80A700D0 +.word L80A7056C +.word L80A700D0 +.word L80A700D0 +.word L80A700D0 +.word L80A700D0 +glabel jtbl_80A728EC +.word L80A70380 +.word L80A70564 +.word L80A70564 +.word L80A70564 +.word L80A70564 +.word L80A702CC +.word L80A702CC +.word L80A702CC +.word L80A702CC +glabel jtbl_80A72910 +.word L80A70318 +.word L80A70564 +.word L80A70440 +.word L80A70564 +.word L80A70564 +.word L80A7034C +.word L80A70564 +.word L80A703F0 +.word L80A70564 +.word L80A70424 +.word L80A70564 +.word L80A703B8 +.word L80A70564 +.word L80A7039C +.word L80A70564 +.word L80A70564 +.word L80A70564 +.word L80A703D4 +glabel jtbl_80A72958 +.word L80A70474 +.word L80A70564 +.word L80A70490 +.word L80A70564 +.word L80A704AC +.word L80A70564 +.word L80A704C8 +.word L80A70564 +.word L80A70564 +.word L80A704E4 + +.text glabel func_80A70058 /* 00AA8 80A70058 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00AAC 80A7005C 3C0F80A7 */ lui $t7, %hi(D_80A727F0) ## $t7 = 80A70000 @@ -383,5 +437,3 @@ glabel L80A7056C /* 00FE8 80A70598 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00FEC 80A7059C 03E00008 */ jr $ra /* 00FF0 80A705A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s index 6fa945a0cf..777c0a4154 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s @@ -51,5 +51,3 @@ glabel func_80A705A4 /* 010A4 80A70654 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010A8 80A70658 03E00008 */ jr $ra /* 010AC 80A7065C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70660.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70660.s index 3b1c8a383e..7bc66da601 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70660.s @@ -13,5 +13,3 @@ glabel func_80A70660 /* 010DC 80A7068C 84790008 */ lh $t9, 0x0008($v1) ## 00000008 /* 010E0 80A70690 03E00008 */ jr $ra /* 010E4 80A70694 A49901DE */ sh $t9, 0x01DE($a0) ## 000001DE - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70698.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70698.s index 7134f7f250..65d07b4954 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70698.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70698.s @@ -39,5 +39,3 @@ glabel func_80A70698 /* 01178 80A70728 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0117C 80A7072C 03E00008 */ jr $ra /* 01180 80A70730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s index 0c8bb78087..11a98ec897 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s @@ -64,5 +64,3 @@ glabel func_80A70734 /* 01278 80A70828 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0127C 80A7082C 03E00008 */ jr $ra /* 01280 80A70830 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s index 98bfb25e6f..baf1a70e2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s @@ -89,5 +89,3 @@ glabel func_80A70834 /* 013BC 80A7096C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013C0 80A70970 03E00008 */ jr $ra /* 013C4 80A70974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s index 8fd898da38..398fd8b0ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s @@ -1,3 +1,26 @@ +.late_rodata +glabel jtbl_80A72980 +.word L80A709E4 +.word L80A70A00 +.word L80A709DC +.word L80A709B8 +.word L80A70A00 +.word L80A70A00 +.word L80A70A00 +.word L80A709B8 +.word L80A70A00 +.word L80A709B8 +.word L80A709B8 +.word L80A70A00 +.word L80A709D4 +.word L80A70A00 +.word L80A70A00 +.word L80A70A00 +.word L80A70A00 +.word L80A709DC +.word L80A709E4 + +.text glabel func_80A70978 /* 013C8 80A70978 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 013CC 80A7097C AFBF0024 */ sw $ra, 0x0024($sp) @@ -102,5 +125,3 @@ glabel L80A70A00 /* 01528 80A70AD8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0152C 80A70ADC 03E00008 */ jr $ra /* 01530 80A70AE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s index 98bc185296..004f456fe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s @@ -1,3 +1,34 @@ +.late_rodata +.late_rodata_alignment 4 +glabel D_80A729CC + .word func_80A70CD8 +.word func_80A70CD8 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word func_80A70C44 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word L80A70D40 +.word func_80A70C08 +.word L80A70D40 +.word func_80A70BAC + +.text glabel func_80A70AE4 /* 01534 80A70AE4 84A300A4 */ lh $v1, 0x00A4($a1) ## 000000A4 /* 01538 80A70AE8 28610038 */ slti $at, $v1, 0x0038 @@ -54,5 +85,3 @@ glabel func_80A70AE4 .L80A70BA4: /* 015F4 80A70BA4 03E00008 */ jr $ra /* 015F8 80A70BA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s index ce27c24906..59d7e745bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s @@ -25,5 +25,3 @@ glabel func_80A70BAC .L80A70C00: /* 01650 80A70C00 03E00008 */ jr $ra /* 01654 80A70C04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s index 8503fc566b..3953a8ad63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s @@ -17,5 +17,3 @@ glabel func_80A70C08 .L80A70C3C: /* 0168C 80A70C3C 03E00008 */ jr $ra /* 01690 80A70C40 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s index afb539d3ec..870ba1f737 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s @@ -42,5 +42,3 @@ glabel func_80A70C44 .L80A70CD0: /* 01720 80A70CD0 03E00008 */ jr $ra /* 01724 80A70CD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s index d861fde78a..500751fea7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s @@ -51,5 +51,3 @@ glabel L80A70D40 .L80A70D78: /* 017C8 80A70D78 03E00008 */ jr $ra /* 017CC 80A70D7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s index fbebe785ab..d3736ce90d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s @@ -1,3 +1,28 @@ +.late_rodata +glabel jtbl_80A72A34 +.word L80A71098 +.word L80A710BC +.word L80A710BC +.word L80A7105C +.word L80A710BC +.word L80A710CC +.word L80A710BC +.word L80A71084 +.word L80A710BC +.word L80A710CC +.word L80A710CC +.word L80A710CC +.word L80A710CC +.word L80A710BC +.word L80A710BC +.word L80A710BC +.word L80A710BC +.word L80A710BC +.word L80A710BC +.word L80A710BC +.word L80A710BC + +.text glabel func_80A70E34 /* 01884 80A70E34 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01888 80A70E38 AFBF002C */ sw $ra, 0x002C($sp) @@ -192,5 +217,3 @@ glabel L80A710CC /* 01B3C 80A710EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01B40 80A710F0 03E00008 */ jr $ra /* 01B44 80A710F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s index ff36e9237b..6415028d48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s @@ -50,5 +50,3 @@ glabel func_80A710F8 /* 01BF8 80A711A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BFC 80A711AC 03E00008 */ jr $ra /* 01C00 80A711B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s index 458b26e1fa..ddf6a08efc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s @@ -52,5 +52,3 @@ glabel func_80A711B4 /* 01CC0 80A71270 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01CC4 80A71274 03E00008 */ jr $ra /* 01CC8 80A71278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7127C.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7127C.s index 4ec0ed0f87..d2f702ee70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7127C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7127C.s @@ -13,5 +13,3 @@ glabel func_80A7127C /* 01CF8 80A712A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CFC 80A712AC 03E00008 */ jr $ra /* 01D00 80A712B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712B4.s index a8b05f6c20..5a5bdea373 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712B4.s @@ -2,5 +2,3 @@ glabel func_80A712B4 /* 01D04 80A712B4 AFA40000 */ sw $a0, 0x0000($sp) /* 01D08 80A712B8 03E00008 */ jr $ra /* 01D0C 80A712BC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712C0.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712C0.s index d9306ee147..eb9b5be8bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A712C0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A72A88 + .float 0.4 + +.text glabel func_80A712C0 /* 01D10 80A712C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01D14 80A712C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -36,5 +41,3 @@ glabel func_80A712C0 /* 01D90 80A71340 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D94 80A71344 03E00008 */ jr $ra /* 01D98 80A71348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s index 52189d995b..c44e495c8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A72A8C + .float 0.4 + +.text glabel func_80A7134C /* 01D9C 80A7134C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01DA0 80A71350 AFBF0024 */ sw $ra, 0x0024($sp) @@ -99,5 +104,3 @@ glabel func_80A7134C /* 01F08 80A714B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01F0C 80A714BC 03E00008 */ jr $ra /* 01F10 80A714C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s index a49b8bb4d1..62e870b4e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s @@ -28,5 +28,3 @@ glabel func_80A714C4 /* 01F74 80A71524 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F78 80A71528 03E00008 */ jr $ra /* 01F7C 80A7152C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s index 32f91fe9df..588819a926 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s @@ -48,5 +48,3 @@ glabel func_80A71530 /* 02020 80A715D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02024 80A715D4 03E00008 */ jr $ra /* 02028 80A715D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s index 6cca25ffb4..ec10c00562 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s @@ -1,3 +1,26 @@ +.rdata +glabel D_80A72810 + .asciz "../z_en_hy.c" + .balign 4 + +glabel D_80A72820 + .asciz "../z_en_hy.c" + .balign 4 + +.late_rodata +glabel D_80A72A90 + .float 3.14159274101 + +glabel D_80A72A94 + .float 3.14159274101 + +glabel D_80A72A98 + .float 3.14159274101 + +glabel D_80A72A9C + .float 3.14159274101 + +.text glabel func_80A716B8 /* 02108 80A716B8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0210C 80A716BC AFBF0014 */ sw $ra, 0x0014($sp) @@ -242,5 +265,3 @@ glabel func_80A716B8 /* 024A8 80A71A58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 024AC 80A71A5C 03E00008 */ jr $ra /* 024B0 80A71A60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s index c161174e9a..57d425ab7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A72830 + .asciz "../z_en_hy.c" + .balign 4 + +glabel D_80A72840 + .asciz "../z_en_hy.c" + .balign 4 + +.text glabel func_80A71A64 /* 024B4 80A71A64 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 024B8 80A71A68 3C0F80A7 */ lui $t7, %hi(D_80A72800) ## $t7 = 80A70000 @@ -88,5 +98,3 @@ glabel func_80A71A64 /* 02600 80A71BB0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02604 80A71BB4 03E00008 */ jr $ra /* 02608 80A71BB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71BBC.s index 4cdb7c0479..ad1f705f79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71BBC.s @@ -27,5 +27,3 @@ glabel func_80A71BBC /* 0266C 80A71C1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02670 80A71C20 03E00008 */ jr $ra /* 02674 80A71C24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s index 8283caa4b6..ef9d0cfdd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s @@ -25,5 +25,3 @@ glabel EnIceHono_Destroy /* 003EC 80A733DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F0 80A733E0 03E00008 */ jr $ra /* 003F4 80A733E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s index 823f54f554..4c9d856c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A740D8 + .asciz "../z_en_ice_hono.c" + .balign 4 + +glabel D_80A740EC + .asciz "../z_en_ice_hono.c" + .balign 4 + +glabel D_80A74100 + .asciz "../z_en_ice_hono.c" + .balign 4 + +.late_rodata +glabel D_80A74174 + .float 9.58738019108e-05 + +.text glabel EnIceHono_Draw /* 00E1C 80A73E0C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00E20 80A73E10 AFB10038 */ sw $s1, 0x0038($sp) @@ -120,4 +138,3 @@ glabel EnIceHono_Draw /* 00FF4 80A73FE4 8FB10038 */ lw $s1, 0x0038($sp) /* 00FF8 80A73FE8 03E00008 */ jr $ra /* 00FFC 80A73FEC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s index cedb5bfd2b..efe0a081a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s @@ -1,3 +1,15 @@ +.rdata +glabel D_80A740A0 + .asciz "(ice 炎)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel D_80A7412C + .word 0x477FFF80 +glabel D_80A74130 + .word 0x477FFF80 + +.text glabel EnIceHono_Init /* 00238 80A73228 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0023C 80A7322C AFBF002C */ sw $ra, 0x002C($sp) @@ -101,5 +113,3 @@ glabel EnIceHono_Init /* 00394 80A73384 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00398 80A73388 03E00008 */ jr $ra /* 0039C 80A7338C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s index 430c854f9d..e78f39587e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80A740BC + .asciz "ありえない値(ratio = %f)\n" + .balign 4 + +.late_rodata +glabel D_80A74160 + .float 0.1 + +glabel D_80A74164 + .float 0.05 + +glabel D_80A74168 + .word 0x3ED9999A +glabel D_80A7416C + .float 0.7 + +glabel D_80A74170 + .float 0.2 + +.text glabel EnIceHono_Update /* 00C38 80A73C28 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00C3C 80A73C2C AFBF002C */ sw $ra, 0x002C($sp) @@ -132,5 +153,3 @@ glabel EnIceHono_Update /* 00E10 80A73E00 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00E14 80A73E04 03E00008 */ jr $ra /* 00E18 80A73E08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s index 5e92b6366b..ab2b38337a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s @@ -10,5 +10,3 @@ glabel func_80A72FF0 /* 00020 80A73010 460C6482 */ mul.s $f18, $f12, $f12 /* 00024 80A73014 03E00008 */ jr $ra /* 00028 80A73018 46128000 */ add.s $f0, $f16, $f18 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s index 9118cc1e41..ef459cf719 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s @@ -45,5 +45,3 @@ glabel func_80A7301C /* 000C0 80A730B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000C4 80A730B4 03E00008 */ jr $ra /* 000C8 80A730B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s index e14181d8cc..cba8edd616 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A74114 + .word 0x37A7C5AC +glabel D_80A74118 + .word 0xBE99999A +glabel D_80A7411C + .word 0x457A0666 +glabel D_80A74120 + .word 0x45FA019A + +.text glabel func_80A730BC /* 000CC 80A730BC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 000D0 80A730C0 AFA5003C */ sw $a1, 0x003C($sp) @@ -68,5 +79,3 @@ glabel func_80A730BC /* 001C4 80A731B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001C8 80A731B8 03E00008 */ jr $ra /* 001CC 80A731BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s index d589eaba79..4e4cf58df3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A74124 + .word 0x3A51B717 +glabel D_80A74128 + .word 0xBE99999A + +.text glabel func_80A731C0 /* 001D0 80A731C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001D4 80A731C4 AFA5001C */ sw $a1, 0x001C($sp) @@ -26,5 +33,3 @@ glabel func_80A731C0 /* 0022C 80A7321C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00230 80A73220 03E00008 */ jr $ra /* 00234 80A73224 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s index c526dac3b0..ae16ceccf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s @@ -61,5 +61,3 @@ glabel func_80A733E8 /* 004D8 80A734C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004DC 80A734CC 03E00008 */ jr $ra /* 004E0 80A734D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s index bba8bbb06d..f7772bb875 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s @@ -8,5 +8,3 @@ glabel func_80A734D4 /* 004FC 80A734EC A48F0150 */ sh $t7, 0x0150($a0) ## 00000150 /* 00500 80A734F0 03E00008 */ jr $ra /* 00504 80A734F4 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s index 5606b74216..c8604f941d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s @@ -45,5 +45,3 @@ glabel func_80A734F8 /* 005A4 80A73594 8FB10020 */ lw $s1, 0x0020($sp) /* 005A8 80A73598 03E00008 */ jr $ra /* 005AC 80A7359C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s index cbd557954c..f55f435d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s @@ -7,5 +7,3 @@ glabel func_80A735A0 /* 005C4 80A735B4 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 /* 005C8 80A735B8 03E00008 */ jr $ra /* 005CC 80A735BC A4980150 */ sh $t8, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s index 107315b073..ae4581029b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A74134 + .word 0x3ADED289 +glabel D_80A74138 + .word 0x455AC000 + +.text glabel func_80A735C0 /* 005D0 80A735C0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 005D4 80A735C4 F7B40030 */ sdc1 $f20, 0x0030($sp) @@ -122,5 +129,3 @@ glabel func_80A735C0 /* 00784 80A73774 8FB40048 */ lw $s4, 0x0048($sp) /* 00788 80A73778 03E00008 */ jr $ra /* 0078C 80A7377C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s index 462f971c42..7851d71856 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s @@ -7,5 +7,3 @@ glabel func_80A73780 /* 007A4 80A73794 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 /* 007A8 80A73798 03E00008 */ jr $ra /* 007AC 80A7379C A4980150 */ sh $t8, 0x0150($a0) ## 00000150 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s index 79e269a3b0..d4ca73f2d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80A7413C + .word 0x38D1B717 +glabel D_80A74140 + .word 0x455AC000 +glabel D_80A74144 + .float 6000.0 + +.text glabel func_80A737A0 /* 007B0 80A737A0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 007B4 80A737A4 AFBF004C */ sw $ra, 0x004C($sp) @@ -170,5 +179,3 @@ glabel func_80A737A0 /* 00A00 80A739F0 8FB40048 */ lw $s4, 0x0048($sp) /* 00A04 80A739F4 03E00008 */ jr $ra /* 00A08 80A739F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s index 72f1dd17eb..6bd2ba9602 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_80A74148 + .float 0.005 + +glabel D_80A7414C + .word 0x3B83126F +glabel D_80A74150 + .float 1.6 + +glabel D_80A74154 + .float 0.005 + +glabel D_80A74158 + .word 0x3B449BA6 + +.text glabel func_80A739FC /* 00A0C 80A739FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00A10 80A73A00 AFBF001C */ sw $ra, 0x001C($sp) @@ -58,5 +74,3 @@ glabel func_80A739FC /* 00AD4 80A73AC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AD8 80A73AC8 03E00008 */ jr $ra /* 00ADC 80A73ACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s index c236c0680d..abd9c13fa0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A7415C + .word 0x3F2AC083 + +.text glabel func_80A73AD0 /* 00AE0 80A73AD0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00AE4 80A73AD4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -98,5 +103,3 @@ glabel func_80A73AD0 /* 00C2C 80A73C1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C30 80A73C20 03E00008 */ jr $ra /* 00C34 80A73C24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s index a16606519c..1429b4c354 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s @@ -34,5 +34,3 @@ glabel EnIk_Destroy /* 00074 80A74384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00078 80A74388 03E00008 */ jr $ra /* 0007C 80A7438C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Draw.s index 12c20e9aab..dcd92fc8b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A78978 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnIk_Draw /* 03D64 80A78074 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03D68 80A78078 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnIk_Draw /* 03DB4 80A780C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03DB8 80A780C8 03E00008 */ jr $ra /* 03DBC 80A780CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s index 9574b5d5b3..71c7efd942 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s @@ -62,4 +62,3 @@ glabel EnIk_Init /* 04024 80A78334 00000000 */ nop /* 04028 80A78338 00000000 */ nop /* 0402C 80A7833C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Update.s index 7ab3d3755b..1051142299 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A78840 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnIk_Update /* 0388C 80A77B9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03890 80A77BA0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnIk_Update /* 038DC 80A77BEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 038E0 80A77BF0 03E00008 */ jr $ra /* 038E4 80A77BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74390.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74390.s index 23c66e93d6..fe5b369b05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74390.s @@ -1,5 +1,3 @@ glabel func_80A74390 /* 00080 80A74390 03E00008 */ jr $ra /* 00084 80A74394 AC850304 */ sw $a1, 0x0304($a0) ## 00000304 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s index 1c7bc75f45..90fa495f25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s @@ -160,5 +160,3 @@ glabel func_80A74398 /* 002C8 80A745D8 8FB10020 */ lw $s1, 0x0020($sp) /* 002CC 80A745DC 03E00008 */ jr $ra /* 002D0 80A745E0 27BD01E0 */ addiu $sp, $sp, 0x01E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s index 639eb7d98a..2dff9eb81d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s @@ -38,5 +38,3 @@ glabel func_80A745E4 /* 00358 80A74668 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0035C 80A7466C 03E00008 */ jr $ra /* 00360 80A74670 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74674.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74674.s index 14c959e6e4..479484c9e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74674.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74674.s @@ -44,5 +44,3 @@ glabel func_80A74674 /* 003F8 80A74708 8FB20028 */ lw $s2, 0x0028($sp) /* 003FC 80A7470C 03E00008 */ jr $ra /* 00400 80A74710 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s index 8ccc1cf911..2770d8c4ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s @@ -46,5 +46,3 @@ glabel func_80A74714 /* 004A4 80A747B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004A8 80A747B8 03E00008 */ jr $ra /* 004AC 80A747BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A747C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A747C0.s index 6a14a1f55e..57e7031f8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A747C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A747C0.s @@ -60,5 +60,3 @@ glabel func_80A747C0 /* 00580 80A74890 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00584 80A74894 03E00008 */ jr $ra /* 00588 80A74898 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s index be3d8c8ed5..88209caf8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s @@ -37,5 +37,3 @@ glabel func_80A7489C /* 00610 80A74920 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00614 80A74924 03E00008 */ jr $ra /* 00618 80A74928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7492C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7492C.s index d9a7f61af1..4b8b96c0bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7492C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7492C.s @@ -105,5 +105,3 @@ glabel func_80A7492C /* 00790 80A74AA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00794 80A74AA4 03E00008 */ jr $ra /* 00798 80A74AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s index 7d8ea9328f..441a6d71e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A789E0 + .float 0.9 + +.text glabel func_80A74AAC /* 0079C 80A74AAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 007A0 80A74AB0 AFBF002C */ sw $ra, 0x002C($sp) @@ -68,5 +73,3 @@ glabel func_80A74AAC /* 00888 80A74B98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0088C 80A74B9C 03E00008 */ jr $ra /* 00890 80A74BA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74BA4.s index b4ae650a16..89dc336336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74BA4.s @@ -183,5 +183,3 @@ glabel func_80A74BA4 /* 00B10 80A74E20 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00B14 80A74E24 03E00008 */ jr $ra /* 00B18 80A74E28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s index 3bc40d3178..0fb7e0df99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s @@ -37,5 +37,3 @@ glabel func_80A74E2C /* 00BA0 80A74EB0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00BA4 80A74EB4 03E00008 */ jr $ra /* 00BA8 80A74EB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74EBC.s index cce125aa71..15b2ae378b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74EBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74EBC.s @@ -119,5 +119,3 @@ glabel func_80A74EBC /* 00D50 80A75060 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00D54 80A75064 03E00008 */ jr $ra /* 00D58 80A75068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s index aee0546f38..de3883bf4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s @@ -42,5 +42,3 @@ glabel func_80A7506C /* 00DF0 80A75100 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00DF4 80A75104 03E00008 */ jr $ra /* 00DF8 80A75108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s index 71eb8d380e..44896ac644 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s @@ -53,5 +53,3 @@ glabel func_80A7510C /* 00EAC 80A751BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00EB0 80A751C0 03E00008 */ jr $ra /* 00EB4 80A751C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s index 42ad381170..04eac3f744 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s @@ -39,5 +39,3 @@ glabel func_80A751C8 /* 00F44 80A75254 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F48 80A75258 03E00008 */ jr $ra /* 00F4C 80A7525C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75260.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75260.s index 2d34694fe0..ba54ee668e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75260.s @@ -104,5 +104,3 @@ glabel func_80A75260 /* 010B4 80A753C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010B8 80A753C8 03E00008 */ jr $ra /* 010BC 80A753CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s index 283bda3a97..2f6d40dbd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s @@ -36,5 +36,3 @@ glabel func_80A753D0 /* 01140 80A75450 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01144 80A75454 03E00008 */ jr $ra /* 01148 80A75458 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7545C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7545C.s index 3dad725786..c1378c96b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7545C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7545C.s @@ -18,5 +18,3 @@ glabel func_80A7545C /* 01184 80A75494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01188 80A75498 03E00008 */ jr $ra /* 0118C 80A7549C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s index aae6a330fd..724dbbd759 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s @@ -37,5 +37,3 @@ glabel func_80A754A0 /* 01214 80A75524 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01218 80A75528 03E00008 */ jr $ra /* 0121C 80A7552C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75530.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75530.s index ccd69873ee..10a74d9548 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75530.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75530.s @@ -52,5 +52,3 @@ glabel func_80A75530 /* 012D4 80A755E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 012D8 80A755E8 03E00008 */ jr $ra /* 012DC 80A755EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s index ca6ac94c95..fb621aed1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s @@ -36,5 +36,3 @@ glabel func_80A755F0 /* 01360 80A75670 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01364 80A75674 03E00008 */ jr $ra /* 01368 80A75678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s index 64a882ee76..f473c8da5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s @@ -76,5 +76,3 @@ glabel func_80A7567C /* 01474 80A75784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01478 80A75788 03E00008 */ jr $ra /* 0147C 80A7578C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s index 56a0f25e27..7dace578d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s @@ -79,5 +79,3 @@ glabel func_80A75790 /* 01594 80A758A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01598 80A758A8 03E00008 */ jr $ra /* 0159C 80A758AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A758B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A758B0.s index f583cfbcd3..c5143abadc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A758B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A758B0.s @@ -60,5 +60,3 @@ glabel func_80A758B0 /* 01670 80A75980 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01674 80A75984 03E00008 */ jr $ra /* 01678 80A75988 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s index 66d4c43098..a78cd3ae6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s @@ -46,5 +46,3 @@ glabel func_80A7598C /* 0171C 80A75A2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01720 80A75A30 03E00008 */ jr $ra /* 01724 80A75A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s index 13ad57f4f6..a5d3535418 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s @@ -141,5 +141,3 @@ glabel func_80A75A38 /* 0191C 80A75C2C 8FB40070 */ lw $s4, 0x0070($sp) /* 01920 80A75C30 03E00008 */ jr $ra /* 01924 80A75C34 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75C38.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75C38.s index 5b1aeb97c1..3c395b54f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75C38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75C38.s @@ -247,5 +247,3 @@ glabel func_80A75C38 /* 01C84 80A75F94 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01C88 80A75F98 03E00008 */ jr $ra /* 01C8C 80A75F9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s index 69e2fd892b..a5cfdd3e99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s @@ -145,5 +145,3 @@ glabel func_80A75FA0 /* 01E94 80A761A4 8FB10020 */ lw $s1, 0x0020($sp) /* 01E98 80A761A8 03E00008 */ jr $ra /* 01E9C 80A761AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A761B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A761B0.s index 4dac742e99..09a54aa7fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A761B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A761B0.s @@ -47,5 +47,3 @@ glabel func_80A761B0 /* 01F50 80A76260 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F54 80A76264 03E00008 */ jr $ra /* 01F58 80A76268 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7626C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7626C.s index c5c2ec112b..64cd4ef088 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7626C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7626C.s @@ -55,5 +55,3 @@ glabel func_80A7626C .L80A76328: /* 02018 80A76328 03E00008 */ jr $ra /* 0201C 80A7632C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s index 86d4ba50e6..b08760c79d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80A78650 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A78668 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A78680 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A78698 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A786B0 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A786C8 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A786E0 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +.text glabel func_80A76330 /* 02020 80A76330 27BDFF00 */ addiu $sp, $sp, 0xFF00 ## $sp = FFFFFF00 /* 02024 80A76334 AFB00024 */ sw $s0, 0x0024($sp) @@ -294,5 +324,3 @@ glabel func_80A76330 /* 0247C 80A7678C 8FB50038 */ lw $s5, 0x0038($sp) /* 02480 80A76790 03E00008 */ jr $ra /* 02484 80A76794 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s index 8a200f61e7..fe578b88a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A786F8 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +glabel D_80A78710 + .asciz "../z_en_ik_inFight.c" + .balign 4 + +.text glabel func_80A76798 /* 02488 80A76798 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0248C 80A7679C AFB10028 */ sw $s1, 0x0028($sp) @@ -282,5 +292,3 @@ glabel func_80A76798 /* 028D8 80A76BE8 8FB10028 */ lw $s1, 0x0028($sp) /* 028DC 80A76BEC 03E00008 */ jr $ra /* 028E0 80A76BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76BF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76BF4.s index 9e7641d94e..2b937d6f89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76BF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76BF4.s @@ -7,5 +7,3 @@ glabel func_80A76BF4 /* 028F8 80A76C08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028FC 80A76C0C 03E00008 */ jr $ra /* 02900 80A76C10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s index 7891073465..db67cbbc5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s @@ -127,5 +127,3 @@ glabel func_80A76C14 /* 02AC0 80A76DD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02AC4 80A76DD4 03E00008 */ jr $ra /* 02AC8 80A76DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s index 8c1f1458e3..7dd309ab59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s @@ -20,5 +20,3 @@ glabel func_80A76DDC /* 02B10 80A76E20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02B14 80A76E24 03E00008 */ jr $ra /* 02B18 80A76E28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76E2C.s index cec997f828..5531423ea8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76E2C.s @@ -133,5 +133,3 @@ glabel func_80A76E2C /* 02D18 80A77028 8FBE0068 */ lw $s8, 0x0068($sp) /* 02D1C 80A7702C 03E00008 */ jr $ra /* 02D20 80A77030 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77034.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77034.s index 9dacc91e9b..ae648c7477 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77034.s @@ -17,5 +17,3 @@ glabel func_80A77034 /* 02D60 80A77070 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D64 80A77074 03E00008 */ jr $ra /* 02D68 80A77078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7707C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7707C.s index c01f37f3f2..31370904ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7707C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7707C.s @@ -8,5 +8,3 @@ glabel func_80A7707C /* 02D80 80A77090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D84 80A77094 03E00008 */ jr $ra /* 02D88 80A77098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7709C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7709C.s index d6a15166bf..3a94592a6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7709C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7709C.s @@ -9,5 +9,3 @@ glabel func_80A7709C .L80A770B8: /* 02DA8 80A770B8 03E00008 */ jr $ra /* 02DAC 80A770BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A770C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A770C0.s index 9300228ea2..4ad5c97426 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A770C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A770C0.s @@ -32,5 +32,3 @@ glabel func_80A770C0 /* 02E24 80A77134 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E28 80A77138 03E00008 */ jr $ra /* 02E2C 80A7713C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77140.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77140.s index 9aa4dd8d18..90870301f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77140.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77140.s @@ -1,5 +1,3 @@ glabel func_80A77140 /* 02E30 80A77140 03E00008 */ jr $ra /* 02E34 80A77144 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77148.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77148.s index b575fb7abe..2302300fba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77148.s @@ -3,5 +3,3 @@ glabel func_80A77148 /* 02E3C 80A7714C AC8004CC */ sw $zero, 0x04CC($a0) ## 000004CC /* 02E40 80A77150 03E00008 */ jr $ra /* 02E44 80A77154 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s index eaa647c72f..42c41eadef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s @@ -36,5 +36,3 @@ glabel func_80A77158 /* 02EC8 80A771D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02ECC 80A771DC 03E00008 */ jr $ra /* 02ED0 80A771E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s index 535b71141c..957c0d4c0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s @@ -33,5 +33,3 @@ glabel func_80A771E4 /* 02F48 80A77258 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02F4C 80A7725C 03E00008 */ jr $ra /* 02F50 80A77260 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77264.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77264.s index 127b4d2205..14309dc34e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77264.s @@ -16,5 +16,3 @@ glabel func_80A77264 /* 02F88 80A77298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F8C 80A7729C 03E00008 */ jr $ra /* 02F90 80A772A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s index 8a24d6dcb1..21ebfd68ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s @@ -18,5 +18,3 @@ glabel func_80A772A4 /* 02FD0 80A772E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02FD4 80A772E4 03E00008 */ jr $ra /* 02FD8 80A772E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s index 0e8791b155..10a4af5e77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s @@ -28,5 +28,3 @@ glabel func_80A772EC /* 03040 80A77350 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03044 80A77354 03E00008 */ jr $ra /* 03048 80A77358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s index 8787948de3..b024fc5dfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s @@ -55,5 +55,3 @@ glabel func_80A7735C /* 03118 80A77428 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0311C 80A7742C 03E00008 */ jr $ra /* 03120 80A77430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77434.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77434.s index 0a01e90460..b7a7ab9167 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77434.s @@ -15,5 +15,3 @@ glabel func_80A77434 /* 03158 80A77468 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0315C 80A7746C 03E00008 */ jr $ra /* 03160 80A77470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77474.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77474.s index 88f75a98f7..2dfdedce88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77474.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77474.s @@ -5,5 +5,3 @@ glabel func_80A77474 /* 03170 80A77480 AC8004CC */ sw $zero, 0x04CC($a0) ## 000004CC /* 03174 80A77484 03E00008 */ jr $ra /* 03178 80A77488 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7748C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7748C.s index a73edbe0cd..a9236e25a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7748C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7748C.s @@ -11,5 +11,3 @@ glabel func_80A7748C /* 031A0 80A774B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 031A4 80A774B4 03E00008 */ jr $ra /* 031A8 80A774B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774BC.s index f542824c90..d01ea1b7ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774BC.s @@ -14,5 +14,3 @@ glabel func_80A774BC /* 031DC 80A774EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 031E0 80A774F0 03E00008 */ jr $ra /* 031E4 80A774F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774F8.s index 273a9e1efe..e9c67eca7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A774F8.s @@ -15,5 +15,3 @@ glabel func_80A774F8 /* 03214 80A77524 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03218 80A77528 03E00008 */ jr $ra /* 0321C 80A7752C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77530.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77530.s index 4634ca3c5e..1fd75d0155 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77530.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77530.s @@ -28,5 +28,3 @@ glabel func_80A77530 /* 03280 80A77590 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 03284 80A77594 03E00008 */ jr $ra /* 03288 80A77598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s index 7a2c1f6ada..058e4db48f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s @@ -1,3 +1,51 @@ +.rdata +glabel D_80A78728 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A78740 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A78758 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A78770 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A78788 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A787A0 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A787B8 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +.late_rodata +glabel jtbl_80A789E4 +.word L80A775FC +.word L80A77818 +.word L80A77818 +.word L80A77818 +.word L80A77818 +.word L80A77818 +.word L80A77818 +.word L80A77818 +.word L80A77818 +.word L80A77674 +.word L80A77818 +.word L80A776D0 +.word L80A77818 +.word L80A7772C +.word L80A777A4 + +.text glabel func_80A7759C /* 0328C 80A7759C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 03290 80A775A0 AFBF001C */ sw $ra, 0x001C($sp) @@ -176,5 +224,3 @@ glabel L80A77818 /* 03528 80A77838 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 0352C 80A7783C 03E00008 */ jr $ra /* 03530 80A77840 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s index a263487284..3356ba5586 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A787D0 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +glabel D_80A787E8 + .asciz "../z_en_ik_inAwake.c" + .balign 4 + +.text glabel func_80A77844 /* 03534 80A77844 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 03538 80A77848 AFBF002C */ sw $ra, 0x002C($sp) @@ -101,5 +111,3 @@ glabel func_80A77844 /* 036C0 80A779D0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 036C4 80A779D4 03E00008 */ jr $ra /* 036C8 80A779D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A779DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A779DC.s index 41f89941d9..af0072cedb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A779DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A779DC.s @@ -1,3 +1,19 @@ +.rdata +glabel D_80A78800 + .asciz "En_Ik_inConfrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80A78A20 +.word L80A77A44 +.word L80A77A54 +.word L80A77A68 +.word L80A77A78 +.word L80A77A8C +.word L80A77AA0 +.word L80A77AB4 + +.text glabel func_80A779DC /* 036CC 80A779DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 036D0 80A779E0 AFB00018 */ sw $s0, 0x0018($sp) @@ -79,5 +95,3 @@ glabel L80A77AB4 /* 037D0 80A77AE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 037D4 80A77AE4 03E00008 */ jr $ra /* 037D8 80A77AE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77AEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77AEC.s index 80b31ebef6..3383d18012 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77AEC.s @@ -7,5 +7,3 @@ glabel func_80A77AEC /* 037F0 80A77B00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 037F4 80A77B04 03E00008 */ jr $ra /* 037F8 80A77B08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B0C.s index fa65cc97e5..3e19a09c8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B0C.s @@ -11,5 +11,3 @@ glabel func_80A77B0C /* 03820 80A77B30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03824 80A77B34 03E00008 */ jr $ra /* 03828 80A77B38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B3C.s index d6eb451971..f88bf67396 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77B3C.s @@ -23,5 +23,3 @@ glabel func_80A77B3C /* 03880 80A77B90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03884 80A77B94 03E00008 */ jr $ra /* 03888 80A77B98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77BF8.s index 65435bf247..e0f7a399d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77BF8.s @@ -37,5 +37,3 @@ glabel func_80A77BF8 /* 03960 80A77C70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 03964 80A77C74 03E00008 */ jr $ra /* 03968 80A77C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s index 5380efab95..a46bd979b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s @@ -1,3 +1,53 @@ +.rdata +glabel D_80A7887C + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A78898 + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A788B4 + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A788D0 + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A788EC + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A78908 + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A78924 + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +.late_rodata +glabel jtbl_80A78A3C +.word L80A77CDC +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77EA4 +.word L80A77D38 +.word L80A77EA4 +.word L80A77D94 +.word L80A77EA4 +.word L80A77DF0 +.word L80A77E4C +.word 0x00000000 + +.text glabel func_80A77C7C /* 0396C 80A77C7C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 03970 80A77C80 AFBF001C */ sw $ra, 0x001C($sp) @@ -155,5 +205,3 @@ glabel L80A77EA4 /* 03BB4 80A77EC4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 03BB8 80A77EC8 03E00008 */ jr $ra /* 03BBC 80A77ECC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77ED0.s index e4ddde8e19..940c8f5aa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77ED0.s @@ -2,5 +2,3 @@ glabel func_80A77ED0 /* 03BC0 80A77ED0 AFA40000 */ sw $a0, 0x0000($sp) /* 03BC4 80A77ED4 03E00008 */ jr $ra /* 03BC8 80A77ED8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s index fa539c486e..334777415c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A78940 + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +glabel D_80A7895C + .asciz "../z_en_ik_inConfrontion.c" + .balign 4 + +.text glabel func_80A77EDC /* 03BCC 80A77EDC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 03BD0 80A77EE0 AFBF002C */ sw $ra, 0x002C($sp) @@ -101,5 +111,3 @@ glabel func_80A77EDC /* 03D58 80A78068 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 03D5C 80A7806C 03E00008 */ jr $ra /* 03D60 80A78070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s index cd56fa8554..820905730b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A789B0 + .asciz "En_Ik_inConfrontion_Init : %d !!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80A780D0 /* 03DC0 80A780D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 03DC4 80A780D4 AFBF001C */ sw $ra, 0x001C($sp) @@ -39,5 +45,3 @@ glabel func_80A780D0 /* 03E44 80A78154 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03E48 80A78158 03E00008 */ jr $ra /* 03E4C 80A7815C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s index 141d4b73a5..3971886a28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s @@ -27,5 +27,3 @@ glabel func_80A78160 /* 03EB0 80A781C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03EB4 80A781C4 03E00008 */ jr $ra /* 03EB8 80A781C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s index d28f4f7209..ddd97608dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s @@ -39,5 +39,3 @@ glabel func_80A781CC /* 03F44 80A78254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F48 80A78258 03E00008 */ jr $ra /* 03F4C 80A7825C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s index 5339eb30fd..5a4a205810 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s @@ -16,5 +16,3 @@ glabel EnIn_Destroy /* 00FF4 80A79FA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FF8 80A79FA8 03E00008 */ jr $ra /* 00FFC 80A79FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s index 0864de5868..fada25567f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A7BA0C + .asciz "../z_en_in.c" + .balign 4 + +glabel D_80A7BA1C + .asciz "../z_en_in.c" + .balign 4 + +.text glabel EnIn_Draw /* 02704 80A7B6B4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 02708 80A7B6B8 AFBF002C */ sw $ra, 0x002C($sp) @@ -91,4 +101,3 @@ glabel EnIn_Draw /* 02864 80A7B814 00000000 */ nop /* 02868 80A7B818 00000000 */ nop /* 0286C 80A7B81C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s index c233281bc2..eec95e16ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A7BA94 + .word 0x448A6000 +glabel D_80A7BA98 + .word 0xC569C000 + +.text glabel EnIn_Init /* 00EBC 80A79E6C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00EC0 80A79E70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 @@ -71,5 +78,3 @@ glabel EnIn_Init /* 00FB8 80A79F68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00FBC 80A79F6C 03E00008 */ jr $ra /* 00FC0 80A79F70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s index a19ac3034a..f0450e71f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s @@ -143,5 +143,3 @@ glabel EnIn_Update /* 02364 80A7B314 8FB10020 */ lw $s1, 0x0020($sp) /* 02368 80A7B318 03E00008 */ jr $ra /* 0236C 80A7B31C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s index 0a3d49e230..954a3c730b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s @@ -27,5 +27,3 @@ glabel func_80A78FB0 .L80A79008: /* 00058 80A79008 03E00008 */ jr $ra /* 0005C 80A7900C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s index 35be65abe1..20d59f1524 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80A7BA2C +.word L80A790B0 +.word L80A7913C +.word L80A79100 +.word L80A79124 +.word L80A7912C +.word L80A7912C +.word L80A79134 + +.text glabel func_80A79010 /* 00060 80A79010 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00064 80A79014 AFBF0014 */ sw $ra, 0x0014($sp) @@ -102,5 +113,3 @@ glabel L80A7913C /* 001AC 80A7915C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001B0 80A79160 03E00008 */ jr $ra /* 001B4 80A79164 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s index e15f2dc779..f5012fdedf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s @@ -28,5 +28,3 @@ glabel func_80A79168 /* 00210 80A791C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00214 80A791C4 03E00008 */ jr $ra /* 00218 80A791C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s index c4087f8368..1b5bba98ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s @@ -34,5 +34,3 @@ glabel func_80A791CC /* 00290 80A79240 00031400 */ sll $v0, $v1, 16 /* 00294 80A79244 03E00008 */ jr $ra /* 00298 80A79248 00021403 */ sra $v0, $v0, 16 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s index 9f6f1f63ad..cdb607c925 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s @@ -1,3 +1,16 @@ +.late_rodata +glabel jtbl_80A7BA48 +.word L80A792A8 +.word L80A792A8 +.word L80A79488 +.word L80A79488 +.word L80A79318 +.word L80A79488 +.word L80A7936C +.word L80A7936C +.word L80A793A8 + +.text glabel func_80A7924C /* 0029C 80A7924C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 002A0 80A79250 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -165,5 +178,3 @@ glabel L80A79488 /* 004E0 80A79490 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004E4 80A79494 03E00008 */ jr $ra /* 004E8 80A79498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7949C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7949C.s index 5a356e8b24..f7c7b8c087 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7949C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7949C.s @@ -26,5 +26,3 @@ glabel func_80A7949C /* 00544 80A794F4 00021403 */ sra $v0, $v0, 16 /* 00548 80A794F8 03E00008 */ jr $ra /* 0054C 80A794FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79500.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79500.s index dedce19177..9b3362adb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79500.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79500.s @@ -1,3 +1,22 @@ +.rdata +glabel D_80A7B9D0 + .asciz "message_check->(%d[%x])\n" + .balign 4 + +.late_rodata +glabel jtbl_80A7BA6C +.word L80A795B4 +.word L80A795B4 +.word L80A79564 +.word L80A795B4 +.word L80A79578 +.word L80A79598 +.word L80A795B4 +.word L80A795B4 +.word L80A795B4 +.word L80A795B4 + +.text glabel func_80A79500 /* 00550 80A79500 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00554 80A79504 AFA40020 */ sw $a0, 0x0020($sp) @@ -55,5 +74,3 @@ glabel L80A795B4 /* 0060C 80A795BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00610 80A795C0 03E00008 */ jr $ra /* 00614 80A795C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s index 33e9b5e486..01236a00ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s @@ -54,5 +54,3 @@ glabel func_80A795C8 /* 006D4 80A79684 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006D8 80A79688 03E00008 */ jr $ra /* 006DC 80A7968C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s index 9b1e611e5a..019a8abda4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s @@ -23,5 +23,3 @@ glabel func_80A79690 /* 00730 80A796E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00734 80A796E4 03E00008 */ jr $ra /* 00738 80A796E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s index b53711975e..89538536e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s @@ -29,5 +29,3 @@ glabel func_80A796EC /* 007A0 80A79750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 007A4 80A79754 03E00008 */ jr $ra /* 007A8 80A79758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s index 52f4028582..6cefd962ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s @@ -57,5 +57,3 @@ glabel func_80A7975C /* 00874 80A79824 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00878 80A79828 03E00008 */ jr $ra /* 0087C 80A7982C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s index f8114c0a3a..40b35a4aa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s @@ -140,5 +140,3 @@ glabel func_80A79830 .L80A79A24: /* 00A74 80A79A24 03E00008 */ jr $ra /* 00A78 80A79A28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s index 7d43108499..2cc43a23d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s @@ -37,5 +37,3 @@ glabel func_80A79A2C /* 00AF8 80A79AA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AFC 80A79AAC 03E00008 */ jr $ra /* 00B00 80A79AB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s index 9f5d51703d..c3e9969c4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s @@ -63,5 +63,3 @@ glabel func_80A79AB4 /* 00BF0 80A79BA0 00000000 */ nop /* 00BF4 80A79BA4 03E00008 */ jr $ra /* 00BF8 80A79BA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s index 6ffe77bc98..e9b52c4648 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s @@ -52,5 +52,3 @@ glabel func_80A79BAC /* 00CBC 80A79C6C A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E /* 00CC0 80A79C70 03E00008 */ jr $ra /* 00CC4 80A79C74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s index 05f3158ae6..1cc61b351b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s @@ -128,5 +128,3 @@ glabel func_80A79C78 /* 00EB0 80A79E60 8FB20020 */ lw $s2, 0x0020($sp) /* 00EB4 80A79E64 03E00008 */ jr $ra /* 00EB8 80A79E68 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s index 19c5a5f90f..1873c7b82b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s @@ -1,3 +1,24 @@ +.late_rodata +glabel jtbl_80A7BA9C +.word L80A7A1A4 +.word L80A7A1BC +.word L80A7A1A4 +.word L80A7A1A4 +.word L80A7A1A4 +.word L80A7A1D0 +.word L80A7A1D0 +.word L80A7A1A4 +glabel jtbl_80A7BABC +.word L80A7A21C +.word L80A7A244 +.word L80A7A21C +.word L80A7A270 +.word L80A7A28C +.word L80A7A2B0 +.word L80A7A2B0 +.word L80A7A2D8 + +.text glabel func_80A79FB0 /* 01000 80A79FB0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01004 80A79FB4 AFB00028 */ sw $s0, 0x0028($sp) @@ -239,5 +260,3 @@ glabel L80A7A2D8 /* 01348 80A7A2F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0134C 80A7A2FC 03E00008 */ jr $ra /* 01350 80A7A300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s index 78e2039007..a2cccec80a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A7BADC + .float 0.3 + +.text glabel func_80A7A304 /* 01354 80A7A304 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01358 80A7A308 AFBF002C */ sw $ra, 0x002C($sp) @@ -124,5 +129,3 @@ glabel func_80A7A304 /* 01500 80A7A4B0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01504 80A7A4B4 03E00008 */ jr $ra /* 01508 80A7A4B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4BC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4BC.s index 55bc0bac34..2df49ecc29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4BC.s @@ -2,5 +2,3 @@ glabel func_80A7A4BC /* 0150C 80A7A4BC AFA40000 */ sw $a0, 0x0000($sp) /* 01510 80A7A4C0 03E00008 */ jr $ra /* 01514 80A7A4C4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s index c70cddeb28..4ec7ec313e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s @@ -40,5 +40,3 @@ glabel func_80A7A4C8 /* 015AC 80A7A55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015B0 80A7A560 03E00008 */ jr $ra /* 015B4 80A7A564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s index f897093a04..5c4957697e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s @@ -140,5 +140,3 @@ glabel func_80A7A568 /* 017B4 80A7A764 8FB10020 */ lw $s1, 0x0020($sp) /* 017B8 80A7A768 03E00008 */ jr $ra /* 017BC 80A7A76C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s index 0207339c12..d077a17796 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s @@ -55,5 +55,3 @@ glabel func_80A7A770 /* 0188C 80A7A83C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01890 80A7A840 03E00008 */ jr $ra /* 01894 80A7A844 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s index 042e01d2f0..538e7883d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s @@ -66,5 +66,3 @@ glabel func_80A7A848 /* 01984 80A7A934 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01988 80A7A938 03E00008 */ jr $ra /* 0198C 80A7A93C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s index 0ffb4c3b15..20102809af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s @@ -68,5 +68,3 @@ glabel func_80A7A940 /* 01A84 80A7AA34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A88 80A7AA38 03E00008 */ jr $ra /* 01A8C 80A7AA3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s index eece81925d..e229891a9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s @@ -100,5 +100,3 @@ glabel func_80A7AA40 /* 01C18 80A7ABC8 8FB00014 */ lw $s0, 0x0014($sp) /* 01C1C 80A7ABCC 03E00008 */ jr $ra /* 01C20 80A7ABD0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s index cbcebdf4ec..40a4453508 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s @@ -188,5 +188,3 @@ glabel func_80A7ABD4 /* 01EC8 80A7AE78 8FB00028 */ lw $s0, 0x0028($sp) /* 01ECC 80A7AE7C 03E00008 */ jr $ra /* 01ED0 80A7AE80 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s index d6b739a073..d3842265be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s @@ -26,5 +26,3 @@ glabel func_80A7AE84 /* 01F34 80A7AEE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F38 80A7AEE8 03E00008 */ jr $ra /* 01F3C 80A7AEEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s index 1a59d239b8..3ad364fdc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s @@ -80,5 +80,3 @@ glabel func_80A7AEF0 /* 0205C 80A7B00C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02060 80A7B010 03E00008 */ jr $ra /* 02064 80A7B014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B018.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B018.s index 8fd3a8427d..fc551077b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B018.s @@ -2,5 +2,3 @@ glabel func_80A7B018 /* 02068 80A7B018 AFA40000 */ sw $a0, 0x0000($sp) /* 0206C 80A7B01C 03E00008 */ jr $ra /* 02070 80A7B020 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s index acbdae002e..6875776f16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s @@ -62,5 +62,3 @@ glabel func_80A7B024 /* 02154 80A7B104 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02158 80A7B108 03E00008 */ jr $ra /* 0215C 80A7B10C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s index e5991c356c..0b381dcc64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_80A7BAE0 + .float 1500.0 + +glabel D_80A7BAE4 + .float 3.14159274101 + +glabel D_80A7BAE8 + .float 3.14159274101 + +glabel D_80A7BAEC + .word 0xC4BB8000 +glabel D_80A7BAF0 + .float 3.14159274101 + +glabel D_80A7BAF4 + .float 3.14159274101 + +.text glabel func_80A7B320 /* 02370 80A7B320 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02374 80A7B324 8FAE004C */ lw $t6, 0x004C($sp) @@ -155,5 +174,3 @@ glabel func_80A7B320 /* 025B4 80A7B564 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 025B8 80A7B568 03E00008 */ jr $ra /* 025BC 80A7B56C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s index 8cc50b6061..8093e74e31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A7B9EC + .asciz "../z_en_in.c" + .balign 4 + +glabel D_80A7B9FC + .asciz "../z_en_in.c" + .balign 4 + +.text glabel func_80A7B570 /* 025C0 80A7B570 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 025C4 80A7B574 3C0F80A8 */ lui $t7, %hi(D_80A7B9A8) ## $t7 = 80A80000 @@ -83,5 +93,3 @@ glabel func_80A7B570 /* 026F8 80A7B6A8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 026FC 80A7B6AC 03E00008 */ jr $ra /* 02700 80A7B6B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s index 8d1ecefe96..ec7a73b345 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s @@ -29,5 +29,3 @@ glabel EnInsect_Destroy /* 00574 80A7C394 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00578 80A7C398 03E00008 */ jr $ra /* 0057C 80A7C39C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Draw.s index 365d57b598..4f3f35efdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Draw.s @@ -26,4 +26,3 @@ glabel EnInsect_Draw /* 02084 80A7DEA4 00000000 */ nop /* 02088 80A7DEA8 00000000 */ nop /* 0208C 80A7DEAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s index 7ff3bd996f..b0caa7b8cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A7DFD0 + .word 0xBE4CCCCD +glabel D_80A7DFD4 + .float 0.3 + +glabel D_80A7DFD8 + .float 0.4 + +.text glabel EnInsect_Init /* 002CC 80A7C0EC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 002D0 80A7C0F0 AFB3003C */ sw $s3, 0x003C($sp) @@ -161,5 +171,3 @@ glabel EnInsect_Init /* 00508 80A7C328 8FB40040 */ lw $s4, 0x0040($sp) /* 0050C 80A7C32C 03E00008 */ jr $ra /* 00510 80A7C330 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s index 775907025e..b0677c6166 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s @@ -166,5 +166,3 @@ glabel EnInsect_Update /* 0201C 80A7DE3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02020 80A7DE40 03E00008 */ jr $ra /* 02024 80A7DE44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE20.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE20.s index 116e767878..cf40a27ebb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE20.s @@ -7,5 +7,3 @@ glabel func_80A7BE20 /* 00014 80A7BE34 9739DF10 */ lhu $t9, %lo(D_80A7DF10)($t9) /* 00018 80A7BE38 03E00008 */ jr $ra /* 0001C 80A7BE3C A4990314 */ sh $t9, 0x0314($a0) ## 00000314 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE40.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE40.s index 361d953c54..8814fbed1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE40.s @@ -10,5 +10,3 @@ glabel func_80A7BE40 /* 00040 80A7BE60 460C6482 */ mul.s $f18, $f12, $f12 /* 00044 80A7BE64 03E00008 */ jr $ra /* 00048 80A7BE68 46128000 */ add.s $f0, $f16, $f18 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE6C.s index ff01e9b4c4..d495ee7569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BE6C.s @@ -61,5 +61,3 @@ glabel func_80A7BE6C /* 0012C 80A7BF4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00130 80A7BF50 03E00008 */ jr $ra /* 00134 80A7BF54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s index 088010af9e..4aa4ee8a1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s @@ -18,5 +18,3 @@ glabel func_80A7BF58 /* 00174 80A7BF94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00178 80A7BF98 03E00008 */ jr $ra /* 0017C 80A7BF9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BFA0.s index d305b2c666..f0caf3aa73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BFA0.s @@ -48,5 +48,3 @@ glabel func_80A7BFA0 /* 0022C 80A7C04C 8FB20024 */ lw $s2, 0x0024($sp) /* 00230 80A7C050 03E00008 */ jr $ra /* 00234 80A7C054 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C058.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C058.s index 9e8869f92d..5af9c9bf5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C058.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A7DFCC + .float 0.1 + +.text glabel func_80A7C058 /* 00238 80A7C058 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0023C 80A7C05C AFBF0014 */ sw $ra, 0x0014($sp) @@ -41,5 +46,3 @@ glabel func_80A7C058 /* 002C0 80A7C0E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002C4 80A7C0E4 03E00008 */ jr $ra /* 002C8 80A7C0E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3A0.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3A0.s index be6d13d691..95d9ae12de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3A0.s @@ -21,5 +21,3 @@ glabel func_80A7C3A0 /* 005C8 80A7C3E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005CC 80A7C3EC 03E00008 */ jr $ra /* 005D0 80A7C3F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3F4.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3F4.s index 9f0638566b..ba51b5c85a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C3F4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A7DFDC + .float 1.2 + +glabel D_80A7DFE0 + .float 0.8 + +glabel D_80A7DFE4 + .float 1.9 + +.text glabel func_80A7C3F4 /* 005D4 80A7C3F4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 005D8 80A7C3F8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -118,5 +129,3 @@ glabel func_80A7C3F4 /* 0076C 80A7C58C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00770 80A7C590 03E00008 */ jr $ra /* 00774 80A7C594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C598.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C598.s index 84dcff4b7d..1dd0b2ffc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C598.s @@ -21,5 +21,3 @@ glabel func_80A7C598 /* 007C0 80A7C5E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007C4 80A7C5E4 03E00008 */ jr $ra /* 007C8 80A7C5E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C5EC.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C5EC.s index 712e052b5b..ce2bfbd68b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C5EC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A7DFE8 + .float 0.7 + +glabel D_80A7DFEC + .float 1.4 + +glabel D_80A7DFF0 + .float 1.9 + +.text glabel func_80A7C5EC /* 007CC 80A7C5EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 007D0 80A7C5F0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -158,5 +169,3 @@ glabel func_80A7C5EC /* 009EC 80A7C80C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 009F0 80A7C810 03E00008 */ jr $ra /* 009F4 80A7C814 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C818.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C818.s index c276ee086e..002771324f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C818.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C818.s @@ -21,5 +21,3 @@ glabel func_80A7C818 /* 00A40 80A7C860 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A44 80A7C864 03E00008 */ jr $ra /* 00A48 80A7C868 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C86C.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C86C.s index dd27983617..e8613d8e06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C86C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7C86C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A7DFF4 + .float 0.8 + +glabel D_80A7DFF8 + .float 1.6 + +glabel D_80A7DFFC + .float 1.9 + +.text glabel func_80A7C86C /* 00A4C 80A7C86C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00A50 80A7C870 AFBF0024 */ sw $ra, 0x0024($sp) @@ -144,5 +155,3 @@ glabel func_80A7C86C /* 00C38 80A7CA58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00C3C 80A7CA5C 03E00008 */ jr $ra /* 00C40 80A7CA60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CA64.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CA64.s index 605eeaff4d..6b38dac667 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CA64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CA64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A7E000 + .float 0.3 + +.text glabel func_80A7CA64 /* 00C44 80A7CA64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00C48 80A7CA68 AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,5 +32,3 @@ glabel func_80A7CA64 /* 00CA4 80A7CAC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CA8 80A7CAC8 03E00008 */ jr $ra /* 00CAC 80A7CACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CAD0.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CAD0.s index ec34d2ae7d..9affdf156d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CAD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CAD0.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80A7E004 + .float 0.01 + +glabel D_80A7E008 + .float 0.01 + +glabel D_80A7E00C + .float 0.001 + +.text glabel func_80A7CAD0 /* 00CB0 80A7CAD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00CB4 80A7CAD4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -71,5 +82,3 @@ glabel func_80A7CAD0 /* 00D9C 80A7CBBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DA0 80A7CBC0 03E00008 */ jr $ra /* 00DA4 80A7CBC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CBC8.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CBC8.s index 2b809eac06..3e3459aa81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CBC8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A7E010 + .float 1.9 + +.text glabel func_80A7CBC8 /* 00DA8 80A7CBC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00DAC 80A7CBCC AFBF001C */ sw $ra, 0x001C($sp) @@ -30,5 +35,3 @@ glabel func_80A7CBC8 /* 00E10 80A7CC30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E14 80A7CC34 03E00008 */ jr $ra /* 00E18 80A7CC38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CC3C.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CC3C.s index 437effd285..43aa1e87f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CC3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CC3C.s @@ -1,3 +1,24 @@ +.late_rodata +glabel D_80A7E014 + .float 0.001 + +glabel D_80A7E018 + .word 0x3951B717 +glabel D_80A7E01C + .float 0.8 + +glabel D_80A7E020 + .float 0.1 + +glabel D_80A7E024 + .word 0xBF19999A +glabel D_80A7E028 + .float 0.6 + +glabel D_80A7E02C + .word 0xBF19999A + +.text glabel func_80A7CC3C /* 00E1C 80A7CC3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E20 80A7CC40 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 @@ -153,5 +174,3 @@ glabel func_80A7CC3C /* 01034 80A7CE54 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01038 80A7CE58 03E00008 */ jr $ra /* 0103C 80A7CE5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CE60.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CE60.s index ae13bb513f..3c52e8a3a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CE60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CE60.s @@ -24,5 +24,3 @@ glabel func_80A7CE60 /* 01094 80A7CEB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01098 80A7CEB8 03E00008 */ jr $ra /* 0109C 80A7CEBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CEC0.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CEC0.s index c93a17b91e..b4ca4d1385 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CEC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7CEC0.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80A7E030 + .float 0.1 + +glabel D_80A7E034 + .word 0x3C9374BC +glabel D_80A7E038 + .float 1.9 + +glabel D_80A7E03C + .float 0.03 + +.text glabel func_80A7CEC0 /* 010A0 80A7CEC0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 010A4 80A7CEC4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -231,5 +244,3 @@ glabel func_80A7CEC0 /* 013C8 80A7D1E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 013CC 80A7D1EC 03E00008 */ jr $ra /* 013D0 80A7D1F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D1F4.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D1F4.s index 0ffded4a52..df7fe0be43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D1F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D1F4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A7E040 + .float -0.8 + +glabel D_80A7E044 + .word 0xBD23D70A + +.text glabel func_80A7D1F4 /* 013D4 80A7D1F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 013D8 80A7D1F8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +37,3 @@ glabel func_80A7D1F4 /* 01440 80A7D260 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01444 80A7D264 03E00008 */ jr $ra /* 01448 80A7D268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D26C.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D26C.s index c11478b51c..2afa99e742 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D26C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D26C.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_80A7E048 + .float 0.001 + +glabel D_80A7E04C + .word 0x3851B717 +glabel D_80A7E050 + .float 0.3 + +glabel D_80A7E054 + .float 0.04 + +glabel D_80A7E058 + .float 0.02 + +.text glabel func_80A7D26C /* 0144C 80A7D26C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01450 80A7D270 AFBF0024 */ sw $ra, 0x0024($sp) @@ -82,5 +98,3 @@ glabel func_80A7D26C /* 01570 80A7D390 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01574 80A7D394 03E00008 */ jr $ra /* 01578 80A7D398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D39C.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D39C.s index 31ae25abe3..d460e21b5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D39C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D39C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80A7E05C + .word 0x477FFF80 +glabel D_80A7E060 + .float 1500.0 + +glabel D_80A7E064 + .word 0x477FFF80 + +.text glabel func_80A7D39C /* 0157C 80A7D39C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01580 80A7D3A0 AFBF001C */ sw $ra, 0x001C($sp) @@ -52,5 +62,3 @@ glabel func_80A7D39C /* 01634 80A7D454 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01638 80A7D458 03E00008 */ jr $ra /* 0163C 80A7D45C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s index f99d5de5e4..676e6e8fc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s @@ -1,3 +1,84 @@ +.rdata +glabel D_80A7DF40 + .asciz "" + .balign 4 + +glabel D_80A7DF4C + .asciz "warning:目標 Actor が NULL (%s %d)\n" + .balign 4 + +glabel D_80A7DF70 + .asciz "../z_en_mushi.c" + .balign 4 + +glabel D_80A7DF80 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A7DF84 + .asciz "" + .balign 4 + +glabel D_80A7DF90 + .asciz "BG 抜け？ Actor_delete します(%s %d)\n" + .balign 4 + +glabel D_80A7DFB8 + .asciz "../z_en_mushi.c" + .balign 4 + +glabel D_80A7DFC8 + .asciz "\x1b[m" + .balign 4 + +.late_rodata +glabel D_80A7E068 + .word 0x3B5A740D +glabel D_80A7E06C + .word 0x3F7FBE77 +glabel D_80A7E070 + .float 1.1 + +glabel D_80A7E074 + .word 0x3D8F5C29 +glabel D_80A7E078 + .word 0x3F7FBE77 +glabel D_80A7E07C + .float 0.6 + +glabel D_80A7E080 + .word 0x3D8F5C29 +glabel D_80A7E084 + .float 0.1 + +glabel D_80A7E088 + .float 0.8 + +glabel D_80A7E08C + .float 1.3 + +glabel D_80A7E090 + .word 0x477FFF00 +glabel D_80A7E094 + .float 0.01 + +glabel D_80A7E098 + .word 0x3A51B717 +glabel D_80A7E09C + .word 0x3E0F5C29 +glabel D_80A7E0A0 + .float 0.12 + +glabel D_80A7E0A4 + .float 1.3 + +glabel D_80A7E0A8 + .float 1.9 + +glabel D_80A7E0AC + .word 0xC6F9EC00 + +.text glabel func_80A7D460 /* 01640 80A7D460 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01644 80A7D464 AFBF0024 */ sw $ra, 0x0024($sp) @@ -552,5 +633,3 @@ glabel func_80A7D460 /* 01DD4 80A7DBF4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01DD8 80A7DBF8 03E00008 */ jr $ra /* 01DDC 80A7DBFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s index cd5417975c..7ef39fccb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s @@ -10,5 +10,3 @@ glabel EnIshi_Destroy /* 00C2C 80A7F08C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C30 80A7F090 03E00008 */ jr $ra /* 00C34 80A7F094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s index aee2873b77..45ef749285 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s @@ -15,4 +15,3 @@ glabel EnIshi_Draw /* 01584 80A7F9E4 00000000 */ nop /* 01588 80A7F9E8 00000000 */ nop /* 0158C 80A7F9EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s index b7bf35532e..dc4ff58c85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s @@ -112,5 +112,3 @@ glabel EnIshi_Init /* 00C04 80A7F064 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C08 80A7F068 03E00008 */ jr $ra /* 00C0C 80A7F06C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s index 1fefdc8a98..0b3fcb3414 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s @@ -8,5 +8,3 @@ glabel EnIshi_Update /* 01434 80A7F894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01438 80A7F898 03E00008 */ jr $ra /* 0143C 80A7F89C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s index 0e3d5d0576..cc1b420c04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s @@ -32,5 +32,3 @@ glabel func_80A7E460 /* 0006C 80A7E4CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00070 80A7E4D0 03E00008 */ jr $ra /* 00074 80A7E4D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s index e01f0426e7..be6673a302 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A873F0 + .asciz "" + .balign 4 + +glabel D_80A873FC + .asciz "地面に付着失敗(%s %d)\n" + .balign 4 + +glabel D_80A87414 + .asciz "../z_en_ishi.c" + .balign 4 + +glabel D_80A87424 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_80A7E4D8 /* 00078 80A7E4D8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0007C 80A7E4DC AFBF001C */ sw $ra, 0x001C($sp) @@ -57,5 +75,3 @@ glabel func_80A7E4D8 /* 0013C 80A7E59C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00140 80A7E5A0 03E00008 */ jr $ra /* 00144 80A7E5A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s index 6129cbd40b..b69b67e604 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A87458 + .float -0.8 + +glabel D_80A8745C + .float 0.8 + +.text glabel func_80A7E5A8 /* 00148 80A7E5A8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 0014C 80A7E5AC F7BE0068 */ sdc1 $f30, 0x0068($sp) @@ -172,5 +180,3 @@ glabel func_80A7E5A8 /* 003B8 80A7E818 8FB70090 */ lw $s7, 0x0090($sp) /* 003BC 80A7E81C 03E00008 */ jr $ra /* 003C0 80A7E820 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s index a074327e1f..545c9b07f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80A87460 + .float -0.9 + +glabel D_80A87464 + .float 0.9 + +glabel D_80A87468 + .float -0.8 + +glabel D_80A8746C + .float 0.8 + +glabel D_80A87470 + .float 0.7 + +.text glabel func_80A7E824 /* 003C4 80A7E824 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 003C8 80A7E828 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -203,5 +220,3 @@ glabel func_80A7E824 /* 006A4 80A7EB04 8FBE0098 */ lw $s8, 0x0098($sp) /* 006A8 80A7EB08 03E00008 */ jr $ra /* 006AC 80A7EB0C 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s index 10201d038a..c6fba244ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s @@ -64,5 +64,3 @@ glabel func_80A7EB10 /* 00798 80A7EBF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0079C 80A7EBFC 03E00008 */ jr $ra /* 007A0 80A7EC00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s index 00ccbadfdd..4532294885 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s @@ -64,5 +64,3 @@ glabel func_80A7EC04 /* 0088C 80A7ECEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00890 80A7ECF0 03E00008 */ jr $ra /* 00894 80A7ECF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s index b9e01eed3a..9744605b2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s @@ -28,5 +28,3 @@ glabel func_80A7ECF8 /* 008F4 80A7ED54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008F8 80A7ED58 03E00008 */ jr $ra /* 008FC 80A7ED5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s index 2d86fd0fb0..d69d255519 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s @@ -13,5 +13,3 @@ glabel func_80A7ED60 .L80A7ED8C: /* 0092C 80A7ED8C 03E00008 */ jr $ra /* 00930 80A7ED90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s index 0d2a5039a5..115f85c196 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A87474 + .float 0.2 + +glabel D_80A87478 + .float 0.1 + +.text glabel func_80A7ED94 /* 00934 80A7ED94 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 /* 00938 80A7ED98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 @@ -34,5 +42,3 @@ glabel func_80A7ED94 /* 009B0 80A7EE10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009B4 80A7EE14 03E00008 */ jr $ra /* 009B8 80A7EE18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s index ea77e7f2f8..efe738100f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A8747C + .word 0x477FFF00 + +.text glabel func_80A7EE1C /* 009BC 80A7EE1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 009C0 80A7EE20 AFB40048 */ sw $s4, 0x0048($sp) @@ -50,5 +55,3 @@ glabel func_80A7EE1C /* 00A6C 80A7EECC 8FB40048 */ lw $s4, 0x0048($sp) /* 00A70 80A7EED0 03E00008 */ jr $ra /* 00A74 80A7EED4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s index 25fbffb604..302f9be6d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s @@ -3,5 +3,3 @@ glabel func_80A7F098 /* 00C3C 80A7F09C 25CEF0A8 */ addiu $t6, $t6, %lo(func_80A7F0A8) ## $t6 = 80A7F0A8 /* 00C40 80A7F0A0 03E00008 */ jr $ra /* 00C44 80A7F0A4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s index a9674cda45..3830b21fcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s @@ -157,5 +157,3 @@ glabel func_80A7F0A8 /* 00E8C 80A7F2EC 8FB10020 */ lw $s1, 0x0020($sp) /* 00E90 80A7F2F0 03E00008 */ jr $ra /* 00E94 80A7F2F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s index 10126604eb..a5237ed4b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s @@ -8,5 +8,3 @@ glabel func_80A7F2F8 /* 00EB0 80A7F310 A08F0003 */ sb $t7, 0x0003($a0) ## 00000003 /* 00EB4 80A7F314 03E00008 */ jr $ra /* 00EB8 80A7F318 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s index 0726576bb6..5205a9f7a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s @@ -53,5 +53,3 @@ glabel func_80A7F31C /* 00F7C 80A7F3DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F80 80A7F3E0 03E00008 */ jr $ra /* 00F84 80A7F3E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s index 196df76664..ab476da1a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s @@ -82,5 +82,3 @@ glabel func_80A7F3E8 /* 010A8 80A7F508 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 010AC 80A7F50C 03E00008 */ jr $ra /* 010B0 80A7F510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s index f206b8d042..d8be9c5609 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s @@ -230,5 +230,3 @@ glabel func_80A7F514 /* 01410 80A7F870 8FB10020 */ lw $s1, 0x0020($sp) /* 01414 80A7F874 03E00008 */ jr $ra /* 01418 80A7F878 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s index 06d303d4d2..d0ebbce452 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s @@ -11,5 +11,3 @@ glabel func_80A7F8A0 /* 01460 80A7F8C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01464 80A7F8C4 03E00008 */ jr $ra /* 01468 80A7F8C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s index 38e9152e9c..bf77f25473 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A87428 + .asciz "../z_en_ishi.c" + .balign 4 + +glabel D_80A87438 + .asciz "../z_en_ishi.c" + .balign 4 + +glabel D_80A87448 + .asciz "../z_en_ishi.c" + .balign 4 + +.text glabel func_80A7F8CC /* 0146C 80A7F8CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01470 80A7F8D0 AFBF001C */ sw $ra, 0x001C($sp) @@ -56,5 +70,3 @@ glabel func_80A7F8CC /* 01544 80A7F9A4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01548 80A7F9A8 03E00008 */ jr $ra /* 0154C 80A7F9AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s index 79759b4c0f..9dc9c61a0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s @@ -40,5 +40,3 @@ glabel EnJj_Destroy /* 00310 80A87B10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00314 80A87B14 03E00008 */ jr $ra /* 00318 80A87B18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s index b94b8f2980..e499a0409a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A88D10 + .asciz "../z_en_jj.c" + .balign 4 + +glabel D_80A88D20 + .asciz "../z_en_jj.c" + .balign 4 + +.late_rodata +glabel D_80A88D34 + .float 0.076624215 + +.text glabel EnJj_Draw /* 00800 80A88000 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00804 80A88004 AFBF002C */ sw $ra, 0x002C($sp) @@ -80,4 +94,3 @@ glabel EnJj_Draw /* 00934 80A88134 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00938 80A88138 03E00008 */ jr $ra /* 0093C 80A8813C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index 88dc71552a..25ad5e1c99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -185,5 +185,3 @@ glabel EnJj_Init /* 00288 80A87A88 8FB10038 */ lw $s1, 0x0038($sp) /* 0028C 80A87A8C 03E00008 */ jr $ra /* 00290 80A87A90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Update.s index 3b016c36ae..669939ca8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Update.s @@ -48,5 +48,3 @@ glabel EnJj_Update /* 007F4 80A87FF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007F8 80A87FF8 03E00008 */ jr $ra /* 007FC 80A87FFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87800.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87800.s index 6e634631af..d70dece24a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87800.s @@ -1,5 +1,3 @@ glabel func_80A87800 /* 00000 80A87800 03E00008 */ jr $ra /* 00004 80A87804 AC8502FC */ sw $a1, 0x02FC($a0) ## 000002FC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s index a374828b09..e295bb578f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s @@ -35,5 +35,3 @@ glabel func_80A87B1C /* 00390 80A87B90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00394 80A87B94 03E00008 */ jr $ra /* 00398 80A87B98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B9C.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B9C.s index 64ba175a7f..7befdbaa31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B9C.s @@ -21,5 +21,3 @@ glabel func_80A87B9C /* 003E0 80A87BE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003E4 80A87BE4 03E00008 */ jr $ra /* 003E8 80A87BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87BEC.s index 4238582f37..e7a9691b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87BEC.s @@ -17,5 +17,3 @@ glabel func_80A87BEC /* 00424 80A87C24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00428 80A87C28 03E00008 */ jr $ra /* 0042C 80A87C2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s index ac2515ee10..79e231d8a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s @@ -50,5 +50,3 @@ glabel func_80A87C30 /* 004E0 80A87CE0 8FB10018 */ lw $s1, 0x0018($sp) /* 004E4 80A87CE4 03E00008 */ jr $ra /* 004E8 80A87CE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s index afba908114..ab771c0228 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s @@ -43,5 +43,3 @@ glabel func_80A87CEC /* 00588 80A87D88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0058C 80A87D8C 03E00008 */ jr $ra /* 00590 80A87D90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s index 71ae9693d8..461c8a48ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A88D30 + .float -1100.0 + +.text glabel func_80A87D94 /* 00594 80A87D94 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00598 80A87D98 AFBF003C */ sw $ra, 0x003C($sp) @@ -95,5 +100,3 @@ glabel func_80A87D94 /* 006E4 80A87EE4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 006E8 80A87EE8 03E00008 */ jr $ra /* 006EC 80A87EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87EF0.s index a36947b092..3a55c86471 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87EF0.s @@ -23,5 +23,3 @@ glabel func_80A87EF0 /* 00738 80A87F38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0073C 80A87F3C 03E00008 */ jr $ra /* 00740 80A87F40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87F44.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87F44.s index ac7879b219..d246c30d92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87F44.s @@ -2,5 +2,3 @@ glabel func_80A87F44 /* 00744 80A87F44 AFA40000 */ sw $a0, 0x0000($sp) /* 00748 80A87F48 03E00008 */ jr $ra /* 0074C 80A87F4C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s index 77324cdbc5..6831bccdaf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s @@ -10,5 +10,3 @@ glabel EnJs_Destroy /* 00148 80A88F58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0014C 80A88F5C 03E00008 */ jr $ra /* 00150 80A88F60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s index 42654dda55..c8046d6d8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s @@ -22,4 +22,3 @@ glabel EnJs_Draw /* 00874 80A89684 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00878 80A89688 03E00008 */ jr $ra /* 0087C 80A8968C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s index b3d975d9fa..8355526837 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s @@ -77,5 +77,3 @@ glabel EnJs_Init /* 00120 80A88F30 8FB10038 */ lw $s1, 0x0038($sp) /* 00124 80A88F34 03E00008 */ jr $ra /* 00128 80A88F38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s index f5161c783a..7218006f8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s @@ -181,5 +181,3 @@ glabel EnJs_Update /* 007A4 80A895B4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 007A8 80A895B8 03E00008 */ jr $ra /* 007AC 80A895BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88E10.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88E10.s index 5108ea4c18..de4ba0c213 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88E10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88E10.s @@ -1,5 +1,3 @@ glabel func_80A88E10 /* 00000 80A88E10 03E00008 */ jr $ra /* 00004 80A88E14 AC85028C */ sw $a1, 0x028C($a0) ## 0000028C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88F64.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88F64.s index 7b671d4bb7..99e67527fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88F64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A88F64.s @@ -45,5 +45,3 @@ glabel func_80A88F64 /* 001EC 80A88FFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001F0 80A89000 03E00008 */ jr $ra /* 001F4 80A89004 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s index 8ba357a796..18ef3928fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s @@ -29,5 +29,3 @@ glabel func_80A89008 /* 0025C 80A8906C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00260 80A89070 03E00008 */ jr $ra /* 00264 80A89074 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89078.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89078.s index 04bb83b34a..5dce1c921a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89078.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89078.s @@ -18,5 +18,3 @@ glabel func_80A89078 /* 002A4 80A890B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A8 80A890B8 03E00008 */ jr $ra /* 002AC 80A890BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A890C0.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A890C0.s index 5892710e03..f82c31fc5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A890C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A890C0.s @@ -20,5 +20,3 @@ glabel func_80A890C0 /* 002F0 80A89100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F4 80A89104 03E00008 */ jr $ra /* 002F8 80A89108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A8910C.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A8910C.s index 2c319fc78a..8fd20e854c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A8910C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A8910C.s @@ -21,5 +21,3 @@ glabel func_80A8910C /* 00344 80A89154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00348 80A89158 03E00008 */ jr $ra /* 0034C 80A8915C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89160.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89160.s index a2ca44e19e..d1a6680daa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89160.s @@ -26,5 +26,3 @@ glabel func_80A89160 /* 003A8 80A891B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003AC 80A891BC 03E00008 */ jr $ra /* 003B0 80A891C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s index 11add59fbd..c6229ed555 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s @@ -56,5 +56,3 @@ glabel func_80A891C4 /* 00478 80A89288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0047C 80A8928C 03E00008 */ jr $ra /* 00480 80A89290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s index 3f957146dc..c6a1238c1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s @@ -29,5 +29,3 @@ glabel func_80A89294 /* 004E8 80A892F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004EC 80A892FC 03E00008 */ jr $ra /* 004F0 80A89300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89304.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89304.s index f617681d6a..885ff2077d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89304.s @@ -13,5 +13,3 @@ glabel func_80A89304 /* 0051C 80A8932C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00520 80A89330 03E00008 */ jr $ra /* 00524 80A89334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895C0.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895C0.s index e58f2b0df6..b49dc8b1f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895C0.s @@ -13,5 +13,3 @@ glabel func_80A895C0 .L80A895EC: /* 007DC 80A895EC 03E00008 */ jr $ra /* 007E0 80A895F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895F4.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895F4.s index bc67a59441..6e3aea7bb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895F4.s @@ -16,5 +16,3 @@ glabel func_80A895F4 /* 00818 80A89628 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0081C 80A8962C 03E00008 */ jr $ra /* 00820 80A89630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Destroy.s index 29fffa8f8f..fa0a19cc78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Destroy.s @@ -12,5 +12,3 @@ glabel EnJsjutan_Destroy /* 000B4 80A89854 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B8 80A89858 03E00008 */ jr $ra /* 000BC 80A8985C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s index e34b480889..4bc2673092 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A8E430 + .asciz "../z_en_jsjutan.c" + .balign 4 + +glabel D_80A8E444 + .asciz "../z_en_jsjutan.c" + .balign 4 + +glabel D_80A8E458 + .asciz "../z_en_jsjutan.c" + .balign 4 + +glabel D_80A8E46C + .asciz "../z_en_jsjutan.c" + .balign 4 + +.text glabel EnJsjutan_Draw /* 00E78 80A8A618 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00E7C 80A8A61C AFBF001C */ sw $ra, 0x001C($sp) @@ -289,4 +307,3 @@ glabel EnJsjutan_Draw /* 012C4 80A8AA64 03E00008 */ jr $ra /* 012C8 80A8AA68 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 012CC 80A8AA6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Init.s index 5fe8ad244f..c85beb712f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Init.s @@ -39,5 +39,3 @@ glabel EnJsjutan_Init /* 00084 80A89824 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00088 80A89828 03E00008 */ jr $ra /* 0008C 80A8982C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s index 249e98f13f..0e099d334a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s @@ -55,5 +55,3 @@ glabel EnJsjutan_Update /* 00E6C 80A8A60C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E70 80A8A610 03E00008 */ jr $ra /* 00E74 80A8A614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s index 09d89f9aee..14ca64ddba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A8E480 + .float 0.02 + +.text glabel func_80A89860 /* 000C0 80A89860 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 000C4 80A89864 AFBE0050 */ sw $s8, 0x0050($sp) @@ -133,5 +138,3 @@ glabel func_80A89860 /* 002C0 80A89A60 8FBE0050 */ lw $s8, 0x0050($sp) /* 002C4 80A89A64 03E00008 */ jr $ra /* 002C8 80A89A68 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s index ec8ff4e6ac..3dfbc860ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s @@ -1,3 +1,33 @@ +.late_rodata +glabel D_80A8E484 + .word 0x45ABE000 +glabel D_80A8E488 + .float 3000.0 + +glabel D_80A8E48C + .word 0x453B8000, 0x453B8000 +glabel D_80A8E494 + .float 2500.0 + +glabel D_80A8E498 + .float 1500.0 + +glabel D_80A8E49C + .float 0.01 + +glabel D_80A8E4A0 + .float 3000.0 + +glabel D_80A8E4A4 + .float 1500.0 + +glabel D_80A8E4A8 + .float 0.01 + +glabel D_80A8E4AC + .word 0x3B343958 + +.text glabel func_80A89A6C /* 002CC 80A89A6C 27BDFED8 */ addiu $sp, $sp, 0xFED8 ## $sp = FFFFFED8 /* 002D0 80A89A70 AFBF005C */ sw $ra, 0x005C($sp) @@ -740,5 +770,3 @@ glabel func_80A89A6C /* 00D94 80A8A534 8FB40058 */ lw $s4, 0x0058($sp) /* 00D98 80A8A538 03E00008 */ jr $ra /* 00D9C 80A8A53C 27BD0128 */ addiu $sp, $sp, 0x0128 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s index 8bf0dc8a23..8b684f6a1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s @@ -10,5 +10,3 @@ glabel EnKakasi_Destroy /* 0001C 80A8F18C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00020 80A8F190 03E00008 */ jr $ra /* 00024 80A8F194 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s index 26ee637b56..5722a683b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A8FEB8 + .asciz "\n\n" + .balign 4 + +glabel D_80A8FEBC + .asciz "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel EnKakasi_Draw /* 00BE0 80A8FD50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00BE4 80A8FD54 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -38,4 +48,3 @@ glabel EnKakasi_Draw /* 00C64 80A8FDD4 00000000 */ nop /* 00C68 80A8FDD8 00000000 */ nop /* 00C6C 80A8FDDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s index 5adf1af452..acb8b10fa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A8FE30 + .asciz "\n\n" + .balign 4 + +glabel D_80A8FE34 + .asciz "☆☆☆☆☆ Ｌｅｔ’ｓ ＤＡＮＣＥ！ ☆☆☆☆☆ %f\n" + .balign 4 + +.text glabel EnKakasi_Init /* 00028 80A8F198 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0002C 80A8F19C AFB00028 */ sw $s0, 0x0028($sp) @@ -65,5 +75,3 @@ glabel EnKakasi_Init /* 00110 80A8F280 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00114 80A8F284 03E00008 */ jr $ra /* 00118 80A8F288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s index 7e207ef03a..9bd266ea9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s @@ -70,5 +70,3 @@ glabel EnKakasi_Update /* 00BD4 80A8FD44 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00BD8 80A8FD48 03E00008 */ jr $ra /* 00BDC 80A8FD4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s index 71de335c9b..bf632a6635 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s @@ -40,5 +40,3 @@ glabel func_80A8F28C /* 001A4 80A8F314 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001A8 80A8F318 03E00008 */ jr $ra /* 001AC 80A8F31C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s index 17caf26569..e285b72775 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_80A8FEE8 + .word 0x412FD70A +glabel D_80A8FEEC + .word 0x409FAE14 +glabel D_80A8FEF0 + .word 0x403F5C29 +glabel jtbl_80A8FEF4 +.word L80A8F3D8 +.word L80A8F408 +.word L80A8F424 +.word L80A8F444 +.word L80A8F464 +.word 0x00000000, 0x00000000 + +.text glabel func_80A8F320 /* 001B0 80A8F320 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 001B4 80A8F324 AFA60030 */ sw $a2, 0x0030($sp) @@ -235,5 +251,3 @@ glabel L80A8F464 /* 004E4 80A8F654 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004E8 80A8F658 03E00008 */ jr $ra /* 004EC 80A8F65C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s index a5431cdb35..c24f2751f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s @@ -67,5 +67,3 @@ glabel func_80A8F660 /* 005E0 80A8F750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005E4 80A8F754 03E00008 */ jr $ra /* 005E8 80A8F758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s index 68f4770bb8..bec03c8abb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s @@ -101,5 +101,3 @@ glabel func_80A8F75C /* 00754 80A8F8C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00758 80A8F8C8 03E00008 */ jr $ra /* 0075C 80A8F8CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s index e73876056b..6781a6d8dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A8FE70 + .asciz "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80A8F8D0 /* 00760 80A8F8D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00764 80A8F8D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -66,5 +72,3 @@ glabel func_80A8F8D0 /* 0084C 80A8F9BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00850 80A8F9C0 03E00008 */ jr $ra /* 00854 80A8F9C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s index d18fb8c266..32c204ecc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s @@ -57,5 +57,3 @@ glabel func_80A8F9C8 /* 00928 80A8FA98 8FB10020 */ lw $s1, 0x0020($sp) /* 0092C 80A8FA9C 03E00008 */ jr $ra /* 00930 80A8FAA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s index 857336f4a8..c16641cdb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A8FE98 + .asciz "game_play->message.msg_mode=%d\n" + .balign 4 + +.text glabel func_80A8FAA4 /* 00934 80A8FAA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00938 80A8FAA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -73,5 +79,3 @@ glabel func_80A8FAA4 /* 00A3C 80A8FBAC 8FB10020 */ lw $s1, 0x0020($sp) /* 00A40 80A8FBB0 03E00008 */ jr $ra /* 00A44 80A8FBB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s index 43b37e1d80..2645fd6ff3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s @@ -38,5 +38,3 @@ glabel func_80A8FBB8 /* 00AD0 80A8FC40 8FB10018 */ lw $s1, 0x0018($sp) /* 00AD4 80A8FC44 03E00008 */ jr $ra /* 00AD8 80A8FC48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s index af4b4e82af..ff93e47d32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s @@ -10,5 +10,3 @@ glabel EnKakasi2_Destroy /* 00248 80A90258 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0024C 80A9025C 03E00008 */ jr $ra /* 00250 80A90260 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s index cb023daa97..4c9ad834bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s @@ -1,3 +1,41 @@ +.rdata +glabel D_80A909F0 + .asciz "\n\n" + .balign 4 + +glabel D_80A909F4 + .asciz "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80A90A24 + .asciz "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A90A54 + .asciz "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" + .balign 4 + +glabel D_80A90A84 + .asciz "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A90AB4 + .asciz "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A90AE4 + .asciz "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A90B14 + .asciz "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A90B44 + .asciz "\n\n" + .balign 4 + +.text glabel EnKakasi2_Init /* 00000 80A90010 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 80A90014 AFB00028 */ sw $s0, 0x0028($sp) @@ -154,5 +192,3 @@ glabel EnKakasi2_Init /* 00220 80A90230 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00224 80A90234 03E00008 */ jr $ra /* 00228 80A90238 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s index 3292445e21..d79d6bfb15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A90BA0 + .asciz "☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80A90BE0 + .asciz "☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n" + .balign 4 + +.late_rodata +glabel D_80A90C10 + .word 0x0A0A0000, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnKakasi2_Update /* 00720 80A90730 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00724 80A90734 AFBF004C */ sw $ra, 0x004C($sp) @@ -148,5 +162,3 @@ glabel EnKakasi2_Update /* 0092C 80A9093C 8FB10048 */ lw $s1, 0x0048($sp) /* 00930 80A90940 03E00008 */ jr $ra /* 00934 80A90944 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s index bd455dddc5..3aef5c5eb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A90B48 + .asciz "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A90B74 + .asciz "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel func_80A90264 /* 00254 80A90264 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00258 80A90268 AFBF002C */ sw $ra, 0x002C($sp) @@ -169,5 +179,3 @@ glabel func_80A90264 /* 004BC 80A904CC 8FB10028 */ lw $s1, 0x0028($sp) /* 004C0 80A904D0 03E00008 */ jr $ra /* 004C4 80A904D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s index 9448ca5234..5422c0d309 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s @@ -42,5 +42,3 @@ glabel func_80A904D8 /* 0055C 80A9056C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00560 80A90570 03E00008 */ jr $ra /* 00564 80A90574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s index 6a4d8fd420..5569cff04d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s @@ -50,5 +50,3 @@ glabel func_80A90578 /* 00610 80A90620 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00614 80A90624 03E00008 */ jr $ra /* 00618 80A90628 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s index a6e0452cfe..502dd8a091 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s @@ -39,5 +39,3 @@ glabel func_80A9062C /* 006A8 80A906B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006AC 80A906BC 03E00008 */ jr $ra /* 006B0 80A906C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s index ca866c1f3a..6075e3a8e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s @@ -30,5 +30,3 @@ glabel func_80A906C4 /* 00714 80A90724 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00718 80A90728 03E00008 */ jr $ra /* 0071C 80A9072C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s index f8576b8f91..3740302548 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s @@ -21,4 +21,3 @@ glabel func_80A90948 /* 00984 80A90994 00000000 */ nop /* 00988 80A90998 00000000 */ nop /* 0098C 80A9099C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s index 0b7ad60306..2da88f8ac6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s @@ -10,5 +10,3 @@ glabel EnKakasi3_Destroy /* 0001C 80A90D3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00020 80A90D40 03E00008 */ jr $ra /* 00024 80A90D44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s index f07a46d4c7..392d68cf52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s @@ -21,4 +21,3 @@ glabel EnKakasi3_Draw /* 00FE4 80A91D04 00000000 */ nop /* 00FE8 80A91D08 00000000 */ nop /* 00FEC 80A91D0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s index 9fd612ab38..68cf1a3be4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A91D60 + .asciz "\n\n" + .balign 4 + +glabel D_80A91D64 + .asciz "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" + .balign 4 + +.text glabel EnKakasi3_Init /* 00028 80A90D48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0002C 80A90D4C AFB00028 */ sw $s0, 0x0028($sp) @@ -60,5 +70,3 @@ glabel EnKakasi3_Init /* 000FC 80A90E1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00100 80A90E20 03E00008 */ jr $ra /* 00104 80A90E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s index 5340f7b4a4..bb2e066ffa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A91E04 + .asciz "\n\n" + .balign 4 + +glabel D_80A91E08 + .asciz "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel EnKakasi3_Update /* 00E6C 80A91B8C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00E70 80A91B90 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -83,5 +93,3 @@ glabel EnKakasi3_Update /* 00F8C 80A91CAC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00F90 80A91CB0 03E00008 */ jr $ra /* 00F94 80A91CB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s index 30ae9e3807..000c6a1263 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s @@ -40,5 +40,3 @@ glabel func_80A90E28 /* 00190 80A90EB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00194 80A90EB4 03E00008 */ jr $ra /* 00198 80A90EB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s index a995445840..ec8bb71fe8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_80A91E34 + .word 0x412FD70A +glabel D_80A91E38 + .word 0x409FAE14 +glabel D_80A91E3C + .word 0x403F5C29 +glabel jtbl_80A91E40 +.word L80A90F68 +.word L80A90F98 +.word L80A90FB4 +.word L80A90FD4 +.word L80A90FF4 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80A90EBC /* 0019C 80A90EBC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 001A0 80A90EC0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 @@ -232,5 +248,3 @@ glabel L80A90FF4 /* 004C4 80A911E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004C8 80A911E8 03E00008 */ jr $ra /* 004CC 80A911EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s index bf3ee6781f..9803d79554 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s @@ -38,5 +38,3 @@ glabel func_80A911F0 /* 00558 80A91278 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0055C 80A9127C 03E00008 */ jr $ra /* 00560 80A91280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s index 7941b0631a..ee29721d44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s @@ -51,5 +51,3 @@ glabel func_80A91284 /* 0061C 80A9133C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00620 80A91340 03E00008 */ jr $ra /* 00624 80A91344 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s index 8bf7c6cbea..00e0138441 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s @@ -167,5 +167,3 @@ glabel func_80A91348 /* 0088C 80A915AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00890 80A915B0 03E00008 */ jr $ra /* 00894 80A915B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s index 6cb9fb26f2..13cae44ec8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s @@ -26,5 +26,3 @@ glabel func_80A915B8 /* 008F4 80A91614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008F8 80A91618 03E00008 */ jr $ra /* 008FC 80A9161C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s index 5975b445d5..92971cb659 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s @@ -87,5 +87,3 @@ glabel func_80A91620 /* 00A34 80A91754 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A38 80A91758 03E00008 */ jr $ra /* 00A3C 80A9175C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s index 24a6c27993..6550d433c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s @@ -41,5 +41,3 @@ glabel func_80A91760 /* 00AD0 80A917F0 8FB10020 */ lw $s1, 0x0020($sp) /* 00AD4 80A917F4 03E00008 */ jr $ra /* 00AD8 80A917F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s index e1e28c2e3f..4ab235393f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s @@ -33,5 +33,3 @@ glabel func_80A917FC /* 00B50 80A91870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B54 80A91874 03E00008 */ jr $ra /* 00B58 80A91878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s index 7141048c93..142ba617bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s @@ -26,5 +26,3 @@ glabel func_80A9187C /* 00BB8 80A918D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BBC 80A918DC 03E00008 */ jr $ra /* 00BC0 80A918E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s index c0d4709bb9..eeec89bc61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80A91D94 + .asciz "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80A91DC0 + .asciz "\n\n" + .balign 4 + +glabel D_80A91DC4 + .asciz "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel func_80A918E4 /* 00BC4 80A918E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00BC8 80A918E8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -117,5 +131,3 @@ glabel func_80A918E4 /* 00D64 80A91A84 8FB10018 */ lw $s1, 0x0018($sp) /* 00D68 80A91A88 03E00008 */ jr $ra /* 00D6C 80A91A8C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s index 641fe4e52f..b84c33bd5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s @@ -68,5 +68,3 @@ glabel func_80A91A90 /* 00E60 80A91B80 8FB10018 */ lw $s1, 0x0018($sp) /* 00E64 80A91B84 03E00008 */ jr $ra /* 00E68 80A91B88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s index 790e90aba7..933632a41c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s @@ -14,5 +14,3 @@ glabel EnKanban_Destroy /* 00214 80A921B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00218 80A921B8 03E00008 */ jr $ra /* 0021C 80A921BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s index ea2282b705..dc86a66ccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s @@ -1,3 +1,65 @@ +.rdata +glabel D_80A9504C + .asciz "../z_en_kanban.c" + .balign 4 + +glabel D_80A95060 + .asciz "../z_en_kanban.c" + .balign 4 + +glabel D_80A95074 + .asciz "../z_en_kanban.c" + .balign 4 + +glabel D_80A95088 + .asciz "../z_en_kanban.c" + .balign 4 + +glabel D_80A9509C + .asciz "../z_en_kanban.c" + .balign 4 + +glabel D_80A950B0 + .asciz "../z_en_kanban.c" + .balign 4 + +.late_rodata +glabel D_80A95108 + .float 3.14159274101 + +glabel D_80A9510C + .float 3.14159274101 + +glabel D_80A95110 + .float 3.14159274101 + +glabel D_80A95114 + .float 3.14159274101 + +glabel D_80A95118 + .word 0x45898000 +glabel D_80A9511C + .word 0xC53B8000 +glabel D_80A95120 + .word 0x3B343958 +glabel D_80A95124 + .float 0.01 + +glabel D_80A95128 + .word 0xBF20D97C +glabel D_80A9512C + .float 3.14159274101 + +glabel D_80A95130 + .float 3.14159274101 + +glabel D_80A95134 + .float 3.14159274101 + +glabel D_80A95138 + .float 3.14159274101 + +.text glabel EnKanban_Draw /* 01BE8 80A93B88 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01BEC 80A93B8C AFB00014 */ sw $s0, 0x0014($sp) @@ -593,4 +655,3 @@ glabel EnKanban_Draw /* 024C4 80A94464 00000000 */ nop /* 024C8 80A94468 00000000 */ nop /* 024CC 80A9446C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s index 691cb80297..864a135617 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80A94FE0 + .asciz "KANBAN ARG %x\n" + .balign 4 + +.text glabel EnKanban_Init /* 000B8 80A92058 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 000BC 80A9205C AFA50034 */ sw $a1, 0x0034($sp) @@ -85,5 +91,3 @@ glabel EnKanban_Init /* 001E0 80A92180 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001E4 80A92184 03E00008 */ jr $ra /* 001E8 80A92188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index 37cc654f9a..750d32e2b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -1,3 +1,69 @@ +.rdata +glabel D_80A94FF4 + .asciz "\x1b[m" + .balign 4 + +glabel D_80A94FF8 + .asciz " WAT Y = %f\n" + .balign 4 + +glabel D_80A95008 + .asciz " POS Y = %f\n" + .balign 4 + +glabel D_80A95018 + .asciz " GROUND Y = %f\n" + .balign 4 + +glabel D_80A9502C + .asciz "" + .balign 4 + +glabel D_80A95034 + .asciz "OCARINA_MODE %d\n" + .balign 4 + +glabel D_80A95048 + .asciz "\x1b[m" + .balign 4 + +.late_rodata +glabel jtbl_80A950C8 +.word L80A922CC +.word L80A92A24 +.word L80A92A24 +.word L80A930DC +.word L80A930DC +.word L80A93920 +glabel D_80A950E0 + .float 3.14159274101 + +glabel D_80A950E4 + .word 0xBE99999A +glabel D_80A950E8 + .float 0.7 + +glabel D_80A950EC + .float 0.1 + +glabel D_80A950F0 + .float 2500.0 + +glabel D_80A950F4 + .float 10000.0 + +glabel D_80A950F8 + .float 0.05 + +glabel D_80A950FC + .float 0.05 + +glabel D_80A95100 + .word 0x4622F983 +glabel D_80A95104 + .float 3.14159274101 + +.text glabel EnKanban_Update /* 002D8 80A92278 27BDFF00 */ addiu $sp, $sp, 0xFF00 ## $sp = FFFFFF00 /* 002DC 80A9227C AFBF003C */ sw $ra, 0x003C($sp) @@ -1786,5 +1852,3 @@ glabel L80A93920 /* 01BDC 80A93B7C 8FB10038 */ lw $s1, 0x0038($sp) /* 01BE0 80A93B80 03E00008 */ jr $ra /* 01BE4 80A93B84 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s index bee583262f..d2c7c78429 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A950C4 + .word 0x38000100 + +.text glabel func_80A91FA0 /* 00000 80A91FA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 80A91FA4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -46,5 +51,3 @@ glabel func_80A91FA0 /* 000AC 80A9204C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000B0 80A92050 03E00008 */ jr $ra /* 000B4 80A92054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A921C0.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A921C0.s index 029831d080..71e103a906 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A921C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A921C0.s @@ -51,5 +51,3 @@ glabel func_80A921C0 /* 002CC 80A9226C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002D0 80A92270 03E00008 */ jr $ra /* 002D4 80A92274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s index 0ecfc40be6..51dc72791b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s @@ -17,5 +17,3 @@ glabel EnKarebaba_Destroy /* 00164 80A954B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00168 80A954B8 03E00008 */ jr $ra /* 0016C 80A954BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s index dc2f57c169..8554b39364 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s @@ -1,3 +1,41 @@ +.rdata +glabel D_80A96ACC + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96AE0 + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96AF4 + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96B08 + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96B1C + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96B30 + .asciz "../z_en_karebaba.c" + .balign 4 + +.late_rodata +glabel D_80A96B64 + .word 0x3A03126F +glabel D_80A96B68 + .float 0.01 + +glabel D_80A96B6C + .float 0.01 + +glabel D_80A96B70 + .float 9.58738019108e-05 + +.text glabel EnKarebaba_Draw /* 01228 80A96578 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0122C 80A9657C AFB40038 */ sw $s4, 0x0038($sp) @@ -293,4 +331,3 @@ glabel EnKarebaba_Draw /* 01674 80A969C4 03E00008 */ jr $ra /* 01678 80A969C8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 0167C 80A969CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s index 39f5e6763a..b0029271cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s @@ -87,5 +87,3 @@ glabel EnKarebaba_Init /* 00124 80A95474 8FB10028 */ lw $s1, 0x0028($sp) /* 00128 80A95478 03E00008 */ jr $ra /* 0012C 80A9547C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s index 3296576a2f..d727f69aae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A96B5C + .float 0.01 + +.text glabel EnKarebaba_Update /* 00F50 80A962A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00F54 80A962A4 AFB0001C */ sw $s0, 0x001C($sp) @@ -117,5 +122,3 @@ glabel EnKarebaba_Update /* 010F0 80A96440 8FB10020 */ lw $s1, 0x0020($sp) /* 010F4 80A96444 03E00008 */ jr $ra /* 010F8 80A96448 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954C0.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954C0.s index b96706ac7b..5930f11fee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954C0.s @@ -13,5 +13,3 @@ glabel func_80A954C0 /* 0019C 80A954EC AC880264 */ sw $t0, 0x0264($a0) ## 00000264 /* 001A0 80A954F0 03E00008 */ jr $ra /* 001A4 80A954F4 A482023A */ sh $v0, 0x023A($a0) ## 0000023A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954F8.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954F8.s index 87840fdf64..e8214f3878 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A954F8.s @@ -20,5 +20,3 @@ glabel func_80A954F8 /* 001EC 80A9553C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001F0 80A95540 03E00008 */ jr $ra /* 001F4 80A95544 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95548.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95548.s index b85ecec44f..feb275f1c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95548.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95548.s @@ -21,5 +21,3 @@ glabel func_80A95548 /* 00240 80A95590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00244 80A95594 03E00008 */ jr $ra /* 00248 80A95598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s index 88f4457db0..2005239c7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s @@ -33,5 +33,3 @@ glabel func_80A9559C /* 002BC 80A9560C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002C0 80A95610 03E00008 */ jr $ra /* 002C4 80A95614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s index 60c7cef6ac..828bb86077 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s @@ -43,5 +43,3 @@ glabel func_80A95618 /* 0035C 80A956AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00360 80A956B0 03E00008 */ jr $ra /* 00364 80A956B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956B8.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956B8.s index 1f67426492..8f5bc6819e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956B8.s @@ -5,5 +5,3 @@ glabel func_80A956B8 /* 00374 80A956C4 A48E001C */ sh $t6, 0x001C($a0) ## 0000001C /* 00378 80A956C8 03E00008 */ jr $ra /* 0037C 80A956CC AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956D0.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956D0.s index 09f869c1fe..daf20b8824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A956D0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A96B44 + .float -0.8 + +.text glabel func_80A956D0 /* 00380 80A956D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00384 80A956D4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -30,5 +35,3 @@ glabel func_80A956D0 /* 003EC 80A9573C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F0 80A95740 03E00008 */ jr $ra /* 003F4 80A95744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95748.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95748.s index f34e513a77..7da7a1f565 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95748.s @@ -39,5 +39,3 @@ glabel func_80A95748 /* 00484 80A957D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00488 80A957D8 03E00008 */ jr $ra /* 0048C 80A957DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s index 14e12bf874..431c0119c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s @@ -33,5 +33,3 @@ glabel func_80A957E0 /* 00504 80A95854 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00508 80A95858 03E00008 */ jr $ra /* 0050C 80A9585C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s index 9641fc05c1..2653b1ae8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s @@ -36,5 +36,3 @@ glabel func_80A95860 /* 00590 80A958E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00594 80A958E4 03E00008 */ jr $ra /* 00598 80A958E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A958EC.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A958EC.s index c94bac61e3..96c8c54817 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A958EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A958EC.s @@ -21,5 +21,3 @@ glabel func_80A958EC /* 005E4 80A95934 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005E8 80A95938 03E00008 */ jr $ra /* 005EC 80A9593C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95940.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95940.s index 49f4cbf426..2127037e2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95940.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95940.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A96B48 + .float 0.05 + +glabel D_80A96B4C + .float 0.005 + +.text glabel func_80A95940 /* 005F0 80A95940 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 005F4 80A95944 AFBF0014 */ sw $ra, 0x0014($sp) @@ -39,5 +47,3 @@ glabel func_80A95940 /* 0067C 80A959CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00680 80A959D0 03E00008 */ jr $ra /* 00684 80A959D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A959D8.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A959D8.s index 4bd32ac838..9139e5ce3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A959D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A959D8.s @@ -24,5 +24,3 @@ glabel func_80A959D8 /* 006DC 80A95A2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E0 80A95A30 03E00008 */ jr $ra /* 006E4 80A95A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s index e506f9b4a3..54b26bd028 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s @@ -56,5 +56,3 @@ glabel func_80A95A38 /* 007B0 80A95B00 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 007B4 80A95B04 03E00008 */ jr $ra /* 007B8 80A95B08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95B0C.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95B0C.s index e00050ec78..bedc6dcd7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95B0C.s @@ -68,5 +68,3 @@ glabel func_80A95B0C /* 008A0 80A95BF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008A4 80A95BF4 03E00008 */ jr $ra /* 008A8 80A95BF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95BFC.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95BFC.s index 631a966a44..eae53e8c75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95BFC.s @@ -114,5 +114,3 @@ glabel func_80A95BFC /* 00A34 80A95D84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A38 80A95D88 03E00008 */ jr $ra /* 00A3C 80A95D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s index 66ad2b4633..9fcfd23d8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A96B50 + .float 0.005 + +.text glabel func_80A95D90 /* 00A40 80A95D90 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00A44 80A95D94 F7B40028 */ sdc1 $f20, 0x0028($sp) @@ -188,5 +193,3 @@ glabel func_80A95D90 /* 00CEC 80A9603C 8FB50058 */ lw $s5, 0x0058($sp) /* 00CF0 80A96040 03E00008 */ jr $ra /* 00CF4 80A96044 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s index d69fcccc4c..a5397cad35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s @@ -29,5 +29,3 @@ glabel func_80A96048 /* 00D54 80A960A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D58 80A960A8 03E00008 */ jr $ra /* 00D5C 80A960AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s index 88650673aa..e1780675cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s @@ -56,5 +56,3 @@ glabel func_80A960B0 /* 00E28 80A96178 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00E2C 80A9617C 03E00008 */ jr $ra /* 00E30 80A96180 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96184.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96184.s index f693bdf6f0..057f72ea95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96184.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96184.s @@ -24,5 +24,3 @@ glabel func_80A96184 /* 00E80 80A961D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E84 80A961D4 03E00008 */ jr $ra /* 00E88 80A961D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A961DC.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A961DC.s index 498ed396ba..e7a133ab57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A961DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A961DC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A96B54 + .float 0.05 + +glabel D_80A96B58 + .float 0.005 + +.text glabel func_80A961DC /* 00E8C 80A961DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00E90 80A961E0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -51,5 +59,3 @@ glabel func_80A961DC /* 00F44 80A96294 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F48 80A96298 03E00008 */ jr $ra /* 00F4C 80A9629C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s index 819b6da9d4..55f359dd37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A96A90 + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96AA4 + .asciz "../z_en_karebaba.c" + .balign 4 + +glabel D_80A96AB8 + .asciz "../z_en_karebaba.c" + .balign 4 + +.late_rodata +glabel D_80A96B60 + .float 0.15 + +.text glabel func_80A9644C /* 010FC 80A9644C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 01100 80A96450 AFBF0024 */ sw $ra, 0x0024($sp) @@ -74,5 +92,3 @@ glabel func_80A9644C /* 0121C 80A9656C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 01220 80A96570 03E00008 */ jr $ra /* 01224 80A96574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s index 62962ed6de..befe141a4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s @@ -10,5 +10,3 @@ glabel EnKo_Destroy /* 0228C 80A9903C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02290 80A99040 03E00008 */ jr $ra /* 02294 80A99044 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s index 3f52fcecdb..e51675e304 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s @@ -258,4 +258,3 @@ glabel EnKo_Draw /* 03324 80A9A0D4 8FB20028 */ lw $s2, 0x0028($sp) /* 03328 80A9A0D8 03E00008 */ jr $ra /* 0332C 80A9A0DC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Init.s index aadbb916de..43f9863f26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Init.s @@ -39,5 +39,3 @@ glabel EnKo_Init /* 02264 80A99014 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02268 80A99018 03E00008 */ jr $ra /* 0226C 80A9901C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s index 78edf03a65..ec15bf5562 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s @@ -97,5 +97,3 @@ glabel EnKo_Update /* 02AA8 80A99858 8FB10020 */ lw $s1, 0x0020($sp) /* 02AAC 80A9985C 03E00008 */ jr $ra /* 02AB0 80A99860 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96DB0.s index 29c1d7e679..04e51769cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96DB0.s @@ -74,5 +74,3 @@ glabel func_80A96DB0 /* 00108 80A96EB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0010C 80A96EBC 03E00008 */ jr $ra /* 00110 80A96EC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96EC4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96EC4.s index 28891a3caf..289e8256c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96EC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96EC4.s @@ -38,5 +38,3 @@ glabel func_80A96EC4 /* 0018C 80A96F3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00190 80A96F40 03E00008 */ jr $ra /* 00194 80A96F44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F48.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F48.s index b75adb7f4a..c4361b1ce0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F48.s @@ -20,5 +20,3 @@ glabel func_80A96F48 .L80A96F8C: /* 001DC 80A96F8C 03E00008 */ jr $ra /* 001E0 80A96F90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F94.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F94.s index 0e3bbccdfb..3804c5d5c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96F94.s @@ -17,5 +17,3 @@ glabel func_80A96F94 .L80A96FC8: /* 00218 80A96FC8 03E00008 */ jr $ra /* 0021C 80A96FCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s index 4d288d0172..ac335a7a61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s @@ -42,5 +42,3 @@ glabel L80A97000 .L80A97060: /* 002B0 80A97060 03E00008 */ jr $ra /* 002B4 80A97064 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 000010D8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s index 1e6e673682..65abe6deb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s @@ -19,5 +19,3 @@ glabel func_80A97068 .L80A970A8: /* 002F8 80A970A8 03E00008 */ jr $ra /* 002FC 80A970AC 24021004 */ addiu $v0, $zero, 0x1004 ## $v0 = 00001004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s index a9d2068c1d..31242f41f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s @@ -27,5 +27,3 @@ glabel func_80A970B0 .L80A97108: /* 00358 80A97108 03E00008 */ jr $ra /* 0035C 80A9710C 24021005 */ addiu $v0, $zero, 0x1005 ## $v0 = 00001005 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s index 061aed299f..83cd06f618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s @@ -10,5 +10,3 @@ glabel func_80A97110 .L80A97130: /* 00380 80A97130 03E00008 */ jr $ra /* 00384 80A97134 24021007 */ addiu $v0, $zero, 0x1007 ## $v0 = 00001007 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s index f22cf308dc..622bec13e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s @@ -27,5 +27,3 @@ glabel func_80A97138 .L80A97190: /* 003E0 80A97190 03E00008 */ jr $ra /* 003E4 80A97194 24021008 */ addiu $v0, $zero, 0x1008 ## $v0 = 00001008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s index 64d93cfec9..a944e20eb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s @@ -27,5 +27,3 @@ glabel func_80A97198 .L80A971F0: /* 00440 80A971F0 03E00008 */ jr $ra /* 00444 80A971F4 2402100A */ addiu $v0, $zero, 0x100A ## $v0 = 0000100A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s index 49f1dd9cd1..0bf77ed442 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s @@ -27,5 +27,3 @@ glabel func_80A971F8 .L80A97250: /* 004A0 80A97250 03E00008 */ jr $ra /* 004A4 80A97254 2402100C */ addiu $v0, $zero, 0x100C ## $v0 = 0000100C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s index dccec49e16..59954d9d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s @@ -33,5 +33,3 @@ glabel L80A972B8 glabel L80A972C0 /* 00510 80A972C0 03E00008 */ jr $ra /* 00514 80A972C4 24021038 */ addiu $v0, $zero, 0x1038 ## $v0 = 00001038 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s index 6e30482cff..ef5b657790 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s @@ -12,5 +12,3 @@ glabel func_80A972C8 .L80A972F0: /* 00540 80A972F0 03E00008 */ jr $ra /* 00544 80A972F4 2402103C */ addiu $v0, $zero, 0x103C ## $v0 = 0000103C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s index 08dd2c6388..759632fe27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s @@ -18,5 +18,3 @@ glabel L80A97328 .L80A97330: /* 00580 80A97330 03E00008 */ jr $ra /* 00584 80A97334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s index b9cd07af21..33486a51b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s @@ -16,5 +16,3 @@ glabel L80A97368 /* 005BC 80A9736C A0780693 */ sb $t8, 0x0693($v1) ## 00000693 /* 005C0 80A97370 03E00008 */ jr $ra /* 005C4 80A97374 240210B9 */ addiu $v0, $zero, 0x10B9 ## $v0 = 000010B9 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s index a3b0b40998..2498e4314d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s @@ -20,5 +20,3 @@ glabel func_80A97378 .L80A973B8: /* 00608 80A973B8 03E00008 */ jr $ra /* 0060C 80A973BC 24021055 */ addiu $v0, $zero, 0x1055 ## $v0 = 00001055 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s index 72bded489a..8de132ccab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s @@ -12,5 +12,3 @@ glabel func_80A973C0 .L80A973E8: /* 00638 80A973E8 03E00008 */ jr $ra /* 0063C 80A973EC 2402105A */ addiu $v0, $zero, 0x105A ## $v0 = 0000105A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s index 47ff3ba03a..b61b5074d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s @@ -20,5 +20,3 @@ glabel func_80A973F0 .L80A97430: /* 00680 80A97430 03E00008 */ jr $ra /* 00684 80A97434 2402105D */ addiu $v0, $zero, 0x105D ## $v0 = 0000105D - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s index 8b91514eee..e77a418df9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s @@ -12,5 +12,3 @@ glabel func_80A97438 .L80A97460: /* 006B0 80A97460 03E00008 */ jr $ra /* 006B4 80A97464 2402105B */ addiu $v0, $zero, 0x105B ## $v0 = 0000105B - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s index fcc9da7974..ea02a2e5ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s @@ -15,5 +15,3 @@ glabel func_80A97468 glabel L80A97498 /* 006E8 80A97498 03E00008 */ jr $ra /* 006EC 80A9749C 24021057 */ addiu $v0, $zero, 0x1057 ## $v0 = 00001057 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s index 9fa1d59fb9..ba8c7b68d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s @@ -20,5 +20,3 @@ glabel func_80A974A0 .L80A974E0: /* 00730 80A974E0 03E00008 */ jr $ra /* 00734 80A974E4 24021058 */ addiu $v0, $zero, 0x1058 ## $v0 = 00001058 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s index 6f26143fa8..aa064026e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s @@ -12,5 +12,3 @@ glabel func_80A974E8 .L80A97510: /* 00760 80A97510 03E00008 */ jr $ra /* 00764 80A97514 2402104E */ addiu $v0, $zero, 0x104E ## $v0 = 0000104E - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s index a866d670fd..8e94305292 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s @@ -20,5 +20,3 @@ glabel func_80A97518 .L80A97558: /* 007A8 80A97558 03E00008 */ jr $ra /* 007AC 80A9755C 2402104F */ addiu $v0, $zero, 0x104F ## $v0 = 0000104F - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s index f6c9ae422d..824e92478f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s @@ -12,5 +12,3 @@ glabel func_80A97560 .L80A97588: /* 007D8 80A97588 03E00008 */ jr $ra /* 007DC 80A9758C 24021051 */ addiu $v0, $zero, 0x1051 ## $v0 = 00001051 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s index 4e5b97eb33..8b14028506 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s @@ -12,5 +12,3 @@ glabel func_80A97590 .L80A975B8: /* 00808 80A975B8 03E00008 */ jr $ra /* 0080C 80A975BC 24021052 */ addiu $v0, $zero, 0x1052 ## $v0 = 00001052 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s index 0c61e46e9f..3ec3cdd476 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s @@ -23,5 +23,3 @@ glabel func_80A975C0 .L80A97608: /* 00858 80A97608 03E00008 */ jr $ra /* 0085C 80A9760C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s index c5b77ad81c..15d1097d7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s @@ -82,5 +82,3 @@ glabel func_80A97610 /* 0097C 80A9772C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00980 80A97730 03E00008 */ jr $ra /* 00984 80A97734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s index 56368404e3..72d6492ed3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s @@ -295,5 +295,3 @@ glabel L80A97900 /* 00D7C 80A97B2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D80 80A97B30 03E00008 */ jr $ra /* 00D84 80A97B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s index fb0755889d..60de57b824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s @@ -37,5 +37,3 @@ glabel func_80A97B38 /* 00E04 80A97BB4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000004 /* 00E08 80A97BB8 03E00008 */ jr $ra /* 00E0C 80A97BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s index 1d970508fc..48e2425f20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s @@ -49,5 +49,3 @@ glabel func_80A97BC0 /* 00EC0 80A97C70 27BD0120 */ addiu $sp, $sp, 0x0120 ## $sp = 00000000 /* 00EC4 80A97C74 03E00008 */ jr $ra /* 00EC8 80A97C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97C7C.s index e5949ba453..99e05c7f2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97C7C.s @@ -33,5 +33,3 @@ glabel func_80A97C7C /* 00F44 80A97CF4 9042001C */ lbu $v0, 0x001C($v0) ## 0000001C /* 00F48 80A97CF8 03E00008 */ jr $ra /* 00F4C 80A97CFC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D00.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D00.s index d90e177eb5..596b04dcc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D00.s @@ -28,5 +28,3 @@ glabel func_80A97D00 .L80A97D60: /* 00FB0 80A97D60 03E00008 */ jr $ra /* 00FB4 80A97D64 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s index 60a1b0faac..1f21fdd5bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s @@ -47,5 +47,3 @@ glabel func_80A97D68 /* 0105C 80A97E0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01060 80A97E10 03E00008 */ jr $ra /* 01064 80A97E14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97E18.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97E18.s index 396cc10fad..995457adfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97E18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97E18.s @@ -41,5 +41,3 @@ glabel func_80A97E18 /* 010F4 80A97EA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 010F8 80A97EA8 03E00008 */ jr $ra /* 010FC 80A97EAC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97EB0.s index b08c27031a..730b7b0dd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97EB0.s @@ -29,5 +29,3 @@ glabel func_80A97EB0 /* 01164 80A97F14 8FB00018 */ lw $s0, 0x0018($sp) /* 01168 80A97F18 03E00008 */ jr $ra /* 0116C 80A97F1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F20.s index 11ffe79289..209b14ae24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F20.s @@ -19,5 +19,3 @@ glabel func_80A97F20 /* 011B4 80A97F64 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 011B8 80A97F68 03E00008 */ jr $ra /* 011BC 80A97F6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s index 6db0f4ea1a..b843a237a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s @@ -52,5 +52,3 @@ glabel func_80A97F70 /* 01278 80A98028 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0127C 80A9802C 03E00008 */ jr $ra /* 01280 80A98030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s index 4ae22a095d..da65d06cbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s @@ -64,5 +64,3 @@ glabel func_80A98034 /* 01368 80A98118 8FB00018 */ lw $s0, 0x0018($sp) /* 0136C 80A9811C 03E00008 */ jr $ra /* 01370 80A98120 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98124.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98124.s index a34bdd05fc..a5414ba993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98124.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98124.s @@ -19,5 +19,3 @@ glabel func_80A98124 /* 013B8 80A98168 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 013BC 80A9816C 03E00008 */ jr $ra /* 013C0 80A98170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98174.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98174.s index f75e98aece..1a900bf131 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98174.s @@ -61,5 +61,3 @@ glabel func_80A98174 /* 01498 80A98248 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0149C 80A9824C 03E00008 */ jr $ra /* 014A0 80A98250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98254.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98254.s index a1a9411336..f0057c7123 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98254.s @@ -80,5 +80,3 @@ glabel L80A98344 /* 015A0 80A98350 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015A4 80A98354 03E00008 */ jr $ra /* 015A8 80A98358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9835C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9835C.s index 4303d9c512..8a110f3266 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9835C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9835C.s @@ -80,5 +80,3 @@ glabel L80A9844C /* 016A8 80A98458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016AC 80A9845C 03E00008 */ jr $ra /* 016B0 80A98460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98464.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98464.s index 121d1db9bc..9a1b91bda3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98464.s @@ -80,5 +80,3 @@ glabel L80A98554 /* 017B0 80A98560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017B4 80A98564 03E00008 */ jr $ra /* 017B8 80A98568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9856C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9856C.s index d15d58d8fd..1bff9ef181 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9856C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9856C.s @@ -80,5 +80,3 @@ glabel L80A9865C /* 018B8 80A98668 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018BC 80A9866C 03E00008 */ jr $ra /* 018C0 80A98670 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98674.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98674.s index a422afb4e0..e7d24614df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98674.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98674.s @@ -80,5 +80,3 @@ glabel L80A98764 /* 019C0 80A98770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 019C4 80A98774 03E00008 */ jr $ra /* 019C8 80A98778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s index 567631f8f9..6569f0273f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s @@ -117,5 +117,3 @@ glabel func_80A9877C /* 01B78 80A98928 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01B7C 80A9892C 03E00008 */ jr $ra /* 01B80 80A98930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s index 6435adef74..faf0403354 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s @@ -52,5 +52,3 @@ glabel func_80A98934 .L80A989EC: /* 01C3C 80A989EC 03E00008 */ jr $ra /* 01C40 80A989F0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s index af6ccb06a5..4f60826e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s @@ -13,5 +13,3 @@ glabel func_80A989F4 .L80A98A20: /* 01C70 80A98A20 03E00008 */ jr $ra /* 01C74 80A98A24 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s index cf93280c94..40ccd8d1cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s @@ -34,5 +34,3 @@ glabel func_80A98A28 .L80A98A9C: /* 01CEC 80A98A9C 03E00008 */ jr $ra /* 01CF0 80A98AA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s index 0247d59414..40c04ab646 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s @@ -25,5 +25,3 @@ glabel func_80A98AA4 .L80A98AFC: /* 01D4C 80A98AFC 03E00008 */ jr $ra /* 01D50 80A98B00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s index 43c7b06efe..11c1341c25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s @@ -23,5 +23,3 @@ glabel func_80A98B04 .L80A98B54: /* 01DA4 80A98B54 03E00008 */ jr $ra /* 01DA8 80A98B58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s index 531dbfffca..bb97a9b33d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s @@ -55,5 +55,3 @@ glabel L80A98C0C .L80A98C10: /* 01E60 80A98C10 03E00008 */ jr $ra /* 01E64 80A98C14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s index da5818afbc..85f46e490e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s @@ -52,5 +52,3 @@ glabel func_80A98C18 /* 01F1C 80A98CCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F20 80A98CD0 03E00008 */ jr $ra /* 01F24 80A98CD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98CD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98CD8.s index 3b89b81fe5..bd999fbcde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98CD8.s @@ -20,5 +20,3 @@ glabel func_80A98CD8 /* 01F70 80A98D20 C4720008 */ lwc1 $f18, 0x0008($v1) ## 00000008 /* 01F74 80A98D24 03E00008 */ jr $ra /* 01F78 80A98D28 E4920218 */ swc1 $f18, 0x0218($a0) ## 00000218 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s index 486036ec25..2861964995 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s @@ -38,5 +38,3 @@ glabel func_80A98D2C .L80A98DAC: /* 01FFC 80A98DAC 03E00008 */ jr $ra /* 02000 80A98DB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s index 9fc105a5d1..39d338fb6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s @@ -79,5 +79,3 @@ glabel func_80A98DB4 /* 02110 80A98EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02114 80A98EC4 03E00008 */ jr $ra /* 02118 80A98EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98ECC.s index 3b2c23fe6f..f56e630db6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98ECC.s @@ -57,5 +57,3 @@ glabel L80A98F7C /* 021D8 80A98F88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021DC 80A98F8C 03E00008 */ jr $ra /* 021E0 80A98F90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index aa843b1daf..72455623ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -222,5 +222,3 @@ glabel func_80A99048 /* 025C8 80A99378 8FB10038 */ lw $s1, 0x0038($sp) /* 025CC 80A9937C 03E00008 */ jr $ra /* 025D0 80A99380 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99384.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99384.s index 022d3f1ebb..c54111ebe0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99384.s @@ -47,5 +47,3 @@ glabel func_80A99384 /* 0267C 80A9942C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02680 80A99430 03E00008 */ jr $ra /* 02684 80A99434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99438.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99438.s index a06d871cd8..706fc84b0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99438.s @@ -54,5 +54,3 @@ glabel func_80A99438 /* 02748 80A994F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0274C 80A994FC 03E00008 */ jr $ra /* 02750 80A99500 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s index f5f71ac7c8..b6561d2273 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s @@ -24,5 +24,3 @@ glabel func_80A99504 /* 027A4 80A99554 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 027A8 80A99558 03E00008 */ jr $ra /* 027AC 80A9955C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s index 7ccc506f94..ae5fd1c4f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s @@ -27,5 +27,3 @@ glabel func_80A99560 /* 02810 80A995C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02814 80A995C4 03E00008 */ jr $ra /* 02818 80A995C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s index 8a8aad2859..8f4365435d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s @@ -85,5 +85,3 @@ glabel func_80A995CC /* 02948 80A996F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0294C 80A996FC 03E00008 */ jr $ra /* 02950 80A99700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s index 883dc562b2..30c330b7b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s @@ -223,5 +223,3 @@ glabel func_80A99864 /* 02E08 80A99BB8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02E0C 80A99BBC 03E00008 */ jr $ra /* 02E10 80A99BC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s index 349bfb51d8..1cbeae4332 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s @@ -53,5 +53,3 @@ glabel func_80A99BC4 /* 02ED8 80A99C88 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02EDC 80A99C8C 03E00008 */ jr $ra /* 02EE0 80A99C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99C94.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99C94.s index 4a3bed31c5..f0b4a7e406 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99C94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99C94.s @@ -27,5 +27,3 @@ glabel func_80A99C94 /* 02F44 80A99CF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F48 80A99CF8 03E00008 */ jr $ra /* 02F4C 80A99CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s index b63ccd9811..7c2ac31b97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s @@ -10,5 +10,3 @@ glabel EnKusa_Destroy /* 00840 80A9B7E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00844 80A9B7E4 03E00008 */ jr $ra /* 00848 80A9B7E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Init.s index 323c38bfe8..1b3c5dd859 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A9C2D8 + .asciz "Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n" + .balign 4 + +glabel D_80A9C308 + .asciz "../z_en_kusa.c" + .balign 4 + +.text glabel EnKusa_Init /* 006E8 80A9B688 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 006EC 80A9B68C AFA50024 */ sw $a1, 0x0024($sp) @@ -89,5 +99,3 @@ glabel EnKusa_Init /* 00818 80A9B7B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0081C 80A9B7BC 03E00008 */ jr $ra /* 00820 80A9B7C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Update.s index 5cf010d732..565e1b8c64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Update.s @@ -26,5 +26,3 @@ glabel EnKusa_Update /* 011B8 80A9C158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011BC 80A9C15C 03E00008 */ jr $ra /* 011C0 80A9C160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFA0.s index 888ef85e1a..58073787ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFA0.s @@ -2,5 +2,3 @@ glabel func_80A9AFA0 /* 00000 80A9AFA0 A480019C */ sh $zero, 0x019C($a0) ## 0000019C /* 00004 80A9AFA4 03E00008 */ jr $ra /* 00008 80A9AFA8 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFAC.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFAC.s index 55dee08872..9fd75d0031 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9AFAC.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80A9C2A0 + .asciz "" + .balign 4 + +glabel D_80A9C2AC + .asciz "地面に付着失敗(%s %d)\n" + .balign 4 + +glabel D_80A9C2C4 + .asciz "../z_en_kusa.c" + .balign 4 + +glabel D_80A9C2D4 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_80A9AFAC /* 0000C 80A9AFAC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00010 80A9AFB0 AFBF001C */ sw $ra, 0x001C($sp) @@ -57,5 +75,3 @@ glabel func_80A9AFAC /* 000D0 80A9B070 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000D4 80A9B074 03E00008 */ jr $ra /* 000D8 80A9B078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B07C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B07C.s index 4902492167..3728189fc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B07C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B07C.s @@ -58,5 +58,3 @@ glabel func_80A9B07C /* 00194 80A9B134 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00198 80A9B138 03E00008 */ jr $ra /* 0019C 80A9B13C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B140.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B140.s index fab672869a..128fc1365e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B140.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B140.s @@ -13,5 +13,3 @@ glabel func_80A9B140 .L80A9B16C: /* 001CC 80A9B16C 03E00008 */ jr $ra /* 001D0 80A9B170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B174.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B174.s index cda805cd97..cb48a82ce8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B174.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80A9C318 + .float 0.2 + +glabel D_80A9C31C + .float 0.1 + +.text glabel func_80A9B174 /* 001D4 80A9B174 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 /* 001D8 80A9B178 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 @@ -34,5 +42,3 @@ glabel func_80A9B174 /* 00250 80A9B1F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00254 80A9B1F4 03E00008 */ jr $ra /* 00258 80A9B1F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B1FC.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B1FC.s index b47b813900..c6b97103c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B1FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B1FC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A9C320 + .word 0x3DF5C290 +glabel D_80A9C324 + .word 0x3E23D70B + +.text glabel func_80A9B1FC /* 0025C 80A9B1FC 3C0180AA */ lui $at, %hi(D_80A9C320) ## $at = 80AA0000 /* 00260 80A9B200 C420C320 */ lwc1 $f0, %lo(D_80A9C320)($at) @@ -7,5 +14,3 @@ glabel func_80A9B1FC /* 00270 80A9B210 E4800058 */ swc1 $f0, 0x0058($a0) ## 00000058 /* 00274 80A9B214 03E00008 */ jr $ra /* 00278 80A9B218 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s index 2cbc335ecf..832d6b30fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A9C328 + .word 0x42DE3333 + +.text glabel func_80A9B21C /* 0027C 80A9B21C 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00280 80A9B220 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -226,5 +231,3 @@ glabel func_80A9B21C /* 005C8 80A9B568 8FBE0098 */ lw $s8, 0x0098($sp) /* 005CC 80A9B56C 03E00008 */ jr $ra /* 005D0 80A9B570 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B574.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B574.s index a6f103fe92..b678c332d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B574.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B574.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A9C32C + .word 0x477FFF00 + +.text glabel func_80A9B574 /* 005D4 80A9B574 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 005D8 80A9B578 AFB40048 */ sw $s4, 0x0048($sp) @@ -50,5 +55,3 @@ glabel func_80A9B574 /* 00684 80A9B624 8FB40048 */ lw $s4, 0x0048($sp) /* 00688 80A9B628 03E00008 */ jr $ra /* 0068C 80A9B62C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s index b97e4df552..682f51d5e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s @@ -24,5 +24,3 @@ glabel func_80A9B630 /* 006DC 80A9B67C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006E0 80A9B680 03E00008 */ jr $ra /* 006E4 80A9B684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B7EC.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B7EC.s index 0407639c64..eb2c27170b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B7EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B7EC.s @@ -8,5 +8,3 @@ glabel func_80A9B7EC /* 00864 80A9B804 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00868 80A9B808 03E00008 */ jr $ra /* 0086C 80A9B80C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B810.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B810.s index f4898f7187..7686c35e1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B810.s @@ -38,5 +38,3 @@ glabel func_80A9B810 /* 008F0 80A9B890 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008F4 80A9B894 03E00008 */ jr $ra /* 008F8 80A9B898 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B89C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B89C.s index b2e40dac1f..6e6614ab2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B89C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B89C.s @@ -14,5 +14,3 @@ glabel func_80A9B89C /* 0092C 80A9B8CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00930 80A9B8D0 03E00008 */ jr $ra /* 00934 80A9B8D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s index 151c9a1f37..d5830f4128 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s @@ -125,5 +125,3 @@ glabel func_80A9B8D8 /* 00AEC 80A9BA8C 8FB10018 */ lw $s1, 0x0018($sp) /* 00AF0 80A9BA90 03E00008 */ jr $ra /* 00AF4 80A9BA94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BA98.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BA98.s index 0453a5cf93..cc436524bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BA98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BA98.s @@ -15,5 +15,3 @@ glabel func_80A9BA98 /* 00B2C 80A9BACC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B30 80A9BAD0 03E00008 */ jr $ra /* 00B34 80A9BAD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s index 779cc993da..6f7b038b2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A9C330 + .word 0xBDCCCCCD +glabel D_80A9C334 + .word 0xC04CCCCD, 0x00000000, 0x00000000 + +.text glabel func_80A9BAD8 /* 00B38 80A9BAD8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00B3C 80A9BADC AFBF0024 */ sw $ra, 0x0024($sp) @@ -56,5 +63,3 @@ glabel func_80A9BAD8 /* 00C04 80A9BBA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C08 80A9BBA8 03E00008 */ jr $ra /* 00C0C 80A9BBAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BBB0.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BBB0.s index d830927261..3ef086984e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BBB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BBB0.s @@ -27,5 +27,3 @@ glabel func_80A9BBB0 /* 00C70 80A9BC10 3C0180AA */ lui $at, %hi(D_80A9C1DC) ## $at = 80AA0000 /* 00C74 80A9BC14 03E00008 */ jr $ra /* 00C78 80A9BC18 A420C1DC */ sh $zero, %lo(D_80A9C1DC)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s index 532c0c7e9a..83d38f427f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s @@ -176,5 +176,3 @@ glabel func_80A9BC1C /* 00F00 80A9BEA0 8FB10020 */ lw $s1, 0x0020($sp) /* 00F04 80A9BEA4 03E00008 */ jr $ra /* 00F08 80A9BEA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEAC.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEAC.s index 06b8ce6245..b4fb0e10bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEAC.s @@ -22,5 +22,3 @@ glabel func_80A9BEAC /* 00F50 80A9BEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F54 80A9BEF4 03E00008 */ jr $ra /* 00F58 80A9BEF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEFC.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEFC.s index bf8acc08fc..11ee85c384 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BEFC.s @@ -13,5 +13,3 @@ glabel func_80A9BEFC /* 00F84 80A9BF24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F88 80A9BF28 03E00008 */ jr $ra /* 00F8C 80A9BF2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF30.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF30.s index 065142ddef..06602facd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF30.s @@ -2,5 +2,3 @@ glabel func_80A9BF30 /* 00F90 80A9BF30 AFA40000 */ sw $a0, 0x0000($sp) /* 00F94 80A9BF34 03E00008 */ jr $ra /* 00F98 80A9BF38 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF3C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF3C.s index de643fce37..d5b51ab6ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BF3C.s @@ -26,5 +26,3 @@ glabel func_80A9BF3C /* 00FFC 80A9BF9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01000 80A9BFA0 03E00008 */ jr $ra /* 01004 80A9BFA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BFA8.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BFA8.s index 2de15dd58d..8b8b61dff4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BFA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BFA8.s @@ -27,5 +27,3 @@ glabel func_80A9BFA8 /* 01060 80A9C000 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01064 80A9C004 03E00008 */ jr $ra /* 01068 80A9C008 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C00C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C00C.s index ee43ac902b..32fc0b2dc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C00C.s @@ -22,5 +22,3 @@ glabel func_80A9C00C /* 010BC 80A9C05C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010C0 80A9C060 03E00008 */ jr $ra /* 010C4 80A9C064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C068.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C068.s index 6b7e92baa7..c226797289 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C068.s @@ -41,5 +41,3 @@ glabel func_80A9C068 /* 01154 80A9C0F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01158 80A9C0F8 03E00008 */ jr $ra /* 0115C 80A9C0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s index 70394704a6..7e106956ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s @@ -30,4 +30,3 @@ glabel func_80A9C164 /* 01224 80A9C1C4 00000000 */ nop /* 01228 80A9C1C8 00000000 */ nop /* 0122C 80A9C1CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s index 90410c1f1c..026419914a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s @@ -10,5 +10,3 @@ glabel EnKz_Destroy /* 00B64 80A9D0B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B68 80A9D0B8 03E00008 */ jr $ra /* 00B6C 80A9D0BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s index 8f68f74d58..b273d7fd2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80A9D970 + .asciz "../z_en_kz.c" + .balign 4 + +glabel D_80A9D980 + .asciz "../z_en_kz.c" + .balign 4 + +.text glabel EnKz_Draw /* 01250 80A9D7A0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01254 80A9D7A4 AFBF002C */ sw $ra, 0x002C($sp) @@ -63,4 +73,3 @@ glabel EnKz_Draw /* 01344 80A9D894 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01348 80A9D898 03E00008 */ jr $ra /* 0134C 80A9D89C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s index 9d26d9c488..6bd54fb4f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s @@ -106,5 +106,3 @@ glabel EnKz_Init /* 00B3C 80A9D08C 8FB10038 */ lw $s1, 0x0038($sp) /* 00B40 80A9D090 03E00008 */ jr $ra /* 00B44 80A9D094 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s index 0425101629..284838f73c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s @@ -52,5 +52,3 @@ glabel EnKz_Update /* 01114 80A9D664 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01118 80A9D668 03E00008 */ jr $ra /* 0111C 80A9D66C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s index 9874b796a1..b5420414fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s @@ -26,5 +26,3 @@ glabel func_80A9C550 .L80A9C5A4: /* 00054 80A9C5A4 03E00008 */ jr $ra /* 00058 80A9C5A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s index 7476ef1907..126748bf7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s @@ -46,5 +46,3 @@ glabel func_80A9C5AC /* 000FC 80A9C64C 24024012 */ addiu $v0, $zero, 0x4012 ## $v0 = 00004012 /* 00100 80A9C650 03E00008 */ jr $ra /* 00104 80A9C654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s index e0419cfb31..1b00fe98f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s @@ -29,5 +29,3 @@ glabel func_80A9C658 /* 00164 80A9C6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00168 80A9C6B8 03E00008 */ jr $ra /* 0016C 80A9C6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s index 3b49424dd2..7352445848 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_80A9D990 +.word L80A9C8D0 +.word L80A9C8D0 +.word L80A9C8D0 +.word L80A9C794 +.word L80A9C844 +.word L80A9C8B8 +.word L80A9C710 +.word L80A9C8D0 +.word L80A9C8D0 +.word L80A9C8D0 + +.text glabel func_80A9C6C0 /* 00170 80A9C6C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00174 80A9C6C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -151,5 +165,3 @@ glabel L80A9C8D0 /* 00388 80A9C8D8 01001025 */ or $v0, $t0, $zero ## $v0 = 00000002 /* 0038C 80A9C8DC 03E00008 */ jr $ra /* 00390 80A9C8E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C8E4.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C8E4.s index 6b78615e0e..de5d968ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C8E4.s @@ -33,5 +33,3 @@ glabel func_80A9C8E4 /* 00400 80A9C950 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00404 80A9C954 03E00008 */ jr $ra /* 00408 80A9C958 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C95C.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C95C.s index 265224c2fb..286d93bdcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C95C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C95C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80A9D9B8 + .word 0x44CCC000 +glabel D_80A9D9BC + .word 0x43848000 + +.text glabel func_80A9C95C /* 0040C 80A9C95C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00410 80A9C960 AFB00018 */ sw $s0, 0x0018($sp) @@ -120,5 +127,3 @@ glabel func_80A9C95C /* 005BC 80A9CB0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 005C0 80A9CB10 03E00008 */ jr $ra /* 005C4 80A9CB14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s index 0b37377f24..026d745f55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s @@ -122,5 +122,3 @@ glabel func_80A9CB18 /* 0077C 80A9CCCC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00780 80A9CCD0 03E00008 */ jr $ra /* 00784 80A9CCD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s index 8bfe49a29a..ce00953afc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A9D9C0 + .word 0x4622F983 + +.text glabel func_80A9CCD8 /* 00788 80A9CCD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0078C 80A9CCDC AFBF0024 */ sw $ra, 0x0024($sp) @@ -94,5 +99,3 @@ glabel func_80A9CCD8 /* 008E8 80A9CE38 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 008EC 80A9CE3C 03E00008 */ jr $ra /* 008F0 80A9CE40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s index 360c300daf..cb0055d662 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s @@ -50,5 +50,3 @@ glabel func_80A9CE44 /* 009B0 80A9CF00 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C /* 009B4 80A9CF04 03E00008 */ jr $ra /* 009B8 80A9CF08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D0C0.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D0C0.s index 0620fa65d9..9324984887 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D0C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D0C0.s @@ -29,5 +29,3 @@ glabel func_80A9D0C0 /* 00BD4 80A9D124 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00BD8 80A9D128 03E00008 */ jr $ra /* 00BDC 80A9D12C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s index 27194bdc59..88d551c88e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A9D9C4 + .float 0.1 + +.text glabel func_80A9D130 /* 00BE0 80A9D130 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00BE4 80A9D134 3C0F80AA */ lui $t7, %hi(D_80A9D940) ## $t7 = 80AA0000 @@ -74,5 +79,3 @@ glabel func_80A9D130 /* 00D00 80A9D250 8FB00014 */ lw $s0, 0x0014($sp) /* 00D04 80A9D254 03E00008 */ jr $ra /* 00D08 80A9D258 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s index f5cc416b32..da18deeb75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s @@ -94,5 +94,3 @@ glabel func_80A9D25C /* 00E6C 80A9D3BC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00E70 80A9D3C0 03E00008 */ jr $ra /* 00E74 80A9D3C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s index b72c45c6b9..0566504714 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s @@ -24,5 +24,3 @@ glabel func_80A9D3C8 /* 00ED0 80A9D420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00ED4 80A9D424 03E00008 */ jr $ra /* 00ED8 80A9D428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D42C.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D42C.s index 6bf95b7a8b..c5a3a2e92f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D42C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D42C.s @@ -26,5 +26,3 @@ glabel func_80A9D42C /* 00F34 80A9D484 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F38 80A9D488 03E00008 */ jr $ra /* 00F3C 80A9D48C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D490.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D490.s index e3d25978e0..81a609d9c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D490.s @@ -38,5 +38,3 @@ glabel func_80A9D490 /* 00FC4 80A9D514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FC8 80A9D518 03E00008 */ jr $ra /* 00FCC 80A9D51C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s index 1fc56c7708..c57bee372d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s @@ -39,5 +39,3 @@ glabel func_80A9D520 /* 01058 80A9D5A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0105C 80A9D5AC 03E00008 */ jr $ra /* 01060 80A9D5B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D670.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D670.s index d00ed4c504..e857dc6d6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D670.s @@ -56,5 +56,3 @@ glabel func_80A9D670 /* 011E8 80A9D738 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 011EC 80A9D73C 03E00008 */ jr $ra /* 011F0 80A9D740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D744.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D744.s index 5bf35b63de..d73d1293a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D744.s @@ -23,5 +23,3 @@ glabel func_80A9D744 /* 01244 80A9D794 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01248 80A9D798 03E00008 */ jr $ra /* 0124C 80A9D79C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Destroy.s index 7fe2aff5f5..54c0befee9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Destroy.s @@ -12,5 +12,3 @@ glabel EnLight_Destroy /* 00204 80A9DD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00208 80A9DD48 03E00008 */ jr $ra /* 0020C 80A9DD4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s index 914f0ef65f..cd3e8bbbc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80A9E8C0 + .asciz "../z_en_light.c" + .balign 4 + +glabel D_80A9E8D0 + .asciz "../z_en_light.c" + .balign 4 + +glabel D_80A9E8E0 + .asciz "../z_en_light.c" + .balign 4 + +.late_rodata +glabel D_80A9E910 + .float 9.58738019108e-05 + +glabel D_80A9E914 + .float 3.14159274101 + +.text glabel EnLight_Draw /* 0096C 80A9E4AC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00970 80A9E4B0 AFBF003C */ sw $ra, 0x003C($sp) @@ -223,4 +244,3 @@ glabel EnLight_Draw /* 00CD4 80A9E814 00000000 */ nop /* 00CD8 80A9E818 00000000 */ nop /* 00CDC 80A9E81C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s index a0cd301526..4668338594 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80A9E8F0 + .word 0x38D1B717, 0x00000000 + +.text glabel EnLight_Init /* 00000 80A9DB40 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00004 80A9DB44 8DCEF9BC */ lw $t6, -0x0644($t6) ## 8015F9BC @@ -132,5 +137,3 @@ glabel EnLight_Init /* 001D4 80A9DD14 8FB10028 */ lw $s1, 0x0028($sp) /* 001D8 80A9DD18 03E00008 */ jr $ra /* 001DC 80A9DD1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Update.s index 0f98744b34..73be5115b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Update.s @@ -185,5 +185,3 @@ glabel EnLight_Update /* 00528 80A9E068 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0052C 80A9E06C 03E00008 */ jr $ra /* 00530 80A9E070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9DD50.s b/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9DD50.s index 647b26c488..5e734c8d41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9DD50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9DD50.s @@ -33,5 +33,3 @@ glabel func_80A9DD50 /* 00284 80A9DDC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00288 80A9DDC8 03E00008 */ jr $ra /* 0028C 80A9DDCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9E074.s b/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9E074.s index 22f6864659..0957fb4ec5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9E074.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/func_80A9E074.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80A9E8F8 + .word 0x3F1A36E2, 0xEB1C432D +glabel D_80A9E900 + .float 0.1 + +glabel D_80A9E904 + .float 0.1 + +glabel D_80A9E908 + .word 0x3F1A36E2, 0xEB1C432D + +.text glabel func_80A9E074 /* 00534 80A9E074 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00538 80A9E078 AFBF0024 */ sw $ra, 0x0024($sp) @@ -302,5 +315,3 @@ glabel func_80A9E074 /* 00960 80A9E4A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00964 80A9E4A4 03E00008 */ jr $ra /* 00968 80A9E4A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s index 7d73c77888..56c6286451 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s @@ -29,5 +29,3 @@ glabel EnMThunder_Destroy /* 00328 80A9F308 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0032C 80A9F30C 03E00008 */ jr $ra /* 00330 80A9F310 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s index 13e3642cec..5f092fbb71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s @@ -1,3 +1,39 @@ +.rdata +glabel D_80AA0490 + .asciz "../z_en_m_thunder.c" + .balign 4 + +glabel D_80AA04A4 + .asciz "../z_en_m_thunder.c" + .balign 4 + +glabel D_80AA04B8 + .asciz "../z_en_m_thunder.c" + .balign 4 + +glabel D_80AA04CC + .asciz "../z_en_m_thunder.c" + .balign 4 + +.late_rodata +glabel D_80AA0514 + .float 0.02 + +glabel D_80AA0518 + .word 0xBF333333 +glabel D_80AA051C + .word 0xBF19999A +glabel D_80AA0520 + .float -1.2 + +glabel D_80AA0524 + .word 0xBFE66666 +glabel D_80AA0528 + .word 0xBFB33333 +glabel D_80AA052C + .float 0.85 + +.text glabel EnMThunder_Draw /* 00D08 80A9FCE8 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 00D0C 80A9FCEC AFBF003C */ sw $ra, 0x003C($sp) @@ -471,4 +507,3 @@ glabel EnMThunder_Draw /* 01414 80AA03F4 03E00008 */ jr $ra /* 01418 80AA03F8 00000000 */ nop /* 0141C 80AA03FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s index ed1c1c6359..96b0a9f2a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s @@ -191,5 +191,3 @@ glabel EnMThunder_Init /* 002BC 80A9F29C 8FB10028 */ lw $s1, 0x0028($sp) /* 002C0 80A9F2A0 03E00008 */ jr $ra /* 002C4 80A9F2A4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Update.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Update.s index b42c0a8cd7..362b300e77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Update.s @@ -121,5 +121,3 @@ glabel EnMThunder_Update /* 00CFC 80A9FCDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D00 80A9FCE0 03E00008 */ jr $ra /* 00D04 80A9FCE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9EFE0.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9EFE0.s index 66495886a4..bb6d79b69d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9EFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9EFE0.s @@ -1,5 +1,3 @@ glabel func_80A9EFE0 /* 00000 80A9EFE0 03E00008 */ jr $ra /* 00004 80A9EFE4 AC8501C0 */ sw $a1, 0x01C0($a0) ## 000001C0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F314.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F314.s index 3978185b5b..3c18811651 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F314.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F314.s @@ -14,5 +14,3 @@ glabel func_80A9F314 /* 00364 80A9F344 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00368 80A9F348 03E00008 */ jr $ra /* 0036C 80A9F34C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s index 934b85cb39..fbfaa1b7d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s @@ -52,5 +52,3 @@ glabel func_80A9F350 /* 0041C 80A9F3FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00420 80A9F400 03E00008 */ jr $ra /* 00424 80A9F404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s index 9a03c33d9d..19c9eae29a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s @@ -1,3 +1,35 @@ +.late_rodata +glabel D_80AA04E0 + .float 0.1 + +glabel D_80AA04E4 + .float 0.1 + +glabel D_80AA04E8 + .float 0.15 + +glabel D_80AA04EC + .float 0.1 + +glabel D_80AA04F0 + .float 0.85 + +glabel D_80AA04F4 + .float 0.15 + +glabel D_80AA04F8 + .float 0.15 + +glabel D_80AA04FC + .float 0.1 + +glabel D_80AA0500 + .float 0.85 + +glabel D_80AA0504 + .float 0.1 + +.text glabel func_80A9F408 /* 00428 80A9F408 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0042C 80A9F40C AFBF003C */ sw $ra, 0x003C($sp) @@ -361,5 +393,3 @@ glabel func_80A9F408 /* 0094C 80A9F92C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00950 80A9F930 03E00008 */ jr $ra /* 00954 80A9F934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F938.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F938.s index e8e7bd900a..bf79073d7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F938.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AA0508 + .float 0.1 + +.text glabel func_80A9F938 /* 00958 80A9F938 AFA50004 */ sw $a1, 0x0004($sp) /* 0095C 80A9F93C 948E01C4 */ lhu $t6, 0x01C4($a0) ## 000001C4 @@ -34,5 +39,3 @@ glabel func_80A9F938 /* 009C8 80A9F9A8 E48C01BC */ swc1 $f12, 0x01BC($a0) ## 000001BC /* 009CC 80A9F9AC 03E00008 */ jr $ra /* 009D0 80A9F9B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s index aee46c4bf2..9b95b073df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AA050C + .float 0.6 + +glabel D_80AA0510 + .word 0x3FD55555 + +.text glabel func_80A9F9B4 /* 009D4 80A9F9B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 009D8 80A9F9B8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -102,5 +110,3 @@ glabel func_80A9F9B4 /* 00B30 80A9FB10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B34 80A9FB14 03E00008 */ jr $ra /* 00B38 80A9FB18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s index 34dd9fa10f..0462f549cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s @@ -14,5 +14,3 @@ glabel EnMa1_Destroy /* 006EC 80AA0D7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006F0 80AA0D80 03E00008 */ jr $ra /* 006F4 80AA0D84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s index ea43940eb5..9a2cc77aa2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AA16E0 + .asciz "../z_en_ma1.c" + .balign 4 + +glabel D_80AA16F0 + .asciz "../z_en_ma1.c" + .balign 4 + +.text glabel EnMa1_Draw /* 00E14 80AA14A4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00E18 80AA14A8 AFB20030 */ sw $s2, 0x0030($sp) @@ -95,4 +105,3 @@ glabel EnMa1_Draw /* 00F84 80AA1614 8FB20030 */ lw $s2, 0x0030($sp) /* 00F88 80AA1618 03E00008 */ jr $ra /* 00F8C 80AA161C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s index 6087e66e66..70c57a7bfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s @@ -99,5 +99,3 @@ glabel EnMa1_Init /* 006B4 80AA0D44 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 006B8 80AA0D48 03E00008 */ jr $ra /* 006BC 80AA0D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s index a05d10d99a..e59972b2db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s @@ -61,5 +61,3 @@ glabel EnMa1_Update /* 00C20 80AA12B0 8FB10020 */ lw $s1, 0x0020($sp) /* 00C24 80AA12B4 03E00008 */ jr $ra /* 00C28 80AA12B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s index c89dc68b4e..b27e5c8f80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s @@ -67,5 +67,3 @@ glabel func_80AA0690 /* 000DC 80AA076C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E0 80AA0770 03E00008 */ jr $ra /* 000E4 80AA0774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s index b55d766c7f..808a4747fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s @@ -1,3 +1,52 @@ +.late_rodata +.late_rodata_alignment 8 +glabel jtbl_80AA1700 +.word L80AA08B0 +.word L80AA08B0 +.word L80AA07C4 +.word L80AA08B0 +.word L80AA087C +.word L80AA087C +.word L80AA0898 +.word L80AA08B0 +.word L80AA08B0 +.word L80AA08B0 +glabel jtbl_80AA1728 +.word L80AA07F0 +.word L80AA0874 +.word L80AA08B0 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0818 +.word L80AA0834 +.word L80AA0850 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA0874 +.word L80AA086C + +.text glabel func_80AA0778 /* 000E8 80AA0778 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000EC 80AA077C AFBF0014 */ sw $ra, 0x0014($sp) @@ -94,5 +143,3 @@ glabel L80AA08B0 /* 00228 80AA08B8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000003 /* 0022C 80AA08BC 03E00008 */ jr $ra /* 00230 80AA08C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s index ad45f97987..038eee714d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s @@ -95,5 +95,3 @@ glabel func_80AA08C4 .L80AA0A04: /* 00374 80AA0A04 03E00008 */ jr $ra /* 00378 80AA0A08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A0C.s index bfd936b144..034d89b290 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A0C.s @@ -33,5 +33,3 @@ glabel func_80AA0A0C /* 003E8 80AA0A78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003EC 80AA0A7C 03E00008 */ jr $ra /* 003F0 80AA0A80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s index 26eab980bc..b18ccbc4b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s @@ -29,5 +29,3 @@ glabel func_80AA0A84 /* 00458 80AA0AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0045C 80AA0AEC 03E00008 */ jr $ra /* 00460 80AA0AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0AF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0AF4.s index 0b240332ed..8e4c238363 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0AF4.s @@ -32,5 +32,3 @@ glabel func_80AA0AF4 /* 004D8 80AA0B68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004DC 80AA0B6C 03E00008 */ jr $ra /* 004E0 80AA0B70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0B74.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0B74.s index edcee895cb..bf4a8384a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0B74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0B74.s @@ -31,5 +31,3 @@ glabel func_80AA0B74 /* 0054C 80AA0BDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00550 80AA0BE0 03E00008 */ jr $ra /* 00554 80AA0BE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s index ff31017a94..469ae710b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s @@ -76,5 +76,3 @@ glabel func_80AA0D88 /* 00804 80AA0E94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00808 80AA0E98 03E00008 */ jr $ra /* 0080C 80AA0E9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EA0.s index cbaa75c98f..b8c27d0798 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EA0.s @@ -24,5 +24,3 @@ glabel func_80AA0EA0 /* 00860 80AA0EF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00864 80AA0EF4 03E00008 */ jr $ra /* 00868 80AA0EF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s index 6773023dfd..b13888cc5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s @@ -18,5 +18,3 @@ glabel func_80AA0EFC .L80AA0F3C: /* 008AC 80AA0F3C 03E00008 */ jr $ra /* 008B0 80AA0F40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s index 8f71c8f188..4dc37bc821 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s @@ -78,5 +78,3 @@ glabel func_80AA0F44 /* 009D0 80AA1060 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009D4 80AA1064 03E00008 */ jr $ra /* 009D8 80AA1068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA106C.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA106C.s index a585a1067c..6a083f55c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA106C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA106C.s @@ -32,5 +32,3 @@ glabel func_80AA106C /* 00A50 80AA10E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A54 80AA10E4 03E00008 */ jr $ra /* 00A58 80AA10E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA10EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA10EC.s index 62508b9a2c..56506841eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA10EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA10EC.s @@ -25,5 +25,3 @@ glabel func_80AA10EC /* 00AB4 80AA1144 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AB8 80AA1148 03E00008 */ jr $ra /* 00ABC 80AA114C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s index 45398b6a23..d42b346dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s @@ -30,5 +30,3 @@ glabel func_80AA1150 .L80AA11C0: /* 00B30 80AA11C0 03E00008 */ jr $ra /* 00B34 80AA11C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA11C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA11C8.s index a5a8b6e7cd..85ec709899 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA11C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA11C8.s @@ -2,5 +2,3 @@ glabel func_80AA11C8 /* 00B38 80AA11C8 AFA40000 */ sw $a0, 0x0000($sp) /* 00B3C 80AA11CC 03E00008 */ jr $ra /* 00B40 80AA11D0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA12BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA12BC.s index 128c8ac24d..74ace6cd58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA12BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA12BC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AA17AC + .float 3.14159274101 + +glabel D_80AA17B0 + .float 3.14159274101 + +glabel D_80AA17B4 + .float 3.14159274101 + +glabel D_80AA17B8 + .float 3.14159274101 + +.text glabel func_80AA12BC /* 00C2C 80AA12BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00C30 80AA12C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -102,5 +116,3 @@ glabel func_80AA12BC /* 00DAC 80AA143C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00DB0 80AA1440 03E00008 */ jr $ra /* 00DB4 80AA1444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1448.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1448.s index 5c18d181d4..a456d95a59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1448.s @@ -23,5 +23,3 @@ glabel func_80AA1448 /* 00E08 80AA1498 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E0C 80AA149C 03E00008 */ jr $ra /* 00E10 80AA14A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s index 65e59c5c7a..4032e6c5ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s @@ -14,5 +14,3 @@ glabel EnMa2_Destroy /* 0066C 80AA200C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00670 80AA2010 03E00008 */ jr $ra /* 00674 80AA2014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s index 14c2f09b68..506b363bcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AA28F0 + .asciz "../z_en_ma2.c" + .balign 4 + +glabel D_80AA2900 + .asciz "../z_en_ma2.c" + .balign 4 + +.text glabel EnMa2_Draw /* 00CDC 80AA267C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00CE0 80AA2680 AFB20030 */ sw $s2, 0x0030($sp) @@ -97,4 +107,3 @@ glabel EnMa2_Draw /* 00E54 80AA27F4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00E58 80AA27F8 00000000 */ nop /* 00E5C 80AA27FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s index d564306d4a..bdc37d51db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s @@ -119,5 +119,3 @@ glabel EnMa2_Init /* 00634 80AA1FD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00638 80AA1FD8 03E00008 */ jr $ra /* 0063C 80AA1FDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s index 69ff4de778..452b942c3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s @@ -62,5 +62,3 @@ glabel EnMa2_Update /* 009A8 80AA2348 8FB10020 */ lw $s1, 0x0020($sp) /* 009AC 80AA234C 03E00008 */ jr $ra /* 009B0 80AA2350 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s index 937efa5d6c..975e61ccb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s @@ -42,5 +42,3 @@ glabel func_80AA19A0 /* 0008C 80AA1A2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00090 80AA1A30 03E00008 */ jr $ra /* 00094 80AA1A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s index 43e0494854..2301b0b3d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_80AA2910 +.word L80AA1AD0 +.word L80AA1AD0 +.word L80AA1A78 +.word L80AA1AD0 +.word L80AA1AD0 +.word L80AA1AD0 +.word L80AA1AD0 +.word L80AA1AD0 +.word L80AA1AD0 +.word L80AA1AD0 + +.text glabel func_80AA1A38 /* 00098 80AA1A38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0009C 80AA1A3C AFBF0014 */ sw $ra, 0x0014($sp) @@ -47,5 +61,3 @@ glabel L80AA1AD0 /* 00138 80AA1AD8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 0013C 80AA1ADC 03E00008 */ jr $ra /* 00140 80AA1AE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1AE4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1AE4.s index 4aae34bd54..6636d115cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1AE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1AE4.s @@ -29,5 +29,3 @@ glabel func_80AA1AE4 /* 001AC 80AA1B4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001B0 80AA1B50 03E00008 */ jr $ra /* 001B4 80AA1B54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s index 0d22c128f5..556213a90f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s @@ -78,5 +78,3 @@ glabel func_80AA1B58 .L80AA1C60: /* 002C0 80AA1C60 03E00008 */ jr $ra /* 002C4 80AA1C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1C68.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1C68.s index 2a460f0c73..769b78e040 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1C68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1C68.s @@ -26,5 +26,3 @@ glabel func_80AA1C68 /* 00314 80AA1CB4 A4830210 */ sh $v1, 0x0210($a0) ## 00000210 /* 00318 80AA1CB8 03E00008 */ jr $ra /* 0031C 80AA1CBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1CC0.s index 4b6032ccc6..5c1ebd20d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1CC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1CC0.s @@ -37,5 +37,3 @@ glabel func_80AA1CC0 /* 00398 80AA1D38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0039C 80AA1D3C 03E00008 */ jr $ra /* 003A0 80AA1D40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s index 22a2238b2d..d21513f0f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s @@ -29,5 +29,3 @@ glabel func_80AA1D44 /* 00408 80AA1DA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0040C 80AA1DAC 03E00008 */ jr $ra /* 00410 80AA1DB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1DB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1DB4.s index 00a5ff317d..d08ffaf097 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1DB4.s @@ -36,5 +36,3 @@ glabel func_80AA1DB4 /* 00490 80AA1E30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00494 80AA1E34 03E00008 */ jr $ra /* 00498 80AA1E38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2018.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2018.s index 64b05d4617..56a98ec3dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2018.s @@ -13,5 +13,3 @@ glabel func_80AA2018 .L80AA2044: /* 006A4 80AA2044 03E00008 */ jr $ra /* 006A8 80AA2048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA204C.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA204C.s index b4d3bcffb9..42340256de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA204C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA204C.s @@ -40,5 +40,3 @@ glabel func_80AA204C /* 00738 80AA20D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0073C 80AA20DC 03E00008 */ jr $ra /* 00740 80AA20E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s index bf4fbfa78d..af91929adc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s @@ -60,5 +60,3 @@ glabel func_80AA20E4 /* 0081C 80AA21BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00820 80AA21C0 03E00008 */ jr $ra /* 00824 80AA21C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA21C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA21C8.s index fcc858f8a5..5c7c6b9fa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA21C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA21C8.s @@ -45,5 +45,3 @@ glabel func_80AA21C8 /* 008BC 80AA225C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C0 80AA2260 03E00008 */ jr $ra /* 008C4 80AA2264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2354.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2354.s index 22ae0a16ba..14cae4cf63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2354.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2354.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AA2938 + .float 3.14159274101 + +glabel D_80AA293C + .float 3.14159274101 + +glabel D_80AA2940 + .float 3.14159274101 + +glabel D_80AA2944 + .float 3.14159274101 + +.text glabel func_80AA2354 /* 009B4 80AA2354 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 009B8 80AA2358 AFB00018 */ sw $s0, 0x0018($sp) @@ -150,5 +164,3 @@ glabel func_80AA2354 /* 00BE4 80AA2584 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00BE8 80AA2588 03E00008 */ jr $ra /* 00BEC 80AA258C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s index 4ae39d33ff..e049217d59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AA28D0 + .asciz "../z_en_ma2.c" + .balign 4 + +glabel D_80AA28E0 + .asciz "../z_en_ma2.c" + .balign 4 + +.text glabel func_80AA2590 /* 00BF0 80AA2590 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00BF4 80AA2594 3C0F80AA */ lui $t7, %hi(D_80AA28A8) ## $t7 = 80AA0000 @@ -61,5 +71,3 @@ glabel func_80AA2590 /* 00CD0 80AA2670 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00CD4 80AA2674 03E00008 */ jr $ra /* 00CD8 80AA2678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s index 0f09415115..1155376ad2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s @@ -14,5 +14,3 @@ glabel EnMa3_Destroy /* 00754 80AA31F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00758 80AA31F8 03E00008 */ jr $ra /* 0075C 80AA31FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s index 0d2015bacf..c0ddc9b5d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AA38E0 + .asciz "../z_en_ma3.c" + .balign 4 + +glabel D_80AA38F0 + .asciz "../z_en_ma3.c" + .balign 4 + +.text glabel EnMa3_Draw /* 00BCC 80AA366C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00BD0 80AA3670 AFB20030 */ sw $s2, 0x0030($sp) @@ -97,4 +107,3 @@ glabel EnMa3_Draw /* 00D44 80AA37E4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00D48 80AA37E8 00000000 */ nop /* 00D4C 80AA37EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s index c7a11481a2..0971d5b263 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s @@ -95,5 +95,3 @@ glabel EnMa3_Init /* 0071C 80AA31BC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00720 80AA31C0 03E00008 */ jr $ra /* 00724 80AA31C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s index 2c6d319fb5..20ab4b97e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s @@ -73,5 +73,3 @@ glabel EnMa3_Update /* 00898 80AA3338 8FB10020 */ lw $s1, 0x0020($sp) /* 0089C 80AA333C 03E00008 */ jr $ra /* 008A0 80AA3340 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s index e04a925f50..ae0ab1a276 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s @@ -87,5 +87,3 @@ glabel func_80AA2AA0 /* 00128 80AA2BC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0012C 80AA2BCC 03E00008 */ jr $ra /* 00130 80AA2BD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s index d848570124..c34af1c68f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s @@ -1,3 +1,37 @@ +.late_rodata +glabel jtbl_80AA3900 +.word L80AA2E40 +.word L80AA2E40 +.word L80AA2D20 +.word L80AA2E40 +.word L80AA2C8C +.word L80AA2C20 +.word L80AA2E40 +.word L80AA2E40 +.word L80AA2E40 +.word L80AA2E40 +glabel jtbl_80AA3928 +.word L80AA2D80 +.word L80AA2E3C +.word L80AA2E08 +.word L80AA2E1C +.word L80AA2DB0 +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2E3C +.word L80AA2DB0 + +.text glabel func_80AA2BD4 /* 00134 80AA2BD4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00138 80AA2BD8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -177,5 +211,3 @@ glabel L80AA2E40 /* 003A8 80AA2E48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003AC 80AA2E4C 03E00008 */ jr $ra /* 003B0 80AA2E50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2E54.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2E54.s index 765fb9ff95..f7309f498a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2E54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2E54.s @@ -29,5 +29,3 @@ glabel func_80AA2E54 /* 0041C 80AA2EBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00420 80AA2EC0 03E00008 */ jr $ra /* 00424 80AA2EC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s index 8f36a714d1..b141c20684 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s @@ -27,5 +27,3 @@ glabel func_80AA2EC8 .L80AA2F20: /* 00480 80AA2F20 03E00008 */ jr $ra /* 00484 80AA2F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F28.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F28.s index faa1054dda..55d402e311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F28.s @@ -26,5 +26,3 @@ glabel func_80AA2F28 /* 004D4 80AA2F74 A4830210 */ sh $v1, 0x0210($a0) ## 00000210 /* 004D8 80AA2F78 03E00008 */ jr $ra /* 004DC 80AA2F7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F80.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F80.s index 56c20fc9bb..64d244069d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2F80.s @@ -37,5 +37,3 @@ glabel func_80AA2F80 /* 00558 80AA2FF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0055C 80AA2FFC 03E00008 */ jr $ra /* 00560 80AA3000 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s index 938b6d946b..140efc7a9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s @@ -29,5 +29,3 @@ glabel func_80AA3004 /* 005C8 80AA3068 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005CC 80AA306C 03E00008 */ jr $ra /* 005D0 80AA3070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3200.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3200.s index 0c6f30d0fb..fbcabf56a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3200.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3200.s @@ -13,5 +13,3 @@ glabel func_80AA3200 .L80AA322C: /* 0078C 80AA322C 03E00008 */ jr $ra /* 00790 80AA3230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3344.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3344.s index 21004d1565..44cce3609b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3344.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AA3974 + .float 3.14159274101 + +glabel D_80AA3978 + .float 3.14159274101 + +glabel D_80AA397C + .float 3.14159274101 + +glabel D_80AA3980 + .float 3.14159274101 + +.text glabel func_80AA3344 /* 008A4 80AA3344 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 008A8 80AA3348 AFB00018 */ sw $s0, 0x0018($sp) @@ -150,5 +164,3 @@ glabel func_80AA3344 /* 00AD4 80AA3574 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00AD8 80AA3578 03E00008 */ jr $ra /* 00ADC 80AA357C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s index c50b18b63b..da3e4d8c5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AA38C0 + .asciz "../z_en_ma3.c" + .balign 4 + +glabel D_80AA38D0 + .asciz "../z_en_ma3.c" + .balign 4 + +.text glabel func_80AA3580 /* 00AE0 80AA3580 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00AE4 80AA3584 3C0F80AA */ lui $t7, %hi(D_80AA3898) ## $t7 = 80AA0000 @@ -61,5 +71,3 @@ glabel func_80AA3580 /* 00BC0 80AA3660 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00BC4 80AA3664 03E00008 */ jr $ra /* 00BC8 80AA3668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s index 4a34109a54..7bf74b1eae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s @@ -2,5 +2,3 @@ glabel EnMag_Destroy /* 00294 80AA3D94 AFA40000 */ sw $a0, 0x0000($sp) /* 00298 80AA3D98 03E00008 */ jr $ra /* 0029C 80AA3D9C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s index 9554dc50ea..7d77ed28a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AA5F10 + .asciz "../z_en_mag.c" + .balign 4 + +glabel D_80AA5F20 + .asciz "../z_en_mag.c" + .balign 4 + +.text glabel EnMag_Draw /* 022D4 80AA5DD4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 022D8 80AA5DD8 AFBF001C */ sw $ra, 0x001C($sp) @@ -50,4 +60,3 @@ glabel EnMag_Draw /* 02394 80AA5E94 03E00008 */ jr $ra /* 02398 80AA5E98 00000000 */ nop /* 0239C 80AA5E9C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s index 1e2955b246..914f9977f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s @@ -165,5 +165,3 @@ glabel EnMag_Init /* 00288 80AA3D88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0028C 80AA3D8C 03E00008 */ jr $ra /* 00290 80AA3D90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s index 474fdf4c6a..c54500db26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AA5F30 + .float 0.8 +glabel D_80AA5F34 + .float 2.4 + +.text glabel EnMag_Update /* 002A0 80AA3DA0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 002A4 80AA3DA4 8DCEF9B4 */ lw $t6, -0x064C($t6) ## 8015F9B4 @@ -461,5 +468,3 @@ glabel EnMag_Update /* 00970 80AA4470 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00974 80AA4474 03E00008 */ jr $ra /* 00978 80AA4478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s index a0792a4f1f..99c10cc7d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s @@ -145,5 +145,3 @@ glabel func_80AA447C /* 00B94 80AA4694 AC790004 */ sw $t9, 0x0004($v1) ## 0000004C /* 00B98 80AA4698 03E00008 */ jr $ra /* 00B9C 80AA469C AC820000 */ sw $v0, 0x0000($a0) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s index 8cb7e7dfe0..2c88006ad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s @@ -283,5 +283,3 @@ glabel func_80AA46A0 /* 00FC8 80AA4AC8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00FCC 80AA4ACC 03E00008 */ jr $ra /* 00FD0 80AA4AD0 AF020000 */ sw $v0, 0x0000($t8) ## F1000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s index 651a7390de..e0dfd6ce5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s @@ -258,5 +258,3 @@ glabel func_80AA4AD4 /* 013AC 80AA4EAC 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 /* 013B0 80AA4EB0 03E00008 */ jr $ra /* 013B4 80AA4EB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s index 92a9f82dde..a2d57dd54d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s @@ -112,5 +112,3 @@ glabel func_80AA4EB8 /* 01570 80AA5070 ACB80004 */ sw $t8, 0x0004($a1) ## 0000004C /* 01574 80AA5074 03E00008 */ jr $ra /* 01578 80AA5078 AC820000 */ sw $v0, 0x0000($a0) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s index 1c33779976..bd278616a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s @@ -875,5 +875,3 @@ glabel func_80AA507C /* 022C8 80AA5DC8 8FB00050 */ lw $s0, 0x0050($sp) /* 022CC 80AA5DCC 03E00008 */ jr $ra /* 022D0 80AA5DD0 27BD0158 */ addiu $sp, $sp, 0x0158 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s index 4c186aa289..369b24768e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s @@ -20,5 +20,3 @@ glabel EnMb_Destroy /* 003AC 80AA63FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B0 80AA6400 03E00008 */ jr $ra /* 003B4 80AA6404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s index 4bb188cd02..2f76a0e06a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s @@ -124,4 +124,3 @@ glabel EnMb_Draw /* 03B84 80AA9BD4 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 /* 03B88 80AA9BD8 00000000 */ nop /* 03B8C 80AA9BDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s index 6f19421168..1e73e63085 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80AA9E70 + .word 0x44DAC000 +glabel D_80AA9E74 + .word 0x44318000 +glabel D_80AA9E78 + .word 0x44DAC000 + +.text glabel EnMb_Init /* 00008 80AA6058 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0000C 80AA605C AFBF002C */ sw $ra, 0x002C($sp) @@ -230,5 +239,3 @@ glabel EnMb_Init /* 0035C 80AA63AC 8FB10028 */ lw $s1, 0x0028($sp) /* 00360 80AA63B0 03E00008 */ jr $ra /* 00364 80AA63B4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s index 2882b9167b..6a21ba85ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80AA9E94 + .float 4500.0 + +glabel D_80AA9E98 + .word 0xC5898000 +glabel D_80AA9E9C + .word 0xC5898000 + +.text glabel EnMb_Update /* 03654 80AA96A4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 03658 80AA96A8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -128,5 +138,3 @@ glabel EnMb_Update /* 03814 80AA9864 8FB10020 */ lw $s1, 0x0020($sp) /* 03818 80AA9868 03E00008 */ jr $ra /* 0381C 80AA986C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6050.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6050.s index 52b65321fb..996064d13d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6050.s @@ -1,5 +1,3 @@ glabel func_80AA6050 /* 00000 80AA6050 03E00008 */ jr $ra /* 00004 80AA6054 AC850324 */ sw $a1, 0x0324($a0) ## 00000324 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6408.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6408.s index cfff2c5244..cad36049d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6408.s @@ -15,5 +15,3 @@ glabel func_80AA6408 /* 003E8 80AA6438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003EC 80AA643C 03E00008 */ jr $ra /* 003F0 80AA6440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s index 7944208aa9..927a7721fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s @@ -60,5 +60,3 @@ glabel func_80AA6444 /* 004D0 80AA6520 468084A0 */ cvt.s.w $f18, $f16 /* 004D4 80AA6524 03E00008 */ jr $ra /* 004D8 80AA6528 E492034C */ swc1 $f18, 0x034C($a0) ## 0000034C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA652C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA652C.s index ac0ac8299e..17fea6730f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA652C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA652C.s @@ -104,5 +104,3 @@ glabel func_80AA652C .L80AA6698: /* 00648 80AA6698 03E00008 */ jr $ra /* 0064C 80AA669C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s index 7ef67b3eec..a083888fd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s @@ -105,5 +105,3 @@ glabel func_80AA66A0 /* 007D4 80AA6824 8FBE0038 */ lw $s8, 0x0038($sp) /* 007D8 80AA6828 03E00008 */ jr $ra /* 007DC 80AA682C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s index ec1e5245d6..ff7186395d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s @@ -26,5 +26,3 @@ glabel func_80AA6830 /* 0083C 80AA688C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00840 80AA6890 03E00008 */ jr $ra /* 00844 80AA6894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s index 6ba6440a6f..2fafb02871 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s @@ -25,5 +25,3 @@ glabel func_80AA6898 /* 008A0 80AA68F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008A4 80AA68F4 03E00008 */ jr $ra /* 008A8 80AA68F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s index 3e1e41c5d3..9b77c535ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s @@ -30,5 +30,3 @@ glabel func_80AA68FC /* 00918 80AA6968 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0091C 80AA696C 03E00008 */ jr $ra /* 00920 80AA6970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s index 96af81d026..38a3a17b61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AA9E7C + .word 0x3F199999 + +.text glabel func_80AA6974 /* 00924 80AA6974 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00928 80AA6978 AFB00028 */ sw $s0, 0x0028($sp) @@ -43,5 +48,3 @@ glabel func_80AA6974 /* 009BC 80AA6A0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 009C0 80AA6A10 03E00008 */ jr $ra /* 009C4 80AA6A14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s index 3203f4673a..5935e17e55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AA9E80 + .word 0x3F199999 + +.text glabel func_80AA6A18 /* 009C8 80AA6A18 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 009CC 80AA6A1C AFB00028 */ sw $s0, 0x0028($sp) @@ -46,5 +51,3 @@ glabel func_80AA6A18 /* 00A6C 80AA6ABC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A70 80AA6AC0 03E00008 */ jr $ra /* 00A74 80AA6AC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s index bdaf17c70f..ecd6fbebc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s @@ -49,5 +49,3 @@ glabel func_80AA6AC8 /* 00B24 80AA6B74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B28 80AA6B78 03E00008 */ jr $ra /* 00B2C 80AA6B7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s index 6e3b2f121b..80eb1e62bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s @@ -28,5 +28,3 @@ glabel func_80AA6B80 /* 00B94 80AA6BE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B98 80AA6BE8 03E00008 */ jr $ra /* 00B9C 80AA6BEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s index ae0a9bf032..c074746577 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s @@ -58,5 +58,3 @@ glabel func_80AA6BF0 /* 00C64 80AA6CB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C68 80AA6CB8 03E00008 */ jr $ra /* 00C6C 80AA6CBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s index 238e5a0de6..37c19c4d11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s @@ -24,5 +24,3 @@ glabel func_80AA6CC0 /* 00CC4 80AA6D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CC8 80AA6D18 03E00008 */ jr $ra /* 00CCC 80AA6D1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s index e26a94bd55..755f3f1118 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s @@ -33,5 +33,3 @@ glabel func_80AA6D20 /* 00D48 80AA6D98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D4C 80AA6D9C 03E00008 */ jr $ra /* 00D50 80AA6DA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s index 49ba3c86ae..124da8db18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s @@ -31,5 +31,3 @@ glabel func_80AA6DA4 /* 00DC0 80AA6E10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DC4 80AA6E14 03E00008 */ jr $ra /* 00DC8 80AA6E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s index 78fd723672..53d2e0a73e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s @@ -24,5 +24,3 @@ glabel func_80AA6E1C /* 00E20 80AA6E70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E24 80AA6E74 03E00008 */ jr $ra /* 00E28 80AA6E78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s index decb1c13b7..073ef8774d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s @@ -35,5 +35,3 @@ glabel func_80AA6E7C /* 00EA8 80AA6EF8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00EAC 80AA6EFC 03E00008 */ jr $ra /* 00EB0 80AA6F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s index e067646c5f..4d6a9e24ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s @@ -34,5 +34,3 @@ glabel func_80AA6F04 /* 00F30 80AA6F80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F34 80AA6F84 03E00008 */ jr $ra /* 00F38 80AA6F88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s index ceff5b4154..72463081e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s @@ -43,5 +43,3 @@ glabel func_80AA6F8C /* 00FD0 80AA7020 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00FD4 80AA7024 03E00008 */ jr $ra /* 00FD8 80AA7028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA702C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA702C.s index 55b4e7715f..6a9b21af0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA702C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA702C.s @@ -72,5 +72,3 @@ glabel func_80AA702C /* 010D8 80AA7128 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010DC 80AA712C 03E00008 */ jr $ra /* 010E0 80AA7130 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7134.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7134.s index a9d022df00..fd416752c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7134.s @@ -34,5 +34,3 @@ glabel func_80AA7134 /* 01150 80AA71A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01154 80AA71A4 03E00008 */ jr $ra /* 01158 80AA71A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA71AC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA71AC.s index 8dec4d1164..d8195133d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA71AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA71AC.s @@ -100,5 +100,3 @@ glabel func_80AA71AC /* 012B4 80AA7304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012B8 80AA7308 03E00008 */ jr $ra /* 012BC 80AA730C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s index b2264dd31a..078b3427de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s @@ -99,5 +99,3 @@ glabel func_80AA7310 /* 0141C 80AA746C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01420 80AA7470 03E00008 */ jr $ra /* 01424 80AA7474 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7478.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7478.s index 97af02f57f..7c02a0b711 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7478.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7478.s @@ -18,5 +18,3 @@ glabel func_80AA7478 /* 01460 80AA74B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01464 80AA74B4 03E00008 */ jr $ra /* 01468 80AA74B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s index 76cb745a80..28462c8cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s @@ -220,5 +220,3 @@ glabel func_80AA74BC /* 01774 80AA77C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 01778 80AA77C8 03E00008 */ jr $ra /* 0177C 80AA77CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s index 16832319ad..3b1c19a975 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s @@ -99,5 +99,3 @@ glabel func_80AA77D0 /* 018DC 80AA792C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 018E0 80AA7930 03E00008 */ jr $ra /* 018E4 80AA7934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s index 7b97dfe51e..bc1409c0b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AA9E84 + .word 0x44228000 +glabel D_80AA9E88 + .float 0.04 + +.text glabel func_80AA7938 /* 018E8 80AA7938 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 018EC 80AA793C 3C1880AB */ lui $t8, %hi(D_80AA9D50) ## $t8 = 80AB0000 @@ -235,5 +242,3 @@ glabel func_80AA7938 /* 01C50 80AA7CA0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 01C54 80AA7CA4 03E00008 */ jr $ra /* 01C58 80AA7CA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s index f5594820a0..c59c087c20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s @@ -239,5 +239,3 @@ glabel func_80AA7CAC /* 01FB0 80AA8000 8FB10030 */ lw $s1, 0x0030($sp) /* 01FB4 80AA8004 03E00008 */ jr $ra /* 01FB8 80AA8008 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA800C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA800C.s index f3cf95ef02..8407f60332 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA800C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA800C.s @@ -242,5 +242,3 @@ glabel func_80AA800C /* 0231C 80AA836C 8FB10030 */ lw $s1, 0x0030($sp) /* 02320 80AA8370 03E00008 */ jr $ra /* 02324 80AA8374 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s index 53cb1185a6..74a8915d28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s @@ -40,5 +40,3 @@ glabel func_80AA8378 /* 023B0 80AA8400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 023B4 80AA8404 03E00008 */ jr $ra /* 023B8 80AA8408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s index 40b0ee5e9b..597d656b53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s @@ -74,5 +74,3 @@ glabel func_80AA840C /* 024B8 80AA8508 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 024BC 80AA850C 03E00008 */ jr $ra /* 024C0 80AA8510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s index a5afaa05ca..58c2894673 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s @@ -191,5 +191,3 @@ glabel func_80AA8514 /* 0277C 80AA87CC 8FB40070 */ lw $s4, 0x0070($sp) /* 02780 80AA87D0 03E00008 */ jr $ra /* 02784 80AA87D4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA87D8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA87D8.s index eff822af1d..fbbeaf5e65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA87D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA87D8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AA9E8C + .float 0.7 + +.text glabel func_80AA87D8 /* 02788 80AA87D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0278C 80AA87DC AFBF0024 */ sw $ra, 0x0024($sp) @@ -227,5 +232,3 @@ glabel func_80AA87D8 /* 02A90 80AA8AE0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02A94 80AA8AE4 03E00008 */ jr $ra /* 02A98 80AA8AE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8AEC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8AEC.s index 7455c5bd08..80bca8e2d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8AEC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AA9E90 + .float 0.1 + +.text glabel func_80AA8AEC /* 02A9C 80AA8AEC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02AA0 80AA8AF0 AFB00020 */ sw $s0, 0x0020($sp) @@ -216,5 +221,3 @@ glabel func_80AA8AEC /* 02D7C 80AA8DCC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 02D80 80AA8DD0 03E00008 */ jr $ra /* 02D84 80AA8DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8DD8.s index f98d9cb322..1860a3718b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8DD8.s @@ -47,5 +47,3 @@ glabel func_80AA8DD8 /* 02E2C 80AA8E7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02E30 80AA8E80 03E00008 */ jr $ra /* 02E34 80AA8E84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s index 9943051c8e..1fa62fbc21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s @@ -53,5 +53,3 @@ glabel func_80AA8E88 /* 02EF4 80AA8F44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02EF8 80AA8F48 03E00008 */ jr $ra /* 02EFC 80AA8F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8F50.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8F50.s index bc97e5eed0..b269e6338a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8F50.s @@ -33,5 +33,3 @@ glabel func_80AA8F50 /* 02F6C 80AA8FBC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02F70 80AA8FC0 03E00008 */ jr $ra /* 02F74 80AA8FC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s index 7e01a09dae..4d6cb842c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s @@ -57,5 +57,3 @@ glabel func_80AA8FC8 /* 03044 80AA9094 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03048 80AA9098 03E00008 */ jr $ra /* 0304C 80AA909C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s index 5f0f5d0ea7..9f14513057 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s @@ -144,5 +144,3 @@ glabel func_80AA90A0 /* 0325C 80AA92AC 8FB40070 */ lw $s4, 0x0070($sp) /* 03260 80AA92B0 03E00008 */ jr $ra /* 03264 80AA92B4 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA92B8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA92B8.s index db483743f2..2b1946fe46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA92B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA92B8.s @@ -98,5 +98,3 @@ glabel func_80AA92B8 /* 033E4 80AA9434 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 033E8 80AA9438 03E00008 */ jr $ra /* 033EC 80AA943C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9440.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9440.s index fdfcfef17d..104860aa29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9440.s @@ -37,5 +37,3 @@ glabel func_80AA9440 /* 0347C 80AA94CC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03480 80AA94D0 03E00008 */ jr $ra /* 03484 80AA94D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA94D8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA94D8.s index 2d49188d14..cb340e575c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA94D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA94D8.s @@ -126,5 +126,3 @@ glabel func_80AA94D8 /* 03648 80AA9698 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0364C 80AA969C 03E00008 */ jr $ra /* 03650 80AA96A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9870.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9870.s index 89126879d4..36318e7496 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9870.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA9870.s @@ -1,3 +1,30 @@ +.late_rodata +glabel jtbl_80AA9EA0 +.word L80AA996C +.word L80AA9944 +.word L80AA9990 +.word L80AA995C +.word L80AA9990 +.word L80AA9990 +.word L80AA994C +.word L80AA9990 +.word L80AA9964 +.word L80AA9990 +.word L80AA9990 +.word L80AA9954 +.word L80AA9990 +.word L80AA9990 +.word L80AA9974 +.word L80AA9990 +.word L80AA9984 +.word L80AA9990 +.word L80AA9990 +.word L80AA997C +.word L80AA9990 +.word L80AA998C +.word 0x00000000, 0x00000000 + +.text glabel func_80AA9870 /* 03820 80AA9870 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03824 80AA9874 8FAE0048 */ lw $t6, 0x0048($sp) @@ -117,5 +144,3 @@ glabel L80AA9990 /* 039AC 80AA99FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 039B0 80AA9A00 03E00008 */ jr $ra /* 039B4 80AA9A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s index f992927206..60794361b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s @@ -10,5 +10,3 @@ glabel EnMd_Destroy /* 01618 80AAB868 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0161C 80AAB86C 03E00008 */ jr $ra /* 01620 80AAB870 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s index cca31ef496..5dbb4a0bd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AAC4B0 + .asciz "../z_en_md.c" + .balign 4 + +glabel D_80AAC4C0 + .asciz "../z_en_md.c" + .balign 4 + +.text glabel EnMd_Draw /* 01F10 80AAC160 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01F14 80AAC164 AFBF0024 */ sw $ra, 0x0024($sp) @@ -102,4 +112,3 @@ glabel EnMd_Draw /* 02094 80AAC2E4 03E00008 */ jr $ra /* 02098 80AAC2E8 00000000 */ nop /* 0209C 80AAC2EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s index 799059906d..7927696454 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s @@ -141,5 +141,3 @@ glabel EnMd_Init /* 015F0 80AAB840 8FB10038 */ lw $s1, 0x0038($sp) /* 015F4 80AAB844 03E00008 */ jr $ra /* 015F8 80AAB848 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s index f20ea1ec60..343f404692 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s @@ -50,5 +50,3 @@ glabel EnMd_Update /* 01C94 80AABEE4 8FB10020 */ lw $s1, 0x0020($sp) /* 01C98 80AABEE8 03E00008 */ jr $ra /* 01C9C 80AABEEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s index 5d4c329609..ad8b34192f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s @@ -8,5 +8,3 @@ glabel func_80AAA250 /* 00018 80AAA268 E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C /* 0001C 80AAA26C 03E00008 */ jr $ra /* 00020 80AAA270 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s index 24ca7915c3..08e13b8367 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s @@ -40,5 +40,3 @@ glabel func_80AAA274 /* 000AC 80AAA2FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000B0 80AAA300 03E00008 */ jr $ra /* 000B4 80AAA304 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s index bdf8c76bf7..320a7b17a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s @@ -40,5 +40,3 @@ glabel func_80AAA308 /* 00140 80AAA390 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00144 80AAA394 03E00008 */ jr $ra /* 00148 80AAA398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s index acb48ff5e3..317cc0a9a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s @@ -58,5 +58,3 @@ glabel func_80AAA39C /* 00218 80AAA468 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0021C 80AAA46C 03E00008 */ jr $ra /* 00220 80AAA470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s index d04602c1a8..0a1ab75af4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s @@ -40,5 +40,3 @@ glabel func_80AAA474 /* 002AC 80AAA4FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002B0 80AAA500 03E00008 */ jr $ra /* 002B4 80AAA504 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s index b6548cba4b..074a9531e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s @@ -42,5 +42,3 @@ glabel func_80AAA508 /* 00348 80AAA598 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0034C 80AAA59C 03E00008 */ jr $ra /* 00350 80AAA5A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s index 9e2ab80934..ce5c342658 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s @@ -40,5 +40,3 @@ glabel func_80AAA5A4 /* 003DC 80AAA62C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003E0 80AAA630 03E00008 */ jr $ra /* 003E4 80AAA634 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s index b7824d8943..9cffa79cc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s @@ -42,5 +42,3 @@ glabel func_80AAA638 /* 00478 80AAA6C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0047C 80AAA6CC 03E00008 */ jr $ra /* 00480 80AAA6D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s index a18ac760c0..813555cb62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s @@ -40,5 +40,3 @@ glabel func_80AAA6D4 /* 0050C 80AAA75C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00510 80AAA760 03E00008 */ jr $ra /* 00514 80AAA764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s index c668a21e42..ede5ea246d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s @@ -40,5 +40,3 @@ glabel func_80AAA768 /* 005A0 80AAA7F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005A4 80AAA7F4 03E00008 */ jr $ra /* 005A8 80AAA7F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s index 0dd0f96f80..a7ac952e01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s @@ -40,5 +40,3 @@ glabel func_80AAA7FC /* 00634 80AAA884 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00638 80AAA888 03E00008 */ jr $ra /* 0063C 80AAA88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s index ae2860d99d..de51f23e7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s @@ -42,5 +42,3 @@ glabel func_80AAA890 /* 006D0 80AAA920 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006D4 80AAA924 03E00008 */ jr $ra /* 006D8 80AAA928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s index 59f9c3cfac..4a08ab38c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s @@ -3,5 +3,3 @@ glabel func_80AAA92C /* 006E0 80AAA930 A085020B */ sb $a1, 0x020B($a0) ## 0000020B /* 006E4 80AAA934 03E00008 */ jr $ra /* 006E8 80AAA938 A080020A */ sb $zero, 0x020A($a0) ## 0000020A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s index bd2aa8f79e..ddb0adb340 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s @@ -1,3 +1,18 @@ +.late_rodata +glabel jtbl_80AAC4D0 +.word L80AAA96C +.word L80AAA97C +.word L80AAA98C +.word L80AAA99C +.word L80AAA9AC +.word L80AAA9BC +.word L80AAA9CC +.word L80AAA9DC +.word L80AAA9EC +.word L80AAA9FC +.word L80AAAA0C + +.text glabel func_80AAA93C /* 006EC 80AAA93C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 006F0 80AAA940 AFBF0014 */ sw $ra, 0x0014($sp) @@ -70,5 +85,3 @@ glabel L80AAAA0C /* 007C8 80AAAA18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007CC 80AAAA1C 03E00008 */ jr $ra /* 007D0 80AAAA20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s index 45e8b5c145..0ddfb36cbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s @@ -1,3 +1,31 @@ +.late_rodata +glabel jtbl_80AAC4FC +.word L80AAAA68 +.word L80AAABCC +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAB18 +.word L80AAABCC +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAAC5C +.word L80AAABCC +.word L80AAABFC + +.text glabel func_80AAAA24 /* 007D4 80AAAA24 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 007D8 80AAAA28 AFBF001C */ sw $ra, 0x001C($sp) @@ -161,5 +189,3 @@ glabel L80AAAC5C /* 00A1C 80AAAC6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A20 80AAAC70 03E00008 */ jr $ra /* 00A24 80AAAC74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s index 06aaa268b1..3994a68d78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s @@ -34,5 +34,3 @@ glabel func_80AAAC78 /* 00A9C 80AAACEC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 00AA0 80AAACF0 03E00008 */ jr $ra /* 00AA4 80AAACF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s index 625b86f073..39981c2855 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s @@ -62,5 +62,3 @@ glabel func_80AAACF8 /* 00B84 80AAADD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B88 80AAADD8 03E00008 */ jr $ra /* 00B8C 80AAADDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s index 6838c8045b..6114ab2da0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s @@ -13,5 +13,3 @@ glabel func_80AAADE0 .L80AAAE0C: /* 00BBC 80AAAE0C 03E00008 */ jr $ra /* 00BC0 80AAAE10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s index 868bd3eb0e..f3307c4330 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s @@ -37,5 +37,3 @@ glabel func_80AAAE14 .L80AAAE8C: /* 00C3C 80AAAE8C 03E00008 */ jr $ra /* 00C40 80AAAE90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s index 71e179eaaa..61b3aa1194 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s @@ -32,5 +32,3 @@ glabel func_80AAAE94 /* 00CA8 80AAAEF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CAC 80AAAEFC 03E00008 */ jr $ra /* 00CB0 80AAAF00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s index 74128c5a29..828a1de4bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_80AAC55C +.word L80AAAF40 +.word L80AAAF40 +.word L80AAAF48 +.word L80AAAF40 +.word L80AAAF40 +.word L80AAB010 +.word L80AAAF40 +.word L80AAAF40 +.word L80AAAF40 +.word L80AAAF40 + +.text glabel func_80AAAF04 /* 00CB4 80AAAF04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00CB8 80AAAF08 AFA40018 */ sw $a0, 0x0018($sp) @@ -87,5 +101,3 @@ glabel L80AAB010 /* 00DE0 80AAB030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DE4 80AAB034 03E00008 */ jr $ra /* 00DE8 80AAB038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s index d4ea10a127..4fab3e440e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s @@ -46,5 +46,3 @@ glabel func_80AAB03C .L80AAB0D8: /* 00E88 80AAB0D8 03E00008 */ jr $ra /* 00E8C 80AAB0DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s index 3e723e66d2..ee8cc380f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s @@ -33,5 +33,3 @@ glabel func_80AAB0E0 /* 00EFC 80AAB14C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F00 80AAB150 03E00008 */ jr $ra /* 00F04 80AAB154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s index f4d5055f5c..088123d4c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s @@ -146,5 +146,3 @@ glabel func_80AAB158 /* 01114 80AAB364 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01118 80AAB368 03E00008 */ jr $ra /* 0111C 80AAB36C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s index c791253fd3..0f3dcb576e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AAC584 + .word 0x4622F983 + +.text glabel func_80AAB370 /* 01120 80AAB370 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01124 80AAB374 AFBF0024 */ sw $ra, 0x0024($sp) @@ -94,5 +99,3 @@ glabel func_80AAB370 /* 01280 80AAB4D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01284 80AAB4D4 03E00008 */ jr $ra /* 01288 80AAB4D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s index c85efa8d1c..b8a2a4406b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s @@ -50,5 +50,3 @@ glabel func_80AAB4DC /* 01348 80AAB598 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C /* 0134C 80AAB59C 03E00008 */ jr $ra /* 01350 80AAB5A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s index 1d5c9ef113..750a19bb8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s @@ -47,5 +47,3 @@ glabel func_80AAB5A4 /* 013F4 80AAB644 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013F8 80AAB648 03E00008 */ jr $ra /* 013FC 80AAB64C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s index 737150e91e..f29db25941 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s @@ -34,5 +34,3 @@ glabel func_80AAB874 /* 0169C 80AAB8EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016A0 80AAB8F0 03E00008 */ jr $ra /* 016A4 80AAB8F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s index e8c7c066e4..7989d432f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s @@ -20,5 +20,3 @@ glabel func_80AAB8F8 /* 016EC 80AAB93C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016F0 80AAB940 03E00008 */ jr $ra /* 016F4 80AAB944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s index 5b598868ff..34e91e6e35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AAC588 + .float 0.001 + +.text glabel func_80AAB948 /* 016F8 80AAB948 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 016FC 80AAB94C AFBF001C */ sw $ra, 0x001C($sp) @@ -193,5 +198,3 @@ glabel func_80AAB948 /* 019B4 80AABC04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 019B8 80AABC08 03E00008 */ jr $ra /* 019BC 80AABC0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s index d16120b7c7..7a3b575047 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s @@ -66,5 +66,3 @@ glabel func_80AABC10 /* 01AB0 80AABD00 8FB10020 */ lw $s1, 0x0020($sp) /* 01AB4 80AABD04 03E00008 */ jr $ra /* 01AB8 80AABD08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s index 31d625f57b..ba700c2039 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s @@ -79,5 +79,3 @@ glabel func_80AABD0C /* 01BD8 80AABE28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01BDC 80AABE2C 03E00008 */ jr $ra /* 01BE0 80AABE30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s index af5a6f5d7f..a6cf61fab7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AAC58C + .float 3.14159274101 + +glabel D_80AAC590 + .float 3.14159274101 + +glabel D_80AAC594 + .float 3.14159274101 + +glabel D_80AAC598 + .float 3.14159274101 + +.text glabel func_80AABEF0 /* 01CA0 80AABEF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01CA4 80AABEF4 AFB00018 */ sw $s0, 0x0018($sp) @@ -138,5 +152,3 @@ glabel func_80AABEF0 /* 01EA8 80AAC0F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01EAC 80AAC0FC 03E00008 */ jr $ra /* 01EB0 80AAC100 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s index 7283d66c7b..28c9fef2f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s @@ -23,5 +23,3 @@ glabel func_80AAC104 /* 01F04 80AAC154 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F08 80AAC158 03E00008 */ jr $ra /* 01F0C 80AAC15C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s index fc96261017..8231cdfca1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s @@ -10,5 +10,3 @@ glabel EnMk_Destroy /* 00134 80AACA34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00138 80AACA38 03E00008 */ jr $ra /* 0013C 80AACA3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s index a1816b6003..7d8a3d9b55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s @@ -24,4 +24,3 @@ glabel EnMk_Draw /* 00CF4 80AAD5F4 00000000 */ nop /* 00CF8 80AAD5F8 00000000 */ nop /* 00CFC 80AAD5FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index f938125f4e..a5aae0defd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s @@ -74,5 +74,3 @@ glabel EnMk_Init /* 0010C 80AACA0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00110 80AACA10 03E00008 */ jr $ra /* 00114 80AACA14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s index 3923d45a04..5cf2a1f341 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AAD660 + .float 0.025 + +.text glabel EnMk_Update /* 009D0 80AAD2D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 009D4 80AAD2D4 AFB00028 */ sw $s0, 0x0028($sp) @@ -162,5 +167,3 @@ glabel EnMk_Update /* 00C0C 80AAD50C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00C10 80AAD510 03E00008 */ jr $ra /* 00C14 80AAD514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s index a6551ff006..74598e2ab8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s @@ -21,5 +21,3 @@ glabel func_80AACA40 /* 00188 80AACA88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0018C 80AACA8C 03E00008 */ jr $ra /* 00190 80AACA90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s index 86502df089..e82bd0102a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s @@ -33,5 +33,3 @@ glabel func_80AACA94 /* 00208 80AACB08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0020C 80AACB0C 03E00008 */ jr $ra /* 00210 80AACB10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s index 06d1e0e5c0..9f3e761265 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s @@ -22,5 +22,3 @@ glabel func_80AACB14 /* 00260 80AACB60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00264 80AACB64 03E00008 */ jr $ra /* 00268 80AACB68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s index 4d897ad0de..f71b726c6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s @@ -16,5 +16,3 @@ glabel func_80AACB6C /* 002A0 80AACBA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A4 80AACBA4 03E00008 */ jr $ra /* 002A8 80AACBA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s index 81df271424..65dcbcee6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s @@ -23,5 +23,3 @@ glabel func_80AACBAC /* 002F8 80AACBF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002FC 80AACBFC 03E00008 */ jr $ra /* 00300 80AACC00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s index 483205016d..d678cca487 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s @@ -42,5 +42,3 @@ glabel func_80AACC04 /* 00394 80AACC94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00398 80AACC98 03E00008 */ jr $ra /* 0039C 80AACC9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s index 587a004830..e0da6672ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s @@ -45,5 +45,3 @@ glabel func_80AACCA0 /* 0043C 80AACD3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00440 80AACD40 03E00008 */ jr $ra /* 00444 80AACD44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s index 661907bd9a..e08496e4c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s @@ -59,5 +59,3 @@ glabel func_80AACD48 /* 00520 80AACE20 8FB00024 */ lw $s0, 0x0024($sp) /* 00524 80AACE24 03E00008 */ jr $ra /* 00528 80AACE28 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s index 852b5b5aeb..24538efba5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s @@ -50,5 +50,3 @@ glabel func_80AACE2C /* 005DC 80AACEDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005E0 80AACEE0 03E00008 */ jr $ra /* 005E4 80AACEE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s index 0e5bd57db2..824bb59957 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s @@ -49,5 +49,3 @@ glabel func_80AACEE8 /* 00694 80AACF94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00698 80AACF98 03E00008 */ jr $ra /* 0069C 80AACF9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s index a69e7dcc9c..8325f1f70f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s @@ -30,5 +30,3 @@ glabel func_80AACFA0 /* 00708 80AAD008 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0070C 80AAD00C 03E00008 */ jr $ra /* 00710 80AAD010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s index dad164947a..c964b6da00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s @@ -27,5 +27,3 @@ glabel func_80AAD014 /* 00774 80AAD074 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00778 80AAD078 03E00008 */ jr $ra /* 0077C 80AAD07C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s index f7f7039308..bb373eb870 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s @@ -161,5 +161,3 @@ glabel func_80AAD080 /* 009C4 80AAD2C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 009C8 80AAD2C8 03E00008 */ jr $ra /* 009CC 80AAD2CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s index 828c8a4e75..a1df22a9e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s @@ -17,5 +17,3 @@ glabel func_80AAD518 .L80AAD554: /* 00C54 80AAD554 03E00008 */ jr $ra /* 00C58 80AAD558 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s index 7eaa9893c1..a578d8f70a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s @@ -16,5 +16,3 @@ glabel func_80AAD55C /* 00C90 80AAD590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C94 80AAD594 03E00008 */ jr $ra /* 00C98 80AAD598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s index b86133b0ea..97dbad66b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s @@ -10,5 +10,3 @@ glabel EnMm_Destroy /* 002F4 80AADA64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 80AADA68 03E00008 */ jr $ra /* 002FC 80AADA6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s index 448c04e578..e257db4218 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80AAEC00 + .asciz "../z_en_mm.c" + .balign 4 + +glabel D_80AAEC10 + .asciz "../z_en_mm.c" + .balign 4 + +glabel D_80AAEC20 + .asciz "../z_en_mm.c" + .balign 4 + +glabel D_80AAEC30 + .asciz "../z_en_mm.c" + .balign 4 + +glabel D_80AAEC40 + .asciz "../z_en_mm.c" + .balign 4 + +.late_rodata +glabel D_80AAEC88 + .word 0xC4966000 +glabel D_80AAEC8C + .word 0xC4966000 + +.text glabel EnMm_Draw /* 00F3C 80AAE6AC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00F40 80AAE6B0 AFB10028 */ sw $s1, 0x0028($sp) @@ -182,5 +210,3 @@ glabel EnMm_Draw /* 01200 80AAE970 8FB10028 */ lw $s1, 0x0028($sp) /* 01204 80AAE974 03E00008 */ jr $ra /* 01208 80AAE978 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s index 809d40fcd9..78fadcb2ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s @@ -117,5 +117,3 @@ glabel EnMm_Init /* 002CC 80AADA3C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 002D0 80AADA40 03E00008 */ jr $ra /* 002D4 80AADA44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s index cb7e7b67b8..25e29c1bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s @@ -28,5 +28,3 @@ glabel EnMm_Update /* 00F30 80AAE6A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F34 80AAE6A4 03E00008 */ jr $ra /* 00F38 80AAE6A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s index 899a6248e8..fb7bc1ef88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s @@ -80,5 +80,3 @@ glabel func_80AAD770 /* 00114 80AAD884 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00118 80AAD888 03E00008 */ jr $ra /* 0011C 80AAD88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s index 1c9fee951e..27843aff52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s @@ -12,5 +12,3 @@ glabel func_80AADA70 .L80AADA98: /* 00328 80AADA98 03E00008 */ jr $ra /* 0032C 80AADA9C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s index 1d1be374d1..23404aae16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80AAEC50 +.word L80AADC20 +.word L80AADC20 +.word L80AADC20 +.word L80AADC20 +.word L80AADAF0 +.word L80AADB78 +.word L80AADBD0 + +.text glabel func_80AADAA0 /* 00330 80AADAA0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00334 80AADAA4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -109,5 +120,3 @@ glabel L80AADC20 /* 004B8 80AADC28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004BC 80AADC2C 03E00008 */ jr $ra /* 004C0 80AADC30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s index d735dd3d07..6d73f69fc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s @@ -43,5 +43,3 @@ glabel func_80AADC34 .L80AADCC8: /* 00558 80AADCC8 03E00008 */ jr $ra /* 0055C 80AADCCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADCD0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADCD0.s index 6aafa0f15d..0f4654f245 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADCD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADCD0.s @@ -103,5 +103,3 @@ glabel func_80AADCD0 /* 006D4 80AADE44 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 006D8 80AADE48 03E00008 */ jr $ra /* 006DC 80AADE4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE50.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE50.s index 688cd105fe..d9b6b554f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE50.s @@ -3,5 +3,3 @@ glabel func_80AADE50 /* 006E4 80AADE54 01C47821 */ addu $t7, $t6, $a0 /* 006E8 80AADE58 03E00008 */ jr $ra /* 006EC 80AADE5C 91E20000 */ lbu $v0, 0x0000($t7) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s index ec6a8696c3..2247a2b1e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s @@ -35,5 +35,3 @@ glabel func_80AADE60 /* 00774 80AADEE4 468084A0 */ cvt.s.w $f18, $f16 /* 00778 80AADEE8 03E00008 */ jr $ra /* 0077C 80AADEEC E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s index 4a0e217bb6..ed154798b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AAEC6C + .word 0x4622F983 +glabel D_80AAEC70 + .word 0x41270A3D +glabel D_80AAEC74 + .word 0x4622F983 +glabel D_80AAEC78 + .word 0x41270A3D + +.text glabel func_80AADEF0 /* 00780 80AADEF0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00784 80AADEF4 AFBF0044 */ sw $ra, 0x0044($sp) @@ -222,5 +233,3 @@ glabel func_80AADEF0 /* 00AA8 80AAE218 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 00AAC 80AAE21C 03E00008 */ jr $ra /* 00AB0 80AAE220 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE224.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE224.s index fd4b29e295..ee0eab693a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE224.s @@ -29,5 +29,3 @@ glabel func_80AAE224 /* 00B18 80AAE288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B1C 80AAE28C 03E00008 */ jr $ra /* 00B20 80AAE290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s index 7ad934ab64..ef7dabcd62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80AAEC7C + .word 0x38000100 +glabel D_80AAEC80 + .word 0x3F7C1BDA +glabel D_80AAEC84 + .word 0xBF7C1BDA + +.text glabel func_80AAE294 /* 00B24 80AAE294 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00B28 80AAE298 AFB00028 */ sw $s0, 0x0028($sp) @@ -173,5 +182,3 @@ glabel func_80AAE294 /* 00D90 80AAE500 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00D94 80AAE504 03E00008 */ jr $ra /* 00D98 80AAE508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s index 9e26184bc9..3fe2138940 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s @@ -38,5 +38,3 @@ glabel func_80AAE50C /* 00E1C 80AAE58C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E20 80AAE590 03E00008 */ jr $ra /* 00E24 80AAE594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE598.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE598.s index dcb2022e81..37dbb0cdf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE598.s @@ -44,5 +44,3 @@ glabel func_80AAE598 /* 00EC4 80AAE634 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00EC8 80AAE638 03E00008 */ jr $ra /* 00ECC 80AAE63C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE97C.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE97C.s index aaef590e3a..2c7343fb3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE97C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE97C.s @@ -39,5 +39,3 @@ glabel func_80AAE97C .L80AAEA08: /* 01298 80AAEA08 03E00008 */ jr $ra /* 0129C 80AAEA0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAEA10.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAEA10.s index 2a5d8123af..87b84a2284 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAEA10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAEA10.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AAEC90 + .word 0x4020D97C, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80AAEA10 /* 012A0 80AAEA10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 012A4 80AAEA14 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -44,4 +49,3 @@ glabel func_80AAEA10 /* 01344 80AAEAB4 03E00008 */ jr $ra /* 01348 80AAEAB8 00000000 */ nop /* 0134C 80AAEABC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s index ca9348ce86..40f486914e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s @@ -10,5 +10,3 @@ glabel EnMm2_Destroy /* 003C8 80AAF218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003CC 80AAF21C 03E00008 */ jr $ra /* 003D0 80AAF220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s index af571d6a95..29de2846c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AAFBE8 + .asciz "../z_en_mm2.c" + .balign 4 + +glabel D_80AAFBF8 + .asciz "../z_en_mm2.c" + .balign 4 + +.text glabel EnMm2_Draw /* 00A88 80AAF8D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00A8C 80AAF8DC AFBF002C */ sw $ra, 0x002C($sp) @@ -63,5 +73,3 @@ glabel EnMm2_Draw /* 00B7C 80AAF9CC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00B80 80AAF9D0 03E00008 */ jr $ra /* 00B84 80AAF9D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s index 2d54d51e40..3644b645f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AAFB80 + .asciz " マラソン 開始されていない \n\n" + .balign 4 + +.text glabel EnMm2_Init /* 001EC 80AAF03C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 001F0 80AAF040 AFA50044 */ sw $a1, 0x0044($sp) @@ -125,5 +131,3 @@ glabel EnMm2_Init /* 003A0 80AAF1F0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 003A4 80AAF1F4 03E00008 */ jr $ra /* 003A8 80AAF1F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s index a47bc2f090..a6264a873d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s @@ -90,5 +90,3 @@ glabel EnMm2_Update /* 00A7C 80AAF8CC 8FB10028 */ lw $s1, 0x0028($sp) /* 00A80 80AAF8D0 03E00008 */ jr $ra /* 00A84 80AAF8D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s index ba82c029f0..e760a78182 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s @@ -80,5 +80,3 @@ glabel func_80AAEE50 /* 00114 80AAEF64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00118 80AAEF68 03E00008 */ jr $ra /* 0011C 80AAEF6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s index 258ce82966..4f7d7b8302 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s @@ -60,5 +60,3 @@ glabel func_80AAEF70 /* 001E0 80AAF030 A44B13FC */ sh $t3, 0x13FC($v0) ## 8015FA5C /* 001E4 80AAF034 03E00008 */ jr $ra /* 001E8 80AAF038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF224.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF224.s index fa41322d9d..a60237242a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF224.s @@ -41,5 +41,3 @@ glabel func_80AAF224 /* 00460 80AAF2B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00464 80AAF2B4 03E00008 */ jr $ra /* 00468 80AAF2B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s index 06b61e75dc..0db0ebb615 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s @@ -32,5 +32,3 @@ glabel func_80AAF2BC /* 004D4 80AAF324 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004D8 80AAF328 03E00008 */ jr $ra /* 004DC 80AAF32C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s index e0338160ef..092d0e6681 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s @@ -38,5 +38,3 @@ glabel func_80AAF330 /* 00564 80AAF3B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00568 80AAF3B8 03E00008 */ jr $ra /* 0056C 80AAF3BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s index dc84707dd4..5abfa7ede7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s @@ -121,5 +121,3 @@ glabel func_80AAF3C0 /* 00720 80AAF570 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00724 80AAF574 03E00008 */ jr $ra /* 00728 80AAF578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s index f27932c24f..476704e85b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s @@ -29,5 +29,3 @@ glabel func_80AAF57C /* 00790 80AAF5E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00794 80AAF5E4 03E00008 */ jr $ra /* 00798 80AAF5E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF5EC.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF5EC.s index 719f602807..569ca511e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF5EC.s @@ -33,5 +33,3 @@ glabel func_80AAF5EC /* 0080C 80AAF65C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00810 80AAF660 03E00008 */ jr $ra /* 00814 80AAF664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s index 98aa29a2c9..539a7d314b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AAFBA8 + .asciz "../z_en_mm2.c" + .balign 4 + +glabel D_80AAFBB8 + .asciz "((z_common_data.event_inf[1]) & (0x0001)) = %x\n" + .balign 4 + +.text glabel func_80AAF668 /* 00818 80AAF668 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0081C 80AAF66C AFBF001C */ sw $ra, 0x001C($sp) @@ -81,5 +91,3 @@ glabel func_80AAF668 /* 00934 80AAF784 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00938 80AAF788 03E00008 */ jr $ra /* 0093C 80AAF78C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF9D8.s index 2429735df5..0aeb1609ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF9D8.s @@ -35,5 +35,3 @@ glabel func_80AAF9D8 /* 00C04 80AAFA54 A4780004 */ sh $t8, 0x0004($v1) ## 00000004 /* 00C08 80AAFA58 03E00008 */ jr $ra /* 00C0C 80AAFA5C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAFA60.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAFA60.s index 1c0bac173e..22c74b3107 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAFA60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAFA60.s @@ -16,4 +16,3 @@ glabel func_80AAFA60 /* 00C44 80AAFA94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C48 80AAFA98 03E00008 */ jr $ra /* 00C4C 80AAFA9C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s index dec17fc631..495dee13cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s @@ -7,5 +7,3 @@ glabel EnMu_Destroy /* 002F8 80AB0718 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002FC 80AB071C 03E00008 */ jr $ra /* 00300 80AB0720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s index 4e1527e84d..2e5250c2cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AB0C70 + .asciz "../z_en_mu.c" + .balign 4 + +glabel D_80AB0C80 + .asciz "../z_en_mu.c" + .balign 4 + +.text glabel EnMu_Draw /* 005F4 80AB0A14 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 005F8 80AB0A18 AFB70044 */ sw $s7, 0x0044($sp) @@ -112,4 +122,3 @@ glabel EnMu_Draw /* 007A4 80AB0BC4 00000000 */ nop /* 007A8 80AB0BC8 00000000 */ nop /* 007AC 80AB0BCC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s index bb06fb3f36..6876e26bbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s @@ -57,5 +57,3 @@ glabel EnMu_Init /* 002D8 80AB06F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002DC 80AB06FC 03E00008 */ jr $ra /* 002E0 80AB0700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s index e5d990d039..0151f2fa7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s @@ -83,5 +83,3 @@ glabel EnMu_Update /* 00478 80AB0898 8FB0001C */ lw $s0, 0x001C($sp) /* 0047C 80AB089C 03E00008 */ jr $ra /* 00480 80AB08A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0420.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0420.s index 8674b444ec..79974c7b98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0420.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0420.s @@ -1,5 +1,3 @@ glabel func_80AB0420 /* 00000 80AB0420 03E00008 */ jr $ra /* 00004 80AB0424 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s index bccd441adf..666146c74b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s @@ -91,5 +91,3 @@ glabel func_80AB0428 /* 00158 80AB0578 A50B13FE */ sh $t3, 0x13FE($t0) ## 8015FA5E /* 0015C 80AB057C 03E00008 */ jr $ra /* 00160 80AB0580 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s index 50515fcfc3..659c4b34e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s @@ -17,5 +17,3 @@ glabel func_80AB0584 /* 00198 80AB05B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0019C 80AB05BC 03E00008 */ jr $ra /* 001A0 80AB05C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB05C4.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB05C4.s index 2b88e439a7..8ef991db25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB05C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB05C4.s @@ -1,3 +1,18 @@ +.late_rodata +.late_rodata_alignment 8 +glabel jtbl_80AB0C90 +.word L80AB05FC +.word L80AB05FC +.word L80AB0604 +.word L80AB05FC +.word L80AB05FC +.word L80AB05FC +.word L80AB05FC +.word L80AB05FC +.word L80AB05FC +.word L80AB05FC + +.text glabel func_80AB05C4 /* 001A4 80AB05C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001A8 80AB05C8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +44,3 @@ glabel L80AB0604 /* 00200 80AB0620 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00204 80AB0624 03E00008 */ jr $ra /* 00208 80AB0628 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0724.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0724.s index 6647e4aa5f..77633208f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0724.s @@ -13,5 +13,3 @@ glabel func_80AB0724 /* 00330 80AB0750 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00334 80AB0754 03E00008 */ jr $ra /* 00338 80AB0758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s index 2bbe12e53a..1dc604a1cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s @@ -63,5 +63,3 @@ glabel func_80AB08A4 /* 00568 80AB0988 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0056C 80AB098C 03E00008 */ jr $ra /* 00570 80AB0990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0994.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0994.s index ba1b72c3f2..87ecce9188 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0994.s @@ -4,5 +4,3 @@ glabel func_80AB0994 /* 0057C 80AB099C AFA60008 */ sw $a2, 0x0008($sp) /* 00580 80AB09A0 03E00008 */ jr $ra /* 00584 80AB09A4 AFA7000C */ sw $a3, 0x000C($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB09A8.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB09A8.s index 95f5103092..783a41938c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB09A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB09A8.s @@ -27,5 +27,3 @@ glabel func_80AB09A8 /* 005E8 80AB0A08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005EC 80AB0A0C 03E00008 */ jr $ra /* 005F0 80AB0A10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s index fd4e5bd0bb..fc7870bf94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s @@ -10,5 +10,3 @@ glabel EnNb_Destroy /* 00220 80AB0FB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00224 80AB0FB4 03E00008 */ jr $ra /* 00228 80AB0FB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Draw.s index b7d53c97bb..d87aa8c952 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AB51C8 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnNb_Draw /* 034F0 80AB4280 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 034F4 80AB4284 AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,4 +33,3 @@ glabel EnNb_Draw /* 03544 80AB42D4 03E00008 */ jr $ra /* 03548 80AB42D8 00000000 */ nop /* 0354C 80AB42DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s index 2d82452039..39bd34a534 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_80AB5244 +.word L80AB3F64 +.word L80AB3F78 +.word L80AB3F8C +.word L80AB3FA0 +.word L80AB3FB4 +.word 0x00000000, 0x00000000 + +.text glabel EnNb_Init /* 0313C 80AB3ECC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03140 80AB3ED0 AFB10028 */ sw $s1, 0x0028($sp) @@ -78,5 +88,3 @@ glabel L80AB3FB4 /* 0324C 80AB3FDC 8FB10028 */ lw $s1, 0x0028($sp) /* 03250 80AB3FE0 03E00008 */ jr $ra /* 03254 80AB3FE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Update.s index bf41026409..5c904ff7ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AB516C + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnNb_Update /* 030E0 80AB3E70 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 030E4 80AB3E74 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnNb_Update /* 03130 80AB3EC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03134 80AB3EC4 03E00008 */ jr $ra /* 03138 80AB3EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0D90.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0D90.s index c10593d418..5460f15f5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0D90.s @@ -3,5 +3,3 @@ glabel func_80AB0D90 /* 00004 80AB0D94 00031A03 */ sra $v1, $v1, 8 /* 00008 80AB0D98 03E00008 */ jr $ra /* 0000C 80AB0D9C 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DA0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DA0.s index 6e686e28b9..638471e4c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DA0.s @@ -2,5 +2,3 @@ glabel func_80AB0DA0 /* 00010 80AB0DA0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C /* 00014 80AB0DA4 03E00008 */ jr $ra /* 00018 80AB0DA8 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s index 1883cd8de6..f261da547d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AB4F90 + .asciz "En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80AB4FD4 + .asciz "En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel D_80AB5200 + .word 0x4622F983 + +.text glabel func_80AB0DAC /* 0001C 80AB0DAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00020 80AB0DB0 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 @@ -89,5 +103,3 @@ glabel func_80AB0DAC /* 00168 80AB0EF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0016C 80AB0EFC 03E00008 */ jr $ra /* 00170 80AB0F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s index ee97614561..2c61edeea3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s @@ -19,5 +19,3 @@ glabel func_80AB0F04 /* 001B4 80AB0F44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001B8 80AB0F48 03E00008 */ jr $ra /* 001BC 80AB0F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s index e3b5ad0a31..319254c821 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s @@ -18,5 +18,3 @@ glabel func_80AB0F50 /* 001F8 80AB0F88 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001FC 80AB0F8C 03E00008 */ jr $ra /* 00200 80AB0F90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s index 0d054b07d5..e1bad4c1c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s @@ -32,5 +32,3 @@ glabel func_80AB0FBC /* 002A4 80AB1034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A8 80AB1038 03E00008 */ jr $ra /* 002AC 80AB103C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s index 635a665f61..1d40cd66d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s @@ -32,5 +32,3 @@ glabel func_80AB1040 /* 00328 80AB10B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0032C 80AB10BC 03E00008 */ jr $ra /* 00330 80AB10C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB10C4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB10C4.s index 682d25515e..04d136cbf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB10C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB10C4.s @@ -43,5 +43,3 @@ glabel func_80AB10C4 /* 003C8 80AB1158 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003CC 80AB115C 03E00008 */ jr $ra /* 003D0 80AB1160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1164.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1164.s index 9a38d0efbb..195eed1108 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1164.s @@ -38,5 +38,3 @@ glabel func_80AB1164 /* 00450 80AB11E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00454 80AB11E4 03E00008 */ jr $ra /* 00458 80AB11E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB11EC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB11EC.s index 731e296d2f..2cc2e0cacc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB11EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB11EC.s @@ -8,5 +8,3 @@ glabel func_80AB11EC /* 00474 80AB1204 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 00478 80AB1208 03E00008 */ jr $ra /* 0047C 80AB120C E4840280 */ swc1 $f4, 0x0280($a0) ## 00000280 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1210.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1210.s index 639ac61a48..55ecb6147b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1210.s @@ -32,5 +32,3 @@ glabel func_80AB1210 /* 004E8 80AB1278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004EC 80AB127C 03E00008 */ jr $ra /* 004F0 80AB1280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1284.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1284.s index c0a49ac071..d03b36a5f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1284.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1284.s @@ -17,5 +17,3 @@ glabel func_80AB1284 /* 00530 80AB12C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00534 80AB12C4 03E00008 */ jr $ra /* 00538 80AB12C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12CC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12CC.s index d3530788ea..80655506a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12CC.s @@ -8,5 +8,3 @@ glabel func_80AB12CC /* 00550 80AB12E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00554 80AB12E4 03E00008 */ jr $ra /* 00558 80AB12E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12EC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12EC.s index 26354e9057..5694e11e2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB12EC.s @@ -9,5 +9,3 @@ glabel func_80AB12EC .L80AB1308: /* 00578 80AB1308 03E00008 */ jr $ra /* 0057C 80AB130C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1310.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1310.s index 18e538ec61..5b0bed3ac6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1310.s @@ -32,5 +32,3 @@ glabel func_80AB1310 /* 005F4 80AB1384 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005F8 80AB1388 03E00008 */ jr $ra /* 005FC 80AB138C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1390.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1390.s index 7ee4ab9315..b83cda8a90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1390.s @@ -19,5 +19,3 @@ glabel func_80AB1390 .L80AB13D0: /* 00640 80AB13D0 03E00008 */ jr $ra /* 00644 80AB13D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB13D8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB13D8.s index a65c4f0a89..c97afb19fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB13D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB13D8.s @@ -19,5 +19,3 @@ glabel func_80AB13D8 .L80AB1418: /* 00688 80AB1418 03E00008 */ jr $ra /* 0068C 80AB141C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1420.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1420.s index 54fe2c02a7..6ef3437995 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1420.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1420.s @@ -32,5 +32,3 @@ glabel func_80AB1420 /* 00704 80AB1494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00708 80AB1498 03E00008 */ jr $ra /* 0070C 80AB149C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s index 45604b02f0..f356b6193b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s @@ -39,5 +39,3 @@ glabel func_80AB14A0 /* 00794 80AB1524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00798 80AB1528 03E00008 */ jr $ra /* 0079C 80AB152C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1530.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1530.s index d9d1622f2d..c41d8bb63d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1530.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1530.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AB5204 + .word 0xC61C4000 + +.text glabel func_80AB1530 /* 007A0 80AB1530 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 007A4 80AB1534 AFA50024 */ sw $a1, 0x0024($sp) @@ -17,5 +22,3 @@ glabel func_80AB1530 /* 007DC 80AB156C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007E0 80AB1570 03E00008 */ jr $ra /* 007E4 80AB1574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s index 597e685cd5..1db7b0ef19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s @@ -23,5 +23,3 @@ glabel func_80AB1578 /* 00838 80AB15C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0083C 80AB15CC 03E00008 */ jr $ra /* 00840 80AB15D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s index 71d70b77a9..3cadf080de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s @@ -31,5 +31,3 @@ glabel func_80AB15D4 /* 008B4 80AB1644 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 008B8 80AB1648 03E00008 */ jr $ra /* 008BC 80AB164C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1650.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1650.s index 50449810a6..d39b07b9c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1650.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AB5208 + .word 0x42A6AAAB + +.text glabel func_80AB1650 /* 008C0 80AB1650 AFA50004 */ sw $a1, 0x0004($sp) /* 008C4 80AB1654 3C0180AB */ lui $at, %hi(D_80AB5208) ## $at = 80AB0000 @@ -6,5 +11,3 @@ glabel func_80AB1650 /* 008D0 80AB1660 46062200 */ add.s $f8, $f4, $f6 /* 008D4 80AB1664 03E00008 */ jr $ra /* 008D8 80AB1668 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s index cbd08eec0d..2038e6a841 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s @@ -36,5 +36,3 @@ glabel func_80AB166C /* 00960 80AB16F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00964 80AB16F4 03E00008 */ jr $ra /* 00968 80AB16F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB16FC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB16FC.s index 060e638520..0e04468973 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB16FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB16FC.s @@ -20,5 +20,3 @@ glabel func_80AB16FC /* 009B0 80AB1740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009B4 80AB1744 03E00008 */ jr $ra /* 009B8 80AB1748 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB174C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB174C.s index 0fe18b2e50..67f0eedfa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB174C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB174C.s @@ -11,5 +11,3 @@ glabel func_80AB174C .L80AB1770: /* 009E0 80AB1770 03E00008 */ jr $ra /* 009E4 80AB1774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s index d72e52c881..39b74a8448 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s @@ -39,5 +39,3 @@ glabel func_80AB1778 /* 00A70 80AB1800 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A74 80AB1804 03E00008 */ jr $ra /* 00A78 80AB1808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s index 56605f2f73..c3404789f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s @@ -29,5 +29,3 @@ glabel func_80AB180C /* 00ADC 80AB186C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AE0 80AB1870 03E00008 */ jr $ra /* 00AE4 80AB1874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1878.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1878.s index f591043b87..a51bbe1d7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1878.s @@ -19,5 +19,3 @@ glabel func_80AB1878 /* 00B28 80AB18B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B2C 80AB18BC 03E00008 */ jr $ra /* 00B30 80AB18C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18C4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18C4.s index da8bf8024f..605ebe5fc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18C4.s @@ -7,5 +7,3 @@ glabel func_80AB18C4 /* 00B48 80AB18D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B4C 80AB18DC 03E00008 */ jr $ra /* 00B50 80AB18E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18E4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18E4.s index 1354bbf6c1..e0f26bec2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB18E4.s @@ -7,5 +7,3 @@ glabel func_80AB18E4 /* 00B68 80AB18F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B6C 80AB18FC 03E00008 */ jr $ra /* 00B70 80AB1900 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1904.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1904.s index 9c5ca41003..e71bc3f499 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1904.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1904.s @@ -13,5 +13,3 @@ glabel func_80AB1904 /* 00BA0 80AB1930 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BA4 80AB1934 03E00008 */ jr $ra /* 00BA8 80AB1938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB193C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB193C.s index c345c07e2b..44bce44863 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB193C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB193C.s @@ -15,5 +15,3 @@ glabel func_80AB193C /* 00BE0 80AB1970 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BE4 80AB1974 03E00008 */ jr $ra /* 00BE8 80AB1978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB197C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB197C.s index a45566efeb..210fed1a9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB197C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB197C.s @@ -15,5 +15,3 @@ glabel func_80AB197C /* 00C20 80AB19B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C24 80AB19B4 03E00008 */ jr $ra /* 00C28 80AB19B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19BC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19BC.s index b6bb2f99fa..97e0f10e2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19BC.s @@ -15,5 +15,3 @@ glabel func_80AB19BC /* 00C60 80AB19F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C64 80AB19F4 03E00008 */ jr $ra /* 00C68 80AB19F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19FC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19FC.s index 3db923074d..1790676aca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB19FC.s @@ -11,5 +11,3 @@ glabel func_80AB19FC /* 00C90 80AB1A20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C94 80AB1A24 03E00008 */ jr $ra /* 00C98 80AB1A28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A2C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A2C.s index 3ae77b1d13..681a8de05c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A2C.s @@ -17,5 +17,3 @@ glabel func_80AB1A2C /* 00CD8 80AB1A68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CDC 80AB1A6C 03E00008 */ jr $ra /* 00CE0 80AB1A70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A74.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A74.s index d962146973..5081349b0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A74.s @@ -7,5 +7,3 @@ glabel func_80AB1A74 /* 00CF8 80AB1A88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CFC 80AB1A8C 03E00008 */ jr $ra /* 00D00 80AB1A90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s index 6b73160356..65976b7ba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s @@ -32,5 +32,3 @@ glabel func_80AB1A94 /* 00D78 80AB1B08 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00D7C 80AB1B0C 03E00008 */ jr $ra /* 00D80 80AB1B10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B14.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B14.s index f2d1601673..989724c667 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B14.s @@ -21,5 +21,3 @@ glabel func_80AB1B14 /* 00DCC 80AB1B5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DD0 80AB1B60 03E00008 */ jr $ra /* 00DD4 80AB1B64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s index 382a18b095..3e68150105 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s @@ -87,5 +87,3 @@ glabel func_80AB1B68 /* 00F20 80AB1CB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F24 80AB1CB4 03E00008 */ jr $ra /* 00F28 80AB1CB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s index 7be89efb95..ad8b1d25bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s @@ -39,5 +39,3 @@ glabel func_80AB1CBC /* 00FB8 80AB1D48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FBC 80AB1D4C 03E00008 */ jr $ra /* 00FC0 80AB1D50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D54.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D54.s index bd20021663..88ee3246ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D54.s @@ -11,5 +11,3 @@ glabel func_80AB1D54 /* 00FE8 80AB1D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FEC 80AB1D7C 03E00008 */ jr $ra /* 00FF0 80AB1D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D84.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D84.s index 03329f774e..9374aadc8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1D84.s @@ -20,5 +20,3 @@ glabel func_80AB1D84 /* 0103C 80AB1DCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01040 80AB1DD0 03E00008 */ jr $ra /* 01044 80AB1DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1DD8.s index da25f7adbe..ddb752f5a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1DD8.s @@ -20,5 +20,3 @@ glabel func_80AB1DD8 /* 01090 80AB1E20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01094 80AB1E24 03E00008 */ jr $ra /* 01098 80AB1E28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s index 8b105bef02..9c0b4d4ee9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AB5010 + .asciz "../z_en_nb_inKenjyanomaDemo02.c" + .balign 4 + +glabel D_80AB5030 + .asciz "../z_en_nb_inKenjyanomaDemo02.c" + .balign 4 + +.text glabel func_80AB1E2C /* 0109C 80AB1E2C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 010A0 80AB1E30 AFBF002C */ sw $ra, 0x002C($sp) @@ -93,5 +103,3 @@ glabel func_80AB1E2C /* 01208 80AB1F98 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 0120C 80AB1F9C 03E00008 */ jr $ra /* 01210 80AB1FA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s index 77d9888b3b..abe00be753 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s @@ -21,5 +21,3 @@ glabel func_80AB1FA4 /* 01260 80AB1FF0 35F80020 */ ori $t8, $t7, 0x0020 ## $t8 = 00000020 /* 01264 80AB1FF4 03E00008 */ jr $ra /* 01268 80AB1FF8 A4580EE6 */ sh $t8, 0x0EE6($v0) ## 8015F546 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FFC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FFC.s index 7920f932b3..b105ec08a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FFC.s @@ -13,5 +13,3 @@ glabel func_80AB1FFC /* 01294 80AB2024 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01298 80AB2028 03E00008 */ jr $ra /* 0129C 80AB202C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2030.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2030.s index 3d1b43964a..4e21d3fce4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2030.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2030.s @@ -13,5 +13,3 @@ glabel func_80AB2030 /* 012C8 80AB2058 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012CC 80AB205C 03E00008 */ jr $ra /* 012D0 80AB2060 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2064.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2064.s index b7cad5db6c..0cd04f2665 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2064.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2064.s @@ -57,5 +57,3 @@ glabel func_80AB2064 /* 013AC 80AB213C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 013B0 80AB2140 03E00008 */ jr $ra /* 013B4 80AB2144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2148.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2148.s index 5b8da6f949..65ea1d232c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2148.s @@ -13,5 +13,3 @@ glabel func_80AB2148 /* 013E4 80AB2174 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013E8 80AB2178 03E00008 */ jr $ra /* 013EC 80AB217C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s index 8d619ac7df..e3c01deee6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s @@ -26,5 +26,3 @@ glabel func_80AB2180 /* 01444 80AB21D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01448 80AB21D8 03E00008 */ jr $ra /* 0144C 80AB21DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s index a215469afc..657f9a1635 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s @@ -30,5 +30,3 @@ glabel func_80AB21E0 /* 014B8 80AB2248 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014BC 80AB224C 03E00008 */ jr $ra /* 014C0 80AB2250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s index a440213222..e2563dffd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s @@ -31,5 +31,3 @@ glabel func_80AB2254 /* 01530 80AB22C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01534 80AB22C4 03E00008 */ jr $ra /* 01538 80AB22C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB22CC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB22CC.s index 108d780b60..289147f9cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB22CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB22CC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AB5050 + .asciz "En_Nb_Kidnap_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_80AB22CC /* 0153C 80AB22CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01540 80AB22D0 AFB00018 */ sw $s0, 0x0018($sp) @@ -63,5 +69,3 @@ glabel func_80AB22CC /* 0160C 80AB239C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01610 80AB23A0 03E00008 */ jr $ra /* 01614 80AB23A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23A8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23A8.s index a431e6c882..0ac1400412 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23A8.s @@ -11,5 +11,3 @@ glabel func_80AB23A8 /* 0163C 80AB23CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01640 80AB23D0 03E00008 */ jr $ra /* 01644 80AB23D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23D8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23D8.s index 2c013a313a..736fcbcfeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB23D8.s @@ -20,5 +20,3 @@ glabel func_80AB23D8 /* 01690 80AB2420 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01694 80AB2424 03E00008 */ jr $ra /* 01698 80AB2428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB242C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB242C.s index 48ea512537..2c46a79175 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB242C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB242C.s @@ -21,5 +21,3 @@ glabel func_80AB242C /* 016E8 80AB2478 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 016EC 80AB247C 03E00008 */ jr $ra /* 016F0 80AB2480 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2484.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2484.s index 31a7961d95..ed5ddf78aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2484.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2484.s @@ -17,5 +17,3 @@ glabel func_80AB2484 /* 01730 80AB24C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01734 80AB24C4 03E00008 */ jr $ra /* 01738 80AB24C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB24CC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB24CC.s index 8cb8603891..d4433a8518 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB24CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB24CC.s @@ -16,5 +16,3 @@ glabel func_80AB24CC /* 01770 80AB2500 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01774 80AB2504 03E00008 */ jr $ra /* 01778 80AB2508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB250C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB250C.s index ac896c7da6..9ae7697e35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB250C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB250C.s @@ -27,5 +27,3 @@ glabel func_80AB250C /* 017D4 80AB2564 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017D8 80AB2568 03E00008 */ jr $ra /* 017DC 80AB256C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2570.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2570.s index f1ea3b5d07..6ad2dc7644 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2570.s @@ -19,5 +19,3 @@ glabel func_80AB2570 /* 01820 80AB25B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01824 80AB25B4 03E00008 */ jr $ra /* 01828 80AB25B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB25BC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB25BC.s index a09bf471dd..53c3e81a3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB25BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB25BC.s @@ -22,5 +22,3 @@ glabel func_80AB25BC /* 01874 80AB2604 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01878 80AB2608 03E00008 */ jr $ra /* 0187C 80AB260C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s index e0c945fcdf..354aff9160 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s @@ -30,5 +30,3 @@ glabel func_80AB2610 /* 018EC 80AB267C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 018F0 80AB2680 03E00008 */ jr $ra /* 018F4 80AB2684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s index 63b26dbcfb..6db74e20f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s @@ -15,5 +15,3 @@ glabel func_80AB2688 /* 0192C 80AB26BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01930 80AB26C0 03E00008 */ jr $ra /* 01934 80AB26C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26C8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26C8.s index 31096ed8d8..52aa6a980c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26C8.s @@ -4,5 +4,3 @@ glabel func_80AB26C8 /* 01940 80AB26D0 AC80027C */ sw $zero, 0x027C($a0) ## 0000027C /* 01944 80AB26D4 03E00008 */ jr $ra /* 01948 80AB26D8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s index 1587f7b2a3..9c758413a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s @@ -39,5 +39,3 @@ glabel func_80AB26DC /* 019D8 80AB2768 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 019DC 80AB276C 03E00008 */ jr $ra /* 019E0 80AB2770 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s index 28d4ac6060..fdd0bc5cd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s @@ -32,5 +32,3 @@ glabel func_80AB2774 /* 01A54 80AB27E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A58 80AB27E8 03E00008 */ jr $ra /* 01A5C 80AB27EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s index 2671d7123c..e93b9ebd69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s @@ -29,5 +29,3 @@ glabel func_80AB27F0 /* 01AC0 80AB2850 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01AC4 80AB2854 03E00008 */ jr $ra /* 01AC8 80AB2858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s index b67f808636..8e062f6db8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s @@ -33,5 +33,3 @@ glabel func_80AB285C /* 01B40 80AB28D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B44 80AB28D4 03E00008 */ jr $ra /* 01B48 80AB28D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s index 98a516c65c..6f40745da1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s @@ -29,5 +29,3 @@ glabel func_80AB28DC /* 01BAC 80AB293C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BB0 80AB2940 03E00008 */ jr $ra /* 01BB4 80AB2944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s index dad22257d8..962f8d3ac8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s @@ -33,5 +33,3 @@ glabel func_80AB2948 /* 01C2C 80AB29BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C30 80AB29C0 03E00008 */ jr $ra /* 01C34 80AB29C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s index 30d0d019a7..b3f7ae4ede 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s @@ -26,5 +26,3 @@ glabel func_80AB29C8 /* 01C8C 80AB2A1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C90 80AB2A20 03E00008 */ jr $ra /* 01C94 80AB2A24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A28.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A28.s index a161346a32..327a02b6aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A28.s @@ -16,5 +16,3 @@ glabel func_80AB2A28 /* 01CCC 80AB2A5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CD0 80AB2A60 03E00008 */ jr $ra /* 01CD4 80AB2A64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s index 3023b97bde..8193f4aeae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s @@ -33,5 +33,3 @@ glabel func_80AB2A68 /* 01D4C 80AB2ADC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D50 80AB2AE0 03E00008 */ jr $ra /* 01D54 80AB2AE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AE8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AE8.s index e7a1aefaf8..8e86719b3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AE8.s @@ -4,5 +4,3 @@ glabel func_80AB2AE8 /* 01D60 80AB2AF0 AC80027C */ sw $zero, 0x027C($a0) ## 0000027C /* 01D64 80AB2AF4 03E00008 */ jr $ra /* 01D68 80AB2AF8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AFC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AFC.s index 39bd154d8b..9711599bca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2AFC.s @@ -1,3 +1,26 @@ +.rdata +glabel D_80AB5088 + .asciz "En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80AB520C +.word L80AB2B5C +.word L80AB2BD0 +.word L80AB2BD0 +.word L80AB2BD0 +.word L80AB2BD0 +.word L80AB2BD0 +.word L80AB2BD0 +.word L80AB2BD0 +.word L80AB2BC0 +.word L80AB2B6C +.word L80AB2B80 +.word L80AB2B90 +.word L80AB2BA0 +.word L80AB2BB0 + +.text glabel func_80AB2AFC /* 01D6C 80AB2AFC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01D70 80AB2B00 AFB00018 */ sw $s0, 0x0018($sp) @@ -74,5 +97,3 @@ glabel L80AB2BD0 /* 01E5C 80AB2BEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01E60 80AB2BF0 03E00008 */ jr $ra /* 01E64 80AB2BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2BF8.s index 627f9d26ab..8a37cb1190 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2BF8.s @@ -7,5 +7,3 @@ glabel func_80AB2BF8 /* 01E7C 80AB2C0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E80 80AB2C10 03E00008 */ jr $ra /* 01E84 80AB2C14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C18.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C18.s index cf18cf817c..7a58e4163c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C18.s @@ -17,5 +17,3 @@ glabel func_80AB2C18 /* 01EC4 80AB2C54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01EC8 80AB2C58 03E00008 */ jr $ra /* 01ECC 80AB2C5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C60.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C60.s index 9bbde3e242..256246e6d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2C60.s @@ -26,5 +26,3 @@ glabel func_80AB2C60 /* 01F30 80AB2CC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F34 80AB2CC4 03E00008 */ jr $ra /* 01F38 80AB2CC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2CCC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2CCC.s index a4e1aacfe7..cffdeaa857 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2CCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2CCC.s @@ -26,5 +26,3 @@ glabel func_80AB2CCC /* 01F9C 80AB2D2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01FA0 80AB2D30 03E00008 */ jr $ra /* 01FA4 80AB2D34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D38.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D38.s index 0f1568a029..5dc12f7503 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D38.s @@ -24,5 +24,3 @@ glabel func_80AB2D38 /* 02000 80AB2D90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02004 80AB2D94 03E00008 */ jr $ra /* 02008 80AB2D98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D9C.s index 3e2e96d9d3..771569dbaf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2D9C.s @@ -31,5 +31,3 @@ glabel func_80AB2D9C /* 02080 80AB2E10 8FB10018 */ lw $s1, 0x0018($sp) /* 02084 80AB2E14 03E00008 */ jr $ra /* 02088 80AB2E18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E1C.s index 44d66ef78e..3f052c44e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E1C.s @@ -22,5 +22,3 @@ glabel func_80AB2E1C /* 020D4 80AB2E64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 020D8 80AB2E68 03E00008 */ jr $ra /* 020DC 80AB2E6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s index 3743d1c5c9..482fa14486 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AB50C4 + .asciz "../z_en_nb_inConfrontion.c" + .balign 4 + +glabel D_80AB50E0 + .asciz "../z_en_nb_inConfrontion.c" + .balign 4 + +.text glabel func_80AB2E70 /* 020E0 80AB2E70 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 020E4 80AB2E74 AFBF0024 */ sw $ra, 0x0024($sp) @@ -83,5 +93,3 @@ glabel func_80AB2E70 /* 02224 80AB2FB4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 02228 80AB2FB8 03E00008 */ jr $ra /* 0222C 80AB2FBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FC0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FC0.s index a77a3ac275..9af54a3a79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FC0.s @@ -9,5 +9,3 @@ glabel func_80AB2FC0 .L80AB2FDC: /* 0224C 80AB2FDC 03E00008 */ jr $ra /* 02250 80AB2FE0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s index 3c5656a8b1..b5e0e09a2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AB50FC + .asciz "../z_en_nb_inConfrontion.c" + .balign 4 + +glabel D_80AB5118 + .asciz "../z_en_nb_inConfrontion.c" + .balign 4 + +.text glabel func_80AB2FE4 /* 02254 80AB2FE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02258 80AB2FE8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -90,5 +100,3 @@ glabel func_80AB2FE4 /* 023B4 80AB3144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 023B8 80AB3148 03E00008 */ jr $ra /* 023BC 80AB314C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3150.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3150.s index ed9be028e9..d777101ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3150.s @@ -18,5 +18,3 @@ glabel func_80AB3150 /* 02400 80AB3190 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02404 80AB3194 03E00008 */ jr $ra /* 02408 80AB3198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s index 8e27fb4c73..e1245356bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s @@ -36,5 +36,3 @@ glabel func_80AB319C /* 0248C 80AB321C A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 /* 02490 80AB3220 03E00008 */ jr $ra /* 02494 80AB3224 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3228.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3228.s index 70918b7047..eb3d011fca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3228.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3228.s @@ -13,5 +13,3 @@ glabel func_80AB3228 /* 024C4 80AB3254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 024C8 80AB3258 03E00008 */ jr $ra /* 024CC 80AB325C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s index 586c73c80d..3f397fa320 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s @@ -19,5 +19,3 @@ glabel func_80AB3260 .L80AB32A4: /* 02514 80AB32A4 03E00008 */ jr $ra /* 02518 80AB32A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32AC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32AC.s index 290105bad9..9dded62238 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32AC.s @@ -15,5 +15,3 @@ glabel func_80AB32AC /* 02550 80AB32E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02554 80AB32E4 03E00008 */ jr $ra /* 02558 80AB32E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32EC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32EC.s index a4a9909fec..e55523e36b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB32EC.s @@ -13,5 +13,3 @@ glabel func_80AB32EC /* 02584 80AB3314 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02588 80AB3318 03E00008 */ jr $ra /* 0258C 80AB331C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3320.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3320.s index eae70e5380..f7f1a7aee7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3320.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AB5134 + .asciz "En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_80AB3320 /* 02590 80AB3320 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02594 80AB3324 AFA40020 */ sw $a0, 0x0020($sp) @@ -46,5 +52,3 @@ glabel func_80AB3320 /* 02624 80AB33B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02628 80AB33B8 03E00008 */ jr $ra /* 0262C 80AB33BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33C0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33C0.s index cdc5e3aae0..3e92ddadcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33C0.s @@ -7,5 +7,3 @@ glabel func_80AB33C0 /* 02644 80AB33D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02648 80AB33D8 03E00008 */ jr $ra /* 0264C 80AB33DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33E0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33E0.s index 793d726621..98dc01fc63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB33E0.s @@ -17,5 +17,3 @@ glabel func_80AB33E0 /* 0268C 80AB341C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02690 80AB3420 03E00008 */ jr $ra /* 02694 80AB3424 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3428.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3428.s index 05688f04fe..491a5900c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3428.s @@ -15,5 +15,3 @@ glabel func_80AB3428 /* 026CC 80AB345C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 026D0 80AB3460 03E00008 */ jr $ra /* 026D4 80AB3464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3468.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3468.s index 26f0c2cfba..b7eaefaed9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3468.s @@ -15,5 +15,3 @@ glabel func_80AB3468 /* 0270C 80AB349C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02710 80AB34A0 03E00008 */ jr $ra /* 02714 80AB34A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s index ec6319da6d..0113204f81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s @@ -64,5 +64,3 @@ glabel func_80AB34A8 /* 02800 80AB3590 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02804 80AB3594 03E00008 */ jr $ra /* 02808 80AB3598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s index 5cb6ca22e4..62a2e98697 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s @@ -49,5 +49,3 @@ glabel func_80AB359C /* 028C4 80AB3654 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 028C8 80AB3658 03E00008 */ jr $ra /* 028CC 80AB365C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3660.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3660.s index 585700f885..568ff7559f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3660.s @@ -8,5 +8,3 @@ glabel func_80AB3660 /* 028E8 80AB3678 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028EC 80AB367C 03E00008 */ jr $ra /* 028F0 80AB3680 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3684.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3684.s index 1b0d016b51..f0f83520d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3684.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3684.s @@ -22,5 +22,3 @@ glabel func_80AB3684 .L80AB36D4: /* 02944 80AB36D4 03E00008 */ jr $ra /* 02948 80AB36D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s index 961a87679e..a8a46db772 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s @@ -48,5 +48,3 @@ glabel func_80AB36DC /* 029F0 80AB3780 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 029F4 80AB3784 03E00008 */ jr $ra /* 029F8 80AB3788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB378C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB378C.s index 2af459be1e..6b3bffee62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB378C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB378C.s @@ -21,5 +21,3 @@ glabel func_80AB378C /* 02A44 80AB37D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02A48 80AB37D8 03E00008 */ jr $ra /* 02A4C 80AB37DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB37E0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB37E0.s index d7bca0728c..f55811769e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB37E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB37E0.s @@ -22,5 +22,3 @@ glabel func_80AB37E0 /* 02A9C 80AB382C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02AA0 80AB3830 03E00008 */ jr $ra /* 02AA4 80AB3834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s index 9549f0325a..ea717efe0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s @@ -31,5 +31,3 @@ glabel func_80AB3838 /* 02B10 80AB38A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02B14 80AB38A4 03E00008 */ jr $ra /* 02B18 80AB38A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s index 4f2f3b07ef..cba5cf0800 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s @@ -25,5 +25,3 @@ glabel func_80AB38AC /* 02B78 80AB3908 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02B7C 80AB390C 03E00008 */ jr $ra /* 02B80 80AB3910 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s index 0c0fda0a34..b17b6ee8c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s @@ -102,5 +102,3 @@ glabel func_80AB3914 /* 02CE0 80AB3A70 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02CE4 80AB3A74 03E00008 */ jr $ra /* 02CE8 80AB3A78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s index 640d944d3e..390fdddba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s @@ -36,5 +36,3 @@ glabel func_80AB3A7C /* 02D68 80AB3AF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D6C 80AB3AFC 03E00008 */ jr $ra /* 02D70 80AB3B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s index 77c9bb9cfa..728e12965d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s @@ -32,5 +32,3 @@ glabel func_80AB3B04 /* 02DE0 80AB3B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DE4 80AB3B74 03E00008 */ jr $ra /* 02DE8 80AB3B78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B7C.s index 5e4c43a09f..f63ff96ec3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B7C.s @@ -19,5 +19,3 @@ glabel func_80AB3B7C /* 02E2C 80AB3BBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E30 80AB3BC0 03E00008 */ jr $ra /* 02E34 80AB3BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3BC8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3BC8.s index a066814a25..a087345de7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3BC8.s @@ -20,5 +20,3 @@ glabel func_80AB3BC8 /* 02E80 80AB3C10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E84 80AB3C14 03E00008 */ jr $ra /* 02E88 80AB3C18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C1C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C1C.s index c37af4fe7f..fbecf65264 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C1C.s @@ -21,5 +21,3 @@ glabel func_80AB3C1C /* 02ED8 80AB3C68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02EDC 80AB3C6C 03E00008 */ jr $ra /* 02EE0 80AB3C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C74.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C74.s index 330747d804..5f05d7cadf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3C74.s @@ -23,5 +23,3 @@ glabel func_80AB3C74 /* 02F38 80AB3CC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02F3C 80AB3CCC 03E00008 */ jr $ra /* 02F40 80AB3CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3CD4.s index 41f1603f9c..7bdef12aff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3CD4.s @@ -23,5 +23,3 @@ glabel func_80AB3CD4 /* 02F98 80AB3D28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02F9C 80AB3D2C 03E00008 */ jr $ra /* 02FA0 80AB3D30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3D34.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3D34.s index 33028482c9..3073dcae50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3D34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3D34.s @@ -30,5 +30,3 @@ glabel func_80AB3D34 /* 03014 80AB3DA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03018 80AB3DA8 03E00008 */ jr $ra /* 0301C 80AB3DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3DB0.s index 68b18d31eb..e54d4a9c00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3DB0.s @@ -23,5 +23,3 @@ glabel func_80AB3DB0 /* 03074 80AB3E04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03078 80AB3E08 03E00008 */ jr $ra /* 0307C 80AB3E0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3E10.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3E10.s index dbe10534ce..e7769045d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3E10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3E10.s @@ -23,5 +23,3 @@ glabel func_80AB3E10 /* 030D4 80AB3E64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 030D8 80AB3E68 03E00008 */ jr $ra /* 030DC 80AB3E6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3FE8.s index 8892af512c..ee2ea18591 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3FE8.s @@ -36,5 +36,3 @@ glabel func_80AB3FE8 .L80AB406C: /* 032DC 80AB406C 03E00008 */ jr $ra /* 032E0 80AB4070 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4074.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4074.s index bf8118151f..d2aef8d297 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4074.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4074.s @@ -35,5 +35,3 @@ glabel func_80AB4074 /* 03364 80AB40F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03368 80AB40F8 03E00008 */ jr $ra /* 0336C 80AB40FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4100.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4100.s index 8652ba86a8..f3445953a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB4100.s @@ -2,5 +2,3 @@ glabel func_80AB4100 /* 03370 80AB4100 AFA40000 */ sw $a0, 0x0000($sp) /* 03374 80AB4104 03E00008 */ jr $ra /* 03378 80AB4108 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s index 19ffcc4800..e3c41bc2be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AB51A8 + .asciz "../z_en_nb.c" + .balign 4 + +glabel D_80AB51B8 + .asciz "../z_en_nb.c" + .balign 4 + +.text glabel func_80AB410C /* 0337C 80AB410C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 03380 80AB4110 AFBF0024 */ sw $ra, 0x0024($sp) @@ -92,5 +102,3 @@ glabel func_80AB410C /* 034E4 80AB4274 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 034E8 80AB4278 03E00008 */ jr $ra /* 034EC 80AB427C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s index 07ac92c35f..39bc9b6458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s @@ -10,5 +10,3 @@ glabel EnNiw_Destroy /* 0046C 80AB5BEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00470 80AB5BF0 03E00008 */ jr $ra /* 00474 80AB5BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s index 74830c28ed..45ac23b81e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s @@ -44,5 +44,3 @@ glabel EnNiw_Draw /* 029DC 80AB815C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 029E0 80AB8160 03E00008 */ jr $ra /* 029E4 80AB8164 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s index 2907ab0578..044efb347a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s @@ -323,5 +323,3 @@ glabel L80AB5AF4 /* 00444 80AB5BC4 8FB20030 */ lw $s2, 0x0030($sp) /* 00448 80AB5BC8 03E00008 */ jr $ra /* 0044C 80AB5BCC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s index 5ce0377de9..86c68bac65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s @@ -721,5 +721,3 @@ glabel EnNiw_Update /* 027D4 80AB7F54 8FB10028 */ lw $s1, 0x0028($sp) /* 027D8 80AB7F58 03E00008 */ jr $ra /* 027DC 80AB7F5C 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s index 75ecce02a5..9806951c56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5BF8.s @@ -263,5 +263,3 @@ glabel L80AB5DE4 /* 00814 80AB5F94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00818 80AB5F98 03E00008 */ jr $ra /* 0081C 80AB5F9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s index d9f5f06524..ff628379a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s @@ -96,5 +96,3 @@ glabel func_80AB5FA0 /* 00974 80AB60F4 8FB10038 */ lw $s1, 0x0038($sp) /* 00978 80AB60F8 03E00008 */ jr $ra /* 0097C 80AB60FC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s index 1d225f6bf5..1b90afd0e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6100.s @@ -103,5 +103,3 @@ glabel func_80AB6100 /* 00AF0 80AB6270 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AF4 80AB6274 03E00008 */ jr $ra /* 00AF8 80AB6278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s index 8ff24c1b91..04629dbeed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s @@ -46,5 +46,3 @@ glabel func_80AB627C /* 00B98 80AB6318 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B9C 80AB631C 03E00008 */ jr $ra /* 00BA0 80AB6320 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s index 0b1702cf3c..cb58b06261 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6324.s @@ -35,5 +35,3 @@ glabel func_80AB6324 /* 00C1C 80AB639C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C20 80AB63A0 03E00008 */ jr $ra /* 00C24 80AB63A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s index f2220ed3cc..1de6aa3f70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB63A8.s @@ -43,5 +43,3 @@ glabel func_80AB63A8 /* 00CC4 80AB6444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CC8 80AB6448 03E00008 */ jr $ra /* 00CCC 80AB644C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s index b46c46b186..ccfbe15a17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s @@ -75,5 +75,3 @@ glabel func_80AB6450 /* 00DE4 80AB6564 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DE8 80AB6568 03E00008 */ jr $ra /* 00DEC 80AB656C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s index bb8d3ea06e..5baa38e451 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s @@ -345,5 +345,3 @@ glabel func_80AB6570 /* 012AC 80AB6A2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 012B0 80AB6A30 03E00008 */ jr $ra /* 012B4 80AB6A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s index 4d822bd897..358d3cb921 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s @@ -114,5 +114,3 @@ glabel func_80AB6A38 /* 0146C 80AB6BEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01470 80AB6BF0 03E00008 */ jr $ra /* 01474 80AB6BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s index 5f523eb94a..6c26a1624d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s @@ -74,5 +74,3 @@ glabel func_80AB6BF8 /* 0157C 80AB6CFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01580 80AB6D00 03E00008 */ jr $ra /* 01584 80AB6D04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s index dfa18aa8ed..64fddcbf2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s @@ -116,5 +116,3 @@ glabel func_80AB6D08 /* 01728 80AB6EA8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0172C 80AB6EAC 03E00008 */ jr $ra /* 01730 80AB6EB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s index e0cc6003e9..ce841f51ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6EB4.s @@ -21,5 +21,3 @@ glabel func_80AB6EB4 /* 01778 80AB6EF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0177C 80AB6EFC 03E00008 */ jr $ra /* 01780 80AB6F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s index a4d9839163..3c892a1ce0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s @@ -112,5 +112,3 @@ glabel func_80AB6F04 /* 01914 80AB7094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01918 80AB7098 03E00008 */ jr $ra /* 0191C 80AB709C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s index 824bd709db..19ecd57fbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70A0.s @@ -21,5 +21,3 @@ glabel func_80AB70A0 /* 0196C 80AB70EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01970 80AB70F0 03E00008 */ jr $ra /* 01974 80AB70F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s index 2a18fb217d..35568bb161 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB70F8.s @@ -21,5 +21,3 @@ glabel func_80AB70F8 /* 019C0 80AB7140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 019C4 80AB7144 03E00008 */ jr $ra /* 019C8 80AB7148 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s index a09cf4444c..0307324f7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB714C.s @@ -48,5 +48,3 @@ glabel func_80AB714C /* 01A78 80AB71F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A7C 80AB71FC 03E00008 */ jr $ra /* 01A80 80AB7200 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s index 133c789d55..8623f34453 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7204.s @@ -37,5 +37,3 @@ glabel func_80AB7204 /* 01B04 80AB7284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B08 80AB7288 03E00008 */ jr $ra /* 01B0C 80AB728C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s index 99aec75a24..caebef7fb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s @@ -40,5 +40,3 @@ glabel func_80AB7290 /* 01B9C 80AB731C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BA0 80AB7320 03E00008 */ jr $ra /* 01BA4 80AB7324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s index d75bb2f170..b8201a5565 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s @@ -64,5 +64,3 @@ glabel func_80AB7328 /* 01C94 80AB7414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C98 80AB7418 03E00008 */ jr $ra /* 01C9C 80AB741C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s index 60ea6d1c27..22f7aa297d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7420.s @@ -24,5 +24,3 @@ glabel func_80AB7420 /* 01CF0 80AB7470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CF4 80AB7474 03E00008 */ jr $ra /* 01CF8 80AB7478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s index 6a8666002b..a75071f681 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB747C.s @@ -50,5 +50,3 @@ glabel func_80AB747C /* 01DA8 80AB7528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DAC 80AB752C 03E00008 */ jr $ra /* 01DB0 80AB7530 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s index eeddc8f78f..52b303f518 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7F60.s @@ -89,5 +89,3 @@ glabel func_80AB7F60 .L80AB80B0: /* 02930 80AB80B0 03E00008 */ jr $ra /* 02934 80AB80B4 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s index d914eb8086..ea241d9f5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8168.s @@ -64,5 +64,3 @@ glabel func_80AB8168 /* 02ACC 80AB824C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02AD0 80AB8250 03E00008 */ jr $ra /* 02AD4 80AB8254 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s index f293ff939c..9724dae45d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB8258.s @@ -115,5 +115,3 @@ glabel func_80AB8258 /* 02C80 80AB8400 8FB30050 */ lw $s3, 0x0050($sp) /* 02C84 80AB8404 03E00008 */ jr $ra /* 02C88 80AB8408 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s index 9a0701b15b..cbfa1f018f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s @@ -119,4 +119,3 @@ glabel func_80AB840C /* 02E54 80AB85D4 03E00008 */ jr $ra /* 02E58 80AB85D8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 02E5C 80AB85DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Destroy.s index 75e992abf3..2c8eea18ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Destroy.s @@ -2,5 +2,3 @@ glabel EnNiwGirl_Destroy /* 00200 80AB9180 AFA40000 */ sw $a0, 0x0000($sp) /* 00204 80AB9184 03E00008 */ jr $ra /* 00208 80AB9188 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s index 5b21b6d45c..da1a0c014a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AB9AEC + .asciz "../z_en_niw_girl.c" + .balign 4 + +glabel D_80AB9B00 + .asciz "../z_en_niw_girl.c" + .balign 4 + +.text glabel EnNiwGirl_Draw /* 008C8 80AB9848 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 008CC 80AB984C 3C0F80AC */ lui $t7, %hi(D_80AB99CC) ## $t7 = 80AC0000 @@ -77,4 +87,3 @@ glabel EnNiwGirl_Draw /* 009F4 80AB9974 00000000 */ nop /* 009F8 80AB9978 00000000 */ nop /* 009FC 80AB997C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s index 5920760c84..31c3abe8c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80AB99F0 + .asciz "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AB9A34 + .asciz "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AB9A70 + .asciz "\n\n" + .balign 4 + +glabel D_80AB9A74 + .asciz "\n\n" + .balign 4 + +glabel D_80AB9A78 + .asciz "☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AB9AB8 + .asciz "☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AB9AE8 + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel D_80AB9B14 + .float 3.14159274101 + +.text glabel EnNiwGirl_Init /* 00000 80AB8F80 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00004 80AB8F84 AFB00038 */ sw $s0, 0x0038($sp) @@ -141,5 +175,3 @@ glabel EnNiwGirl_Init /* 001F4 80AB9174 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 001F8 80AB9178 03E00008 */ jr $ra /* 001FC 80AB917C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s index 0048e58442..92527d9c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s @@ -150,5 +150,3 @@ glabel EnNiwGirl_Update /* 00858 80AB97D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0085C 80AB97DC 03E00008 */ jr $ra /* 00860 80AB97E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s index ad6874648a..d8cabac461 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s @@ -34,5 +34,3 @@ glabel func_80AB918C /* 00284 80AB9204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00288 80AB9208 03E00008 */ jr $ra /* 0028C 80AB920C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s index 094c5a7961..7176da0af2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AB9B18 + .word 0x4622F983 + +.text glabel func_80AB9210 /* 00290 80AB9210 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00294 80AB9214 AFBF0024 */ sw $ra, 0x0024($sp) @@ -116,5 +121,3 @@ glabel func_80AB9210 /* 00434 80AB93B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00438 80AB93B8 03E00008 */ jr $ra /* 0043C 80AB93BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s index e12f3cc9c5..48a5a730b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s @@ -1,3 +1,16 @@ +.late_rodata +glabel jtbl_80AB9B1C +.word L80AB947C +.word L80AB94A0 +.word L80AB9488 +.word L80AB9494 +.word L80AB94A0 +.word L80AB9494 +.word L80AB9494 +.word L80AB94A0 +.word 0x00000000 + +.text glabel func_80AB93C0 /* 00440 80AB93C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00444 80AB93C4 AFB00028 */ sw $s0, 0x0028($sp) @@ -75,5 +88,3 @@ glabel L80AB94A0 /* 00544 80AB94C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00548 80AB94C8 03E00008 */ jr $ra /* 0054C 80AB94CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB94D0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB94D0.s index d85f163d54..ff5ba2bb39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB94D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB94D0.s @@ -69,5 +69,3 @@ glabel func_80AB94D0 /* 00638 80AB95B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0063C 80AB95BC 03E00008 */ jr $ra /* 00640 80AB95C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB97E4.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB97E4.s index 820695a181..106ff000cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB97E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB97E4.s @@ -26,5 +26,3 @@ glabel func_80AB97E4 .L80AB9840: /* 008C0 80AB9840 03E00008 */ jr $ra /* 008C4 80AB9844 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s index 825168a2d2..1676057973 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s @@ -10,5 +10,3 @@ glabel EnNiwLady_Destroy /* 00114 80AB9D54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00118 80AB9D58 03E00008 */ jr $ra /* 0011C 80AB9D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s index 32aba227ad..ea36fcbb28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80ABB420 + .asciz "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB458 + .asciz "\n\n" + .balign 4 + +.text glabel EnNiwLady_Init /* 00000 80AB9C40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80AB9C44 AFB00018 */ sw $s0, 0x0018($sp) @@ -72,5 +82,3 @@ glabel EnNiwLady_Init /* 000EC 80AB9D2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000F0 80AB9D30 03E00008 */ jr $ra /* 000F4 80AB9D34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s index 5665dc17b1..4f577e8d76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s @@ -166,5 +166,3 @@ glabel EnNiwLady_Update /* 01454 80ABB094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01458 80ABB098 03E00008 */ jr $ra /* 0145C 80ABB09C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s index 04e8f6bae1..e15a96f2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s @@ -1,3 +1,37 @@ +.late_rodata +glabel jtbl_80ABB744 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E80 +.word L80AB9E34 +.word L80AB9DE8 +.word L80AB9DE4 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9F14 +.word L80AB9E80 +.word L80AB9E34 +.word L80AB9E34 +.word L80AB9E80 +.word L80AB9E34 +.word L80AB9E80 +.word L80AB9E80 +.word L80AB9E80 +.word L80AB9E80 +.word L80AB9E34 + +.text glabel func_80AB9D60 /* 00120 80AB9D60 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00124 80AB9D64 AFA40028 */ sw $a0, 0x0028($sp) @@ -130,5 +164,3 @@ glabel L80AB9F14 /* 002D8 80AB9F18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002DC 80AB9F1C 03E00008 */ jr $ra /* 002E0 80AB9F20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s index b75c88f697..7d3c499a9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s @@ -208,5 +208,3 @@ glabel func_80AB9F24 /* 005D0 80ABA210 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 005D4 80ABA214 03E00008 */ jr $ra /* 005D8 80ABA218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s index 40fbab9210..334b9f09c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s @@ -9,5 +9,3 @@ glabel func_80ABA21C /* 005F8 80ABA238 AC980250 */ sw $t8, 0x0250($a0) ## 00000250 /* 005FC 80ABA23C 03E00008 */ jr $ra /* 00600 80ABA240 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s index 0edd79ef91..158f2a65ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s @@ -1,3 +1,57 @@ +.rdata +glabel D_80ABB45C + .asciz "☆ 鶏柵内ＧＥＴ！☆ %x\n" + .balign 4 + +glabel D_80ABB47C + .asciz "\n\n" + .balign 4 + +glabel D_80ABB480 + .asciz "☆☆☆☆☆ ねぇちゃん選択 ☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB4B0 + .asciz "☆☆☆☆☆ ねぇちゃんハート ☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB4E8 + .asciz "☆☆☆☆☆ ねぇちゃん保存 ☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB520 + .asciz "☆☆☆☆☆ ねぇちゃん今 ☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB550 + .asciz "☆☆☆☆☆ this->actor.talk_message ☆☆ %x\n" + .balign 4 + +glabel D_80ABB588 + .asciz "☆☆☆☆☆ this->message_end_code ☆☆ %d\n" + .balign 4 + +glabel D_80ABB5C0 + .asciz "\n\n" + .balign 4 + +glabel D_80ABB5C4 + .asciz "☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n" + .balign 4 + +glabel D_80ABB5F0 + .asciz "☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n" + .balign 4 + +glabel D_80ABB61C + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel D_80ABB7BC + .word 0x44C94000 + +.text glabel func_80ABA244 /* 00604 80ABA244 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00608 80ABA248 AFBF0024 */ sw $ra, 0x0024($sp) @@ -292,5 +346,3 @@ glabel func_80ABA244 /* 00A08 80ABA648 8FB30020 */ lw $s3, 0x0020($sp) /* 00A0C 80ABA64C 03E00008 */ jr $ra /* 00A10 80ABA650 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s index 7f6223ec48..5ede0706dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80ABB620 + .asciz "☆☆☆☆☆ ハート ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB64C + .asciz "☆☆☆☆☆ 爆弾 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80ABB678 + .asciz "\n\n" + .balign 4 + +.text glabel func_80ABA654 /* 00A14 80ABA654 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A18 80ABA658 AFB0001C */ sw $s0, 0x001C($sp) @@ -79,5 +93,3 @@ glabel func_80ABA654 /* 00B2C 80ABA76C 8FB10020 */ lw $s1, 0x0020($sp) /* 00B30 80ABA770 03E00008 */ jr $ra /* 00B34 80ABA774 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s index 2a3e894f41..f250ed2c24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80ABB67C + .asciz "☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80ABA778 /* 00B38 80ABA778 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B3C 80ABA77C AFA5001C */ sw $a1, 0x001C($sp) @@ -68,5 +74,3 @@ glabel func_80ABA778 /* 00C2C 80ABA86C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C30 80ABA870 03E00008 */ jr $ra /* 00C34 80ABA874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s index 9193772ba7..7ff1d2a09b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s @@ -86,5 +86,3 @@ glabel func_80ABA878 /* 00D6C 80ABA9AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D70 80ABA9B0 03E00008 */ jr $ra /* 00D74 80ABA9B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s index 69aca97ada..83b959cec0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s @@ -60,5 +60,3 @@ glabel func_80ABA9B8 /* 00E50 80ABAA90 8FB10020 */ lw $s1, 0x0020($sp) /* 00E54 80ABAA94 03E00008 */ jr $ra /* 00E58 80ABAA98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s index 43ec16446c..99b8dbc025 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s @@ -27,5 +27,3 @@ glabel func_80ABAA9C /* 00EBC 80ABAAFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EC0 80ABAB00 03E00008 */ jr $ra /* 00EC4 80ABAB04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s index a7eaa85c21..244a56ee15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s @@ -65,5 +65,3 @@ glabel func_80ABAB08 /* 00FB4 80ABABF4 8FB10020 */ lw $s1, 0x0020($sp) /* 00FB8 80ABABF8 03E00008 */ jr $ra /* 00FBC 80ABABFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s index 82a38fc7fe..a84f360dce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s @@ -35,5 +35,3 @@ glabel func_80ABAC00 /* 01038 80ABAC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0103C 80ABAC7C 03E00008 */ jr $ra /* 01040 80ABAC80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s index 3cb705a440..f3aab3485c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80ABB6B8 + .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80ABAC84 /* 01044 80ABAC84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01048 80ABAC88 AFBF0014 */ sw $ra, 0x0014($sp) @@ -50,5 +56,3 @@ glabel func_80ABAC84 /* 010EC 80ABAD2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010F0 80ABAD30 03E00008 */ jr $ra /* 010F4 80ABAD34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s index fe8436a5d0..5448153496 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80ABB6E4 + .asciz "☆☆☆☆☆ 通常メッセージチェック ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80ABAD38 /* 010F8 80ABAD38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 010FC 80ABAD3C AFA40018 */ sw $a0, 0x0018($sp) @@ -17,5 +23,3 @@ glabel func_80ABAD38 /* 01130 80ABAD70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01134 80ABAD74 03E00008 */ jr $ra /* 01138 80ABAD78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s index b9f933cd80..71907307fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s @@ -53,5 +53,3 @@ glabel func_80ABAD7C /* 011F4 80ABAE34 8FB10018 */ lw $s1, 0x0018($sp) /* 011F8 80ABAE38 03E00008 */ jr $ra /* 011FC 80ABAE3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s index 87b7210a30..dcbce66fdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s @@ -11,5 +11,3 @@ glabel func_80ABB0A0 /* 01480 80ABB0C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01484 80ABB0C4 03E00008 */ jr $ra /* 01488 80ABB0C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s index 47d5861939..58bdf49a1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s @@ -92,5 +92,3 @@ glabel func_80ABB0CC /* 015DC 80ABB21C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 015E0 80ABB220 03E00008 */ jr $ra /* 015E4 80ABB224 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s index 919ea3dd03..06a924f0ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80ABB71C + .asciz "../z_en_niw_lady.c" + .balign 4 + +glabel D_80ABB730 + .asciz "../z_en_niw_lady.c" + .balign 4 + +.text glabel func_80ABB228 /* 015E8 80ABB228 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 015EC 80ABB22C AFB10028 */ sw $s1, 0x0028($sp) @@ -86,4 +96,3 @@ glabel func_80ABB228 /* 01734 80ABB374 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01738 80ABB378 00000000 */ nop /* 0173C 80ABB37C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s index 7702b79106..177ffa0026 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s @@ -9,5 +9,3 @@ glabel EnNwc_Destroy /* 008E4 80ABC9C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008E8 80ABC9C8 03E00008 */ jr $ra /* 008EC 80ABC9CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Draw.s index b838ac8897..cf4fce05a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Draw.s @@ -9,4 +9,3 @@ glabel EnNwc_Draw /* 00974 80ABCA54 00000000 */ nop /* 00978 80ABCA58 00000000 */ nop /* 0097C 80ABCA5C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s index db3d72e581..c1ff939c20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s @@ -104,5 +104,3 @@ glabel EnNwc_Init /* 008BC 80ABC99C 8FB50040 */ lw $s5, 0x0040($sp) /* 008C0 80ABC9A0 03E00008 */ jr $ra /* 008C4 80ABC9A4 27BD02A0 */ addiu $sp, $sp, 0x02A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s index 85e2bf5f83..75db76ab79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s @@ -18,5 +18,3 @@ glabel EnNwc_Update /* 0094C 80ABCA2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00950 80ABCA30 03E00008 */ jr $ra /* 00954 80ABCA34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E0.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E0.s index 98ef096f49..03a327006b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E0.s @@ -1,5 +1,3 @@ glabel func_80ABC0E0 /* 00000 80ABC0E0 03E00008 */ jr $ra /* 00004 80ABC0E4 AC850730 */ sw $a1, 0x0730($a0) ## 00000730 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E8.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E8.s index 752cde166e..08f8ba7350 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0E8.s @@ -3,5 +3,3 @@ glabel func_80ABC0E8 /* 0000C 80ABC0EC AFA50004 */ sw $a1, 0x0004($sp) /* 00010 80ABC0F0 03E00008 */ jr $ra /* 00014 80ABC0F4 AFA60008 */ sw $a2, 0x0008($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0F8.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0F8.s index 9458486098..3b8f03ed8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC0F8.s @@ -64,5 +64,3 @@ glabel func_80ABC0F8 /* 00108 80ABC1E8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0010C 80ABC1EC 03E00008 */ jr $ra /* 00110 80ABC1F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC1F4.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC1F4.s index 2674169a22..59801c0819 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC1F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC1F4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ABCB00 + .float 0.1 + +.text glabel func_80ABC1F4 /* 00114 80ABC1F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00118 80ABC1F8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 @@ -27,5 +32,3 @@ glabel func_80ABC1F4 /* 00174 80ABC254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00178 80ABC258 03E00008 */ jr $ra /* 0017C 80ABC25C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC260.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC260.s index 6a69f81d83..832239444c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC260.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ABCB04 + .word 0x47C34FF3 + +.text glabel func_80ABC260 /* 00180 80ABC260 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00184 80ABC264 3C0180AC */ lui $at, %hi(D_80ABCB04) ## $at = 80AC0000 @@ -133,5 +138,3 @@ glabel func_80ABC260 /* 00374 80ABC454 8FB70050 */ lw $s7, 0x0050($sp) /* 00378 80ABC458 03E00008 */ jr $ra /* 0037C 80ABC45C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s index cb3dae8fdd..2aabde2a6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s @@ -1,3 +1,28 @@ +.rdata +glabel D_80ABCAC0 + .asciz "../z_en_nwc.c" + .balign 4 + +glabel D_80ABCAD0 + .asciz "../z_en_nwc.c" + .balign 4 + +glabel D_80ABCAE0 + .asciz "../z_en_nwc.c" + .balign 4 + +glabel D_80ABCAF0 + .asciz "../z_en_nwc.c" + .balign 4 + +.late_rodata +glabel D_80ABCB08 + .float 0.01 + +glabel D_80ABCB0C + .float 9.58738019108e-05 + +.text glabel func_80ABC460 /* 00380 80ABC460 27BDFF00 */ addiu $sp, $sp, 0xFF00 ## $sp = FFFFFF00 /* 00384 80ABC464 AFBF004C */ sw $ra, 0x004C($sp) @@ -245,5 +270,3 @@ glabel func_80ABC460 /* 00730 80ABC810 8FBE0048 */ lw $s8, 0x0048($sp) /* 00734 80ABC814 03E00008 */ jr $ra /* 00738 80ABC818 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC9D0.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC9D0.s index 4081f88b8e..7d09b9a73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC9D0.s @@ -7,5 +7,3 @@ glabel func_80ABC9D0 /* 00904 80ABC9E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00908 80ABC9E8 03E00008 */ jr $ra /* 0090C 80ABC9EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s index 63b9c95a02..ccee1a9e49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s @@ -9,5 +9,3 @@ glabel EnNy_Destroy /* 00184 80ABCD34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00188 80ABCD38 03E00008 */ jr $ra /* 0018C 80ABCD3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s index 0dda1274fc..09b23bfd0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80ABE444 + .asciz "../z_en_ny.c" + .balign 4 + +glabel D_80ABE454 + .asciz "../z_en_ny.c" + .balign 4 + +glabel D_80ABE464 + .asciz "../z_en_ny.c" + .balign 4 + +glabel D_80ABE474 + .asciz "../z_en_ny.c" + .balign 4 + +.text glabel EnNy_Draw /* 01174 80ABDD24 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 01178 80ABDD28 AFBF002C */ sw $ra, 0x002C($sp) @@ -203,5 +221,3 @@ glabel EnNy_Draw /* 01484 80ABE034 8FB10028 */ lw $s1, 0x0028($sp) /* 01488 80ABE038 03E00008 */ jr $ra /* 0148C 80ABE03C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s index 080120f023..6eb76b104d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80ABE3E0 + .asciz "ニュウ イニシャル[ %d ] ！！\n" + .balign 4 + +glabel D_80ABE400 + .asciz "ダミーニュウ イニシャル[ %d ] ！！\n" + .balign 4 + +glabel D_80ABE424 + .asciz "En_Ny_actor_move2[ %x ] ！！\n" + .balign 4 + +.late_rodata +glabel D_80ABE4B4 + .word 0xBECCCCCD + +.text glabel EnNy_Init /* 00000 80ABCBB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80ABCBB4 AFA50034 */ sw $a1, 0x0034($sp) @@ -97,5 +115,3 @@ glabel EnNy_Init /* 0015C 80ABCD0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00160 80ABCD10 03E00008 */ jr $ra /* 00164 80ABCD14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s index f3a96a23c0..a12f966afe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ABE4D0 + .word 0x3FAA3D71 + +.text glabel EnNy_Update /* 008EC 80ABD49C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 008F0 80ABD4A0 AFBF003C */ sw $ra, 0x003C($sp) @@ -177,5 +182,3 @@ glabel EnNy_Update /* 00B6C 80ABD71C 8FB30038 */ lw $s3, 0x0038($sp) /* 00B70 80ABD720 03E00008 */ jr $ra /* 00B74 80ABD724 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s index 1ceaa3bd9f..ba7134bd98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80ABE4B8 + .float 0.7 + +glabel D_80ABE4BC + .word 0x40333333 + +.text glabel func_80ABCD40 /* 00190 80ABCD40 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00194 80ABCD44 C4860084 */ lwc1 $f6, 0x0084($a0) ## 00000084 @@ -18,5 +26,3 @@ glabel func_80ABCD40 /* 001C8 80ABCD78 46004282 */ mul.s $f10, $f8, $f0 /* 001CC 80ABCD7C 03E00008 */ jr $ra /* 001D0 80ABCD80 E48A01E8 */ swc1 $f10, 0x01E8($a0) ## 000001E8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s index b4e3c4adfa..d27535efe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s @@ -3,5 +3,3 @@ glabel func_80ABCD84 /* 001D8 80ABCD88 25CECE50 */ addiu $t6, $t6, %lo(func_80ABCE50) ## $t6 = 80ABCE50 /* 001DC 80ABCD8C 03E00008 */ jr $ra /* 001E0 80ABCD90 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s index 57a5d6645f..28d24d9730 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s @@ -5,5 +5,3 @@ glabel func_80ABCD94 /* 001F0 80ABCDA0 AC8E01DC */ sw $t6, 0x01DC($a0) ## 000001DC /* 001F4 80ABCDA4 03E00008 */ jr $ra /* 001F8 80ABCDA8 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s index 95d19a3153..a54aac7737 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s @@ -3,5 +3,3 @@ glabel func_80ABCDAC /* 00200 80ABCDB0 25CECEEC */ addiu $t6, $t6, %lo(func_80ABCEEC) ## $t6 = 80ABCEEC /* 00204 80ABCDB4 03E00008 */ jr $ra /* 00208 80ABCDB8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s index ef58ba5920..ac2e5db887 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s @@ -15,5 +15,3 @@ glabel func_80ABCDBC /* 00240 80ABCDF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00244 80ABCDF4 03E00008 */ jr $ra /* 00248 80ABCDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s index 9b671ccbb9..f38aa4f453 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s @@ -15,5 +15,3 @@ glabel func_80ABCDFC /* 0027C 80ABCE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00280 80ABCE30 03E00008 */ jr $ra /* 00284 80ABCE34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s index af2b499e93..bdcdac5a0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s @@ -5,5 +5,3 @@ glabel func_80ABCE38 /* 00294 80ABCE44 AC8E01DC */ sw $t6, 0x01DC($a0) ## 000001DC /* 00298 80ABCE48 03E00008 */ jr $ra /* 0029C 80ABCE4C AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s index 5f64efe35c..70550cc90d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s @@ -16,5 +16,3 @@ glabel func_80ABCE50 /* 002D4 80ABCE84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002D8 80ABCE88 03E00008 */ jr $ra /* 002DC 80ABCE8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s index 8a50fb0166..981b5a91d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s @@ -23,5 +23,3 @@ glabel func_80ABCE90 /* 00330 80ABCEE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00334 80ABCEE4 03E00008 */ jr $ra /* 00338 80ABCEE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s index d117c8bb77..d21dcbe9b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s @@ -24,5 +24,3 @@ glabel func_80ABCEEC /* 00390 80ABCF40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00394 80ABCF44 03E00008 */ jr $ra /* 00398 80ABCF48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s index b6a25830eb..3b2c44cf2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s @@ -76,5 +76,3 @@ glabel func_80ABCF4C /* 004A0 80ABD050 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004A4 80ABD054 03E00008 */ jr $ra /* 004A8 80ABD058 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s index 5ee11a74d6..87964c734c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s @@ -50,5 +50,3 @@ glabel func_80ABD05C /* 00560 80ABD110 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00564 80ABD114 03E00008 */ jr $ra /* 00568 80ABD118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s index 0eb9cb501f..6b235a0abc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s @@ -30,5 +30,3 @@ glabel func_80ABD11C /* 005D4 80ABD184 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005D8 80ABD188 03E00008 */ jr $ra /* 005DC 80ABD18C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s index aadfdb1946..3a97b22fa0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s @@ -149,5 +149,3 @@ glabel func_80ABD190 /* 007FC 80ABD3AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00800 80ABD3B0 03E00008 */ jr $ra /* 00804 80ABD3B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s index bc0389ebf9..a24a0b9652 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_80ABE4C0 + .word 0xBECCCCCD +glabel D_80ABE4C4 + .word 0xBECCCCCD +glabel D_80ABE4C8 + .float 0.4 + +glabel D_80ABE4CC + .float 0.4 + +.text glabel func_80ABD3B8 /* 00808 80ABD3B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0080C 80ABD3BC C48601E8 */ lwc1 $f6, 0x01E8($a0) ## 000001E8 @@ -63,5 +75,3 @@ glabel func_80ABD3B8 .L80ABD494: /* 008E4 80ABD494 03E00008 */ jr $ra /* 008E8 80ABD498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s index f333b89f16..9fe70e6944 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s @@ -180,5 +180,3 @@ glabel func_80ABD728 /* 00DF0 80ABD9A0 8FB50050 */ lw $s5, 0x0050($sp) /* 00DF4 80ABD9A4 03E00008 */ jr $ra /* 00DF8 80ABD9A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s index 3149b70c51..49db8a01ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80ABE4D4 + .float 0.4 + +glabel D_80ABE4D8 + .float 0.1 + +glabel D_80ABE4DC + .float 0.6 + +glabel D_80ABE4E0 + .float 0.15 + +.text glabel func_80ABD9AC /* 00DFC 80ABD9AC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00E00 80ABD9B0 F7B40018 */ sdc1 $f20, 0x0018($sp) @@ -142,5 +156,3 @@ glabel func_80ABD9AC /* 00FFC 80ABDBAC 8FB60050 */ lw $s6, 0x0050($sp) /* 01000 80ABDBB0 03E00008 */ jr $ra /* 01004 80ABDBB4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s index cd11c333b9..0e2983b301 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s @@ -16,5 +16,3 @@ glabel func_80ABDBB8 /* 0103C 80ABDBEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01040 80ABDBF0 03E00008 */ jr $ra /* 01044 80ABDBF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s index f1369f2700..2527340975 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s @@ -80,5 +80,3 @@ glabel func_80ABDBF8 /* 01168 80ABDD18 8FB10020 */ lw $s1, 0x0020($sp) /* 0116C 80ABDD1C 03E00008 */ jr $ra /* 01170 80ABDD20 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s index 33bd2bf51f..d0a43b819b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80ABE484 + .asciz "../z_en_ny.c" + .balign 4 + +glabel D_80ABE494 + .asciz "../z_en_ny.c" + .balign 4 + +glabel D_80ABE4A4 + .asciz "../z_en_ny.c" + .balign 4 + +.late_rodata +glabel D_80ABE4E4 + .float 0.04 + +glabel D_80ABE4E8 + .float 0.4 + +.text glabel func_80ABE040 /* 01490 80ABE040 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 01494 80ABE044 AFBF0064 */ sw $ra, 0x0064($sp) @@ -185,4 +206,3 @@ glabel func_80ABE040 /* 01754 80ABE304 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 01758 80ABE308 00000000 */ nop /* 0175C 80ABE30C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Destroy.s index 8a670854a4..938f1939eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Destroy.s @@ -2,5 +2,3 @@ glabel EnOkarinaTag_Destroy /* 00000 80ABED20 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80ABED24 03E00008 */ jr $ra /* 00008 80ABED28 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s index a752013ded..bc2133e147 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s @@ -1,3 +1,51 @@ +.rdata +glabel D_80AC0300 + .asciz "\n\n" + .balign 4 + +glabel D_80AC0304 + .asciz "☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80AC0338 + .asciz "☆☆☆☆☆ セーブ情報 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AC0368 + .asciz "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AC039C + .asciz "☆☆☆☆☆ 正解情報 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AC03C8 + .asciz "☆☆☆☆☆ 範囲情報 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AC03F4 + .asciz "☆☆☆☆☆ 処理範囲情報 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80AC0424 + .asciz "☆☆☆☆☆ 当り？ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80AC0450 + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel jtbl_80AC0508 +.word L80ABEEE8 +.word L80ABEEC8 +.word L80ABEF10 +.word L80ABEEE8 +.word L80ABEEF8 +.word L80ABEEE8 +.word L80ABEEB8 + +.text glabel EnOkarinaTag_Init /* 0000C 80ABED2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00010 80ABED30 AFB00018 */ sw $s0, 0x0018($sp) @@ -153,5 +201,3 @@ glabel L80ABEF10 /* 00200 80ABEF20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00204 80ABEF24 03E00008 */ jr $ra /* 00208 80ABEF28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s index b899841798..89019fd4a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s @@ -78,4 +78,3 @@ glabel EnOkarinaTag_Update /* 00CA4 80ABF9C4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00CA8 80ABF9C8 03E00008 */ jr $ra /* 00CAC 80ABF9CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s index c6d05f3ea8..660088dc34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AC0454 + .asciz "☆☆☆☆☆ 北！！！！！ ☆☆☆☆☆ %f\n" + .balign 4 + +.text glabel func_80ABEF2C /* 0020C 80ABEF2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00210 80ABEF30 AFBF001C */ sw $ra, 0x001C($sp) @@ -112,5 +118,3 @@ glabel func_80ABEF2C /* 003A0 80ABF0C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003A4 80ABF0C4 03E00008 */ jr $ra /* 003A8 80ABF0C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF0CC.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF0CC.s index 67399ae91d..6d065f7f83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF0CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF0CC.s @@ -124,5 +124,3 @@ glabel func_80ABF0CC /* 00560 80ABF280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00564 80ABF284 03E00008 */ jr $ra /* 00568 80ABF288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s index 9ff3a31dc2..05a21d9840 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AC0484 + .asciz "☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel func_80ABF28C /* 0056C 80ABF28C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00570 80ABF290 AFBF0014 */ sw $ra, 0x0014($sp) @@ -159,5 +165,3 @@ glabel func_80ABF28C /* 0079C 80ABF4BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007A0 80ABF4C0 03E00008 */ jr $ra /* 007A4 80ABF4C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s index 301b69bd47..8abe671eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC0524 + .word 0x3F983809, 0x00000000, 0x00000000 + +.text glabel func_80ABF4C8 /* 007A8 80ABF4C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 007AC 80ABF4CC 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 @@ -159,5 +164,3 @@ glabel func_80ABF4C8 /* 009DC 80ABF6FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009E0 80ABF700 03E00008 */ jr $ra /* 009E4 80ABF704 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s index 8a2166d940..223bba22d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s @@ -52,5 +52,3 @@ glabel func_80ABF708 /* 00AA0 80ABF7C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AA4 80ABF7C4 03E00008 */ jr $ra /* 00AA8 80ABF7C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s index 2ab22f68af..f06ca0a188 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AC04D0 + .asciz "☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel func_80ABF7CC /* 00AAC 80ABF7CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00AB0 80ABF7D0 AFA40020 */ sw $a0, 0x0020($sp) @@ -57,5 +63,3 @@ glabel func_80ABF7CC /* 00B7C 80ABF89C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B80 80ABF8A0 03E00008 */ jr $ra /* 00B84 80ABF8A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s index 97f094bd7e..d50dcb170a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s @@ -10,5 +10,3 @@ glabel EnOkuta_Destroy /* 00224 80AC0884 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00228 80AC0888 03E00008 */ jr $ra /* 0022C 80AC088C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s index 2970e59b52..b3aeae5f38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80AC28D0 + .asciz "../z_en_okuta.c" + .balign 4 + +glabel D_80AC28E0 + .asciz "../z_en_okuta.c" + .balign 4 + +glabel D_80AC28F0 + .asciz "../z_en_okuta.c" + .balign 4 + +.late_rodata +glabel D_80AC2988 + .float 9.58738019108e-05 + +.text glabel EnOkuta_Draw /* 02074 80AC26D4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 02078 80AC26D8 AFB00020 */ sw $s0, 0x0020($sp) @@ -77,4 +95,3 @@ glabel EnOkuta_Draw /* 02194 80AC27F4 8FB20028 */ lw $s2, 0x0028($sp) /* 02198 80AC27F8 03E00008 */ jr $ra /* 0219C 80AC27FC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s index f379a895f4..030027f43b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s @@ -144,5 +144,3 @@ glabel EnOkuta_Init /* 001FC 80AC085C 8FB10028 */ lw $s1, 0x0028($sp) /* 00200 80AC0860 03E00008 */ jr $ra /* 00204 80AC0864 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s index 3e10752d51..7345d39cc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s @@ -247,5 +247,3 @@ glabel EnOkuta_Update /* 01CE4 80AC2344 8FB10020 */ lw $s1, 0x0020($sp) /* 01CE8 80AC2348 03E00008 */ jr $ra /* 01CEC 80AC234C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s index bd2489449e..6345dd1519 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s @@ -43,5 +43,3 @@ glabel func_80AC0890 /* 002D0 80AC0930 8FB30048 */ lw $s3, 0x0048($sp) /* 002D4 80AC0934 03E00008 */ jr $ra /* 002D8 80AC0938 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC093C.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC093C.s index 7a32d0ca3a..a1b76957db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC093C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC093C.s @@ -25,5 +25,3 @@ glabel func_80AC093C /* 00338 80AC0998 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0033C 80AC099C 03E00008 */ jr $ra /* 00340 80AC09A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s index 06bc69b7e6..afec8d63aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s @@ -16,5 +16,3 @@ glabel func_80AC09A4 /* 0037C 80AC09DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00380 80AC09E0 03E00008 */ jr $ra /* 00384 80AC09E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s index 3a0e88d2f5..440562afca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s @@ -41,5 +41,3 @@ glabel func_80AC09E8 /* 0041C 80AC0A7C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00420 80AC0A80 03E00008 */ jr $ra /* 00424 80AC0A84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0A88.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0A88.s index 4dc3c4bf4b..b49d2c00cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0A88.s @@ -10,5 +10,3 @@ glabel func_80AC0A88 /* 00448 80AC0AA8 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 /* 0044C 80AC0AAC 03E00008 */ jr $ra /* 00450 80AC0AB0 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s index dbbe2ce0c2..3159fe480a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s @@ -27,5 +27,3 @@ glabel func_80AC0AB4 /* 004B8 80AC0B18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004BC 80AC0B1C 03E00008 */ jr $ra /* 004C0 80AC0B20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s index 6134965691..b7d9d6d9b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s @@ -14,5 +14,3 @@ glabel func_80AC0B24 /* 004F4 80AC0B54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F8 80AC0B58 03E00008 */ jr $ra /* 004FC 80AC0B5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s index 8af0ee2e4e..f8db85acf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s @@ -25,5 +25,3 @@ glabel func_80AC0B60 /* 00554 80AC0BB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00558 80AC0BB8 03E00008 */ jr $ra /* 0055C 80AC0BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s index 491d8bc113..9a15e5c238 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s @@ -64,5 +64,3 @@ glabel func_80AC0BC0 /* 00640 80AC0CA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00644 80AC0CA4 03E00008 */ jr $ra /* 00648 80AC0CA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s index 8b8069002e..42ef4091a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s @@ -35,5 +35,3 @@ glabel func_80AC0CAC /* 006C8 80AC0D28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006CC 80AC0D2C 03E00008 */ jr $ra /* 006D0 80AC0D30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s index 2be0e2b10a..3439639289 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s @@ -17,5 +17,3 @@ glabel func_80AC0D34 /* 00710 80AC0D70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00714 80AC0D74 03E00008 */ jr $ra /* 00718 80AC0D78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D7C.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D7C.s index 82d69cdc8a..268c0560f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D7C.s @@ -18,5 +18,3 @@ glabel func_80AC0D7C /* 0075C 80AC0DBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00760 80AC0DC0 03E00008 */ jr $ra /* 00764 80AC0DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0DC8.s index 3cdf62e5f5..bfa542370f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0DC8.s @@ -84,5 +84,3 @@ glabel func_80AC0DC8 /* 0089C 80AC0EFC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 008A0 80AC0F00 03E00008 */ jr $ra /* 008A4 80AC0F04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F08.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F08.s index 20f34fb9ab..bc546df73c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F08.s @@ -23,5 +23,3 @@ glabel func_80AC0F08 /* 008F8 80AC0F58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008FC 80AC0F5C 03E00008 */ jr $ra /* 00900 80AC0F60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F64.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F64.s index d639d6a9b0..07647223e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0F64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC2900 + .float 0.01 + +.text glabel func_80AC0F64 /* 00904 80AC0F64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00908 80AC0F68 AFB00018 */ sw $s0, 0x0018($sp) @@ -94,5 +99,3 @@ glabel func_80AC0F64 /* 00A3C 80AC109C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A40 80AC10A0 03E00008 */ jr $ra /* 00A44 80AC10A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC10A8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC10A8.s index ad55b97d12..d18adda026 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC10A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC10A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC2904 + .float 0.01 + +.text glabel func_80AC10A8 /* 00A48 80AC10A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A4C 80AC10AC AFB00018 */ sw $s0, 0x0018($sp) @@ -72,5 +77,3 @@ glabel func_80AC10A8 /* 00B3C 80AC119C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B40 80AC11A0 03E00008 */ jr $ra /* 00B44 80AC11A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC11A8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC11A8.s index e0eac7c307..ab95d4cf8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC11A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC11A8.s @@ -85,5 +85,3 @@ glabel func_80AC11A8 /* 00C6C 80AC12CC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C70 80AC12D0 03E00008 */ jr $ra /* 00C74 80AC12D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC12D8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC12D8.s index 5ffee1c68a..707ae07bd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC12D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC12D8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC2908 + .word 0x3E860932 + +.text glabel func_80AC12D8 /* 00C78 80AC12D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00C7C 80AC12DC AFB00018 */ sw $s0, 0x0018($sp) @@ -109,5 +114,3 @@ glabel func_80AC12D8 /* 00DEC 80AC144C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00DF0 80AC1450 03E00008 */ jr $ra /* 00DF4 80AC1454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1458.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1458.s index e19edd6271..bf8293d952 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1458.s @@ -22,5 +22,3 @@ glabel func_80AC1458 /* 00E3C 80AC149C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E40 80AC14A0 03E00008 */ jr $ra /* 00E44 80AC14A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s index 3e3305a2cd..55f2443007 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_80AC290C + .float 0.01 + +glabel D_80AC2910 + .word 0x3E6EE632 +glabel D_80AC2914 + .float 0.01 + +glabel D_80AC2918 + .float 0.04 + +glabel D_80AC291C + .float 0.8 + +glabel D_80AC2920 + .float 0.01 + +.text glabel func_80AC14A8 /* 00E48 80AC14A8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00E4C 80AC14AC AFB50054 */ sw $s5, 0x0054($sp) @@ -220,5 +239,3 @@ glabel func_80AC14A8 /* 01150 80AC17B0 8FB60058 */ lw $s6, 0x0058($sp) /* 01154 80AC17B4 03E00008 */ jr $ra /* 01158 80AC17B8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s index 4e12a68056..c1d153c6bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AC2924 + .float 0.2 + +glabel D_80AC2928 + .float 1.9 + +.text glabel func_80AC17BC /* 0115C 80AC17BC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01160 80AC17C0 AFBF003C */ sw $ra, 0x003C($sp) @@ -103,5 +111,3 @@ glabel func_80AC17BC /* 012CC 80AC192C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 012D0 80AC1930 03E00008 */ jr $ra /* 012D4 80AC1934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s index 35c07a9d09..ce9c5cda47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC292C + .float 0.1 + +.text glabel func_80AC1938 /* 012D8 80AC1938 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 012DC 80AC193C AFBF0034 */ sw $ra, 0x0034($sp) @@ -159,5 +164,3 @@ glabel func_80AC1938 /* 01514 80AC1B74 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01518 80AC1B78 03E00008 */ jr $ra /* 0151C 80AC1B7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1B80.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1B80.s index f6c11a96d0..57e72f8ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1B80.s @@ -1,3 +1,50 @@ +.late_rodata +glabel D_80AC2930 + .float 0.4 + +glabel D_80AC2934 + .float 0.075 + +glabel D_80AC2938 + .word 0x3FE66666 +glabel D_80AC293C + .float 0.8 + +glabel D_80AC2940 + .float 1.3 + +glabel D_80AC2944 + .float 0.05 + +glabel D_80AC2948 + .word 0x3D086595 +glabel D_80AC294C + .word 0x3EAA7EFA +glabel D_80AC2950 + .word 0x3EB33333 +glabel D_80AC2954 + .float 0.8 + +glabel D_80AC2958 + .float 0.05 + +glabel D_80AC295C + .float 0.8 + +glabel D_80AC2960 + .float 1.3 + +glabel D_80AC2964 + .float 0.1 + +glabel D_80AC2968 + .word 0x3D886595 +glabel D_80AC296C + .word 0x3E490FDB +glabel D_80AC2970 + .float 0.2 + +.text glabel func_80AC1B80 /* 01520 80AC1B80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01524 80AC1B84 AFBF0014 */ sw $ra, 0x0014($sp) @@ -248,5 +295,3 @@ glabel func_80AC1B80 /* 018BC 80AC1F1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018C0 80AC1F20 03E00008 */ jr $ra /* 018C4 80AC1F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1F28.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1F28.s index ca3d0dd681..a24a7cf323 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1F28.s @@ -46,5 +46,3 @@ glabel func_80AC1F28 /* 01968 80AC1FC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0196C 80AC1FCC 03E00008 */ jr $ra /* 01970 80AC1FD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC2350.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC2350.s index aeebdb1937..35a24d8763 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC2350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC2350.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AC2974 + .word 0x3E490FDB +glabel D_80AC2978 + .float 0.4 + +glabel D_80AC297C + .word 0x3D9D7DBF +glabel D_80AC2980 + .word 0x3EAA7EFA +glabel D_80AC2984 + .float 0.2 + +.text glabel func_80AC2350 /* 01CF0 80AC2350 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01CF4 80AC2354 AFBF0014 */ sw $ra, 0x0014($sp) @@ -173,5 +187,3 @@ glabel func_80AC2350 /* 01F6C 80AC25CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F70 80AC25D0 03E00008 */ jr $ra /* 01F74 80AC25D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC25D8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC25D8.s index 7cb4d9bd4f..0c88ecce30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC25D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC25D8.s @@ -67,5 +67,3 @@ glabel func_80AC25D8 /* 02068 80AC26C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0206C 80AC26CC 03E00008 */ jr $ra /* 02070 80AC26D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s index 28c68c06ea..e9b56c1c36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s @@ -14,5 +14,3 @@ glabel EnOssan_Destroy /* 00A98 80AC3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A9C 80AC373C 03E00008 */ jr $ra /* 00AA0 80AC3740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s index 546963989c..53b396d6ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s @@ -1,3 +1,109 @@ +.rdata +glabel D_80AC8EF0 + .asciz "コキリの店 " + .balign 4 + +glabel D_80AC8F00 + .asciz "薬屋 " + .balign 4 + +glabel D_80AC8F10 + .asciz "夜の店 " + .balign 4 + +glabel D_80AC8F20 + .asciz "路地裏の店 " + .balign 4 + +glabel D_80AC8F30 + .asciz "盾の店 " + .balign 4 + +glabel D_80AC8F40 + .asciz "大人の店 " + .balign 4 + +glabel D_80AC8F50 + .asciz "タロンの店 " + .balign 4 + +glabel D_80AC8F60 + .asciz "ゾーラの店 " + .balign 4 + +glabel D_80AC8F70 + .asciz "ゴロン夜の店" + .balign 4 + +glabel D_80AC8F80 + .asciz "インゴーの店" + .balign 4 + +glabel D_80AC8F90 + .asciz "お面屋 " + .balign 4 + +glabel D_80AC8FA0 + .asciz "\x1b[41;37m" + .balign 4 + +glabel D_80AC8FAC + .asciz "引数がおかしいよ(arg_data=%d)！！\n" + .balign 4 + +glabel D_80AC8FD0 + .asciz "\x1b[m" + .balign 4 + +glabel D_80AC8FD4 + .asciz "0" + .balign 4 + +glabel D_80AC8FD8 + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC8FE8 + .asciz "\x1b[41;37m" + .balign 4 + +glabel D_80AC8FF4 + .asciz "バンクが無いよ！！(%s)\n" + .balign 4 + +glabel D_80AC900C + .asciz "\x1b[m" + .balign 4 + +glabel D_80AC9010 + .asciz "0" + .balign 4 + +glabel D_80AC9014 + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC9024 + .asciz "" + .balign 4 + +glabel D_80AC9030 + .asciz "予備バンクが無いよ！！(%s)\n" + .balign 4 + +glabel D_80AC904C + .asciz "\x1b[m" + .balign 4 + +glabel D_80AC9050 + .asciz "0" + .balign 4 + +glabel D_80AC9054 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel EnOssan_Init /* 007D0 80AC3470 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 007D4 80AC3474 AFBF001C */ sw $ra, 0x001C($sp) @@ -197,5 +303,3 @@ glabel EnOssan_Init /* 00A60 80AC3700 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A64 80AC3704 03E00008 */ jr $ra /* 00A68 80AC3708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s index 531198c1b4..9beae1459b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s @@ -10,5 +10,3 @@ glabel EnOssan_Update /* 04848 80AC74E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0484C 80AC74EC 03E00008 */ jr $ra /* 04850 80AC74F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s index 2315d6db8a..95daf065c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s @@ -1,5 +1,3 @@ glabel func_80AC2CA0 /* 00000 80AC2CA0 03E00008 */ jr $ra /* 00004 80AC2CA4 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s index b699466a30..0b97468c97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s @@ -3,5 +3,3 @@ glabel func_80AC2CA8 /* 0000C 80AC2CAC 00042400 */ sll $a0, $a0, 16 /* 00010 80AC2CB0 03E00008 */ jr $ra /* 00014 80AC2CB4 00041403 */ sra $v0, $a0, 16 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s index 51f6823055..58a58330da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s @@ -12,5 +12,3 @@ glabel func_80AC2CB8 /* 0003C 80AC2CDC 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF /* 00040 80AC2CE0 03E00008 */ jr $ra /* 00044 80AC2CE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s index 9e1b483db7..ef11dfb516 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s @@ -12,5 +12,3 @@ glabel func_80AC2CE8 /* 0006C 80AC2D0C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF /* 00070 80AC2D10 03E00008 */ jr $ra /* 00074 80AC2D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s index cfd91bbf6a..e867153a18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s @@ -12,5 +12,3 @@ glabel func_80AC2D18 /* 0009C 80AC2D3C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF /* 000A0 80AC2D40 03E00008 */ jr $ra /* 000A4 80AC2D44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s index 6c5713852e..c3326ee6c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s @@ -12,5 +12,3 @@ glabel func_80AC2D48 /* 000CC 80AC2D6C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF /* 000D0 80AC2D70 03E00008 */ jr $ra /* 000D4 80AC2D74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s index 8f26845241..5d07a4d82e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s @@ -12,5 +12,3 @@ glabel func_80AC2D78 /* 000FC 80AC2D9C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF /* 00100 80AC2DA0 03E00008 */ jr $ra /* 00104 80AC2DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s index 2987bf80da..90ef2f8437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s @@ -12,5 +12,3 @@ glabel func_80AC2DA8 /* 0012C 80AC2DCC 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF /* 00130 80AC2DD0 03E00008 */ jr $ra /* 00134 80AC2DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s index a22e88d477..69aba60f4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s @@ -89,5 +89,3 @@ glabel func_80AC2DD8 /* 00280 80AC2F20 8FB70048 */ lw $s7, 0x0048($sp) /* 00284 80AC2F24 03E00008 */ jr $ra /* 00288 80AC2F28 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s index 7d8befbce9..cad1effe42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s @@ -95,5 +95,3 @@ glabel func_80AC2F2C /* 003EC 80AC308C 8FB70048 */ lw $s7, 0x0048($sp) /* 003F0 80AC3090 03E00008 */ jr $ra /* 003F4 80AC3094 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s index 70f244dece..426738e587 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s @@ -7,5 +7,3 @@ glabel func_80AC3098 /* 0040C 80AC30AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00410 80AC30B0 03E00008 */ jr $ra /* 00414 80AC30B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s index fe1adc2d31..e714ab1af3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s @@ -18,5 +18,3 @@ glabel func_80AC30B8 /* 00450 80AC30F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00454 80AC30F4 03E00008 */ jr $ra /* 00458 80AC30F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s index c5cfcada0b..ef45866142 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s @@ -7,5 +7,3 @@ glabel func_80AC30FC /* 00470 80AC3110 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00474 80AC3114 03E00008 */ jr $ra /* 00478 80AC3118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s index 8003a59f19..a6202101c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s @@ -7,5 +7,3 @@ glabel func_80AC311C /* 00490 80AC3130 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00494 80AC3134 03E00008 */ jr $ra /* 00498 80AC3138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s index 0e0e6bbf6c..244ab10ba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s @@ -18,5 +18,3 @@ glabel func_80AC313C /* 004D4 80AC3174 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004D8 80AC3178 03E00008 */ jr $ra /* 004DC 80AC317C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s index e22a0a9fbc..5461433cea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s @@ -7,5 +7,3 @@ glabel func_80AC3180 /* 004F4 80AC3194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004F8 80AC3198 03E00008 */ jr $ra /* 004FC 80AC319C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s index 4880dd5b9d..f6878537cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s @@ -24,5 +24,3 @@ glabel func_80AC31A0 /* 00548 80AC31E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0054C 80AC31EC 03E00008 */ jr $ra /* 00550 80AC31F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s index 3abd374137..79bcb0e9d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s @@ -58,5 +58,3 @@ glabel func_80AC31F4 /* 00618 80AC32B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0061C 80AC32BC 03E00008 */ jr $ra /* 00620 80AC32C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s index f4cd2dfa86..ce698536dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s @@ -38,5 +38,3 @@ glabel func_80AC32C4 /* 006A4 80AC3344 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006A8 80AC3348 03E00008 */ jr $ra /* 006AC 80AC334C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s index b6bfcc6d1b..82a27000f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s @@ -23,5 +23,3 @@ glabel func_80AC3350 /* 00704 80AC33A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00708 80AC33A8 03E00008 */ jr $ra /* 0070C 80AC33AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s index 9fd92bb97c..c24b542d28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s @@ -53,5 +53,3 @@ glabel func_80AC33B0 /* 007C4 80AC3464 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007C8 80AC3468 03E00008 */ jr $ra /* 007CC 80AC346C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s index afba76138b..475c02ca15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s @@ -24,5 +24,3 @@ glabel func_80AC3744 /* 00AFC 80AC379C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B00 80AC37A0 03E00008 */ jr $ra /* 00B04 80AC37A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s index 02ef814696..21b4e56f1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC9064 + .asciz "\x1b[33m%s[%d]:★★★ 会話終了！！ ★★★\x1b[m\n" + .balign 4 + +glabel D_80AC9090 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC37A8 /* 00B08 80AC37A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00B0C 80AC37AC AFBF001C */ sw $ra, 0x001C($sp) @@ -55,5 +65,3 @@ glabel func_80AC37A8 /* 00BD8 80AC3878 8FB00014 */ lw $s0, 0x0014($sp) /* 00BDC 80AC387C 03E00008 */ jr $ra /* 00BE0 80AC3880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s index c88624e2e6..08db724771 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s @@ -17,5 +17,3 @@ glabel func_80AC3884 /* 00C1C 80AC38BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C20 80AC38C0 03E00008 */ jr $ra /* 00C24 80AC38C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s index 6a8e210fd6..e7226b8bc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s @@ -24,5 +24,3 @@ glabel func_80AC38C8 /* 00C7C 80AC391C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C80 80AC3920 03E00008 */ jr $ra /* 00C84 80AC3924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s index 2d23bbc348..3bc17516e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s @@ -34,5 +34,3 @@ glabel func_80AC3928 /* 00D00 80AC39A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D04 80AC39A4 03E00008 */ jr $ra /* 00D08 80AC39A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s index 2b785e9b90..7b4718de94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s @@ -56,5 +56,3 @@ glabel func_80AC39AC /* 00DD4 80AC3A74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DD8 80AC3A78 03E00008 */ jr $ra /* 00DDC 80AC3A7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s index 9de4557edb..1cf1304eea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s @@ -23,5 +23,3 @@ glabel func_80AC3A80 /* 00E34 80AC3AD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E38 80AC3AD8 03E00008 */ jr $ra /* 00E3C 80AC3ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s index 0033c40a21..fb5cd1b7fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s @@ -13,5 +13,3 @@ glabel func_80AC3AE0 /* 00E6C 80AC3B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E70 80AC3B10 03E00008 */ jr $ra /* 00E74 80AC3B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s index 87a2aa4232..7ce8a8781d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AC90A0 + .asciz "\x1b[33m★★★ 会話開始！！ ★★★\x1b[m\n" + .balign 4 + +.text glabel func_80AC3B18 /* 00E78 80AC3B18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00E7C 80AC3B1C AFBF0014 */ sw $ra, 0x0014($sp) @@ -47,5 +53,3 @@ glabel func_80AC3B18 /* 00F20 80AC3BC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F24 80AC3BC4 03E00008 */ jr $ra /* 00F28 80AC3BC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s index 7c6f548c3b..44ac3e30a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s @@ -95,5 +95,3 @@ glabel func_80AC3BCC .L80AC3D10: /* 01070 80AC3D10 03E00008 */ jr $ra /* 01074 80AC3D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s index 2ed6e239c0..7b99f51d58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s @@ -94,5 +94,3 @@ glabel func_80AC3D18 .L80AC3E48: /* 011A8 80AC3E48 03E00008 */ jr $ra /* 011AC 80AC3E4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s index a048063418..d4f504aca1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s @@ -37,5 +37,3 @@ glabel func_80AC3E50 /* 0122C 80AC3ECC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 01230 80AC3ED0 03E00008 */ jr $ra /* 01234 80AC3ED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s index b359352928..19fb19e707 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s @@ -27,5 +27,3 @@ glabel func_80AC3ED8 /* 0128C 80AC3F2C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 01290 80AC3F30 03E00008 */ jr $ra /* 01294 80AC3F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s index 2613072fe5..60feb9f74e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s @@ -85,5 +85,3 @@ glabel func_80AC3F38 /* 013C8 80AC4068 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013CC 80AC406C 03E00008 */ jr $ra /* 013D0 80AC4070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s index 812a6f3ac7..0dbdcd4aca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s @@ -1,3 +1,19 @@ +.rdata +glabel D_80AC90C4 + .asciz "「スティック左右で品物みてくれ！」\n" + .balign 4 + +.late_rodata +glabel jtbl_80AC94FC +.word L80AC4198 +.word L80AC4198 +.word L80AC4198 +.word L80AC4198 +.word L80AC4184 +.word L80AC41AC +.word L80AC4168 + +.text glabel func_80AC4074 /* 013D4 80AC4074 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 013D8 80AC4078 AFBF001C */ sw $ra, 0x001C($sp) @@ -117,5 +133,3 @@ glabel L80AC41AC /* 01574 80AC4214 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01578 80AC4218 03E00008 */ jr $ra /* 0157C 80AC421C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s index ee29fa2581..e8641e98c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s @@ -28,5 +28,3 @@ glabel func_80AC4220 /* 015DC 80AC427C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015E0 80AC4280 03E00008 */ jr $ra /* 015E4 80AC4284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s index dd570b36e7..0408c62baa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s @@ -74,5 +74,3 @@ glabel func_80AC4288 /* 016F4 80AC4394 8FB10018 */ lw $s1, 0x0018($sp) /* 016F8 80AC4398 03E00008 */ jr $ra /* 016FC 80AC439C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s index e3f8b851f2..884607c9ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s @@ -21,5 +21,3 @@ glabel func_80AC43A0 /* 01744 80AC43E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01748 80AC43E8 03E00008 */ jr $ra /* 0174C 80AC43EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s index d4e66fcf54..53c1bd28be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s @@ -62,5 +62,3 @@ glabel func_80AC43F0 /* 01830 80AC44D0 8FB10018 */ lw $s1, 0x0018($sp) /* 01834 80AC44D4 03E00008 */ jr $ra /* 01838 80AC44D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s index e2db312ab0..1519494d05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s @@ -62,5 +62,3 @@ glabel func_80AC44DC /* 0191C 80AC45BC 8FB10018 */ lw $s1, 0x0018($sp) /* 01920 80AC45C0 03E00008 */ jr $ra /* 01924 80AC45C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s index 06193214db..a7ba62b38e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s @@ -158,5 +158,3 @@ glabel func_80AC45C8 .L80AC47D4: /* 01B34 80AC47D4 03E00008 */ jr $ra /* 01B38 80AC47D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s index 47ac5d668e..434b18c1c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s @@ -1,3 +1,53 @@ +.late_rodata +.late_rodata_alignment 8 +glabel jtbl_80AC9518 +.word L80AC4918 +.word L80AC4934 +.word L80AC4934 +.word L80AC4918 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC48C4 +.word L80AC48E0 +.word L80AC48FC +.word L80AC48FC +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC48A8 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4934 +.word L80AC4918 +.word L80AC4918 +.word L80AC4918 + +.text glabel func_80AC47DC /* 01B3C 80AC47DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01B40 80AC47E0 AFBF001C */ sw $ra, 0x001C($sp) @@ -112,5 +162,3 @@ glabel L80AC4934 /* 01CCC 80AC496C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01CD0 80AC4970 03E00008 */ jr $ra /* 01CD4 80AC4974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s index 4e995094a7..385b24d311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC90E8 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9108 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC4978 /* 01CD8 80AC4978 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01CDC 80AC497C AFBF001C */ sw $ra, 0x001C($sp) @@ -127,5 +137,3 @@ glabel func_80AC4978 /* 01EA0 80AC4B40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01EA4 80AC4B44 03E00008 */ jr $ra /* 01EA8 80AC4B48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s index 6950390005..d77b381336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC9118 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9138 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC4B4C /* 01EAC 80AC4B4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01EB0 80AC4B50 AFBF001C */ sw $ra, 0x001C($sp) @@ -127,5 +137,3 @@ glabel func_80AC4B4C /* 02074 80AC4D14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02078 80AC4D18 03E00008 */ jr $ra /* 0207C 80AC4D1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s index 8e00393b7c..5d9810027c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s @@ -49,5 +49,3 @@ glabel func_80AC4D20 /* 02130 80AC4DD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02134 80AC4DD4 03E00008 */ jr $ra /* 02138 80AC4DD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s index b365a1c297..72f3136d93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC9148 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9168 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC4DDC /* 0213C 80AC4DDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02140 80AC4DE0 AFBF001C */ sw $ra, 0x001C($sp) @@ -63,5 +73,3 @@ glabel func_80AC4DDC /* 0221C 80AC4EBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02220 80AC4EC0 03E00008 */ jr $ra /* 02224 80AC4EC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s index fedcfcd3c0..a1586a6b6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC9178 + .asciz "\n\x1b[33m初めて手にいれた！！\x1b[m\n\n" + .balign 4 + +glabel D_80AC9198 + .asciz "\x1b[33m持ち上げ開始！！\x1b[m\n\n" + .balign 4 + +.text glabel func_80AC4EC8 /* 02228 80AC4EC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0222C 80AC4ECC AFBF0024 */ sw $ra, 0x0024($sp) @@ -58,5 +68,3 @@ glabel func_80AC4EC8 /* 02300 80AC4FA0 8FB10020 */ lw $s1, 0x0020($sp) /* 02304 80AC4FA4 03E00008 */ jr $ra /* 02308 80AC4FA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s index d97dcb332c..618a7f53da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s @@ -12,5 +12,3 @@ glabel func_80AC4FAC /* 02334 80AC4FD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02338 80AC4FD8 03E00008 */ jr $ra /* 0233C 80AC4FDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s index 2c09ef9261..018e11fd3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s @@ -12,5 +12,3 @@ glabel func_80AC4FE0 /* 02368 80AC5008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0236C 80AC500C 03E00008 */ jr $ra /* 02370 80AC5010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s index 4febf10088..78fbf42a9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_80AC95CC +.word L80AC5070 +.word L80AC50DC +.word L80AC512C +.word L80AC514C +.word L80AC516C +.word L80AC518C + +.text glabel func_80AC5014 /* 02374 80AC5014 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02378 80AC5018 AFBF001C */ sw $ra, 0x001C($sp) @@ -114,5 +124,3 @@ glabel L80AC518C /* 0250C 80AC51AC 8FB10018 */ lw $s1, 0x0018($sp) /* 02510 80AC51B0 03E00008 */ jr $ra /* 02514 80AC51B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s index c25c8a568d..62a05a61ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s @@ -71,5 +71,3 @@ glabel func_80AC51B8 /* 02614 80AC52B4 8FB20020 */ lw $s2, 0x0020($sp) /* 02618 80AC52B8 03E00008 */ jr $ra /* 0261C 80AC52BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s index 9d6c6ded9c..57b546df88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s @@ -81,5 +81,3 @@ glabel func_80AC52C0 /* 02748 80AC53E8 8FB20020 */ lw $s2, 0x0020($sp) /* 0274C 80AC53EC 03E00008 */ jr $ra /* 02750 80AC53F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s index 3bf66bb3b1..0528a2c996 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s @@ -67,5 +67,3 @@ glabel func_80AC53F4 /* 02848 80AC54E8 8FB20020 */ lw $s2, 0x0020($sp) /* 0284C 80AC54EC 03E00008 */ jr $ra /* 02850 80AC54F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s index aad229bdfd..33cdec4fe8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s @@ -46,5 +46,3 @@ glabel func_80AC54F4 /* 028E8 80AC5588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028EC 80AC558C 03E00008 */ jr $ra /* 028F0 80AC5590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s index d98ab51013..c55a7379b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC91B4 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC91D4 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC5594 /* 028F4 80AC5594 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 028F8 80AC5598 AFBF001C */ sw $ra, 0x001C($sp) @@ -64,5 +74,3 @@ glabel func_80AC5594 /* 029D4 80AC5674 8FB10018 */ lw $s1, 0x0018($sp) /* 029D8 80AC5678 03E00008 */ jr $ra /* 029DC 80AC567C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s index 97da704306..95fd9fe136 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC91E4 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9204 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC5680 /* 029E0 80AC5680 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 029E4 80AC5684 AFBF001C */ sw $ra, 0x001C($sp) @@ -64,5 +74,3 @@ glabel func_80AC5680 /* 02AC0 80AC5760 8FB10018 */ lw $s1, 0x0018($sp) /* 02AC4 80AC5764 03E00008 */ jr $ra /* 02AC8 80AC5768 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s index 4ed83d0d87..377774e6b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC9214 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9234 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC576C /* 02ACC 80AC576C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02AD0 80AC5770 AFBF001C */ sw $ra, 0x001C($sp) @@ -64,5 +74,3 @@ glabel func_80AC576C /* 02BAC 80AC584C 8FB10018 */ lw $s1, 0x0018($sp) /* 02BB0 80AC5850 03E00008 */ jr $ra /* 02BB4 80AC5854 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s index 368c402986..9b7908c167 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC9244 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9264 + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC5858 /* 02BB8 80AC5858 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02BBC 80AC585C AFBF0014 */ sw $ra, 0x0014($sp) @@ -45,5 +55,3 @@ glabel func_80AC5858 /* 02C54 80AC58F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C58 80AC58F8 03E00008 */ jr $ra /* 02C5C 80AC58FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s index 220f9ae74a..f5b21db172 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AC9274 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC9294 + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC92A4 + .asciz "店主の依頼 ( %d )\n" + .balign 4 + +.text glabel func_80AC5900 /* 02C60 80AC5900 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02C64 80AC5904 AFBF001C */ sw $ra, 0x001C($sp) @@ -81,5 +95,3 @@ glabel func_80AC5900 /* 02D7C 80AC5A1C 8FB10018 */ lw $s1, 0x0018($sp) /* 02D80 80AC5A20 03E00008 */ jr $ra /* 02D84 80AC5A24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s index b178cf8fd5..8df9911125 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80AC92B8 + .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" + .balign 4 + +glabel D_80AC92D8 + .asciz "../z_en_oB1.c" + .balign 4 + +.late_rodata +glabel jtbl_80AC95E4 +.word L80AC5B5C +.word L80AC5B74 +.word L80AC5B8C +.word L80AC5BA4 +.word L80AC5BB8 +.word L80AC5BB8 +.word L80AC5BB8 +.word L80AC5BB8 + +.text glabel func_80AC5A28 /* 02D88 80AC5A28 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02D8C 80AC5A2C AFB00014 */ sw $s0, 0x0014($sp) @@ -139,5 +160,3 @@ glabel L80AC5BB8 /* 02F78 80AC5C18 8FB10018 */ lw $s1, 0x0018($sp) /* 02F7C 80AC5C1C 03E00008 */ jr $ra /* 02F80 80AC5C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s index db395307bc..77af0761a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s @@ -30,5 +30,3 @@ glabel func_80AC5C24 /* 02FF0 80AC5C90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02FF4 80AC5C94 03E00008 */ jr $ra /* 02FF8 80AC5C98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s index ce0c489e08..e58f9704e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s @@ -41,5 +41,3 @@ glabel func_80AC5C9C /* 03094 80AC5D34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03098 80AC5D38 03E00008 */ jr $ra /* 0309C 80AC5D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s index 7639801d75..65a3578eec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s @@ -28,5 +28,3 @@ glabel func_80AC5D40 /* 03100 80AC5DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03104 80AC5DA4 03E00008 */ jr $ra /* 03108 80AC5DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s index daf0231008..7b0e14da8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s @@ -84,5 +84,3 @@ glabel func_80AC5DAC /* 03244 80AC5EE4 8FB10018 */ lw $s1, 0x0018($sp) /* 03248 80AC5EE8 03E00008 */ jr $ra /* 0324C 80AC5EEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s index d3c5bce64c..71f221418d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC92E8 + .asciz "\x1b[33m★★★ 続けるよ！！ ★★★\x1b[m\n" + .balign 4 + +glabel D_80AC930C + .asciz "\x1b[33m★★★ やめるよ！！ ★★★\x1b[m\n" + .balign 4 + +.text glabel func_80AC5EF0 /* 03250 80AC5EF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 03254 80AC5EF4 AFB10018 */ sw $s1, 0x0018($sp) @@ -131,5 +141,3 @@ glabel func_80AC5EF0 /* 03438 80AC60D8 8FB10018 */ lw $s1, 0x0018($sp) /* 0343C 80AC60DC 03E00008 */ jr $ra /* 03440 80AC60E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s index b8175abe02..6143d7b91c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s @@ -26,5 +26,3 @@ glabel func_80AC60E4 /* 0349C 80AC613C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 034A0 80AC6140 03E00008 */ jr $ra /* 034A4 80AC6144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s index f3ccb190c7..3e517d4a18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s @@ -29,5 +29,3 @@ glabel func_80AC6148 /* 0350C 80AC61AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03510 80AC61B0 03E00008 */ jr $ra /* 03514 80AC61B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s index f8688e9ffa..0f6a38eeec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s @@ -21,5 +21,3 @@ glabel func_80AC61B8 /* 0355C 80AC61FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03560 80AC6200 03E00008 */ jr $ra /* 03564 80AC6204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s index a15aa30ace..525890d499 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s @@ -21,5 +21,3 @@ glabel func_80AC6208 /* 035AC 80AC624C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 035B0 80AC6250 03E00008 */ jr $ra /* 035B4 80AC6254 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s index 6ac826c94a..2b47148e8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s @@ -28,5 +28,3 @@ glabel func_80AC6258 /* 03618 80AC62B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0361C 80AC62BC 03E00008 */ jr $ra /* 03620 80AC62C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s index ed26f2f2bf..78ff5b3d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s @@ -11,5 +11,3 @@ glabel func_80AC62C4 /* 03648 80AC62E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0364C 80AC62EC 03E00008 */ jr $ra /* 03650 80AC62F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s index 3569b41f8d..80a01aab21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s @@ -36,5 +36,3 @@ glabel func_80AC62F4 /* 036D8 80AC6378 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 036DC 80AC637C 03E00008 */ jr $ra /* 036E0 80AC6380 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s index 083a9a87d3..377d9b53ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s @@ -57,5 +57,3 @@ glabel func_80AC6384 /* 037C0 80AC6460 46124100 */ add.s $f4, $f8, $f18 /* 037C4 80AC6464 03E00008 */ jr $ra /* 037C8 80AC6468 E4A4002C */ swc1 $f4, 0x002C($a1) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s index c4a7410528..b35e416886 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s @@ -8,5 +8,3 @@ glabel func_80AC646C /* 037E4 80AC6484 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 037E8 80AC6488 03E00008 */ jr $ra /* 037EC 80AC648C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s index 3cd9ae9ba5..aa9184b8cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC9604 + .float 0.85 + +.text glabel func_80AC6490 /* 037F0 80AC6490 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 037F4 80AC6494 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -41,5 +46,3 @@ glabel func_80AC6490 /* 03880 80AC6520 8FB00018 */ lw $s0, 0x0018($sp) /* 03884 80AC6524 03E00008 */ jr $ra /* 03888 80AC6528 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s index 25bbe8ed99..ce40b7a075 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AC9608 + .float 0.15 + +.text glabel func_80AC652C /* 0388C 80AC652C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 03890 80AC6530 AFB00018 */ sw $s0, 0x0018($sp) @@ -37,5 +42,3 @@ glabel func_80AC652C /* 0390C 80AC65AC 8FB00018 */ lw $s0, 0x0018($sp) /* 03910 80AC65B0 03E00008 */ jr $ra /* 03914 80AC65B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s index db156ebecb..beb7004af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s @@ -85,5 +85,3 @@ glabel func_80AC65B8 /* 03A48 80AC66E8 8FB00004 */ lw $s0, 0x0004($sp) /* 03A4C 80AC66EC 03E00008 */ jr $ra /* 03A50 80AC66F0 27BD0008 */ addiu $sp, $sp, 0x0008 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s index 795224876a..6383c85a2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AC960C + .float 0.05 + +glabel D_80AC9610 + .float 0.05 + +.text glabel func_80AC66F4 /* 03A54 80AC66F4 908E0250 */ lbu $t6, 0x0250($a0) ## 00000250 /* 03A58 80AC66F8 C480024C */ lwc1 $f0, 0x024C($a0) ## 0000024C @@ -54,5 +62,3 @@ glabel func_80AC66F4 /* 03B18 80AC67B8 AC8F0244 */ sw $t7, 0x0244($a0) ## 00000244 /* 03B1C 80AC67BC 03E00008 */ jr $ra /* 03B20 80AC67C0 AC990248 */ sw $t9, 0x0248($a0) ## 00000248 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s index 7aa4df175c..23468fd8c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AC9614 + .float 0.05 + +glabel D_80AC9618 + .float 0.05 + +glabel D_80AC961C + .float 0.1 + +.text glabel func_80AC67C4 /* 03B24 80AC67C4 908E02CC */ lbu $t6, 0x02CC($a0) ## 000002CC /* 03B28 80AC67C8 C48202C4 */ lwc1 $f2, 0x02C4($a0) ## 000002C4 @@ -112,5 +123,3 @@ glabel func_80AC67C4 /* 03CC4 80AC6964 E48E0268 */ swc1 $f14, 0x0268($a0) ## 00000268 /* 03CC8 80AC6968 03E00008 */ jr $ra /* 03CCC 80AC696C E486027C */ swc1 $f6, 0x027C($a0) ## 0000027C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s index 774cfc9fae..502c4c667e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s @@ -14,5 +14,3 @@ glabel func_80AC6970 .L80AC699C: /* 03CFC 80AC699C 03E00008 */ jr $ra /* 03D00 80AC69A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s index 6022f05425..aa8111fb49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s @@ -43,5 +43,3 @@ glabel func_80AC69A4 /* 03D98 80AC6A38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03D9C 80AC6A3C 03E00008 */ jr $ra /* 03DA0 80AC6A40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s index c7e9a677c7..538e7f5ea1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s @@ -44,5 +44,3 @@ glabel func_80AC6A44 /* 03E30 80AC6AD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03E34 80AC6AD4 03E00008 */ jr $ra /* 03E38 80AC6AD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s index 831c206390..3cf362f9d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s @@ -23,5 +23,3 @@ glabel func_80AC6ADC /* 03E90 80AC6B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03E94 80AC6B34 03E00008 */ jr $ra /* 03E98 80AC6B38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s index 6a1efc5ee5..60d77647ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s @@ -72,5 +72,3 @@ glabel func_80AC6B3C /* 03FA8 80AC6C48 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 03FAC 80AC6C4C 03E00008 */ jr $ra /* 03FB0 80AC6C50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s index 75a941b279..7218c81fd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s @@ -56,5 +56,3 @@ glabel func_80AC6C54 /* 04084 80AC6D24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04088 80AC6D28 03E00008 */ jr $ra /* 0408C 80AC6D2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s index 63d8bef75e..84cf39f01a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s @@ -56,5 +56,3 @@ glabel func_80AC6D30 /* 04160 80AC6E00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04164 80AC6E04 03E00008 */ jr $ra /* 04168 80AC6E08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s index 3f0a50c1da..6bdecb6ddb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s @@ -23,5 +23,3 @@ glabel func_80AC6E0C /* 041C0 80AC6E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 041C4 80AC6E64 03E00008 */ jr $ra /* 041C8 80AC6E68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s index 8dae64f0e7..aaadb2a9b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s @@ -23,5 +23,3 @@ glabel func_80AC6E6C /* 04220 80AC6EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04224 80AC6EC4 03E00008 */ jr $ra /* 04228 80AC6EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s index 036ba230d8..64cc6f6d5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s @@ -23,5 +23,3 @@ glabel func_80AC6ECC /* 04280 80AC6F20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04284 80AC6F24 03E00008 */ jr $ra /* 04288 80AC6F28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s index c329cebcc4..acc9ae7c57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s @@ -103,5 +103,3 @@ glabel func_80AC6F2C .L80AC708C: /* 043EC 80AC708C 03E00008 */ jr $ra /* 043F0 80AC7090 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s index af5bc68791..7ccf69c432 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80AC9330 + .asciz "\x1b[41;37m" + .balign 4 + +glabel D_80AC933C + .asciz "★★★ 警告！！ 棚がないよ！！ ★★★\n" + .balign 4 + +glabel D_80AC9364 + .asciz "\x1b[m" + .balign 4 + +glabel D_80AC9368 + .asciz "\x1b[33m◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇\x1b[m\n" + .balign 4 + +.text glabel func_80AC7094 /* 043F4 80AC7094 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 043F8 80AC7098 AFBF001C */ sw $ra, 0x001C($sp) @@ -197,5 +215,3 @@ glabel func_80AC7094 /* 046D4 80AC7374 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 046D8 80AC7378 03E00008 */ jr $ra /* 046DC 80AC737C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s index d6c64ae2f1..c8d92527ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s @@ -12,5 +12,3 @@ glabel func_80AC7380 /* 04708 80AC73A8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 0470C 80AC73AC 03E00008 */ jr $ra /* 04710 80AC73B0 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s index 8a100662c7..06a7567e2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s @@ -75,5 +75,3 @@ glabel func_80AC73B4 /* 0481C 80AC74BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04820 80AC74C0 03E00008 */ jr $ra /* 04824 80AC74C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s index 7e71f5aa30..96b4c4ebfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s @@ -13,5 +13,3 @@ glabel func_80AC74F4 .L80AC7520: /* 04880 80AC7520 03E00008 */ jr $ra /* 04884 80AC7524 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s index f78c8f1c08..3c3e7a6b4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC939C + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC93AC + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC7528 /* 04888 80AC7528 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0488C 80AC752C AFBF0014 */ sw $ra, 0x0014($sp) @@ -169,5 +179,3 @@ glabel func_80AC7528 /* 04B20 80AC77C0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 04B24 80AC77C4 03E00008 */ jr $ra /* 04B28 80AC77C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s index bbdf219027..81737d6ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC93BC + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC93CC + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC77CC /* 04B2C 80AC77CC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 04B30 80AC77D0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -126,5 +136,3 @@ glabel func_80AC77CC /* 04D1C 80AC79BC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 04D20 80AC79C0 03E00008 */ jr $ra /* 04D24 80AC79C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s index 610adbf680..8d3dc2fa1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC93DC + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC93EC + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC79C8 /* 04D28 80AC79C8 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 04D2C 80AC79CC AFBF003C */ sw $ra, 0x003C($sp) @@ -253,5 +263,3 @@ glabel func_80AC79C8 /* 05100 80AC7DA0 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 05104 80AC7DA4 03E00008 */ jr $ra /* 05108 80AC7DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s index 755834e3b0..ebc4b3fac8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC93FC + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC940C + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC7DAC /* 0510C 80AC7DAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 05110 80AC7DB0 AFB10028 */ sw $s1, 0x0028($sp) @@ -72,5 +82,3 @@ glabel func_80AC7DAC /* 05224 80AC7EC4 8FB10028 */ lw $s1, 0x0028($sp) /* 05228 80AC7EC8 03E00008 */ jr $ra /* 0522C 80AC7ECC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s index f4e6f736c3..14238742c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC941C + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC942C + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC7ED0 /* 05230 80AC7ED0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 05234 80AC7ED4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -83,5 +93,3 @@ glabel func_80AC7ED0 /* 05370 80AC8010 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 05374 80AC8014 03E00008 */ jr $ra /* 05378 80AC8018 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s index 8808d81468..b6ecb8577e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s @@ -11,5 +11,3 @@ glabel func_80AC801C /* 0539C 80AC803C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 053A0 80AC8040 03E00008 */ jr $ra /* 053A4 80AC8044 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s index 3eef2a623c..b143211272 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s @@ -27,5 +27,3 @@ glabel func_80AC8048 /* 05408 80AC80A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0540C 80AC80AC 03E00008 */ jr $ra /* 05410 80AC80B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s index 2588c7ed42..eef7860569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC943C + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC944C + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC80B4 /* 05414 80AC80B4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 05418 80AC80B8 AFB20030 */ sw $s2, 0x0030($sp) @@ -99,5 +109,3 @@ glabel func_80AC80B4 /* 05598 80AC8238 8FB20030 */ lw $s2, 0x0030($sp) /* 0559C 80AC823C 03E00008 */ jr $ra /* 055A0 80AC8240 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s index 164411af86..66b95b21e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC945C + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC946C + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC8244 /* 055A4 80AC8244 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 055A8 80AC8248 AFB10028 */ sw $s1, 0x0028($sp) @@ -88,5 +98,3 @@ glabel func_80AC8244 /* 056FC 80AC839C 8FB10028 */ lw $s1, 0x0028($sp) /* 05700 80AC83A0 03E00008 */ jr $ra /* 05704 80AC83A4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s index 0099956959..6f6f2a696c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s @@ -13,5 +13,3 @@ glabel func_80AC83A8 .L80AC83D4: /* 05734 80AC83D4 03E00008 */ jr $ra /* 05738 80AC83D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s index 6fdd6de1bf..60cd81bbf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC947C + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC948C + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC83DC /* 0573C 80AC83DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 05740 80AC83E0 AFB20030 */ sw $s2, 0x0030($sp) @@ -91,5 +101,3 @@ glabel func_80AC83DC /* 058A0 80AC8540 8FB20030 */ lw $s2, 0x0030($sp) /* 058A4 80AC8544 03E00008 */ jr $ra /* 058A8 80AC8548 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s index 83ea783afe..aee3f552e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC949C + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC94AC + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC854C /* 058AC 80AC854C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 058B0 80AC8550 AFB10028 */ sw $s1, 0x0028($sp) @@ -70,5 +80,3 @@ glabel func_80AC854C /* 059BC 80AC865C 8FB10028 */ lw $s1, 0x0028($sp) /* 059C0 80AC8660 03E00008 */ jr $ra /* 059C4 80AC8664 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s index c5aa374171..d807455e07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC94BC + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC94CC + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC8668 /* 059C8 80AC8668 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 059CC 80AC866C AFB10028 */ sw $s1, 0x0028($sp) @@ -70,5 +80,3 @@ glabel func_80AC8668 /* 05AD8 80AC8778 8FB10028 */ lw $s1, 0x0028($sp) /* 05ADC 80AC877C 03E00008 */ jr $ra /* 05AE0 80AC8780 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s index e5d6ba595a..1a37153b61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AC94DC + .asciz "../z_en_oB1.c" + .balign 4 + +glabel D_80AC94EC + .asciz "../z_en_oB1.c" + .balign 4 + +.text glabel func_80AC8784 /* 05AE4 80AC8784 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 05AE8 80AC8788 AFB10028 */ sw $s1, 0x0028($sp) @@ -70,4 +80,3 @@ glabel func_80AC8784 /* 05BF4 80AC8894 8FB10028 */ lw $s1, 0x0028($sp) /* 05BF8 80AC8898 03E00008 */ jr $ra /* 05BFC 80AC889C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s index f2ceec3fc5..bdca494a61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s @@ -10,5 +10,3 @@ glabel EnOwl_Destroy /* 0048C 80ACA3AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00490 80ACA3B0 03E00008 */ jr $ra /* 00494 80ACA3B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s index 200f269a01..2d2d7e5a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80ACD7DC + .asciz "../z_en_owl.c" + .balign 4 + +glabel D_80ACD7EC + .asciz "../z_en_owl.c" + .balign 4 + +.text glabel EnOwl_Draw /* 03098 80ACCFB8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0309C 80ACCFBC AFBF0024 */ sw $ra, 0x0024($sp) @@ -63,5 +73,3 @@ glabel EnOwl_Draw /* 0318C 80ACD0AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 03190 80ACD0B0 03E00008 */ jr $ra /* 03194 80ACD0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s index 2c55735c7b..6c29726fac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s @@ -1,3 +1,65 @@ +.rdata +glabel D_80ACD650 + .asciz " 会話フクロウ %4x no = %d, sv = %d\n" + .balign 4 + +glabel D_80ACD67C + .asciz "savebitでフクロウ退避\n" + .balign 4 + +glabel D_80ACD694 + .asciz "フクロウ退避\n" + .balign 4 + +glabel D_80ACD6A4 + .asciz "フクロウ退避\n" + .balign 4 + +glabel D_80ACD6B4 + .asciz "フクロウ退避\n" + .balign 4 + +glabel D_80ACD6C4 + .asciz "フクロウ退避\n" + .balign 4 + +glabel D_80ACD6D4 + .asciz "フクロウ退避\n" + .balign 4 + +glabel D_80ACD6E4 + .asciz "\x1b[36m" + .balign 4 + +glabel D_80ACD6EC + .asciz "no = %d \n" + .balign 4 + +glabel D_80ACD6F8 + .asciz "未完成のフクロウ未完成のフクロウ未完成のフクロウ\n" + .balign 4 + +glabel D_80ACD72C + .asciz "\x1b[m" + .balign 4 + +.late_rodata +glabel jtbl_80ACD7FC +.word L80ACA110 +.word L80ACA12C +.word L80ACA13C +.word L80ACA160 +.word L80ACA1A0 +.word L80ACA1E0 +.word L80ACA1F0 +.word L80ACA244 +.word L80ACA264 +.word L80ACA274 +.word L80ACA284 +.word L80ACA294 +.word L80ACA2DC + +.text glabel EnOwl_Init /* 00000 80AC9F20 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00004 80AC9F24 AFA50054 */ sw $a1, 0x0054($sp) @@ -331,5 +393,3 @@ glabel L80ACA2DC /* 00464 80ACA384 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00468 80ACA388 03E00008 */ jr $ra /* 0046C 80ACA38C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s index 719b859314..5f4b332658 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s @@ -1,3 +1,22 @@ +.rdata +glabel D_80ACD7AC + .asciz "フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel D_80ACD854 + .float 0.3 + +glabel D_80ACD858 + .float 5000.0 + +glabel D_80ACD85C + .float 5000.0 + +glabel D_80ACD860 + .float 5000.0 + +.text glabel EnOwl_Update /* 02780 80ACC6A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02784 80ACC6A4 AFB00020 */ sw $s0, 0x0020($sp) @@ -535,5 +554,3 @@ glabel EnOwl_Update /* 02ED4 80ACCDF4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02ED8 80ACCDF8 03E00008 */ jr $ra /* 02EDC 80ACCDFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s index 8e6cffa5ec..7402050a0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s @@ -15,5 +15,3 @@ glabel func_80ACA3B8 /* 004C8 80ACA3E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004CC 80ACA3EC 03E00008 */ jr $ra /* 004D0 80ACA3F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s index af672db061..b13aa2fa40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s @@ -98,5 +98,3 @@ glabel func_80ACA3F4 /* 0062C 80ACA54C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00630 80ACA550 03E00008 */ jr $ra /* 00634 80ACA554 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s index f2c05c71d4..43fedf9df4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s @@ -29,5 +29,3 @@ glabel func_80ACA558 /* 0069C 80ACA5BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006A0 80ACA5C0 03E00008 */ jr $ra /* 006A4 80ACA5C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s index 73cfe80f0a..b09751954c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s @@ -25,5 +25,3 @@ glabel func_80ACA5C8 /* 00700 80ACA620 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00704 80ACA624 03E00008 */ jr $ra /* 00708 80ACA628 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s index 8cb50ff315..59eca1d126 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80ACD730 + .asciz "\x1B[36m Actor_Environment_sw = %d\n\x1B[m" + .balign 4 + +.text glabel func_80ACA62C /* 0070C 80ACA62C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00710 80ACA630 AFBF0014 */ sw $ra, 0x0014($sp) @@ -28,5 +34,3 @@ glabel func_80ACA62C /* 00764 80ACA684 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00768 80ACA688 03E00008 */ jr $ra /* 0076C 80ACA68C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s index 1cd0fd45bb..b44dc9f1c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s @@ -12,5 +12,3 @@ glabel func_80ACA690 /* 00794 80ACA6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00798 80ACA6B8 03E00008 */ jr $ra /* 0079C 80ACA6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s index 506c59a6a7..722b839493 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s @@ -25,5 +25,3 @@ glabel func_80ACA6C0 /* 007F0 80ACA710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F4 80ACA714 03E00008 */ jr $ra /* 007F8 80ACA718 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s index 8a017ea1ad..22b6f3c98e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s @@ -19,5 +19,3 @@ glabel func_80ACA71C /* 00840 80ACA760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00844 80ACA764 03E00008 */ jr $ra /* 00848 80ACA768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s index f666e38ad3..51462ee370 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s @@ -30,5 +30,3 @@ glabel func_80ACA76C /* 008B4 80ACA7D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008B8 80ACA7D8 03E00008 */ jr $ra /* 008BC 80ACA7DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s index 019894dc96..f60e153e24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s @@ -46,5 +46,3 @@ glabel func_80ACA7E0 /* 00960 80ACA880 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00964 80ACA884 03E00008 */ jr $ra /* 00968 80ACA888 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s index 21e1efcfa3..4635d5f746 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s @@ -42,5 +42,3 @@ glabel func_80ACA88C /* 009FC 80ACA91C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A00 80ACA920 03E00008 */ jr $ra /* 00A04 80ACA924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s index 26747b3d1a..a2c39ddfd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s @@ -28,5 +28,3 @@ glabel func_80ACA928 /* 00A6C 80ACA98C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A70 80ACA990 03E00008 */ jr $ra /* 00A74 80ACA994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s index a6e995ccf6..b753c467d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s @@ -51,5 +51,3 @@ glabel func_80ACA998 /* 00B28 80ACAA48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B2C 80ACAA4C 03E00008 */ jr $ra /* 00B30 80ACAA50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s index 6dc3a92192..a13ad79c4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s @@ -28,5 +28,3 @@ glabel func_80ACAA54 /* 00B94 80ACAAB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B98 80ACAAB8 03E00008 */ jr $ra /* 00B9C 80ACAABC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s index 5c0d6410d3..79802af1c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s @@ -28,5 +28,3 @@ glabel func_80ACAAC0 /* 00C00 80ACAB20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C04 80ACAB24 03E00008 */ jr $ra /* 00C08 80ACAB28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s index 4aead0c3ca..ae392ab0a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s @@ -23,5 +23,3 @@ glabel func_80ACAB2C /* 00C5C 80ACAB7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C60 80ACAB80 03E00008 */ jr $ra /* 00C64 80ACAB84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s index 81d8958194..3513f388e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s @@ -63,5 +63,3 @@ glabel func_80ACAB88 /* 00D40 80ACAC60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D44 80ACAC64 03E00008 */ jr $ra /* 00D48 80ACAC68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s index 29339a281c..2774b0d638 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s @@ -28,5 +28,3 @@ glabel func_80ACAC6C /* 00DAC 80ACACCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DB0 80ACACD0 03E00008 */ jr $ra /* 00DB4 80ACACD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s index 3203c4c284..b6ca7fbd09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s @@ -23,5 +23,3 @@ glabel func_80ACACD8 /* 00E08 80ACAD28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E0C 80ACAD2C 03E00008 */ jr $ra /* 00E10 80ACAD30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s index d730aeb498..7fc976cac3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s @@ -51,5 +51,3 @@ glabel func_80ACAD34 /* 00EC4 80ACADE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EC8 80ACADE8 03E00008 */ jr $ra /* 00ECC 80ACADEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s index 58333a0f65..b8697c3747 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s @@ -28,5 +28,3 @@ glabel func_80ACADF0 /* 00F30 80ACAE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F34 80ACAE54 03E00008 */ jr $ra /* 00F38 80ACAE58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s index d5e6e06b02..57ba8f96b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s @@ -23,5 +23,3 @@ glabel func_80ACAE5C /* 00F8C 80ACAEAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F90 80ACAEB0 03E00008 */ jr $ra /* 00F94 80ACAEB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s index eaab56ad11..43667b0b02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s @@ -51,5 +51,3 @@ glabel func_80ACAEB8 /* 01048 80ACAF68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0104C 80ACAF6C 03E00008 */ jr $ra /* 01050 80ACAF70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s index 97da2d58b9..ac546ec398 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s @@ -28,5 +28,3 @@ glabel func_80ACAF74 /* 010B4 80ACAFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010B8 80ACAFD8 03E00008 */ jr $ra /* 010BC 80ACAFDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s index a23714155f..a3b05b3566 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s @@ -23,5 +23,3 @@ glabel func_80ACAFE0 /* 01110 80ACB030 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01114 80ACB034 03E00008 */ jr $ra /* 01118 80ACB038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s index 2b2018b53d..2253d447e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s @@ -30,5 +30,3 @@ glabel func_80ACB03C /* 01184 80ACB0A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01188 80ACB0A8 03E00008 */ jr $ra /* 0118C 80ACB0AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s index eee02ac49a..7095a083bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s @@ -41,5 +41,3 @@ glabel func_80ACB0B0 /* 0121C 80ACB13C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01220 80ACB140 03E00008 */ jr $ra /* 01224 80ACB144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s index 62209284b2..d034d97c8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s @@ -24,5 +24,3 @@ glabel func_80ACB148 /* 01274 80ACB194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01278 80ACB198 03E00008 */ jr $ra /* 0127C 80ACB19C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s index f49964efbd..082826b4a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s @@ -37,5 +37,3 @@ glabel func_80ACB1A0 /* 01300 80ACB220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01304 80ACB224 03E00008 */ jr $ra /* 01308 80ACB228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s index 8db9455219..a5f0bd395a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s @@ -19,5 +19,3 @@ glabel func_80ACB22C /* 01348 80ACB268 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0134C 80ACB26C 03E00008 */ jr $ra /* 01350 80ACB270 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s index a9cdb17fc1..1e8ad363ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s @@ -17,5 +17,3 @@ glabel func_80ACB274 /* 01388 80ACB2A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0138C 80ACB2AC 03E00008 */ jr $ra /* 01390 80ACB2B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s index dc4cd4c3c6..0d2d35ed0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s @@ -38,5 +38,3 @@ glabel func_80ACB2B4 /* 01418 80ACB338 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0141C 80ACB33C 03E00008 */ jr $ra /* 01420 80ACB340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s index b3ca578bfa..15ba7413d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s @@ -42,5 +42,3 @@ glabel func_80ACB344 /* 014B4 80ACB3D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014B8 80ACB3D8 03E00008 */ jr $ra /* 014BC 80ACB3DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s index 7f36fee311..7ead1ae6a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s @@ -24,5 +24,3 @@ glabel func_80ACB3E0 /* 01514 80ACB434 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01518 80ACB438 03E00008 */ jr $ra /* 0151C 80ACB43C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s index ea1436fc4b..b29991735f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s @@ -51,5 +51,3 @@ glabel func_80ACB440 /* 015D0 80ACB4F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 015D4 80ACB4F4 03E00008 */ jr $ra /* 015D8 80ACB4F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s index 6caca3d2f6..476cb77ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s @@ -28,5 +28,3 @@ glabel func_80ACB4FC /* 0163C 80ACB55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01640 80ACB560 03E00008 */ jr $ra /* 01644 80ACB564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s index 020ef7700c..d71d42faea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s @@ -23,5 +23,3 @@ glabel func_80ACB568 /* 01698 80ACB5B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0169C 80ACB5BC 03E00008 */ jr $ra /* 016A0 80ACB5C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s index 97754d5f32..ea386a0f52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s @@ -51,5 +51,3 @@ glabel func_80ACB5C4 /* 01754 80ACB674 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01758 80ACB678 03E00008 */ jr $ra /* 0175C 80ACB67C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s index 540abe35cf..64ee1edafa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s @@ -28,5 +28,3 @@ glabel func_80ACB680 /* 017C0 80ACB6E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017C4 80ACB6E4 03E00008 */ jr $ra /* 017C8 80ACB6E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s index 87fae0627c..abf1873b18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s @@ -23,5 +23,3 @@ glabel func_80ACB6EC /* 0181C 80ACB73C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01820 80ACB740 03E00008 */ jr $ra /* 01824 80ACB744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s index 7fb135e0c0..f3828dab74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s @@ -122,5 +122,3 @@ glabel func_80ACB748 /* 019D8 80ACB8F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 019DC 80ACB8FC 03E00008 */ jr $ra /* 019E0 80ACB900 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s index 6b742bd0db..13fe0b5d19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s @@ -38,5 +38,3 @@ glabel func_80ACB904 /* 01A68 80ACB988 8FB10018 */ lw $s1, 0x0018($sp) /* 01A6C 80ACB98C 03E00008 */ jr $ra /* 01A70 80ACB990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s index 1069393638..e3b8a5090e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s @@ -38,5 +38,3 @@ glabel func_80ACB994 /* 01AF8 80ACBA18 8FB10018 */ lw $s1, 0x0018($sp) /* 01AFC 80ACBA1C 03E00008 */ jr $ra /* 01B00 80ACBA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s index 69bbceb0bc..890231469b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s @@ -40,5 +40,3 @@ glabel func_80ACBA24 /* 01B8C 80ACBAAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B90 80ACBAB0 03E00008 */ jr $ra /* 01B94 80ACBAB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s index e70ebdf804..50b53da426 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80ACD830 +.word L80ACBAFC +.word L80ACBB38 +.word L80ACBB80 +.word L80ACBBC8 +.word L80ACBBE4 + +.text glabel func_80ACBAB8 /* 01B98 80ACBAB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01B9C 80ACBABC AFBF0024 */ sw $ra, 0x0024($sp) @@ -91,5 +100,3 @@ glabel L80ACBBE4 /* 01CE0 80ACBC00 8FB0001C */ lw $s0, 0x001C($sp) /* 01CE4 80ACBC04 03E00008 */ jr $ra /* 01CE8 80ACBC08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s index 515a9fed8e..6e1ee26a27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80ACD844 + .float 6000.0 + +glabel D_80ACD848 + .float 0.4 + +glabel D_80ACD84C + .float 0.2 + +.text glabel func_80ACBC0C /* 01CEC 80ACBC0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01CF0 80ACBC10 AFBF0024 */ sw $ra, 0x0024($sp) @@ -86,5 +97,3 @@ glabel func_80ACBC0C /* 01E20 80ACBD40 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01E24 80ACBD44 03E00008 */ jr $ra /* 01E28 80ACBD48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s index 0aab9912fd..c33648b605 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s @@ -91,5 +91,3 @@ glabel func_80ACBD4C /* 01F74 80ACBE94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F78 80ACBE98 03E00008 */ jr $ra /* 01F7C 80ACBE9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s index 32f0c7c325..2d43b3422e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s @@ -45,5 +45,3 @@ glabel func_80ACBEA0 /* 02024 80ACBF44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02028 80ACBF48 03E00008 */ jr $ra /* 0202C 80ACBF4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s index e83b6a5cb4..6f4f8344fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s @@ -48,5 +48,3 @@ glabel func_80ACBF50 /* 020E0 80ACC000 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 020E4 80ACC004 03E00008 */ jr $ra /* 020E8 80ACC008 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s index bf885a81de..aefea655d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80ACD754 + .asciz "\x1B[36m" + .balign 4 + +glabel D_80ACD75C + .asciz "%dのフクロウ\n" + .balign 4 + +glabel D_80ACD76C + .asciz "\x1B[m" + .balign 4 + +glabel D_80ACD770 + .asciz "\x1B[36m" + .balign 4 + +glabel D_80ACD778 + .asciz "SPOT 06 の デモがはしった\n" + .balign 4 + +glabel D_80ACD794 + .asciz "\x1B[m" + .balign 4 + +glabel D_80ACD798 + .asciz "0" + .balign 4 + +glabel D_80ACD79C + .asciz "../z_en_owl.c" + .balign 4 + +.text glabel func_80ACC00C /* 020EC 80ACC00C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 020F0 80ACC010 AFB00020 */ sw $s0, 0x0020($sp) @@ -155,5 +189,3 @@ glabel func_80ACC00C /* 02310 80ACC230 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02314 80ACC234 03E00008 */ jr $ra /* 02318 80ACC238 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s index 144893de83..ca520f3db5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s @@ -55,5 +55,3 @@ glabel func_80ACC23C /* 023E0 80ACC300 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 023E4 80ACC304 03E00008 */ jr $ra /* 023E8 80ACC308 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s index 2f0ead18f1..0abc28ef5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ACD850 + .float 0.2 + +.text glabel func_80ACC30C /* 023EC 80ACC30C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 023F0 80ACC310 AFBF001C */ sw $ra, 0x001C($sp) @@ -33,5 +38,3 @@ glabel func_80ACC30C /* 02464 80ACC384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02468 80ACC388 03E00008 */ jr $ra /* 0246C 80ACC38C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s index 45ee227f7a..ea8ad5a5e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s @@ -57,5 +57,3 @@ glabel func_80ACC390 /* 02534 80ACC454 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02538 80ACC458 03E00008 */ jr $ra /* 0253C 80ACC45C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s index c858d77bbf..a878e951c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s @@ -62,5 +62,3 @@ glabel func_80ACC460 /* 02614 80ACC534 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02618 80ACC538 03E00008 */ jr $ra /* 0261C 80ACC53C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s index 572c631051..b2f81f8b22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s @@ -39,5 +39,3 @@ glabel func_80ACC540 /* 026A0 80ACC5C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 026A4 80ACC5C4 03E00008 */ jr $ra /* 026A8 80ACC5C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s index 2f78511acc..eae0e3f851 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s @@ -25,5 +25,3 @@ glabel func_80ACC5CC .L80ACC61C: /* 026FC 80ACC61C 03E00008 */ jr $ra /* 02700 80ACC620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s index fa0e407bc1..a663b7d21e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s @@ -37,5 +37,3 @@ glabel func_80ACC624 .L80ACC698: /* 02778 80ACC698 03E00008 */ jr $ra /* 0277C 80ACC69C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s index e095064aaa..89a6966018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s @@ -81,5 +81,3 @@ glabel func_80ACCE00 .L80ACCF2C: /* 0300C 80ACCF2C 03E00008 */ jr $ra /* 03010 80ACCF30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s index 94585e5ee0..fca78d9964 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s @@ -35,5 +35,3 @@ glabel func_80ACCF34 /* 0308C 80ACCFAC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03090 80ACCFB0 03E00008 */ jr $ra /* 03094 80ACCFB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s index ec972dc30d..48e4b946db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s @@ -31,5 +31,3 @@ glabel func_80ACD0B8 /* 03204 80ACD124 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03208 80ACD128 03E00008 */ jr $ra /* 0320C 80ACD12C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s index c90dbfef96..b58a7914d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s @@ -36,5 +36,3 @@ glabel func_80ACD130 /* 03298 80ACD1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0329C 80ACD1BC 03E00008 */ jr $ra /* 032A0 80ACD1C0 A49800B8 */ sh $t8, 0x00B8($a0) ## 000000B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s index ded45daee3..341762f61c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s @@ -23,5 +23,3 @@ glabel func_80ACD1C4 .L80ACD218: /* 032F8 80ACD218 03E00008 */ jr $ra /* 032FC 80ACD21C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s index 07eda2c077..29d710fcbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s @@ -44,5 +44,3 @@ glabel func_80ACD220 /* 033A0 80ACD2C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 033A4 80ACD2C4 03E00008 */ jr $ra /* 033A8 80ACD2C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s index 8385a967ef..417b421ef7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s @@ -138,5 +138,3 @@ glabel func_80ACD2CC /* 035A8 80ACD4C8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 035AC 80ACD4CC 03E00008 */ jr $ra /* 035B0 80ACD4D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s index 4e45f1a736..1a8f376dbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s @@ -62,4 +62,3 @@ glabel func_80ACD4D4 /* 036A4 80ACD5C4 00000000 */ nop /* 036A8 80ACD5C8 00000000 */ nop /* 036AC 80ACD5CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s index 4af5a54657..b73dac1ad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s @@ -2,5 +2,3 @@ glabel EnPart_Destroy /* 0000C 80ACDDDC AFA40000 */ sw $a0, 0x0000($sp) /* 00010 80ACDDE0 03E00008 */ jr $ra /* 00014 80ACDDE4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s index 8c15094981..eca6d79b5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80ACF210 + .asciz "../z_en_part.c" + .balign 4 + +glabel D_80ACF220 + .asciz "../z_en_part.c" + .balign 4 + +glabel D_80ACF230 + .asciz "../z_en_part.c" + .balign 4 + +.text glabel EnPart_Draw /* 00DAC 80ACEB7C 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00DB0 80ACEB80 AFBF002C */ sw $ra, 0x002C($sp) @@ -396,4 +410,3 @@ glabel EnPart_Draw /* 013B4 80ACF184 03E00008 */ jr $ra /* 013B8 80ACF188 00000000 */ nop /* 013BC 80ACF18C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s index a46d0e9e40..9907c9bfef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s @@ -2,5 +2,3 @@ glabel EnPart_Init /* 00000 80ACDDD0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80ACDDD4 03E00008 */ jr $ra /* 00008 80ACDDD8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s index bedde13fca..c1ac1db3e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s @@ -60,5 +60,3 @@ glabel EnPart_Update /* 00CE4 80ACEAB4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CE8 80ACEAB8 03E00008 */ jr $ra /* 00CEC 80ACEABC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s index cddd6525f1..3e89101164 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s @@ -1,3 +1,52 @@ +.late_rodata +glabel D_80ACF240 + .word 0x469C4000 +glabel jtbl_80ACF244 +.word L80ACDE58 +.word L80ACDF68 +.word L80ACDF98 +.word L80ACE010 +.word L80ACDF68 +.word L80ACE0AC +.word L80ACE0AC +.word L80ACE0AC +.word L80ACE0AC +.word L80ACDF68 +.word L80ACDF68 +.word L80ACDFEC +.word L80ACDEBC +.word L80ACDEB4 +.word L80ACDF44 +glabel D_80ACF280 + .word 0xBE99999A +glabel D_80ACF284 + .float 0.3 + +glabel D_80ACF288 + .word 0xBF19999A +glabel D_80ACF28C + .float 0.15 + +glabel D_80ACF290 + .word 0xBF19999A +glabel D_80ACF294 + .float 0.15 + +glabel D_80ACF298 + .word 0xBF19999A +glabel D_80ACF29C + .float 0.3 + +glabel D_80ACF2A0 + .float 0.15 + +glabel D_80ACF2A4 + .float -1.2 + +glabel D_80ACF2A8 + .float 0.15 + +.text glabel func_80ACDDE8 /* 00018 80ACDDE8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0001C 80ACDDEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -237,5 +286,3 @@ glabel L80ACE0AC /* 00360 80ACE130 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00364 80ACE134 03E00008 */ jr $ra /* 00368 80ACE138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s index 89c14c9551..443ca9adc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s @@ -1,3 +1,21 @@ +.late_rodata +glabel jtbl_80ACF2AC +.word L80ACE2AC +.word L80ACE56C +.word L80ACE348 +.word L80ACE3E4 +.word L80ACE4A4 +.word L80ACE4A4 +.word L80ACE4A4 +.word L80ACE4A4 +.word L80ACE2AC +.word L80ACE2AC +.word L80ACE348 +.word L80ACE56C +.word L80ACE56C +.word L80ACE2AC + +.text glabel func_80ACE13C /* 0036C 80ACE13C 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00370 80ACE140 3C0F80AD */ lui $t7, %hi(D_80ACF1B0) ## $t7 = 80AD0000 @@ -311,5 +329,3 @@ glabel L80ACE56C /* 007DC 80ACE5AC 8FB40060 */ lw $s4, 0x0060($sp) /* 007E0 80ACE5B0 03E00008 */ jr $ra /* 007E4 80ACE5B4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s index 39fea9e27a..87a23e0202 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s @@ -3,5 +3,3 @@ glabel func_80ACE5B8 /* 007EC 80ACE5BC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 007F0 80ACE5C0 03E00008 */ jr $ra /* 007F4 80ACE5C4 A08E014C */ sb $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s index bda3140b58..aecf85d347 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80ACF2E4 + .word 0x44228000 +glabel D_80ACF2E8 + .float 0.04 + +.text glabel func_80ACE5C8 /* 007F8 80ACE5C8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 007FC 80ACE5CC AFBF0034 */ sw $ra, 0x0034($sp) @@ -144,5 +151,3 @@ glabel func_80ACE5C8 /* 00A0C 80ACE7DC 8FB10030 */ lw $s1, 0x0030($sp) /* 00A10 80ACE7E0 03E00008 */ jr $ra /* 00A14 80ACE7E4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s index e1eb376bc5..bbad769e1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s @@ -139,5 +139,3 @@ glabel func_80ACE7E8 /* 00C08 80ACE9D8 8FB00050 */ lw $s0, 0x0050($sp) /* 00C0C 80ACE9DC 03E00008 */ jr $ra /* 00C10 80ACE9E0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s index ca77c70ff1..20ab288831 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s @@ -47,5 +47,3 @@ glabel func_80ACEAC0 /* 00DA0 80ACEB70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DA4 80ACEB74 03E00008 */ jr $ra /* 00DA8 80ACEB78 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s index a4efffb607..9f99f50312 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s @@ -30,5 +30,3 @@ glabel EnPeehat_Destroy /* 002DC 80ACF77C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002E0 80ACF780 03E00008 */ jr $ra /* 002E4 80ACF784 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s index afe51d91ca..5060455574 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s @@ -64,4 +64,3 @@ glabel EnPeehat_Draw /* 03274 80AD2714 00000000 */ nop /* 03278 80AD2718 00000000 */ nop /* 0327C 80AD271C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s index 3ee14e72fe..6102a3d714 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80AD2908 + .word 0x45834000 +glabel D_80AD290C + .word 0x3BC49BA6 +glabel D_80AD2910 + .word 0x3B449BA6 + +.text glabel EnPeehat_Init /* 00008 80ACF4A8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0000C 80ACF4AC AFB10028 */ sw $s1, 0x0028($sp) @@ -165,5 +174,3 @@ glabel EnPeehat_Init /* 00268 80ACF708 8FB10028 */ lw $s1, 0x0028($sp) /* 0026C 80ACF70C 03E00008 */ jr $ra /* 00270 80ACF710 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s index 12bad8f394..07d9155a2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2958 + .word 0x3F866666 + +.text glabel EnPeehat_Update /* 02924 80AD1DC4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02928 80AD1DC8 AFBF004C */ sw $ra, 0x004C($sp) @@ -313,5 +318,3 @@ glabel EnPeehat_Update /* 02D78 80AD2218 8FB40048 */ lw $s4, 0x0048($sp) /* 02D7C 80AD221C 03E00008 */ jr $ra /* 02D80 80AD2220 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s index acf0e1f356..396da407da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s @@ -1,5 +1,3 @@ glabel func_80ACF4A0 /* 00000 80ACF4A0 03E00008 */ jr $ra /* 00004 80ACF4A4 AC8502B8 */ sw $a1, 0x02B8($a0) ## 000002B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s index 45f1191810..86e525ebfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2914 + .float 6.28 + +.text glabel func_80ACF788 /* 002E8 80ACF788 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 002EC 80ACF78C 3C0F80AD */ lui $t7, %hi(D_80AD2814) ## $t7 = 80AD0000 @@ -106,5 +111,3 @@ glabel func_80ACF788 /* 00474 80ACF914 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00478 80ACF918 03E00008 */ jr $ra /* 0047C 80ACF91C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s index d03cf7931d..2af3b51d75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2918 + .word 0x477FFF00 + +.text glabel func_80ACF920 /* 00480 80ACF920 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00484 80ACF924 AFBF007C */ sw $ra, 0x007C($sp) @@ -146,5 +151,3 @@ glabel func_80ACF920 /* 00688 80ACFB28 8FB40078 */ lw $s4, 0x0078($sp) /* 0068C 80ACFB2C 03E00008 */ jr $ra /* 00690 80ACFB30 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s index 162136bb36..bc4dac6acb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s @@ -39,5 +39,3 @@ glabel func_80ACFB34 /* 00720 80ACFBC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00724 80ACFBC4 03E00008 */ jr $ra /* 00728 80ACFBC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s index fe40cead74..d550601180 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s @@ -94,5 +94,3 @@ glabel func_80ACFBCC /* 00874 80ACFD14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00878 80ACFD18 03E00008 */ jr $ra /* 0087C 80ACFD1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s index 2335ae9e9a..1255350972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s @@ -36,5 +36,3 @@ glabel func_80ACFD20 /* 00900 80ACFDA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00904 80ACFDA4 03E00008 */ jr $ra /* 00908 80ACFDA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s index 8b879a5e8d..77291eb198 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s @@ -71,5 +71,3 @@ glabel func_80ACFDAC /* 00A04 80ACFEA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A08 80ACFEA8 03E00008 */ jr $ra /* 00A0C 80ACFEAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s index 2bb098e487..2aa1285148 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s @@ -17,5 +17,3 @@ glabel func_80ACFEB0 /* 00A4C 80ACFEEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A50 80ACFEF0 03E00008 */ jr $ra /* 00A54 80ACFEF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s index 5a6e74a71d..333c89c9c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD291C + .word 0x477FFF00 + +.text glabel func_80ACFEF8 /* 00A58 80ACFEF8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00A5C 80ACFEFC AFBF003C */ sw $ra, 0x003C($sp) @@ -104,5 +109,3 @@ glabel func_80ACFEF8 /* 00BC4 80AD0064 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00BC8 80AD0068 03E00008 */ jr $ra /* 00BCC 80AD006C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s index dac079bae4..4ce3a4d073 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s @@ -45,5 +45,3 @@ glabel func_80AD0070 /* 00C6C 80AD010C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00C70 80AD0110 03E00008 */ jr $ra /* 00C74 80AD0114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s index 6817be00c3..2259c9c9da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2920 + .word 0x3F866666 + +.text glabel func_80AD0118 /* 00C78 80AD0118 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00C7C 80AD011C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 @@ -123,5 +128,3 @@ glabel func_80AD0118 /* 00E38 80AD02D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00E3C 80AD02DC 03E00008 */ jr $ra /* 00E40 80AD02E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s index fda8ce6e61..d835d18243 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s @@ -45,5 +45,3 @@ glabel func_80AD02E4 /* 00EE0 80AD0380 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00EE4 80AD0384 03E00008 */ jr $ra /* 00EE8 80AD0388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s index 351219e06d..a8cd9814d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2924 + .word 0x3F866666 + +.text glabel func_80AD038C /* 00EEC 80AD038C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00EF0 80AD0390 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 @@ -123,5 +128,3 @@ glabel func_80AD038C /* 010AC 80AD054C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 010B0 80AD0550 03E00008 */ jr $ra /* 010B4 80AD0554 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s index 9bbcea305b..db63ee2e58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s @@ -19,5 +19,3 @@ glabel func_80AD0558 /* 010FC 80AD059C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01100 80AD05A0 03E00008 */ jr $ra /* 01104 80AD05A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s index 4d2a514cb8..d874042d07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s @@ -106,5 +106,3 @@ glabel func_80AD05A8 /* 01274 80AD0714 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01278 80AD0718 03E00008 */ jr $ra /* 0127C 80AD071C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s index 453b97addd..b4be4e8075 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s @@ -18,5 +18,3 @@ glabel func_80AD0720 /* 012C0 80AD0760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012C4 80AD0764 03E00008 */ jr $ra /* 012C8 80AD0768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s index 1c0edfaaa8..42a0a05090 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AD2928 + .word 0x40A9999A +glabel D_80AD292C + .word 0x3A03126F + +.text glabel func_80AD076C /* 012CC 80AD076C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 012D0 80AD0770 AFBF005C */ sw $ra, 0x005C($sp) @@ -275,5 +282,3 @@ glabel func_80AD076C /* 01690 80AD0B30 8FB20058 */ lw $s2, 0x0058($sp) /* 01694 80AD0B34 03E00008 */ jr $ra /* 01698 80AD0B38 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s index fa397b9832..77659cde32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s @@ -17,5 +17,3 @@ glabel func_80AD0B3C /* 016D8 80AD0B78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016DC 80AD0B7C 03E00008 */ jr $ra /* 016E0 80AD0B80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s index 0a0e8b058b..613eb39003 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2930 + .word 0x3F866666 + +.text glabel func_80AD0B84 /* 016E4 80AD0B84 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 016E8 80AD0B88 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -118,5 +123,3 @@ glabel func_80AD0B84 /* 01890 80AD0D30 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01894 80AD0D34 03E00008 */ jr $ra /* 01898 80AD0D38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s index 7f2501d31c..2b68664a50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s @@ -17,5 +17,3 @@ glabel func_80AD0D3C /* 018D8 80AD0D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018DC 80AD0D7C 03E00008 */ jr $ra /* 018E0 80AD0D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s index 5971d8b785..789c8013c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD2934 + .word 0x3F866666 + +.text glabel func_80AD0D84 /* 018E4 80AD0D84 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 018E8 80AD0D88 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -118,5 +123,3 @@ glabel func_80AD0D84 /* 01A8C 80AD0F2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01A90 80AD0F30 03E00008 */ jr $ra /* 01A94 80AD0F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s index dc2f7eb102..75ee6c88fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s @@ -37,5 +37,3 @@ glabel func_80AD0F38 /* 01B1C 80AD0FBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B20 80AD0FC0 03E00008 */ jr $ra /* 01B24 80AD0FC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s index 19947f6055..533e87f54d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80AD2938 + .float 1.4 + +glabel D_80AD293C + .word 0x3E3851EC +glabel D_80AD2940 + .word 0x3D8F5C29 + +.text glabel func_80AD0FC8 /* 01B28 80AD0FC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01B2C 80AD0FCC AFBF0024 */ sw $ra, 0x0024($sp) @@ -164,5 +174,3 @@ glabel func_80AD0FC8 /* 01D74 80AD1214 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01D78 80AD1218 03E00008 */ jr $ra /* 01D7C 80AD121C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s index a46fe45b73..a5379f3f26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s @@ -13,5 +13,3 @@ glabel func_80AD1220 /* 01DAC 80AD124C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DB0 80AD1250 03E00008 */ jr $ra /* 01DB4 80AD1254 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s index 8d6a7f4b14..9c942035dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80AD2944 + .float 1.4 + +glabel D_80AD2948 + .word 0x3E3851EC +glabel D_80AD294C + .word 0x3D8F5C29 + +.text glabel func_80AD1258 /* 01DB8 80AD1258 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01DBC 80AD125C AFBF0024 */ sw $ra, 0x0024($sp) @@ -133,5 +143,3 @@ glabel func_80AD1258 /* 01F94 80AD1434 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01F98 80AD1438 03E00008 */ jr $ra /* 01F9C 80AD143C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s index d9cd143ba5..6f7a8cad5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s @@ -23,5 +23,3 @@ glabel func_80AD1440 /* 01FF4 80AD1494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FF8 80AD1498 03E00008 */ jr $ra /* 01FFC 80AD149C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s index 6ce6921b53..a40faec71b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s @@ -128,5 +128,3 @@ glabel func_80AD14A0 /* 021D0 80AD1670 8FB40068 */ lw $s4, 0x0068($sp) /* 021D4 80AD1674 03E00008 */ jr $ra /* 021D8 80AD1678 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s index 7f6ac82a75..bffa24c617 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s @@ -34,5 +34,3 @@ glabel func_80AD167C /* 02254 80AD16F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02258 80AD16F8 03E00008 */ jr $ra /* 0225C 80AD16FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s index 8b8eac76f6..6ecbad8c07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s @@ -33,5 +33,3 @@ glabel func_80AD1700 /* 022D0 80AD1770 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 022D4 80AD1774 03E00008 */ jr $ra /* 022D8 80AD1778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s index ac27a620d9..aa4aaea5a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s @@ -26,5 +26,3 @@ glabel func_80AD177C /* 0233C 80AD17DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02340 80AD17E0 03E00008 */ jr $ra /* 02344 80AD17E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s index 6e8c56bfcc..67b45f75fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AD2950 + .float 0.0015 + +glabel D_80AD2954 + .word 0x3F866666 + +.text glabel func_80AD17E8 /* 02348 80AD17E8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0234C 80AD17EC AFBF002C */ sw $ra, 0x002C($sp) @@ -192,5 +200,3 @@ glabel func_80AD17E8 /* 025FC 80AD1A9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02600 80AD1AA0 03E00008 */ jr $ra /* 02604 80AD1AA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s index 597366cb91..46c8bf0441 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s @@ -21,5 +21,3 @@ glabel func_80AD1AA8 /* 02654 80AD1AF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02658 80AD1AF8 03E00008 */ jr $ra /* 0265C 80AD1AFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s index 8291fa98ad..d1c0ac5067 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s @@ -61,5 +61,3 @@ glabel func_80AD1B00 /* 0272C 80AD1BCC 8FB10030 */ lw $s1, 0x0030($sp) /* 02730 80AD1BD0 03E00008 */ jr $ra /* 02734 80AD1BD4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s index 69a357d5fd..603374c31c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s @@ -136,5 +136,3 @@ glabel func_80AD1BD8 /* 02918 80AD1DB8 8FB30040 */ lw $s3, 0x0040($sp) /* 0291C 80AD1DBC 03E00008 */ jr $ra /* 02920 80AD1DC0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s index 0dd4c406ae..5d57a6dd0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80AD2890 + .asciz "../z_en_peehat.c" + .balign 4 + +glabel D_80AD28A4 + .asciz "../z_en_peehat.c" + .balign 4 + +glabel D_80AD28B8 + .asciz "../z_en_peehat.c" + .balign 4 + +.late_rodata +glabel D_80AD295C + .word 0x3DEB851F +glabel D_80AD2960 + .word 0x3E051EB8 +glabel D_80AD2964 + .float 0.1 + +glabel D_80AD2968 + .float 0.1 + +glabel D_80AD296C + .word 0x3E051EB8 +glabel D_80AD2970 + .word 0x3DEB851F + +.text glabel func_80AD2224 /* 02D84 80AD2224 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02D88 80AD2228 AFA70054 */ sw $a3, 0x0054($sp) @@ -136,5 +166,3 @@ glabel func_80AD2224 /* 02F8C 80AD242C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 02F90 80AD2430 03E00008 */ jr $ra /* 02F94 80AD2434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s index 2f5a59f132..125f83354d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80AD28CC + .asciz "../z_en_peehat.c" + .balign 4 + +glabel D_80AD28E0 + .asciz "../z_en_peehat.c" + .balign 4 + +glabel D_80AD28F4 + .asciz "../z_en_peehat.c" + .balign 4 + +.late_rodata +glabel D_80AD2974 + .word 0x3EB33333 +glabel D_80AD2978 + .float 3.2 + +glabel D_80AD297C + .float 0.2 + +glabel D_80AD2980 + .float 0.3 + +.text glabel func_80AD2438 /* 02F98 80AD2438 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02F9C 80AD243C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 @@ -128,5 +154,3 @@ glabel func_80AD2438 /* 0317C 80AD261C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03180 80AD2620 03E00008 */ jr $ra /* 03184 80AD2624 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s index f0525635f2..870bb4048d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s @@ -19,5 +19,3 @@ glabel EnPoDesert_Destroy /* 001A8 80AD2E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001AC 80AD2E5C 03E00008 */ jr $ra /* 001B0 80AD2E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s index 2d07a376b2..cb29e9155e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AD3A04 + .asciz "../z_en_po_desert.c" + .balign 4 + +glabel D_80AD3A18 + .asciz "../z_en_po_desert.c" + .balign 4 + +.text glabel EnPoDesert_Draw /* 00B44 80AD37F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00B48 80AD37F8 AFB20030 */ sw $s2, 0x0030($sp) @@ -100,4 +110,3 @@ glabel EnPoDesert_Draw /* 00CC4 80AD3974 00000000 */ nop /* 00CC8 80AD3978 00000000 */ nop /* 00CCC 80AD397C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s index e76a4deaf1..5acd7c5aee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s @@ -97,5 +97,3 @@ glabel EnPoDesert_Init /* 00160 80AD2E10 8FB10028 */ lw $s1, 0x0028($sp) /* 00164 80AD2E14 03E00008 */ jr $ra /* 00168 80AD2E18 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s index dd54b01aff..f34669eb79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s @@ -67,5 +67,3 @@ glabel EnPoDesert_Update /* 00848 80AD34F8 8FB10020 */ lw $s1, 0x0020($sp) /* 0084C 80AD34FC 03E00008 */ jr $ra /* 00850 80AD3500 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s index 70511fd88b..01d914a2ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s @@ -88,5 +88,3 @@ glabel func_80AD2E64 /* 00300 80AD2FB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00304 80AD2FB4 03E00008 */ jr $ra /* 00308 80AD2FB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s index e80b8dc266..c2a62c422d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s @@ -15,5 +15,3 @@ glabel func_80AD2FBC /* 00340 80AD2FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00344 80AD2FF4 03E00008 */ jr $ra /* 00348 80AD2FF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s index 2ba80b51c0..06936d946c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s @@ -24,5 +24,3 @@ glabel func_80AD2FFC /* 003A0 80AD3050 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003A4 80AD3054 03E00008 */ jr $ra /* 003A8 80AD3058 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s index 67876b7922..82392c6ea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s @@ -31,5 +31,3 @@ glabel func_80AD305C /* 00414 80AD30C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00418 80AD30C8 03E00008 */ jr $ra /* 0041C 80AD30CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s index 2ff4f1465d..f29287c480 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s @@ -54,5 +54,3 @@ glabel func_80AD30D0 /* 004D8 80AD3188 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004DC 80AD318C 03E00008 */ jr $ra /* 004E0 80AD3190 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s index 49fedf473d..a4e57b4ab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AD3A2C + .float 0.157079637 +glabel D_80AD3A30 + .float 0.098174773 + +.text glabel func_80AD3194 /* 004E4 80AD3194 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 004E8 80AD3198 AFBF0024 */ sw $ra, 0x0024($sp) @@ -110,5 +117,3 @@ glabel func_80AD3194 /* 0066C 80AD331C 8FB00020 */ lw $s0, 0x0020($sp) /* 00670 80AD3320 03E00008 */ jr $ra /* 00674 80AD3324 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s index 544502dbf3..25d4b60618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s @@ -63,5 +63,3 @@ glabel func_80AD3328 /* 00754 80AD3404 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00758 80AD3408 03E00008 */ jr $ra /* 0075C 80AD340C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s index b719db68ca..8ceaccebb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s @@ -38,5 +38,3 @@ glabel func_80AD3504 /* 008D8 80AD3588 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 008DC 80AD358C 03E00008 */ jr $ra /* 008E0 80AD3590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s index b9ec8507ff..8ee4d95229 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AD39F0 + .asciz "../z_en_po_desert.c" + .balign 4 + +.text glabel func_80AD3594 /* 008E4 80AD3594 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 008E8 80AD3598 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -155,5 +161,3 @@ glabel func_80AD3594 /* 00B38 80AD37E8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00B3C 80AD37EC 03E00008 */ jr $ra /* 00B40 80AD37F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s index 79a206e176..d586f667ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s @@ -27,5 +27,3 @@ glabel EnPoField_Destroy /* 0025C 80AD3D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00260 80AD3D60 03E00008 */ jr $ra /* 00264 80AD3D64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s index 35afec827f..57bee6cf01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AD71B0 + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD71C4 + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD71D8 + .asciz "../z_en_po_field.c" + .balign 4 + +.text glabel EnPoField_Draw /* 02DE4 80AD68E4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 02DE8 80AD68E8 AFBF0034 */ sw $ra, 0x0034($sp) @@ -199,5 +213,3 @@ glabel EnPoField_Draw /* 030E8 80AD6BE8 8FB20030 */ lw $s2, 0x0030($sp) /* 030EC 80AD6BEC 03E00008 */ jr $ra /* 030F0 80AD6BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s index f723c72f9a..87fe1cf3d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s @@ -141,5 +141,3 @@ glabel EnPoField_Init /* 001FC 80AD3CFC 8FB10028 */ lw $s1, 0x0028($sp) /* 00200 80AD3D00 03E00008 */ jr $ra /* 00204 80AD3D04 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s index 77fae34dd6..f7fdccd09a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s @@ -81,5 +81,3 @@ glabel EnPoField_Update /* 02ABC 80AD65BC 8FB10020 */ lw $s1, 0x0020($sp) /* 02AC0 80AD65C0 03E00008 */ jr $ra /* 02AC4 80AD65C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s index 2d62d6f681..7e856cdbe8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s @@ -51,5 +51,3 @@ glabel func_80AD3D68 /* 00320 80AD3E20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00324 80AD3E24 03E00008 */ jr $ra /* 00328 80AD3E28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s index bc0a1afc71..a153c19274 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AD723C + .word 0x3C656042 +glabel D_80AD7240 + .float 0.01 + +.text glabel func_80AD3E2C /* 0032C 80AD3E2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00330 80AD3E30 AFBF0014 */ sw $ra, 0x0014($sp) @@ -74,5 +81,3 @@ glabel func_80AD3E2C /* 00440 80AD3F40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00444 80AD3F44 03E00008 */ jr $ra /* 00448 80AD3F48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s index adadc62d9e..6c77ddf21f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s @@ -42,5 +42,3 @@ glabel func_80AD3F4C /* 004E4 80AD3FE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004E8 80AD3FE8 03E00008 */ jr $ra /* 004EC 80AD3FEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s index e5aaf88157..c02fd5864d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s @@ -37,5 +37,3 @@ glabel func_80AD3FF0 /* 00578 80AD4078 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0057C 80AD407C 03E00008 */ jr $ra /* 00580 80AD4080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s index 0a4c72e0fc..e5f4222383 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s @@ -48,5 +48,3 @@ glabel func_80AD4084 /* 00634 80AD4134 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00638 80AD4138 03E00008 */ jr $ra /* 0063C 80AD413C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s index 0950ff7f02..fec19d0d66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s @@ -20,5 +20,3 @@ glabel func_80AD4140 /* 00684 80AD4184 254A4ED8 */ addiu $t2, $t2, %lo(func_80AD4ED8) ## $t2 = 80AD4ED8 /* 00688 80AD4188 03E00008 */ jr $ra /* 0068C 80AD418C AC8A0190 */ sw $t2, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s index e282b5f84b..9ba9dd37c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s @@ -31,5 +31,3 @@ glabel func_80AD4190 /* 006FC 80AD41FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00700 80AD4200 03E00008 */ jr $ra /* 00704 80AD4204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s index 198ec0d303..2d64bef000 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD7244 + .float 1500.0 + +.text glabel func_80AD4208 /* 00708 80AD4208 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0070C 80AD420C AFA5001C */ sw $a1, 0x001C($sp) @@ -43,5 +48,3 @@ glabel func_80AD4208 /* 007A4 80AD42A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007A8 80AD42A8 03E00008 */ jr $ra /* 007AC 80AD42AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s index cc31979ba7..28accd105b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s @@ -55,5 +55,3 @@ glabel func_80AD42B0 /* 00878 80AD4378 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0087C 80AD437C 03E00008 */ jr $ra /* 00880 80AD4380 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s index c3f1c5d865..b1069e5139 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s @@ -46,5 +46,3 @@ glabel func_80AD4384 /* 00930 80AD4430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00934 80AD4434 03E00008 */ jr $ra /* 00938 80AD4438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s index 6bdc208fe3..7cb501add3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s @@ -3,5 +3,3 @@ glabel func_80AD443C /* 00940 80AD4440 25CE5AD8 */ addiu $t6, $t6, %lo(func_80AD5AD8) ## $t6 = 80AD5AD8 /* 00944 80AD4444 03E00008 */ jr $ra /* 00948 80AD4448 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s index 59daad0895..9a04b5af94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s @@ -8,5 +8,3 @@ glabel func_80AD444C /* 00964 80AD4464 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 00968 80AD4468 03E00008 */ jr $ra /* 0096C 80AD446C E488000C */ swc1 $f8, 0x000C($a0) ## 0000000C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s index bac2e4aea1..ae287f98df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s @@ -63,5 +63,3 @@ glabel func_80AD4470 /* 00A48 80AD4548 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A4C 80AD454C 03E00008 */ jr $ra /* 00A50 80AD4550 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s index 9ce65c9c9a..fdb6516ad0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s @@ -74,5 +74,3 @@ glabel func_80AD4554 .L80AD465C: /* 00B5C 80AD465C 03E00008 */ jr $ra /* 00B60 80AD4660 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s index 1b407d5afe..ece9d1685d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD7248 + .float 0.4 + +.text glabel func_80AD4664 /* 00B64 80AD4664 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00B68 80AD4668 AFBF0074 */ sw $ra, 0x0074($sp) @@ -166,5 +171,3 @@ glabel func_80AD4664 /* 00DC0 80AD48C0 8FBE0070 */ lw $s8, 0x0070($sp) /* 00DC4 80AD48C4 03E00008 */ jr $ra /* 00DC8 80AD48C8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s index bae9dc363d..755be4462a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AD724C + .float 0.05 + +glabel D_80AD7250 + .float 0.1 + +.text glabel func_80AD48CC /* 00DCC 80AD48CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00DD0 80AD48D0 AFB00018 */ sw $s0, 0x0018($sp) @@ -113,5 +121,3 @@ glabel func_80AD48CC /* 00F5C 80AD4A5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F60 80AD4A60 03E00008 */ jr $ra /* 00F64 80AD4A64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s index 4098c69653..68686b65ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s @@ -160,5 +160,3 @@ glabel func_80AD4A68 /* 01198 80AD4C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0119C 80AD4C9C 03E00008 */ jr $ra /* 011A0 80AD4CA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s index b5492302a2..f85356d147 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AD7254 + .float 3000.0 + +glabel D_80AD7258 + .float 0.2 + +glabel D_80AD725C + .float 1500.0 + +.text glabel func_80AD4CA4 /* 011A4 80AD4CA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 011A8 80AD4CA8 AFB00018 */ sw $s0, 0x0018($sp) @@ -114,5 +125,3 @@ glabel func_80AD4CA4 /* 0133C 80AD4E3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01340 80AD4E40 03E00008 */ jr $ra /* 01344 80AD4E44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s index 2cad226b68..f26825886e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s @@ -41,5 +41,3 @@ glabel func_80AD4E48 /* 013CC 80AD4ECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013D0 80AD4ED0 03E00008 */ jr $ra /* 013D4 80AD4ED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s index 9724616881..ec91bf7409 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD7260 + .float 0.001 + +.text glabel func_80AD4ED8 /* 013D8 80AD4ED8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 013DC 80AD4EDC AFBF004C */ sw $ra, 0x004C($sp) @@ -276,5 +281,3 @@ glabel func_80AD4ED8 /* 017E4 80AD52E4 8FB10048 */ lw $s1, 0x0048($sp) /* 017E8 80AD52E8 03E00008 */ jr $ra /* 017EC 80AD52EC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s index 656e7a5ca7..cf22a51b64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s @@ -69,5 +69,3 @@ glabel func_80AD52F0 /* 018E4 80AD53E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018E8 80AD53E8 03E00008 */ jr $ra /* 018EC 80AD53EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s index ad45cf5372..e5e0612d75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s @@ -60,5 +60,3 @@ glabel func_80AD53F0 /* 019C8 80AD54C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 019CC 80AD54CC 03E00008 */ jr $ra /* 019D0 80AD54D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s index dd956a7500..6b04f07b7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80AD7264 + .word 0x3BE56042 +glabel D_80AD7268 + .word 0x3B808081 +glabel D_80AD726C + .word 0x3BB78035 +glabel D_80AD7270 + .word 0x3AB78035 +glabel D_80AD7274 + .word 0x37E64689 +glabel D_80AD7278 + .word 0x3D70F0F1 +glabel D_80AD727C + .word 0x3F48C8C9 + +.text glabel func_80AD54D4 /* 019D4 80AD54D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 019D8 80AD54D8 AFBF002C */ sw $ra, 0x002C($sp) @@ -253,5 +270,3 @@ glabel func_80AD54D4 /* 01D70 80AD5870 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01D74 80AD5874 03E00008 */ jr $ra /* 01D78 80AD5878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s index 333806b370..eb246bc8d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s @@ -22,5 +22,3 @@ glabel func_80AD587C /* 01DC8 80AD58C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DCC 80AD58CC 03E00008 */ jr $ra /* 01DD0 80AD58D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s index 334d398a35..27b773849f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AD7280 + .word 0x3F48C8C9 + +.text glabel func_80AD58D4 /* 01DD4 80AD58D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01DD8 80AD58D8 AFBF002C */ sw $ra, 0x002C($sp) @@ -142,5 +147,3 @@ glabel func_80AD58D4 /* 01FCC 80AD5ACC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01FD0 80AD5AD0 03E00008 */ jr $ra /* 01FD4 80AD5AD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s index 6afdfd5f7e..80b856498f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s @@ -16,5 +16,3 @@ glabel func_80AD5AD8 /* 0200C 80AD5B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02010 80AD5B10 03E00008 */ jr $ra /* 02014 80AD5B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s index 58a5e59a0a..ab1a1d26eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s @@ -100,5 +100,3 @@ glabel func_80AD5B18 /* 02168 80AD5C68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0216C 80AD5C6C 03E00008 */ jr $ra /* 02170 80AD5C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s index 40090c61a5..3bf1d88a26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s @@ -44,5 +44,3 @@ glabel func_80AD5C74 /* 02200 80AD5D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02204 80AD5D04 03E00008 */ jr $ra /* 02208 80AD5D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s index 6c04393c1b..4c79be2bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s @@ -21,5 +21,3 @@ glabel func_80AD5D0C .L80AD5D58: /* 02258 80AD5D58 03E00008 */ jr $ra /* 0225C 80AD5D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s index a17f189937..eb5e4e77d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s @@ -84,5 +84,3 @@ glabel func_80AD5D60 /* 02380 80AD5E80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02384 80AD5E84 03E00008 */ jr $ra /* 02388 80AD5E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s index 58177573cf..5c11a7a77c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80AD7160 + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD7174 + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD7188 + .asciz "../z_en_po_field.c" + .balign 4 + +.late_rodata +glabel D_80AD7284 + .word 0x47A60400 +glabel D_80AD7288 + .float 9.58738019108e-05 + +glabel D_80AD728C + .word 0x3B449BA6 +glabel D_80AD7290 + .float 0.7 + +glabel D_80AD7294 + .word 0x3A6BEDFB + +.text glabel func_80AD5E8C /* 0238C 80AD5E8C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02390 80AD5E90 AFBF0044 */ sw $ra, 0x0044($sp) @@ -201,5 +229,3 @@ glabel func_80AD5E8C /* 02690 80AD6190 8FB20040 */ lw $s2, 0x0040($sp) /* 02694 80AD6194 03E00008 */ jr $ra /* 02698 80AD6198 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s index af0a780e10..89460a8cda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s @@ -113,5 +113,3 @@ glabel func_80AD619C /* 02824 80AD6324 A0820216 */ sb $v0, 0x0216($a0) ## 00000216 /* 02828 80AD6328 03E00008 */ jr $ra /* 0282C 80AD632C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s index 55530406fe..aa4646644c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AD7298 + .word 0x418547AE +glabel D_80AD729C + .word 0x41855555 + +.text glabel func_80AD6330 /* 02830 80AD6330 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02834 80AD6334 AFBF0014 */ sw $ra, 0x0014($sp) @@ -98,5 +105,3 @@ glabel func_80AD6330 /* 02998 80AD6498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0299C 80AD649C 03E00008 */ jr $ra /* 029A0 80AD64A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s index 8bf33d56ee..6c1b2939a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s @@ -73,5 +73,3 @@ glabel func_80AD65C8 /* 02BC4 80AD66C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02BC8 80AD66C8 03E00008 */ jr $ra /* 02BCC 80AD66CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s index 4df11b5bfc..5075671806 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s @@ -1,3 +1,16 @@ +.rdata +glabel D_80AD719C + .asciz "../z_en_po_field.c" + .balign 4 + +.late_rodata +glabel D_80AD72A0 + .float 0.01 + +glabel D_80AD72A4 + .word 0x3F48C8C9 + +.text glabel func_80AD66D0 /* 02BD0 80AD66D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 02BD4 80AD66D4 AFB00028 */ sw $s0, 0x0028($sp) @@ -139,5 +152,3 @@ glabel func_80AD66D0 /* 02DD8 80AD68D8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 02DDC 80AD68DC 03E00008 */ jr $ra /* 02DE0 80AD68E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s index 5be39a539c..c6114933db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s @@ -22,5 +22,3 @@ glabel func_80AD6BF4 /* 03140 80AD6C40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03144 80AD6C44 03E00008 */ jr $ra /* 03148 80AD6C48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s index f2a8dde25d..d6c4d75bc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80AD71EC + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD7200 + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD7214 + .asciz "../z_en_po_field.c" + .balign 4 + +glabel D_80AD7228 + .asciz "../z_en_po_field.c" + .balign 4 + +.late_rodata +glabel D_80AD72A8 + .float 9.58738019108e-05 + +.text glabel func_80AD6C4C /* 0314C 80AD6C4C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 03150 80AD6C50 AFBF0044 */ sw $ra, 0x0044($sp) @@ -263,4 +285,3 @@ glabel func_80AD6C4C /* 03554 80AD7054 03E00008 */ jr $ra /* 03558 80AD7058 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 0355C 80AD705C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s index fc40459d2e..2a79a45282 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s @@ -19,5 +19,3 @@ glabel EnPoRelay_Destroy /* 001C0 80AD7900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C4 80AD7904 03E00008 */ jr $ra /* 001C8 80AD7908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s index 21a0013a0e..91a20c45c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AD8DC4 + .asciz "../z_en_po_relay.c" + .balign 4 + +glabel D_80AD8DD8 + .asciz "../z_en_po_relay.c" + .balign 4 + +.text glabel EnPoRelay_Draw /* 013F8 80AD8B38 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 013FC 80AD8B3C AFBF002C */ sw $ra, 0x002C($sp) @@ -61,4 +71,3 @@ glabel EnPoRelay_Draw /* 014E4 80AD8C24 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 014E8 80AD8C28 03E00008 */ jr $ra /* 014EC 80AD8C2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s index 0c500754c6..2d0e03021d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s @@ -106,5 +106,3 @@ glabel EnPoRelay_Init /* 00178 80AD78B8 8FB00024 */ lw $s0, 0x0024($sp) /* 0017C 80AD78BC 03E00008 */ jr $ra /* 00180 80AD78C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s index acf108b642..daa0284fff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s @@ -68,5 +68,3 @@ glabel EnPoRelay_Update /* 01184 80AD88C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01188 80AD88C8 03E00008 */ jr $ra /* 0118C 80AD88CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s index bf8bdbb47b..02a93929e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s @@ -13,5 +13,3 @@ glabel func_80AD790C /* 001F8 80AD7938 A09900AE */ sb $t9, 0x00AE($a0) ## 000000AE /* 001FC 80AD793C 03E00008 */ jr $ra /* 00200 80AD7940 AC880190 */ sw $t0, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s index 835ee2ad4b..ba93307381 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s @@ -15,5 +15,3 @@ glabel func_80AD7944 /* 00238 80AD7978 468084A0 */ cvt.s.w $f18, $f16 /* 0023C 80AD797C 03E00008 */ jr $ra /* 00240 80AD7980 E4920008 */ swc1 $f18, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s index 988e1d9381..960e17543d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s @@ -50,5 +50,3 @@ glabel func_80AD7984 /* 00300 80AD7A40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00304 80AD7A44 03E00008 */ jr $ra /* 00308 80AD7A48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s index 26cf30a61e..eab6a091e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s @@ -14,5 +14,3 @@ glabel func_80AD7A4C /* 0033C 80AD7A7C AC880190 */ sw $t0, 0x0190($a0) ## 00000190 /* 00340 80AD7A80 03E00008 */ jr $ra /* 00344 80AD7A84 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s index bc2ae8cd68..3a03cd2642 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s @@ -45,5 +45,3 @@ glabel func_80AD7A88 /* 003E8 80AD7B28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003EC 80AD7B2C 03E00008 */ jr $ra /* 003F0 80AD7B30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s index 770af45022..3ed3013a71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s @@ -50,5 +50,3 @@ glabel func_80AD7B34 /* 004A4 80AD7BE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004A8 80AD7BE8 03E00008 */ jr $ra /* 004AC 80AD7BEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s index a27cb77fd8..6364a7b627 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s @@ -31,5 +31,3 @@ glabel func_80AD7BF0 /* 00518 80AD7C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0051C 80AD7C5C 03E00008 */ jr $ra /* 00520 80AD7C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s index 59cf38e1b6..39f7a1d853 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s @@ -1,3 +1,29 @@ +.late_rodata +glabel D_80AD8DEC + .float 0.03 + +glabel D_80AD8DF0 + .word 0x44D98000 +glabel D_80AD8DF4 + .word 0x44C58000 +glabel D_80AD8DF8 + .word 0x4502A000 +glabel D_80AD8DFC + .float 1.4 + +glabel D_80AD8E00 + .float 1.2 + +glabel D_80AD8E04 + .float 1.2 + +glabel D_80AD8E08 + .float 0.8 + +glabel D_80AD8E0C + .float 0.02 + +.text glabel func_80AD7C64 /* 00524 80AD7C64 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00528 80AD7C68 AFBF0034 */ sw $ra, 0x0034($sp) @@ -359,5 +385,3 @@ glabel func_80AD7C64 /* 00A28 80AD8168 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00A2C 80AD816C 03E00008 */ jr $ra /* 00A30 80AD8170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s index 834c722873..5f0a0898e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s @@ -53,5 +53,3 @@ glabel func_80AD8174 /* 00AE8 80AD8228 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AEC 80AD822C 03E00008 */ jr $ra /* 00AF0 80AD8230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s index 9943d01415..b59ae46dad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s @@ -61,5 +61,3 @@ glabel func_80AD8234 /* 00BC0 80AD8300 8FB10018 */ lw $s1, 0x0018($sp) /* 00BC4 80AD8304 03E00008 */ jr $ra /* 00BC8 80AD8308 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s index 357b2edf8a..6b02c4e6af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s @@ -330,5 +330,3 @@ glabel func_80AD830C /* 01090 80AD87D0 8FB00044 */ lw $s0, 0x0044($sp) /* 01094 80AD87D4 03E00008 */ jr $ra /* 01098 80AD87D8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s index 45c5608e19..44ce0d4683 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80AD8D60 + .asciz "../z_en_po_relay.c" + .balign 4 + +glabel D_80AD8D74 + .asciz "../z_en_po_relay.c" + .balign 4 + +glabel D_80AD8D88 + .asciz "../z_en_po_relay.c" + .balign 4 + +glabel D_80AD8D9C + .asciz "../z_en_po_relay.c" + .balign 4 + +glabel D_80AD8DB0 + .asciz "../z_en_po_relay.c" + .balign 4 + +.text glabel func_80AD88D0 /* 01190 80AD88D0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 01194 80AD88D4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E @@ -158,5 +180,3 @@ glabel func_80AD88D0 /* 013EC 80AD8B2C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 013F0 80AD8B30 03E00008 */ jr $ra /* 013F4 80AD8B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s index 79f8b5ccb7..7140fdd0a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s @@ -28,5 +28,3 @@ glabel EnPoSisters_Destroy /* 002A4 80AD9234 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A8 80AD9238 03E00008 */ jr $ra /* 002AC 80AD923C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index d3817d9aa4..d533f766cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -1,3 +1,44 @@ +.rdata +glabel D_80ADD828 + .asciz "../z_en_po_sisters.c" + .balign 4 + +glabel D_80ADD840 + .asciz "../z_en_po_sisters.c" + .balign 4 + +glabel D_80ADD858 + .asciz "../z_en_po_sisters.c" + .balign 4 + +glabel D_80ADD870 + .asciz "../z_en_po_sisters.c" + .balign 4 + +.late_rodata +glabel D_80ADD8A8 + .word 0x3BB78035 +glabel D_80ADD8AC + .float 0.0027 + +glabel D_80ADD8B0 + .float 0.0027 + +glabel D_80ADD8B4 + .word 0x3B656042 +glabel D_80ADD8B8 + .float 0.0027 + +glabel D_80ADD8BC + .float 0.8 + +glabel D_80ADD8C0 + .float 0.025 + +glabel D_80ADD8C4 + .word 0x3BE56042, 0x00000000, 0x00000000 + +.text glabel EnPoSisters_Draw /* 040B4 80ADD044 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 /* 040B8 80ADD048 AFBF006C */ sw $ra, 0x006C($sp) @@ -449,4 +490,3 @@ glabel EnPoSisters_Draw /* 04754 80ADD6E4 03E00008 */ jr $ra /* 04758 80ADD6E8 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 /* 0475C 80ADD6EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s index 7f7e20594b..85a46dd31d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s @@ -156,5 +156,3 @@ glabel EnPoSisters_Init /* 0023C 80AD91CC 8FB00024 */ lw $s0, 0x0024($sp) /* 00240 80AD91D0 03E00008 */ jr $ra /* 00244 80AD91D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s index 9615b01378..3d4d6bf743 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s @@ -186,5 +186,3 @@ glabel EnPoSisters_Update /* 035C0 80ADC550 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 035C4 80ADC554 03E00008 */ jr $ra /* 035C8 80ADC558 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s index ade84583d7..8b7d384dcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ADD888 + .float 0.1 + +.text glabel func_80AD9240 /* 002B0 80AD9240 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 002B4 80AD9244 AFBF003C */ sw $ra, 0x003C($sp) @@ -77,5 +82,3 @@ glabel func_80AD9240 /* 003CC 80AD935C 8FB50038 */ lw $s5, 0x0038($sp) /* 003D0 80AD9360 03E00008 */ jr $ra /* 003D4 80AD9364 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s index 4b111fd6d2..aea0de05fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s @@ -23,5 +23,3 @@ glabel func_80AD9368 /* 00428 80AD93B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0042C 80AD93BC 03E00008 */ jr $ra /* 00430 80AD93C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s index c3c1e201ea..d2421778da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s @@ -31,5 +31,3 @@ glabel func_80AD93C4 /* 004A0 80AD9430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A4 80AD9434 03E00008 */ jr $ra /* 004A8 80AD9438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s index 8a6a94c19e..a33961bc68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s @@ -3,5 +3,3 @@ glabel func_80AD943C /* 004B0 80AD9440 25CEA6A0 */ addiu $t6, $t6, %lo(func_80ADA6A0) ## $t6 = 80ADA6A0 /* 004B4 80AD9444 03E00008 */ jr $ra /* 004B8 80AD9448 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s index efa69cabaa..c4b305d89a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s @@ -38,5 +38,3 @@ glabel func_80AD944C /* 00544 80AD94D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00548 80AD94D8 03E00008 */ jr $ra /* 0054C 80AD94DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s index c0dc1b8d8a..ad9fbcab3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s @@ -34,5 +34,3 @@ glabel func_80AD94E0 /* 005CC 80AD955C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D0 80AD9560 03E00008 */ jr $ra /* 005D4 80AD9564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s index 8717f1a2e5..a5b4015506 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s @@ -28,5 +28,3 @@ glabel func_80AD9568 /* 0063C 80AD95CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00640 80AD95D0 03E00008 */ jr $ra /* 00644 80AD95D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s index aa8656e832..1d33245ed4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s @@ -54,5 +54,3 @@ glabel func_80AD95D8 /* 00708 80AD9698 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0070C 80AD969C 03E00008 */ jr $ra /* 00710 80AD96A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s index 31a470b0af..e51945a51f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s @@ -28,5 +28,3 @@ glabel func_80AD96A4 /* 0077C 80AD970C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00780 80AD9710 03E00008 */ jr $ra /* 00784 80AD9714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s index f67578a282..0958a7455b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s @@ -47,5 +47,3 @@ glabel func_80AD9718 /* 0082C 80AD97BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00830 80AD97C0 03E00008 */ jr $ra /* 00834 80AD97C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s index 8aaad6e068..417e7be05e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s @@ -85,5 +85,3 @@ glabel func_80AD97C8 /* 00958 80AD98E8 8FB00014 */ lw $s0, 0x0014($sp) /* 0095C 80AD98EC 03E00008 */ jr $ra /* 00960 80AD98F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s index b08098c45d..57bc80e32c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s @@ -60,5 +60,3 @@ glabel func_80AD98F4 /* 00A38 80AD99C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A3C 80AD99CC 03E00008 */ jr $ra /* 00A40 80AD99D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s index 4f6c011b3d..635275da80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ADD88C + .word 0xC5BB8000 + +.text glabel func_80AD99D4 /* 00A44 80AD99D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00A48 80AD99D8 AFBF001C */ sw $ra, 0x001C($sp) @@ -31,5 +36,3 @@ glabel func_80AD99D4 /* 00AB8 80AD9A48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00ABC 80AD9A4C 03E00008 */ jr $ra /* 00AC0 80AD9A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s index 3dcc4da930..d82f13d5d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s @@ -21,5 +21,3 @@ glabel func_80AD9A54 /* 00B0C 80AD9A9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B10 80AD9AA0 03E00008 */ jr $ra /* 00B14 80AD9AA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s index ac19b2b432..6d5a6db607 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s @@ -107,5 +107,3 @@ glabel func_80AD9AA8 /* 00C88 80AD9C18 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00C8C 80AD9C1C 03E00008 */ jr $ra /* 00C90 80AD9C20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s index 7b1a3dbdf8..c7f2dbcdfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s @@ -73,5 +73,3 @@ glabel func_80AD9C24 /* 00DA8 80AD9D38 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00DAC 80AD9D3C 03E00008 */ jr $ra /* 00DB0 80AD9D40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s index a0430d9c37..f4896f8f7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s @@ -47,5 +47,3 @@ glabel func_80AD9D44 /* 00E54 80AD9DE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E58 80AD9DE8 03E00008 */ jr $ra /* 00E5C 80AD9DEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s index b3468416d2..063a4e264e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s @@ -27,5 +27,3 @@ glabel func_80AD9DF0 /* 00EC4 80AD9E54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EC8 80AD9E58 03E00008 */ jr $ra /* 00ECC 80AD9E5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s index 19d1142ee5..95bb327af1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s @@ -51,5 +51,3 @@ glabel func_80AD9E60 /* 00F80 80AD9F10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F84 80AD9F14 03E00008 */ jr $ra /* 00F88 80AD9F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s index caf51f6f59..586ba920e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s @@ -28,5 +28,3 @@ glabel func_80AD9F1C /* 00FF4 80AD9F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FF8 80AD9F88 03E00008 */ jr $ra /* 00FFC 80AD9F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s index 703b2c252b..243c09e455 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s @@ -39,5 +39,3 @@ glabel func_80AD9F90 /* 0108C 80ADA01C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01090 80ADA020 03E00008 */ jr $ra /* 01094 80ADA024 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s index f200c1ec77..be23912945 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s @@ -26,5 +26,3 @@ glabel func_80ADA028 /* 010F8 80ADA088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010FC 80ADA08C 03E00008 */ jr $ra /* 01100 80ADA090 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s index 803f52109b..5e3580fc30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s @@ -30,5 +30,3 @@ glabel func_80ADA094 /* 01170 80ADA100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01174 80ADA104 03E00008 */ jr $ra /* 01178 80ADA108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s index 7e0c828733..dbb800c312 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s @@ -43,5 +43,3 @@ glabel func_80ADA10C /* 0121C 80ADA1AC 25EFBD38 */ addiu $t7, $t7, %lo(func_80ADBD38) ## $t7 = 80ADBD38 /* 01220 80ADA1B0 03E00008 */ jr $ra /* 01224 80ADA1B4 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s index 695afe0d56..6d16d0e089 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s @@ -45,5 +45,3 @@ glabel func_80ADA1B8 /* 012C0 80ADA250 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 012C4 80ADA254 03E00008 */ jr $ra /* 012C8 80ADA258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s index ce60f1a013..fe9bd6e2cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s @@ -23,5 +23,3 @@ glabel func_80ADA25C /* 01320 80ADA2B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01324 80ADA2B4 03E00008 */ jr $ra /* 01328 80ADA2B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s index e3d7ede846..22801e701b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s @@ -42,5 +42,3 @@ glabel func_80ADA2BC /* 013C0 80ADA350 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013C4 80ADA354 03E00008 */ jr $ra /* 013C8 80ADA358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA35C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA35C.s index 5ad4683112..7b4e1f096c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA35C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA35C.s @@ -94,5 +94,3 @@ glabel func_80ADA35C /* 0150C 80ADA49C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01510 80ADA4A0 03E00008 */ jr $ra /* 01514 80ADA4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s index a9c63e9b79..42e1c89da6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s @@ -37,5 +37,3 @@ glabel func_80ADA4A8 /* 01594 80ADA524 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01598 80ADA528 03E00008 */ jr $ra /* 0159C 80ADA52C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s index c753863100..4dcb1fe4b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s @@ -102,5 +102,3 @@ glabel func_80ADA530 /* 01704 80ADA694 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01708 80ADA698 03E00008 */ jr $ra /* 0170C 80ADA69C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s index cce37c946e..924064364f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s @@ -93,5 +93,3 @@ glabel func_80ADA6A0 /* 01854 80ADA7E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01858 80ADA7E8 03E00008 */ jr $ra /* 0185C 80ADA7EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s index 86ba3c7a04..77d2d92fac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s @@ -57,5 +57,3 @@ glabel func_80ADA7F0 /* 01924 80ADA8B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01928 80ADA8B8 03E00008 */ jr $ra /* 0192C 80ADA8BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s index 61830967d2..7cb4dda5df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s @@ -82,5 +82,3 @@ glabel func_80ADA8C0 /* 01A4C 80ADA9DC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01A50 80ADA9E0 03E00008 */ jr $ra /* 01A54 80ADA9E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s index 61d94f785f..035ef5aa68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s @@ -51,5 +51,3 @@ glabel func_80ADA9E8 /* 01B08 80ADAA98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B0C 80ADAA9C 03E00008 */ jr $ra /* 01B10 80ADAAA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s index ecb395e7c7..7532d729d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s @@ -127,5 +127,3 @@ glabel func_80ADAAA4 /* 01CD4 80ADAC64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01CD8 80ADAC68 03E00008 */ jr $ra /* 01CDC 80ADAC6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s index 56776c7e7a..0a23a9fead 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s @@ -62,5 +62,3 @@ glabel func_80ADAC70 /* 01DB8 80ADAD48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01DBC 80ADAD4C 03E00008 */ jr $ra /* 01DC0 80ADAD50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s index a1931687ad..f04f5736cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s @@ -75,5 +75,3 @@ glabel func_80ADAD54 /* 01ED0 80ADAE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01ED4 80ADAE64 03E00008 */ jr $ra /* 01ED8 80ADAE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s index 15b42e4907..9b0358a602 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s @@ -93,5 +93,3 @@ glabel func_80ADAE6C /* 02024 80ADAFB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02028 80ADAFB8 03E00008 */ jr $ra /* 0202C 80ADAFBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s index 9ff9559dc1..4dfe13048a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80ADD890 + .float 3000.0 + +glabel D_80ADD894 + .float 3000.0 + +.text glabel func_80ADAFC0 /* 02030 80ADAFC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02034 80ADAFC4 AFBF001C */ sw $ra, 0x001C($sp) @@ -122,5 +130,3 @@ glabel func_80ADAFC0 /* 021E0 80ADB170 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 021E4 80ADB174 03E00008 */ jr $ra /* 021E8 80ADB178 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s index 3c0dbf2236..de1bd1fc78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s @@ -87,5 +87,3 @@ glabel func_80ADB17C /* 0231C 80ADB2AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02320 80ADB2B0 03E00008 */ jr $ra /* 02324 80ADB2B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s index 9fc0209b1a..0dd6284bed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s @@ -35,5 +35,3 @@ glabel func_80ADB2B8 /* 0239C 80ADB32C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 023A0 80ADB330 03E00008 */ jr $ra /* 023A4 80ADB334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s index c4944756fc..06bd68c5c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s @@ -101,5 +101,3 @@ glabel func_80ADB338 /* 02514 80ADB4A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02518 80ADB4A8 03E00008 */ jr $ra /* 0251C 80ADB4AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s index b1576a7bd2..1c99dc5c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s @@ -29,5 +29,3 @@ glabel func_80ADB4B0 /* 02580 80ADB510 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02584 80ADB514 03E00008 */ jr $ra /* 02588 80ADB518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s index 9db5be3bbe..5c23de5d0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ADD898 + .float 0.1 + +.text glabel func_80ADB51C /* 0258C 80ADB51C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02590 80ADB520 AFB00018 */ sw $s0, 0x0018($sp) @@ -168,5 +173,3 @@ glabel func_80ADB51C /* 027D4 80ADB764 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 027D8 80ADB768 03E00008 */ jr $ra /* 027DC 80ADB76C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s index fbe45fe13b..1211887971 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s @@ -181,5 +181,3 @@ glabel func_80ADB770 /* 02A54 80ADB9E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02A58 80ADB9E8 03E00008 */ jr $ra /* 02A5C 80ADB9EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s index 6dcde566ad..7de3ed79ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s @@ -105,5 +105,3 @@ glabel func_80ADB9F0 /* 02BD0 80ADBB60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02BD4 80ADBB64 03E00008 */ jr $ra /* 02BD8 80ADBB68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s index 73da583d66..e8d3fbbaa1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s @@ -37,5 +37,3 @@ glabel func_80ADBB6C /* 02C58 80ADBBE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02C5C 80ADBBEC 03E00008 */ jr $ra /* 02C60 80ADBBF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s index 7be245a8a6..56793c4752 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s @@ -39,5 +39,3 @@ glabel func_80ADBBF4 /* 02CEC 80ADBC7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02CF0 80ADBC80 03E00008 */ jr $ra /* 02CF4 80ADBC84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s index a7b7bb52ca..022d84cc9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s @@ -48,5 +48,3 @@ glabel func_80ADBC88 /* 02D9C 80ADBD2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02DA0 80ADBD30 03E00008 */ jr $ra /* 02DA4 80ADBD34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s index 1c94c6a6e9..12995146e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s @@ -21,5 +21,3 @@ glabel func_80ADBD38 /* 02DF0 80ADBD80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DF4 80ADBD84 03E00008 */ jr $ra /* 02DF8 80ADBD88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s index a8d0077692..6ad668303b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s @@ -95,5 +95,3 @@ glabel func_80ADBD8C /* 02F4C 80ADBEDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F50 80ADBEE0 03E00008 */ jr $ra /* 02F54 80ADBEE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s index d83a0a4d77..19bcdd30de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s @@ -30,5 +30,3 @@ glabel func_80ADBEE8 /* 02FBC 80ADBF4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02FC0 80ADBF50 03E00008 */ jr $ra /* 02FC4 80ADBF54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s index b4d61d1137..a1aa0218e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s @@ -64,5 +64,3 @@ glabel func_80ADBF58 /* 03098 80ADC028 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0309C 80ADC02C 03E00008 */ jr $ra /* 030A0 80ADC030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s index 0a02bf3e3e..5bbec4213e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s @@ -61,5 +61,3 @@ glabel func_80ADC034 /* 03170 80ADC100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03174 80ADC104 03E00008 */ jr $ra /* 03178 80ADC108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s index 3d842665b5..e1200085ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80ADD89C + .float 0.2 + +.text glabel func_80ADC10C /* 0317C 80ADC10C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03180 80ADC110 AFBF001C */ sw $ra, 0x001C($sp) @@ -126,5 +131,3 @@ glabel func_80ADC10C /* 03330 80ADC2C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03334 80ADC2C4 03E00008 */ jr $ra /* 03338 80ADC2C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s index 009f27962e..139de794c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s @@ -152,5 +152,3 @@ glabel func_80ADC55C /* 037E0 80ADC770 A0820230 */ sb $v0, 0x0230($a0) ## 00000230 /* 037E4 80ADC774 03E00008 */ jr $ra /* 037E8 80ADC778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s index 75787992de..ba5aa91ad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s @@ -135,5 +135,3 @@ glabel func_80ADC77C .L80ADC968: /* 039D8 80ADC968 03E00008 */ jr $ra /* 039DC 80ADC96C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s index 806e0e27bb..7dfdd9d04d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s @@ -1,3 +1,16 @@ +.rdata +glabel D_80ADD810 + .asciz "../z_en_po_sisters.c" + .balign 4 + +.late_rodata +glabel D_80ADD8A0 + .float 0.3 + +glabel D_80ADD8A4 + .float 0.7 + +.text glabel func_80ADC970 /* 039E0 80ADC970 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 039E4 80ADC974 AFB00028 */ sw $s0, 0x0028($sp) @@ -476,5 +489,3 @@ glabel func_80ADC970 /* 040A8 80ADD038 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 040AC 80ADD03C 03E00008 */ jr $ra /* 040B0 80ADD040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s index 90b84aedf0..0babf88b74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s @@ -34,5 +34,3 @@ glabel EnPoh_Destroy /* 003B8 80ADE108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003BC 80ADE10C 03E00008 */ jr $ra /* 003C0 80ADE110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s index 989e6a2e10..1d3acb5993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s @@ -242,5 +242,3 @@ glabel EnPoh_Init /* 00338 80ADE088 8FB10028 */ lw $s1, 0x0028($sp) /* 0033C 80ADE08C 03E00008 */ jr $ra /* 00340 80ADE090 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s index aacad92c1d..39d6478614 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s @@ -87,5 +87,3 @@ glabel EnPoh_Update /* 02920 80AE0670 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02924 80AE0674 03E00008 */ jr $ra /* 02928 80AE0678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s index ed6c65658a..79080be662 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s @@ -22,5 +22,3 @@ glabel func_80ADE114 /* 00410 80ADE160 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00414 80ADE164 03E00008 */ jr $ra /* 00418 80ADE168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s index 926f84ef92..bd529dbb5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s @@ -20,5 +20,3 @@ glabel func_80ADE16C /* 00460 80ADE1B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00464 80ADE1B4 03E00008 */ jr $ra /* 00468 80ADE1B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s index f4c98700cc..ebac79583f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s @@ -19,5 +19,3 @@ glabel func_80ADE1BC /* 004B0 80ADE200 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004B4 80ADE204 03E00008 */ jr $ra /* 004B8 80ADE208 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s index bc19eee158..b09d7ee65d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s @@ -34,5 +34,3 @@ glabel func_80ADE20C /* 00530 80ADE280 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00534 80ADE284 03E00008 */ jr $ra /* 00538 80ADE288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s index 085d9eb6e7..77ad1fbefd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s @@ -58,5 +58,3 @@ glabel func_80ADE28C /* 0060C 80ADE35C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00610 80ADE360 03E00008 */ jr $ra /* 00614 80ADE364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s index b1ea036547..78a190522f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s @@ -28,5 +28,3 @@ glabel func_80ADE368 /* 00680 80ADE3D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00684 80ADE3D4 03E00008 */ jr $ra /* 00688 80ADE3D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s index ed1feb797d..34a57261d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s @@ -47,5 +47,3 @@ glabel func_80ADE3DC /* 00730 80ADE480 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00734 80ADE484 03E00008 */ jr $ra /* 00738 80ADE488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s index 34493e53ca..e17005cd5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s @@ -14,5 +14,3 @@ glabel func_80ADE48C /* 0076C 80ADE4BC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00770 80ADE4C0 03E00008 */ jr $ra /* 00774 80ADE4C4 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s index f282d8a1b8..ff7fadf36b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s @@ -18,5 +18,3 @@ glabel func_80ADE4C8 /* 007B8 80ADE508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007BC 80ADE50C 03E00008 */ jr $ra /* 007C0 80ADE510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s index c0fcbd5c39..602507f57d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s @@ -21,5 +21,3 @@ glabel func_80ADE514 /* 00810 80ADE560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00814 80ADE564 03E00008 */ jr $ra /* 00818 80ADE568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s index afa0abb516..9eb0e26012 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s @@ -23,5 +23,3 @@ glabel func_80ADE56C /* 00868 80ADE5B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0086C 80ADE5BC 03E00008 */ jr $ra /* 00870 80ADE5C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s index a454394dbe..d7db4589ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s @@ -20,5 +20,3 @@ glabel func_80ADE5C4 /* 008B4 80ADE604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008B8 80ADE608 03E00008 */ jr $ra /* 008BC 80ADE60C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s index e9f2312718..15a920ec06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE1C30 + .float 1500.0 + +.text glabel func_80ADE610 /* 008C0 80ADE610 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 008C4 80ADE614 AFA5001C */ sw $a1, 0x001C($sp) @@ -51,5 +56,3 @@ glabel func_80ADE610 /* 00978 80ADE6C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0097C 80ADE6CC 03E00008 */ jr $ra /* 00980 80ADE6D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s index cc639660a1..ecf058f46f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s @@ -62,5 +62,3 @@ glabel func_80ADE6D4 /* 00A64 80ADE7B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A68 80ADE7B8 03E00008 */ jr $ra /* 00A6C 80ADE7BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s index 0f66df42f4..59ee400b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s @@ -112,5 +112,3 @@ glabel func_80ADE7C0 /* 00BF4 80ADE944 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BF8 80ADE948 03E00008 */ jr $ra /* 00BFC 80ADE94C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s index d187cca01a..99a06efee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s @@ -19,5 +19,3 @@ glabel func_80ADE950 /* 00C3C 80ADE98C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C40 80ADE990 03E00008 */ jr $ra /* 00C44 80ADE994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s index f66a1400b5..391de04b37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s @@ -8,5 +8,3 @@ glabel func_80ADE998 /* 00C60 80ADE9B0 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 00C64 80ADE9B4 03E00008 */ jr $ra /* 00C68 80ADE9B8 E488000C */ swc1 $f8, 0x000C($a0) ## 0000000C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s index f9cf9eb322..84f35ae3b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s @@ -3,5 +3,3 @@ glabel func_80ADE9BC /* 00C70 80ADE9C0 25CE0204 */ addiu $t6, $t6, %lo(func_80AE0204) ## $t6 = 80AE0204 /* 00C74 80ADE9C4 03E00008 */ jr $ra /* 00C78 80ADE9C8 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s index 916768644f..36acf4f867 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s @@ -39,5 +39,3 @@ glabel func_80ADE9CC /* 00D00 80ADEA50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D04 80ADEA54 03E00008 */ jr $ra /* 00D08 80ADEA58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s index cf18fd814d..c34b56d8d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s @@ -27,5 +27,3 @@ glabel func_80ADEA5C /* 00D68 80ADEAB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D6C 80ADEABC 03E00008 */ jr $ra /* 00D70 80ADEAC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s index 0e956d27fa..64e78eca4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s @@ -51,5 +51,3 @@ glabel func_80ADEAC4 /* 00E24 80ADEB74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E28 80ADEB78 03E00008 */ jr $ra /* 00E2C 80ADEB7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s index 1dd4a2f0c1..569ddef504 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE1C34 + .float 0.1 + +.text glabel func_80ADEB80 /* 00E30 80ADEB80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00E34 80ADEB84 AFB00018 */ sw $s0, 0x0018($sp) @@ -78,5 +83,3 @@ glabel func_80ADEB80 /* 00F40 80ADEC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F44 80ADEC94 03E00008 */ jr $ra /* 00F48 80ADEC98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s index 8b95e37ee2..0f4f913fda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s @@ -98,5 +98,3 @@ glabel func_80ADEC9C /* 010A0 80ADEDF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010A4 80ADEDF4 03E00008 */ jr $ra /* 010A8 80ADEDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s index 61d4494387..6e78c26a6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s @@ -59,5 +59,3 @@ glabel func_80ADEDFC /* 01170 80ADEEC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01174 80ADEEC4 03E00008 */ jr $ra /* 01178 80ADEEC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s index d846da7ac7..2909a71454 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s @@ -31,5 +31,3 @@ glabel func_80ADEECC /* 011DC 80ADEF2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011E0 80ADEF30 03E00008 */ jr $ra /* 011E4 80ADEF34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s index 4c508e37c6..995b329eeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE1C38 + .float 0.05 + +.text glabel func_80ADEF38 /* 011E8 80ADEF38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 011EC 80ADEF3C AFB00018 */ sw $s0, 0x0018($sp) @@ -104,5 +109,3 @@ glabel func_80ADEF38 /* 0135C 80ADF0AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01360 80ADF0B0 03E00008 */ jr $ra /* 01364 80ADF0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s index a08ca417b2..fdf3027f7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s @@ -45,5 +45,3 @@ glabel func_80ADF0B8 /* 01400 80ADF150 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01404 80ADF154 03E00008 */ jr $ra /* 01408 80ADF158 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s index 5febab672d..81750020cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE1C3C + .float 0.001 + +.text glabel func_80ADF15C /* 0140C 80ADF15C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 01410 80ADF160 AFBF004C */ sw $ra, 0x004C($sp) @@ -276,5 +281,3 @@ glabel func_80ADF15C /* 01818 80ADF568 8FB10048 */ lw $s1, 0x0048($sp) /* 0181C 80ADF56C 03E00008 */ jr $ra /* 01820 80ADF570 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s index fca63d6faa..2e7e337685 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s @@ -30,5 +30,3 @@ glabel func_80ADF574 /* 01884 80ADF5D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01888 80ADF5D8 03E00008 */ jr $ra /* 0188C 80ADF5DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s index 0199c57a42..99dcbea27c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s @@ -35,5 +35,3 @@ glabel func_80ADF5E0 /* 01904 80ADF654 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01908 80ADF658 03E00008 */ jr $ra /* 0190C 80ADF65C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s index c8d25f5b05..5ed22ae8db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s @@ -77,5 +77,3 @@ glabel func_80ADF660 /* 01A20 80ADF770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A24 80ADF774 03E00008 */ jr $ra /* 01A28 80ADF778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s index 81e628247e..831354627b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s @@ -75,5 +75,3 @@ glabel func_80ADF77C /* 01B38 80ADF888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B3C 80ADF88C 03E00008 */ jr $ra /* 01B40 80ADF890 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s index 0ad4f24258..2b6cd2a1b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s @@ -70,5 +70,3 @@ glabel func_80ADF894 /* 01C38 80ADF988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C3C 80ADF98C 03E00008 */ jr $ra /* 01C40 80ADF990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s index 2601bb2646..1306cd8bc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s @@ -69,5 +69,3 @@ glabel func_80ADF994 /* 01D34 80ADFA84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01D38 80ADFA88 03E00008 */ jr $ra /* 01D3C 80ADFA8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s index 5c89ecbe37..fc903f9363 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80AE1C40 + .word 0x3BE56042 +glabel D_80AE1C44 + .word 0x3B808081 +glabel D_80AE1C48 + .word 0x3BB78035 +glabel D_80AE1C4C + .word 0x3AB78035 +glabel D_80AE1C50 + .word 0x37E64689 +glabel D_80AE1C54 + .word 0x3D70F0F1 +glabel D_80AE1C58 + .word 0x3F48C8C9 + +.text glabel func_80ADFA90 /* 01D40 80ADFA90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01D44 80ADFA94 AFBF002C */ sw $ra, 0x002C($sp) @@ -249,5 +266,3 @@ glabel func_80ADFA90 /* 020CC 80ADFE1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 020D0 80ADFE20 03E00008 */ jr $ra /* 020D4 80ADFE24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s index 17f2fbc9d5..dda3f59921 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s @@ -22,5 +22,3 @@ glabel func_80ADFE28 /* 02124 80ADFE74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02128 80ADFE78 03E00008 */ jr $ra /* 0212C 80ADFE7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s index 674ac4c35c..be71ea5cc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE1C5C + .word 0x3F48C8C9 + +.text glabel func_80ADFE80 /* 02130 80ADFE80 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 02134 80ADFE84 AFBF002C */ sw $ra, 0x002C($sp) @@ -149,5 +154,3 @@ glabel func_80ADFE80 /* 02340 80AE0090 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02344 80AE0094 03E00008 */ jr $ra /* 02348 80AE0098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s index 3f7e924093..b447123e9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s @@ -17,5 +17,3 @@ glabel func_80AE009C /* 02380 80AE00D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02384 80AE00D4 03E00008 */ jr $ra /* 02388 80AE00D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s index 9f8d666284..9ffc6afa24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s @@ -84,5 +84,3 @@ glabel func_80AE00DC /* 024A8 80AE01F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024AC 80AE01FC 03E00008 */ jr $ra /* 024B0 80AE0200 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s index fc677494d3..e693b58960 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s @@ -87,5 +87,3 @@ glabel func_80AE0204 /* 025D0 80AE0320 8FB10018 */ lw $s1, 0x0018($sp) /* 025D4 80AE0324 03E00008 */ jr $ra /* 025D8 80AE0328 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s index 1f8bb4c808..d28fd21edc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s @@ -44,5 +44,3 @@ glabel func_80AE032C /* 02668 80AE03B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0266C 80AE03BC 03E00008 */ jr $ra /* 02670 80AE03C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s index 6063e56e6c..f2b5834b72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s @@ -100,5 +100,3 @@ glabel func_80AE03C4 /* 027D8 80AE0528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 027DC 80AE052C 03E00008 */ jr $ra /* 027E0 80AE0530 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s index eda7297145..558e9aea6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s @@ -152,5 +152,3 @@ glabel func_80AE067C /* 02B40 80AE0890 A082029C */ sb $v0, 0x029C($a0) ## 0000029C /* 02B44 80AE0894 03E00008 */ jr $ra /* 02B48 80AE0898 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s index 60abbb19c5..19bbed42d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AE1C60 + .word 0x418547AE +glabel D_80AE1C64 + .word 0x41855555 + +.text glabel func_80AE089C /* 02B4C 80AE089C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02B50 80AE08A0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -102,5 +109,3 @@ glabel func_80AE089C /* 02CC0 80AE0A10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02CC4 80AE0A14 03E00008 */ jr $ra /* 02CC8 80AE0A18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s index 72abfa5870..35e7a7c224 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s @@ -131,5 +131,3 @@ glabel func_80AE0A1C /* 02E9C 80AE0BEC 8FB0001C */ lw $s0, 0x001C($sp) /* 02EA0 80AE0BF0 03E00008 */ jr $ra /* 02EA4 80AE0BF4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s index f37fb733d0..27a66407ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s @@ -63,5 +63,3 @@ glabel func_80AE0BF8 .L80AE0CE0: /* 02F90 80AE0CE0 03E00008 */ jr $ra /* 02F94 80AE0CE4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s index 8106c5b511..9e28d99e39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s @@ -1,3 +1,16 @@ +.rdata +glabel D_80AE1B80 + .asciz "../z_en_poh.c" + .balign 4 + +.late_rodata +glabel D_80AE1C68 + .float 0.01 + +glabel D_80AE1C6C + .word 0x3F48C8C9 + +.text glabel func_80AE0CE8 /* 02F98 80AE0CE8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 02F9C 80AE0CEC AFB00028 */ sw $s0, 0x0028($sp) @@ -132,5 +145,3 @@ glabel func_80AE0CE8 /* 03188 80AE0ED8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0318C 80AE0EDC 03E00008 */ jr $ra /* 03190 80AE0EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s index ffb4cef57c..6fdeb98f83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AE1B90 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1BA0 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1BB0 + .asciz "../z_en_poh.c" + .balign 4 + +.text glabel func_80AE0EE4 /* 03194 80AE0EE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 03198 80AE0EE8 AFBF002C */ sw $ra, 0x002C($sp) @@ -155,5 +169,3 @@ glabel func_80AE0EE4 /* 033EC 80AE113C 8FB10028 */ lw $s1, 0x0028($sp) /* 033F0 80AE1140 03E00008 */ jr $ra /* 033F4 80AE1144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s index 3c38df862f..04c8674cb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AE1BC0 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1BD0 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1BE0 + .asciz "../z_en_poh.c" + .balign 4 + +.text glabel func_80AE1148 /* 033F8 80AE1148 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 033FC 80AE114C AFBF002C */ sw $ra, 0x002C($sp) @@ -306,5 +320,3 @@ glabel func_80AE1148 /* 038A4 80AE15F4 8FB10028 */ lw $s1, 0x0028($sp) /* 038A8 80AE15F8 03E00008 */ jr $ra /* 038AC 80AE15FC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s index 626cf38bf0..f54dcbdaf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s @@ -21,5 +21,3 @@ glabel func_80AE1600 /* 038F8 80AE1648 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 038FC 80AE164C 03E00008 */ jr $ra /* 03900 80AE1650 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s index 19da712c0c..5ad04f7fd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80AE1BF0 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1C00 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1C10 + .asciz "../z_en_poh.c" + .balign 4 + +glabel D_80AE1C20 + .asciz "../z_en_poh.c" + .balign 4 + +.late_rodata +glabel D_80AE1C70 + .float 9.58738019108e-05 + +.text glabel func_80AE1654 /* 03904 80AE1654 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 03908 80AE1658 AFBF003C */ sw $ra, 0x003C($sp) @@ -259,4 +281,3 @@ glabel func_80AE1654 /* 03CF4 80AE1A44 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 03CF8 80AE1A48 00000000 */ nop /* 03CFC 80AE1A4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s index 190f150562..0023832a24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s @@ -17,5 +17,3 @@ glabel EnRd_Destroy /* 00224 80AE2624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00228 80AE2628 03E00008 */ jr $ra /* 0022C 80AE262C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s index 8b182fce1f..860a07440e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AE4970 + .asciz "../z_en_rd.c" + .balign 4 + +glabel D_80AE4980 + .asciz "../z_en_rd.c" + .balign 4 + +.text glabel EnRd_Draw /* 02268 80AE4668 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0226C 80AE466C AFBF0034 */ sw $ra, 0x0034($sp) @@ -143,4 +153,3 @@ glabel EnRd_Draw /* 02494 80AE4894 8FB20030 */ lw $s2, 0x0030($sp) /* 02498 80AE4898 03E00008 */ jr $ra /* 0249C 80AE489C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s index f53348ce62..415d20b4bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s @@ -133,5 +133,3 @@ glabel EnRd_Init /* 001E4 80AE25E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 001E8 80AE25E8 03E00008 */ jr $ra /* 001EC 80AE25EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s index ac1f5b3f2e..a611f8127e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s @@ -136,5 +136,3 @@ glabel EnRd_Update /* 020B8 80AE44B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 020BC 80AE44BC 03E00008 */ jr $ra /* 020C0 80AE44C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s index 71a3d5f2b4..56ab7ad8d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s @@ -1,5 +1,3 @@ glabel func_80AE2400 /* 00000 80AE2400 03E00008 */ jr $ra /* 00004 80AE2404 AC850308 */ sw $a1, 0x0308($a0) ## 00000308 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s index c72d80369b..288d05e331 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s @@ -33,5 +33,3 @@ glabel func_80AE2630 .L80AE2694: /* 00294 80AE2694 03E00008 */ jr $ra /* 00298 80AE2698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s index 0524e7dd9e..e4fece9e3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s @@ -44,5 +44,3 @@ glabel func_80AE269C /* 00338 80AE2738 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0033C 80AE273C 03E00008 */ jr $ra /* 00340 80AE2740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s index 70dde32688..665921f698 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s @@ -154,5 +154,3 @@ glabel func_80AE2744 /* 00564 80AE2964 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00568 80AE2968 03E00008 */ jr $ra /* 0056C 80AE296C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s index 6886f1d5e4..8bb5fff237 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s @@ -41,5 +41,3 @@ glabel func_80AE2970 /* 00604 80AE2A04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00608 80AE2A08 03E00008 */ jr $ra /* 0060C 80AE2A0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s index 7dfcf9425b..29ad4507d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AE4990 + .float 0.3 + +glabel D_80AE4994 + .float 0.3 + +glabel D_80AE4998 + .float 0.3 + +.text glabel func_80AE2A10 /* 00610 80AE2A10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00614 80AE2A14 AFBF0024 */ sw $ra, 0x0024($sp) @@ -106,5 +117,3 @@ glabel func_80AE2A10 /* 00784 80AE2B84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00788 80AE2B88 03E00008 */ jr $ra /* 0078C 80AE2B8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s index 6bf9c74610..eaa537eac6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE499C + .float 0.4 + +.text glabel func_80AE2B90 /* 00790 80AE2B90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00794 80AE2B94 AFA40028 */ sw $a0, 0x0028($sp) @@ -36,5 +41,3 @@ glabel func_80AE2B90 /* 00810 80AE2C10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00814 80AE2C14 03E00008 */ jr $ra /* 00818 80AE2C18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s index 082f87a37e..e97dddc60a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s @@ -224,5 +224,3 @@ glabel func_80AE2C1C /* 00B44 80AE2F44 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00B48 80AE2F48 03E00008 */ jr $ra /* 00B4C 80AE2F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s index ee4ed17e28..81fad75c9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s @@ -33,5 +33,3 @@ glabel func_80AE2F50 /* 00BC4 80AE2FC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BC8 80AE2FC8 03E00008 */ jr $ra /* 00BCC 80AE2FCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s index 4e3a3bce14..35f976870c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s @@ -146,5 +146,3 @@ glabel func_80AE2FD0 /* 00DD0 80AE31D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00DD4 80AE31D4 03E00008 */ jr $ra /* 00DD8 80AE31D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s index 663c721142..5ed0bf63eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s @@ -34,5 +34,3 @@ glabel func_80AE31DC /* 00E54 80AE3254 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E58 80AE3258 03E00008 */ jr $ra /* 00E5C 80AE325C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s index 0a5b765d29..410956a36f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE49A0 + .float 0.4 + +.text glabel func_80AE3260 /* 00E60 80AE3260 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00E64 80AE3264 AFBF0024 */ sw $ra, 0x0024($sp) @@ -114,5 +119,3 @@ glabel func_80AE3260 /* 00FE4 80AE33E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00FE8 80AE33E8 03E00008 */ jr $ra /* 00FEC 80AE33EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s index 7215908ed6..3a12002ddd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s @@ -24,5 +24,3 @@ glabel func_80AE33F0 /* 01048 80AE3448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0104C 80AE344C 03E00008 */ jr $ra /* 01050 80AE3450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s index c4809c66b8..7ef9566039 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80AE49A4 +.word L80AE3508 +.word L80AE34B4 +.word L80AE3538 +.word L80AE3724 +.word L80AE3754 + +.text glabel func_80AE3454 /* 01054 80AE3454 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01058 80AE3458 AFB00028 */ sw $s0, 0x0028($sp) @@ -244,5 +253,3 @@ glabel L80AE3754 /* 013B0 80AE37B0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 013B4 80AE37B4 03E00008 */ jr $ra /* 013B8 80AE37B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s index 83ad877812..7c1e95703f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s @@ -31,5 +31,3 @@ glabel func_80AE37BC /* 01428 80AE3828 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0142C 80AE382C 03E00008 */ jr $ra /* 01430 80AE3830 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s index 280707c6d6..6715ac49db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s @@ -66,5 +66,3 @@ glabel func_80AE3834 /* 01520 80AE3920 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01524 80AE3924 03E00008 */ jr $ra /* 01528 80AE3928 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s index 44629907c1..8e241027d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s @@ -18,5 +18,3 @@ glabel func_80AE392C /* 0156C 80AE396C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01570 80AE3970 03E00008 */ jr $ra /* 01574 80AE3974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s index c06d39e159..7358cdfafa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s @@ -26,5 +26,3 @@ glabel func_80AE3978 /* 015C8 80AE39C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015CC 80AE39CC 03E00008 */ jr $ra /* 015D0 80AE39D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s index f486361d27..0581a8ca40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s @@ -33,5 +33,3 @@ glabel func_80AE39D4 /* 01648 80AE3A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0164C 80AE3A4C 03E00008 */ jr $ra /* 01650 80AE3A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s index 633179125b..d15b4410b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s @@ -15,5 +15,3 @@ glabel func_80AE3A54 /* 01680 80AE3A80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01684 80AE3A84 03E00008 */ jr $ra /* 01688 80AE3A88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s index ce055f3b6b..a8e333b662 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s @@ -36,5 +36,3 @@ glabel func_80AE3A8C /* 0170C 80AE3B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01710 80AE3B10 03E00008 */ jr $ra /* 01714 80AE3B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s index 9d1ac8b3c5..d4b27c86a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE49B8 + .float 0.15 + +.text glabel func_80AE3B18 /* 01718 80AE3B18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0171C 80AE3B1C AFBF0024 */ sw $ra, 0x0024($sp) @@ -73,5 +78,3 @@ glabel func_80AE3B18 /* 01814 80AE3C14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01818 80AE3C18 03E00008 */ jr $ra /* 0181C 80AE3C1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s index 70df39d712..33f9bee3e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s @@ -30,5 +30,3 @@ glabel func_80AE3C20 /* 0188C 80AE3C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01890 80AE3C90 03E00008 */ jr $ra /* 01894 80AE3C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s index f01a90ec7a..efa022d326 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE49BC + .float 7.5e-5 + +.text glabel func_80AE3C98 /* 01898 80AE3C98 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0189C 80AE3C9C AFBF0024 */ sw $ra, 0x0024($sp) @@ -99,5 +104,3 @@ glabel func_80AE3C98 /* 019D8 80AE3DD8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 019DC 80AE3DDC 03E00008 */ jr $ra /* 019E0 80AE3DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s index 4bc39abf10..4e4e23d5f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s @@ -62,5 +62,3 @@ glabel func_80AE3DE4 /* 01AC0 80AE3EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01AC4 80AE3EC4 03E00008 */ jr $ra /* 01AC8 80AE3EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s index fc7fe6cab4..57bff38008 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s @@ -57,5 +57,3 @@ glabel func_80AE3ECC /* 01B90 80AE3F90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B94 80AE3F94 03E00008 */ jr $ra /* 01B98 80AE3F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3F9C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3F9C.s index 31e7c8e7aa..75e56e4767 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3F9C.s @@ -113,5 +113,3 @@ glabel func_80AE3F9C /* 01D08 80AE4108 A488030E */ sh $t0, 0x030E($a0) ## 0000030E /* 01D0C 80AE410C 03E00008 */ jr $ra /* 01D10 80AE4110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s index 4f020027fa..3f2e8ce194 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s @@ -126,5 +126,3 @@ glabel func_80AE4114 /* 01ED0 80AE42D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01ED4 80AE42D4 03E00008 */ jr $ra /* 01ED8 80AE42D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s index 74efefbf63..b42d700ef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s @@ -24,5 +24,3 @@ glabel func_80AE44C4 .L80AE4518: /* 02118 80AE4518 03E00008 */ jr $ra /* 0211C 80AE451C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s index 674c30490e..002b04b0e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s @@ -1,3 +1,33 @@ +.late_rodata +.late_rodata_alignment 8 +glabel jtbl_80AE49C0 +.word L80AE45B4 +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45E4 +.word L80AE45F8 +.word L80AE45F4 +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45DC +.word L80AE45F8 +.word L80AE45EC +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45CC +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45C4 +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45F8 +.word L80AE45BC +.word L80AE45F8 +.word L80AE45AC +.word L80AE45D4 + +.text glabel func_80AE4520 /* 02120 80AE4520 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02124 80AE4524 3C0E80AE */ lui $t6, %hi(D_80AE4940) ## $t6 = 80AE0000 @@ -96,5 +126,3 @@ glabel L80AE45F8 /* 0225C 80AE465C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02260 80AE4660 03E00008 */ jr $ra /* 02264 80AE4664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s index 9fb46fc9e5..2cbbbbac83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s @@ -31,5 +31,3 @@ glabel EnReeba_Destroy /* 00264 80AE4F34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00268 80AE4F38 03E00008 */ jr $ra /* 0026C 80AE4F3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s index ff6999a9e8..dd6e46a034 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AE665C + .asciz "../z_en_reeba.c" + .balign 4 + +glabel D_80AE666C + .asciz "../z_en_reeba.c" + .balign 4 + +.text glabel EnReeba_Draw /* 016F4 80AE63C4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 016F8 80AE63C8 AFB10048 */ sw $s1, 0x0048($sp) @@ -109,4 +119,3 @@ glabel EnReeba_Draw /* 01884 80AE6554 8FB10048 */ lw $s1, 0x0048($sp) /* 01888 80AE6558 03E00008 */ jr $ra /* 0188C 80AE655C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s index d9ce2b2da7..b1d2cc56af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s @@ -1,3 +1,16 @@ +.rdata +glabel D_80AE65F0 + .asciz "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" + .balign 4 + +.late_rodata +glabel D_80AE667C + .float 0.04 + +glabel D_80AE6680 + .word 0xC6D6D800 + +.text glabel EnReeba_Init /* 00000 80AE4CD0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 80AE4CD4 AFB00024 */ sw $s0, 0x0024($sp) @@ -136,5 +149,3 @@ glabel EnReeba_Init /* 001F0 80AE4EC0 8FB10028 */ lw $s1, 0x0028($sp) /* 001F4 80AE4EC4 03E00008 */ jr $ra /* 001F8 80AE4EC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s index 45355b3393..9e17e7dca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s @@ -191,5 +191,3 @@ glabel EnReeba_Update /* 016E8 80AE63B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 016EC 80AE63BC 03E00008 */ jr $ra /* 016F0 80AE63C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s index 5757e9889a..3790a512c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s @@ -76,5 +76,3 @@ glabel func_80AE4F40 /* 00378 80AE5048 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0037C 80AE504C 03E00008 */ jr $ra /* 00380 80AE5050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s index b646401650..5561aa0ebd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80AE6684 +.word L80AE5170 +.word L80AE517C +.word L80AE51A8 +.word L80AE51A8 +.word L80AE51E8 +glabel D_80AE6698 + .float 0.15 + +.text glabel func_80AE5054 /* 00384 80AE5054 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00388 80AE5058 AFBF0034 */ sw $ra, 0x0034($sp) @@ -149,5 +160,3 @@ glabel L80AE51E8 /* 00594 80AE5264 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00598 80AE5268 03E00008 */ jr $ra /* 0059C 80AE526C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s index 38a1282faa..43eaae444f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s @@ -79,5 +79,3 @@ glabel func_80AE5270 /* 006B0 80AE5380 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006B4 80AE5384 03E00008 */ jr $ra /* 006B8 80AE5388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s index 462b79faed..9e4558b151 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s @@ -7,5 +7,3 @@ glabel func_80AE538C /* 006D0 80AE53A0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 006D4 80AE53A4 03E00008 */ jr $ra /* 006D8 80AE53A8 AC98026C */ sw $t8, 0x026C($a0) ## 0000026C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s index c69018b68b..13073e5838 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AE669C + .word 0x3FE66666 + +.text glabel func_80AE53AC /* 006DC 80AE53AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 006E0 80AE53B0 AFB00018 */ sw $s0, 0x0018($sp) @@ -171,5 +176,3 @@ glabel func_80AE53AC /* 00940 80AE5610 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00944 80AE5614 03E00008 */ jr $ra /* 00948 80AE5618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s index b02becada3..fa2daf1853 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s @@ -30,5 +30,3 @@ glabel func_80AE561C /* 009AC 80AE567C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009B0 80AE5680 03E00008 */ jr $ra /* 009B4 80AE5684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s index 10308784d5..c452e579e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s @@ -22,5 +22,3 @@ glabel func_80AE5688 /* 00A04 80AE56D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A08 80AE56D8 03E00008 */ jr $ra /* 00A0C 80AE56DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s index 10ede6fb46..a75b7c994a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s @@ -76,5 +76,3 @@ glabel func_80AE56E0 /* 00B14 80AE57E4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00B18 80AE57E8 03E00008 */ jr $ra /* 00B1C 80AE57EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s index ffe77323b3..338b6d9d67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s @@ -24,5 +24,3 @@ glabel func_80AE57F0 /* 00B78 80AE5848 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B7C 80AE584C 03E00008 */ jr $ra /* 00B80 80AE5850 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s index ff9b8e1d44..d24b70fa88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s @@ -42,5 +42,3 @@ glabel func_80AE5854 /* 00C10 80AE58E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C14 80AE58E4 03E00008 */ jr $ra /* 00C18 80AE58E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s index c8f975697b..6d60dd2f6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s @@ -18,5 +18,3 @@ glabel func_80AE58EC /* 00C5C 80AE592C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00C60 80AE5930 03E00008 */ jr $ra /* 00C64 80AE5934 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s index 5f34709cb3..a104a42f2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s @@ -98,5 +98,3 @@ glabel func_80AE5938 /* 00DC0 80AE5A90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00DC4 80AE5A94 03E00008 */ jr $ra /* 00DC8 80AE5A98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s index 124981eac5..bf3d816d42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s @@ -81,5 +81,3 @@ glabel func_80AE5A9C /* 00EE8 80AE5BB8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00EEC 80AE5BBC 03E00008 */ jr $ra /* 00EF0 80AE5BC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s index 7181607671..b22d5a0132 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s @@ -28,5 +28,3 @@ glabel func_80AE5BC4 /* 00F5C 80AE5C2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F60 80AE5C30 03E00008 */ jr $ra /* 00F64 80AE5C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s index 29ec030f43..2bbe7a2e89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80AE6624 + .asciz "\n\n" + .balign 4 + +glabel D_80AE6628 + .asciz "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" + .balign 4 + +glabel D_80AE6658 + .asciz "\n\n" + .balign 4 + +.late_rodata +glabel D_80AE66A0 + .float 0.01 + +.text glabel func_80AE5C38 /* 00F68 80AE5C38 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00F6C 80AE5C3C 3C0F80AE */ lui $t7, %hi(D_80AE65CC) ## $t7 = 80AE0000 @@ -145,5 +163,3 @@ glabel func_80AE5C38 /* 0116C 80AE5E3C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 01170 80AE5E40 03E00008 */ jr $ra /* 01174 80AE5E44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s index bea0154424..fd47422be5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AE66A4 + .float 3000.0 + +glabel D_80AE66A8 + .float 3000.0 + +.text glabel func_80AE5E48 /* 01178 80AE5E48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0117C 80AE5E4C AFBF0014 */ sw $ra, 0x0014($sp) @@ -40,5 +48,3 @@ glabel func_80AE5E48 /* 01200 80AE5ED0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01204 80AE5ED4 03E00008 */ jr $ra /* 01208 80AE5ED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s index f344d6c0e5..62e8992f8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s @@ -1,3 +1,22 @@ +.late_rodata +glabel jtbl_80AE66AC +.word L80AE60CC +.word L80AE6104 +.word L80AE608C +.word L80AE6104 +.word L80AE6104 +.word L80AE6104 +.word L80AE6104 +.word L80AE6104 +.word L80AE6104 +.word L80AE6104 +.word L80AE5F5C +.word L80AE5F5C +.word L80AE5FB4 +.word L80AE600C +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80AE5EDC /* 0120C 80AE5EDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01210 80AE5EE0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -161,5 +180,3 @@ glabel L80AE6104 /* 0143C 80AE610C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01440 80AE6110 03E00008 */ jr $ra /* 01444 80AE6114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Destroy.s index 7ee0928e81..b443a11c56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Destroy.s @@ -22,5 +22,3 @@ glabel EnRiverSound_Destroy /* 00118 80AE6A48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0011C 80AE6A4C 03E00008 */ jr $ra /* 00120 80AE6A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Draw.s index 22a307e2ea..1e5e353236 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Draw.s @@ -94,4 +94,3 @@ glabel EnRiverSound_Draw /* 00894 80AE71C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00898 80AE71C8 03E00008 */ jr $ra /* 0089C 80AE71CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s index 620b915607..dc0e22e369 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s @@ -59,5 +59,3 @@ glabel EnRiverSound_Init /* 000C4 80AE69F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000C8 80AE69F8 03E00008 */ jr $ra /* 000CC 80AE69FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s index 9b9a48180e..8bfe0df806 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s @@ -127,5 +127,3 @@ glabel EnRiverSound_Update /* 0074C 80AE707C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00750 80AE7080 03E00008 */ jr $ra /* 00754 80AE7084 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6A54.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6A54.s index 3df8a50cf2..01cd44e58e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6A54.s @@ -91,5 +91,3 @@ glabel func_80AE6A54 .L80AE6BB8: /* 00288 80AE6BB8 03E00008 */ jr $ra /* 0028C 80AE6BBC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6BC0.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6BC0.s index ee6f893638..5d32fca5ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/func_80AE6BC0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AE7230 + .float 10000.0 +glabel D_80AE7234 + .float 10000.0 + +.text glabel func_80AE6BC0 /* 00290 80AE6BC0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00294 80AE6BC4 3C0F80AE */ lui $t7, %hi(D_80AE71F0) ## $t7 = 80AE0000 @@ -202,5 +209,3 @@ glabel func_80AE6BC0 /* 00580 80AE6EB0 8FB50030 */ lw $s5, 0x0030($sp) /* 00584 80AE6EB4 03E00008 */ jr $ra /* 00588 80AE6EB8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s index f3a1f799ac..386088e150 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s @@ -7,5 +7,3 @@ glabel EnRl_Destroy /* 00014 80AE72C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00018 80AE72C8 03E00008 */ jr $ra /* 0001C 80AE72CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s index e94d66f40d..b99b092387 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AE829C + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnRl_Draw /* 00E90 80AE8140 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00E94 80AE8144 AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,4 +33,3 @@ glabel EnRl_Draw /* 00EE4 80AE8194 03E00008 */ jr $ra /* 00EE8 80AE8198 00000000 */ nop /* 00EEC 80AE819C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s index 5ab4e81d6d..fbc833b36a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s @@ -28,5 +28,3 @@ glabel EnRl_Init /* 00D14 80AE7FC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D18 80AE7FC8 03E00008 */ jr $ra /* 00D1C 80AE7FCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s index 2db615b0a1..7644ead2a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AE8240 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnRl_Update /* 00C5C 80AE7F0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00C60 80AE7F10 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnRl_Update /* 00CAC 80AE7F5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CB0 80AE7F60 03E00008 */ jr $ra /* 00CB4 80AE7F64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s index 5657a7079f..af6ff27336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s @@ -38,5 +38,3 @@ glabel func_80AE72D0 /* 0009C 80AE734C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000A0 80AE7350 03E00008 */ jr $ra /* 000A4 80AE7354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s index 3c479ff224..a2f2be4d99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s @@ -33,5 +33,3 @@ glabel func_80AE7358 /* 0011C 80AE73CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00120 80AE73D0 03E00008 */ jr $ra /* 00124 80AE73D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s index 059093a118..6ae6cdcaf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s @@ -32,5 +32,3 @@ glabel func_80AE73D8 /* 00190 80AE7440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00194 80AE7444 03E00008 */ jr $ra /* 00198 80AE7448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s index 8db44e3f2b..bcb392177a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s @@ -17,5 +17,3 @@ glabel func_80AE744C /* 001D8 80AE7488 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001DC 80AE748C 03E00008 */ jr $ra /* 001E0 80AE7490 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s index 087c408bb5..7285a87aa7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s @@ -8,5 +8,3 @@ glabel func_80AE7494 /* 001F8 80AE74A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001FC 80AE74AC 03E00008 */ jr $ra /* 00200 80AE74B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s index d711ac0837..65d0148eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s @@ -19,5 +19,3 @@ glabel func_80AE74B4 .L80AE74F4: /* 00244 80AE74F4 03E00008 */ jr $ra /* 00248 80AE74F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s index 439fa7f5f7..ade3595376 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s @@ -19,5 +19,3 @@ glabel func_80AE74FC .L80AE753C: /* 0028C 80AE753C 03E00008 */ jr $ra /* 00290 80AE7540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s index d03b16266c..c16d0db17e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s @@ -18,5 +18,3 @@ glabel func_80AE7544 /* 002D4 80AE7584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002D8 80AE7588 03E00008 */ jr $ra /* 002DC 80AE758C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s index ce286ef0ee..342dafec85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s @@ -56,5 +56,3 @@ glabel func_80AE7590 /* 003AC 80AE765C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003B0 80AE7660 03E00008 */ jr $ra /* 003B4 80AE7664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s index 5440bcb6d6..01b96223c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s @@ -11,5 +11,3 @@ glabel func_80AE7668 /* 003DC 80AE768C A44300B6 */ sh $v1, 0x00B6($v0) ## 000000B6 /* 003E0 80AE7690 03E00008 */ jr $ra /* 003E4 80AE7694 A4430032 */ sh $v1, 0x0032($v0) ## 00000032 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s index 2aa28eb1e5..9c3604d99f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s @@ -39,5 +39,3 @@ glabel func_80AE7698 /* 00470 80AE7720 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00474 80AE7724 03E00008 */ jr $ra /* 00478 80AE7728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s index 53f90133b9..f24db61fe7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s @@ -29,5 +29,3 @@ glabel func_80AE772C /* 004DC 80AE778C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004E0 80AE7790 03E00008 */ jr $ra /* 004E4 80AE7794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s index fdef6a5aca..74186b01f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s @@ -7,5 +7,3 @@ glabel func_80AE7798 /* 004FC 80AE77AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00500 80AE77B0 03E00008 */ jr $ra /* 00504 80AE77B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s index 8846298ac6..09025ebffd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s @@ -15,5 +15,3 @@ glabel func_80AE77B8 /* 0053C 80AE77EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00540 80AE77F0 03E00008 */ jr $ra /* 00544 80AE77F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s index d3bba1b74e..fac0e64dcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s @@ -15,5 +15,3 @@ glabel func_80AE77F8 /* 0057C 80AE782C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00580 80AE7830 03E00008 */ jr $ra /* 00584 80AE7834 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s index 366c13aae5..1df3ae08ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s @@ -15,5 +15,3 @@ glabel func_80AE7838 /* 005BC 80AE786C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005C0 80AE7870 03E00008 */ jr $ra /* 005C4 80AE7874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s index f017e1be1d..3eee0803f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s @@ -22,5 +22,3 @@ glabel func_80AE7878 /* 00618 80AE78C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0061C 80AE78CC 03E00008 */ jr $ra /* 00620 80AE78D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s index 71fb1c44c9..7b8c06637f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s @@ -32,5 +32,3 @@ glabel func_80AE78D4 /* 00698 80AE7948 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0069C 80AE794C 03E00008 */ jr $ra /* 006A0 80AE7950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s index 2e30f77797..c944ca8380 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s @@ -20,5 +20,3 @@ glabel func_80AE7954 /* 006E8 80AE7998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006EC 80AE799C 03E00008 */ jr $ra /* 006F0 80AE79A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s index d1c8951bde..79aeb48a04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s @@ -87,5 +87,3 @@ glabel func_80AE79A4 /* 0083C 80AE7AEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00840 80AE7AF0 03E00008 */ jr $ra /* 00844 80AE7AF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s index 86ef63f8ad..64b275f39c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s @@ -68,5 +68,3 @@ glabel func_80AE7AF8 /* 0093C 80AE7BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00940 80AE7BF0 03E00008 */ jr $ra /* 00944 80AE7BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s index 5701b1bdb9..c6123a3da2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s @@ -29,5 +29,3 @@ glabel func_80AE7BF8 /* 009A8 80AE7C58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009AC 80AE7C5C 03E00008 */ jr $ra /* 009B0 80AE7C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s index 4963aa1eb9..550b67a062 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s @@ -11,5 +11,3 @@ glabel func_80AE7C64 /* 009D8 80AE7C88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009DC 80AE7C8C 03E00008 */ jr $ra /* 009E0 80AE7C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s index 06a0aa0799..68005f9f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s @@ -20,5 +20,3 @@ glabel func_80AE7C94 /* 00A2C 80AE7CDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A30 80AE7CE0 03E00008 */ jr $ra /* 00A34 80AE7CE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s index b18bf7051e..b88353f560 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s @@ -21,5 +21,3 @@ glabel func_80AE7CE8 /* 00A84 80AE7D34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A88 80AE7D38 03E00008 */ jr $ra /* 00A8C 80AE7D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s index 5e3caf0d09..21c22401ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s @@ -20,5 +20,3 @@ glabel func_80AE7D40 /* 00AD8 80AE7D88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00ADC 80AE7D8C 03E00008 */ jr $ra /* 00AE0 80AE7D90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s index 1ed6818756..68bf7d87ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AE8200 + .asciz "../z_en_rl_inKenjyanomaDemo02.c" + .balign 4 + +glabel D_80AE8220 + .asciz "../z_en_rl_inKenjyanomaDemo02.c" + .balign 4 + +.text glabel func_80AE7D94 /* 00AE4 80AE7D94 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) @@ -93,5 +103,3 @@ glabel func_80AE7D94 /* 00C50 80AE7F00 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 00C54 80AE7F04 03E00008 */ jr $ra /* 00C58 80AE7F08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s index d039cc6af5..fd2d0aca5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s @@ -2,5 +2,3 @@ glabel func_80AE7FD0 /* 00D20 80AE7FD0 AFA40000 */ sw $a0, 0x0000($sp) /* 00D24 80AE7FD4 03E00008 */ jr $ra /* 00D28 80AE7FD8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s index 15d0fc584e..a088bfea31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AE827C + .asciz "../z_en_rl.c" + .balign 4 + +glabel D_80AE828C + .asciz "../z_en_rl.c" + .balign 4 + +.text glabel func_80AE7FDC /* 00D2C 80AE7FDC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -88,5 +98,3 @@ glabel func_80AE7FDC /* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 00E88 80AE8138 03E00008 */ jr $ra /* 00E8C 80AE813C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s index 376f4b09a2..833366c796 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s @@ -17,5 +17,3 @@ glabel EnRr_Destroy /* 001D0 80AE8610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001D4 80AE8614 03E00008 */ jr $ra /* 001D8 80AE8618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index f766fe687d..63663fa62a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80AEA838 + .asciz "../z_en_rr.c" + .balign 4 + +glabel D_80AEA848 + .asciz "../z_en_rr.c" + .balign 4 + +glabel D_80AEA858 + .asciz "../z_en_rr.c" + .balign 4 + +glabel D_80AEA868 + .asciz "../z_en_rr.c" + .balign 4 + +.text glabel EnRr_Draw /* 01D94 80AEA1D4 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 01D98 80AEA1D8 AFB30054 */ sw $s3, 0x0054($sp) @@ -282,4 +300,3 @@ glabel EnRr_Draw /* 021D4 80AEA614 00000000 */ nop /* 021D8 80AEA618 00000000 */ nop /* 021DC 80AEA61C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s index d5ce57cb9d..0afd920bd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80AEA878 + .float 0.014 +glabel D_80AEA87C + .float 0.013 +glabel D_80AEA880 + .float -0.4 + +.text glabel EnRr_Init /* 00000 80AE8440 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00004 80AE8444 AFB10018 */ sw $s1, 0x0018($sp) @@ -106,5 +115,3 @@ glabel EnRr_Init /* 00190 80AE85D0 8FB10018 */ lw $s1, 0x0018($sp) /* 00194 80AE85D4 03E00008 */ jr $ra /* 00198 80AE85D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s index a1002885de..8ffaaecaa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AEA824 + .asciz "0" + .balign 4 + +glabel D_80AEA828 + .asciz "../z_en_rr.c" + .balign 4 + +.late_rodata +glabel D_80AEA934 + .float 0.2 + +.text glabel EnRr_Update /* 01944 80AE9D84 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01948 80AE9D88 AFBF004C */ sw $ra, 0x004C($sp) @@ -309,5 +323,3 @@ glabel EnRr_Update /* 01D88 80AEA1C8 8FB60048 */ lw $s6, 0x0048($sp) /* 01D8C 80AEA1CC 03E00008 */ jr $ra /* 01D90 80AEA1D0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE861C.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE861C.s index 3ac0c479e5..ed082da4c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE861C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE861C.s @@ -10,5 +10,3 @@ glabel func_80AE861C /* 001F8 80AE8638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001FC 80AE863C 03E00008 */ jr $ra /* 00200 80AE8640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8644.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8644.s index 4c5a9e5dd7..755ba1f079 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8644.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AEA884 + .float 2500.0 + +glabel D_80AEA888 + .float 0.8 + +glabel D_80AEA88C + .float 6000.0 + +.text glabel func_80AE8644 /* 00204 80AE8644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00208 80AE8648 AFBF0014 */ sw $ra, 0x0014($sp) @@ -64,5 +75,3 @@ glabel func_80AE8644 /* 002F8 80AE8738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002FC 80AE873C 03E00008 */ jr $ra /* 00300 80AE8740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8744.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8744.s index 7141d8acb5..a85eb0fca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8744.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AEA890 + .float 2500.0 + +.text glabel func_80AE8744 /* 00304 80AE8744 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00308 80AE8748 A0800370 */ sb $zero, 0x0370($a0) ## 00000370 @@ -51,5 +56,3 @@ glabel func_80AE8744 /* 003C4 80AE8804 AC89014C */ sw $t1, 0x014C($a0) ## 0000014C /* 003C8 80AE8808 03E00008 */ jr $ra /* 003CC 80AE880C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8810.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8810.s index 70ac1ce3a4..eb36333b83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8810.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AEA894 + .float 0.15 + +glabel D_80AEA898 + .float 5000.0 + +.text glabel func_80AE8810 /* 003D0 80AE8810 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 003D4 80AE8814 AFBF0014 */ sw $ra, 0x0014($sp) @@ -66,5 +74,3 @@ glabel func_80AE8810 /* 004CC 80AE890C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004D0 80AE8910 03E00008 */ jr $ra /* 004D4 80AE8914 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8918.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8918.s index cef2cb309d..15800a2d83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8918.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8918.s @@ -23,5 +23,3 @@ glabel func_80AE8918 .L80AE8960: /* 00520 80AE8960 03E00008 */ jr $ra /* 00524 80AE8964 00601025 */ or $v0, $v1, $zero ## $v0 = 00000003 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s index ae76145d0d..2577c8ee39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80AEA720 + .asciz "タイプ７ " + .balign 4 +glabel D_80AEA72C + .asciz "魔法の壷小" + .balign 4 +glabel D_80AEA738 + .asciz "矢 " + .balign 4 + +glabel D_80AEA744 + .asciz "妖精 " + .balign 4 + +glabel D_80AEA750 + .asciz "20ルピー " + .balign 4 + +glabel D_80AEA75C + .asciz "50ルピー " + .balign 4 +glabel D_80AEA768 + .asciz "\x1b[33m%s[%d] : Rr_Catch_Cancel\x1b[m\n" + .balign 4 + +glabel D_80AEA78C + .asciz "../z_en_rr.c" + .balign 4 + +.late_rodata +glabel D_80AEA89C + .float 2500.0 +.text glabel func_80AE8968 /* 00528 80AE8968 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0052C 80AE896C AFBF0024 */ sw $ra, 0x0024($sp) @@ -142,5 +176,3 @@ glabel func_80AE8968 /* 0072C 80AE8B6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00730 80AE8B70 03E00008 */ jr $ra /* 00734 80AE8B74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8B78.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8B78.s index c81b85865d..164a9868c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8B78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8B78.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AEA8A0 + .float 2500.0 + +.text glabel func_80AE8B78 /* 00738 80AE8B78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0073C 80AE8B7C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -51,5 +56,3 @@ glabel func_80AE8B78 /* 007F8 80AE8C38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007FC 80AE8C3C 03E00008 */ jr $ra /* 00800 80AE8C40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8C44.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8C44.s index 99a0ec357b..ade009c6a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8C44.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AEA8A4 + .float 0.15 + +glabel D_80AEA8A8 + .float 2500.0 + +.text glabel func_80AE8C44 /* 00804 80AE8C44 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00808 80AE8C48 3C0180AF */ lui $at, %hi(D_80AEA8A4) ## $at = 80AF0000 @@ -44,5 +52,3 @@ glabel func_80AE8C44 /* 008AC 80AE8CEC E4620240 */ swc1 $f2, 0x0240($v1) ## 00000240 /* 008B0 80AE8CF0 03E00008 */ jr $ra /* 008B4 80AE8CF4 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8CF8.s index e256d6ef43..86e7b990ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8CF8.s @@ -41,5 +41,3 @@ glabel func_80AE8CF8 /* 00950 80AE8D90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00954 80AE8D94 03E00008 */ jr $ra /* 00958 80AE8D98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8D9C.s index f8a2df49e5..5c702e8a08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8D9C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AEA8AC + .float 2500.0 + +glabel D_80AEA8B0 + .float 0.15 + +.text glabel func_80AE8D9C /* 0095C 80AE8D9C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00960 80AE8DA0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -66,5 +74,3 @@ glabel func_80AE8D9C /* 00A58 80AE8E98 25EF9D1C */ addiu $t7, $t7, %lo(func_80AE9D1C) ## $t7 = 80AE9D1C /* 00A5C 80AE8E9C 03E00008 */ jr $ra /* 00A60 80AE8EA0 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8EA4.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8EA4.s index 6abcd31f07..630128deff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8EA4.s @@ -1,3 +1,35 @@ +.rdata +glabel D_80AEA79C + .asciz "\x1b[32mカキン(%d)！！\x1b[m\n" + .balign 4 + +glabel D_80AEA7B4 + .asciz "\x1b[31mいてっ( %d : LIFE %d : DAMAGE %d : %x )！！\x1b[m\n" + .balign 4 + +glabel D_80AEA7EC + .asciz "\x1b[32mキャッチ(%d)！！\x1b[m\n" + .balign 4 + +.late_rodata +glabel jtbl_80AEA8B4 +.word L80AE9170 +.word L80AE9094 +.word L80AE90DC +.word L80AE912C +.word L80AE91A8 +.word L80AE91A8 +.word L80AE91A8 +.word L80AE91A8 +.word L80AE91A8 +.word L80AE91A8 +.word L80AE8FD4 +.word L80AE8FD8 +.word L80AE8FE0 +.word L80AE8FE8 +.word L80AE8FF0 + +.text glabel func_80AE8EA4 /* 00A64 80AE8EA4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00A68 80AE8EA8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -272,5 +304,3 @@ glabel L80AE91A8 /* 00E20 80AE9260 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00E24 80AE9264 03E00008 */ jr $ra /* 00E28 80AE9268 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE926C.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE926C.s index 9bec0de369..95bf55d94f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE926C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE926C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AEA8F0 + .float 2500.0 + +glabel D_80AEA8F4 + .float 0.15 + +.text glabel func_80AE926C /* 00E2C 80AE926C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00E30 80AE9270 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -117,5 +125,3 @@ glabel func_80AE926C /* 00FE0 80AE9420 8FB30020 */ lw $s3, 0x0020($sp) /* 00FE4 80AE9424 03E00008 */ jr $ra /* 00FE8 80AE9428 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE942C.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE942C.s index 3b1b49a9ce..345f26251a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE942C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE942C.s @@ -104,5 +104,3 @@ glabel func_80AE942C /* 01164 80AE95A4 8FB40028 */ lw $s4, 0x0028($sp) /* 01168 80AE95A8 03E00008 */ jr $ra /* 0116C 80AE95AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE95B0.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE95B0.s index dd264aa4b1..09a7949216 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE95B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE95B0.s @@ -51,5 +51,3 @@ glabel func_80AE95B0 /* 01224 80AE9664 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01228 80AE9668 03E00008 */ jr $ra /* 0122C 80AE966C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9670.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9670.s index 786d88cb86..1329d2d282 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9670.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80AEA8F8 +.word L80AE96CC +.word L80AE96E4 +.word L80AE9710 +.word L80AE9738 +.word L80AE9764 +glabel D_80AEA90C + .float 0.8 + +.text glabel func_80AE9670 /* 01230 80AE9670 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01234 80AE9674 AFB00020 */ sw $s0, 0x0020($sp) @@ -78,5 +89,3 @@ glabel L80AE9764 /* 01340 80AE9780 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01344 80AE9784 03E00008 */ jr $ra /* 01348 80AE9788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE978C.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE978C.s index 0d756ebb10..5a5663debe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE978C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE978C.s @@ -69,5 +69,3 @@ glabel func_80AE978C /* 01434 80AE9874 8FB10018 */ lw $s1, 0x0018($sp) /* 01438 80AE9878 03E00008 */ jr $ra /* 0143C 80AE987C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9880.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9880.s index 2538d025dc..165b6e4d35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9880.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AEA910 + .float 5000.0 + +glabel D_80AEA914 + .float -5000.0 + +.text glabel func_80AE9880 /* 01440 80AE9880 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01444 80AE9884 AFBF0014 */ sw $ra, 0x0014($sp) @@ -33,5 +41,3 @@ glabel func_80AE9880 /* 014AC 80AE98EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014B0 80AE98F0 03E00008 */ jr $ra /* 014B4 80AE98F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s index b91769c958..62920530e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s @@ -1,3 +1,20 @@ +.rdata +glabel D_80AEA808 + .asciz "\x1b[32m「%s」が出た！！\x1b[m\n" + .balign 4 + +.late_rodata +glabel D_80AEA918 + .float 0.003 +glabel jtbl_80AEA91C +.word L80AE9B4C +.word L80AE9AD4 +.word L80AE9AEC +.word L80AE9B04 +.word L80AE9B1C +.word L80AE9B34 + +.text glabel func_80AE98F8 /* 014B8 80AE98F8 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 014BC 80AE98FC AFBF005C */ sw $ra, 0x005C($sp) @@ -262,5 +279,3 @@ glabel L80AE9B4C /* 0183C 80AE9C7C 8FB20058 */ lw $s2, 0x0058($sp) /* 01840 80AE9C80 03E00008 */ jr $ra /* 01844 80AE9C84 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9C88.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9C88.s index 226f0352e5..47ea8bbdc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9C88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9C88.s @@ -40,5 +40,3 @@ glabel func_80AE9C88 /* 018D0 80AE9D10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 018D4 80AE9D14 03E00008 */ jr $ra /* 018D8 80AE9D18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9D1C.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9D1C.s index a172e2518f..15c46a8baf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9D1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE9D1C.s @@ -29,5 +29,3 @@ glabel func_80AE9D1C /* 01938 80AE9D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0193C 80AE9D7C 03E00008 */ jr $ra /* 01940 80AE9D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s index bd507c03c3..665e5eebf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s @@ -7,5 +7,3 @@ glabel EnRu1_Destroy /* 00200 80AEAE10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00204 80AEAE14 03E00008 */ jr $ra /* 00208 80AEAE18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s index e32e32a951..e523210350 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AF1B94 + .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.text glabel EnRu1_Draw /* 05B94 80AF07A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 05B98 80AF07A8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,4 +32,3 @@ glabel EnRu1_Draw /* 05BE4 80AF07F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05BE8 80AF07F8 03E00008 */ jr $ra /* 05BEC 80AF07FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s index 87d2c6f68b..b64ab108ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80AF1AFC + .asciz "該当 arge_data = %d 無し\n" + .balign 4 + +.late_rodata +glabel jtbl_80AF1C60 +.word L80AF01A4 +.word L80AF01B8 +.word L80AF01CC +.word L80AF01E0 +.word L80AF01F4 +.word L80AF0208 +.word L80AF021C +.word L80AF0244 +.word L80AF0244 +.word L80AF0244 +.word L80AF0230 + +.text glabel EnRu1_Init /* 05500 80AF0110 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 05504 80AF0114 AFB10028 */ sw $s1, 0x0028($sp) @@ -103,5 +123,3 @@ glabel L80AF0244 /* 0565C 80AF026C 8FB10028 */ lw $s1, 0x0028($sp) /* 05660 80AF0270 03E00008 */ jr $ra /* 05664 80AF0274 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s index f176ade162..bdb32a7079 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AF1AC0 + .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.text glabel EnRu1_Update /* 054A4 80AF00B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 054A8 80AF00B8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnRu1_Update /* 054F4 80AF0104 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 054F8 80AF0108 03E00008 */ jr $ra /* 054FC 80AF010C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s index 65b4db1153..0952aa5f8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s @@ -18,5 +18,3 @@ glabel func_80AEAC10 /* 00038 80AEAC48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0003C 80AEAC4C 03E00008 */ jr $ra /* 00040 80AEAC50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s index d5961cc182..fe6d064a5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s @@ -37,5 +37,3 @@ glabel func_80AEAC54 /* 000C0 80AEACD0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000C4 80AEACD4 03E00008 */ jr $ra /* 000C8 80AEACD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s index 879d3289b5..e6bc7190c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s @@ -18,5 +18,3 @@ glabel func_80AEACDC /* 00104 80AEAD14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00108 80AEAD18 03E00008 */ jr $ra /* 0010C 80AEAD1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s index 0848511879..b7cf31a656 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s @@ -31,5 +31,3 @@ glabel func_80AEAD20 /* 0017C 80AEAD8C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00180 80AEAD90 03E00008 */ jr $ra /* 00184 80AEAD94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s index 19209cc763..ea7f09eb67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s @@ -17,5 +17,3 @@ glabel func_80AEAD98 /* 001BC 80AEADCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C0 80AEADD0 03E00008 */ jr $ra /* 001C4 80AEADD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s index 8a3d7d7f1e..a602cdd4b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s @@ -1,5 +1,3 @@ glabel func_80AEADD8 /* 001C8 80AEADD8 03E00008 */ jr $ra /* 001CC 80AEADDC AC80034C */ sw $zero, 0x034C($a0) ## 0000034C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s index ed49d2e808..95a6564bdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s @@ -3,5 +3,3 @@ glabel func_80AEADE0 /* 001D4 80AEADE4 00031A03 */ sra $v1, $v1, 8 /* 001D8 80AEADE8 03E00008 */ jr $ra /* 001DC 80AEADEC 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s index 8c1bcb376b..8790e65333 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s @@ -2,5 +2,3 @@ glabel func_80AEADF0 /* 001E0 80AEADF0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C /* 001E4 80AEADF4 03E00008 */ jr $ra /* 001E8 80AEADF8 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s index bc679263e9..2a29d0bdd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s @@ -38,5 +38,3 @@ glabel func_80AEAE1C /* 00288 80AEAE98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0028C 80AEAE9C 03E00008 */ jr $ra /* 00290 80AEAEA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s index 5b7b819c20..ed2028b7f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s @@ -4,5 +4,3 @@ glabel func_80AEAEA4 /* 0029C 80AEAEAC 00052C03 */ sra $a1, $a1, 16 /* 002A0 80AEAEB0 03E00008 */ jr $ra /* 002A4 80AEAEB4 A485025C */ sh $a1, 0x025C($a0) ## 0000025C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s index 83f515f5c8..d0dfae10d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s @@ -4,5 +4,3 @@ glabel func_80AEAEB8 /* 002B0 80AEAEC0 00052C03 */ sra $a1, $a1, 16 /* 002B4 80AEAEC4 03E00008 */ jr $ra /* 002B8 80AEAEC8 A4850260 */ sh $a1, 0x0260($a0) ## 00000260 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s index 8b0c09cc6b..9dceb4bd78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s @@ -26,5 +26,3 @@ glabel func_80AEAECC /* 0031C 80AEAF2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00320 80AEAF30 03E00008 */ jr $ra /* 00324 80AEAF34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s index d11c42a0be..63cfb11662 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s @@ -8,5 +8,3 @@ glabel func_80AEAF38 .L80AEAF50: /* 00340 80AEAF50 03E00008 */ jr $ra /* 00344 80AEAF54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s index 9ac72a3478..f605471c2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s @@ -18,5 +18,3 @@ glabel func_80AEAF58 /* 00384 80AEAF94 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00388 80AEAF98 03E00008 */ jr $ra /* 0038C 80AEAF9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s index 7475691494..948b73c980 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s @@ -17,5 +17,3 @@ glabel func_80AEAFA0 .L80AEAFD8: /* 003C8 80AEAFD8 03E00008 */ jr $ra /* 003CC 80AEAFDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s index a4fc064bdb..2b22905f24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s @@ -17,5 +17,3 @@ glabel func_80AEAFE0 .L80AEB018: /* 00408 80AEB018 03E00008 */ jr $ra /* 0040C 80AEB01C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s index be3001eab9..6a27fa3542 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s @@ -30,5 +30,3 @@ glabel func_80AEB020 /* 0046C 80AEB07C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00470 80AEB080 03E00008 */ jr $ra /* 00474 80AEB084 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s index a21bb0c9dc..bdfca9f992 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AF1A30 + .asciz "\x1b[31mお立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.text glabel func_80AEB088 /* 00478 80AEB088 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0047C 80AEB08C AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +35,3 @@ glabel func_80AEB088 /* 004D0 80AEB0E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004D4 80AEB0E4 03E00008 */ jr $ra /* 004D8 80AEB0E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s index f9a409cb61..027818a014 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s @@ -6,5 +6,3 @@ glabel func_80AEB0EC .L80AEB0FC: /* 004EC 80AEB0FC 03E00008 */ jr $ra /* 004F0 80AEB100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s index bf559aa457..94855e06d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s @@ -8,5 +8,3 @@ glabel func_80AEB104 .L80AEB11C: /* 0050C 80AEB11C 03E00008 */ jr $ra /* 00510 80AEB120 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s index 2508c38c2b..a88b1c6063 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s @@ -23,5 +23,3 @@ glabel func_80AEB124 .L80AEB16C: /* 0055C 80AEB16C 03E00008 */ jr $ra /* 00560 80AEB170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s index de292e80b6..0f3796a67c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s @@ -16,5 +16,3 @@ glabel func_80AEB174 /* 00598 80AEB1A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0059C 80AEB1AC 03E00008 */ jr $ra /* 005A0 80AEB1B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s index 9a170ce720..c9bacc73c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s @@ -8,5 +8,3 @@ glabel func_80AEB1B4 /* 005BC 80AEB1CC 2C420001 */ sltiu $v0, $v0, 0x0001 /* 005C0 80AEB1D0 03E00008 */ jr $ra /* 005C4 80AEB1D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s index 8a248c3414..df85225999 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s @@ -17,5 +17,3 @@ glabel func_80AEB1D8 /* 00604 80AEB214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00608 80AEB218 03E00008 */ jr $ra /* 0060C 80AEB21C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s index bfc4708ef5..c8c7f5ddf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s @@ -18,5 +18,3 @@ glabel func_80AEB220 /* 00648 80AEB258 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0064C 80AEB25C 03E00008 */ jr $ra /* 00650 80AEB260 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s index 670bf8c532..c0ae0a2fb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s @@ -50,5 +50,3 @@ glabel func_80AEB264 /* 00704 80AEB314 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00708 80AEB318 03E00008 */ jr $ra /* 0070C 80AEB31C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s index fe6a611cdc..98638138c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s @@ -20,5 +20,3 @@ glabel func_80AEB320 /* 00748 80AEB358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0074C 80AEB35C 03E00008 */ jr $ra /* 00750 80AEB360 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s index c5f6d03838..9c701f43e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s @@ -15,5 +15,3 @@ glabel func_80AEB364 /* 00788 80AEB398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0078C 80AEB39C 03E00008 */ jr $ra /* 00790 80AEB3A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s index 07b288092e..7e5e3c0946 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s @@ -9,5 +9,3 @@ glabel func_80AEB3A4 /* 007B0 80AEB3C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007B4 80AEB3C4 03E00008 */ jr $ra /* 007B8 80AEB3C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s index 973e662126..c370456dbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s @@ -3,5 +3,3 @@ glabel func_80AEB3CC /* 007C0 80AEB3D0 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 007C4 80AEB3D4 03E00008 */ jr $ra /* 007C8 80AEB3D8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s index 53b0da9923..eed9e7008a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s @@ -22,5 +22,3 @@ glabel func_80AEB3DC /* 0081C 80AEB42C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00820 80AEB430 03E00008 */ jr $ra /* 00824 80AEB434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s index 537a523edd..e38fac0223 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s @@ -7,5 +7,3 @@ glabel func_80AEB438 /* 0083C 80AEB44C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00840 80AEB450 03E00008 */ jr $ra /* 00844 80AEB454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s index f6ef11830a..5fabdd87fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s @@ -9,5 +9,3 @@ glabel func_80AEB458 /* 00864 80AEB474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00868 80AEB478 03E00008 */ jr $ra /* 0086C 80AEB47C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s index 294627f7b4..9701a1383a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s @@ -9,5 +9,3 @@ glabel func_80AEB480 /* 0088C 80AEB49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00890 80AEB4A0 03E00008 */ jr $ra /* 00894 80AEB4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s index f08bd0f24e..2188a8a157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s @@ -24,5 +24,3 @@ glabel func_80AEB4A8 /* 008F0 80AEB500 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 008F4 80AEB504 03E00008 */ jr $ra /* 008F8 80AEB508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s index e89ebdf791..1f7ac4468b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s @@ -36,5 +36,3 @@ glabel func_80AEB50C /* 00980 80AEB590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00984 80AEB594 03E00008 */ jr $ra /* 00988 80AEB598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s index a2f0b2b4ec..bb90daf989 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s @@ -56,5 +56,3 @@ glabel func_80AEB59C /* 00A64 80AEB674 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A68 80AEB678 03E00008 */ jr $ra /* 00A6C 80AEB67C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s index 3598b43125..02616bd6a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s @@ -23,5 +23,3 @@ glabel func_80AEB680 /* 00AC4 80AEB6D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00AC8 80AEB6D8 03E00008 */ jr $ra /* 00ACC 80AEB6DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s index 76399e7825..4a3b62cdec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s @@ -22,5 +22,3 @@ glabel func_80AEB6E0 /* 00B1C 80AEB72C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B20 80AEB730 03E00008 */ jr $ra /* 00B24 80AEB734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s index cbc385747e..7db781b9a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s @@ -38,5 +38,3 @@ glabel func_80AEB738 /* 00BB4 80AEB7C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00BB8 80AEB7C8 03E00008 */ jr $ra /* 00BBC 80AEB7CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s index e3966aa643..b7919e440e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s @@ -3,5 +3,3 @@ glabel func_80AEB7D0 /* 00BC4 80AEB7D4 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 /* 00BC8 80AEB7D8 03E00008 */ jr $ra /* 00BCC 80AEB7DC A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s index 3f1c764c69..b652dc9b9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s @@ -42,5 +42,3 @@ glabel func_80AEB7E0 /* 00C60 80AEB870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C64 80AEB874 03E00008 */ jr $ra /* 00C68 80AEB878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s index afda795612..880635deb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s @@ -7,5 +7,3 @@ glabel func_80AEB87C /* 00C80 80AEB890 460C5402 */ mul.s $f16, $f10, $f12 /* 00C84 80AEB894 03E00008 */ jr $ra /* 00C88 80AEB898 46028000 */ add.s $f0, $f16, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s index 5bc4ba01d1..b2dbc43da5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s @@ -30,5 +30,3 @@ glabel func_80AEB89C /* 00CF8 80AEB908 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CFC 80AEB90C 03E00008 */ jr $ra /* 00D00 80AEB910 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s index 19b032aa5c..340e1cce78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s @@ -7,5 +7,3 @@ glabel func_80AEB914 /* 00D18 80AEB928 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D1C 80AEB92C 03E00008 */ jr $ra /* 00D20 80AEB930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s index 6283e49d53..4e372d6af8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s @@ -7,5 +7,3 @@ glabel func_80AEB934 /* 00D38 80AEB948 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D3C 80AEB94C 03E00008 */ jr $ra /* 00D40 80AEB950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s index 52ef3ec253..3f6bea806d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s @@ -7,5 +7,3 @@ glabel func_80AEB954 /* 00D58 80AEB968 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D5C 80AEB96C 03E00008 */ jr $ra /* 00D60 80AEB970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s index 98f9466ff9..602ad25462 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s @@ -38,5 +38,3 @@ glabel func_80AEB974 /* 00DF0 80AEBA00 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00DF4 80AEBA04 03E00008 */ jr $ra /* 00DF8 80AEBA08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s index 407603d7ae..3b9932fde7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s @@ -7,5 +7,3 @@ glabel func_80AEBA0C /* 00E10 80AEBA20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E14 80AEBA24 03E00008 */ jr $ra /* 00E18 80AEBA28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s index cf29e48208..cc908033cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s @@ -52,5 +52,3 @@ glabel func_80AEBA2C /* 00EE0 80AEBAF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00EE4 80AEBAF4 03E00008 */ jr $ra /* 00EE8 80AEBAF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s index 642deb0062..4ed59560fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s @@ -16,5 +16,3 @@ glabel func_80AEBAFC /* 00F20 80AEBB30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F24 80AEBB34 03E00008 */ jr $ra /* 00F28 80AEBB38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s index 94d3fb20e9..1cdc3f5c56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s @@ -15,5 +15,3 @@ glabel func_80AEBB3C /* 00F5C 80AEBB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F60 80AEBB70 03E00008 */ jr $ra /* 00F64 80AEBB74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s index da1df35227..db9a21b4e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s @@ -32,5 +32,3 @@ glabel func_80AEBB78 /* 00FD8 80AEBBE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FDC 80AEBBEC 03E00008 */ jr $ra /* 00FE0 80AEBBF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s index 92799c51b0..46b14d5510 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s @@ -15,5 +15,3 @@ glabel func_80AEBBF4 /* 01014 80AEBC24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01018 80AEBC28 03E00008 */ jr $ra /* 0101C 80AEBC2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s index 83a4aa7349..ee936d7420 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s @@ -22,5 +22,3 @@ glabel func_80AEBC30 /* 01068 80AEBC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0106C 80AEBC7C 03E00008 */ jr $ra /* 01070 80AEBC80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s index 23c31b3aab..782e5a929b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s @@ -13,5 +13,3 @@ glabel func_80AEBC84 /* 0109C 80AEBCAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010A0 80AEBCB0 03E00008 */ jr $ra /* 010A4 80AEBCB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s index 2a4388e3da..f3aa3e750b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s @@ -27,5 +27,3 @@ glabel func_80AEBCB8 /* 01100 80AEBD10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01104 80AEBD14 03E00008 */ jr $ra /* 01108 80AEBD18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s index eeeaf26a34..5fe1ba15b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s @@ -30,5 +30,3 @@ glabel func_80AEBD1C /* 01178 80AEBD88 8FB10018 */ lw $s1, 0x0018($sp) /* 0117C 80AEBD8C 03E00008 */ jr $ra /* 01180 80AEBD90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s index 2f61e12870..0fa7ece5cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s @@ -44,5 +44,3 @@ glabel func_80AEBD94 /* 01220 80AEBE30 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01224 80AEBE34 03E00008 */ jr $ra /* 01228 80AEBE38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s index 4f0acd899a..6596ac5fc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s @@ -38,5 +38,3 @@ glabel func_80AEBE3C /* 012AC 80AEBEBC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 012B0 80AEBEC0 03E00008 */ jr $ra /* 012B4 80AEBEC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s index 42c7cd9030..a78250761c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s @@ -40,5 +40,3 @@ glabel func_80AEBEC8 /* 01344 80AEBF54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01348 80AEBF58 03E00008 */ jr $ra /* 0134C 80AEBF5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s index dfdc0ee0b8..027bc526a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s @@ -31,5 +31,3 @@ glabel func_80AEBF60 /* 013BC 80AEBFCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013C0 80AEBFD0 03E00008 */ jr $ra /* 013C4 80AEBFD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s index 6b2515686b..225a8bbfb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s @@ -40,5 +40,3 @@ glabel func_80AEBFD8 /* 01454 80AEC064 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01458 80AEC068 03E00008 */ jr $ra /* 0145C 80AEC06C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s index 23e5638f99..f9d47ff711 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s @@ -19,5 +19,3 @@ glabel func_80AEC070 /* 01498 80AEC0A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0149C 80AEC0AC 03E00008 */ jr $ra /* 014A0 80AEC0B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s index 29c009df47..a681e761f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s @@ -18,5 +18,3 @@ glabel func_80AEC0B4 /* 014E4 80AEC0F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014E8 80AEC0F8 03E00008 */ jr $ra /* 014EC 80AEC0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s index e070aaf29c..14b3eb1271 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s @@ -11,5 +11,3 @@ glabel func_80AEC100 /* 01514 80AEC124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01518 80AEC128 03E00008 */ jr $ra /* 0151C 80AEC12C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s index 8fb5cebfcc..7478f7e06c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s @@ -18,5 +18,3 @@ glabel func_80AEC130 /* 01560 80AEC170 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01564 80AEC174 03E00008 */ jr $ra /* 01568 80AEC178 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s index 0760f00ecf..d60acff351 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s @@ -21,5 +21,3 @@ glabel func_80AEC17C /* 015B8 80AEC1C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 015BC 80AEC1CC 03E00008 */ jr $ra /* 015C0 80AEC1D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s index d067f29ab6..0243a5de1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s @@ -27,5 +27,3 @@ glabel func_80AEC1D4 /* 01628 80AEC238 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0162C 80AEC23C 03E00008 */ jr $ra /* 01630 80AEC240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s index a98aefd843..21ebfdfb00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s @@ -30,5 +30,3 @@ glabel func_80AEC244 /* 016A4 80AEC2B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 016A8 80AEC2B8 03E00008 */ jr $ra /* 016AC 80AEC2BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s index e15a41dfac..5017743632 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s @@ -23,5 +23,3 @@ glabel func_80AEC2C0 /* 01704 80AEC314 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01708 80AEC318 03E00008 */ jr $ra /* 0170C 80AEC31C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s index de662611d3..eb9ddd4840 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s @@ -65,5 +65,3 @@ glabel func_80AEC320 /* 017F0 80AEC400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017F4 80AEC404 03E00008 */ jr $ra /* 017F8 80AEC408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s index 5dd59f96cb..8ec26d08dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AF1BCC + .float 0.01 + +glabel D_80AF1BD0 + .float 2.7 + +glabel D_80AF1BD4 + .float 0.01 + +glabel D_80AF1BD8 + .float 2.7 + +.text glabel func_80AEC40C /* 017FC 80AEC40C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01800 80AEC410 AFBF0014 */ sw $ra, 0x0014($sp) @@ -50,5 +64,3 @@ glabel func_80AEC40C /* 018B0 80AEC4C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018B4 80AEC4C4 03E00008 */ jr $ra /* 018B8 80AEC4C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s index b03e5a97d5..896cd12a35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s @@ -10,5 +10,3 @@ glabel func_80AEC4CC /* 018D8 80AEC4E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018DC 80AEC4EC 03E00008 */ jr $ra /* 018E0 80AEC4F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s index f929d8646e..301df6f295 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AF1BDC + .float 0.01 + +glabel D_80AF1BE0 + .float 0.01 + +.text glabel func_80AEC4F4 /* 018E4 80AEC4F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 018E8 80AEC4F8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -68,5 +76,3 @@ glabel func_80AEC4F4 /* 019E0 80AEC5F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 019E4 80AEC5F4 03E00008 */ jr $ra /* 019E8 80AEC5F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s index 699b501a57..af8bb8e7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF1BE4 + .float 265.0 + +.text glabel func_80AEC5FC /* 019EC 80AEC5FC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 /* 019F0 80AEC600 C480002C */ lwc1 $f0, 0x002C($a0) ## 0000002C @@ -22,5 +27,3 @@ glabel func_80AEC5FC .L80AEC648: /* 01A38 80AEC648 03E00008 */ jr $ra /* 01A3C 80AEC64C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s index 7f541140a1..b47dc9082a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s @@ -26,5 +26,3 @@ glabel func_80AEC650 /* 01A94 80AEC6A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A98 80AEC6A8 03E00008 */ jr $ra /* 01A9C 80AEC6AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s index 91f0e809e3..46a2a94549 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s @@ -12,5 +12,3 @@ glabel func_80AEC6B0 /* 01AC8 80AEC6D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01ACC 80AEC6DC 03E00008 */ jr $ra /* 01AD0 80AEC6E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s index 4132687239..56b247c94e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s @@ -42,5 +42,3 @@ glabel func_80AEC6E4 /* 01B64 80AEC774 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B68 80AEC778 03E00008 */ jr $ra /* 01B6C 80AEC77C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s index 052f0eaf9a..ca02fd9d41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s @@ -40,5 +40,3 @@ glabel func_80AEC780 /* 01C00 80AEC810 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C04 80AEC814 03E00008 */ jr $ra /* 01C08 80AEC818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s index 033cdcf7b0..77bcf5cc3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s @@ -39,5 +39,3 @@ glabel func_80AEC81C /* 01C9C 80AEC8AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CA0 80AEC8B0 03E00008 */ jr $ra /* 01CA4 80AEC8B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s index e481540a5e..4abec3f8a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s @@ -35,5 +35,3 @@ glabel func_80AEC8B8 /* 01D20 80AEC930 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D24 80AEC934 03E00008 */ jr $ra /* 01D28 80AEC938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s index a1b498c166..9153e85611 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s @@ -36,5 +36,3 @@ glabel func_80AEC93C /* 01DA8 80AEC9B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01DAC 80AEC9BC 03E00008 */ jr $ra /* 01DB0 80AEC9C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s index 2aef678e26..7d64453187 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s @@ -21,5 +21,3 @@ glabel func_80AEC9C4 .L80AECA10: /* 01E00 80AECA10 03E00008 */ jr $ra /* 01E04 80AECA14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s index 02518bc510..856ece386e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s @@ -11,5 +11,3 @@ glabel func_80AECA18 .L80AECA3C: /* 01E2C 80AECA3C 03E00008 */ jr $ra /* 01E30 80AECA40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s index 7cc982398a..a54aa169ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s @@ -20,5 +20,3 @@ glabel func_80AECA44 /* 01E78 80AECA88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E7C 80AECA8C 03E00008 */ jr $ra /* 01E80 80AECA90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s index 3e22779737..0f0f5f19db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s @@ -7,5 +7,3 @@ glabel func_80AECA94 /* 01E98 80AECAA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E9C 80AECAAC 03E00008 */ jr $ra /* 01EA0 80AECAB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s index 223ac8dcb0..278d5fb35b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s @@ -7,5 +7,3 @@ glabel func_80AECAB4 /* 01EB8 80AECAC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01EBC 80AECACC 03E00008 */ jr $ra /* 01EC0 80AECAD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s index d22423f37d..5715a8d22c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s @@ -16,5 +16,3 @@ glabel func_80AECAD4 /* 01EFC 80AECB0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F00 80AECB10 03E00008 */ jr $ra /* 01F04 80AECB14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s index a854a8038b..9dc5bd4433 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s @@ -17,5 +17,3 @@ glabel func_80AECB18 /* 01F44 80AECB54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F48 80AECB58 03E00008 */ jr $ra /* 01F4C 80AECB5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s index 5bae9ce77c..0a88eaceae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s @@ -21,5 +21,3 @@ glabel func_80AECB60 /* 01F9C 80AECBAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01FA0 80AECBB0 03E00008 */ jr $ra /* 01FA4 80AECBB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s index 8a27056c61..0649762915 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s @@ -24,5 +24,3 @@ glabel func_80AECBB8 /* 02000 80AECC10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02004 80AECC14 03E00008 */ jr $ra /* 02008 80AECC18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s index 0684d43e9b..14f0981da5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s @@ -25,5 +25,3 @@ glabel func_80AECC1C /* 02068 80AECC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0206C 80AECC7C 03E00008 */ jr $ra /* 02070 80AECC80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s index c7012486c8..5903394c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s @@ -12,5 +12,3 @@ glabel func_80AECC84 /* 02094 80AECCA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02098 80AECCA8 03E00008 */ jr $ra /* 0209C 80AECCAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s index 4ccee125ca..c18739060b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s @@ -62,5 +62,3 @@ glabel func_80AECCB0 /* 02184 80AECD94 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 02188 80AECD98 03E00008 */ jr $ra /* 0218C 80AECD9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s index 7f4fd4f243..d63fc59aa1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF1BE8 + .float -10000.0 + +.text glabel func_80AECDA0 /* 02190 80AECDA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02194 80AECDA4 AFA50024 */ sw $a1, 0x0024($sp) @@ -24,5 +29,3 @@ glabel func_80AECDA0 /* 021E8 80AECDF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 021EC 80AECDFC 03E00008 */ jr $ra /* 021F0 80AECE00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s index a9a11a1eb3..12086bce25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF1BEC + .float 83.333336 + +.text glabel func_80AECE04 /* 021F4 80AECE04 AFA50004 */ sw $a1, 0x0004($sp) /* 021F8 80AECE08 3C0180AF */ lui $at, %hi(D_80AF1BEC) ## $at = 80AF0000 @@ -6,5 +11,3 @@ glabel func_80AECE04 /* 02204 80AECE14 46062200 */ add.s $f8, $f4, $f6 /* 02208 80AECE18 03E00008 */ jr $ra /* 0220C 80AECE1C E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s index 00aacc3951..85d4eef954 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s @@ -38,5 +38,3 @@ glabel func_80AECE20 /* 02298 80AECEA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0229C 80AECEAC 03E00008 */ jr $ra /* 022A0 80AECEB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s index 128b5dcfe7..f99979d5da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s @@ -47,5 +47,3 @@ glabel func_80AECEB4 /* 02350 80AECF60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02354 80AECF64 03E00008 */ jr $ra /* 02358 80AECF68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s index 98c6060336..f6bff7b30a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF1BF0 + .float 10430.378 + +.text glabel func_80AECF6C /* 0235C 80AECF6C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02360 80AECF70 AFBF001C */ sw $ra, 0x001C($sp) @@ -73,5 +78,3 @@ glabel func_80AECF6C /* 02468 80AED078 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0246C 80AED07C 03E00008 */ jr $ra /* 02470 80AED080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s index 06b48fb08b..0149d884d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s @@ -12,5 +12,3 @@ glabel func_80AED084 .L80AED0A8: /* 02498 80AED0A8 03E00008 */ jr $ra /* 0249C 80AED0AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s index f4f300c8f1..50d1ddb542 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s @@ -6,5 +6,3 @@ glabel func_80AED0B0 .L80AED0C0: /* 024B0 80AED0C0 03E00008 */ jr $ra /* 024B4 80AED0C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s index 2e55547318..279d5da22b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s @@ -3,5 +3,3 @@ glabel func_80AED0C8 /* 024BC 80AED0CC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 /* 024C0 80AED0D0 03E00008 */ jr $ra /* 024C4 80AED0D4 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s index df634d9dce..c3875bae07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s @@ -13,5 +13,3 @@ glabel func_80AED0D8 /* 024F4 80AED104 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 024F8 80AED108 03E00008 */ jr $ra /* 024FC 80AED10C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s index d6365a241e..fd20b4e19b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s @@ -17,5 +17,3 @@ glabel func_80AED110 /* 02538 80AED148 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0253C 80AED14C 03E00008 */ jr $ra /* 02540 80AED150 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s index e870bcd4c4..7d4d441b76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s @@ -18,5 +18,3 @@ glabel func_80AED154 /* 02580 80AED190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02584 80AED194 03E00008 */ jr $ra /* 02588 80AED198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s index c2d3ff0759..2bcff903c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s @@ -33,5 +33,3 @@ glabel func_80AED19C /* 025FC 80AED20C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02600 80AED210 03E00008 */ jr $ra /* 02604 80AED214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s index e0827ec14f..30e9c43062 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s @@ -65,5 +65,3 @@ glabel func_80AED218 /* 026E8 80AED2F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 026EC 80AED2FC 03E00008 */ jr $ra /* 026F0 80AED300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s index 827a328cdb..2abdea62a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s @@ -7,5 +7,3 @@ glabel func_80AED304 /* 02708 80AED318 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0270C 80AED31C 03E00008 */ jr $ra /* 02710 80AED320 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s index f0360be6c7..8dedd13421 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s @@ -7,5 +7,3 @@ glabel func_80AED324 /* 02728 80AED338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0272C 80AED33C 03E00008 */ jr $ra /* 02730 80AED340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s index 0481186419..13ee4c51c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s @@ -11,5 +11,3 @@ glabel func_80AED344 /* 02758 80AED368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0275C 80AED36C 03E00008 */ jr $ra /* 02760 80AED370 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s index 21f5081dd2..dfbee1cf6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s @@ -11,5 +11,3 @@ glabel func_80AED374 /* 02788 80AED398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0278C 80AED39C 03E00008 */ jr $ra /* 02790 80AED3A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s index 5a249642c9..5d4dd5257f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s @@ -14,5 +14,3 @@ glabel func_80AED3A4 /* 027C4 80AED3D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 027C8 80AED3D8 03E00008 */ jr $ra /* 027CC 80AED3DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s index ebaca3e3f7..5309640a75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s @@ -12,5 +12,3 @@ glabel func_80AED3E0 /* 027F8 80AED408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 027FC 80AED40C 03E00008 */ jr $ra /* 02800 80AED410 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s index 5914c38284..b00c2932b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s @@ -13,5 +13,3 @@ glabel func_80AED414 /* 02830 80AED440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02834 80AED444 03E00008 */ jr $ra /* 02838 80AED448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s index cec21c666e..15e050ef69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s @@ -49,5 +49,3 @@ glabel func_80AED44C /* 028E0 80AED4F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 028E4 80AED4F4 03E00008 */ jr $ra /* 028E8 80AED4F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s index c5a764b17f..6ca2b0a90a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s @@ -8,5 +8,3 @@ glabel func_80AED4FC /* 02904 80AED514 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02908 80AED518 03E00008 */ jr $ra /* 0290C 80AED51C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s index 82018fbe22..0e703ee158 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s @@ -23,5 +23,3 @@ glabel func_80AED520 /* 02960 80AED570 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02964 80AED574 03E00008 */ jr $ra /* 02968 80AED578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s index b33241b0c7..ef1d1e5c86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s @@ -15,5 +15,3 @@ glabel func_80AED57C /* 0299C 80AED5AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029A0 80AED5B0 03E00008 */ jr $ra /* 029A4 80AED5B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s index 92f6423590..08676811dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s @@ -8,5 +8,3 @@ glabel func_80AED5B8 /* 029C0 80AED5D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029C4 80AED5D4 03E00008 */ jr $ra /* 029C8 80AED5D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s index 208414bdd5..883e7233d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s @@ -8,5 +8,3 @@ glabel func_80AED5DC /* 029E4 80AED5F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029E8 80AED5F8 03E00008 */ jr $ra /* 029EC 80AED5FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s index bfe0d303d9..bd7d3cb867 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s @@ -8,5 +8,3 @@ glabel func_80AED600 /* 02A08 80AED618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A0C 80AED61C 03E00008 */ jr $ra /* 02A10 80AED620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s index 0ecf1e8dcd..e6a990b266 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s @@ -50,5 +50,3 @@ glabel func_80AED624 /* 02AC0 80AED6D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02AC4 80AED6D4 03E00008 */ jr $ra /* 02AC8 80AED6D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s index 487fb218fe..fb010407d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s @@ -6,5 +6,3 @@ glabel func_80AED6DC /* 02ADC 80AED6EC A0820285 */ sb $v0, 0x0285($a0) ## 00000285 /* 02AE0 80AED6F0 03E00008 */ jr $ra /* 02AE4 80AED6F4 E4840288 */ swc1 $f4, 0x0288($a0) ## 00000288 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s index ae6287979f..bb401d1157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s @@ -16,5 +16,3 @@ glabel func_80AED6F8 .L80AED730: /* 02B20 80AED730 03E00008 */ jr $ra /* 02B24 80AED734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s index 49787a70bd..96c827bcbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s @@ -70,5 +70,3 @@ glabel func_80AED738 /* 02C20 80AED830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C24 80AED834 03E00008 */ jr $ra /* 02C28 80AED838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s index 300ad92099..b65fd27950 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s @@ -43,5 +43,3 @@ glabel func_80AED83C /* 02CC0 80AED8D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02CC4 80AED8D4 03E00008 */ jr $ra /* 02CC8 80AED8D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s index df800f5b11..00ffa69d39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s @@ -147,5 +147,3 @@ glabel func_80AED8DC /* 02EC4 80AEDAD4 8FB10020 */ lw $s1, 0x0020($sp) /* 02EC8 80AEDAD8 03E00008 */ jr $ra /* 02ECC 80AEDADC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s index 2c6cb93fab..5d7224ccb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s @@ -22,5 +22,3 @@ glabel func_80AEDAE0 /* 02F14 80AEDB24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F18 80AEDB28 03E00008 */ jr $ra /* 02F1C 80AEDB2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s index 5a0c30038d..7b8886821a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s @@ -1,3 +1,35 @@ +.late_rodata +glabel D_80AF1BF4 + .float 0.01 + +glabel D_80AF1BF8 + .float 0.01 + +glabel D_80AF1BFC + .float 0.8 + +glabel D_80AF1C00 + .float 0.6 + +glabel D_80AF1C04 + .float 0.6, 0.01 + +glabel D_80AF1C0C + .float 0.01 + +glabel D_80AF1C10 + .float 0.8 + +glabel D_80AF1C14 + .float 0.6 + +glabel D_80AF1C18 + .float 0.01 + +glabel D_80AF1C1C + .float 0.6 + +.text glabel func_80AEDB30 /* 02F20 80AEDB30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02F24 80AEDB34 AFBF0014 */ sw $ra, 0x0014($sp) @@ -255,5 +287,3 @@ glabel func_80AEDB30 /* 032D8 80AEDEE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032DC 80AEDEEC 03E00008 */ jr $ra /* 032E0 80AEDEF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s index cabf748940..f297f2867b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AF1C20 + .float 1.1 + +glabel D_80AF1C24 + .float 0.01 + +glabel D_80AF1C28 + .float 0.98 + +.text glabel func_80AEDEF4 /* 032E4 80AEDEF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 032E8 80AEDEF8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -68,5 +79,3 @@ glabel func_80AEDEF4 /* 033D8 80AEDFE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 033DC 80AEDFEC 03E00008 */ jr $ra /* 033E0 80AEDFF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s index fae3f2e0c9..3223db645b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s @@ -14,5 +14,3 @@ glabel func_80AEDFF4 /* 03410 80AEE020 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03414 80AEE024 03E00008 */ jr $ra /* 03418 80AEE028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s index 0f43d5ba15..a1c3f4d90c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s @@ -8,5 +8,3 @@ glabel func_80AEE02C /* 03434 80AEE044 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C /* 03438 80AEE048 03E00008 */ jr $ra /* 0343C 80AEE04C E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s index 69869ae06b..b4d03600c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80AF1C2C + .float 0.2 + +glabel D_80AF1C30 + .float -0.1 +glabel D_80AF1C34 + .float 0.1 + +glabel D_80AF1C38 + .float 0.95 + +.text glabel func_80AEE050 /* 03440 80AEE050 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03444 80AEE054 AFBF001C */ sw $ra, 0x001C($sp) @@ -143,5 +156,3 @@ glabel func_80AEE050 /* 03648 80AEE258 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0364C 80AEE25C 03E00008 */ jr $ra /* 03650 80AEE260 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s index 0ca5b84906..09aaab200a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s @@ -40,5 +40,3 @@ glabel func_80AEE264 /* 036DC 80AEE2EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 036E0 80AEE2F0 03E00008 */ jr $ra /* 036E4 80AEE2F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s index fc907c39a2..33d42acbfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s @@ -41,5 +41,3 @@ glabel func_80AEE2F8 /* 03778 80AEE388 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0377C 80AEE38C 03E00008 */ jr $ra /* 03780 80AEE390 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s index b0b9bb3dad..e160ed10e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s @@ -63,5 +63,3 @@ glabel func_80AEE394 /* 0386C 80AEE47C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03870 80AEE480 03E00008 */ jr $ra /* 03874 80AEE484 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s index f5680fab23..ecbead59f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80AF1C3C + .float 0.01 + +glabel D_80AF1C40 + .float 6.8 +glabel D_80AF1C44 + .float 1.3 + +.text glabel func_80AEE488 /* 03878 80AEE488 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0387C 80AEE48C AFBF0014 */ sw $ra, 0x0014($sp) @@ -58,5 +68,3 @@ glabel func_80AEE488 /* 0394C 80AEE55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03950 80AEE560 03E00008 */ jr $ra /* 03954 80AEE564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s index 86128129a7..aedcbafbd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s @@ -49,5 +49,3 @@ glabel func_80AEE568 /* 03A0C 80AEE61C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03A10 80AEE620 03E00008 */ jr $ra /* 03A14 80AEE624 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s index 165313e088..dff390a67e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s @@ -44,5 +44,3 @@ glabel func_80AEE628 /* 03AB4 80AEE6C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03AB8 80AEE6C8 03E00008 */ jr $ra /* 03ABC 80AEE6CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s index fac3bad620..2ccfea6b7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s @@ -66,5 +66,3 @@ glabel func_80AEE6D0 /* 03BA8 80AEE7B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03BAC 80AEE7BC 03E00008 */ jr $ra /* 03BB0 80AEE7C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s index 8987a2763d..af0c0fc2bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80AF1C48 + .float 0.01 + +glabel D_80AF1C4C + .float 6.8 + +glabel D_80AF1C50 + .float 1.3 + +.text glabel func_80AEE7C4 /* 03BB4 80AEE7C4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 03BB8 80AEE7C8 AFBF002C */ sw $ra, 0x002C($sp) @@ -208,5 +219,3 @@ glabel func_80AEE7C4 /* 03EAC 80AEEABC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 03EB0 80AEEAC0 03E00008 */ jr $ra /* 03EB4 80AEEAC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s index 96dcb1d83c..6f78801363 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s @@ -23,5 +23,3 @@ glabel func_80AEEAC8 /* 03F08 80AEEB18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F0C 80AEEB1C 03E00008 */ jr $ra /* 03F10 80AEEB20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s index 8f601a56ad..9553c89f36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80AF1C54 + .float -0.1 +glabel D_80AF1C58 + .float 0.1 + +glabel D_80AF1C5C + .float 0.7 + +.text glabel func_80AEEB24 /* 03F14 80AEEB24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03F18 80AEEB28 AFBF0014 */ sw $ra, 0x0014($sp) @@ -37,5 +47,3 @@ glabel func_80AEEB24 /* 03F98 80AEEBA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F9C 80AEEBAC 03E00008 */ jr $ra /* 03FA0 80AEEBB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s index 4ab036e525..a64991f426 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s @@ -7,5 +7,3 @@ glabel func_80AEEBB4 /* 03FB8 80AEEBC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03FBC 80AEEBCC 03E00008 */ jr $ra /* 03FC0 80AEEBD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s index 17a5dba291..e44278ea53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s @@ -33,5 +33,3 @@ glabel func_80AEEBD4 /* 04040 80AEEC50 8FB10018 */ lw $s1, 0x0018($sp) /* 04044 80AEEC54 03E00008 */ jr $ra /* 04048 80AEEC58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s index 2efe368a16..40473d131c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s @@ -36,5 +36,3 @@ glabel func_80AEEC5C /* 040D4 80AEECE4 8FB10018 */ lw $s1, 0x0018($sp) /* 040D8 80AEECE8 03E00008 */ jr $ra /* 040DC 80AEECEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s index 299b41cd93..908bec5321 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s @@ -25,5 +25,3 @@ glabel func_80AEECF0 /* 0413C 80AEED4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04140 80AEED50 03E00008 */ jr $ra /* 04144 80AEED54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s index da3de5bdd4..64fe722ae4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s @@ -29,5 +29,3 @@ glabel func_80AEED58 /* 041B0 80AEEDC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 041B4 80AEEDC4 03E00008 */ jr $ra /* 041B8 80AEEDC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s index 8d90aecdae..9fc7d2f9e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s @@ -25,5 +25,3 @@ glabel func_80AEEDCC /* 04218 80AEEE28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0421C 80AEEE2C 03E00008 */ jr $ra /* 04220 80AEEE30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s index fc35ae5654..4a89efb956 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s @@ -25,5 +25,3 @@ glabel func_80AEEE34 /* 04280 80AEEE90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04284 80AEEE94 03E00008 */ jr $ra /* 04288 80AEEE98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s index 791f03b56c..88d27cd086 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s @@ -26,5 +26,3 @@ glabel func_80AEEE9C /* 042EC 80AEEEFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 042F0 80AEEF00 03E00008 */ jr $ra /* 042F4 80AEEF04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s index 706de5a2fd..22861ead0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s @@ -20,5 +20,3 @@ glabel func_80AEEF08 /* 04340 80AEEF50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04344 80AEEF54 03E00008 */ jr $ra /* 04348 80AEEF58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s index bcdfffd016..1093f3e439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s @@ -2,5 +2,3 @@ glabel func_80AEEF5C /* 0434C 80AEEF5C AFA40000 */ sw $a0, 0x0000($sp) /* 04350 80AEEF60 03E00008 */ jr $ra /* 04354 80AEEF64 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s index ea323c0f05..971b22c73c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s @@ -32,5 +32,3 @@ glabel func_80AEEF68 /* 043D0 80AEEFE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 043D4 80AEEFE4 03E00008 */ jr $ra /* 043D8 80AEEFE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s index c89c311596..3882b338cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s @@ -36,5 +36,3 @@ glabel func_80AEEFEC /* 04464 80AEF074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04468 80AEF078 03E00008 */ jr $ra /* 0446C 80AEF07C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s index eabe6cc45d..cc10d1328f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s @@ -15,5 +15,3 @@ glabel func_80AEF080 /* 044A0 80AEF0B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 044A4 80AEF0B4 03E00008 */ jr $ra /* 044A8 80AEF0B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s index 769502fbbb..575f060979 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s @@ -48,5 +48,3 @@ glabel func_80AEF0BC /* 04554 80AEF164 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04558 80AEF168 03E00008 */ jr $ra /* 0455C 80AEF16C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s index 1c7e9ba5f2..fdc31eec1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s @@ -6,5 +6,3 @@ glabel func_80AEF170 .L80AEF180: /* 04570 80AEF180 03E00008 */ jr $ra /* 04574 80AEF184 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s index 612c3d7c71..bdffc5180e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s @@ -27,5 +27,3 @@ glabel func_80AEF188 /* 045D4 80AEF1E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 045D8 80AEF1E8 03E00008 */ jr $ra /* 045DC 80AEF1EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s index e5d2eb69b1..cc178f3462 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s @@ -45,5 +45,3 @@ glabel func_80AEF1F0 /* 04680 80AEF290 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04684 80AEF294 03E00008 */ jr $ra /* 04688 80AEF298 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s index b51c42c3b0..a2065d8b71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s @@ -3,5 +3,3 @@ glabel func_80AEF29C /* 04690 80AEF2A0 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 /* 04694 80AEF2A4 03E00008 */ jr $ra /* 04698 80AEF2A8 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s index c0349833d9..a2a6acda42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s @@ -8,5 +8,3 @@ glabel func_80AEF2AC /* 046B4 80AEF2C4 AC8F0268 */ sw $t7, 0x0268($a0) ## 00000268 /* 046B8 80AEF2C8 03E00008 */ jr $ra /* 046BC 80AEF2CC AC990004 */ sw $t9, 0x0004($a0) ## 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s index fb812edfda..c84e8f22b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s @@ -32,5 +32,3 @@ glabel func_80AEF2D0 /* 04738 80AEF348 8FB10018 */ lw $s1, 0x0018($sp) /* 0473C 80AEF34C 03E00008 */ jr $ra /* 04740 80AEF350 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s index ef47c94fe5..a5efd0aa63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s @@ -20,5 +20,3 @@ glabel func_80AEF354 /* 0478C 80AEF39C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04790 80AEF3A0 03E00008 */ jr $ra /* 04794 80AEF3A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s index 73930f47eb..f55dea139b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s @@ -24,5 +24,3 @@ glabel func_80AEF3A8 /* 047F0 80AEF400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 047F4 80AEF404 03E00008 */ jr $ra /* 047F8 80AEF408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s index ac3199d644..b93ac087b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s @@ -40,5 +40,3 @@ glabel func_80AEF40C /* 0488C 80AEF49C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04890 80AEF4A0 03E00008 */ jr $ra /* 04894 80AEF4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s index b5d474815b..2317ef2876 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s @@ -14,5 +14,3 @@ glabel func_80AEF4A8 /* 048C4 80AEF4D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 048C8 80AEF4D8 03E00008 */ jr $ra /* 048CC 80AEF4DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s index 9319b664dd..4d0846c79c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s @@ -15,5 +15,3 @@ glabel func_80AEF4E0 /* 04900 80AEF510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04904 80AEF514 03E00008 */ jr $ra /* 04908 80AEF518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s index 6293450d77..95bd300ff1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s @@ -8,5 +8,3 @@ glabel func_80AEF51C /* 04924 80AEF534 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04928 80AEF538 03E00008 */ jr $ra /* 0492C 80AEF53C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s index 55b82daa06..cdd27ffdf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s @@ -30,5 +30,3 @@ glabel func_80AEF540 /* 0499C 80AEF5AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 049A0 80AEF5B0 03E00008 */ jr $ra /* 049A4 80AEF5B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s index a9d159ab31..cf91a68398 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s @@ -28,5 +28,3 @@ glabel func_80AEF5B8 /* 04A08 80AEF618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04A0C 80AEF61C 03E00008 */ jr $ra /* 04A10 80AEF620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s index e910cca45b..b0445d0c3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s @@ -67,5 +67,3 @@ glabel func_80AEF624 /* 04B0C 80AEF71C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04B10 80AEF720 03E00008 */ jr $ra /* 04B14 80AEF724 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s index 68255964bc..7c941c16c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s @@ -31,5 +31,3 @@ glabel func_80AEF728 /* 04B80 80AEF790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04B84 80AEF794 03E00008 */ jr $ra /* 04B88 80AEF798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s index f2ae45c41e..a6c36c20cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s @@ -35,5 +35,3 @@ glabel func_80AEF79C /* 04C04 80AEF814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04C08 80AEF818 03E00008 */ jr $ra /* 04C0C 80AEF81C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s index f8e6a2f7b3..5dad9ca449 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s @@ -30,5 +30,3 @@ glabel func_80AEF820 /* 04C74 80AEF884 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04C78 80AEF888 03E00008 */ jr $ra /* 04C7C 80AEF88C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s index 5a05d0fcee..a610334bc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s @@ -41,5 +41,3 @@ glabel func_80AEF890 /* 04D14 80AEF924 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04D18 80AEF928 03E00008 */ jr $ra /* 04D1C 80AEF92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s index fa24ded7a3..1dbb5bfc09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s @@ -27,5 +27,3 @@ glabel func_80AEF930 /* 04D80 80AEF990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04D84 80AEF994 03E00008 */ jr $ra /* 04D88 80AEF998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s index 39e413a651..bfb9fb8661 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s @@ -16,5 +16,3 @@ glabel func_80AEF99C /* 04DBC 80AEF9CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04DC0 80AEF9D0 03E00008 */ jr $ra /* 04DC4 80AEF9D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s index ad8fa7a5f7..702a843649 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s @@ -20,5 +20,3 @@ glabel func_80AEF9D8 /* 04E10 80AEFA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04E14 80AEFA24 03E00008 */ jr $ra /* 04E18 80AEFA28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s index 99cf0a336c..90f550550e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s @@ -31,5 +31,3 @@ glabel func_80AEFA2C /* 04E90 80AEFAA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04E94 80AEFAA4 03E00008 */ jr $ra /* 04E98 80AEFAA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s index e91b96ab68..cea585e4e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s @@ -21,5 +21,3 @@ glabel func_80AEFAAC /* 04EE8 80AEFAF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04EEC 80AEFAFC 03E00008 */ jr $ra /* 04EF0 80AEFB00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s index 3d0268a8e2..d04cfee9fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s @@ -24,5 +24,3 @@ glabel func_80AEFB04 /* 04F4C 80AEFB5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04F50 80AEFB60 03E00008 */ jr $ra /* 04F54 80AEFB64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s index d2da4b9798..7f810aab89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s @@ -23,5 +23,3 @@ glabel func_80AEFB68 /* 04FAC 80AEFBBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04FB0 80AEFBC0 03E00008 */ jr $ra /* 04FB4 80AEFBC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s index 90618c4fdf..1b50d59bc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s @@ -22,5 +22,3 @@ glabel func_80AEFBC8 /* 05008 80AEFC18 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0500C 80AEFC1C 03E00008 */ jr $ra /* 05010 80AEFC20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s index 94cee30122..18346c310f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s @@ -11,5 +11,3 @@ glabel func_80AEFC24 /* 05038 80AEFC48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0503C 80AEFC4C 03E00008 */ jr $ra /* 05040 80AEFC50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s index 91d6726ec8..5162a8b3ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s @@ -39,5 +39,3 @@ glabel func_80AEFC54 /* 050CC 80AEFCDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 050D0 80AEFCE0 03E00008 */ jr $ra /* 050D4 80AEFCE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s index 67138ebf38..92b418fa0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s @@ -20,5 +20,3 @@ glabel func_80AEFCE8 /* 0511C 80AEFD2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05120 80AEFD30 03E00008 */ jr $ra /* 05124 80AEFD34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s index 24c2994fc5..552ad8de7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s @@ -36,5 +36,3 @@ glabel func_80AEFD38 /* 051A4 80AEFDB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 051A8 80AEFDB8 03E00008 */ jr $ra /* 051AC 80AEFDBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s index e74e673e1f..6fe2271cb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s @@ -32,5 +32,3 @@ glabel func_80AEFDC0 /* 0521C 80AEFE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05220 80AEFE30 03E00008 */ jr $ra /* 05224 80AEFE34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s index eb946b035b..3bed6a3f29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s @@ -20,5 +20,3 @@ glabel func_80AEFE38 /* 05268 80AEFE78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0526C 80AEFE7C 03E00008 */ jr $ra /* 05270 80AEFE80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s index 2bbc300fbc..72acc6a005 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s @@ -6,5 +6,3 @@ glabel func_80AEFE84 .L80AEFE94: /* 05284 80AEFE94 03E00008 */ jr $ra /* 05288 80AEFE98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s index 31e2537a5a..de8f254e0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s @@ -12,5 +12,3 @@ glabel func_80AEFE9C /* 052B0 80AEFEC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 052B4 80AEFEC4 03E00008 */ jr $ra /* 052B8 80AEFEC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s index c549623d28..3999dde68f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s @@ -28,5 +28,3 @@ glabel func_80AEFECC /* 05324 80AEFF34 8FB10018 */ lw $s1, 0x0018($sp) /* 05328 80AEFF38 03E00008 */ jr $ra /* 0532C 80AEFF3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s index cfa2bc97da..2c9939ce1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s @@ -20,5 +20,3 @@ glabel func_80AEFF40 /* 05378 80AEFF88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0537C 80AEFF8C 03E00008 */ jr $ra /* 05380 80AEFF90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s index 4fac2f00d4..8fd3472037 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s @@ -1,3 +1,12 @@ +.rdata +glabel D_80AF1A64 + .asciz "スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 +glabel D_80AF1A90 + .asciz "スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80AEFF94 /* 05384 80AEFF94 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 05388 80AEFF98 9442F580 */ lhu $v0, -0x0A80($v0) ## 8015F580 @@ -51,5 +60,3 @@ glabel func_80AEFF94 /* 05434 80AF0044 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05438 80AF0048 03E00008 */ jr $ra /* 0543C 80AF004C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s index a942430b75..c3e8132f4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s @@ -24,5 +24,3 @@ glabel func_80AF0050 /* 05498 80AF00A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0549C 80AF00AC 03E00008 */ jr $ra /* 054A0 80AF00B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s index 45a04c4e71..9db5b27773 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s @@ -29,5 +29,3 @@ glabel func_80AF0278 /* 056CC 80AF02DC A4EF0004 */ sh $t7, 0x0004($a3) ## 00000004 /* 056D0 80AF02E0 03E00008 */ jr $ra /* 056D4 80AF02E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s index 8a4a914f5f..45687b55ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80AF1B18 + .asciz "\x1b[31m首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" + .balign 4 + +.text glabel func_80AF02E8 /* 056D8 80AF02E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 056DC 80AF02EC 8FAE002C */ lw $t6, 0x002C($sp) @@ -35,5 +41,3 @@ glabel func_80AF02E8 /* 0574C 80AF035C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 05750 80AF0360 03E00008 */ jr $ra /* 05754 80AF0364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s index c61a210eab..4bb63237c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s @@ -35,5 +35,3 @@ glabel func_80AF0368 /* 057D8 80AF03E8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 057DC 80AF03EC 03E00008 */ jr $ra /* 057E0 80AF03F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s index 361fdf0ece..3088a691c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s @@ -2,5 +2,3 @@ glabel func_80AF03F4 /* 057E4 80AF03F4 AFA40000 */ sw $a0, 0x0000($sp) /* 057E8 80AF03F8 03E00008 */ jr $ra /* 057EC 80AF03FC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s index cab71abb4a..a809ad78a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AF1B54 + .asciz "../z_en_ru1.c" + .balign 4 + +glabel D_80AF1B64 + .asciz "../z_en_ru1.c" + .balign 4 + +.text glabel func_80AF0400 /* 057F0 80AF0400 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 057F4 80AF0404 AFBF002C */ sw $ra, 0x002C($sp) @@ -116,5 +126,3 @@ glabel func_80AF0400 /* 059B8 80AF05C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 059BC 80AF05CC 03E00008 */ jr $ra /* 059C0 80AF05D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s index de3f7d17d1..f75fe38fa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AF1B74 + .asciz "../z_en_ru1.c" + .balign 4 + +glabel D_80AF1B84 + .asciz "../z_en_ru1.c" + .balign 4 + +.text glabel func_80AF05D4 /* 059C4 80AF05D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 059C8 80AF05D8 AFBF002C */ sw $ra, 0x002C($sp) @@ -115,5 +125,3 @@ glabel func_80AF05D4 /* 05B88 80AF0798 8FB10028 */ lw $s1, 0x0028($sp) /* 05B8C 80AF079C 03E00008 */ jr $ra /* 05B90 80AF07A0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s index ccb9acd422..8073be0103 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s @@ -10,5 +10,3 @@ glabel EnSa_Destroy /* 00EDC 80AF643C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EE0 80AF6440 03E00008 */ jr $ra /* 00EE4 80AF6444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s index 86babf9298..ee130d721a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AF7490 + .asciz "../z_en_sa.c" + .balign 4 + +glabel D_80AF74A0 + .asciz "../z_en_sa.c" + .balign 4 + +.text glabel EnSa_Draw /* 01A08 80AF6F68 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01A0C 80AF6F6C AFBF0024 */ sw $ra, 0x0024($sp) @@ -184,4 +194,3 @@ glabel EnSa_Draw /* 01CD4 80AF7234 03E00008 */ jr $ra /* 01CD8 80AF7238 00000000 */ nop /* 01CDC 80AF723C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s index f9db9f2edc..e8f038a43c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_80AF74F4 +.word L80AF637C +.word L80AF62B4 +.word L80AF627C +.word L80AF6350 +.word L80AF62DC +.word L80AF6298 + +.text glabel EnSa_Init /* 00C50 80AF61B0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00C54 80AF61B4 AFB00034 */ sw $s0, 0x0034($sp) @@ -169,5 +179,3 @@ glabel L80AF637C /* 00EB4 80AF6414 8FB10038 */ lw $s1, 0x0038($sp) /* 00EB8 80AF6418 03E00008 */ jr $ra /* 00EBC 80AF641C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s index c8c9642ca5..062ae43c6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s @@ -108,5 +108,3 @@ glabel EnSa_Update /* 01800 80AF6D60 8FB10020 */ lw $s1, 0x0020($sp) /* 01804 80AF6D64 03E00008 */ jr $ra /* 01808 80AF6D68 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s index 405427f3d4..8b18645c8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s @@ -34,5 +34,3 @@ glabel func_80AF5560 /* 00074 80AF55D4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 00078 80AF55D8 03E00008 */ jr $ra /* 0007C 80AF55DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s index ee0d850cef..336d610d49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s @@ -76,5 +76,3 @@ glabel func_80AF55E0 /* 00188 80AF56E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0018C 80AF56EC 03E00008 */ jr $ra /* 00190 80AF56F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s index 3aecad609d..91c555e698 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_80AF74B0 +.word L80AF57C4 +.word L80AF57C4 +.word L80AF573C +.word L80AF57C4 +.word L80AF57C4 +.word L80AF57C4 +.word L80AF57C4 +.word L80AF57C4 +.word L80AF57C4 +.word L80AF57C4 + +.text glabel func_80AF56F4 /* 00194 80AF56F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00198 80AF56F8 AFA50024 */ sw $a1, 0x0024($sp) @@ -62,5 +76,3 @@ glabel L80AF57C4 /* 0026C 80AF57CC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00270 80AF57D0 03E00008 */ jr $ra /* 00274 80AF57D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s index b39394ee0b..4114449fef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s @@ -49,5 +49,3 @@ glabel func_80AF57D8 /* 00328 80AF5888 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0032C 80AF588C 03E00008 */ jr $ra /* 00330 80AF5890 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s index c2172f7d2e..282145d9e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s @@ -8,5 +8,3 @@ glabel func_80AF5894 /* 0034C 80AF58AC E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C /* 00350 80AF58B0 03E00008 */ jr $ra /* 00354 80AF58B4 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s index 6aa25d2eab..fdc458153a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s @@ -40,5 +40,3 @@ glabel func_80AF58B8 /* 003E0 80AF5940 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003E4 80AF5944 03E00008 */ jr $ra /* 003E8 80AF5948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s index 00be0b75a6..fa6c6fdf03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s @@ -40,5 +40,3 @@ glabel func_80AF594C /* 00474 80AF59D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00478 80AF59D8 03E00008 */ jr $ra /* 0047C 80AF59DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s index 48d78eb53b..0c111f7881 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s @@ -40,5 +40,3 @@ glabel func_80AF59E0 /* 00508 80AF5A68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0050C 80AF5A6C 03E00008 */ jr $ra /* 00510 80AF5A70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s index 38bf350f25..5569221bad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s @@ -42,5 +42,3 @@ glabel func_80AF5A74 /* 005A4 80AF5B04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005A8 80AF5B08 03E00008 */ jr $ra /* 005AC 80AF5B0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s index ed17148936..9d4929cc21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s @@ -40,5 +40,3 @@ glabel func_80AF5B10 /* 00638 80AF5B98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0063C 80AF5B9C 03E00008 */ jr $ra /* 00640 80AF5BA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s index 0593bd6d45..1bff6d46ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s @@ -42,5 +42,3 @@ glabel func_80AF5BA4 /* 006D4 80AF5C34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006D8 80AF5C38 03E00008 */ jr $ra /* 006DC 80AF5C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s index 602c5856bf..392406a77f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s @@ -40,5 +40,3 @@ glabel func_80AF5C40 /* 00768 80AF5CC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0076C 80AF5CCC 03E00008 */ jr $ra /* 00770 80AF5CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s index 1a76fe638b..24f09b7742 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s @@ -3,5 +3,3 @@ glabel func_80AF5CD4 /* 00778 80AF5CD8 A085020B */ sb $a1, 0x020B($a0) ## 0000020B /* 0077C 80AF5CDC 03E00008 */ jr $ra /* 00780 80AF5CE0 A080020A */ sb $zero, 0x020A($a0) ## 0000020A - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s index 0b08ea79c9..7c1f60e86d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80AF74D8 +.word L80AF5D14 +.word L80AF5D24 +.word L80AF5D34 +.word L80AF5D44 +.word L80AF5D54 +.word L80AF5D64 +.word L80AF5D74 + +.text glabel func_80AF5CE4 /* 00784 80AF5CE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00788 80AF5CE8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -50,5 +61,3 @@ glabel L80AF5D74 /* 00820 80AF5D80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00824 80AF5D84 03E00008 */ jr $ra /* 00828 80AF5D88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s index 4611c77b43..89bbeecda1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s @@ -29,5 +29,3 @@ glabel func_80AF5D8C /* 00890 80AF5DF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00894 80AF5DF4 03E00008 */ jr $ra /* 00898 80AF5DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s index 221de8d341..66d068fa8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s @@ -89,5 +89,3 @@ glabel func_80AF5DFC .L80AF5F2C: /* 009CC 80AF5F2C 03E00008 */ jr $ra /* 009D0 80AF5F30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s index 728f821e5c..998f87bdd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s @@ -69,5 +69,3 @@ glabel func_80AF5F34 /* 00AD0 80AF6030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AD4 80AF6034 03E00008 */ jr $ra /* 00AD8 80AF6038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s index fb02247022..56f2e4abd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s @@ -28,5 +28,3 @@ glabel func_80AF603C .L80AF6094: /* 00B34 80AF6094 03E00008 */ jr $ra /* 00B38 80AF6098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s index ad0612e3ed..e659a10c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s @@ -42,5 +42,3 @@ glabel func_80AF609C /* 00BC4 80AF6124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BC8 80AF6128 03E00008 */ jr $ra /* 00BCC 80AF612C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s index 5b118083f4..1b97d03927 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s @@ -15,5 +15,3 @@ glabel func_80AF6130 /* 00C04 80AF6164 468084A0 */ cvt.s.w $f18, $f16 /* 00C08 80AF6168 03E00008 */ jr $ra /* 00C0C 80AF616C E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s index 3ceb317273..969eeeae07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s @@ -15,5 +15,3 @@ glabel func_80AF6170 /* 00C44 80AF61A4 468084A0 */ cvt.s.w $f18, $f16 /* 00C48 80AF61A8 03E00008 */ jr $ra /* 00C4C 80AF61AC E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s index 8a935c2559..cba435378f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s @@ -245,5 +245,3 @@ glabel func_80AF6448 /* 01264 80AF67C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01268 80AF67C8 03E00008 */ jr $ra /* 0126C 80AF67CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s index c145c78cf6..fa260f8a59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s @@ -28,5 +28,3 @@ glabel func_80AF67D0 /* 012D0 80AF6830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012D4 80AF6834 03E00008 */ jr $ra /* 012D8 80AF6838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s index 452219c723..158dfc0b26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF750C + .float -2220.0 + +.text glabel func_80AF683C /* 012DC 80AF683C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 012E0 80AF6840 AFBF0014 */ sw $ra, 0x0014($sp) @@ -43,5 +48,3 @@ glabel func_80AF683C /* 01378 80AF68D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0137C 80AF68DC 03E00008 */ jr $ra /* 01380 80AF68E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s index d78fbb4477..04d35cacdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s @@ -157,5 +157,3 @@ glabel func_80AF68E4 /* 015B4 80AF6B14 8FB10020 */ lw $s1, 0x0020($sp) /* 015B8 80AF6B18 03E00008 */ jr $ra /* 015BC 80AF6B1C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s index 1ea8d28aed..d4fc399fee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s @@ -49,5 +49,3 @@ glabel func_80AF6B20 /* 01674 80AF6BD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01678 80AF6BD8 03E00008 */ jr $ra /* 0167C 80AF6BDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s index 6d597fdeb3..c608fc399f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80AF7510 + .float 3.14159274101 + +glabel D_80AF7514 + .float 3.14159274101 + +glabel D_80AF7518 + .float 3.14159274101 + +glabel D_80AF751C + .float 3.14159274101 + +.text glabel func_80AF6D6C /* 0180C 80AF6D6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01810 80AF6D70 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 @@ -106,5 +120,3 @@ glabel func_80AF6D6C /* 019A0 80AF6F00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 019A4 80AF6F04 03E00008 */ jr $ra /* 019A8 80AF6F08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s index cd14c4a9a9..29c9fd05ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s @@ -23,5 +23,3 @@ glabel func_80AF6F0C /* 019FC 80AF6F5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A00 80AF6F60 03E00008 */ jr $ra /* 01A04 80AF6F64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s index 3c3ae9719a..030ec17620 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s @@ -14,5 +14,3 @@ glabel EnSb_Destroy /* 00110 80AF7900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00114 80AF7904 03E00008 */ jr $ra /* 00118 80AF7908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s index 34d48074b3..debe1483d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s @@ -81,4 +81,3 @@ glabel EnSb_Draw /* 011B4 80AF89A4 03E00008 */ jr $ra /* 011B8 80AF89A8 00000000 */ nop /* 011BC 80AF89AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s index 3cf512b9d2..f19f9f20b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF8A8C + .float -0.35 + +.text glabel EnSb_Init /* 00000 80AF77F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80AF77F4 AFA5003C */ sw $a1, 0x003C($sp) @@ -59,5 +64,3 @@ glabel EnSb_Init /* 000D8 80AF78C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000DC 80AF78CC 03E00008 */ jr $ra /* 000E0 80AF78D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s index d7bf6b04ec..edf989300d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s @@ -110,5 +110,3 @@ glabel EnSb_Update /* 0102C 80AF881C 8FB10020 */ lw $s1, 0x0020($sp) /* 01030 80AF8820 03E00008 */ jr $ra /* 01034 80AF8824 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF790C.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF790C.s index 386d0bcc49..23e05ced0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF790C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF790C.s @@ -45,5 +45,3 @@ glabel func_80AF790C /* 001C0 80AF79B0 8FB30040 */ lw $s3, 0x0040($sp) /* 001C4 80AF79B4 03E00008 */ jr $ra /* 001C8 80AF79B8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s index f06717908a..1cf3d7b082 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s @@ -31,5 +31,3 @@ glabel func_80AF79BC /* 00238 80AF7A28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0023C 80AF7A2C 03E00008 */ jr $ra /* 00240 80AF7A30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s index bb128da998..8dc6b3ce94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s @@ -33,5 +33,3 @@ glabel func_80AF7A34 /* 002B4 80AF7AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002B8 80AF7AA8 03E00008 */ jr $ra /* 002BC 80AF7AAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s index d8052a8b7d..4281e2e322 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s @@ -30,5 +30,3 @@ glabel func_80AF7AB0 /* 00328 80AF7B18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0032C 80AF7B1C 03E00008 */ jr $ra /* 00330 80AF7B20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s index 52199b6a5d..61e3f990aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s @@ -46,5 +46,3 @@ glabel func_80AF7B24 /* 003D0 80AF7BC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003D4 80AF7BC4 03E00008 */ jr $ra /* 003D8 80AF7BC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s index c2f1ee13bc..c289c5c8f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s @@ -31,5 +31,3 @@ glabel func_80AF7BCC /* 00448 80AF7C38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0044C 80AF7C3C 03E00008 */ jr $ra /* 00450 80AF7C40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s index ccb1df88b9..a8c25f59f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AF8A90 + .float 2.1 + +glabel D_80AF8A94 + .float 1.4 + +.text glabel func_80AF7C44 /* 00454 80AF7C44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00458 80AF7C48 AFB00028 */ sw $s0, 0x0028($sp) @@ -69,5 +77,3 @@ glabel func_80AF7C44 /* 0054C 80AF7D3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00550 80AF7D40 03E00008 */ jr $ra /* 00554 80AF7D44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7D48.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7D48.s index adc1685313..7d4c2b7358 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7D48.s @@ -33,5 +33,3 @@ glabel func_80AF7D48 /* 005CC 80AF7DBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 005D0 80AF7DC0 03E00008 */ jr $ra /* 005D4 80AF7DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7DC8.s index 949a65374c..9e911fa8f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7DC8.s @@ -54,5 +54,3 @@ glabel func_80AF7DC8 /* 00694 80AF7E84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00698 80AF7E88 03E00008 */ jr $ra /* 0069C 80AF7E8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7E90.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7E90.s index f8931c69db..63b10c1718 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7E90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7E90.s @@ -49,5 +49,3 @@ glabel func_80AF7E90 /* 00748 80AF7F38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0074C 80AF7F3C 03E00008 */ jr $ra /* 00750 80AF7F40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7F44.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7F44.s index 40ce24749b..9a71342a99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7F44.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AF8A60 + .asciz "アタァ〜ック！！\n" + .balign 4 + +.late_rodata +glabel D_80AF8A98 + .float -0.35 + +.text glabel func_80AF7F44 /* 00754 80AF7F44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00758 80AF7F48 AFBF0024 */ sw $ra, 0x0024($sp) @@ -66,5 +76,3 @@ glabel func_80AF7F44 /* 00840 80AF8030 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00844 80AF8034 03E00008 */ jr $ra /* 00848 80AF8038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF803C.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF803C.s index b40abadcf0..bf23d5ca86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF803C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF803C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AF8A9C + .float -0.1 + +.text glabel func_80AF803C /* 0084C 80AF803C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00850 80AF8040 AFBF0014 */ sw $ra, 0x0014($sp) @@ -46,5 +51,3 @@ glabel func_80AF803C /* 008E8 80AF80D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008EC 80AF80DC 03E00008 */ jr $ra /* 008F0 80AF80E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF80E4.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF80E4.s index d6f9001d3f..e4dc2b27ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF80E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF80E4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AF8A74 + .asciz "\x1B[31m攻撃終了！！\x1B[m\n" + .balign 4 + +.late_rodata +glabel D_80AF8AA0 + .float -0.35 + +.text glabel func_80AF80E4 /* 008F4 80AF80E4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 008F8 80AF80E8 AFBF001C */ sw $ra, 0x001C($sp) @@ -87,5 +97,3 @@ glabel func_80AF80E4 /* 00A28 80AF8218 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A2C 80AF821C 03E00008 */ jr $ra /* 00A30 80AF8220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8224.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8224.s index 4544159c18..6219050327 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8224.s @@ -28,5 +28,3 @@ glabel func_80AF8224 .L80AF8284: /* 00A94 80AF8284 03E00008 */ jr $ra /* 00A98 80AF8288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF828C.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF828C.s index ea162aa09f..1ca740ef29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF828C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF828C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_80AF8AA4 +.word L80AF82B0 +.word func_80AF82F0 +.word func_80AF832C +.word func_80AF8368 +.word func_80AF8388 + +.text glabel func_80AF828C /* 00A9C 80AF828C 948E01FA */ lhu $t6, 0x01FA($a0) ## 000001FA /* 00AA0 80AF8290 2DC10005 */ sltiu $at, $t6, 0x0005 @@ -25,5 +34,3 @@ glabel L80AF82B0 /* 00AF4 80AF82E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00AF8 80AF82E8 03E00008 */ jr $ra /* 00AFC 80AF82EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF82F0.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF82F0.s index 27be4bdb53..c67c57d858 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF82F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF82F0.s @@ -14,5 +14,3 @@ glabel func_80AF82F0 /* 00B30 80AF8320 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00B34 80AF8324 03E00008 */ jr $ra /* 00B38 80AF8328 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF832C.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF832C.s index 18c5d9cf18..319315653c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF832C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF832C.s @@ -14,5 +14,3 @@ glabel func_80AF832C /* 00B6C 80AF835C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00B70 80AF8360 03E00008 */ jr $ra /* 00B74 80AF8364 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8368.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8368.s index dbf4868254..90d38517c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8368.s @@ -7,5 +7,3 @@ glabel func_80AF8368 /* 00B8C 80AF837C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00B90 80AF8380 03E00008 */ jr $ra /* 00B94 80AF8384 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8388.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8388.s index ad2e1380bd..6d951f9605 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8388.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8388.s @@ -20,5 +20,3 @@ glabel func_80AF8388 .L80AF83CC: /* 00BDC 80AF83CC 03E00008 */ jr $ra /* 00BE0 80AF83D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF83D4.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF83D4.s index 912537cd55..298621bb12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF83D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF83D4.s @@ -1,3 +1,22 @@ +.late_rodata +glabel jtbl_80AF8AB8 +.word L80AF8538 +.word L80AF8504 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF85F4 +.word L80AF8538 +.word L80AF8450 +.word L80AF8458 + +.text glabel func_80AF83D4 /* 00BE4 80AF83D4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00BE8 80AF83D8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -195,5 +214,3 @@ glabel L80AF85F4 /* 00EB0 80AF86A0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00EB4 80AF86A4 03E00008 */ jr $ra /* 00EB8 80AF86A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8828.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8828.s index 764915e9f9..f323e4f449 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8828.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF8828.s @@ -19,5 +19,3 @@ glabel func_80AF8828 /* 0107C 80AF886C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01080 80AF8870 03E00008 */ jr $ra /* 01084 80AF8874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Destroy.s index 2b3cc82878..ba41ac66e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Destroy.s @@ -2,5 +2,3 @@ glabel EnSda_Destroy /* 0000C 80AF8E2C AFA40000 */ sw $a0, 0x0000($sp) /* 00010 80AF8E30 03E00008 */ jr $ra /* 00014 80AF8E34 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s index 584e450d77..13262ab58d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AFA44C + .asciz "SDA DRAW \n" + .balign 4 + +glabel D_80AFA458 + .asciz "SDA DRAW END\n" + .balign 4 + +.text glabel EnSda_Draw /* 00090 80AF8EB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00094 80AF8EB4 AFBF001C */ sw $ra, 0x001C($sp) @@ -48,5 +58,3 @@ glabel EnSda_Draw /* 00134 80AF8F54 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00138 80AF8F58 03E00008 */ jr $ra /* 0013C 80AF8F5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Init.s index 7f4104e5d6..4d0666be27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Init.s @@ -2,5 +2,3 @@ glabel EnSda_Init /* 00000 80AF8E20 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80AF8E24 03E00008 */ jr $ra /* 00008 80AF8E28 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Update.s index 3112d9950a..f53f67941e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Update.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AFA430 + .asciz "SDA MOVE\n" + .balign 4 + +glabel D_80AFA43C + .asciz "SDA MOVE END\n" + .balign 4 + +.text glabel EnSda_Update /* 00018 80AF8E38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0001C 80AF8E3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -32,5 +42,3 @@ glabel EnSda_Update /* 00084 80AF8EA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00088 80AF8EA8 03E00008 */ jr $ra /* 0008C 80AF8EAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s index bfe4ec20f1..a839eefa01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s @@ -437,5 +437,3 @@ glabel func_80AF8F60 /* 00798 80AF95B8 8FB60060 */ lw $s6, 0x0060($sp) /* 0079C 80AF95BC 03E00008 */ jr $ra /* 007A0 80AF95C0 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s index 36abcc8e14..e6898bdfce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s @@ -1,3 +1,34 @@ +.rdata +glabel D_80AFA468 + .asciz "SDA CONT \n" + .balign 4 + +glabel D_80AFA474 + .asciz "SDA CONT 2\n" + .balign 4 + +glabel D_80AFA480 + .asciz "SDA CONT 3\n" + .balign 4 + +glabel D_80AFA48C + .asciz "SDA CONT 4\n" + .balign 4 + +.late_rodata +glabel D_80AFA4F0 + .float 1.2 + +glabel D_80AFA4F4 + .float -1.2 + +glabel D_80AFA4F8 + .float 3.14159274101 + +glabel D_80AFA4FC + .float 3.14159274101 + +.text glabel func_80AF95C4 /* 007A4 80AF95C4 27BDFE50 */ addiu $sp, $sp, 0xFE50 ## $sp = FFFFFE50 /* 007A8 80AF95C8 AFB60040 */ sw $s6, 0x0040($sp) @@ -451,5 +482,3 @@ glabel func_80AF95C4 /* 00E44 80AF9C64 8FBE0048 */ lw $s8, 0x0048($sp) /* 00E48 80AF9C68 03E00008 */ jr $ra /* 00E4C 80AF9C6C 27BD01B0 */ addiu $sp, $sp, 0x01B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s index 9ffbbcdc6d..8123682539 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80AFA498 + .asciz "../z_en_sda.c" + .balign 4 + +glabel D_80AFA4A8 + .asciz "SDA D 1\n" + .balign 4 + +glabel D_80AFA4B4 + .asciz "../z_en_sda.c" + .balign 4 + +glabel D_80AFA4C4 + .asciz "../z_en_sda.c" + .balign 4 + +glabel D_80AFA4D4 + .asciz "SDA D 2\n" + .balign 4 + +glabel D_80AFA4E0 + .asciz "../z_en_sda.c" + .balign 4 + +.late_rodata +glabel D_80AFA500 + .float 0.6 + +.text glabel func_80AF9C70 /* 00E50 80AF9C70 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 00E54 80AF9C74 AFBF0034 */ sw $ra, 0x0034($sp) @@ -275,4 +305,3 @@ glabel func_80AF9C70 /* 01284 80AFA0A4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 01288 80AFA0A8 00000000 */ nop /* 0128C 80AFA0AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s index 846928cad9..2a82f43511 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s @@ -10,5 +10,3 @@ glabel EnShopnuts_Destroy /* 00154 80AFA874 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00158 80AFA878 03E00008 */ jr $ra /* 0015C 80AFA87C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s index 9ec7f74db1..54aef35a0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s @@ -20,4 +20,3 @@ glabel EnShopnuts_Draw /* 00D94 80AFB4B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D98 80AFB4B8 03E00008 */ jr $ra /* 00D9C 80AFB4BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s index dc0da2b734..ab71e4f2eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s @@ -88,5 +88,3 @@ glabel EnShopnuts_Init /* 0012C 80AFA84C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00130 80AFA850 03E00008 */ jr $ra /* 00134 80AFA854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s index 56105e0645..3dbc624fe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s @@ -87,5 +87,3 @@ glabel EnShopnuts_Update /* 00B30 80AFB250 8FB10020 */ lw $s1, 0x0020($sp) /* 00B34 80AFB254 03E00008 */ jr $ra /* 00B38 80AFB258 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s index e71c10c25f..45b34d0cb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s @@ -26,5 +26,3 @@ glabel func_80AFA880 /* 001BC 80AFA8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C0 80AFA8E0 03E00008 */ jr $ra /* 001C4 80AFA8E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s index 783a72c33a..9a54135906 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s @@ -17,5 +17,3 @@ glabel func_80AFA8E8 /* 00204 80AFA924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00208 80AFA928 03E00008 */ jr $ra /* 0020C 80AFA92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s index 7d2ece5157..2ddcf92c93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s @@ -14,5 +14,3 @@ glabel func_80AFA930 /* 00240 80AFA960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00244 80AFA964 03E00008 */ jr $ra /* 00248 80AFA968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s index 1a074a0d69..4e6a3d46f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s @@ -27,5 +27,3 @@ glabel func_80AFA96C /* 002A8 80AFA9C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002AC 80AFA9CC 03E00008 */ jr $ra /* 002B0 80AFA9D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s index 05f52c9586..8c1dc1e6a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s @@ -19,5 +19,3 @@ glabel func_80AFA9D4 /* 002F4 80AFAA14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 80AFAA18 03E00008 */ jr $ra /* 002FC 80AFAA1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s index 290dea5f6a..728eff05bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s @@ -23,5 +23,3 @@ glabel func_80AFAA20 /* 00350 80AFAA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00354 80AFAA74 03E00008 */ jr $ra /* 00358 80AFAA78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA7C.s index cc28ca6986..a31f666b62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA7C.s @@ -170,5 +170,3 @@ glabel func_80AFAA7C /* 005B4 80AFACD4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005B8 80AFACD8 03E00008 */ jr $ra /* 005BC 80AFACDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFACE0.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFACE0.s index 2ad9c96c82..3c094c53ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFACE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFACE0.s @@ -36,5 +36,3 @@ glabel func_80AFACE0 /* 00638 80AFAD58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0063C 80AFAD5C 03E00008 */ jr $ra /* 00640 80AFAD60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s index 4cc9ae7b7f..fbc6d0ce59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s @@ -55,5 +55,3 @@ glabel func_80AFAD64 /* 006FC 80AFAE1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00700 80AFAE20 03E00008 */ jr $ra /* 00704 80AFAE24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s index 072877cc52..f725f23282 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s @@ -88,5 +88,3 @@ glabel func_80AFAE28 /* 00838 80AFAF58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0083C 80AFAF5C 03E00008 */ jr $ra /* 00840 80AFAF60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAF64.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAF64.s index 3a544544f7..8212350c2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAF64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAF64.s @@ -53,5 +53,3 @@ glabel func_80AFAF64 /* 008FC 80AFB01C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00900 80AFB020 03E00008 */ jr $ra /* 00904 80AFB024 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s index bcb443ba57..c280e5e24d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s @@ -44,5 +44,3 @@ glabel func_80AFB028 /* 00998 80AFB0B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0099C 80AFB0BC 03E00008 */ jr $ra /* 009A0 80AFB0C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB0C4.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB0C4.s index 31d56b6f88..7963f849eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB0C4.s @@ -25,5 +25,3 @@ glabel func_80AFB0C4 /* 009F8 80AFB118 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009FC 80AFB11C 03E00008 */ jr $ra /* 00A00 80AFB120 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB25C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB25C.s index 780a89bb63..d332b451f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB25C.s @@ -13,5 +13,3 @@ glabel func_80AFB25C .L80AFB288: /* 00B68 80AFB288 03E00008 */ jr $ra /* 00B6C 80AFB28C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s index 115a1b4204..76b32bfdca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80AFB520 + .asciz "../z_en_shopnuts.c" + .balign 4 + +glabel D_80AFB534 + .asciz "../z_en_shopnuts.c" + .balign 4 + +glabel D_80AFB548 + .asciz "../z_en_shopnuts.c" + .balign 4 + +.late_rodata +glabel D_80AFB55C + .word 0x3DAA9931 +glabel D_80AFB560 + .word 0x3DEF0069 +glabel D_80AFB564 + .float 1.7 + +glabel D_80AFB568 + .float 0.7 + +glabel D_80AFB56C + .word 0x3E2AB368 + +.text glabel func_80AFB290 /* 00B70 80AFB290 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00B74 80AFB294 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 @@ -123,5 +151,3 @@ glabel func_80AFB290 /* 00D40 80AFB460 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00D44 80AFB464 03E00008 */ jr $ra /* 00D48 80AFB468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s index 2717093967..663da267e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s @@ -10,5 +10,3 @@ glabel EnSi_Destroy /* 000AC 80AFB73C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B0 80AFB740 03E00008 */ jr $ra /* 000B4 80AFB744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s index 549f7e52c9..413ea52ed5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s @@ -23,4 +23,3 @@ glabel EnSi_Draw /* 00414 80AFBAA4 00000000 */ nop /* 00418 80AFBAA8 00000000 */ nop /* 0041C 80AFBAAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s index 44e7665da8..5e6a00628e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s @@ -38,5 +38,3 @@ glabel EnSi_Init /* 00084 80AFB714 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00088 80AFB718 03E00008 */ jr $ra /* 0008C 80AFB71C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s index ba7c8aec6f..7c8676c57f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s @@ -29,5 +29,3 @@ glabel EnSi_Update /* 003B8 80AFBA48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003BC 80AFBA4C 03E00008 */ jr $ra /* 003C0 80AFBA50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s index f0dd08b10f..c50fbf2bb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s @@ -8,5 +8,3 @@ glabel func_80AFB748 .L80AFB760: /* 000D0 80AFB760 03E00008 */ jr $ra /* 000D4 80AFB764 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s index b1dc68c30b..f8bfb1e1f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s @@ -84,5 +84,3 @@ glabel func_80AFB768 /* 00200 80AFB890 8FB10020 */ lw $s1, 0x0020($sp) /* 00204 80AFB894 03E00008 */ jr $ra /* 00208 80AFB898 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s index c1c703a2dc..367cf4fa93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s @@ -47,5 +47,3 @@ glabel func_80AFB89C /* 002B4 80AFB944 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002B8 80AFB948 03E00008 */ jr $ra /* 002BC 80AFB94C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s index 8a3158f46e..51ada52cb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s @@ -39,5 +39,3 @@ glabel func_80AFB950 /* 00348 80AFB9D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0034C 80AFB9DC 03E00008 */ jr $ra /* 00350 80AFB9E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Destroy.s index f53fc53fce..885e0d7246 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Destroy.s @@ -12,5 +12,3 @@ glabel EnSiofuki_Destroy /* 0023C 80AFBDBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00240 80AFBDC0 03E00008 */ jr $ra /* 00244 80AFBDC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s index 241cd23fdf..73446970fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80AFC820 + .asciz "../z_en_siofuki.c" + .balign 4 + +glabel D_80AFC834 + .asciz "../z_en_siofuki.c" + .balign 4 + +glabel D_80AFC848 + .asciz "../z_en_siofuki.c" + .balign 4 + +.text glabel EnSiofuki_Draw /* 00A18 80AFC598 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00A1C 80AFC59C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -152,4 +166,3 @@ glabel EnSiofuki_Draw /* 00C64 80AFC7E4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 00C68 80AFC7E8 00000000 */ nop /* 00C6C 80AFC7EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Init.s index 52349f49d9..bb7c47feb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Init.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80AFC85C + .word 0xC5BD5000 +glabel D_80AFC860 + .float 0.1 + +glabel D_80AFC864 + .word 0x3F13FA15 + +.text glabel EnSiofuki_Init /* 00000 80AFBB80 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80AFBB84 AFBF001C */ sw $ra, 0x001C($sp) @@ -151,5 +161,3 @@ glabel EnSiofuki_Init /* 0020C 80AFBD8C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00210 80AFBD90 03E00008 */ jr $ra /* 00214 80AFBD94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Update.s index 467db956b3..3e20f00be8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Update.s @@ -8,5 +8,3 @@ glabel EnSiofuki_Update /* 00A0C 80AFC58C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A10 80AFC590 03E00008 */ jr $ra /* 00A14 80AFC594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBDC8.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBDC8.s index 3231e9f3fd..b6549728d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBDC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBDC8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AFC868 + .float 3.14159274101 + +glabel D_80AFC86C + .word 0xC5BD5000 + +.text glabel func_80AFBDC8 /* 00248 80AFBDC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0024C 80AFBDCC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -50,5 +58,3 @@ glabel func_80AFBDC8 /* 00300 80AFBE80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00304 80AFBE84 03E00008 */ jr $ra /* 00308 80AFBE88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s index b6aadbf68a..538a3a5c6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80AFC870 + .word 0x4622F983 +glabel D_80AFC874 + .float 0.3 + +.text glabel func_80AFBE8C /* 0030C 80AFBE8C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00310 80AFBE90 AFBF0024 */ sw $ra, 0x0024($sp) @@ -223,5 +230,3 @@ glabel func_80AFBE8C /* 00644 80AFC1C4 8FB10020 */ lw $s1, 0x0020($sp) /* 00648 80AFC1C8 03E00008 */ jr $ra /* 0064C 80AFC1CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC1D0.s index e7aaab759a..be86176157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC1D0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AFC878 + .float 0.01 + +.text glabel func_80AFC1D0 /* 00650 80AFC1D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00654 80AFC1D4 3C0180B0 */ lui $at, %hi(D_80AFC878) ## $at = 80B00000 @@ -18,5 +23,3 @@ glabel func_80AFC1D0 /* 0068C 80AFC20C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00690 80AFC210 03E00008 */ jr $ra /* 00694 80AFC214 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC218.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC218.s index 2e3c71b789..74ea45c24f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC218.s @@ -85,5 +85,3 @@ glabel func_80AFC218 /* 007C0 80AFC340 8FB10018 */ lw $s1, 0x0018($sp) /* 007C4 80AFC344 03E00008 */ jr $ra /* 007C8 80AFC348 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC34C.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC34C.s index 974c47d5fe..81708693a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC34C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC34C.s @@ -32,5 +32,3 @@ glabel func_80AFC34C /* 0083C 80AFC3BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00840 80AFC3C0 03E00008 */ jr $ra /* 00844 80AFC3C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC3C8.s index bb1d037569..988fe1c0f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC3C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC3C8.s @@ -46,5 +46,3 @@ glabel func_80AFC3C8 /* 008EC 80AFC46C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008F0 80AFC470 03E00008 */ jr $ra /* 008F4 80AFC474 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC478.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC478.s index fd40a6cb26..42ddc9bb06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC478.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC478.s @@ -54,5 +54,3 @@ glabel func_80AFC478 /* 009B8 80AFC538 8FB10020 */ lw $s1, 0x0020($sp) /* 009BC 80AFC53C 03E00008 */ jr $ra /* 009C0 80AFC540 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC544.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC544.s index aae4963e8d..fae5f664e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFC544.s @@ -11,5 +11,3 @@ glabel func_80AFC544 /* 009E8 80AFC568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009EC 80AFC56C 03E00008 */ jr $ra /* 009F0 80AFC570 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s index 8b4c69f010..edd1d08a27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s @@ -21,5 +21,3 @@ glabel EnSkb_Destroy /* 003B4 80AFCD54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B8 80AFCD58 03E00008 */ jr $ra /* 003BC 80AFCD5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s index 3ad020e790..b1a9930817 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s @@ -21,4 +21,3 @@ glabel EnSkb_Draw /* 01674 80AFE014 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01678 80AFE018 03E00008 */ jr $ra /* 0167C 80AFE01C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s index ae7417af0c..77bd98abf0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AFE108 + .float 0.1 + +glabel D_80AFE10C + .float 0.01 + +.text glabel EnSkb_Init /* 001B8 80AFCB58 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 001BC 80AFCB5C AFA50044 */ sw $a1, 0x0044($sp) @@ -112,5 +120,3 @@ glabel EnSkb_Init /* 00360 80AFCD00 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00364 80AFCD04 03E00008 */ jr $ra /* 00368 80AFCD08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s index 9fbab9cfd3..d164e831cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AFE128 + .float 3000.0 + +.text glabel EnSkb_Update /* 01270 80AFDC10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01274 80AFDC14 AFBF0024 */ sw $ra, 0x0024($sp) @@ -78,5 +83,3 @@ glabel EnSkb_Update /* 01384 80AFDD24 8FB10020 */ lw $s1, 0x0020($sp) /* 01388 80AFDD28 03E00008 */ jr $ra /* 0138C 80AFDD2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s index ab521ad1b3..202fb028cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s @@ -1,5 +1,3 @@ glabel func_80AFC9A0 /* 00000 80AFC9A0 03E00008 */ jr $ra /* 00004 80AFC9A4 AC850284 */ sw $a1, 0x0284($a0) ## 00000284 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s index a9964e16c2..35be7c61f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AFE100 + .float 6.28 + +glabel D_80AFE104 + .float 0.8 + +.text glabel func_80AFC9A8 /* 00008 80AFC9A8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 0000C 80AFC9AC 3C0F80B0 */ lui $t7, %hi(D_80AFE0B8) ## $t7 = 80B00000 @@ -112,5 +120,3 @@ glabel func_80AFC9A8 /* 001AC 80AFCB4C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 001B0 80AFCB50 03E00008 */ jr $ra /* 001B4 80AFCB54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s index e34294dd42..b0f37a79e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s @@ -40,5 +40,3 @@ glabel func_80AFCD60 /* 0044C 80AFCDEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00450 80AFCDF0 03E00008 */ jr $ra /* 00454 80AFCDF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s index 600ed085f1..274e878593 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s @@ -25,5 +25,3 @@ glabel func_80AFCDF8 /* 004B0 80AFCE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004B4 80AFCE54 03E00008 */ jr $ra /* 004B8 80AFCE58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s index a29719f7ff..1084eb2ea0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s @@ -65,5 +65,3 @@ glabel func_80AFCE5C /* 0059C 80AFCF3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 005A0 80AFCF40 03E00008 */ jr $ra /* 005A4 80AFCF44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s index 90a228aca0..8c3f507723 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s @@ -44,5 +44,3 @@ glabel func_80AFCF48 /* 00644 80AFCFE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00648 80AFCFE8 03E00008 */ jr $ra /* 0064C 80AFCFEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s index f6164c3f4b..e57d1cc719 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s @@ -50,5 +50,3 @@ glabel func_80AFCFF0 /* 006F8 80AFD098 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006FC 80AFD09C 03E00008 */ jr $ra /* 00700 80AFD0A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s index d98f1b1508..69f56b6bec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s @@ -39,5 +39,3 @@ glabel func_80AFD0A4 /* 00790 80AFD130 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00794 80AFD134 03E00008 */ jr $ra /* 00798 80AFD138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s index ea39199e28..6b87a8f789 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AFE110 + .word 0x47435000 + +.text glabel func_80AFD13C /* 0079C 80AFD13C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 007A0 80AFD140 AFBF0024 */ sw $ra, 0x0024($sp) @@ -142,5 +147,3 @@ glabel func_80AFD13C /* 00990 80AFD330 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00994 80AFD334 03E00008 */ jr $ra /* 00998 80AFD338 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s index 0e850f8963..55d040bb26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s @@ -39,5 +39,3 @@ glabel func_80AFD33C /* 00A28 80AFD3C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00A2C 80AFD3CC 03E00008 */ jr $ra /* 00A30 80AFD3D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s index 8b128fc887..005e660d57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s @@ -49,5 +49,3 @@ glabel func_80AFD3D4 /* 00AD0 80AFD470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AD4 80AFD474 03E00008 */ jr $ra /* 00AD8 80AFD478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s index bdfc096fbf..df586cbb0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s @@ -35,5 +35,3 @@ glabel func_80AFD47C /* 00B5C 80AFD4FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B60 80AFD500 03E00008 */ jr $ra /* 00B64 80AFD504 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s index a8dcfdc667..5fd5405729 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s @@ -15,5 +15,3 @@ glabel func_80AFD508 /* 00B94 80AFD534 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B98 80AFD538 03E00008 */ jr $ra /* 00B9C 80AFD53C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s index 57b812b9ec..c1760e0d2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s @@ -24,5 +24,3 @@ glabel func_80AFD540 /* 00BF0 80AFD590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BF4 80AFD594 03E00008 */ jr $ra /* 00BF8 80AFD598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s index cbc3ec8199..21ac44c809 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AFE114 + .float 0.05 + +.text glabel func_80AFD59C /* 00BFC 80AFD59C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00C00 80AFD5A0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -45,5 +50,3 @@ glabel func_80AFD59C /* 00C98 80AFD638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C9C 80AFD63C 03E00008 */ jr $ra /* 00CA0 80AFD640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s index 04f722f5a3..e529d96d8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s @@ -35,5 +35,3 @@ glabel func_80AFD644 /* 00D20 80AFD6C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D24 80AFD6C4 03E00008 */ jr $ra /* 00D28 80AFD6C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s index b26cd3d822..ac65ab1875 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AFE118 + .float 0.05 + +.text glabel func_80AFD6CC /* 00D2C 80AFD6CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00D30 80AFD6D0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -64,5 +69,3 @@ glabel func_80AFD6CC /* 00E08 80AFD7A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E0C 80AFD7AC 03E00008 */ jr $ra /* 00E10 80AFD7B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s index f1cc9188f5..ddd89a6a15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s @@ -51,5 +51,3 @@ glabel func_80AFD7B4 /* 00ED4 80AFD874 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00ED8 80AFD878 03E00008 */ jr $ra /* 00EDC 80AFD87C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s index f8c5866b27..66cdeccf84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80AFE11C + .float 0.01 + +glabel D_80AFE120 + .word 0x3C75C28F + +.text glabel func_80AFD880 /* 00EE0 80AFD880 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00EE4 80AFD884 AFB10018 */ sw $s1, 0x0018($sp) @@ -67,5 +75,3 @@ glabel func_80AFD880 /* 00FBC 80AFD95C 8FB10018 */ lw $s1, 0x0018($sp) /* 00FC0 80AFD960 03E00008 */ jr $ra /* 00FC4 80AFD964 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s index a00573d465..14fb9b678d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80AFE124 + .word 0x45EA6000 + +.text glabel func_80AFD968 /* 00FC8 80AFD968 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00FCC 80AFD96C AFBF003C */ sw $ra, 0x003C($sp) @@ -185,5 +190,3 @@ glabel func_80AFD968 /* 01264 80AFDC04 8FB30038 */ lw $s3, 0x0038($sp) /* 01268 80AFDC08 03E00008 */ jr $ra /* 0126C 80AFDC0C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s index 77a90d1ffb..8e73cf684a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80AFE0E0 + .asciz "../z_en_skb.c" + .balign 4 + +glabel D_80AFE0F0 + .asciz "../z_en_skb.c" + .balign 4 + +.text glabel func_80AFDD30 /* 01390 80AFDD30 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01394 80AFDD34 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B @@ -133,5 +143,3 @@ glabel func_80AFDD30 /* 01578 80AFDF18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0157C 80AFDF1C 03E00008 */ jr $ra /* 01580 80AFDF20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s index 4455783b62..38dcd8165b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s @@ -44,5 +44,3 @@ glabel func_80AFDF24 /* 01620 80AFDFC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01624 80AFDFC4 03E00008 */ jr $ra /* 01628 80AFDFC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s index 8233806e0a..48a697fcdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s @@ -10,5 +10,3 @@ glabel EnSkj_Destroy /* 00630 80AFE8E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00634 80AFE8E4 03E00008 */ jr $ra /* 00638 80AFE8E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s index 318338f679..07f225de5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s @@ -69,4 +69,3 @@ glabel EnSkj_Draw /* 03384 80B01634 8FB10028 */ lw $s1, 0x0028($sp) /* 03388 80B01638 03E00008 */ jr $ra /* 0338C 80B0163C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s index fcb390afd2..75eb5257f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s @@ -286,5 +286,3 @@ glabel EnSkj_Init /* 00608 80AFE8B8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0060C 80AFE8BC 03E00008 */ jr $ra /* 00610 80AFE8C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s index 35c2ae8783..e9c1147a84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s @@ -137,5 +137,3 @@ glabel EnSkj_Update /* 026A8 80B00958 8FB10020 */ lw $s1, 0x0020($sp) /* 026AC 80B0095C 03E00008 */ jr $ra /* 026B0 80B00960 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s index b0e0531abe..2081f1ecaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s @@ -35,5 +35,3 @@ glabel func_80AFE2B0 /* 0007C 80AFE32C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00080 80AFE330 03E00008 */ jr $ra /* 00084 80AFE334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE338.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE338.s index 4439b1a019..43aed2a5bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE338.s @@ -24,5 +24,3 @@ glabel L80AFE380 /* 000D4 80AFE384 A09902D3 */ sb $t9, 0x02D3($a0) ## 000002D3 /* 000D8 80AFE388 03E00008 */ jr $ra /* 000DC 80AFE38C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE390.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE390.s index 6978d677e3..cb28afb94c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE390.s @@ -37,5 +37,3 @@ glabel func_80AFE390 /* 0016C 80AFE41C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00170 80AFE420 03E00008 */ jr $ra /* 00174 80AFE424 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s index 87b5efd9b4..bb53c52e64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s @@ -37,5 +37,3 @@ glabel func_80AFE428 /* 001F0 80AFE4A0 A08C0117 */ sb $t4, 0x0117($a0) ## 00000117 /* 001F4 80AFE4A4 03E00008 */ jr $ra /* 001F8 80AFE4A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE8EC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE8EC.s index b207cf58cc..c9e84013b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE8EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE8EC.s @@ -32,5 +32,3 @@ glabel func_80AFE8EC .L80AFE960: /* 006B0 80AFE960 03E00008 */ jr $ra /* 006B4 80AFE964 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE968.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE968.s index 1115559cbf..67ad76b3bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE968.s @@ -16,5 +16,3 @@ glabel func_80AFE968 /* 006F0 80AFE9A0 46000004 */ sqrt.s $f0, $f0 /* 006F4 80AFE9A4 03E00008 */ jr $ra /* 006F8 80AFE9A8 46040000 */ add.s $f0, $f0, $f4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9AC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9AC.s index 5d936c8d5b..c7a332122c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9AC.s @@ -9,5 +9,3 @@ glabel func_80AFE9AC /* 00718 80AFE9C8 46000005 */ abs.s $f0, $f0 /* 0071C 80AFE9CC 03E00008 */ jr $ra /* 00720 80AFE9D0 46080000 */ add.s $f0, $f0, $f8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9D4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9D4.s index d817e68f44..bbb755caf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE9D4.s @@ -72,5 +72,3 @@ glabel func_80AFE9D4 /* 00830 80AFEAE0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00834 80AFEAE4 03E00008 */ jr $ra /* 00838 80AFEAE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEAEC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEAEC.s index 51f1eaa89d..db3891b564 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEAEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEAEC.s @@ -84,5 +84,3 @@ glabel func_80AFEAEC /* 00980 80AFEC30 27BD04E8 */ addiu $sp, $sp, 0x04E8 ## $sp = 00000000 /* 00984 80AFEC34 03E00008 */ jr $ra /* 00988 80AFEC38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s index a44c064847..51d92025e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s @@ -119,5 +119,3 @@ glabel func_80AFEC3C /* 00B3C 80AFEDEC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00B40 80AFEDF0 03E00008 */ jr $ra /* 00B44 80AFEDF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEDF8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEDF8.s index 57cd5d1b13..1bcab7014a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEDF8.s @@ -38,5 +38,3 @@ glabel func_80AFEDF8 /* 00BC8 80AFEE78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BCC 80AFEE7C 03E00008 */ jr $ra /* 00BD0 80AFEE80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEE84.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEE84.s index c4ee7d0de5..43c44c5561 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEE84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEE84.s @@ -17,5 +17,3 @@ glabel func_80AFEE84 /* 00C10 80AFEEC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C14 80AFEEC4 03E00008 */ jr $ra /* 00C18 80AFEEC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEECC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEECC.s index 0cab0c2567..68141a29e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEECC.s @@ -40,5 +40,3 @@ glabel func_80AFEECC /* 00CA0 80AFEF50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CA4 80AFEF54 03E00008 */ jr $ra /* 00CA8 80AFEF58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF5C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF5C.s index 3e896073eb..401a2f9a82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF5C.s @@ -14,5 +14,3 @@ glabel func_80AFEF5C /* 00CDC 80AFEF8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CE0 80AFEF90 03E00008 */ jr $ra /* 00CE4 80AFEF94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s index 3618c73a13..97cd52cc8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s @@ -43,5 +43,3 @@ glabel func_80AFEF98 /* 00D7C 80AFF02C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D80 80AFF030 03E00008 */ jr $ra /* 00D84 80AFF034 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF038.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF038.s index 65856d0155..ab83e8d1e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF038.s @@ -16,5 +16,3 @@ glabel func_80AFF038 /* 00DC0 80AFF070 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DC4 80AFF074 03E00008 */ jr $ra /* 00DC8 80AFF078 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s index df8bbcfb1c..606a3e9b70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s @@ -64,5 +64,3 @@ glabel func_80AFF07C /* 00EB0 80AFF160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EB4 80AFF164 03E00008 */ jr $ra /* 00EB8 80AFF168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF16C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF16C.s index 626a4a6dd6..4bc9f4395d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF16C.s @@ -11,5 +11,3 @@ glabel func_80AFF16C /* 00EE0 80AFF190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EE4 80AFF194 03E00008 */ jr $ra /* 00EE8 80AFF198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s index e3a294145d..e881accdf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s @@ -22,5 +22,3 @@ glabel func_80AFF19C /* 00F34 80AFF1E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F38 80AFF1E8 03E00008 */ jr $ra /* 00F3C 80AFF1EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF1F0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF1F0.s index f8b2cb62a5..cc0e2e969d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF1F0.s @@ -11,5 +11,3 @@ glabel func_80AFF1F0 /* 00F64 80AFF214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F68 80AFF218 03E00008 */ jr $ra /* 00F6C 80AFF21C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s index a71f4188b0..eb8ef92fee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s @@ -34,5 +34,3 @@ glabel func_80AFF220 /* 00FE4 80AFF294 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FE8 80AFF298 03E00008 */ jr $ra /* 00FEC 80AFF29C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2A0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2A0.s index 16086d6e44..847d909efa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2A0.s @@ -15,5 +15,3 @@ glabel func_80AFF2A0 /* 01024 80AFF2D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01028 80AFF2D8 03E00008 */ jr $ra /* 0102C 80AFF2DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s index 0fc1db27f5..7fce449070 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s @@ -22,5 +22,3 @@ glabel func_80AFF2E0 /* 01078 80AFF328 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0107C 80AFF32C 03E00008 */ jr $ra /* 01080 80AFF330 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF334.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF334.s index 29c14e3522..784f9a6941 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF334.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF334.s @@ -18,5 +18,3 @@ glabel func_80AFF334 /* 010C4 80AFF374 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010C8 80AFF378 03E00008 */ jr $ra /* 010CC 80AFF37C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF380.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF380.s index bb5ef8b1d6..03b12a4a40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF380.s @@ -22,5 +22,3 @@ glabel func_80AFF380 /* 01114 80AFF3C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01118 80AFF3C8 03E00008 */ jr $ra /* 0111C 80AFF3CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF3D0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF3D0.s index 68fd8f0e50..533c841e45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF3D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF3D0.s @@ -20,5 +20,3 @@ glabel func_80AFF3D0 /* 01168 80AFF418 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0116C 80AFF41C 03E00008 */ jr $ra /* 01170 80AFF420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s index 259f8d8b9d..c4f5be20ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s @@ -123,5 +123,3 @@ glabel func_80AFF424 /* 01334 80AFF5E4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01338 80AFF5E8 03E00008 */ jr $ra /* 0133C 80AFF5EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s index ac5c2f2979..ab808ca40f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s @@ -11,5 +11,3 @@ glabel func_80AFF5F0 /* 01364 80AFF614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01368 80AFF618 03E00008 */ jr $ra /* 0136C 80AFF61C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF620.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF620.s index 43ba7478a9..189169f75b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF620.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF620.s @@ -16,5 +16,3 @@ glabel func_80AFF620 /* 013A4 80AFF654 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013A8 80AFF658 03E00008 */ jr $ra /* 013AC 80AFF65C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF660.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF660.s index bef749971b..7113e6037e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF660.s @@ -9,5 +9,3 @@ glabel func_80AFF660 /* 013CC 80AFF67C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013D0 80AFF680 03E00008 */ jr $ra /* 013D4 80AFF684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s index b4f8f38f11..eee31cdf44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s @@ -73,5 +73,3 @@ glabel func_80AFF688 /* 014E4 80AFF794 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 014E8 80AFF798 03E00008 */ jr $ra /* 014EC 80AFF79C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7A0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7A0.s index f4b3e437e9..04ee13bcaf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7A0.s @@ -13,5 +13,3 @@ glabel func_80AFF7A0 /* 0151C 80AFF7CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01520 80AFF7D0 03E00008 */ jr $ra /* 01524 80AFF7D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s index 145cdbc16a..e0ebd8f682 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s @@ -140,5 +140,3 @@ glabel func_80AFF7D8 /* 0172C 80AFF9DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01730 80AFF9E0 03E00008 */ jr $ra /* 01734 80AFF9E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF9E8.s index 6698970364..0e934fbcc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF9E8.s @@ -8,5 +8,3 @@ glabel func_80AFF9E8 /* 01750 80AFFA00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01754 80AFFA04 03E00008 */ jr $ra /* 01758 80AFFA08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s index bb78b658fa..8125256619 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s @@ -195,5 +195,3 @@ glabel func_80AFFA0C /* 01A24 80AFFCD4 8FB10018 */ lw $s1, 0x0018($sp) /* 01A28 80AFFCD8 03E00008 */ jr $ra /* 01A2C 80AFFCDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFCE0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFCE0.s index 3f890b093d..1104b7f7fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFCE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFCE0.s @@ -12,5 +12,3 @@ glabel func_80AFFCE0 /* 01A58 80AFFD08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A5C 80AFFD0C 03E00008 */ jr $ra /* 01A60 80AFFD10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD14.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD14.s index 039c1ac65f..e7ae7d7611 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD14.s @@ -21,5 +21,3 @@ glabel func_80AFFD14 /* 01AA8 80AFFD58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AAC 80AFFD5C 03E00008 */ jr $ra /* 01AB0 80AFFD60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD64.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD64.s index c30c7cc43e..b188690f67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD64.s @@ -7,5 +7,3 @@ glabel func_80AFFD64 /* 01AC8 80AFFD78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01ACC 80AFFD7C 03E00008 */ jr $ra /* 01AD0 80AFFD80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s index 78b1543e3f..e2e38ca07f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s @@ -42,5 +42,3 @@ glabel func_80AFFD84 /* 01B68 80AFFE18 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01B6C 80AFFE1C 03E00008 */ jr $ra /* 01B70 80AFFE20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE24.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE24.s index ac63166b4d..8a94412ddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE24.s @@ -7,5 +7,3 @@ glabel func_80AFFE24 /* 01B88 80AFFE38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B8C 80AFFE3C 03E00008 */ jr $ra /* 01B90 80AFFE40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s index fba0141685..7397b6e1cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s @@ -29,5 +29,3 @@ glabel func_80AFFE44 /* 01BF8 80AFFEA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01BFC 80AFFEAC 03E00008 */ jr $ra /* 01C00 80AFFEB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFEB4.s index ea9e484323..b85bbb3c50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFEB4.s @@ -7,5 +7,3 @@ glabel func_80AFFEB4 /* 01C18 80AFFEC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C1C 80AFFECC 03E00008 */ jr $ra /* 01C20 80AFFED0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s index 8ea2634552..4ff1bae5e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s @@ -26,5 +26,3 @@ glabel func_80AFFED4 /* 01C7C 80AFFF2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C80 80AFFF30 03E00008 */ jr $ra /* 01C84 80AFFF34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF38.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF38.s index 3c5e309bdc..b07e9cfa62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF38.s @@ -7,5 +7,3 @@ glabel func_80AFFF38 /* 01C9C 80AFFF4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CA0 80AFFF50 03E00008 */ jr $ra /* 01CA4 80AFFF54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF58.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF58.s index 1f394e1b83..84b5698b58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFF58.s @@ -25,5 +25,3 @@ glabel func_80AFFF58 /* 01D00 80AFFFB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D04 80AFFFB4 03E00008 */ jr $ra /* 01D08 80AFFFB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s index 4060725a7a..33e8c1d20c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s @@ -22,5 +22,3 @@ glabel func_80AFFFBC /* 01D5C 80B0000C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D60 80B00010 03E00008 */ jr $ra /* 01D64 80B00014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00018.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00018.s index 9226e612a8..9fab5e92dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00018.s @@ -21,5 +21,3 @@ glabel func_80B00018 /* 01DAC 80B0005C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DB0 80B00060 03E00008 */ jr $ra /* 01DB4 80B00064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00068.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00068.s index bd19a8b2df..2fcbf72152 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00068.s @@ -11,5 +11,3 @@ glabel func_80B00068 /* 01DDC 80B0008C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01DE0 80B00090 03E00008 */ jr $ra /* 01DE4 80B00094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s index 249f33bf1a..74644cfe60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s @@ -22,5 +22,3 @@ glabel func_80B00098 /* 01E30 80B000E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E34 80B000E4 03E00008 */ jr $ra /* 01E38 80B000E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B000EC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B000EC.s index ffb6442b48..cf134d35b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B000EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B000EC.s @@ -16,5 +16,3 @@ glabel func_80B000EC /* 01E74 80B00124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E78 80B00128 03E00008 */ jr $ra /* 01E7C 80B0012C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s index bd39248b07..375881d6e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s @@ -41,5 +41,3 @@ glabel func_80B00130 /* 01F10 80B001C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F14 80B001C4 03E00008 */ jr $ra /* 01F18 80B001C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B001CC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B001CC.s index 7c702cd96e..ba1df4cc80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B001CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B001CC.s @@ -16,5 +16,3 @@ glabel func_80B001CC /* 01F54 80B00204 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F58 80B00208 03E00008 */ jr $ra /* 01F5C 80B0020C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00210.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00210.s index 19706b24ba..458e0a71c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00210.s @@ -40,5 +40,3 @@ glabel func_80B00210 /* 01FE8 80B00298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FEC 80B0029C 03E00008 */ jr $ra /* 01FF0 80B002A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002A4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002A4.s index 61d4fcb216..fa17de673f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002A4.s @@ -12,5 +12,3 @@ glabel func_80B002A4 /* 0201C 80B002CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02020 80B002D0 03E00008 */ jr $ra /* 02024 80B002D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s index 383029c931..53e9e090a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s @@ -38,5 +38,3 @@ glabel func_80B002D8 /* 020B4 80B00364 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 020B8 80B00368 03E00008 */ jr $ra /* 020BC 80B0036C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00370.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00370.s index 627d224b72..30b6176fdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00370.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00370.s @@ -7,5 +7,3 @@ glabel func_80B00370 /* 020D4 80B00384 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 020D8 80B00388 03E00008 */ jr $ra /* 020DC 80B0038C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00390.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00390.s index 50a934022f..06f2460c88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00390.s @@ -26,5 +26,3 @@ glabel func_80B00390 /* 02138 80B003E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0213C 80B003EC 03E00008 */ jr $ra /* 02140 80B003F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B003F4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B003F4.s index e7c1a5716b..f4fd8c59a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B003F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B003F4.s @@ -13,5 +13,3 @@ glabel func_80B003F4 /* 02170 80B00420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02174 80B00424 03E00008 */ jr $ra /* 02178 80B00428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0042C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0042C.s index 08d2406d98..894789a753 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0042C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0042C.s @@ -21,5 +21,3 @@ glabel func_80B0042C /* 021C0 80B00470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021C4 80B00474 03E00008 */ jr $ra /* 021C8 80B00478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0047C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0047C.s index ab84c575fd..5437eb1869 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0047C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0047C.s @@ -7,5 +7,3 @@ glabel func_80B0047C /* 021E0 80B00490 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021E4 80B00494 03E00008 */ jr $ra /* 021E8 80B00498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0049C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0049C.s index 8548aedeae..af2eea4022 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0049C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B0049C.s @@ -30,5 +30,3 @@ glabel func_80B0049C /* 02258 80B00508 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0225C 80B0050C 03E00008 */ jr $ra /* 02260 80B00510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00514.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00514.s index 2ed4d33c42..6e210a96b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00514.s @@ -15,5 +15,3 @@ glabel func_80B00514 /* 02298 80B00548 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0229C 80B0054C 03E00008 */ jr $ra /* 022A0 80B00550 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00554.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00554.s index 161ce8f8c1..3084b3c7ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00554.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00554.s @@ -15,5 +15,3 @@ glabel func_80B00554 /* 022D4 80B00584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 022D8 80B00588 03E00008 */ jr $ra /* 022DC 80B0058C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00590.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00590.s index 5636e780eb..e59226c85b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00590.s @@ -20,5 +20,3 @@ glabel func_80B00590 /* 02324 80B005D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02328 80B005D8 03E00008 */ jr $ra /* 0232C 80B005DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B005E0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B005E0.s index a9746016af..e92c5b5c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B005E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B005E0.s @@ -11,5 +11,3 @@ glabel func_80B005E0 /* 02354 80B00604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02358 80B00608 03E00008 */ jr $ra /* 0235C 80B0060C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00610.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00610.s index 69232ab466..82737b762a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00610.s @@ -10,5 +10,3 @@ glabel func_80B00610 .L80B00630: /* 02380 80B00630 03E00008 */ jr $ra /* 02384 80B00634 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00638.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00638.s index be4253a93f..2826a4a2c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00638.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00638.s @@ -19,5 +19,3 @@ glabel func_80B00638 /* 023C4 80B00674 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023C8 80B00678 03E00008 */ jr $ra /* 023CC 80B0067C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00680.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00680.s index a038f34ef8..7465b05ac2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00680.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00680.s @@ -11,5 +11,3 @@ glabel func_80B00680 /* 023F4 80B006A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023F8 80B006A8 03E00008 */ jr $ra /* 023FC 80B006AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006B0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006B0.s index a7536ceddc..4b0a79ae81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006B0.s @@ -19,5 +19,3 @@ glabel func_80B006B0 /* 0243C 80B006EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02440 80B006F0 03E00008 */ jr $ra /* 02444 80B006F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006F8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006F8.s index 7a3778a7a4..4a4c31e643 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B006F8.s @@ -17,5 +17,3 @@ glabel func_80B006F8 /* 02484 80B00734 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02488 80B00738 03E00008 */ jr $ra /* 0248C 80B0073C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00740.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00740.s index 60c70a77cb..8c17d055ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00740.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00740.s @@ -17,5 +17,3 @@ glabel func_80B00740 /* 024CC 80B0077C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 024D0 80B00780 03E00008 */ jr $ra /* 024D4 80B00784 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s index 827f415a0d..035da9337c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s @@ -42,5 +42,3 @@ glabel func_80B00964 /* 0274C 80B009FC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 02750 80B00A00 03E00008 */ jr $ra /* 02754 80B00A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s index 470049714e..f5cb2bf904 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s @@ -19,5 +19,3 @@ glabel func_80B00A08 /* 02798 80B00A48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0279C 80B00A4C 03E00008 */ jr $ra /* 027A0 80B00A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A54.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A54.s index 724530fd63..cab8faef31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A54.s @@ -47,5 +47,3 @@ glabel func_80B00A54 /* 02850 80B00B00 8FB10018 */ lw $s1, 0x0018($sp) /* 02854 80B00B04 03E00008 */ jr $ra /* 02858 80B00B08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00B0C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00B0C.s index 6f12d6de10..d5cf6f6996 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00B0C.s @@ -43,5 +43,3 @@ glabel func_80B00B0C /* 028F4 80B00BA4 8FB10018 */ lw $s1, 0x0018($sp) /* 028F8 80B00BA8 03E00008 */ jr $ra /* 028FC 80B00BAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00BB0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00BB0.s index 0377bd3a66..a1bfbee085 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00BB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00BB0.s @@ -35,5 +35,3 @@ glabel func_80B00BB0 /* 0297C 80B00C2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02980 80B00C30 03E00008 */ jr $ra /* 02984 80B00C34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00C38.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00C38.s index ffc86ba1d9..3f36f3c9b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00C38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00C38.s @@ -167,5 +167,3 @@ glabel func_80B00C38 /* 02BE8 80B00E98 8FB10018 */ lw $s1, 0x0018($sp) /* 02BEC 80B00E9C 03E00008 */ jr $ra /* 02BF0 80B00EA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EA4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EA4.s index 5d5e175718..04aa452276 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EA4.s @@ -16,5 +16,3 @@ glabel func_80B00EA4 /* 02C24 80B00ED4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C28 80B00ED8 03E00008 */ jr $ra /* 02C2C 80B00EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EE0.s index ac208d42cc..bead3feea7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00EE0.s @@ -20,5 +20,3 @@ glabel func_80B00EE0 /* 02C70 80B00F20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C74 80B00F24 03E00008 */ jr $ra /* 02C78 80B00F28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F2C.s index 22f3d44d23..8f0bcb2f36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F2C.s @@ -13,5 +13,3 @@ glabel func_80B00F2C /* 02CA8 80B00F58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02CAC 80B00F5C 03E00008 */ jr $ra /* 02CB0 80B00F60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F64.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F64.s index 887abc49e3..3b8815eb33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00F64.s @@ -43,5 +43,3 @@ glabel func_80B00F64 /* 02D48 80B00FF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D4C 80B00FFC 03E00008 */ jr $ra /* 02D50 80B01000 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01004.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01004.s index dc70b9ae68..2700ef4768 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01004.s @@ -16,5 +16,3 @@ glabel func_80B01004 /* 02D84 80B01034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D88 80B01038 03E00008 */ jr $ra /* 02D8C 80B0103C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s index f5020f14e2..46c61ccddf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s @@ -34,5 +34,3 @@ glabel func_80B01040 /* 02E08 80B010B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E0C 80B010BC 03E00008 */ jr $ra /* 02E10 80B010C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s index 65d6e1cc4f..83bf822f9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s @@ -29,5 +29,3 @@ glabel func_80B010C4 /* 02E78 80B01128 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E7C 80B0112C 03E00008 */ jr $ra /* 02E80 80B01130 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s index 81366ab984..1182ad191d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s @@ -41,5 +41,3 @@ glabel func_80B01134 /* 02F10 80B011C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F14 80B011C4 03E00008 */ jr $ra /* 02F18 80B011C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B011CC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B011CC.s index 1f721e9418..92761709e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B011CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B011CC.s @@ -33,5 +33,3 @@ glabel func_80B011CC /* 02F88 80B01238 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F8C 80B0123C 03E00008 */ jr $ra /* 02F90 80B01240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s index d77af7f69d..b9d42db11a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s @@ -66,5 +66,3 @@ glabel func_80B01244 /* 0308C 80B0133C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 03090 80B01340 03E00008 */ jr $ra /* 03094 80B01344 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01348.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01348.s index 8898378eaf..2309ed7955 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01348.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01348.s @@ -5,5 +5,3 @@ glabel func_80B01348 /* 030A4 80B01354 AFA7000C */ sw $a3, 0x000C($sp) /* 030A8 80B01358 03E00008 */ jr $ra /* 030AC 80B0135C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s index 105fdfec26..ce73ea8d31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s @@ -69,5 +69,3 @@ glabel func_80B01360 /* 031B8 80B01468 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 031BC 80B0146C 03E00008 */ jr $ra /* 031C0 80B01470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01474.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01474.s index 8c3b70c5b3..041d4d50b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01474.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01474.s @@ -28,5 +28,3 @@ glabel func_80B01474 /* 03228 80B014D8 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 /* 0322C 80B014DC 03E00008 */ jr $ra /* 03230 80B014E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B014E4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B014E4.s index 504c4d6e51..7baa1a324a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B014E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B014E4.s @@ -19,5 +19,3 @@ glabel func_80B014E4 /* 03274 80B01524 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 /* 03278 80B01528 03E00008 */ jr $ra /* 0327C 80B0152C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s index d9ea137032..19d64b4d7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s @@ -10,5 +10,3 @@ glabel EnSkjneedle_Destroy /* 000B0 80B01F60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B4 80B01F64 03E00008 */ jr $ra /* 000B8 80B01F68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s index d6b5e9ccbd..caaa44e99a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B021C0 + .asciz "../z_en_skj_needle.c" + .balign 4 + +glabel D_80B021D8 + .asciz "../z_en_skj_needle.c" + .balign 4 + +glabel D_80B021F0 + .asciz "../z_en_skj_needle.c" + .balign 4 + +.text glabel EnSkjneedle_Draw /* 001DC 80B0208C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 001E0 80B02090 AFBF001C */ sw $ra, 0x001C($sp) @@ -52,4 +66,3 @@ glabel EnSkjneedle_Draw /* 002A4 80B02154 00000000 */ nop /* 002A8 80B02158 00000000 */ nop /* 002AC 80B0215C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s index 26c86bc84b..a77c510f33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s @@ -40,5 +40,3 @@ glabel EnSkjneedle_Init /* 00088 80B01F38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0008C 80B01F3C 03E00008 */ jr $ra /* 00090 80B01F40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s index b6da8ce3ab..bd1c154544 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s @@ -69,5 +69,3 @@ glabel EnSkjneedle_Update /* 001D0 80B02080 8FB10020 */ lw $s1, 0x0020($sp) /* 001D4 80B02084 03E00008 */ jr $ra /* 001D8 80B02088 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/func_80B01F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/func_80B01F6C.s index e84a5be9e3..2377bdc60a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/func_80B01F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/func_80B01F6C.s @@ -12,5 +12,3 @@ glabel func_80B01F6C .L80B01F94: /* 000E4 80B01F94 03E00008 */ jr $ra /* 000E8 80B01F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s index 4a490817ab..236ab8930e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s @@ -33,5 +33,3 @@ glabel EnSsh_Destroy /* 016EC 80B0395C 8FB40028 */ lw $s4, 0x0028($sp) /* 016F0 80B03960 03E00008 */ jr $ra /* 016F4 80B03964 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s index 67c2d0a843..aafbdb2395 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B045D0 + .asciz "../z_en_ssh.c" + .balign 4 + +glabel D_80B045E0 + .asciz "../z_en_ssh.c" + .balign 4 + +.text glabel EnSsh_Draw /* 02048 80B042B8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0204C 80B042BC AFBF0024 */ sw $ra, 0x0024($sp) @@ -66,4 +76,3 @@ glabel EnSsh_Draw /* 02144 80B043B4 00000000 */ nop /* 02148 80B043B8 00000000 */ nop /* 0214C 80B043BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s index 9a00916073..6309194616 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s @@ -111,5 +111,3 @@ glabel EnSsh_Init /* 0166C 80B038DC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01670 80B038E0 03E00008 */ jr $ra /* 01674 80B038E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Update.s index 5a6b9fae66..134d378e9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Update.s @@ -80,5 +80,3 @@ glabel EnSsh_Update /* 01F14 80B04184 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F18 80B04188 03E00008 */ jr $ra /* 01F1C 80B0418C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02270.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02270.s index 6b49277f0d..75b44dcbbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02270.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02270.s @@ -1,5 +1,3 @@ glabel func_80B02270 /* 00000 80B02270 03E00008 */ jr $ra /* 00004 80B02274 AC8502F8 */ sw $a1, 0x02F8($a0) ## 000002F8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s index 4cd48aba0a..10a3a95e63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s @@ -33,5 +33,3 @@ glabel func_80B02278 /* 00084 80B022F4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00088 80B022F8 03E00008 */ jr $ra /* 0008C 80B022FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02300.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02300.s index 548cfb3b82..9600156363 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02300.s @@ -63,5 +63,3 @@ glabel func_80B02300 /* 00180 80B023F0 27BD01D8 */ addiu $sp, $sp, 0x01D8 ## $sp = 00000000 /* 00184 80B023F4 03E00008 */ jr $ra /* 00188 80B023F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B023FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B023FC.s index d05f94b18a..4b065ebaeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B023FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B023FC.s @@ -38,5 +38,3 @@ glabel func_80B023FC /* 00214 80B02484 8FB00030 */ lw $s0, 0x0030($sp) /* 00218 80B02488 03E00008 */ jr $ra /* 0021C 80B0248C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s index 3fee011b68..ac12d12911 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s @@ -65,5 +65,3 @@ glabel func_80B02490 /* 0031C 80B0258C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00320 80B02590 03E00008 */ jr $ra /* 00324 80B02594 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s index f0601ac12d..d88973e000 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s @@ -9,5 +9,3 @@ glabel func_80B02598 /* 00344 80B025B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00348 80B025B8 03E00008 */ jr $ra /* 0034C 80B025BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s index 3f22ebe156..c5361f1f27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s @@ -83,5 +83,3 @@ glabel func_80B025C0 /* 00484 80B026F4 8FB40030 */ lw $s4, 0x0030($sp) /* 00488 80B026F8 03E00008 */ jr $ra /* 0048C 80B026FC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s index 51e0d876fb..be6f9fc381 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s @@ -78,5 +78,3 @@ glabel func_80B02700 /* 005B8 80B02828 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 005BC 80B0282C 03E00008 */ jr $ra /* 005C0 80B02830 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02834.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02834.s index bf4a4bd51c..70b1819b5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02834.s @@ -7,5 +7,3 @@ glabel func_80B02834 /* 005D8 80B02848 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005DC 80B0284C 03E00008 */ jr $ra /* 005E0 80B02850 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02854.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02854.s index 5a6bf93e2f..ed48991ac9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02854.s @@ -12,5 +12,3 @@ glabel func_80B02854 /* 00608 80B02878 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0060C 80B0287C 03E00008 */ jr $ra /* 00610 80B02880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02884.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02884.s index 8d8dc26931..0cffd3099b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02884.s @@ -17,5 +17,3 @@ glabel func_80B02884 /* 00650 80B028C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00654 80B028C4 03E00008 */ jr $ra /* 00658 80B028C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B028CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B028CC.s index f77fdabe9e..ec2ba00563 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B028CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B028CC.s @@ -21,5 +21,3 @@ glabel func_80B028CC /* 006A4 80B02914 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006A8 80B02918 03E00008 */ jr $ra /* 006AC 80B0291C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02920.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02920.s index d8208ff4c1..ce0c2787d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02920.s @@ -11,5 +11,3 @@ glabel func_80B02920 .L80B02944: /* 006D4 80B02944 03E00008 */ jr $ra /* 006D8 80B02948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0294C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0294C.s index df46e9fbcf..118fc7e52d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0294C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0294C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B045F0 + .float 0.04 + +.text glabel func_80B0294C /* 006DC 80B0294C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 006E0 80B02950 44857000 */ mtc1 $a1, $f14 ## $f14 = 0.00 @@ -96,5 +101,3 @@ glabel func_80B0294C /* 00848 80B02AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0084C 80B02ABC 03E00008 */ jr $ra /* 00850 80B02AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02AC4.s index f0cbe5d2a6..94427c9eb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02AC4.s @@ -62,5 +62,3 @@ glabel func_80B02AC4 /* 00920 80B02B90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00924 80B02B94 03E00008 */ jr $ra /* 00928 80B02B98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02B9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02B9C.s index 4f10eb1fdf..589970b0a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02B9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02B9C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B045F4 + .float 10000.0 + +.text glabel func_80B02B9C /* 0092C 80B02B9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00930 80B02BA0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -60,5 +65,3 @@ glabel func_80B02B9C /* 009F8 80B02C68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009FC 80B02C6C 03E00008 */ jr $ra /* 00A00 80B02C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02C74.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02C74.s index 075fad1d3e..213970c788 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02C74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02C74.s @@ -44,5 +44,3 @@ glabel func_80B02C74 /* 00A98 80B02D08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A9C 80B02D0C 03E00008 */ jr $ra /* 00AA0 80B02D10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D14.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D14.s index 77fea0aa07..748ac050ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D14.s @@ -16,5 +16,3 @@ glabel func_80B02D14 /* 00AD4 80B02D44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AD8 80B02D48 03E00008 */ jr $ra /* 00ADC 80B02D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D50.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D50.s index 7db81f80fc..c43ca39905 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D50.s @@ -28,5 +28,3 @@ glabel func_80B02D50 /* 00B40 80B02DB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B44 80B02DB4 03E00008 */ jr $ra /* 00B48 80B02DB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02DBC.s index 5c5e55d85e..dda77c50e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02DBC.s @@ -71,5 +71,3 @@ glabel func_80B02DBC .L80B02E9C: /* 00C2C 80B02E9C 03E00008 */ jr $ra /* 00C30 80B02EA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EA4.s index 9b28e4a3bb..e766cb9b9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EA4.s @@ -14,5 +14,3 @@ glabel func_80B02EA4 .L80B02ED4: /* 00C64 80B02ED4 03E00008 */ jr $ra /* 00C68 80B02ED8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EDC.s index f55664db37..b7339371ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EDC.s @@ -16,5 +16,3 @@ glabel func_80B02EDC .L80B02F14: /* 00CA4 80B02F14 03E00008 */ jr $ra /* 00CA8 80B02F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02F1C.s index 28b704cf8a..4e49e39f09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02F1C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B045F8 + .word 0x3E2AAAAB +glabel D_80B045FC + .word 0x43360B61 +glabel D_80B04600 + .float 9.58738019108e-05 + +.text glabel func_80B02F1C /* 00CAC 80B02F1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00CB0 80B02F20 AFBF0024 */ sw $ra, 0x0024($sp) @@ -85,5 +94,3 @@ glabel func_80B02F1C /* 00DE4 80B03054 8FB00020 */ lw $s0, 0x0020($sp) /* 00DE8 80B03058 03E00008 */ jr $ra /* 00DEC 80B0305C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03060.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03060.s index 056cc0e60d..e225da3446 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03060.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03060.s @@ -30,5 +30,3 @@ glabel func_80B03060 /* 00E58 80B030C8 AC9803B4 */ sw $t8, 0x03B4($a0) ## 000003B4 /* 00E5C 80B030CC 03E00008 */ jr $ra /* 00E60 80B030D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B030D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B030D4.s index 995ea95e73..060d9de72c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B030D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B030D4.s @@ -74,5 +74,3 @@ glabel func_80B030D4 /* 00F60 80B031D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F64 80B031D4 03E00008 */ jr $ra /* 00F68 80B031D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B031DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B031DC.s index 63382f3566..f25d60ce70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B031DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B031DC.s @@ -25,5 +25,3 @@ glabel func_80B031DC .L80B03230: /* 00FC0 80B03230 03E00008 */ jr $ra /* 00FC4 80B03234 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03238.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03238.s index b52f8933e5..1c09c5582e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03238.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03238.s @@ -60,5 +60,3 @@ glabel func_80B03238 /* 01090 80B03300 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01094 80B03304 03E00008 */ jr $ra /* 01098 80B03308 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0330C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0330C.s index b3510ece83..dc9a73b1ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0330C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0330C.s @@ -50,5 +50,3 @@ glabel func_80B0330C /* 01140 80B033B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01144 80B033B4 03E00008 */ jr $ra /* 01148 80B033B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s index 0f7f2f51d2..414d9ceb5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s @@ -18,5 +18,3 @@ glabel func_80B033BC /* 01184 80B033F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01188 80B033F8 03E00008 */ jr $ra /* 0118C 80B033FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s index 090f00f46d..53826eb587 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s @@ -52,5 +52,3 @@ glabel func_80B03400 /* 01238 80B034A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0123C 80B034AC 03E00008 */ jr $ra /* 01240 80B034B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s index 7baa25b8da..9f89cbd9ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B04604 + .float 3.14159274101 + +.text glabel func_80B034B4 /* 01244 80B034B4 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01248 80B034B8 3C0F80B0 */ lui $t7, %hi(D_80B04594) ## $t7 = 80B00000 @@ -120,5 +125,3 @@ glabel func_80B034B4 /* 01410 80B03680 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 01414 80B03684 03E00008 */ jr $ra /* 01418 80B03688 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s index e98b747d55..72d4a6257a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s @@ -56,5 +56,3 @@ glabel func_80B0368C /* 014D8 80B03748 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 014DC 80B0374C 03E00008 */ jr $ra /* 014E0 80B03750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03968.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03968.s index 217e430125..2aa28a647f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03968.s @@ -22,5 +22,3 @@ glabel func_80B03968 /* 01740 80B039B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01744 80B039B4 03E00008 */ jr $ra /* 01748 80B039B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B039BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B039BC.s index 56c661e481..bc43a3888f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B039BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B039BC.s @@ -17,5 +17,3 @@ glabel func_80B039BC /* 01784 80B039F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01788 80B039F8 03E00008 */ jr $ra /* 0178C 80B039FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s index 9eac251066..86520a3fe7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s @@ -188,5 +188,3 @@ glabel func_80B03A00 /* 01A10 80B03C80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A14 80B03C84 03E00008 */ jr $ra /* 01A18 80B03C88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03C8C.s index 5d1ea49a8b..09298b17ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03C8C.s @@ -68,5 +68,3 @@ glabel func_80B03C8C /* 01AF8 80B03D68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01AFC 80B03D6C 03E00008 */ jr $ra /* 01B00 80B03D70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03D74.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03D74.s index 3cec210926..7927289223 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03D74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03D74.s @@ -73,5 +73,3 @@ glabel func_80B03D74 /* 01BF8 80B03E68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01BFC 80B03E6C 03E00008 */ jr $ra /* 01C00 80B03E70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03E74.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03E74.s index 0e99b9b945..201e01cba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03E74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03E74.s @@ -56,5 +56,3 @@ glabel func_80B03E74 /* 01CCC 80B03F3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01CD0 80B03F40 03E00008 */ jr $ra /* 01CD4 80B03F44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03F48.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03F48.s index d4c39a3acd..04d6c5af80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03F48.s @@ -45,5 +45,3 @@ glabel func_80B03F48 /* 01D74 80B03FE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D78 80B03FE8 03E00008 */ jr $ra /* 01D7C 80B03FEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03FF0.s index 3233ea7d2f..214d90586e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03FF0.s @@ -34,5 +34,3 @@ glabel func_80B03FF0 /* 01DF8 80B04068 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01DFC 80B0406C 03E00008 */ jr $ra /* 01E00 80B04070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04190.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04190.s index 1f3ff8e49f..c8e43ffee5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04190.s @@ -66,5 +66,3 @@ glabel func_80B04190 /* 02004 80B04274 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02008 80B04278 03E00008 */ jr $ra /* 0200C 80B0427C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04280.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04280.s index 130dce238b..d50ef41b18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04280.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04280.s @@ -13,5 +13,3 @@ glabel func_80B04280 /* 0203C 80B042AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02040 80B042B0 03E00008 */ jr $ra /* 02044 80B042B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s index 0b86b1e789..43bf2eb47a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s @@ -33,5 +33,3 @@ glabel EnSt_Destroy /* 01C14 80B064A4 8FB40028 */ lw $s4, 0x0028($sp) /* 01C18 80B064A8 03E00008 */ jr $ra /* 01C1C 80B064AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Draw.s index 49d7596f6e..7857f366b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Draw.s @@ -23,4 +23,3 @@ glabel EnSt_Draw /* 026A4 80B06F34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 026A8 80B06F38 03E00008 */ jr $ra /* 026AC 80B06F3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s index 0a1bab28b1..e25ed4c20e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s @@ -77,5 +77,3 @@ glabel EnSt_Init /* 01B94 80B06424 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01B98 80B06428 03E00008 */ jr $ra /* 01B9C 80B0642C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Update.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Update.s index bd794951fe..b0b7baa7bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Update.s @@ -107,5 +107,3 @@ glabel EnSt_Update /* 024EC 80B06D7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 024F0 80B06D80 03E00008 */ jr $ra /* 024F4 80B06D84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04890.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04890.s index 3ca70caecf..2b1e9a4285 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04890.s @@ -1,5 +1,3 @@ glabel func_80B04890 /* 00000 80B04890 03E00008 */ jr $ra /* 00004 80B04894 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04898.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04898.s index b410a3cb58..015c798aca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04898.s @@ -144,5 +144,3 @@ glabel func_80B04898 /* 0021C 80B04AAC 8FBE0068 */ lw $s8, 0x0068($sp) /* 00220 80B04AB0 03E00008 */ jr $ra /* 00224 80B04AB4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04AB8.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04AB8.s index eaa19f161a..1b6c4ea0fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04AB8.s @@ -33,5 +33,3 @@ glabel func_80B04AB8 /* 002A4 80B04B34 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 002A8 80B04B38 03E00008 */ jr $ra /* 002AC 80B04B3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04B40.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04B40.s index 0e1d912832..74c9943690 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04B40.s @@ -81,5 +81,3 @@ glabel func_80B04B40 /* 003E0 80B04C70 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 003E4 80B04C74 03E00008 */ jr $ra /* 003E8 80B04C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04C7C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04C7C.s index 45e9afc42b..def376ab2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04C7C.s @@ -63,5 +63,3 @@ glabel func_80B04C7C /* 004DC 80B04D6C 27BD01D8 */ addiu $sp, $sp, 0x01D8 ## $sp = 00000000 /* 004E0 80B04D70 03E00008 */ jr $ra /* 004E4 80B04D74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04D78.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04D78.s index b57c49dda3..5ebf55fab1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04D78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04D78.s @@ -52,5 +52,3 @@ glabel func_80B04D78 /* 005A8 80B04E38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 005AC 80B04E3C 03E00008 */ jr $ra /* 005B0 80B04E40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s index 03a065e625..6b362ac654 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s @@ -65,5 +65,3 @@ glabel func_80B04E44 /* 006B0 80B04F40 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 006B4 80B04F44 03E00008 */ jr $ra /* 006B8 80B04F48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s index 5a8cbdbb26..5d1647bcf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s @@ -9,5 +9,3 @@ glabel func_80B04F4C /* 006D8 80B04F68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006DC 80B04F6C 03E00008 */ jr $ra /* 006E0 80B04F70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F74.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F74.s index b76028cb73..d09391513e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F74.s @@ -10,5 +10,3 @@ glabel func_80B04F74 /* 00704 80B04F94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00708 80B04F98 03E00008 */ jr $ra /* 0070C 80B04F9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FA0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FA0.s index 49e59bac80..0105cc42a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FA0.s @@ -15,5 +15,3 @@ glabel func_80B04FA0 /* 00740 80B04FD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00744 80B04FD4 03E00008 */ jr $ra /* 00748 80B04FD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FDC.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FDC.s index 5fbd509cf6..c1c60f22fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04FDC.s @@ -23,5 +23,3 @@ glabel func_80B04FDC /* 007A0 80B05030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007A4 80B05034 03E00008 */ jr $ra /* 007A8 80B05038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0503C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0503C.s index 23096cef45..092a7a47ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0503C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0503C.s @@ -25,5 +25,3 @@ glabel func_80B0503C /* 00804 80B05094 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00808 80B05098 03E00008 */ jr $ra /* 0080C 80B0509C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s index 34551600ea..d7926abbfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s @@ -83,5 +83,3 @@ glabel func_80B050A0 /* 00944 80B051D4 8FB40030 */ lw $s4, 0x0030($sp) /* 00948 80B051D8 03E00008 */ jr $ra /* 0094C 80B051DC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B051E0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B051E0.s index 8f57d39074..63134fa3eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B051E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B051E0.s @@ -30,5 +30,3 @@ glabel func_80B051E0 /* 009B8 80B05248 AC98024C */ sw $t8, 0x024C($a0) ## 0000024C /* 009BC 80B0524C 03E00008 */ jr $ra /* 009C0 80B05250 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s index 4ba068275e..1820aebda4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s @@ -18,5 +18,3 @@ glabel func_80B05254 /* 009FC 80B0528C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A00 80B05290 03E00008 */ jr $ra /* 00A04 80B05294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s index 3d70cdb974..2b773f4d9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s @@ -52,5 +52,3 @@ glabel func_80B05298 /* 00AB0 80B05340 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AB4 80B05344 03E00008 */ jr $ra /* 00AB8 80B05348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s index e85a0780ba..803a1042ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B07220 + .float 3.14159274101 + +.text glabel func_80B0534C /* 00ABC 80B0534C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 00AC0 80B05350 3C0F80B0 */ lui $t7, %hi(D_80B071C0) ## $t7 = 80B00000 @@ -120,5 +125,3 @@ glabel func_80B0534C /* 00C88 80B05518 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 00C8C 80B0551C 03E00008 */ jr $ra /* 00C90 80B05520 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05524.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05524.s index 4cd09ec793..bf40aa7bdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05524.s @@ -56,5 +56,3 @@ glabel func_80B05524 /* 00D4C 80B055DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D50 80B055E0 03E00008 */ jr $ra /* 00D54 80B055E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B055E8.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B055E8.s index 222451ddf4..878ff704fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B055E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B055E8.s @@ -64,5 +64,3 @@ glabel func_80B055E8 /* 00E34 80B056C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00E38 80B056C8 03E00008 */ jr $ra /* 00E3C 80B056CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B056D0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B056D0.s index c94023adbc..efa166584c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B056D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B056D0.s @@ -16,5 +16,3 @@ glabel func_80B056D0 /* 00E74 80B05704 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00E78 80B05708 03E00008 */ jr $ra /* 00E7C 80B0570C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05710.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05710.s index b1a32d6ab9..26cbc38530 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05710.s @@ -136,5 +136,3 @@ glabel func_80B05710 /* 01064 80B058F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01068 80B058F8 03E00008 */ jr $ra /* 0106C 80B058FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05900.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05900.s index a8a6e0b97d..395116f69a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05900.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05900.s @@ -37,5 +37,3 @@ glabel func_80B05900 /* 010EC 80B0597C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010F0 80B05980 03E00008 */ jr $ra /* 010F4 80B05984 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05988.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05988.s index c51fc2a1aa..c78b7fc458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05988.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05988.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B07224 + .float 1.4 + +glabel D_80B07228 + .float 0.04 + +.text glabel func_80B05988 /* 010F8 80B05988 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 010FC 80B0598C AFBF0014 */ sw $ra, 0x0014($sp) @@ -95,5 +103,3 @@ glabel func_80B05988 /* 0125C 80B05AEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01260 80B05AF0 03E00008 */ jr $ra /* 01264 80B05AF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05AF8.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05AF8.s index 3546bad4d0..3dc254ffbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05AF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05AF8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0722C + .float 0.6 + +.text glabel func_80B05AF8 /* 01268 80B05AF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0126C 80B05AFC AFB0001C */ sw $s0, 0x001C($sp) @@ -80,5 +85,3 @@ glabel func_80B05AF8 /* 01388 80B05C18 8FB0001C */ lw $s0, 0x001C($sp) /* 0138C 80B05C1C 03E00008 */ jr $ra /* 01390 80B05C20 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C24.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C24.s index d72a41fe2f..ea6d1af77b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C24.s @@ -8,5 +8,3 @@ glabel func_80B05C24 /* 013A8 80B05C38 A48E03CE */ sh $t6, 0x03CE($a0) ## 000003CE /* 013AC 80B05C3C 03E00008 */ jr $ra /* 013B0 80B05C40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C44.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C44.s index 19b22480dd..7da143ff63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05C44.s @@ -188,5 +188,3 @@ glabel func_80B05C44 /* 01648 80B05ED8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0164C 80B05EDC 03E00008 */ jr $ra /* 01650 80B05EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05EE4.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05EE4.s index d5e95f2b9b..786bd1b0dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05EE4.s @@ -56,5 +56,3 @@ glabel func_80B05EE4 /* 01714 80B05FA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01718 80B05FA8 03E00008 */ jr $ra /* 0171C 80B05FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05FB0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05FB0.s index ad8928f4a1..b49c886703 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05FB0.s @@ -28,5 +28,3 @@ glabel func_80B05FB0 /* 01780 80B06010 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01784 80B06014 03E00008 */ jr $ra /* 01788 80B06018 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0601C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0601C.s index 0421fdcc3d..c53476db6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0601C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0601C.s @@ -49,5 +49,3 @@ glabel func_80B0601C .L80B060BC: /* 0182C 80B060BC 03E00008 */ jr $ra /* 01830 80B060C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060C4.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060C4.s index 52a330f6ea..18ef17ea2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060C4.s @@ -14,5 +14,3 @@ glabel func_80B060C4 .L80B060F4: /* 01864 80B060F4 03E00008 */ jr $ra /* 01868 80B060F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060FC.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060FC.s index d0799853a2..546338ecd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B060FC.s @@ -16,5 +16,3 @@ glabel func_80B060FC .L80B06134: /* 018A4 80B06134 03E00008 */ jr $ra /* 018A8 80B06138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0613C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0613C.s index 078dd13f20..d657fc8b64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0613C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0613C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B07230 + .word 0x3EEEEEEF +glabel D_80B07234 + .word 0x43360B61 +glabel D_80B07238 + .float 9.58738019108e-05 + +.text glabel func_80B0613C /* 018AC 80B0613C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 018B0 80B06140 AFBF001C */ sw $ra, 0x001C($sp) @@ -128,5 +137,3 @@ glabel func_80B0613C /* 01A70 80B06300 8FB10018 */ lw $s1, 0x0018($sp) /* 01A74 80B06304 03E00008 */ jr $ra /* 01A78 80B06308 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B064B0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B064B0.s index a0df5aa2a4..a68bb44bd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B064B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B064B0.s @@ -22,5 +22,3 @@ glabel func_80B064B0 /* 01C68 80B064F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C6C 80B064FC 03E00008 */ jr $ra /* 01C70 80B06500 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06504.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06504.s index 365a66d5e9..ecd12ebb7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06504.s @@ -69,5 +69,3 @@ glabel func_80B06504 /* 01D60 80B065F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D64 80B065F4 03E00008 */ jr $ra /* 01D68 80B065F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B065FC.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B065FC.s index 48d6742afb..2bf2552198 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B065FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B065FC.s @@ -71,5 +71,3 @@ glabel func_80B065FC /* 01E64 80B066F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01E68 80B066F8 03E00008 */ jr $ra /* 01E6C 80B066FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06700.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06700.s index aba1bb3915..c02b03846a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06700.s @@ -68,5 +68,3 @@ glabel func_80B06700 /* 01F5C 80B067EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F60 80B067F0 03E00008 */ jr $ra /* 01F64 80B067F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B067F8.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B067F8.s index d30f37da80..7612537b70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B067F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B067F8.s @@ -56,5 +56,3 @@ glabel func_80B067F8 /* 02030 80B068C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02034 80B068C4 03E00008 */ jr $ra /* 02038 80B068C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B068CC.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B068CC.s index f4e163fc4b..66d56ba998 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B068CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B068CC.s @@ -54,5 +54,3 @@ glabel func_80B068CC /* 02100 80B06990 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02104 80B06994 03E00008 */ jr $ra /* 02108 80B06998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0699C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0699C.s index 15c744d46f..84c986f5e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0699C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0699C.s @@ -103,5 +103,3 @@ glabel func_80B0699C /* 02274 80B06B04 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02278 80B06B08 03E00008 */ jr $ra /* 0227C 80B06B0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B10.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B10.s index b0e5019ccf..35471173b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B10.s @@ -35,5 +35,3 @@ glabel func_80B06B10 /* 022EC 80B06B7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022F0 80B06B80 03E00008 */ jr $ra /* 022F4 80B06B84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B88.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B88.s index ba2ab7d563..f04f741b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06B88.s @@ -33,5 +33,3 @@ glabel func_80B06B88 /* 0236C 80B06BFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02370 80B06C00 03E00008 */ jr $ra /* 02374 80B06C04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s index 9d8831e0e5..2f69f75563 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B07200 + .asciz "../z_en_st.c" + .balign 4 + +glabel D_80B07210 + .asciz "../z_en_st.c" + .balign 4 + +.text glabel func_80B06D88 /* 024F8 80B06D88 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 024FC 80B06D8C AFBF0014 */ sw $ra, 0x0014($sp) @@ -76,5 +86,3 @@ glabel func_80B06D88 /* 02610 80B06EA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02614 80B06EA4 03E00008 */ jr $ra /* 02618 80B06EA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06EAC.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06EAC.s index b9bca9a60f..ad27d34e31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06EAC.s @@ -13,5 +13,3 @@ glabel func_80B06EAC /* 02648 80B06ED8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0264C 80B06EDC 03E00008 */ jr $ra /* 02650 80B06EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s index 1f8eca1231..a8f2e600ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s @@ -10,5 +10,3 @@ glabel EnSth_Destroy /* 0032C 80B0786C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00330 80B07870 03E00008 */ jr $ra /* 00334 80B07874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s index 83a765a4f4..7e355290a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80B0B4C0 + .asciz "金スタル屋 no = %d\n" + .balign 4 + +glabel D_80B0B4DC + .asciz "金スタル屋 まだ 人間に戻れない \n" + .balign 4 + +glabel D_80B0B500 + .asciz "金スタル屋 まだ 人間に戻れない \n" + .balign 4 + +glabel D_80B0B52C + .asciz "bank_ID = %d\n" + .balign 4 + +glabel D_80B0B53C + .asciz "0" + .balign 4 + +glabel D_80B0B540 + .asciz "../z_en_sth.c" + .balign 4 + +.text glabel EnSth_Init /* 00008 80B07548 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0000C 80B0754C AFBF001C */ sw $ra, 0x001C($sp) @@ -103,5 +129,3 @@ glabel EnSth_Init /* 00164 80B076A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00168 80B076A8 03E00008 */ jr $ra /* 0016C 80B076AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Update.s index d2a038c270..fc6b6cf16e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Update.s @@ -8,5 +8,3 @@ glabel EnSth_Update /* 00994 80B07ED4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00998 80B07ED8 03E00008 */ jr $ra /* 0099C 80B07EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07540.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07540.s index 61b6e3046b..2cdef6077a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07540.s @@ -1,5 +1,3 @@ glabel func_80B07540 /* 00000 80B07540 03E00008 */ jr $ra /* 00004 80B07544 AC8502B8 */ sw $a1, 0x02B8($a0) ## 000002B8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s index 24b8f79cad..5ec5827ac6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s @@ -35,5 +35,3 @@ glabel func_80B076B0 /* 001E8 80B07728 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001EC 80B0772C 03E00008 */ jr $ra /* 001F0 80B07730 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s index 6294a9951c..70c3a42e34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s @@ -72,5 +72,3 @@ glabel func_80B07734 /* 00304 80B07844 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00308 80B07848 03E00008 */ jr $ra /* 0030C 80B0784C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07878.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07878.s index eaa2d7f43f..92c392fa90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07878.s @@ -21,5 +21,3 @@ glabel func_80B07878 /* 0037C 80B078BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00380 80B078C0 03E00008 */ jr $ra /* 00384 80B078C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s index 41aecfd3f4..50484eb1d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s @@ -78,5 +78,3 @@ glabel func_80B078C8 /* 00494 80B079D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00498 80B079D8 03E00008 */ jr $ra /* 0049C 80B079DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s index 56187adfea..7b6c52291c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s @@ -76,5 +76,3 @@ glabel func_80B079E0 /* 005A8 80B07AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 005AC 80B07AEC 03E00008 */ jr $ra /* 005B0 80B07AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07AF4.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07AF4.s index 88168d1d9e..99a74b8986 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07AF4.s @@ -30,5 +30,3 @@ glabel func_80B07AF4 /* 0061C 80B07B5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00620 80B07B60 03E00008 */ jr $ra /* 00624 80B07B64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07B68.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07B68.s index 2e5cb730ba..b9aad3dd65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07B68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07B68.s @@ -34,5 +34,3 @@ glabel func_80B07B68 /* 006A0 80B07BE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006A4 80B07BE4 03E00008 */ jr $ra /* 006A8 80B07BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s index 9217be7eb2..47f3771753 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s @@ -42,5 +42,3 @@ glabel func_80B07BEC /* 0073C 80B07C7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00740 80B07C80 03E00008 */ jr $ra /* 00744 80B07C84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s index 3effe0c0d5..13771ee5be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s @@ -31,5 +31,3 @@ glabel func_80B07C88 /* 007B4 80B07CF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 007B8 80B07CF8 03E00008 */ jr $ra /* 007BC 80B07CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D00.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D00.s index 00402512be..c6fb92f4b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D00.s @@ -31,5 +31,3 @@ glabel func_80B07D00 /* 00830 80B07D70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00834 80B07D74 03E00008 */ jr $ra /* 00838 80B07D78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D7C.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D7C.s index f77d99a59b..e8dba116fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07D7C.s @@ -42,5 +42,3 @@ glabel func_80B07D7C /* 008CC 80B07E0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008D0 80B07E10 03E00008 */ jr $ra /* 008D4 80B07E14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s index 0c2f039d20..d0fbb1fed7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s @@ -44,5 +44,3 @@ glabel func_80B07E18 /* 00970 80B07EB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00974 80B07EB4 03E00008 */ jr $ra /* 00978 80B07EB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s index 826371d475..afac72a577 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s @@ -73,5 +73,3 @@ glabel func_80B07EE0 /* 00A94 80B07FD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A98 80B07FD8 03E00008 */ jr $ra /* 00A9C 80B07FDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s index 7a86e0ec87..73188b42c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s @@ -92,5 +92,3 @@ glabel func_80B07FE0 /* 00BF0 80B08130 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BF4 80B08134 03E00008 */ jr $ra /* 00BF8 80B08138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s index 867b03af68..2b73370f34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B0B550 + .asciz "../z_en_sth.c" + .balign 4 + +glabel D_80B0B560 + .asciz "../z_en_sth.c" + .balign 4 + +.text glabel func_80B0813C /* 00BFC 80B0813C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00C00 80B08140 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -45,5 +55,3 @@ glabel func_80B0813C /* 00CA0 80B081E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00CA4 80B081E4 03E00008 */ jr $ra /* 00CA8 80B081E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B081EC.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B081EC.s index 658c4402a5..cbdcf20044 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B081EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B081EC.s @@ -27,5 +27,3 @@ glabel func_80B081EC /* 00D0C 80B0824C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D10 80B08250 03E00008 */ jr $ra /* 00D14 80B08254 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s index 3089d6a2c0..31fac65f02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B0B570 + .asciz "../z_en_sth.c" + .balign 4 + +glabel D_80B0B580 + .asciz "../z_en_sth.c" + .balign 4 + +.text glabel func_80B08258 /* 00D18 80B08258 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00D1C 80B0825C AFB1002C */ sw $s1, 0x002C($sp) @@ -111,4 +121,3 @@ glabel func_80B08258 /* 00EC4 80B08404 03E00008 */ jr $ra /* 00EC8 80B08408 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00ECC 80B0840C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Destroy.s index 8f6f96d6b8..4c70e47747 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Destroy.s @@ -2,5 +2,3 @@ glabel EnStream_Destroy /* 00070 80B0B810 AFA40000 */ sw $a0, 0x0000($sp) /* 00074 80B0B814 03E00008 */ jr $ra /* 00078 80B0B818 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s index 996e133539..73676ac0a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B0BCD0 + .asciz "../z_en_stream.c" + .balign 4 + +glabel D_80B0BCE4 + .asciz "../z_en_stream.c" + .balign 4 + +glabel D_80B0BCF8 + .asciz "../z_en_stream.c" + .balign 4 + +.text glabel EnStream_Draw /* 003AC 80B0BB4C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 003B0 80B0BB50 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -84,4 +98,3 @@ glabel EnStream_Draw /* 004F4 80B0BC94 03E00008 */ jr $ra /* 004F8 80B0BC98 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 004FC 80B0BC9C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Init.s index e8488ab73a..0578eccc47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0BD0C + .float 0.01 + +.text glabel EnStream_Init /* 00008 80B0B7A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0000C 80B0B7AC AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,5 +32,3 @@ glabel EnStream_Init /* 00064 80B0B804 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00068 80B0B808 03E00008 */ jr $ra /* 0006C 80B0B80C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Update.s index 9eb59c6324..7d2e09cb6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Update.s @@ -12,5 +12,3 @@ glabel EnStream_Update /* 003A0 80B0BB40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003A4 80B0BB44 03E00008 */ jr $ra /* 003A8 80B0BB48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B7A0.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B7A0.s index 64cc8b756a..b3ae8989cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B7A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B7A0.s @@ -1,5 +1,3 @@ glabel func_80B0B7A0 /* 00000 80B0B7A0 03E00008 */ jr $ra /* 00004 80B0B7A4 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B81C.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B81C.s index 589727a5b6..088e6bcd56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B81C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B81C.s @@ -72,5 +72,3 @@ glabel func_80B0B81C .L80B0B92C: /* 0018C 80B0B92C 03E00008 */ jr $ra /* 00190 80B0B930 00601025 */ or $v0, $v1, $zero ## $v0 = 00000002 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s index a31f7c8c64..c39fd83556 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0BD10 + .float 10430.378 + +.text glabel func_80B0B934 /* 00194 80B0B934 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00198 80B0B938 AFBF0024 */ sw $ra, 0x0024($sp) @@ -109,5 +114,3 @@ glabel func_80B0B934 /* 0031C 80B0BABC 8FB10020 */ lw $s1, 0x0020($sp) /* 00320 80B0BAC0 03E00008 */ jr $ra /* 00324 80B0BAC4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0BAC8.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0BAC8.s index 5a59bc6ed5..4d363cf710 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0BAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0BAC8.s @@ -20,5 +20,3 @@ glabel func_80B0BAC8 /* 0036C 80B0BB0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00370 80B0BB10 03E00008 */ jr $ra /* 00374 80B0BB14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s index ddcd1255e9..b1f3bd5854 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s @@ -9,5 +9,3 @@ glabel EnSw_Destroy /* 00C34 80B0C9E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C38 80B0C9E8 03E00008 */ jr $ra /* 00C3C 80B0C9EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s index a8a7949fa7..0c7a47c9c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F2BC + .word 0xBFB2B8C2 + +.text glabel EnSw_Draw /* 03160 80B0EF10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03164 80B0EF14 3C0E80B1 */ lui $t6, %hi(D_80B0F198) ## $t6 = 80B10000 @@ -72,4 +77,3 @@ glabel EnSw_Draw /* 03264 80B0F014 03E00008 */ jr $ra /* 03268 80B0F018 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0326C 80B0F01C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s index 19f148d4e4..09002c72b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F208 + .float 0.02 + +.text glabel EnSw_Init /* 00750 80B0C500 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00754 80B0C504 3C0F80B1 */ lui $t7, %hi(D_80B0F0E0) ## $t7 = 80B10000 @@ -334,5 +339,3 @@ glabel EnSw_Init /* 00C0C 80B0C9BC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00C10 80B0C9C0 03E00008 */ jr $ra /* 00C14 80B0C9C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s index 20ba4f31ed..25ca3a5a4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s @@ -23,5 +23,3 @@ glabel EnSw_Update /* 02D08 80B0EAB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D0C 80B0EABC 03E00008 */ jr $ra /* 02D10 80B0EAC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s index 997bf6e8ce..2cc17a5340 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s @@ -27,5 +27,3 @@ glabel func_80B0BDB0 /* 00064 80B0BE14 46069281 */ sub.s $f10, $f18, $f6 /* 00068 80B0BE18 03E00008 */ jr $ra /* 0006C 80B0BE1C E4CA0008 */ swc1 $f10, 0x0008($a2) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s index c5037912dc..6c5443bee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B0F200 + .word 0x38000100 +glabel D_80B0F204 + .float 0.001 + +.text glabel func_80B0BE20 /* 00070 80B0BE20 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00074 80B0BE24 3C0180B1 */ lui $at, %hi(D_80B0F200) ## $at = 80B10000 @@ -129,5 +136,3 @@ glabel func_80B0BE20 /* 00264 80B0C014 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00268 80B0C018 03E00008 */ jr $ra /* 0026C 80B0C01C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s index 5913db602b..989f19181a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s @@ -45,5 +45,3 @@ glabel func_80B0C020 /* 00310 80B0C0C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00314 80B0C0C4 03E00008 */ jr $ra /* 00318 80B0C0C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s index eb0c4d5792..373dfa6720 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s @@ -284,5 +284,3 @@ glabel func_80B0C0CC /* 00744 80B0C4F4 8FBE0048 */ lw $s8, 0x0048($sp) /* 00748 80B0C4F8 03E00008 */ jr $ra /* 0074C 80B0C4FC 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s index 607293401d..a3fc076836 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B0F20C + .word 0x481C4000 +glabel D_80B0F210 + .float 0.1 + +glabel D_80B0F214 + .word 0xBDCCCCCD + +.text glabel func_80B0C9F0 /* 00C40 80B0C9F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00C44 80B0C9F4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -137,5 +147,3 @@ glabel func_80B0C9F0 /* 00E2C 80B0CBDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E30 80B0CBE0 03E00008 */ jr $ra /* 00E34 80B0CBE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s index 648935ef16..969ab5ad20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s @@ -78,5 +78,3 @@ glabel func_80B0CBE8 /* 00F38 80B0CCE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F3C 80B0CCEC 03E00008 */ jr $ra /* 00F40 80B0CCF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s index 3bc05a29b6..d153742949 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B0F218 + .word 0x38000100 +glabel D_80B0F21C + .float 0.001 + +.text glabel func_80B0CCF4 /* 00F44 80B0CCF4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00F48 80B0CCF8 AFBF001C */ sw $ra, 0x001C($sp) @@ -111,5 +118,3 @@ glabel func_80B0CCF4 /* 010EC 80B0CE9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 010F0 80B0CEA0 03E00008 */ jr $ra /* 010F4 80B0CEA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s index 08cd680819..da7176bebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F220 + .word 0x3C656041 + +.text glabel func_80B0CEA8 /* 010F8 80B0CEA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 010FC 80B0CEAC AFBF0014 */ sw $ra, 0x0014($sp) @@ -42,5 +47,3 @@ glabel func_80B0CEA8 /* 01188 80B0CF38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0118C 80B0CF3C 03E00008 */ jr $ra /* 01190 80B0CF40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s index 9676d62e31..e70438c7d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s @@ -137,5 +137,3 @@ glabel func_80B0CF44 /* 01390 80B0D140 8FBE0060 */ lw $s8, 0x0060($sp) /* 01394 80B0D144 03E00008 */ jr $ra /* 01398 80B0D148 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s index ace60b9f19..8d182f6557 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s @@ -142,5 +142,3 @@ glabel func_80B0D14C /* 015A8 80B0D358 8FBE0068 */ lw $s8, 0x0068($sp) /* 015AC 80B0D35C 03E00008 */ jr $ra /* 015B0 80B0D360 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s index 086ea130bc..3c24bb0297 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s @@ -18,5 +18,3 @@ glabel func_80B0D364 /* 015F0 80B0D3A0 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 /* 015F4 80B0D3A4 03E00008 */ jr $ra /* 015F8 80B0D3A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s index 0389d1a4b4..0cf2e5c616 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F224 + .float 0.02 + +.text glabel func_80B0D3AC /* 015FC 80B0D3AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01600 80B0D3B0 AFBF001C */ sw $ra, 0x001C($sp) @@ -131,5 +136,3 @@ glabel func_80B0D3AC /* 017D4 80B0D584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017D8 80B0D588 03E00008 */ jr $ra /* 017DC 80B0D58C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s index 70059d4954..21ae8bf962 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80B0F228 + .word 0x3C656041 +glabel D_80B0F22C + .float 0.02 + +glabel D_80B0F230 + .float 0.1 + +glabel D_80B0F234 + .word 0xBDCCCCCD + +.text glabel func_80B0D590 /* 017E0 80B0D590 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 017E4 80B0D594 AFBF001C */ sw $ra, 0x001C($sp) @@ -207,5 +220,3 @@ glabel func_80B0D590 /* 01ABC 80B0D86C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01AC0 80B0D870 03E00008 */ jr $ra /* 01AC4 80B0D874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s index b3d31a0445..f5ffce17f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s @@ -173,5 +173,3 @@ glabel func_80B0D878 /* 01D44 80B0DAF4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 01D48 80B0DAF8 03E00008 */ jr $ra /* 01D4C 80B0DAFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s index f221264fee..89297bf63e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s @@ -102,5 +102,3 @@ glabel func_80B0DB00 /* 01EC0 80B0DC70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01EC4 80B0DC74 03E00008 */ jr $ra /* 01EC8 80B0DC78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s index a9fb1b15bc..60db370a99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s @@ -118,5 +118,3 @@ glabel func_80B0DC7C /* 02078 80B0DE28 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 0207C 80B0DE2C 03E00008 */ jr $ra /* 02080 80B0DE30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s index d7f113b927..b12f63c281 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s @@ -32,5 +32,3 @@ glabel func_80B0DE34 /* 020EC 80B0DE9C 00021400 */ sll $v0, $v0, 16 /* 020F0 80B0DEA0 03E00008 */ jr $ra /* 020F4 80B0DEA4 00021403 */ sra $v0, $v0, 16 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s index cd0ecfb3a4..07d6741f68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s @@ -93,5 +93,3 @@ glabel func_80B0DEA8 /* 02240 80B0DFF0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 02244 80B0DFF4 03E00008 */ jr $ra /* 02248 80B0DFF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s index 88e9ffcb1c..48e68808bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F238 + .word 0x4622F983 + +.text glabel func_80B0DFFC /* 0224C 80B0DFFC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 02250 80B0E000 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -211,5 +216,3 @@ glabel func_80B0DFFC /* 02558 80B0E308 8FB20038 */ lw $s2, 0x0038($sp) /* 0255C 80B0E30C 03E00008 */ jr $ra /* 02560 80B0E310 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s index 7a590e1d8a..a0cc2e6e4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F23C + .float 0.1 + +.text glabel func_80B0E314 /* 02564 80B0E314 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02568 80B0E318 3C0180B1 */ lui $at, %hi(D_80B0F23C) ## $at = 80B10000 @@ -73,5 +78,3 @@ glabel func_80B0E314 /* 02674 80B0E424 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02678 80B0E428 03E00008 */ jr $ra /* 0267C 80B0E42C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s index 3b1659ef02..127ff18d60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B0F240 + .float 0.01 + +glabel D_80B0F244 + .float 0.01 + +.text glabel func_80B0E430 /* 02680 80B0E430 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 02684 80B0E434 AFB00020 */ sw $s0, 0x0020($sp) @@ -123,5 +131,3 @@ glabel func_80B0E430 /* 02824 80B0E5D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02828 80B0E5D8 03E00008 */ jr $ra /* 0282C 80B0E5DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s index dfb2ef465a..7f8544a757 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B0F248 + .word 0x469C4000 + +.text glabel func_80B0E5E0 /* 02830 80B0E5E0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 02834 80B0E5E4 AFA5003C */ sw $a1, 0x003C($sp) @@ -92,5 +97,3 @@ glabel func_80B0E5E0 /* 0296C 80B0E71C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02970 80B0E720 03E00008 */ jr $ra /* 02974 80B0E724 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s index 290b8b859d..2d36292cda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s @@ -134,5 +134,3 @@ glabel func_80B0E728 /* 02B50 80B0E900 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02B54 80B0E904 03E00008 */ jr $ra /* 02B58 80B0E908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s index 3eefc23106..ee723bbc68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s @@ -44,5 +44,3 @@ glabel func_80B0E90C /* 02C00 80B0E9B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02C04 80B0E9B4 03E00008 */ jr $ra /* 02C08 80B0E9B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s index a0f944da86..05902063c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s @@ -45,5 +45,3 @@ glabel func_80B0E9BC /* 02CAC 80B0EA5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02CB0 80B0EA60 03E00008 */ jr $ra /* 02CB4 80B0EA64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s index 8ba67a3394..dc9b342dbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s @@ -1,3 +1,42 @@ +.rdata +glabel D_80B0F1A0 + .asciz "../z_en_sw.c" + .balign 4 + +glabel D_80B0F1B0 + .asciz "../z_en_sw.c" + .balign 4 + +.late_rodata +glabel jtbl_80B0F24C +.word L80B0ECAC +.word L80B0EC9C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC2C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC4C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC3C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC7C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC6C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC1C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC5C +.word L80B0ECB8 +.word L80B0ECB8 +.word L80B0EC8C + +.text glabel func_80B0EAC4 /* 02D14 80B0EAC4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02D18 80B0EAC8 3C0F80B1 */ lui $t7, %hi(D_80B0F150) ## $t7 = 80B10000 @@ -199,5 +238,3 @@ glabel L80B0ECB8 /* 02FE8 80B0ED98 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 02FEC 80B0ED9C 03E00008 */ jr $ra /* 02FF0 80B0EDA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s index f009564909..6575122a5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s @@ -4,5 +4,3 @@ glabel func_80B0EDA4 /* 02FFC 80B0EDAC AFA60008 */ sw $a2, 0x0008($sp) /* 03000 80B0EDB0 03E00008 */ jr $ra /* 03004 80B0EDB4 AFA7000C */ sw $a3, 0x000C($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s index 63def911a9..7912cd28a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s @@ -1,3 +1,19 @@ +.rdata +glabel D_80B0F1C0 + .asciz "../z_en_sw.c" + .balign 4 + +glabel D_80B0F1D0 + .asciz "../z_en_sw.c" + .balign 4 + +.late_rodata +glabel D_80B0F2B4 + .word 0x4633B000 +glabel D_80B0F2B8 + .word 0x4633B000 + +.text glabel func_80B0EDB8 /* 03008 80B0EDB8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0300C 80B0EDBC AFBF0024 */ sw $ra, 0x0024($sp) @@ -59,5 +75,3 @@ glabel func_80B0EDB8 /* 030E8 80B0EE98 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 030EC 80B0EE9C 03E00008 */ jr $ra /* 030F0 80B0EEA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s index e37d132f70..d9a4dbc4d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B0F1E0 + .asciz "../z_en_sw.c" + .balign 4 + +glabel D_80B0F1F0 + .asciz "../z_en_sw.c" + .balign 4 + +.text glabel func_80B0EEA4 /* 030F4 80B0EEA4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 030F8 80B0EEA8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +36,3 @@ glabel func_80B0EEA4 /* 03154 80B0EF04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03158 80B0EF08 03E00008 */ jr $ra /* 0315C 80B0EF0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Destroy.s index cbd1dbd989..717932903e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Destroy.s @@ -2,5 +2,3 @@ glabel EnSyatekiItm_Destroy /* 0017C 80B0F82C AFA40000 */ sw $a0, 0x0000($sp) /* 00180 80B0F830 03E00008 */ jr $ra /* 00184 80B0F834 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s index ce41308d99..d743749c4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B103E0 + .asciz "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" + .balign 4 + +glabel D_80B10408 + .asciz "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" + .balign 4 + +.text glabel EnSyatekiItm_Init /* 00000 80B0F6B0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00004 80B0F6B4 3C01430C */ lui $at, 0x430C ## $at = 430C0000 @@ -104,5 +114,3 @@ glabel EnSyatekiItm_Init /* 00170 80B0F820 8FB70050 */ lw $s7, 0x0050($sp) /* 00174 80B0F824 03E00008 */ jr $ra /* 00178 80B0F828 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s index e5b4bd147a..b0592afabb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s @@ -53,4 +53,3 @@ glabel EnSyatekiItm_Update /* 00B64 80B10214 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00B68 80B10218 03E00008 */ jr $ra /* 00B6C 80B1021C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F838.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F838.s index 922bdf9a1d..16588ad467 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F838.s @@ -69,5 +69,3 @@ glabel func_80B0F838 /* 00288 80B0F938 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0028C 80B0F93C 03E00008 */ jr $ra /* 00290 80B0F940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s index c60a584cb7..2e2d577198 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B10670 + .word 0x40BFAE14 + +.text glabel func_80B0F944 /* 00294 80B0F944 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00298 80B0F948 AFBF0024 */ sw $ra, 0x0024($sp) @@ -106,5 +111,3 @@ glabel func_80B0F944 /* 00400 80B0FAB0 8FB00020 */ lw $s0, 0x0020($sp) /* 00404 80B0FAB4 03E00008 */ jr $ra /* 00408 80B0FAB8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s index 7094ca2866..543e61c7fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s @@ -1,3 +1,19 @@ +.rdata +glabel D_80B10438 + .asciz "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel jtbl_80B10674 +.word L80B0FBDC +.word L80B0FC10 +.word L80B0FC64 +.word L80B0FC98 +.word L80B0FCEC +.word L80B0FD40 +.word 0x00000000 + +.text glabel func_80B0FABC /* 0040C 80B0FABC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00410 80B0FAC0 3C0E80B1 */ lui $t6, %hi(D_80B103C8) ## $t6 = 80B10000 @@ -335,5 +351,3 @@ glabel L80B0FD40 /* 00888 80B0FF38 8FBE0058 */ lw $s8, 0x0058($sp) /* 0088C 80B0FF3C 03E00008 */ jr $ra /* 00890 80B0FF40 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FF44.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FF44.s index b890ada3ec..415a2334bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FF44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FF44.s @@ -45,5 +45,3 @@ glabel func_80B0FF44 .L80B0FFE0: /* 00930 80B0FFE0 03E00008 */ jr $ra /* 00934 80B0FFE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FFE8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FFE8.s index 9c63c63bc7..52c47ef461 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FFE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FFE8.s @@ -36,5 +36,3 @@ glabel func_80B0FFE8 /* 009B4 80B10064 8FB00014 */ lw $s0, 0x0014($sp) /* 009B8 80B10068 03E00008 */ jr $ra /* 009BC 80B1006C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B10070.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B10070.s index d435ab9248..5e563d512c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B10070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B10070.s @@ -1,3 +1,45 @@ +.rdata +glabel D_80B10468 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B1049C + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B104D0 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B10504 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B10538 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B1056C + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B105A0 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B105D4 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B10608 + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +glabel D_80B1063C + .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" + .balign 4 + +.text glabel func_80B10070 /* 009C0 80B10070 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 009C4 80B10074 AFBF001C */ sw $ra, 0x001C($sp) @@ -69,5 +111,3 @@ glabel func_80B10070 /* 00A9C 80B1014C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AA0 80B10150 03E00008 */ jr $ra /* 00AA4 80B10154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Destroy.s index e18e0b143c..532a4fe4d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Destroy.s @@ -2,5 +2,3 @@ glabel EnSyatekiMan_Destroy /* 000CC 80B1093C AFA40000 */ sw $a0, 0x0000($sp) /* 000D0 80B10940 03E00008 */ jr $ra /* 000D4 80B10944 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s index 6de4144394..d608acd8ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s @@ -20,5 +20,3 @@ glabel EnSyatekiMan_Draw /* 00CF0 80B11560 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CF4 80B11564 03E00008 */ jr $ra /* 00CF8 80B11568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s index d5331fe24b..9b7d2ca7ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B116A0 + .asciz "\n\n" + .balign 4 + +glabel D_80B116A4 + .asciz "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" + .balign 4 + +.text glabel EnSyatekiMan_Init /* 00000 80B10870 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80B10874 AFB00028 */ sw $s0, 0x0028($sp) @@ -54,5 +64,3 @@ glabel EnSyatekiMan_Init /* 000C0 80B10930 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000C4 80B10934 03E00008 */ jr $ra /* 000C8 80B10938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Update.s index ba6326b615..2a6ecf3c6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Update.s @@ -43,5 +43,3 @@ glabel EnSyatekiMan_Update /* 00C10 80B11480 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C14 80B11484 03E00008 */ jr $ra /* 00C18 80B11488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s index ae6783924c..a42f7bb226 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s @@ -38,5 +38,3 @@ glabel func_80B10948 /* 00160 80B109D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00164 80B109D4 03E00008 */ jr $ra /* 00168 80B109D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B109DC.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B109DC.s index 96a8e92fe2..0daf54ddfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B109DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B109DC.s @@ -20,5 +20,3 @@ glabel func_80B109DC /* 001B0 80B10A20 AC8801FC */ sw $t0, 0x01FC($a0) ## 000001FC /* 001B4 80B10A24 03E00008 */ jr $ra /* 001B8 80B10A28 A4990212 */ sh $t9, 0x0212($a0) ## 00000212 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A2C.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A2C.s index 00d63c5a1a..2254a0ca28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A2C.s @@ -24,5 +24,3 @@ glabel func_80B10A2C /* 00208 80B10A78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0020C 80B10A7C 03E00008 */ jr $ra /* 00210 80B10A80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s index ce3625b60f..0c4fd58e16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s @@ -119,5 +119,3 @@ glabel func_80B10A84 /* 003B0 80B10C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003B4 80B10C24 03E00008 */ jr $ra /* 003B8 80B10C28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10C2C.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10C2C.s index 0594e09a27..5a8e3380d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10C2C.s @@ -45,5 +45,3 @@ glabel func_80B10C2C /* 00458 80B10CC8 8FB10018 */ lw $s1, 0x0018($sp) /* 0045C 80B10CCC 03E00008 */ jr $ra /* 00460 80B10CD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10CD4.s index cd4840a6ab..b2cd9bb754 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10CD4.s @@ -51,5 +51,3 @@ glabel func_80B10CD4 /* 00518 80B10D88 8FB10018 */ lw $s1, 0x0018($sp) /* 0051C 80B10D8C 03E00008 */ jr $ra /* 00520 80B10D90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10D94.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10D94.s index db9de30635..7f08107e1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10D94.s @@ -76,5 +76,3 @@ glabel func_80B10D94 /* 00634 80B10EA4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00638 80B10EA8 03E00008 */ jr $ra /* 0063C 80B10EAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s index 24360fdb03..2f889e573f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B116E8 + .asciz "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B1171C + .asciz "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel func_80B10EB0 /* 00640 80B10EB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00644 80B10EB4 AFB00020 */ sw $s0, 0x0020($sp) @@ -191,5 +201,3 @@ glabel func_80B10EB0 /* 008E8 80B11158 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008EC 80B1115C 03E00008 */ jr $ra /* 008F0 80B11160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s index 2b6e3cd94e..21a3046282 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s @@ -30,5 +30,3 @@ glabel func_80B11164 /* 00958 80B111C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0095C 80B111CC 03E00008 */ jr $ra /* 00960 80B111D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s index 405acfe937..a43c28372e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B11748 + .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80B111D4 /* 00964 80B111D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00968 80B111D8 AFB00018 */ sw $s0, 0x0018($sp) @@ -58,5 +64,3 @@ glabel func_80B111D4 /* 00A24 80B11294 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A28 80B11298 03E00008 */ jr $ra /* 00A2C 80B1129C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B112A0.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B112A0.s index 57f3948c6a..c4ed343702 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B112A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B112A0.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B11774 + .asciz "再挑戦だぜ！ベイビー！\n" + .balign 4 + +.text glabel func_80B112A0 /* 00A30 80B112A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00A34 80B112A4 AFA5001C */ sw $a1, 0x001C($sp) @@ -31,5 +37,3 @@ glabel func_80B112A0 /* 00A94 80B11304 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A98 80B11308 03E00008 */ jr $ra /* 00A9C 80B1130C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11310.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11310.s index e3e1a40f83..120ac72126 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11310.s @@ -14,5 +14,3 @@ glabel func_80B11310 .L80B1133C: /* 00ACC 80B1133C 03E00008 */ jr $ra /* 00AD0 80B11340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11344.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11344.s index dc774d8756..39e00535d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11344.s @@ -43,5 +43,3 @@ glabel func_80B11344 /* 00B68 80B113D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B6C 80B113DC 03E00008 */ jr $ra /* 00B70 80B113E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1148C.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1148C.s index 6ce5ffc366..92fa261565 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1148C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1148C.s @@ -37,5 +37,3 @@ glabel func_80B1148C .L80B11510: /* 00CA0 80B11510 03E00008 */ jr $ra /* 00CA4 80B11514 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s index fc44bef821..43b5ea553f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s @@ -22,4 +22,3 @@ glabel func_80B1156C /* 00D44 80B115B4 03E00008 */ jr $ra /* 00D48 80B115B8 00000000 */ nop /* 00D4C 80B115BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s index aac8690af7..89d99186da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s @@ -10,5 +10,3 @@ glabel EnSyatekiNiw_Destroy /* 00198 80B11A88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0019C 80B11A8C 03E00008 */ jr $ra /* 001A0 80B11A90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s index 131532dee4..6071b5b5bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s @@ -43,5 +43,3 @@ glabel EnSyatekiNiw_Draw /* 018BC 80B131AC 8FB10028 */ lw $s1, 0x0028($sp) /* 018C0 80B131B0 03E00008 */ jr $ra /* 018C4 80B131B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s index 36595f9ce3..a1ebcd892f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B136E0 + .asciz "\n\n" + .balign 4 + +glabel D_80B136E4 + .asciz "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B13710 + .asciz "\n\n" + .balign 4 + +glabel D_80B13714 + .asciz "☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel EnSyatekiNiw_Init /* 00000 80B118F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80B118F4 AFA5003C */ sw $a1, 0x003C($sp) @@ -107,5 +125,3 @@ glabel EnSyatekiNiw_Init /* 00170 80B11A60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00174 80B11A64 03E00008 */ jr $ra /* 00178 80B11A68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s index 7d190a621c..5136a5f8e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B1382C + .word 0xBE19999A + +.text glabel EnSyatekiNiw_Update /* 01384 80B12C74 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 01388 80B12C78 3C0F80B1 */ lui $t7, %hi(D_80B136B8) ## $t7 = 80B10000 @@ -245,5 +250,3 @@ glabel EnSyatekiNiw_Update /* 016E4 80B12FD4 8FB10048 */ lw $s1, 0x0048($sp) /* 016E8 80B12FD8 03E00008 */ jr $ra /* 016EC 80B12FDC 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11A94.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11A94.s index 298c3786bf..bd77922c48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11A94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11A94.s @@ -1,3 +1,40 @@ +.late_rodata +glabel D_80B13788 + .word 0xC61C4000 +glabel jtbl_80B1378C +.word L80B11B74 +.word L80B11B80 +.word L80B11BB4 +.word L80B11C14 +.word L80B11C48 +.word L80B11C5C +glabel D_80B137A4 + .float 7000.0 + +glabel D_80B137A8 + .float 7000.0 + +glabel D_80B137AC + .word 0x46C35000 +glabel D_80B137B0 + .float 6000.0 + +glabel D_80B137B4 + .word 0xC61C4000 +glabel D_80B137B8 + .word 0xC61C4000 +glabel D_80B137BC + .float 10000.0 + +glabel D_80B137C0 + .float 3000.0 + +glabel D_80B137C4 + .word 0x465AC000 +glabel D_80B137C8 + .float 10000.0 + +.text glabel func_80B11A94 /* 001A4 80B11A94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 001A8 80B11A98 AFBF001C */ sw $ra, 0x001C($sp) @@ -240,5 +277,3 @@ glabel L80B11C5C /* 004F0 80B11DE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004F4 80B11DE4 03E00008 */ jr $ra /* 004F8 80B11DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s index 907563940b..1b0492deb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s @@ -38,5 +38,3 @@ glabel func_80B11DEC /* 0057C 80B11E6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00580 80B11E70 03E00008 */ jr $ra /* 00584 80B11E74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s index f701bf9c26..df1cd165ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B137CC + .word 0x407F5C29 +glabel D_80B137D0 + .word 0x4622F983 +glabel D_80B137D4 + .float 0.2 + +.text glabel func_80B11E78 /* 00588 80B11E78 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 0058C 80B11E7C 3C0F80B1 */ lui $t7, %hi(D_80B13698) ## $t7 = 80B10000 @@ -365,5 +374,3 @@ glabel func_80B11E78 /* 00AAC 80B1239C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 00AB0 80B123A0 03E00008 */ jr $ra /* 00AB4 80B123A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s index 6d5645bf67..002ce5a048 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B137D8 + .word 0xC61C4000 +glabel D_80B137DC + .float 6000.0 + +glabel D_80B137E0 + .float 10000.0 + +.text glabel func_80B123A8 /* 00AB8 80B123A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00ABC 80B123AC AFB00028 */ sw $s0, 0x0028($sp) @@ -47,5 +57,3 @@ glabel func_80B123A8 /* 00B64 80B12454 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B68 80B12458 03E00008 */ jr $ra /* 00B6C 80B1245C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s index a59bd49017..724ec41495 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s @@ -1,3 +1,31 @@ +.late_rodata +glabel jtbl_80B137E4 +.word L80B124AC +.word L80B124C4 +.word L80B1257C +.word L80B12620 +.word L80B12670 +.word L80B126E8 +.word L80B12798 +glabel D_80B13800 + .float 5000.0 + +glabel D_80B13804 + .word 0xC59C4000 +glabel D_80B13808 + .word 0xBE99999A +glabel D_80B1380C + .float 10000.0 + +glabel D_80B13810 + .word 0x465AC000 +glabel D_80B13814 + .float 5000.0 + +glabel D_80B13818 + .word 0x4622F983 + +.text glabel func_80B12460 /* 00B70 80B12460 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00B74 80B12464 AFBF0024 */ sw $ra, 0x0024($sp) @@ -305,5 +333,3 @@ glabel L80B12798 /* 00FDC 80B128CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00FE0 80B128D0 03E00008 */ jr $ra /* 00FE4 80B128D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s index c6f05616a9..4de6799bb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s @@ -8,5 +8,3 @@ glabel func_80B128D8 .L80B128F0: /* 01000 80B128F0 03E00008 */ jr $ra /* 01004 80B128F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128F8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128F8.s index c1aacbe59a..dee1bffb66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128F8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B1381C + .float 1.99000000954 + +glabel D_80B13820 + .word 0xC61C4000 + +.text glabel func_80B128F8 /* 01008 80B128F8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0100C 80B128FC AFB00018 */ sw $s0, 0x0018($sp) @@ -65,5 +73,3 @@ glabel func_80B128F8 /* 010F0 80B129E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 010F4 80B129E4 03E00008 */ jr $ra /* 010F8 80B129E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B129EC.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B129EC.s index 20c296ad64..7fbb233091 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B129EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B129EC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B13824 + .float 5000.0 + +glabel D_80B13828 + .word 0xC59C4000 + +.text glabel func_80B129EC /* 010FC 80B129EC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01100 80B129F0 AFB00020 */ sw $s0, 0x0020($sp) @@ -121,5 +129,3 @@ glabel func_80B129EC /* 012A8 80B12B98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 012AC 80B12B9C 03E00008 */ jr $ra /* 012B0 80B12BA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12BA4.s index a97e142753..e7df9a310c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12BA4.s @@ -57,5 +57,3 @@ glabel func_80B12BA4 /* 01378 80B12C68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0137C 80B12C6C 03E00008 */ jr $ra /* 01380 80B12C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12FE0.s index ddf05568eb..3e04632a5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12FE0.s @@ -78,5 +78,3 @@ glabel func_80B12FE0 .L80B13108: /* 01818 80B13108 03E00008 */ jr $ra /* 0181C 80B1310C 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B131B8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B131B8.s index 3f920c2286..1ab6028372 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B131B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B131B8.s @@ -64,5 +64,3 @@ glabel func_80B131B8 /* 019AC 80B1329C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 019B0 80B132A0 03E00008 */ jr $ra /* 019B4 80B132A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B132A8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B132A8.s index 6981d9af6c..604c5da214 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B132A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B132A8.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B13830 + .float 3.14159274101 + +glabel D_80B13834 + .float 0.05 + +glabel D_80B13838 + .float 0.2 + +.text glabel func_80B132A8 /* 019B8 80B132A8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 019BC 80B132AC F7BE0038 */ sdc1 $f30, 0x0038($sp) @@ -117,5 +128,3 @@ glabel func_80B132A8 /* 01B68 80B13458 8FB30050 */ lw $s3, 0x0050($sp) /* 01B6C 80B1345C 03E00008 */ jr $ra /* 01B70 80B13460 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s index 756b821592..8acd64a301 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B13740 + .asciz "../z_en_syateki_niw.c" + .balign 4 + +glabel D_80B13758 + .asciz "../z_en_syateki_niw.c" + .balign 4 + +glabel D_80B13770 + .asciz "../z_en_syateki_niw.c" + .balign 4 + +.text glabel func_80B13464 /* 01B74 80B13464 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 01B78 80B13468 AFBF0054 */ sw $ra, 0x0054($sp) @@ -121,4 +135,3 @@ glabel func_80B13464 /* 01D44 80B13634 00000000 */ nop /* 01D48 80B13638 00000000 */ nop /* 01D4C 80B1363C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s index 7280c24272..d59ab5d33d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s @@ -32,5 +32,3 @@ glabel EnTa_Destroy /* 00848 80B142E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0084C 80B142EC 03E00008 */ jr $ra /* 00850 80B142F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s index 561d66081f..6e53ba7473 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B16F2C + .asciz "../z_en_ta.c" + .balign 4 + +glabel D_80B16F3C + .asciz "../z_en_ta.c" + .balign 4 + +.text glabel EnTa_Draw /* 03240 80B16CE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 03244 80B16CE4 AFBF002C */ sw $ra, 0x002C($sp) @@ -83,4 +93,3 @@ glabel EnTa_Draw /* 03384 80B16E24 00000000 */ nop /* 03388 80B16E28 00000000 */ nop /* 0338C 80B16E2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s index 3769718eba..aa6f4642c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B16EA0 + .asciz " 追放タロン \n" + .balign 4 + +glabel D_80B16EB8 + .asciz " 出戻りタロン \n" + .balign 4 + +glabel D_80B16ED0 + .asciz " 夜はいない \n" + .balign 4 + +glabel D_80B16EE8 + .asciz " その他のタロン \n" + .balign 4 + +glabel D_80B16F04 + .asciz " ロンロン牧場の倉庫 の タロン\n" + .balign 4 + +.text glabel EnTa_Init /* 000E8 80B13B88 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 000EC 80B13B8C AFB00030 */ sw $s0, 0x0030($sp) @@ -473,5 +495,3 @@ glabel EnTa_Init /* 0079C 80B1423C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 007A0 80B14240 03E00008 */ jr $ra /* 007A4 80B14244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s index 5a72551a40..2c54dbbbe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s @@ -109,5 +109,3 @@ glabel EnTa_Update /* 03070 80B16B10 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03074 80B16B14 03E00008 */ jr $ra /* 03078 80B16B18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s index 19190495bb..3353dc9179 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s @@ -2,5 +2,3 @@ glabel func_80B13AA0 /* 00000 80B13AA0 AC85025C */ sw $a1, 0x025C($a0) ## 0000025C /* 00004 80B13AA4 03E00008 */ jr $ra /* 00008 80B13AA8 AC860260 */ sw $a2, 0x0260($a0) ## 00000260 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s index 1ccab7a8c3..ebcac2a61a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s @@ -61,5 +61,3 @@ glabel func_80B13AAC /* 000DC 80B13B7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E0 80B13B80 03E00008 */ jr $ra /* 000E4 80B13B84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s index 5c428a62e3..3d3f066eed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B16F4C + .float 0.8 + +.text glabel func_80B14248 /* 007A8 80B14248 3C014210 */ lui $at, 0x4210 ## $at = 42100000 /* 007AC 80B1424C 44812000 */ mtc1 $at, $f4 ## $f4 = 36.00 @@ -13,5 +18,3 @@ glabel func_80B14248 .L80B14274: /* 007D4 80B14274 03E00008 */ jr $ra /* 007D8 80B14278 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s index 1904988d0b..4721f96a98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s @@ -45,5 +45,3 @@ glabel func_80B142F4 /* 008EC 80B1438C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008F0 80B14390 03E00008 */ jr $ra /* 008F4 80B14394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s index b4f513f380..daec547dea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s @@ -15,5 +15,3 @@ glabel func_80B14398 /* 00928 80B143C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0092C 80B143CC 03E00008 */ jr $ra /* 00930 80B143D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s index a36725abba..8ab2349506 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s @@ -15,5 +15,3 @@ glabel func_80B143D4 /* 00964 80B14404 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00968 80B14408 03E00008 */ jr $ra /* 0096C 80B1440C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s index 4729c2477b..137ec3f10e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s @@ -32,5 +32,3 @@ glabel func_80B14410 /* 009E0 80B14480 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009E4 80B14484 03E00008 */ jr $ra /* 009E8 80B14488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s index 593a0b278f..deb12f7d09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s @@ -19,5 +19,3 @@ glabel func_80B1448C /* 00A2C 80B144CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A30 80B144D0 03E00008 */ jr $ra /* 00A34 80B144D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s index 7ba83e6952..c54c33a415 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s @@ -39,5 +39,3 @@ glabel func_80B144D8 /* 00AC4 80B14564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AC8 80B14568 03E00008 */ jr $ra /* 00ACC 80B1456C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s index f6683f6236..d158f29448 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s @@ -35,5 +35,3 @@ glabel func_80B14570 /* 00B4C 80B145EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B50 80B145F0 03E00008 */ jr $ra /* 00B54 80B145F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s index 2c9435c8b3..5225ad9507 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s @@ -15,5 +15,3 @@ glabel func_80B145F8 /* 00B88 80B14628 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B8C 80B1462C 03E00008 */ jr $ra /* 00B90 80B14630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s index a51c310532..fbbf669037 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s @@ -53,5 +53,3 @@ glabel func_80B14634 /* 00C4C 80B146EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C50 80B146F0 03E00008 */ jr $ra /* 00C54 80B146F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s index f5c2e959bd..95a009fa8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s @@ -23,5 +23,3 @@ glabel func_80B146F8 /* 00CA8 80B14748 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00CAC 80B1474C 03E00008 */ jr $ra /* 00CB0 80B14750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s index 2f26c4c1f1..6075e14747 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s @@ -53,5 +53,3 @@ glabel func_80B14754 /* 00D6C 80B1480C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D70 80B14810 03E00008 */ jr $ra /* 00D74 80B14814 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s index 44911c6644..6709f7bc0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B16F50 + .float 0.4 + +.text glabel func_80B14818 /* 00D78 80B14818 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00D7C 80B1481C AFBF0014 */ sw $ra, 0x0014($sp) @@ -36,5 +41,3 @@ glabel func_80B14818 /* 00DEC 80B1488C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DF0 80B14890 03E00008 */ jr $ra /* 00DF4 80B14894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s index fb976f8045..cb9f8711d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s @@ -30,5 +30,3 @@ glabel func_80B14898 /* 00E60 80B14900 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00E64 80B14904 03E00008 */ jr $ra /* 00E68 80B14908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s index bb01eab008..16a6a42474 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s @@ -24,5 +24,3 @@ glabel func_80B1490C /* 00EC0 80B14960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EC4 80B14964 03E00008 */ jr $ra /* 00EC8 80B14968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s index f363579fdf..c2eb5e7d11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s @@ -34,5 +34,3 @@ glabel func_80B1496C /* 00F48 80B149E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F4C 80B149EC 03E00008 */ jr $ra /* 00F50 80B149F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s index 06753cdac2..899795a6e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s @@ -24,5 +24,3 @@ glabel func_80B149F4 /* 00FA8 80B14A48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FAC 80B14A4C 03E00008 */ jr $ra /* 00FB0 80B14A50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s index 72cdfc4110..d35ce50ac7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s @@ -41,5 +41,3 @@ glabel func_80B14A54 /* 01048 80B14AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0104C 80B14AEC 03E00008 */ jr $ra /* 01050 80B14AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s index 114fb883e9..53870a96d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s @@ -31,5 +31,3 @@ glabel func_80B14AF4 /* 010C0 80B14B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010C4 80B14B64 03E00008 */ jr $ra /* 010C8 80B14B68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s index f98267d13a..02659ae9c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s @@ -43,5 +43,3 @@ glabel func_80B14B6C /* 0116C 80B14C0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01170 80B14C10 03E00008 */ jr $ra /* 01174 80B14C14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s index 2010ee1b81..917c7b6b48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s @@ -18,5 +18,3 @@ glabel func_80B14C18 /* 011B4 80B14C54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011B8 80B14C58 03E00008 */ jr $ra /* 011BC 80B14C5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s index 004b2f9308..51af4eb29a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s @@ -19,5 +19,3 @@ glabel func_80B14C60 /* 01200 80B14CA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01204 80B14CA4 03E00008 */ jr $ra /* 01208 80B14CA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s index ae1e3a6c08..1ce85dfcbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s @@ -41,5 +41,3 @@ glabel func_80B14CAC /* 012A0 80B14D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 012A4 80B14D44 03E00008 */ jr $ra /* 012A8 80B14D48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s index 7507e78949..1dab39ed08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s @@ -19,5 +19,3 @@ glabel func_80B14D4C /* 012EC 80B14D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012F0 80B14D90 03E00008 */ jr $ra /* 012F4 80B14D94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s index 146320618c..5c6597224d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s @@ -16,5 +16,3 @@ glabel func_80B14D98 /* 0132C 80B14DCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01330 80B14DD0 03E00008 */ jr $ra /* 01334 80B14DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s index 681ade9c40..17fbf1e4e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s @@ -21,5 +21,3 @@ glabel func_80B14DD8 /* 0137C 80B14E1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01380 80B14E20 03E00008 */ jr $ra /* 01384 80B14E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s index 0a827f5c02..08fb8581c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B16F54 + .word 0x4483A000 + +.text glabel func_80B14E28 /* 01388 80B14E28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0138C 80B14E2C AFB10018 */ sw $s1, 0x0018($sp) @@ -44,5 +49,3 @@ glabel func_80B14E28 /* 01430 80B14ED0 8FB10018 */ lw $s1, 0x0018($sp) /* 01434 80B14ED4 03E00008 */ jr $ra /* 01438 80B14ED8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s index 7a1d76b89b..6d3e9e1d24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s @@ -16,5 +16,3 @@ glabel func_80B14EDC /* 01474 80B14F14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01478 80B14F18 03E00008 */ jr $ra /* 0147C 80B14F1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s index 0bc3e51221..1dde19d055 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s @@ -36,5 +36,3 @@ glabel func_80B14F20 /* 01500 80B14FA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01504 80B14FA4 03E00008 */ jr $ra /* 01508 80B14FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s index 981d3acd67..9ed14b8d75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s @@ -35,5 +35,3 @@ glabel func_80B14FAC /* 01588 80B15028 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0158C 80B1502C 03E00008 */ jr $ra /* 01590 80B15030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s index 338771a733..8d9f362e22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s @@ -30,5 +30,3 @@ glabel func_80B15034 /* 01600 80B150A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01604 80B150A4 03E00008 */ jr $ra /* 01608 80B150A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s index 9f181d270d..b277da38ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s @@ -22,5 +22,3 @@ glabel func_80B150AC .L80B150F8: /* 01658 80B150F8 03E00008 */ jr $ra /* 0165C 80B150FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s index 2f914bfe12..755b2a9e5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B16F58 + .float 0.1 + +.text glabel func_80B15100 /* 01660 80B15100 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01664 80B15104 AFB10028 */ sw $s1, 0x0028($sp) @@ -94,5 +99,3 @@ glabel func_80B15100 /* 017B4 80B15254 8FB00024 */ lw $s0, 0x0024($sp) /* 017B8 80B15258 03E00008 */ jr $ra /* 017BC 80B1525C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s index 219a4841d9..3d95acea96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s @@ -29,5 +29,3 @@ glabel func_80B15260 /* 01824 80B152C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01828 80B152C8 03E00008 */ jr $ra /* 0182C 80B152CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s index ef55fa73f1..cd761ce724 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s @@ -15,5 +15,3 @@ glabel func_80B152D0 /* 0185C 80B152FC 24C60004 */ addiu $a2, $a2, 0x0004 ## $a2 = 00000004 /* 01860 80B15300 03E00008 */ jr $ra /* 01864 80B15304 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s index 2677c75dd4..d36f1de44b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s @@ -55,5 +55,3 @@ glabel func_80B15308 /* 01928 80B153C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0192C 80B153CC 03E00008 */ jr $ra /* 01930 80B153D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s index 473f1c2cf0..424991ba41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s @@ -21,5 +21,3 @@ glabel func_80B153D4 /* 01978 80B15418 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0197C 80B1541C 03E00008 */ jr $ra /* 01980 80B15420 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s index 721403633f..72c34bc3d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s @@ -57,5 +57,3 @@ glabel func_80B15424 /* 01A50 80B154F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01A54 80B154F4 03E00008 */ jr $ra /* 01A58 80B154F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s index 6372345534..a5d47eae49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B16F5C + .float 0.03 + +.text glabel func_80B154FC /* 01A5C 80B154FC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01A60 80B15500 AFB20030 */ sw $s2, 0x0030($sp) @@ -235,5 +240,3 @@ glabel func_80B154FC /* 01DB0 80B15850 8FB20030 */ lw $s2, 0x0030($sp) /* 01DB4 80B15854 03E00008 */ jr $ra /* 01DB8 80B15858 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s index 0599182d65..d81ac1efe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B16F60 + .float 0.03 + +.text glabel func_80B1585C /* 01DBC 80B1585C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01DC0 80B15860 AFBF005C */ sw $ra, 0x005C($sp) @@ -172,5 +177,3 @@ glabel func_80B1585C /* 02028 80B15AC8 8FB60058 */ lw $s6, 0x0058($sp) /* 0202C 80B15ACC 03E00008 */ jr $ra /* 02030 80B15AD0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s index d24975d914..3f66280ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s @@ -77,5 +77,3 @@ glabel func_80B15AD4 /* 0214C 80B15BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02150 80B15BF0 03E00008 */ jr $ra /* 02154 80B15BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s index fc71cfc7d6..338811a16d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s @@ -54,5 +54,3 @@ glabel func_80B15BF8 /* 0221C 80B15CBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02220 80B15CC0 03E00008 */ jr $ra /* 02224 80B15CC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s index 133f8320f6..759716f723 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s @@ -52,5 +52,3 @@ glabel func_80B15CC8 /* 022E4 80B15D84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 022E8 80B15D88 03E00008 */ jr $ra /* 022EC 80B15D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s index 07014222dc..6cdec95443 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s @@ -38,5 +38,3 @@ glabel func_80B15D90 /* 0237C 80B15E1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02380 80B15E20 03E00008 */ jr $ra /* 02384 80B15E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s index 21bb9b7e00..0786e5234d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s @@ -22,5 +22,3 @@ glabel func_80B15E28 /* 023D4 80B15E74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 023D8 80B15E78 03E00008 */ jr $ra /* 023DC 80B15E7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s index ad871389c8..79e1b88dda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s @@ -57,5 +57,3 @@ glabel func_80B15E80 /* 024A8 80B15F48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 024AC 80B15F4C 03E00008 */ jr $ra /* 024B0 80B15F50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s index 4456c7afc7..a28e72acf0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s @@ -37,5 +37,3 @@ glabel func_80B15F54 /* 0253C 80B15FDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02540 80B15FE0 03E00008 */ jr $ra /* 02544 80B15FE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s index 3d514e7a99..f1efcff9ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s @@ -127,5 +127,3 @@ glabel func_80B15FE8 /* 02714 80B161B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02718 80B161B8 03E00008 */ jr $ra /* 0271C 80B161BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s index 1ba2a05be2..380f30e4ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s @@ -81,5 +81,3 @@ glabel func_80B161C0 /* 0283C 80B162DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02840 80B162E0 03E00008 */ jr $ra /* 02844 80B162E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s index f7c95c0560..03140b15f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s @@ -33,5 +33,3 @@ glabel func_80B162E8 /* 028B8 80B16358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028BC 80B1635C 03E00008 */ jr $ra /* 028C0 80B16360 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s index dbb0d6cbcc..856462127a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s @@ -53,5 +53,3 @@ glabel func_80B16364 /* 02980 80B16420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02984 80B16424 03E00008 */ jr $ra /* 02988 80B16428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s index d2572eb826..d86c4dd3e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s @@ -55,5 +55,3 @@ glabel func_80B1642C /* 02A58 80B164F8 8FB10020 */ lw $s1, 0x0020($sp) /* 02A5C 80B164FC 03E00008 */ jr $ra /* 02A60 80B16500 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s index 3f54dcf389..a1a93b7091 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s @@ -71,5 +71,3 @@ glabel func_80B16504 /* 02B5C 80B165FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02B60 80B16600 03E00008 */ jr $ra /* 02B64 80B16604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s index 19230480b5..93744e6399 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s @@ -55,5 +55,3 @@ glabel func_80B16608 /* 02C20 80B166C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C24 80B166C4 03E00008 */ jr $ra /* 02C28 80B166C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s index 3e5a877605..d0d61b2db5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s @@ -14,5 +14,3 @@ glabel func_80B166CC .L80B166F8: /* 02C58 80B166F8 03E00008 */ jr $ra /* 02C5C 80B166FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s index 5797a54736..9768cf7740 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s @@ -53,5 +53,3 @@ glabel func_80B16700 /* 02D14 80B167B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D18 80B167B8 03E00008 */ jr $ra /* 02D1C 80B167BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s index 280630c1c3..97f30be9fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s @@ -16,5 +16,3 @@ glabel func_80B167C0 /* 02D50 80B167F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D54 80B167F4 03E00008 */ jr $ra /* 02D58 80B167F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s index 3c375993ec..f3fccbb409 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s @@ -24,5 +24,3 @@ glabel func_80B167FC /* 02DA8 80B16848 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02DAC 80B1684C 03E00008 */ jr $ra /* 02DB0 80B16850 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s index c5f397045b..62b2d489a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s @@ -62,5 +62,3 @@ glabel func_80B16854 /* 02E8C 80B1692C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02E90 80B16930 03E00008 */ jr $ra /* 02E94 80B16934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s index e4c7b45f98..6aebac892c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s @@ -24,5 +24,3 @@ glabel func_80B16938 /* 02EE4 80B16984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02EE8 80B16988 03E00008 */ jr $ra /* 02EEC 80B1698C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s index fe98b1c95f..1ae3e54bb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s @@ -105,5 +105,3 @@ glabel func_80B16B1C /* 031F4 80B16C94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 031F8 80B16C98 03E00008 */ jr $ra /* 031FC 80B16C9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s index f373f0bf4f..6178c46f8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s @@ -16,5 +16,3 @@ glabel func_80B16CA0 /* 03234 80B16CD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03238 80B16CD8 03E00008 */ jr $ra /* 0323C 80B16CDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s index 0cc5c3768c..a7cc55978b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s @@ -2,5 +2,3 @@ glabel EnTakaraMan_Destroy /* 00000 80B17560 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80B17564 03E00008 */ jr $ra /* 00008 80B17568 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s index 16e1321ac8..1cb24eff3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B17E40 + .asciz "../z_en_takara_man.c" + .balign 4 + +glabel D_80B17E58 + .asciz "../z_en_takara_man.c" + .balign 4 + +.text glabel EnTakaraMan_Draw /* 00750 80B17CB0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00754 80B17CB4 AFBF002C */ sw $ra, 0x002C($sp) @@ -63,4 +73,3 @@ glabel EnTakaraMan_Draw /* 00844 80B17DA4 00000000 */ nop /* 00848 80B17DA8 00000000 */ nop /* 0084C 80B17DAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s index 87e98a82b5..0333b1db98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B17DE0 + .asciz "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B17E10 + .asciz "\n\n" + .balign 4 + +glabel D_80B17E14 + .asciz "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" + .balign 4 + +.text glabel EnTakaraMan_Init /* 0000C 80B1756C 3C0280B1 */ lui $v0, %hi(D_80B17DD0) ## $v0 = 80B10000 /* 00010 80B17570 24427DD0 */ addiu $v0, $v0, %lo(D_80B17DD0) ## $v0 = 80B17DD0 @@ -99,5 +113,3 @@ glabel EnTakaraMan_Init /* 00174 80B176D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00178 80B176D8 03E00008 */ jr $ra /* 0017C 80B176DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s index c0b3f1de7b..0f0f1735c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s @@ -58,5 +58,3 @@ glabel EnTakaraMan_Update /* 006E0 80B17C40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 006E4 80B17C44 03E00008 */ jr $ra /* 006E8 80B17C48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s index f8662c0feb..a599fb5348 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s @@ -45,5 +45,3 @@ glabel func_80B176E0 /* 00220 80B17780 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00224 80B17784 03E00008 */ jr $ra /* 00228 80B17788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s index 692dc0a12e..762fabe5ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s @@ -120,5 +120,3 @@ glabel func_80B1778C /* 003C8 80B17928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003CC 80B1792C 03E00008 */ jr $ra /* 003D0 80B17930 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s index 76fb2fe775..7fdafc942b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s @@ -82,5 +82,3 @@ glabel func_80B17934 /* 00500 80B17A60 8FB10020 */ lw $s1, 0x0020($sp) /* 00504 80B17A64 03E00008 */ jr $ra /* 00508 80B17A68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s index ad9696424a..a81efe7cee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s @@ -23,5 +23,3 @@ glabel func_80B17A6C /* 00558 80B17AB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0055C 80B17ABC 03E00008 */ jr $ra /* 00560 80B17AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s index a493d8a66b..70eb816c25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s @@ -21,5 +21,3 @@ glabel func_80B17AC4 /* 005A8 80B17B08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005AC 80B17B0C 03E00008 */ jr $ra /* 005B0 80B17B10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s index 67860dcb69..745a42a389 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s @@ -24,5 +24,3 @@ glabel func_80B17B14 /* 00608 80B17B68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0060C 80B17B6C 03E00008 */ jr $ra /* 00610 80B17B70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s index 3edc7744cc..f77325e2bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s @@ -26,5 +26,3 @@ glabel func_80B17C4C .L80B17CA8: /* 00748 80B17CA8 03E00008 */ jr $ra /* 0074C 80B17CAC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s index b22e34c2db..6164b6580e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s @@ -42,5 +42,3 @@ glabel EnTest_Destroy /* 002DC 8085F92C 8FB10020 */ lw $s1, 0x0020($sp) /* 002E0 8085F930 03E00008 */ jr $ra /* 002E4 8085F934 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s index 14b848fa45..e079556418 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s @@ -72,5 +72,3 @@ glabel EnTest_Draw /* 04AFC 8086414C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 04B00 80864150 03E00008 */ jr $ra /* 04B04 80864154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s index ef3c9133d4..87737e0d60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s @@ -157,5 +157,3 @@ glabel EnTest_Init /* 00244 8085F894 8FB10028 */ lw $s1, 0x0028($sp) /* 00248 8085F898 03E00008 */ jr $ra /* 0024C 8085F89C 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F650.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s similarity index 84% rename from asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F650.s rename to asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s index 8fe62d150a..23b83ce05a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_8085F650 +glabel EnTest_SetupAction /* 00000 8085F650 03E00008 */ jr $ra /* 00004 8085F654 AC8507CC */ sw $a1, 0x07CC($a0) ## 000007CC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s index 539dadf856..6d3f832e69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jtbl_808647E4 +.word L808638F4 +.word L808637D4 +.word L80863848 +.word L80863870 +.word L80863884 + +.text glabel EnTest_Update /* 04044 80863694 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 04048 80863698 AFBF002C */ sw $ra, 0x002C($sp) @@ -301,5 +310,3 @@ glabel L808638F4 /* 0445C 80863AAC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 04460 80863AB0 03E00008 */ jr $ra /* 04464 80863AB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s index 192e46373e..c27e27d581 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s @@ -1,3 +1,18 @@ +.late_rodata +glabel jtbl_80864720 +.word L8085FA00 +.word L8085FA00 +.word L8085FA98 +.word L8085FA84 +.word L8085FA84 +.word L8085FA00 +.word L8085FA00 +.word L8085FA84 +.word L8085FA74 +.word L8085FA98 +.word L8085FA98 + +.text glabel func_8085F938 /* 002E8 8085F938 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002EC 8085F93C AFBF0014 */ sw $ra, 0x0014($sp) @@ -104,5 +119,3 @@ glabel L8085FA98 /* 00454 8085FAA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00458 8085FAA8 03E00008 */ jr $ra /* 0045C 8085FAAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s index b5dd8ccfa9..a1dd56a5e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s @@ -1,3 +1,20 @@ +.late_rodata +glabel jtbl_8086474C +.word L8085FBBC +.word L8085FBCC +.word L8085FBE0 +.word L8085FBBC +.word L8085FBE0 +.word L8085FBCC +.word L8085FBCC +.word L8085FBBC +.word L8085FBCC +.word L8085FBE0 + +glabel D_80864774 + .float 0.2 + +.text glabel func_8085FAB0 /* 00460 8085FAB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00464 8085FAB4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -219,5 +236,3 @@ glabel L8085FBE0 /* 00774 8085FDC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00778 8085FDC8 03E00008 */ jr $ra /* 0077C 8085FDCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s index afb5c3abfc..3698c67b08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s @@ -23,11 +23,9 @@ glabel func_8085FDD0 /* 007D4 8085FE24 AC8E07E8 */ sw $t6, 0x07E8($a0) ## 000007E8 /* 007D8 8085FE28 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 /* 007DC 8085FE2C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 007E0 8085FE30 0C217D94 */ jal func_8085F650 +/* 007E0 8085FE30 0C217D94 */ jal EnTest_SetupAction /* 007E4 8085FE34 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 /* 007E8 8085FE38 8FBF0014 */ lw $ra, 0x0014($sp) /* 007EC 8085FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F0 8085FE40 03E00008 */ jr $ra /* 007F4 8085FE44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s index 1a0d2297b8..96a1bba2f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s @@ -31,7 +31,7 @@ glabel func_8085FE48 /* 00864 8085FEB4 4500000F */ bc1f .L8085FEF4 /* 00868 8085FEB8 00000000 */ nop /* 0086C 8085FEBC A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 -/* 00870 8085FEC0 0C217D94 */ jal func_8085F650 +/* 00870 8085FEC0 0C217D94 */ jal EnTest_SetupAction /* 00874 8085FEC4 AFA60018 */ sw $a2, 0x0018($sp) /* 00878 8085FEC8 8FA60018 */ lw $a2, 0x0018($sp) /* 0087C 8085FECC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -61,5 +61,3 @@ glabel func_8085FE48 /* 008CC 8085FF1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008D0 8085FF20 03E00008 */ jr $ra /* 008D4 8085FF24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s index b853104916..cf76c9fe6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s @@ -23,11 +23,9 @@ glabel func_8085FF28 /* 00928 8085FF78 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 0092C 8085FF7C 24A5FF9C */ addiu $a1, $a1, %lo(func_8085FF9C) ## $a1 = 8085FF9C /* 00930 8085FF80 01C17824 */ and $t7, $t6, $at -/* 00934 8085FF84 0C217D94 */ jal func_8085F650 +/* 00934 8085FF84 0C217D94 */ jal EnTest_SetupAction /* 00938 8085FF88 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 0093C 8085FF8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00940 8085FF90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00944 8085FF94 03E00008 */ jr $ra /* 00948 8085FF98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s index 9fb2ac0b37..ffea0ff989 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s @@ -36,7 +36,7 @@ glabel func_8085FF9C /* 009CC 8086001C 00000000 */ nop /* 009D0 80860020 4502000E */ bc1fl .L8086005C /* 009D4 80860024 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009D8 80860028 0C217D94 */ jal func_8085F650 +/* 009D8 80860028 0C217D94 */ jal EnTest_SetupAction /* 009DC 8086002C AFA60018 */ sw $a2, 0x0018($sp) /* 009E0 80860030 8FA40018 */ lw $a0, 0x0018($sp) /* 009E4 80860034 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 @@ -55,5 +55,3 @@ glabel func_8085FF9C /* 00A0C 8086005C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A10 80860060 03E00008 */ jr $ra /* 00A14 80860064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s index 84083de5aa..f4eaaaf643 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s @@ -27,11 +27,9 @@ glabel func_80860068 /* 00A78 808600C8 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 /* 00A7C 808600CC 4600540D */ trunc.w.s $f16, $f10 /* 00A80 808600D0 44188000 */ mfc1 $t8, $f16 -/* 00A84 808600D4 0C217D94 */ jal func_8085F650 +/* 00A84 808600D4 0C217D94 */ jal EnTest_SetupAction /* 00A88 808600D8 AC9807E8 */ sw $t8, 0x07E8($a0) ## 000007E8 /* 00A8C 808600DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A90 808600E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A94 808600E4 03E00008 */ jr $ra /* 00A98 808600E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s index f80398a07a..685c981e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_80864778 + .float 0.7 + +glabel D_8086477C + .float 0.3 +glabel D_80864780 + .float 0.3 +glabel D_80864784 + .float 0.7 + +.text glabel func_808600EC /* 00A9C 808600EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00AA0 808600F0 AFBF001C */ sw $ra, 0x001C($sp) @@ -155,5 +167,3 @@ glabel func_808600EC /* 00CBC 8086030C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00CC0 80860310 03E00008 */ jr $ra /* 00CC4 80860314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s index 61300cfe89..7330ce80b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80864788 + .float 0.15 + +.text glabel func_80860318 /* 00CC8 80860318 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00CCC 8086031C AFB00018 */ sw $s0, 0x0018($sp) @@ -39,7 +44,7 @@ glabel func_80860318 /* 00D54 808603A4 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 /* 00D58 808603A8 3C058086 */ lui $a1, %hi(func_808603CC) ## $a1 = 80860000 /* 00D5C 808603AC 24A503CC */ addiu $a1, $a1, %lo(func_808603CC) ## $a1 = 808603CC -/* 00D60 808603B0 0C217D94 */ jal func_8085F650 +/* 00D60 808603B0 0C217D94 */ jal EnTest_SetupAction /* 00D64 808603B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D68 808603B8 8FBF001C */ lw $ra, 0x001C($sp) .L808603BC: @@ -47,5 +52,3 @@ glabel func_80860318 /* 00D70 808603C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D74 808603C4 03E00008 */ jr $ra /* 00D78 808603C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s index 86a6be6ab9..8744c6ba31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s @@ -29,5 +29,3 @@ glabel func_808603CC /* 00DDC 8086042C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DE0 80860430 03E00008 */ jr $ra /* 00DE4 80860434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s index 476a5376f9..c7b382900c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s @@ -44,12 +44,10 @@ glabel func_80860438 /* 00E84 808604D4 00000000 */ nop /* 00E88 808604D8 0018CC00 */ sll $t9, $t8, 16 /* 00E8C 808604DC 00194403 */ sra $t0, $t9, 16 -/* 00E90 808604E0 0C217D94 */ jal func_8085F650 +/* 00E90 808604E0 0C217D94 */ jal EnTest_SetupAction /* 00E94 808604E4 AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 /* 00E98 808604E8 8FBF002C */ lw $ra, 0x002C($sp) /* 00E9C 808604EC 8FB00028 */ lw $s0, 0x0028($sp) /* 00EA0 808604F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00EA4 808604F4 03E00008 */ jr $ra /* 00EA8 808604F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s index 2eaab68dca..c150914940 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s @@ -1,3 +1,18 @@ +.late_rodata +glabel D_8086478C + .float 0.02 +glabel D_80864790 + .float 0.7 +glabel D_80864794 + .float 0.1 +glabel D_80864798 + .float 0.4 +glabel D_8086479C + .float 0.2 +glabel D_808647A0 + .float 0.1 + +.text glabel func_808604FC /* 00EAC 808604FC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00EB0 80860500 AFBF002C */ sw $ra, 0x002C($sp) @@ -493,5 +508,3 @@ glabel func_808604FC /* 01580 80860BD0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 01584 80860BD4 03E00008 */ jr $ra /* 01588 80860BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s index b9728a7d60..9c06014204 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s @@ -11,11 +11,9 @@ glabel func_80860BDC /* 015B0 80860C00 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 015B4 80860C04 3C058086 */ lui $a1, %hi(func_80860C24) ## $a1 = 80860000 /* 015B8 80860C08 24A50C24 */ addiu $a1, $a1, %lo(func_80860C24) ## $a1 = 80860C24 -/* 015BC 80860C0C 0C217D94 */ jal func_8085F650 +/* 015BC 80860C0C 0C217D94 */ jal EnTest_SetupAction /* 015C0 80860C10 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 /* 015C4 80860C14 8FBF0014 */ lw $ra, 0x0014($sp) /* 015C8 80860C18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015CC 80860C1C 03E00008 */ jr $ra /* 015D0 80860C20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s index 55bc381f51..49b4017328 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_808647A4 + .float 0.02 +glabel D_808647A8 + .float 0.02 +glabel D_808647AC + .float 0.8 +glabel D_808647B0 + .float 0.7 + +.text glabel func_80860C24 /* 015D4 80860C24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 015D8 80860C28 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -185,5 +196,3 @@ glabel func_80860C24 /* 01864 80860EB4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01868 80860EB8 03E00008 */ jr $ra /* 0186C 80860EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s index 693eb433a3..1033f9d8cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s @@ -44,12 +44,10 @@ glabel func_80860EC0 /* 0190C 80860F5C 00000000 */ nop /* 01910 80860F60 0018CC00 */ sll $t9, $t8, 16 /* 01914 80860F64 00194403 */ sra $t0, $t9, 16 -/* 01918 80860F68 0C217D94 */ jal func_8085F650 +/* 01918 80860F68 0C217D94 */ jal EnTest_SetupAction /* 0191C 80860F6C AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 /* 01920 80860F70 8FBF001C */ lw $ra, 0x001C($sp) /* 01924 80860F74 8FB00018 */ lw $s0, 0x0018($sp) /* 01928 80860F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0192C 80860F7C 03E00008 */ jr $ra /* 01930 80860F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s index e29911e63d..2f5f1ea3ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808647B4 + .float -0.8 +glabel D_808647B8 + .float -0.8 + +.text glabel func_80860F84 /* 01934 80860F84 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01938 80860F88 AFBF0024 */ sw $ra, 0x0024($sp) @@ -330,5 +337,3 @@ glabel func_80860F84 /* 01DBC 8086140C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01DC0 80861410 03E00008 */ jr $ra /* 01DC4 80861414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s index 9940ffb29d..5e1015ca8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s @@ -19,7 +19,7 @@ glabel func_80861418 /* 01E0C 8086145C A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 /* 01E10 80861460 24A5149C */ addiu $a1, $a1, %lo(func_8086149C) ## $a1 = 8086149C /* 01E14 80861464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E18 80861468 0C217D94 */ jal func_8085F650 +/* 01E18 80861468 0C217D94 */ jal EnTest_SetupAction /* 01E1C 8086146C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01E20 80861470 920807DE */ lbu $t0, 0x07DE($s0) ## 000007DE /* 01E24 80861474 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 @@ -33,5 +33,3 @@ glabel func_80861418 /* 01E40 80861490 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E44 80861494 03E00008 */ jr $ra /* 01E48 80861498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s index a8bb7ca1fb..5f57fc4b43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s @@ -74,5 +74,3 @@ glabel func_8086149C /* 01F48 80861598 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01F4C 8086159C 03E00008 */ jr $ra /* 01F50 808615A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s index efafa31d40..9f9a826dd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s @@ -13,11 +13,9 @@ glabel func_808615A4 /* 01F80 808615D0 3C058086 */ lui $a1, %hi(func_808615F4) ## $a1 = 80860000 /* 01F84 808615D4 24A515F4 */ addiu $a1, $a1, %lo(func_808615F4) ## $a1 = 808615F4 /* 01F88 808615D8 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 01F8C 808615DC 0C217D94 */ jal func_8085F650 +/* 01F8C 808615DC 0C217D94 */ jal EnTest_SetupAction /* 01F90 808615E0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 01F94 808615E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F98 808615E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F9C 808615EC 03E00008 */ jr $ra /* 01FA0 808615F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s index a9300945bf..2e898d03be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808647BC + .float 0.7 +glabel D_808647C0 + .float 0.7 + +.text glabel func_808615F4 /* 01FA4 808615F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01FA8 808615F8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -153,5 +160,3 @@ glabel func_808615F4 /* 021C0 80861810 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 021C4 80861814 03E00008 */ jr $ra /* 021C8 80861818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s index b555c87a95..7358e94253 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s @@ -18,7 +18,7 @@ glabel func_8086181C /* 0220C 8086185C A08F086C */ sb $t7, 0x086C($a0) ## 0000086C /* 02210 80861860 A09807C8 */ sb $t8, 0x07C8($a0) ## 000007C8 /* 02214 80861864 A0990879 */ sb $t9, 0x0879($a0) ## 00000879 -/* 02218 80861868 0C217D94 */ jal func_8085F650 +/* 02218 80861868 0C217D94 */ jal EnTest_SetupAction /* 0221C 8086186C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 02220 80861870 8FA60018 */ lw $a2, 0x0018($sp) /* 02224 80861874 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 @@ -31,5 +31,3 @@ glabel func_8086181C /* 0223C 8086188C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02240 80861890 03E00008 */ jr $ra /* 02244 80861894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s index 6f2e4c2444..da705357cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s @@ -49,5 +49,3 @@ glabel func_80861898 /* 022F0 80861940 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 022F4 80861944 03E00008 */ jr $ra /* 022F8 80861948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s index 0df30555ee..7f1e8743b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s @@ -17,7 +17,7 @@ glabel func_8086194C /* 02334 80861984 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02338 80861988 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 /* 0233C 8086198C 24A519EC */ addiu $a1, $a1, %lo(func_808619EC) ## $a1 = 808619EC -/* 02340 80861990 0C217D94 */ jal func_8085F650 +/* 02340 80861990 0C217D94 */ jal EnTest_SetupAction /* 02344 80861994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02348 80861998 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE /* 0234C 8086199C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 @@ -43,5 +43,3 @@ glabel func_8086194C /* 02390 808619E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02394 808619E4 03E00008 */ jr $ra /* 02398 808619E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s index f0b9177ad6..179b1f4ab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s @@ -121,5 +121,3 @@ glabel func_808619EC /* 02538 80861B88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0253C 80861B8C 03E00008 */ jr $ra /* 02540 80861B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s index bae8c8e026..feb22c05f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s @@ -30,7 +30,7 @@ glabel func_80861B94 /* 025B0 80861C00 A219086C */ sb $t9, 0x086C($s0) ## 0000086C /* 025B4 80861C04 24A51C40 */ addiu $a1, $a1, %lo(func_80861C40) ## $a1 = 80861C40 /* 025B8 80861C08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025BC 80861C0C 0C217D94 */ jal func_8085F650 +/* 025BC 80861C0C 0C217D94 */ jal EnTest_SetupAction /* 025C0 80861C10 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 025C4 80861C14 920907DE */ lbu $t1, 0x07DE($s0) ## 000007DE /* 025C8 80861C18 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 @@ -44,5 +44,3 @@ glabel func_80861B94 /* 025E4 80861C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 025E8 80861C38 03E00008 */ jr $ra /* 025EC 80861C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s index 321405a82c..007b1867ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s @@ -77,5 +77,3 @@ glabel func_80861C40 /* 026F4 80861D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 026F8 80861D48 03E00008 */ jr $ra /* 026FC 80861D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s index bbf1eac4d4..482dfee48d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s @@ -24,11 +24,9 @@ glabel func_80861D50 /* 02754 80861DA4 3C058086 */ lui $a1, %hi(func_80861DC8) ## $a1 = 80860000 /* 02758 80861DA8 24A51DC8 */ addiu $a1, $a1, %lo(func_80861DC8) ## $a1 = 80861DC8 /* 0275C 80861DAC 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 02760 80861DB0 0C217D94 */ jal func_8085F650 +/* 02760 80861DB0 0C217D94 */ jal EnTest_SetupAction /* 02764 80861DB4 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 /* 02768 80861DB8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0276C 80861DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02770 80861DC0 03E00008 */ jr $ra /* 02774 80861DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s index 59fdfa6990..bd8236e156 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s @@ -59,7 +59,7 @@ glabel func_80861DC8 /* 02848 80861E98 8FA40034 */ lw $a0, 0x0034($sp) /* 0284C 80861E9C 3C058086 */ lui $a1, %hi(func_808603CC) ## $a1 = 80860000 /* 02850 80861EA0 24A503CC */ addiu $a1, $a1, %lo(func_808603CC) ## $a1 = 808603CC -/* 02854 80861EA4 0C217D94 */ jal func_8085F650 +/* 02854 80861EA4 0C217D94 */ jal EnTest_SetupAction /* 02858 80861EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0285C 80861EAC 8FBF002C */ lw $ra, 0x002C($sp) .L80861EB0: @@ -67,5 +67,3 @@ glabel func_80861DC8 /* 02864 80861EB4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02868 80861EB8 03E00008 */ jr $ra /* 0286C 80861EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s index 83472167d6..23191ef8ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s @@ -43,12 +43,10 @@ glabel func_80861EC0 /* 02908 80861F58 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 0290C 80861F5C 4600218D */ trunc.w.s $f6, $f4 /* 02910 80861F60 44193000 */ mfc1 $t9, $f6 -/* 02914 80861F64 0C217D94 */ jal func_8085F650 +/* 02914 80861F64 0C217D94 */ jal EnTest_SetupAction /* 02918 80861F68 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 /* 0291C 80861F6C 8FBF002C */ lw $ra, 0x002C($sp) /* 02920 80861F70 8FB00028 */ lw $s0, 0x0028($sp) /* 02924 80861F74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02928 80861F78 03E00008 */ jr $ra /* 0292C 80861F7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s index b61d4edcc9..8e0e86bf77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s @@ -58,5 +58,3 @@ glabel func_80861F80 /* 029F4 80862044 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 029F8 80862048 03E00008 */ jr $ra /* 029FC 8086204C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s index fc7ad8419f..7a299b9acd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s @@ -12,11 +12,9 @@ glabel func_80862050 /* 02A28 80862078 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 /* 02A2C 8086207C 3C058086 */ lui $a1, %hi(func_8086209C) ## $a1 = 80860000 /* 02A30 80862080 24A5209C */ addiu $a1, $a1, %lo(func_8086209C) ## $a1 = 8086209C -/* 02A34 80862084 0C217D94 */ jal func_8085F650 +/* 02A34 80862084 0C217D94 */ jal EnTest_SetupAction /* 02A38 80862088 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 /* 02A3C 8086208C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02A40 80862090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A44 80862094 03E00008 */ jr $ra /* 02A48 80862098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s index 10efff8b02..e319db34f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s @@ -50,5 +50,3 @@ glabel func_8086209C /* 02AF8 80862148 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02AFC 8086214C 03E00008 */ jr $ra /* 02B00 80862150 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s index 450347604f..d3191a5ca5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s @@ -25,12 +25,10 @@ glabel func_80862154 /* 02B5C 808621AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02B60 808621B0 3C058086 */ lui $a1, %hi(func_808621D4) ## $a1 = 80860000 /* 02B64 808621B4 24A521D4 */ addiu $a1, $a1, %lo(func_808621D4) ## $a1 = 808621D4 -/* 02B68 808621B8 0C217D94 */ jal func_8085F650 +/* 02B68 808621B8 0C217D94 */ jal EnTest_SetupAction /* 02B6C 808621BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B70 808621C0 8FBF0024 */ lw $ra, 0x0024($sp) /* 02B74 808621C4 8FB00020 */ lw $s0, 0x0020($sp) /* 02B78 808621C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02B7C 808621CC 03E00008 */ jr $ra /* 02B80 808621D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s index f3efd0a0ad..aea7112f3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808647C4 + .float 0.7 + +.text glabel func_808621D4 /* 02B84 808621D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 02B88 808621D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -124,5 +129,3 @@ glabel func_808621D4 /* 02D3C 8086238C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02D40 80862390 03E00008 */ jr $ra /* 02D44 80862394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s index d6a57ca99b..51d87f992a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s @@ -25,12 +25,10 @@ glabel func_80862398 /* 02DA0 808623F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02DA4 808623F4 3C058086 */ lui $a1, %hi(func_80862418) ## $a1 = 80860000 /* 02DA8 808623F8 24A52418 */ addiu $a1, $a1, %lo(func_80862418) ## $a1 = 80862418 -/* 02DAC 808623FC 0C217D94 */ jal func_8085F650 +/* 02DAC 808623FC 0C217D94 */ jal EnTest_SetupAction /* 02DB0 80862400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02DB4 80862404 8FBF0024 */ lw $ra, 0x0024($sp) /* 02DB8 80862408 8FB00020 */ lw $s0, 0x0020($sp) /* 02DBC 8086240C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02DC0 80862410 03E00008 */ jr $ra /* 02DC4 80862414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s index 7ed5d665c4..18b2c64358 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808647C8 + .float 0.7 + +.text glabel func_80862418 /* 02DC8 80862418 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 02DCC 8086241C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -97,5 +102,3 @@ glabel func_80862418 /* 02F1C 8086256C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02F20 80862570 03E00008 */ jr $ra /* 02F24 80862574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s index 67d540a5e8..b4721e76d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s @@ -51,12 +51,10 @@ glabel func_80862578 /* 02FD8 80862628 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 02FDC 8086262C 3C058086 */ lui $a1, %hi(func_80862650) ## $a1 = 80860000 /* 02FE0 80862630 24A52650 */ addiu $a1, $a1, %lo(func_80862650) ## $a1 = 80862650 -/* 02FE4 80862634 0C217D94 */ jal func_8085F650 +/* 02FE4 80862634 0C217D94 */ jal EnTest_SetupAction /* 02FE8 80862638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02FEC 8086263C 8FBF0024 */ lw $ra, 0x0024($sp) /* 02FF0 80862640 8FB00020 */ lw $s0, 0x0020($sp) /* 02FF4 80862644 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02FF8 80862648 03E00008 */ jr $ra /* 02FFC 8086264C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s index 6aed7a23eb..95d78e11c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808647CC + .float 0.7 + +.text glabel func_80862650 /* 03000 80862650 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03004 80862654 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -102,5 +107,3 @@ glabel func_80862650 /* 03168 808627B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0316C 808627BC 03E00008 */ jr $ra /* 03170 808627C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s index 43fec43b3b..0bd9c1ebcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s @@ -59,7 +59,7 @@ glabel func_808627C4 /* 03244 80862894 46024280 */ add.s $f10, $f8, $f2 /* 03248 80862898 4600540D */ trunc.w.s $f16, $f10 /* 0324C 8086289C 440B8000 */ mfc1 $t3, $f16 -/* 03250 808628A0 0C217D94 */ jal func_8085F650 +/* 03250 808628A0 0C217D94 */ jal EnTest_SetupAction /* 03254 808628A4 AE0B07E8 */ sw $t3, 0x07E8($s0) ## 000007E8 /* 03258 808628A8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0325C 808628AC 00000000 */ nop @@ -70,5 +70,3 @@ glabel func_808627C4 /* 0326C 808628BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03270 808628C0 03E00008 */ jr $ra /* 03274 808628C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s index 2998afe0d4..b50530bd4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808647D0 + .float -0.8 +glabel D_808647D4 + .float -0.8 + +.text glabel func_808628C8 /* 03278 808628C8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0327C 808628CC AFBF0024 */ sw $ra, 0x0024($sp) @@ -357,5 +364,3 @@ glabel func_808628C8 /* 03760 80862DB0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 03764 80862DB4 03E00008 */ jr $ra /* 03768 80862DB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s index fb930d380d..33fc8fbf25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s @@ -40,12 +40,10 @@ glabel func_80862DBC .L80862E48: /* 037F8 80862E48 3C058086 */ lui $a1, %hi(func_80862E6C) ## $a1 = 80860000 /* 037FC 80862E4C 24A52E6C */ addiu $a1, $a1, %lo(func_80862E6C) ## $a1 = 80862E6C -/* 03800 80862E50 0C217D94 */ jal func_8085F650 +/* 03800 80862E50 0C217D94 */ jal EnTest_SetupAction /* 03804 80862E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03808 80862E58 8FBF001C */ lw $ra, 0x001C($sp) /* 0380C 80862E5C 8FB00018 */ lw $s0, 0x0018($sp) /* 03810 80862E60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03814 80862E64 03E00008 */ jr $ra /* 03818 80862E68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s index 546fcb2ac4..0b8e54ff6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s @@ -90,5 +90,3 @@ glabel func_80862E6C /* 0394C 80862F9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03950 80862FA0 03E00008 */ jr $ra /* 03954 80862FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s index a39167eb12..4466f58c9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s @@ -28,7 +28,7 @@ glabel func_80862FA8 /* 039BC 8086300C 3C058086 */ lui $a1, %hi(func_80863044) ## $a1 = 80860000 /* 039C0 80863010 A0D907C8 */ sb $t9, 0x07C8($a2) ## 000007C8 /* 039C4 80863014 24A53044 */ addiu $a1, $a1, %lo(func_80863044) ## $a1 = 80863044 -/* 039C8 80863018 0C217D94 */ jal func_8085F650 +/* 039C8 80863018 0C217D94 */ jal EnTest_SetupAction /* 039CC 8086301C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 039D0 80863020 10000005 */ beq $zero, $zero, .L80863038 /* 039D4 80863024 8FBF0014 */ lw $ra, 0x0014($sp) @@ -41,5 +41,3 @@ glabel func_80862FA8 /* 039E8 80863038 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 039EC 8086303C 03E00008 */ jr $ra /* 039F0 80863040 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s index a4a9580d40..5a7e1310eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s @@ -23,7 +23,7 @@ glabel func_80863044 /* 03A40 80863090 46022180 */ add.s $f6, $f4, $f2 /* 03A44 80863094 4600320D */ trunc.w.s $f8, $f6 /* 03A48 80863098 440F4000 */ mfc1 $t7, $f8 -/* 03A4C 8086309C 0C217D94 */ jal func_8085F650 +/* 03A4C 8086309C 0C217D94 */ jal EnTest_SetupAction /* 03A50 808630A0 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 /* 03A54 808630A4 260407F0 */ addiu $a0, $s0, 0x07F0 ## $a0 = 000007F0 /* 03A58 808630A8 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C @@ -47,5 +47,3 @@ glabel func_80863044 /* 03A94 808630E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03A98 808630E8 03E00008 */ jr $ra /* 03A9C 808630EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s index 52dbedc0c5..d11e6c037e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s @@ -28,7 +28,7 @@ glabel func_808630F0 /* 03B04 80863154 0301C824 */ and $t9, $t8, $at /* 03B08 80863158 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 /* 03B0C 8086315C 24A5318C */ addiu $a1, $a1, %lo(func_8086318C) ## $a1 = 8086318C -/* 03B10 80863160 0C217D94 */ jal func_8085F650 +/* 03B10 80863160 0C217D94 */ jal EnTest_SetupAction /* 03B14 80863164 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 03B18 80863168 10000005 */ beq $zero, $zero, .L80863180 /* 03B1C 8086316C 8FBF0014 */ lw $ra, 0x0014($sp) @@ -41,5 +41,3 @@ glabel func_808630F0 /* 03B30 80863180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B34 80863184 03E00008 */ jr $ra /* 03B38 80863188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s index 254b0064c9..d470cbac5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s @@ -23,7 +23,7 @@ glabel func_8086318C /* 03B88 808631D8 46022180 */ add.s $f6, $f4, $f2 /* 03B8C 808631DC 4600320D */ trunc.w.s $f8, $f6 /* 03B90 808631E0 440F4000 */ mfc1 $t7, $f8 -/* 03B94 808631E4 0C217D94 */ jal func_8085F650 +/* 03B94 808631E4 0C217D94 */ jal EnTest_SetupAction /* 03B98 808631E8 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 /* 03B9C 808631EC 260407F0 */ addiu $a0, $s0, 0x07F0 ## $a0 = 000007F0 /* 03BA0 808631F0 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C @@ -50,5 +50,3 @@ glabel func_8086318C /* 03BE4 80863234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03BE8 80863238 03E00008 */ jr $ra /* 03BEC 8086323C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s index 4974ffe29c..63212a0421 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s @@ -14,11 +14,9 @@ glabel func_80863240 /* 03C20 80863270 24A53294 */ addiu $a1, $a1, %lo(func_80863294) ## $a1 = 80863294 /* 03C24 80863274 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 /* 03C28 80863278 E4860194 */ swc1 $f6, 0x0194($a0) ## 00000194 -/* 03C2C 8086327C 0C217D94 */ jal func_8085F650 +/* 03C2C 8086327C 0C217D94 */ jal EnTest_SetupAction /* 03C30 80863280 E4880198 */ swc1 $f8, 0x0198($a0) ## 00000198 /* 03C34 80863284 8FBF0014 */ lw $ra, 0x0014($sp) /* 03C38 80863288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03C3C 8086328C 03E00008 */ jr $ra /* 03C40 80863290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s index b545b389bb..49d2cad691 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808647D8 + .float 0.7 + +.text glabel func_80863294 /* 03C44 80863294 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 03C48 80863298 AFB00018 */ sw $s0, 0x0018($sp) @@ -57,5 +62,3 @@ glabel func_80863294 /* 03D04 80863354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03D08 80863358 03E00008 */ jr $ra /* 03D0C 8086335C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s index bc1b5024be..4674d2e096 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808647DC + .float 0.015 +glabel D_808647E0 + .float 0.002 + +.text glabel func_80863360 /* 03D10 80863360 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03D14 80863364 AFA5001C */ sw $a1, 0x001C($sp) @@ -36,5 +43,3 @@ glabel func_80863360 /* 03D8C 808633DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03D90 808633E0 03E00008 */ jr $ra /* 03D94 808633E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s index 3c08383af2..4c588c2fea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s @@ -33,5 +33,3 @@ glabel func_808633E8 /* 03E04 80863454 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03E08 80863458 03E00008 */ jr $ra /* 03E0C 8086345C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s index a2e58aaba2..54aac8d1eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s @@ -43,5 +43,3 @@ glabel func_80863460 /* 03E9C 808634EC A48307D2 */ sh $v1, 0x07D2($a0) ## 000007D2 /* 03EA0 808634F0 03E00008 */ jr $ra /* 03EA4 808634F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s index f0fba438ec..a85ef1dc08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s @@ -114,5 +114,3 @@ glabel func_808634F8 /* 04038 80863688 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0403C 8086368C 03E00008 */ jr $ra /* 04040 80863690 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s index 416023196e..7d7798a4d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80864700 + .asciz "../z_en_test.c" + .balign 4 + +glabel D_80864710 + .asciz "../z_en_test.c" + .balign 4 + +.text glabel func_80863AB8 /* 04468 80863AB8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0446C 80863ABC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -138,5 +148,3 @@ glabel func_80863AB8 /* 04668 80863CB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0466C 80863CBC 03E00008 */ jr $ra /* 04670 80863CC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s index c348d3c611..2b0f1600f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s @@ -1,3 +1,57 @@ +.late_rodata +glabel jtbl_808647F8 +.word L80863F68 +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863F70 +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863F88 +.word L80863FCC +.word L80863FA0 +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863F7C +.word L80863FCC +.word L80863FCC +.word L80863F94 +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FB8 +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FCC +.word L80863FC4 +.word L80863FCC +.word L80863FCC +.word L80863FAC + +.text glabel func_80863CC4 /* 04674 80863CC4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 04678 80863CC8 AFB00030 */ sw $s0, 0x0030($sp) @@ -245,5 +299,3 @@ glabel L80863FCC /* 049EC 8086403C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 049F0 80864040 03E00008 */ jr $ra /* 049F4 80864044 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s index 2e9f7cb627..421ae7f7d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s @@ -30,11 +30,9 @@ glabel func_80864158 /* 04B74 808641C4 460A4400 */ add.s $f16, $f8, $f10 /* 04B78 808641C8 4600848D */ trunc.w.s $f18, $f16 /* 04B7C 808641CC 44199000 */ mfc1 $t9, $f18 -/* 04B80 808641D0 0C217D94 */ jal func_8085F650 +/* 04B80 808641D0 0C217D94 */ jal EnTest_SetupAction /* 04B84 808641D4 AC9907E8 */ sw $t9, 0x07E8($a0) ## 000007E8 /* 04B88 808641D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 04B8C 808641DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B90 808641E0 03E00008 */ jr $ra /* 04B94 808641E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s index 84a92634bd..b4c3dff997 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s @@ -226,4 +226,3 @@ glabel func_808641E8 /* 04EB4 80864504 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04EB8 80864508 03E00008 */ jr $ra /* 04EBC 8086450C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s index e1ef14c334..3a23b9ef10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s @@ -14,5 +14,3 @@ glabel EnTg_Destroy /* 00254 80B185B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00258 80B185B8 03E00008 */ jr $ra /* 0025C 80B185BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s index 17ded82394..b3c00df098 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B18980 + .asciz "../z_en_tg.c" + .balign 4 + +glabel D_80B18990 + .asciz "../z_en_tg.c" + .balign 4 + +.text glabel EnTg_Draw /* 00484 80B187E4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00488 80B187E8 AFB10028 */ sw $s1, 0x0028($sp) @@ -74,4 +84,3 @@ glabel EnTg_Draw /* 005A4 80B18904 00000000 */ nop /* 005A8 80B18908 00000000 */ nop /* 005AC 80B1890C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s index 781f64064f..140cfdd549 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s @@ -57,5 +57,3 @@ glabel EnTg_Init /* 0021C 80B1857C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00220 80B18580 03E00008 */ jr $ra /* 00224 80B18584 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s index 82126b20a7..a5102f1140 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s @@ -73,5 +73,3 @@ glabel EnTg_Update /* 00398 80B186F8 8FB10020 */ lw $s1, 0x0020($sp) /* 0039C 80B186FC 03E00008 */ jr $ra /* 003A0 80B18700 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s index 1c76f2b0b6..9160564a96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s @@ -42,5 +42,3 @@ glabel func_80B18360 /* 0008C 80B183EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00090 80B183F0 03E00008 */ jr $ra /* 00094 80B183F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B183F8.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B183F8.s index d590a4a543..b8ba0c4252 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B183F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B183F8.s @@ -1,3 +1,18 @@ +.late_rodata +glabel jtbl_80B189A0 +.word L80B18430 +.word L80B18430 +.word L80B18438 +.word L80B18430 +.word L80B18430 +.word L80B18430 +.word L80B18430 +.word L80B18430 +.word L80B18430 +.word L80B18430 +.word 0x00000000, 0x00000000 + +.text glabel func_80B183F8 /* 00098 80B183F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0009C 80B183FC AFBF0014 */ sw $ra, 0x0014($sp) @@ -52,5 +67,3 @@ glabel L80B18438 /* 00144 80B184A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00148 80B184A8 03E00008 */ jr $ra /* 0014C 80B184AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B185C0.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B185C0.s index a948b6909a..b2180ce0b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B185C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B185C0.s @@ -9,5 +9,3 @@ glabel func_80B185C0 .L80B185DC: /* 0027C 80B185DC 03E00008 */ jr $ra /* 00280 80B185E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18704.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18704.s index 47648f577d..9f4915c60d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18704.s @@ -5,5 +5,3 @@ glabel func_80B18704 /* 003B0 80B18710 AFA7000C */ sw $a3, 0x000C($sp) /* 003B4 80B18714 03E00008 */ jr $ra /* 003B8 80B18718 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B1871C.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B1871C.s index ed06d071c4..d64bbb2819 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B1871C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B1871C.s @@ -23,5 +23,3 @@ glabel func_80B1871C /* 0040C 80B1876C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00410 80B18770 03E00008 */ jr $ra /* 00414 80B18774 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18778.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18778.s index a3991099af..e84f18d969 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18778.s @@ -27,5 +27,3 @@ glabel func_80B18778 /* 00478 80B187D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0047C 80B187DC 03E00008 */ jr $ra /* 00480 80B187E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s index f9b00d7d36..49bf5b70c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B1B6F0 + .asciz "\n\n" + .balign 4 + +glabel D_80B1B6F4 + .asciz "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" + .balign 4 + +glabel D_80B1B720 + .asciz "\n\n" + .balign 4 + +.text glabel EnTite_Destroy /* 0015C 80B18BDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00160 80B18BE0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -36,5 +50,3 @@ glabel EnTite_Destroy /* 001D0 80B18C50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001D4 80B18C54 03E00008 */ jr $ra /* 001D8 80B18C58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s index b6ae51417f..4f203737a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B1B724 + .asciz "../z_en_tite.c" + .balign 4 + +glabel D_80B1B734 + .asciz "../z_en_tite.c" + .balign 4 + +.text glabel EnTite_Draw /* 027E8 80B1B268 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 027EC 80B1B26C AFBF003C */ sw $ra, 0x003C($sp) @@ -214,4 +224,3 @@ glabel EnTite_Draw /* 02B24 80B1B5A4 00000000 */ nop /* 02B28 80B1B5A8 00000000 */ nop /* 02B2C 80B1B5AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s index c1bd6c79a7..f83f56b34d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s @@ -89,5 +89,3 @@ glabel EnTite_Init /* 00150 80B18BD0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00154 80B18BD4 03E00008 */ jr $ra /* 00158 80B18BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s index 5e4e6a6f0e..4ef0a8f5d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s @@ -269,5 +269,3 @@ glabel EnTite_Update /* 026EC 80B1B16C 8FB10020 */ lw $s1, 0x0020($sp) /* 026F0 80B1B170 03E00008 */ jr $ra /* 026F4 80B1B174 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18A80.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18A80.s index d3b80c6529..4099775b6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18A80.s @@ -1,5 +1,3 @@ glabel func_80B18A80 /* 00000 80B18A80 03E00008 */ jr $ra /* 00004 80B18A84 AC8502C0 */ sw $a1, 0x02C0($a0) ## 000002C0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s index ec17cc7396..d4ad63779d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s @@ -26,5 +26,3 @@ glabel func_80B18C5C /* 00238 80B18CB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0023C 80B18CBC 03E00008 */ jr $ra /* 00240 80B18CC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s index 6895c69c1b..abfbc12e0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s @@ -90,5 +90,3 @@ glabel func_80B18CC4 /* 0037C 80B18DFC 8FB00028 */ lw $s0, 0x0028($sp) /* 00380 80B18E00 03E00008 */ jr $ra /* 00384 80B18E04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s index e00d367471..dfc9570b3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s @@ -29,5 +29,3 @@ glabel func_80B18E08 /* 003F0 80B18E70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F4 80B18E74 03E00008 */ jr $ra /* 003F8 80B18E78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index d47f02b586..e344bc8ec0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -480,5 +480,3 @@ glabel func_80B18E7C /* 00A98 80B19518 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00A9C 80B1951C 03E00008 */ jr $ra /* 00AA0 80B19520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s index ed2c41dd89..ab68108d5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s @@ -40,5 +40,3 @@ glabel func_80B19524 /* 00B34 80B195B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B38 80B195B8 03E00008 */ jr $ra /* 00B3C 80B195BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B195C0.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B195C0.s index ab277eba66..6e37ebda90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B195C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B195C0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B1B744 + .float 0.01 + +glabel D_80B1B748 + .float 0.01 + +.text glabel func_80B195C0 /* 00B40 80B195C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00B44 80B195C4 AFBF001C */ sw $ra, 0x001C($sp) @@ -182,5 +190,3 @@ glabel func_80B195C0 /* 00DD0 80B19850 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00DD4 80B19854 03E00008 */ jr $ra /* 00DD8 80B19858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s index de834fa9b6..003ff180bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s @@ -51,5 +51,3 @@ glabel func_80B1985C /* 00E8C 80B1990C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E90 80B19910 03E00008 */ jr $ra /* 00E94 80B19914 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s index f846860c12..b5eec7f4a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s @@ -357,5 +357,3 @@ glabel func_80B19918 /* 0139C 80B19E1C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 013A0 80B19E20 03E00008 */ jr $ra /* 013A4 80B19E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s index 451455c5b3..c2571ecd9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s @@ -26,5 +26,3 @@ glabel func_80B19E28 /* 01408 80B19E88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0140C 80B19E8C 03E00008 */ jr $ra /* 01410 80B19E90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s index 18eda4ea75..82c4297f5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s @@ -232,5 +232,3 @@ glabel func_80B19E94 /* 01760 80B1A1E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01764 80B1A1E4 03E00008 */ jr $ra /* 01768 80B1A1E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s index 4bb757c181..6b7f303f63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s @@ -48,5 +48,3 @@ glabel func_80B1A1EC /* 01814 80B1A294 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01818 80B1A298 03E00008 */ jr $ra /* 0181C 80B1A29C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s index 26a43ab90c..b19b434274 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s @@ -251,5 +251,3 @@ glabel func_80B1A2A0 /* 01BB0 80B1A630 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01BB4 80B1A634 03E00008 */ jr $ra /* 01BB8 80B1A638 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A63C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A63C.s index 98d07b1cd6..1ff419677b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A63C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A63C.s @@ -12,5 +12,3 @@ glabel func_80B1A63C /* 01BE4 80B1A664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BE8 80B1A668 03E00008 */ jr $ra /* 01BEC 80B1A66C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A670.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A670.s index 24d78138de..3d04b588a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A670.s @@ -28,5 +28,3 @@ glabel func_80B1A670 /* 01C58 80B1A6D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C5C 80B1A6DC 03E00008 */ jr $ra /* 01C60 80B1A6E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A6E4.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A6E4.s index d18d52c51c..0c6bbc1867 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A6E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A6E4.s @@ -39,5 +39,3 @@ glabel func_80B1A6E4 /* 01CE0 80B1A760 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01CE4 80B1A764 03E00008 */ jr $ra /* 01CE8 80B1A768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s index 5d446bef78..4a693238a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s @@ -75,5 +75,3 @@ glabel func_80B1A76C /* 01DFC 80B1A87C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E00 80B1A880 03E00008 */ jr $ra /* 01E04 80B1A884 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s index 086c92d0aa..7edbafb471 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s @@ -122,5 +122,3 @@ glabel func_80B1A888 /* 01FB8 80B1AA38 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01FBC 80B1AA3C 03E00008 */ jr $ra /* 01FC0 80B1AA40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA44.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA44.s index 3b54f6b8ec..e857bb638b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA44.s @@ -20,5 +20,3 @@ glabel func_80B1AA44 /* 02008 80B1AA88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0200C 80B1AA8C 03E00008 */ jr $ra /* 02010 80B1AA90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s index bfc617996c..84bdde40bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s @@ -77,5 +77,3 @@ glabel func_80B1AA94 /* 02130 80B1ABB0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02134 80B1ABB4 03E00008 */ jr $ra /* 02138 80B1ABB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1ABBC.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1ABBC.s index c535f8e413..0a2829d675 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1ABBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1ABBC.s @@ -131,5 +131,3 @@ glabel func_80B1ABBC /* 02308 80B1AD88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0230C 80B1AD8C 03E00008 */ jr $ra /* 02310 80B1AD90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1B178.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1B178.s index 84ee19a0f7..0bd4029ab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1B178.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1B178.s @@ -64,5 +64,3 @@ glabel func_80B1B178 /* 027DC 80B1B25C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 027E0 80B1B260 03E00008 */ jr $ra /* 027E4 80B1B264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s index 0ef29690ad..8528e2d297 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s @@ -28,5 +28,3 @@ glabel EnTorch2_Destroy /* 0020C 80B1DB8C 8FB10018 */ lw $s1, 0x0018($sp) /* 00210 80B1DB90 03E00008 */ jr $ra /* 00214 80B1DB94 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s index 4596bbc96e..6d2ca223de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B1FA30 + .asciz "../z_en_torch2.c" + .balign 4 + +glabel D_80B1FA44 + .asciz "../z_en_torch2.c" + .balign 4 + +.text glabel EnTorch2_Draw /* 01E78 80B1F7F8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 01E7C 80B1F7FC AFB20030 */ sw $s2, 0x0030($sp) @@ -119,4 +129,3 @@ glabel EnTorch2_Draw /* 02044 80B1F9C4 8FB20030 */ lw $s2, 0x0030($sp) /* 02048 80B1F9C8 03E00008 */ jr $ra /* 0204C 80B1F9CC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s index 499018d6e2..28e0a52da0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s @@ -105,5 +105,3 @@ glabel EnTorch2_Init /* 0019C 80B1DB1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001A0 80B1DB20 03E00008 */ jr $ra /* 001A4 80B1DB24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s index 370a211bff..4fe3a008b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_80B1FA5C + .word 0x44188000 +glabel D_80B1FA60 + .float 1.2 + +glabel D_80B1FA64 + .float 0.6 + +glabel D_80B1FA68 + .float 1.2 + +glabel D_80B1FA6C + .float 0.6 + +glabel D_80B1FA70 + .float 0.01 + +.text glabel EnTorch2_Update /* 00444 80B1DDC4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00448 80B1DDC8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -1797,5 +1816,3 @@ glabel EnTorch2_Update /* 01E1C 80B1F79C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 01E20 80B1F7A0 03E00008 */ jr $ra /* 01E24 80B1F7A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DB98.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DB98.s index 9b64eda8ff..f408d8baeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DB98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DB98.s @@ -17,5 +17,3 @@ glabel func_80B1DB98 /* 0024C 80B1DBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00250 80B1DBD0 03E00008 */ jr $ra /* 00254 80B1DBD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s index 221ed0c113..41c8c5e6d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B1FA58 + .float 0.3 + +.text glabel func_80B1DBD8 /* 00258 80B1DBD8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0025C 80B1DBDC AFBF0014 */ sw $ra, 0x0014($sp) @@ -113,5 +118,3 @@ glabel func_80B1DBD8 /* 003E4 80B1DD64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003E8 80B1DD68 03E00008 */ jr $ra /* 003EC 80B1DD6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DD70.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DD70.s index 3069331c45..c7bc72e835 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DD70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DD70.s @@ -20,5 +20,3 @@ glabel func_80B1DD70 /* 00438 80B1DDB8 3C0180B2 */ lui $at, %hi(D_80B20160) ## $at = 80B20000 /* 0043C 80B1DDBC 03E00008 */ jr $ra /* 00440 80B1DDC0 A0200160 */ sb $zero, %lo(D_80B20160)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7A8.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7A8.s index d30eb554e1..7b0bf7538e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7A8.s @@ -10,5 +10,3 @@ glabel func_80B1F7A8 /* 01E48 80B1F7C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E4C 80B1F7CC 03E00008 */ jr $ra /* 01E50 80B1F7D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7D4.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7D4.s index 88eb13877b..6ea564b4df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7D4.s @@ -8,5 +8,3 @@ glabel func_80B1F7D4 /* 01E6C 80B1F7EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E70 80B1F7F0 03E00008 */ jr $ra /* 01E74 80B1F7F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s index c3f578a7c0..b2e2336e3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s @@ -10,5 +10,3 @@ glabel EnToryo_Destroy /* 0025C 80B203CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00260 80B203D0 03E00008 */ jr $ra /* 00264 80B203D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s index 641488f651..298d66f415 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s @@ -22,5 +22,3 @@ glabel EnToryo_Draw /* 00988 80B20AF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0098C 80B20AFC 03E00008 */ jr $ra /* 00990 80B20B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s index 4aa7328261..b526ebd39f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s @@ -157,5 +157,3 @@ glabel EnToryo_Init /* 00234 80B203A4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00238 80B203A8 03E00008 */ jr $ra /* 0023C 80B203AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s index 7adfb1c74e..22bea2ac81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B20CD0 + .word 0x46638C00 +glabel D_80B20CD4 + .word 0xC6638C00, 0x00000000, 0x00000000 + +.text glabel EnToryo_Update /* 00808 80B20978 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0080C 80B2097C AFB00018 */ sw $s0, 0x0018($sp) @@ -80,5 +87,3 @@ glabel EnToryo_Update /* 0092C 80B20A9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00930 80B20AA0 03E00008 */ jr $ra /* 00934 80B20AA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s index b6711b62f1..a20584694c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s @@ -1,3 +1,21 @@ +.late_rodata +glabel jtbl_80B20C80 +.word L80B205B8 +.word L80B205B8 +.word L80B205B8 +.word L80B205B8 +.word L80B2042C +.word L80B205B8 +.word L80B204AC +glabel jtbl_80B20C9C +.word L80B20570 +.word L80B205A0 +.word L80B205A0 +.word L80B205A0 +.word L80B205A0 +.word L80B20540 + +.text glabel func_80B203D8 /* 00268 80B203D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0026C 80B203DC AFBF0014 */ sw $ra, 0x0014($sp) @@ -137,5 +155,3 @@ glabel L80B205B8 /* 00450 80B205C0 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 /* 00454 80B205C4 03E00008 */ jr $ra /* 00458 80B205C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B205CC.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B205CC.s index 4185cce2d0..65534c39a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B205CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B205CC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80B20CB4 +.word L80B20620 +.word L80B20620 +.word L80B20620 +.word L80B20620 +.word L80B20620 +.word L80B20620 +.word L80B2060C + +.text glabel func_80B205CC /* 0045C 80B205CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00460 80B205D0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,5 +40,3 @@ glabel L80B20620 /* 004B8 80B20628 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 004BC 80B2062C 03E00008 */ jr $ra /* 004C0 80B20630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s index 5d6ca633a8..b3ee329dc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s @@ -30,5 +30,3 @@ glabel func_80B20634 /* 00524 80B20694 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00528 80B20698 03E00008 */ jr $ra /* 0052C 80B2069C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s index dc518ab80d..bb73cfe6f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s @@ -56,5 +56,3 @@ glabel func_80B206A0 /* 005EC 80B2075C 00801025 */ or $v0, $a0, $zero ## $v0 = 0000506C /* 005F0 80B20760 03E00008 */ jr $ra /* 005F4 80B20764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s index 60ecb2c29c..052bb0f4a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s @@ -116,5 +116,3 @@ glabel func_80B20768 /* 00798 80B20908 8FB10020 */ lw $s1, 0x0020($sp) /* 0079C 80B2090C 03E00008 */ jr $ra /* 007A0 80B20910 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20914.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20914.s index e1b0b75fe2..118b285018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20914.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20914.s @@ -27,5 +27,3 @@ glabel func_80B20914 /* 007FC 80B2096C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00800 80B20970 03E00008 */ jr $ra /* 00804 80B20974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B04.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B04.s index dc8fd4dfdc..80249e8273 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B04.s @@ -38,5 +38,3 @@ glabel func_80B20B04 .L80B20B8C: /* 00A1C 80B20B8C 03E00008 */ jr $ra /* 00A20 80B20B90 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B94.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B94.s index 3eb699e442..4776a44333 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20B94.s @@ -19,4 +19,3 @@ glabel func_80B20B94 /* 00A64 80B20BD4 00000000 */ nop /* 00A68 80B20BD8 00000000 */ nop /* 00A6C 80B20BDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s index 2158d0a65c..669dcc0a5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s @@ -9,5 +9,3 @@ glabel EnTp_Destroy /* 00298 80B21078 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0029C 80B2107C 03E00008 */ jr $ra /* 002A0 80B21080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s index dbf2542bb3..2f31f3d911 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B22B40 + .asciz "../z_en_tp.c" + .balign 4 + +glabel D_80B22B50 + .asciz "../z_en_tp.c" + .balign 4 + +glabel D_80B22B60 + .asciz "../z_en_tp.c" + .balign 4 + +glabel D_80B22B70 + .asciz "../z_en_tp.c" + .balign 4 + +.text glabel EnTp_Draw /* 019CC 80B227AC 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 019D0 80B227B0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -181,4 +199,3 @@ glabel EnTp_Draw /* 01C84 80B22A64 00000000 */ nop /* 01C88 80B22A68 00000000 */ nop /* 01C8C 80B22A6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s index f60f7ff136..f2eff48718 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B22B80 + .float 0.3 + +.text glabel EnTp_Init /* 00008 80B20DE8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0000C 80B20DEC AFB60060 */ sw $s6, 0x0060($sp) @@ -167,5 +172,3 @@ glabel EnTp_Init /* 00270 80B21050 8FBE0068 */ lw $s8, 0x0068($sp) /* 00274 80B21054 03E00008 */ jr $ra /* 00278 80B21058 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s index e18f33a80f..e029aacd50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s @@ -242,5 +242,3 @@ glabel EnTp_Update /* 019C0 80B227A0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 019C4 80B227A4 03E00008 */ jr $ra /* 019C8 80B227A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B20DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B20DE0.s index 1bffe71f31..e71217e67f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B20DE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B20DE0.s @@ -1,5 +1,3 @@ glabel func_80B20DE0 /* 00000 80B20DE0 03E00008 */ jr $ra /* 00004 80B20DE4 AC850154 */ sw $a1, 0x0154($a0) ## 00000154 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21084.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21084.s index 8ece1e1be2..ea42bd9d2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21084.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21084.s @@ -10,5 +10,3 @@ glabel func_80B21084 /* 002C4 80B210A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002C8 80B210A8 03E00008 */ jr $ra /* 002CC 80B210AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s index db46280318..0a96731c06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s @@ -129,5 +129,3 @@ glabel func_80B210B0 /* 004A0 80B21280 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 004A4 80B21284 03E00008 */ jr $ra /* 004A8 80B21288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2128C.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2128C.s index 00cc1cee62..3178efd0a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2128C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2128C.s @@ -12,5 +12,3 @@ glabel func_80B2128C /* 004D4 80B212B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004D8 80B212B8 03E00008 */ jr $ra /* 004DC 80B212BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s index 495e6340c4..9df57c4030 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B22B84 + .float 0.2 + +.text glabel func_80B212C0 /* 004E0 80B212C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 004E4 80B212C4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -111,5 +116,3 @@ glabel func_80B212C0 /* 00668 80B21448 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0066C 80B2144C 03E00008 */ jr $ra /* 00670 80B21450 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21454.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21454.s index bdc25559e7..8c8dff74ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21454.s @@ -33,5 +33,3 @@ glabel func_80B21454 /* 006E0 80B214C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E4 80B214C4 03E00008 */ jr $ra /* 006E8 80B214C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s index a3006f72c6..2b00377443 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s @@ -219,5 +219,3 @@ glabel func_80B214CC /* 00A10 80B217F0 8FB40060 */ lw $s4, 0x0060($sp) /* 00A14 80B217F4 03E00008 */ jr $ra /* 00A18 80B217F8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s index 0f0b336dee..1818f3d1ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s @@ -70,5 +70,3 @@ glabel func_80B217FC /* 00B14 80B218F4 8FB00020 */ lw $s0, 0x0020($sp) /* 00B18 80B218F8 03E00008 */ jr $ra /* 00B1C 80B218FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21900.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21900.s index f869cf390d..0398e1f4d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21900.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21900.s @@ -20,5 +20,3 @@ glabel func_80B21900 /* 00B60 80B21940 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B64 80B21944 03E00008 */ jr $ra /* 00B68 80B21948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s index a39105fde4..824fee5c06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s @@ -23,5 +23,3 @@ glabel func_80B2194C /* 00BBC 80B2199C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BC0 80B219A0 03E00008 */ jr $ra /* 00BC4 80B219A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s index a53bf10e16..6a5977990c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B22B88 + .float 0.2 + +.text glabel func_80B219A8 /* 00BC8 80B219A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00BCC 80B219AC AFBF0024 */ sw $ra, 0x0024($sp) @@ -133,5 +138,3 @@ glabel func_80B219A8 /* 00DA4 80B21B84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00DA8 80B21B88 03E00008 */ jr $ra /* 00DAC 80B21B8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21B90.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21B90.s index fd0647fdd3..89a89c7734 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21B90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21B90.s @@ -18,5 +18,3 @@ glabel func_80B21B90 /* 00DF0 80B21BD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DF4 80B21BD4 03E00008 */ jr $ra /* 00DF8 80B21BD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s index 06fcda3a72..909a5a82d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B22B8C + .float 0.3 + +glabel D_80B22B90 + .float 0.3 + +.text glabel func_80B21BDC /* 00DFC 80B21BDC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00E00 80B21BE0 AFBF002C */ sw $ra, 0x002C($sp) @@ -218,5 +226,3 @@ glabel func_80B21BDC /* 010FC 80B21EDC 8FB00028 */ lw $s0, 0x0028($sp) /* 01100 80B21EE0 03E00008 */ jr $ra /* 01104 80B21EE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21EE8.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21EE8.s index c55d19169c..58860fea63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21EE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21EE8.s @@ -11,5 +11,3 @@ glabel func_80B21EE8 /* 0112C 80B21F0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01130 80B21F10 03E00008 */ jr $ra /* 01134 80B21F14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s index 5624c46e14..c8d507d9b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s @@ -199,5 +199,3 @@ glabel func_80B21F18 /* 013FC 80B221DC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01400 80B221E0 03E00008 */ jr $ra /* 01404 80B221E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B221E8.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B221E8.s index 64e4320838..bb81d5d22e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B221E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B221E8.s @@ -170,5 +170,3 @@ glabel func_80B221E8 /* 01654 80B22434 8FB50030 */ lw $s5, 0x0030($sp) /* 01658 80B22438 03E00008 */ jr $ra /* 0165C 80B2243C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s index fcbda447a6..93a63e2ccb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s @@ -2,5 +2,3 @@ glabel EnTr_Destroy /* 00170 80B22E60 AFA40000 */ sw $a0, 0x0000($sp) /* 00174 80B22E64 03E00008 */ jr $ra /* 00178 80B22E68 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s index 16306967d6..28e10f5169 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B24414 + .asciz "../z_en_tr.c" + .balign 4 + +glabel D_80B24424 + .asciz "../z_en_tr.c" + .balign 4 + +.text glabel EnTr_Draw /* 011B4 80B23EA4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 011B8 80B23EA8 AFBF002C */ sw $ra, 0x002C($sp) @@ -80,5 +90,3 @@ glabel EnTr_Draw /* 012E0 80B23FD0 8FB10028 */ lw $s1, 0x0028($sp) /* 012E4 80B23FD4 03E00008 */ jr $ra /* 012E8 80B23FD8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s index 0ca754b3ab..a9d7b93594 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B24400 + .asciz "0" + .balign 4 + +glabel D_80B24404 + .asciz "../z_en_tr.c" + .balign 4 + +.text glabel EnTr_Init /* 00008 80B22CF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0000C 80B22CFC AFB00024 */ sw $s0, 0x0024($sp) @@ -96,5 +106,3 @@ glabel EnTr_Init /* 00164 80B22E54 8FB10028 */ lw $s1, 0x0028($sp) /* 00168 80B22E58 03E00008 */ jr $ra /* 0016C 80B22E5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s index 6291d8cc2b..987637ca1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s @@ -129,5 +129,3 @@ glabel EnTr_Update /* 01078 80B23D68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0107C 80B23D6C 03E00008 */ jr $ra /* 01080 80B23D70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s index c157705d64..d657bbb18e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s @@ -1,5 +1,3 @@ glabel func_80B22CF0 /* 00000 80B22CF0 03E00008 */ jr $ra /* 00004 80B22CF4 AC8502DC */ sw $a1, 0x02DC($a0) ## 000002DC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s index 9b8218751f..a4b813454a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s @@ -48,5 +48,3 @@ glabel func_80B22E6C /* 00220 80B22F10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00224 80B22F14 03E00008 */ jr $ra /* 00228 80B22F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s index d6937d2d16..be3002c0e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s @@ -2,5 +2,3 @@ glabel func_80B22F1C /* 0022C 80B22F1C AFA40000 */ sw $a0, 0x0000($sp) /* 00230 80B22F20 03E00008 */ jr $ra /* 00234 80B22F24 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s index 004c88c36d..ef1135d633 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s @@ -118,5 +118,3 @@ glabel func_80B22F28 /* 003DC 80B230CC 8FB10038 */ lw $s1, 0x0038($sp) /* 003E0 80B230D0 03E00008 */ jr $ra /* 003E4 80B230D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s index 0307dcda1b..f92751bdf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s @@ -101,5 +101,3 @@ glabel func_80B230D8 /* 00558 80B23248 8FB10020 */ lw $s1, 0x0020($sp) /* 0055C 80B2324C 03E00008 */ jr $ra /* 00560 80B23250 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s index 582a944967..9324a92da9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s @@ -168,5 +168,3 @@ glabel func_80B23254 /* 007D8 80B234C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 007DC 80B234CC 03E00008 */ jr $ra /* 007E0 80B234D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s index ef1912d751..b8ce13bf72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B24434 + .float 0.9 + +glabel D_80B24438 + .float 0.2 + +glabel D_80B2443C + .float 0.2 + +glabel D_80B24440 + .float 0.9 + +.text glabel func_80B234D4 /* 007E4 80B234D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 007E8 80B234D8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -119,5 +133,3 @@ glabel func_80B234D4 /* 00994 80B23684 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00998 80B23688 03E00008 */ jr $ra /* 0099C 80B2368C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s index 93ab742401..c396c91f24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B24444 + .float 0.8 + +glabel D_80B24448 + .float 0.002 + +.text glabel func_80B23690 /* 009A0 80B23690 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 009A4 80B23694 AFBF0024 */ sw $ra, 0x0024($sp) @@ -106,5 +114,3 @@ glabel func_80B23690 /* 00B24 80B23814 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B28 80B23818 03E00008 */ jr $ra /* 00B2C 80B2381C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s index ccb61ad799..c681f04fc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s @@ -51,5 +51,3 @@ glabel func_80B23820 /* 00BE4 80B238D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00BE8 80B238D8 03E00008 */ jr $ra /* 00BEC 80B238DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s index 48c7153939..0994372f89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s @@ -53,5 +53,3 @@ glabel func_80B238E0 /* 00CAC 80B2399C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00CB0 80B239A0 03E00008 */ jr $ra /* 00CB4 80B239A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s index 6badc8e531..f98fdce854 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s @@ -59,5 +59,3 @@ glabel func_80B239A8 /* 00D8C 80B23A7C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D90 80B23A80 03E00008 */ jr $ra /* 00D94 80B23A84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s index 552b572cd5..7d680b5aa9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s @@ -83,5 +83,3 @@ glabel func_80B23A88 /* 00EC0 80B23BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00EC4 80B23BB4 03E00008 */ jr $ra /* 00EC8 80B23BB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s index 674cd40a58..b82c091792 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s @@ -79,5 +79,3 @@ glabel func_80B23D74 /* 011A8 80B23E98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 011AC 80B23E9C 03E00008 */ jr $ra /* 011B0 80B23EA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s index f16fc7d3b2..9ede7115d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s @@ -23,5 +23,3 @@ glabel func_80B23FDC .L80B24030: /* 01340 80B24030 03E00008 */ jr $ra /* 01344 80B24034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s index 1ae5c05a00..9f6bf30210 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B2444C + .float 0.1 + +glabel D_80B24450 + .float 0.1 + +glabel D_80B24454 + .float 0.1 + +.text glabel func_80B24038 /* 01348 80B24038 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0134C 80B2403C 00067080 */ sll $t6, $a2, 2 @@ -132,5 +143,3 @@ glabel func_80B24038 /* 01534 80B24224 8FB00020 */ lw $s0, 0x0020($sp) /* 01538 80B24228 03E00008 */ jr $ra /* 0153C 80B2422C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s index c41b5c0215..7bb66c8534 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B24458 + .float 0.1 + +.text glabel func_80B24230 /* 01540 80B24230 00067080 */ sll $t6, $a2, 2 /* 01544 80B24234 00AE7821 */ addu $t7, $a1, $t6 @@ -34,5 +39,3 @@ glabel func_80B24230 /* 015B8 80B242A8 848B0032 */ lh $t3, 0x0032($a0) ## 00000032 /* 015BC 80B242AC 03E00008 */ jr $ra /* 015C0 80B242B0 A48B00B6 */ sh $t3, 0x00B6($a0) ## 000000B6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s index eb369b5fe0..2e65a4beb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s @@ -34,4 +34,3 @@ glabel func_80B242B4 /* 01644 80B24334 03E00008 */ jr $ra /* 01648 80B24338 A4830032 */ sh $v1, 0x0032($a0) ## 00000032 /* 0164C 80B2433C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s index 064323c687..49f5db3167 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s @@ -10,5 +10,3 @@ glabel EnTrap_Destroy /* 003D4 80B24A34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003D8 80B24A38 03E00008 */ jr $ra /* 003DC 80B24A3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s index 0cddd5155b..4aaaf30f62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s @@ -16,4 +16,3 @@ glabel EnTrap_Draw /* 011A4 80B25804 00000000 */ nop /* 011A8 80B25808 00000000 */ nop /* 011AC 80B2580C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s index bedd0fce2a..a38ae2b034 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s @@ -261,5 +261,3 @@ glabel EnTrap_Init /* 003AC 80B24A0C D7B40020 */ ldc1 $f20, 0x0020($sp) /* 003B0 80B24A10 03E00008 */ jr $ra /* 003B4 80B24A14 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s index c4da48e799..38cc0c0d6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_80B25860 + .float 1.8 +glabel D_80B25864 + .float 1.8 +glabel D_80B25868 + .float 1.8 +glabel D_80B2586C + .float 65535.0 +glabel D_80B25870 + .float 65535.0 +glabel D_80B25874 + .float 65535.0 +glabel D_80B25878 + .float 65535.0 +glabel D_80B2587C + .float 65535.0 + +.text glabel EnTrap_Update /* 003E0 80B24A40 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 003E4 80B24A44 AFBF003C */ sw $ra, 0x003C($sp) @@ -962,5 +981,3 @@ glabel EnTrap_Update /* 01164 80B257C4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 /* 01168 80B257C8 03E00008 */ jr $ra /* 0116C 80B257CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s index fe7f9d108c..a386f32825 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s @@ -156,5 +156,3 @@ glabel EnTuboTrap_HandleImpact /* 00830 80B26120 8FB10018 */ lw $s1, 0x0018($sp) /* 00834 80B26124 03E00008 */ jr $ra /* 00838 80B26128 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s index 3366b21942..bcde693bd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s @@ -177,5 +177,3 @@ glabel EnTuboTrap_SpawnFragments /* 00390 80B25C80 8FBE0098 */ lw $s8, 0x0098($sp) /* 00394 80B25C84 03E00008 */ jr $ra /* 00398 80B25C88 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s index f50a18afcf..109aedfdb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s @@ -175,5 +175,3 @@ glabel EnTuboTrap_SpawnWaterFragments /* 0060C 80B25EFC 8FBE0098 */ lw $s8, 0x0098($sp) /* 00610 80B25F00 03E00008 */ jr $ra /* 00614 80B25F04 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s index 98ed8df67a..a9d9377749 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s @@ -20,5 +20,3 @@ glabel EnVali_Destroy /* 001BC 80B2686C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001C0 80B26870 03E00008 */ jr $ra /* 001C4 80B26874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s index 348a1094c2..a8233ee723 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B28A30 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B28A40 + .asciz "../z_en_vali.c" + .balign 4 + +.text glabel EnVali_Draw /* 02068 80B28718 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 0206C 80B2871C AFB1002C */ sw $s1, 0x002C($sp) @@ -91,4 +101,3 @@ glabel EnVali_Draw /* 021C4 80B28874 8FB20030 */ lw $s2, 0x0030($sp) /* 021C8 80B28878 03E00008 */ jr $ra /* 021CC 80B2887C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s index 794e6d2d94..eff3ef8154 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s @@ -100,5 +100,3 @@ glabel EnVali_Init /* 0016C 80B2681C 8FB10028 */ lw $s1, 0x0028($sp) /* 00170 80B26820 03E00008 */ jr $ra /* 00174 80B26824 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s index 78ac439152..18002698fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s @@ -99,5 +99,3 @@ glabel EnVali_Update /* 01560 80B27C10 8FB10018 */ lw $s1, 0x0018($sp) /* 01564 80B27C14 03E00008 */ jr $ra /* 01568 80B27C18 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s index a775435b69..5b242cd9b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s @@ -19,5 +19,3 @@ glabel func_80B26878 /* 0020C 80B268BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00210 80B268C0 03E00008 */ jr $ra /* 00214 80B268C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268C8.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268C8.s index 6b8e0274c6..14b3ca4939 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268C8.s @@ -12,5 +12,3 @@ glabel func_80B268C8 /* 00240 80B268F0 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 /* 00244 80B268F4 03E00008 */ jr $ra /* 00248 80B268F8 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s index eb15f187cf..ee6cfd6d43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s @@ -134,5 +134,3 @@ glabel func_80B268FC /* 0045C 80B26B0C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 00460 80B26B10 03E00008 */ jr $ra /* 00464 80B26B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B18.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B18.s index b17f2fe6b7..9b93aadb68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B18.s @@ -12,5 +12,3 @@ glabel func_80B26B18 /* 00490 80B26B40 A088040D */ sb $t0, 0x040D($a0) ## 0000040D /* 00494 80B26B44 03E00008 */ jr $ra /* 00498 80B26B48 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s index 29e04dc804..55fd9311e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s @@ -27,5 +27,3 @@ glabel func_80B26B4C /* 00500 80B26BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00504 80B26BB4 03E00008 */ jr $ra /* 00508 80B26BB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s index 9f02284bb0..61679a6834 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s @@ -14,5 +14,3 @@ glabel func_80B26BBC /* 0053C 80B26BEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00540 80B26BF0 03E00008 */ jr $ra /* 00544 80B26BF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BF8.s index b2fb42d8d7..5f58893113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BF8.s @@ -21,5 +21,3 @@ glabel func_80B26BF8 /* 00594 80B26C44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00598 80B26C48 03E00008 */ jr $ra /* 0059C 80B26C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s index 14868806df..c9310f6d4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s @@ -69,5 +69,3 @@ glabel func_80B26C50 /* 00698 80B26D48 8FB00030 */ lw $s0, 0x0030($sp) /* 0069C 80B26D4C 03E00008 */ jr $ra /* 006A0 80B26D50 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s index 35b5bd85db..795d5daae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s @@ -35,5 +35,3 @@ glabel func_80B26D54 /* 00724 80B26DD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00728 80B26DD8 03E00008 */ jr $ra /* 0072C 80B26DDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26DE0.s index c05abeb2be..4336fe6ee7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26DE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26DE0.s @@ -23,5 +23,3 @@ glabel func_80B26DE0 /* 00784 80B26E34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00788 80B26E38 03E00008 */ jr $ra /* 0078C 80B26E3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s index 9ca111cefa..e2b195e245 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s @@ -22,5 +22,3 @@ glabel func_80B26E40 /* 007E0 80B26E90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007E4 80B26E94 03E00008 */ jr $ra /* 007E8 80B26E98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s index 726bd22f2d..cdb4d4aca7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s @@ -135,5 +135,3 @@ glabel func_80B26E9C /* 009DC 80B2708C 8FBE0070 */ lw $s8, 0x0070($sp) /* 009E0 80B27090 03E00008 */ jr $ra /* 009E4 80B27094 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27098.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27098.s index 3394023abc..91b837545b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27098.s @@ -16,5 +16,3 @@ glabel func_80B27098 /* 00A1C 80B270CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A20 80B270D0 03E00008 */ jr $ra /* 00A24 80B270D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s index beb854d907..dd60e644da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s @@ -41,5 +41,3 @@ glabel func_80B270D8 /* 00AB0 80B27160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00AB4 80B27164 03E00008 */ jr $ra /* 00AB8 80B27168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s index 0a83452b21..4b4bd9e159 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80B28A50 + .float 3.14159274101 + +glabel D_80B28A54 + .word 0x3C4CCCCD +glabel D_80B28A58 + .float 0.4 + +glabel D_80B28A5C + .word 0x43360B61 + +.text glabel func_80B2716C /* 00ABC 80B2716C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00AC0 80B27170 AFB00018 */ sw $s0, 0x0018($sp) @@ -117,5 +130,3 @@ glabel func_80B2716C /* 00C5C 80B2730C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00C60 80B27310 03E00008 */ jr $ra /* 00C64 80B27314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27318.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27318.s index ad7d997930..19558cdbae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27318.s @@ -51,5 +51,3 @@ glabel func_80B27318 /* 00D14 80B273C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D18 80B273C8 03E00008 */ jr $ra /* 00D1C 80B273CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B273D0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B273D0.s index b0759063d0..227b40773f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B273D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B273D0.s @@ -26,5 +26,3 @@ glabel func_80B273D0 /* 00D70 80B27420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D74 80B27424 03E00008 */ jr $ra /* 00D78 80B27428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2742C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2742C.s index cb6fdb5fb4..3f34d5b089 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2742C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2742C.s @@ -15,5 +15,3 @@ glabel func_80B2742C /* 00DA8 80B27458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DAC 80B2745C 03E00008 */ jr $ra /* 00DB0 80B27460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27464.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27464.s index 20cfdf2ff4..3076e326e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27464.s @@ -16,5 +16,3 @@ glabel func_80B27464 /* 00DE4 80B27494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DE8 80B27498 03E00008 */ jr $ra /* 00DEC 80B2749C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s index ec26a13524..c20479d8a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B28A60 + .float 0.7 + +.text glabel func_80B274A0 /* 00DF0 80B274A0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00DF4 80B274A4 AFBF0064 */ sw $ra, 0x0064($sp) @@ -120,5 +125,3 @@ glabel func_80B274A0 /* 00F98 80B27648 8FB70060 */ lw $s7, 0x0060($sp) /* 00F9C 80B2764C 03E00008 */ jr $ra /* 00FA0 80B27650 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s index babc290183..e56489c752 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s @@ -53,5 +53,3 @@ glabel func_80B27654 /* 01054 80B27704 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01058 80B27708 03E00008 */ jr $ra /* 0105C 80B2770C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s index 15ae3d57c4..497e4be097 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B28A64 + .float 0.2 + +glabel D_80B28A68 + .float 1.3 + +.text glabel func_80B27710 /* 01060 80B27710 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01064 80B27714 AFBF003C */ sw $ra, 0x003C($sp) @@ -109,5 +117,3 @@ glabel func_80B27710 /* 011E4 80B27894 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 011E8 80B27898 03E00008 */ jr $ra /* 011EC 80B2789C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s index a168752873..103a7bf748 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B28A6C + .float 0.1 + +glabel D_80B28A70 + .float 0.01 + +.text glabel func_80B278A0 /* 011F0 80B278A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 011F4 80B278A4 AFBF001C */ sw $ra, 0x001C($sp) @@ -29,5 +37,3 @@ glabel func_80B278A0 /* 01250 80B27900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01254 80B27904 03E00008 */ jr $ra /* 01258 80B27908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2790C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2790C.s index 18b96942a2..c31586a544 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2790C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2790C.s @@ -122,5 +122,3 @@ glabel func_80B2790C /* 01404 80B27AB4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01408 80B27AB8 03E00008 */ jr $ra /* 0140C 80B27ABC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27C1C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27C1C.s index 33299e93fa..ca29eb9f78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27C1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27C1C.s @@ -1,3 +1,32 @@ +.late_rodata +glabel D_80B28A74 + .word 0x3EA0D97C +glabel D_80B28A78 + .float 0.2 + +glabel D_80B28A7C + .word 0x3EA0D97C +glabel D_80B28A80 + .word 0x3E75C28F +glabel D_80B28A84 + .word 0x3E051EB8 +glabel D_80B28A88 + .word 0x3D80ADFD +glabel D_80B28A8C + .word 0x3E75C28F +glabel D_80B28A90 + .word 0x3E051EB8 +glabel D_80B28A94 + .word 0x3EA0D97C +glabel D_80B28A98 + .float 0.08 + +glabel D_80B28A9C + .word 0x3DA0D97C +glabel D_80B28AA0 + .float 0.2 + +.text glabel func_80B27C1C /* 0156C 80B27C1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01570 80B27C20 AFBF001C */ sw $ra, 0x001C($sp) @@ -148,5 +177,3 @@ glabel func_80B27C1C /* 0177C 80B27E2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01780 80B27E30 03E00008 */ jr $ra /* 01784 80B27E34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27E38.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27E38.s index 8fb7a4b3df..c51feb1994 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27E38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27E38.s @@ -1,3 +1,33 @@ +.late_rodata +glabel D_80B28AA4 + .word 0x3EA0D97C +glabel D_80B28AA8 + .word 0x3E051EB8 +glabel D_80B28AAC + .word 0x3EA0D97C +glabel D_80B28AB0 + .word 0x3E3851EC +glabel D_80B28AB4 + .float 0.1 + +glabel D_80B28AB8 + .word 0x3D80ADFD +glabel D_80B28ABC + .word 0x3E3851EC +glabel D_80B28AC0 + .float 0.1 + +glabel D_80B28AC4 + .word 0x3EA0D97C +glabel D_80B28AC8 + .float 0.08 + +glabel D_80B28ACC + .word 0x3DA0D97C +glabel D_80B28AD0 + .word 0x3E051EB8 + +.text glabel func_80B27E38 /* 01788 80B27E38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0178C 80B27E3C AFBF001C */ sw $ra, 0x001C($sp) @@ -148,5 +178,3 @@ glabel func_80B27E38 /* 01998 80B28048 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0199C 80B2804C 03E00008 */ jr $ra /* 019A0 80B28050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s index 2d62004dfd..70b2292dd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B28AD4 + .float 0.05 + +glabel D_80B28AD8 + .float 0.05 + +glabel D_80B28ADC + .word 0x3EA0D97C +glabel D_80B28AE0 + .word 0x3EB33333 +glabel D_80B28AE4 + .word 0x3D80ADFD +glabel D_80B28AE8 + .word 0x3EB33333 + +.text glabel func_80B28054 /* 019A4 80B28054 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 019A8 80B28058 AFBF0014 */ sw $ra, 0x0014($sp) @@ -115,5 +132,3 @@ glabel func_80B28054 .L80B281E8: /* 01B38 80B281E8 03E00008 */ jr $ra /* 01B3C 80B281EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B281F0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B281F0.s index 27f631356a..a31a6efb24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B281F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B281F0.s @@ -40,5 +40,3 @@ glabel func_80B281F0 /* 01BC4 80B28274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BC8 80B28278 03E00008 */ jr $ra /* 01BCC 80B2827C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28280.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28280.s index 618278c0bc..53e4cd06bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28280.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28280.s @@ -52,5 +52,3 @@ glabel func_80B28280 /* 01C88 80B28338 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01C8C 80B2833C 03E00008 */ jr $ra /* 01C90 80B28340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s index 2cc52a8f27..03b84f1ea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s @@ -1,3 +1,40 @@ +.rdata +glabel D_80B289C0 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B289D0 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B289E0 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B289F0 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B28A00 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B28A10 + .asciz "../z_en_vali.c" + .balign 4 + +glabel D_80B28A20 + .asciz "../z_en_vali.c" + .balign 4 + +.late_rodata +glabel D_80B28AEC + .float 9.58738019108e-05 + +glabel D_80B28AF0 + .word 0x448B4000, 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80B28344 /* 01C94 80B28344 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 01C98 80B28348 3C0F80B3 */ lui $t7, %hi(D_80B28988) ## $t7 = 80B30000 @@ -246,5 +283,3 @@ glabel func_80B28344 /* 0205C 80B2870C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 02060 80B28710 03E00008 */ jr $ra /* 02064 80B28714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s index 815ef68800..b3bb768435 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s @@ -15,5 +15,3 @@ glabel EnVbBall_Destroy /* 001AC 80B2914C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001B0 80B29150 03E00008 */ jr $ra /* 001B4 80B29154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s index 07b4eaff65..8637d3dd1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B2A090 + .asciz "../z_en_vb_ball.c" + .balign 4 + +glabel D_80B2A0A4 + .asciz "../z_en_vb_ball.c" + .balign 4 + +glabel D_80B2A0B8 + .asciz "../z_en_vb_ball.c" + .balign 4 + +glabel D_80B2A0CC + .asciz "../z_en_vb_ball.c" + .balign 4 + +.text glabel EnVbBall_Draw /* 00DE0 80B29D80 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00DE4 80B29D84 AFBF001C */ sw $ra, 0x001C($sp) @@ -153,4 +171,3 @@ glabel EnVbBall_Draw /* 01034 80B29FD4 03E00008 */ jr $ra /* 01038 80B29FD8 00000000 */ nop /* 0103C 80B29FDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s index b159bba660..46433d5a11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B2A0E0 + .float -0.8 + +glabel D_80B2A0E4 + .float 10000.0 + +glabel D_80B2A0E8 + .float 3000.0 + +glabel D_80B2A0EC + .float 5000.0 + +glabel D_80B2A0F0 + .word 0xC51C4000 + +.text glabel EnVbBall_Init /* 00000 80B28FA0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 80B28FA4 AFBF001C */ sw $ra, 0x001C($sp) @@ -107,5 +124,3 @@ glabel EnVbBall_Init /* 00174 80B29114 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00178 80B29118 03E00008 */ jr $ra /* 0017C 80B2911C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s index 707912020c..6336d53266 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B2A0F8 + .word 0x44D48000 +glabel D_80B2A0FC + .word 0x43CCCCCD +glabel D_80B2A100 + .word 0x4622F983, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnVbBall_Update /* 00614 80B295B4 27BDFEF0 */ addiu $sp, $sp, 0xFEF0 ## $sp = FFFFFEF0 /* 00618 80B295B8 AFBF0064 */ sw $ra, 0x0064($sp) @@ -553,5 +562,3 @@ glabel EnVbBall_Update /* 00DD4 80B29D74 8FB50060 */ lw $s5, 0x0060($sp) /* 00DD8 80B29D78 03E00008 */ jr $ra /* 00DDC 80B29D7C 27BD0110 */ addiu $sp, $sp, 0x0110 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s index 3669d07225..a1a4c12c3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s @@ -58,5 +58,3 @@ glabel func_80B29158 /* 00284 80B29224 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00288 80B29228 03E00008 */ jr $ra /* 0028C 80B2922C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29230.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29230.s index 6f3bb4501a..704602a08a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29230.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29230.s @@ -41,5 +41,3 @@ glabel func_80B29230 /* 00324 80B292C4 24A5003C */ addiu $a1, $a1, 0x003C ## $a1 = 0000003C /* 00328 80B292C8 03E00008 */ jr $ra /* 0032C 80B292CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s index 03ca52ddc3..d10b42f529 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B2A0F4 + .float 0.3 + +.text glabel func_80B292D0 /* 00330 80B292D0 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 00334 80B292D4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -200,5 +205,3 @@ glabel func_80B292D0 /* 00608 80B295A8 8FBE0070 */ lw $s8, 0x0070($sp) /* 0060C 80B295AC 03E00008 */ jr $ra /* 00610 80B295B0 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Destroy.s index bcf9b78bda..cc8f13efb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Destroy.s @@ -9,5 +9,3 @@ glabel EnViewer_Destroy /* 000F4 80B2A2F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000F8 80B2A2F8 03E00008 */ jr $ra /* 000FC 80B2A2FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s index c55cc1dd5e..e2667f57cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B2D120 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D134 + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel EnViewer_Draw /* 02078 80B2C278 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0207C 80B2C27C AFB10018 */ sw $s1, 0x0018($sp) @@ -75,5 +85,3 @@ glabel EnViewer_Draw /* 0218C 80B2C38C 8FB10018 */ lw $s1, 0x0018($sp) /* 02190 80B2C390 03E00008 */ jr $ra /* 02194 80B2C394 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s index 0e95a9568f..3d635e0317 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s @@ -55,5 +55,3 @@ glabel EnViewer_Init /* 000CC 80B2A2CC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000D0 80B2A2D0 03E00008 */ jr $ra /* 000D4 80B2A2D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s index 272497d630..3fab45cc21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s @@ -20,5 +20,3 @@ glabel EnViewer_Update /* 010E8 80B2B2E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010EC 80B2B2EC 03E00008 */ jr $ra /* 010F0 80B2B2F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A200.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A200.s index af0fdb583a..aa17ba7604 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A200.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A200.s @@ -1,5 +1,3 @@ glabel func_80B2A200 /* 00000 80B2A200 03E00008 */ jr $ra /* 00004 80B2A204 AC8501E0 */ sw $a1, 0x01E0($a0) ## 000001E0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s index 7364f755ff..4736832c62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s @@ -88,5 +88,3 @@ glabel func_80B2A300 /* 0023C 80B2A43C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00240 80B2A440 03E00008 */ jr $ra /* 00244 80B2A444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s index 7184dffd12..16210bb4a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s @@ -35,5 +35,3 @@ glabel func_80B2A448 /* 002CC 80B2A4CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002D0 80B2A4D0 03E00008 */ jr $ra /* 002D4 80B2A4D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s index eeb4a8225b..5e936c9d3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s @@ -39,5 +39,3 @@ glabel func_80B2A4D8 /* 00364 80B2A564 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00368 80B2A568 03E00008 */ jr $ra /* 0036C 80B2A56C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A570.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A570.s index 830abf703a..f07e161905 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A570.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B2CFF0 + .asciz "bank_ID >= 0" + .balign 4 + +glabel D_80B2D000 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D014 + .asciz "this->anime_bank_ID >= 0" + .balign 4 + +glabel D_80B2D030 + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel func_80B2A570 /* 00370 80B2A570 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00374 80B2A574 AFBF001C */ sw $ra, 0x001C($sp) @@ -138,5 +156,3 @@ glabel func_80B2A570 /* 00550 80B2A750 8FB10018 */ lw $s1, 0x0018($sp) /* 00554 80B2A754 03E00008 */ jr $ra /* 00558 80B2A758 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s index 94af4aabb4..703c5a5d53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s @@ -1,3 +1,24 @@ +.late_rodata +glabel D_80B2D184 + .float 10000.0 + +glabel D_80B2D188 + .word 0x44994000 +glabel jtbl_80B2D18C +.word L80B2AC10 +.word L80B2AC38 +.word L80B2AC60 +.word L80B2AC8C +.word L80B2ACB4 +.word L80B2ACE0 +.word L80B2AD0C +.word L80B2AD44 +glabel D_80B2D1AC + .word 0x45228000 +glabel D_80B2D1B0 + .word 0x44FE6000 + +.text glabel func_80B2A75C /* 0055C 80B2A75C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00560 80B2A760 AFBF003C */ sw $ra, 0x003C($sp) @@ -793,5 +814,3 @@ glabel L80B2AD44 /* 01094 80B2B294 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01098 80B2B298 03E00008 */ jr $ra /* 0109C 80B2B29C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s index 9e9b1ada27..d0687a9a96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s @@ -30,5 +30,3 @@ glabel func_80B2B2F4 .L80B2B35C: /* 0115C 80B2B35C 03E00008 */ jr $ra /* 01160 80B2B360 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s index a023396907..88edd40779 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B2D044 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D058 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D06C + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel func_80B2B364 /* 01164 80B2B364 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01168 80B2B368 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B @@ -65,5 +79,3 @@ glabel func_80B2B364 /* 0125C 80B2B45C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01260 80B2B460 03E00008 */ jr $ra /* 01264 80B2B464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B468.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B468.s index d8be4884b8..e348e08786 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B468.s @@ -16,5 +16,3 @@ glabel func_80B2B468 /* 0129C 80B2B49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012A0 80B2B4A0 03E00008 */ jr $ra /* 012A4 80B2B4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s index 0e596d918b..e7351dbc2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B2D080 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D094 + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel func_80B2B4A8 /* 012A8 80B2B4A8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 012AC 80B2B4AC AFBF002C */ sw $ra, 0x002C($sp) @@ -290,5 +300,3 @@ glabel func_80B2B4A8 /* 016F0 80B2B8F0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 016F4 80B2B8F4 03E00008 */ jr $ra /* 016F8 80B2B8F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B8FC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B8FC.s index d0947af285..a03daadd63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B8FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B8FC.s @@ -10,5 +10,3 @@ glabel func_80B2B8FC /* 0171C 80B2B91C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01720 80B2B920 03E00008 */ jr $ra /* 01724 80B2B924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s index 0ada6af69b..f010cbc00d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s @@ -36,5 +36,3 @@ glabel func_80B2B928 .L80B2B99C: /* 0179C 80B2B99C 03E00008 */ jr $ra /* 017A0 80B2B9A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s index b1f098c8e2..8c14c5eb8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B2D0A8 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D0BC + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel func_80B2B9A4 /* 017A4 80B2B9A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 017A8 80B2B9A8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -37,5 +47,3 @@ glabel func_80B2B9A4 /* 0182C 80B2BA2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01830 80B2BA30 03E00008 */ jr $ra /* 01834 80B2BA34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s index 070367aba9..89d3304283 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B2D0D0 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D0E4 + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel func_80B2BA38 /* 01838 80B2BA38 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 0183C 80B2BA3C AFBF0024 */ sw $ra, 0x0024($sp) @@ -448,5 +458,3 @@ glabel func_80B2BA38 /* 01F00 80B2C100 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 /* 01F04 80B2C104 03E00008 */ jr $ra /* 01F08 80B2C108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s index aa95be8478..12e5b81cfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s @@ -9,5 +9,3 @@ glabel func_80B2C10C .L80B2C128: /* 01F28 80B2C128 03E00008 */ jr $ra /* 01F2C 80B2C12C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s index 54ba88c49a..62eeb4199d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B2D0F8 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D10C + .asciz "../z_en_viewer.c" + .balign 4 + +.text glabel func_80B2C130 /* 01F30 80B2C130 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01F34 80B2C134 AFBF0024 */ sw $ra, 0x0024($sp) @@ -81,5 +91,3 @@ glabel func_80B2C130 /* 0206C 80B2C26C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 02070 80B2C270 03E00008 */ jr $ra /* 02074 80B2C274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s index 5fedcd8f78..455fdbf278 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s @@ -256,5 +256,3 @@ glabel func_80B2C398 /* 0255C 80B2C75C 8FB10020 */ lw $s1, 0x0020($sp) /* 02560 80B2C760 03E00008 */ jr $ra /* 02564 80B2C764 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s index 25dcaed2a2..616bdb1d3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B2D1B4 + .float 0.001 + +glabel D_80B2D1B8 + .float 0.001 + +.text glabel func_80B2C768 /* 02568 80B2C768 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0256C 80B2C76C AFA60028 */ sw $a2, 0x0028($sp) @@ -84,5 +92,3 @@ glabel func_80B2C768 /* 026A0 80B2C8A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 026A4 80B2C8A4 03E00008 */ jr $ra /* 026A8 80B2C8A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s index aa03537982..5bc6c26e9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80B2D148 + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D15C + .asciz "../z_en_viewer.c" + .balign 4 + +glabel D_80B2D170 + .asciz "../z_en_viewer.c" + .balign 4 + +.late_rodata +glabel D_80B2D1BC + .float 0.1 + +glabel D_80B2D1C0 + .float 0.01 + +.text glabel func_80B2C8AC /* 026AC 80B2C8AC 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 026B0 80B2C8B0 AFB40068 */ sw $s4, 0x0068($sp) @@ -225,5 +246,3 @@ glabel func_80B2C8AC /* 02A10 80B2CC10 8FBE0078 */ lw $s8, 0x0078($sp) /* 02A14 80B2CC14 03E00008 */ jr $ra /* 02A18 80B2CC18 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s index d6529b0e49..87dc563d1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B2D1C4 + .word 0xC61C4000 +glabel D_80B2D1C8 + .float 3.14159274101 + +.text glabel func_80B2CC1C /* 02A1C 80B2CC1C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 02A20 80B2CC20 AFBF001C */ sw $ra, 0x001C($sp) @@ -170,4 +177,3 @@ glabel func_80B2CC1C /* 02CB4 80B2CEB4 03E00008 */ jr $ra /* 02CB8 80B2CEB8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02CBC 80B2CEBC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s index dbe81e7a44..b11c0f31fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s @@ -10,5 +10,3 @@ glabel EnVm_Destroy /* 00194 80B2D5F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00198 80B2D5F8 03E00008 */ jr $ra /* 0019C 80B2D5FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s index 37aff2a437..649215eb2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80B2EBBC + .asciz "../z_en_vm.c" + .balign 4 + +glabel D_80B2EBCC + .asciz "../z_en_vm.c" + .balign 4 + +glabel D_80B2EBDC + .asciz "../z_en_vm.c" + .balign 4 + +glabel D_80B2EBEC + .asciz "../z_en_vm.c" + .balign 4 + +glabel D_80B2EBFC + .asciz "../z_en_vm.c" + .balign 4 + +.late_rodata +glabel D_80B2EC30 + .float 0.8 + +glabel D_80B2EC34 + .word 0x46FFFE00 +glabel D_80B2EC38 + .float 0.1 + +glabel D_80B2EC3C + .float 0.0015 + +.text glabel EnVm_Draw /* 011B8 80B2E618 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 011BC 80B2E61C AFB20028 */ sw $s2, 0x0028($sp) @@ -251,4 +285,3 @@ glabel EnVm_Draw /* 01594 80B2E9F4 03E00008 */ jr $ra /* 01598 80B2E9F8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0159C 80B2E9FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s index 316b9c07f8..2399c0d291 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s @@ -99,5 +99,3 @@ glabel EnVm_Init /* 0016C 80B2D5CC 8FB10028 */ lw $s1, 0x0028($sp) /* 00170 80B2D5D0 03E00008 */ jr $ra /* 00174 80B2D5D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s index 8a0fe74b5e..6ec5656a73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B2EC24 + .word 0x45CB2000 + +.text glabel EnVm_Update /* 00CE8 80B2E148 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00CEC 80B2E14C AFBF002C */ sw $ra, 0x002C($sp) @@ -110,5 +115,3 @@ glabel EnVm_Update /* 00E6C 80B2E2CC 8FB00024 */ lw $s0, 0x0024($sp) /* 00E70 80B2E2D0 03E00008 */ jr $ra /* 00E74 80B2E2D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D460.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D460.s index fdaa6de7c5..bf2ca89fc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D460.s @@ -1,5 +1,3 @@ glabel func_80B2D460 /* 00000 80B2D460 03E00008 */ jr $ra /* 00004 80B2D464 AC850214 */ sw $a1, 0x0214($a0) ## 00000214 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s index f36bbcb34f..5ef3b1e209 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s @@ -36,5 +36,3 @@ glabel func_80B2D600 /* 00220 80B2D680 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00224 80B2D684 03E00008 */ jr $ra /* 00228 80B2D688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s index 316d8db410..181273d523 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s @@ -232,5 +232,3 @@ glabel func_80B2D68C /* 0056C 80B2D9CC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 00570 80B2D9D0 03E00008 */ jr $ra /* 00574 80B2D9D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s index c2ce6d2382..c8a6205369 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B2EC0C + .float 0.6 + +.text glabel func_80B2D9D8 /* 00578 80B2D9D8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0057C 80B2D9DC 44810000 */ mtc1 $at, $f0 ## $f0 = 3.00 @@ -41,5 +46,3 @@ glabel func_80B2D9D8 /* 00610 80B2DA70 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00614 80B2DA74 03E00008 */ jr $ra /* 00618 80B2DA78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s index bda77d5284..72cf9033a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B2EC10 + .float 0.1 + +glabel D_80B2EC14 + .float 0.1 + +.text glabel func_80B2DA7C /* 0061C 80B2DA7C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00620 80B2DA80 AFBF0024 */ sw $ra, 0x0024($sp) @@ -167,5 +175,3 @@ glabel func_80B2DA7C /* 0085C 80B2DCBC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00860 80B2DCC0 03E00008 */ jr $ra /* 00864 80B2DCC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s index 3b2b00a009..753d7d4c06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s @@ -44,5 +44,3 @@ glabel func_80B2DCC8 /* 00904 80B2DD64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00908 80B2DD68 03E00008 */ jr $ra /* 0090C 80B2DD6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s index 54c8b50220..7872e60bbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s @@ -76,5 +76,3 @@ glabel func_80B2DD70 /* 00A10 80B2DE70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A14 80B2DE74 03E00008 */ jr $ra /* 00A18 80B2DE78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s index cdf5e4b7b6..5f2fe57395 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B2EC18 + .word 0xC59C4000 +glabel D_80B2EC1C + .float 5000.0 + +glabel D_80B2EC20 + .word 0x477FFF00 + +.text glabel func_80B2DE7C /* 00A1C 80B2DE7C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00A20 80B2DE80 AFB00028 */ sw $s0, 0x0028($sp) @@ -69,5 +79,3 @@ glabel func_80B2DE7C /* 00B18 80B2DF78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B1C 80B2DF7C 03E00008 */ jr $ra /* 00B20 80B2DF80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DF84.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DF84.s index c9b7ac6a8e..74afe46abf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DF84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DF84.s @@ -49,5 +49,3 @@ glabel func_80B2DF84 /* 00BC8 80B2E028 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00BCC 80B2E02C 03E00008 */ jr $ra /* 00BD0 80B2E030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s index a53395eb15..89585fd9aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B2EBB0 + .asciz "hp down %d\n" + .balign 4 + +.text glabel func_80B2E034 /* 00BD4 80B2E034 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00BD8 80B2E038 AFB00030 */ sw $s0, 0x0030($sp) @@ -75,5 +81,3 @@ glabel func_80B2E034 /* 00CDC 80B2E13C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00CE0 80B2E140 03E00008 */ jr $ra /* 00CE4 80B2E144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E2D8.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E2D8.s index 43b8b4bc5f..207120c7e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E2D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E2D8.s @@ -27,5 +27,3 @@ glabel func_80B2E2D8 .L80B2E338: /* 00ED8 80B2E338 03E00008 */ jr $ra /* 00EDC 80B2E33C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E340.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E340.s index 12d740d616..4bf9299363 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E340.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E340.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B2EC28 + .float 10000.0 + +glabel D_80B2EC2C + .float 0.01 + +.text glabel func_80B2E340 /* 00EE0 80B2E340 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00EE4 80B2E344 3C0F80B3 */ lui $t7, %hi(D_80B2EAF8) ## $t7 = 80B30000 @@ -187,5 +195,3 @@ glabel func_80B2E340 /* 011AC 80B2E60C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 011B0 80B2E610 03E00008 */ jr $ra /* 011B4 80B2E614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Destroy.s index f196fbdfb6..e950e48c82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Destroy.s @@ -2,5 +2,3 @@ glabel EnWallTubo_Destroy /* 00060 80B2EE50 AFA40000 */ sw $a0, 0x0000($sp) /* 00064 80B2EE54 03E00008 */ jr $ra /* 00068 80B2EE58 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Init.s index 81a63ebff2..645f53b139 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B2F370 + .asciz "\n\n" + .balign 4 + +glabel D_80B2F374 + .asciz "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel EnWallTubo_Init /* 00000 80B2EDF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80B2EDF4 AFA40018 */ sw $a0, 0x0018($sp) @@ -25,5 +35,3 @@ glabel EnWallTubo_Init /* 00054 80B2EE44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00058 80B2EE48 03E00008 */ jr $ra /* 0005C 80B2EE4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s index 76141b4103..8d9778af15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s @@ -51,4 +51,3 @@ glabel EnWallTubo_Update /* 00524 80B2F314 00000000 */ nop /* 00528 80B2F318 00000000 */ nop /* 0052C 80B2F31C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE5C.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE5C.s index 0221325d97..baff0fb15c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE5C.s @@ -19,5 +19,3 @@ glabel func_80B2EE5C .L80B2EE94: /* 000A4 80B2EE94 03E00008 */ jr $ra /* 000A8 80B2EE98 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s index b4dd47324c..b5d546e0d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s @@ -143,5 +143,3 @@ glabel func_80B2EE9C /* 002BC 80B2F0AC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 002C0 80B2F0B0 03E00008 */ jr $ra /* 002C4 80B2F0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s index 9d4beb421e..64c3f36781 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B2F3A0 + .asciz "\x1B[32m☆☆☆☆ やった原！ ☆☆☆☆☆ \n\x1B[m" + .balign 4 + +glabel D_80B2F3CC + .asciz "\x1B[33m☆☆☆☆ やった原！ ☆☆☆☆☆ \n\x1B[m" + .balign 4 + +glabel D_80B2F3F8 + .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B2F424 + .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B2F450 + .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80B2F0B8 /* 002C8 80B2F0B8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 002CC 80B2F0BC 3C0F80B3 */ lui $t7, %hi(D_80B2F358) ## $t7 = 80B30000 @@ -116,5 +138,3 @@ glabel func_80B2F0B8 /* 00460 80B2F250 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00464 80B2F254 03E00008 */ jr $ra /* 00468 80B2F258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s index d117bd4ffd..b8ccffdcd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s @@ -2,5 +2,3 @@ glabel EnWeatherTag_Destroy /* 00008 80B31028 AFA40000 */ sw $a0, 0x0000($sp) /* 0000C 80B3102C 03E00008 */ jr $ra /* 00010 80B31030 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s index 74f2c5bad4..1457c87ac2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s @@ -1,3 +1,81 @@ +.rdata +glabel D_80B31E40 + .asciz "\n\n" + .balign 4 + +glabel D_80B31E44 + .asciz "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B31E78 + .asciz "\n\n" + .balign 4 + +glabel D_80B31E7C + .asciz "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B31EB8 + .asciz "\n\n" + .balign 4 + +glabel D_80B31EBC + .asciz "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B31F00 + .asciz "\n\n" + .balign 4 + +glabel D_80B31F04 + .asciz "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B31F4C + .asciz "\n\n" + .balign 4 + +glabel D_80B31F50 + .asciz "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B31F8C + .asciz "\n\n" + .balign 4 + +glabel D_80B31F90 + .asciz "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B31FD0 + .asciz "\n\n" + .balign 4 + +glabel D_80B31FD4 + .asciz "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B32008 + .asciz "\n\n" + .balign 4 + +glabel D_80B3200C + .asciz "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" + .balign 4 + +.late_rodata +glabel jtbl_80B32054 +.word L80B31080 +.word L80B310B0 +.word L80B310F8 +.word L80B31148 +.word L80B31198 +.word L80B311E8 +.word L80B3125C +.word L80B3128C +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnWeatherTag_Init /* 00014 80B31034 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00018 80B31038 AFBF001C */ sw $ra, 0x001C($sp) @@ -202,5 +280,3 @@ glabel L80B3128C /* 0029C 80B312BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002A0 80B312C0 03E00008 */ jr $ra /* 002A4 80B312C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s index 388bd0f8c4..aefd81bbda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s @@ -45,4 +45,3 @@ glabel EnWeatherTag_Update /* 00DF4 80B31E14 00000000 */ nop /* 00DF8 80B31E18 00000000 */ nop /* 00DFC 80B31E1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s index 6b46157410..031170119c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s @@ -1,5 +1,3 @@ glabel func_80B31020 /* 00000 80B31020 03E00008 */ jr $ra /* 00004 80B31024 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s index 95f6fc1c47..f418e7d661 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s @@ -122,5 +122,3 @@ glabel func_80B312C8 /* 00470 80B31490 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00474 80B31494 03E00008 */ jr $ra /* 00478 80B31498 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s index 68da671495..16f205d310 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s @@ -115,5 +115,3 @@ glabel func_80B3149C /* 0062C 80B3164C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00630 80B31650 03E00008 */ jr $ra /* 00634 80B31654 01001025 */ or $v0, $t0, $zero ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s index 3d2088f542..4db9be98ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s @@ -22,5 +22,3 @@ glabel func_80B31658 /* 00684 80B316A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00688 80B316A8 03E00008 */ jr $ra /* 0068C 80B316AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s index 46f405a832..1f214f884b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s @@ -20,5 +20,3 @@ glabel func_80B316B0 /* 006D4 80B316F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006D8 80B316F8 03E00008 */ jr $ra /* 006DC 80B316FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s index 0235c49a89..225e325c2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s @@ -22,5 +22,3 @@ glabel func_80B31700 /* 0072C 80B3174C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00730 80B31750 03E00008 */ jr $ra /* 00734 80B31754 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s index 7d4330f7fa..436257b067 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s @@ -20,5 +20,3 @@ glabel func_80B31758 /* 0077C 80B3179C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00780 80B317A0 03E00008 */ jr $ra /* 00784 80B317A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s index 32e953bb97..92a873baca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s @@ -22,5 +22,3 @@ glabel func_80B317A8 /* 007D4 80B317F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007D8 80B317F8 03E00008 */ jr $ra /* 007DC 80B317FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s index ac12101f2e..8865e51c5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s @@ -20,5 +20,3 @@ glabel func_80B31800 /* 00824 80B31844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00828 80B31848 03E00008 */ jr $ra /* 0082C 80B3184C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s index f4e8fe4d7a..d4c25b826c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s @@ -28,5 +28,3 @@ glabel func_80B31850 /* 00894 80B318B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00898 80B318B8 03E00008 */ jr $ra /* 0089C 80B318BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s index 065ac285fb..03eb496320 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s @@ -25,5 +25,3 @@ glabel func_80B318C0 /* 008F8 80B31918 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008FC 80B3191C 03E00008 */ jr $ra /* 00900 80B31920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s index f8f306ae50..5b96a8a7a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s @@ -31,5 +31,3 @@ glabel func_80B31924 /* 00974 80B31994 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00978 80B31998 03E00008 */ jr $ra /* 0097C 80B3199C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s index ab207d6029..1fbda9b730 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s @@ -28,5 +28,3 @@ glabel func_80B319A0 /* 009E4 80B31A04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009E8 80B31A08 03E00008 */ jr $ra /* 009EC 80B31A0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s index a3e8c60f3b..84e15873b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s @@ -36,5 +36,3 @@ glabel func_80B31A10 /* 00A74 80B31A94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A78 80B31A98 03E00008 */ jr $ra /* 00A7C 80B31A9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s index a8023263df..75314443f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s @@ -33,5 +33,3 @@ glabel func_80B31AA0 /* 00AF8 80B31B18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00AFC 80B31B1C 03E00008 */ jr $ra /* 00B00 80B31B20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s index a7d6d964eb..2b44246e04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s @@ -68,5 +68,3 @@ glabel func_80B31B24 /* 00BF4 80B31C14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BF8 80B31C18 03E00008 */ jr $ra /* 00BFC 80B31C1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s index 6b2c7ce4d3..3e5618f70c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s @@ -40,5 +40,3 @@ glabel func_80B31C20 /* 00C94 80B31CB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C98 80B31CB8 03E00008 */ jr $ra /* 00C9C 80B31CBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s index 8da5e0e57e..05b54fff31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s @@ -44,5 +44,3 @@ glabel func_80B31CC0 /* 00D44 80B31D64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D48 80B31D68 03E00008 */ jr $ra /* 00D4C 80B31D6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s index 29d0073d75..bf877406b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s @@ -10,5 +10,3 @@ glabel EnWeiyer_Destroy /* 000E8 80B32378 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000EC 80B3237C 03E00008 */ jr $ra /* 000F0 80B32380 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s index b810f26a97..7cf116b003 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B33AF0 + .asciz "../z_en_weiyer.c" + .balign 4 + +glabel D_80B33B04 + .asciz "../z_en_weiyer.c" + .balign 4 + +.text glabel EnWeiyer_Draw /* 01670 80B33900 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 01674 80B33904 AFB20030 */ sw $s2, 0x0030($sp) @@ -93,4 +103,3 @@ glabel EnWeiyer_Draw /* 017D4 80B33A64 8FB20030 */ lw $s2, 0x0030($sp) /* 017D8 80B33A68 03E00008 */ jr $ra /* 017DC 80B33A6C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s index 730f7116d8..67ae3ce763 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s @@ -55,5 +55,3 @@ glabel EnWeiyer_Init /* 000C0 80B32350 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000C4 80B32354 03E00008 */ jr $ra /* 000C8 80B32358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s index 540dadadde..50b9c9b4c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s @@ -103,5 +103,3 @@ glabel EnWeiyer_Update /* 01638 80B338C8 8FB10020 */ lw $s1, 0x0020($sp) /* 0163C 80B338CC 03E00008 */ jr $ra /* 01640 80B338D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s index 1e213a5349..badec88fd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B33B18 + .word 0xBEC90FDB + +.text glabel func_80B32384 /* 000F4 80B32384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 000F8 80B32388 AFBF0014 */ sw $ra, 0x0014($sp) @@ -45,5 +50,3 @@ glabel func_80B32384 /* 00198 80B32428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0019C 80B3242C 03E00008 */ jr $ra /* 001A0 80B32430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s index e7c99b911b..663e2bf58b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s @@ -23,5 +23,3 @@ glabel func_80B32434 /* 001F8 80B32488 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001FC 80B3248C 03E00008 */ jr $ra /* 00200 80B32490 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s index 1a208138c9..1a8cb9199e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s @@ -29,5 +29,3 @@ glabel func_80B32494 /* 0026C 80B324FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00270 80B32500 03E00008 */ jr $ra /* 00274 80B32504 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32508.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32508.s index f5d89a9c5f..63346bba7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32508.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32508.s @@ -11,5 +11,3 @@ glabel func_80B32508 /* 0029C 80B3252C AC990190 */ sw $t9, 0x0190($a0) ## 00000190 /* 002A0 80B32530 03E00008 */ jr $ra /* 002A4 80B32534 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32538.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32538.s index 209c4982b0..fd3ccb6f77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32538.s @@ -27,5 +27,3 @@ glabel func_80B32538 /* 00304 80B32594 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 /* 00308 80B32598 03E00008 */ jr $ra /* 0030C 80B3259C E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s index 8e1cc389f0..6a0047599b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s @@ -48,5 +48,3 @@ glabel func_80B325A0 /* 003C4 80B32654 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 003C8 80B32658 03E00008 */ jr $ra /* 003CC 80B3265C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s index 787a874134..db71f361dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s @@ -50,5 +50,3 @@ glabel func_80B32660 /* 00488 80B32718 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0048C 80B3271C 03E00008 */ jr $ra /* 00490 80B32720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s index 3d63a5ef95..d6ce864c3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s @@ -34,5 +34,3 @@ glabel func_80B32724 /* 00514 80B327A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00518 80B327A8 03E00008 */ jr $ra /* 0051C 80B327AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327B0.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327B0.s index d077eb57ad..4a0161e0db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327B0.s @@ -9,5 +9,3 @@ glabel func_80B327B0 /* 0053C 80B327CC E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 00540 80B327D0 03E00008 */ jr $ra /* 00544 80B327D4 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327D8.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327D8.s index c31ae2ac7e..932e47c1c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B327D8.s @@ -10,5 +10,3 @@ glabel func_80B327D8 /* 00568 80B327F8 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 /* 0056C 80B327FC 03E00008 */ jr $ra /* 00570 80B32800 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32804.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32804.s index dbd52154b4..cc58731383 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32804.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32804.s @@ -60,5 +60,3 @@ glabel func_80B32804 /* 0064C 80B328DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00650 80B328E0 03E00008 */ jr $ra /* 00654 80B328E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s index c1cb830424..58515fa733 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B33B1C + .word 0x3DA0D97C +glabel D_80B33B20 + .word 0x3EAAA64C +glabel D_80B33B24 + .float 0.1 + +.text glabel func_80B328E8 /* 00658 80B328E8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0065C 80B328EC AFB00018 */ sw $s0, 0x0018($sp) @@ -236,5 +245,3 @@ glabel func_80B328E8 /* 00990 80B32C20 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00994 80B32C24 03E00008 */ jr $ra /* 00998 80B32C28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s index d9710e88d8..309cf1a0b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s @@ -74,5 +74,3 @@ glabel func_80B32C2C /* 00A94 80B32D24 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A98 80B32D28 03E00008 */ jr $ra /* 00A9C 80B32D2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s index 45e0a764dd..78a22799b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s @@ -54,5 +54,3 @@ glabel func_80B32D30 /* 00B50 80B32DE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B54 80B32DE4 03E00008 */ jr $ra /* 00B58 80B32DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32DEC.s index d4645b3ed3..3e0eae0bcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32DEC.s @@ -17,5 +17,3 @@ glabel func_80B32DEC /* 00B98 80B32E28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B9C 80B32E2C 03E00008 */ jr $ra /* 00BA0 80B32E30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s index d42b80d495..b005c9851b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s @@ -135,5 +135,3 @@ glabel func_80B32E34 /* 00D7C 80B3300C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D80 80B33010 03E00008 */ jr $ra /* 00D84 80B33014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s index 463b3ae4eb..ca777847d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B33B28 + .word 0x3DA0D97C + +.text glabel func_80B33018 /* 00D88 80B33018 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00D8C 80B3301C AFB00020 */ sw $s0, 0x0020($sp) @@ -123,5 +128,3 @@ glabel func_80B33018 /* 00F30 80B331C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00F34 80B331C4 03E00008 */ jr $ra /* 00F38 80B331C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s index 7bc9dc658e..b1c20a397c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B33B2C + .word 0x3F20D97C + +.text glabel func_80B331CC /* 00F3C 80B331CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00F40 80B331D0 AFB00018 */ sw $s0, 0x0018($sp) @@ -65,5 +70,3 @@ glabel func_80B331CC /* 01018 80B332A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0101C 80B332AC 03E00008 */ jr $ra /* 01020 80B332B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s index 03dcd1d0d4..fc3671b89d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s @@ -37,5 +37,3 @@ glabel func_80B332B4 /* 0109C 80B3332C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010A0 80B33330 03E00008 */ jr $ra /* 010A4 80B33334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33338.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33338.s index 8dfedada0b..89be25efd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33338.s @@ -36,5 +36,3 @@ glabel func_80B33338 /* 0111C 80B333AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01120 80B333B0 03E00008 */ jr $ra /* 01124 80B333B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s index fddb6c73bd..60f78bbb24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s @@ -65,5 +65,3 @@ glabel func_80B333B8 /* 01200 80B33490 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01204 80B33494 03E00008 */ jr $ra /* 01208 80B33498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s index 91d12bf3b5..364e522192 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s @@ -142,5 +142,3 @@ glabel func_80B3349C /* 013F0 80B33680 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 013F4 80B33684 03E00008 */ jr $ra /* 013F8 80B33688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3368C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3368C.s index 6e211d4986..91c716b3ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3368C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3368C.s @@ -61,5 +61,3 @@ glabel func_80B3368C /* 014CC 80B3375C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 014D0 80B33760 03E00008 */ jr $ra /* 014D4 80B33764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B338D4.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B338D4.s index 5877a5f75d..bcbd2365cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B338D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B338D4.s @@ -11,5 +11,3 @@ glabel func_80B338D4 .L80B338F8: /* 01668 80B338F8 03E00008 */ jr $ra /* 0166C 80B338FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s index 432d2ff6ad..817a9f169d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B37B20 + .asciz "\n\n" + .balign 4 + +glabel D_80B37B24 + .asciz "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" + .balign 4 + +glabel D_80B37B50 + .asciz "\n\n" + .balign 4 + +.text glabel EnWf_Destroy /* 00238 80B33EE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0023C 80B33EEC AFB00018 */ sw $s0, 0x0018($sp) @@ -58,5 +72,3 @@ glabel EnWf_Destroy /* 002F4 80B33FA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002F8 80B33FA8 03E00008 */ jr $ra /* 002FC 80B33FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s index b09b99341c..49885633cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B37B54 + .asciz "../z_en_wf.c" + .balign 4 + +glabel D_80B37B64 + .asciz "../z_en_wf.c" + .balign 4 + +.text glabel EnWf_Draw /* 0398C 80B3763C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 03990 80B37640 AFBF002C */ sw $ra, 0x002C($sp) @@ -129,5 +139,3 @@ glabel EnWf_Draw /* 03B74 80B37824 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 03B78 80B37828 03E00008 */ jr $ra /* 03B7C 80B3782C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s index f0d9af85a6..4f938f30da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s @@ -152,5 +152,3 @@ glabel EnWf_Init /* 0022C 80B33EDC 8FB10028 */ lw $s1, 0x0028($sp) /* 00230 80B33EE0 03E00008 */ jr $ra /* 00234 80B33EE4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s index 15610f23be..42d929c927 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37BD0 + .float 0.2 + +.text glabel EnWf_Update /* 03558 80B37208 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0355C 80B3720C AFBF0024 */ sw $ra, 0x0024($sp) @@ -167,5 +172,3 @@ glabel EnWf_Update /* 03798 80B37448 8FB10020 */ lw $s1, 0x0020($sp) /* 0379C 80B3744C 03E00008 */ jr $ra /* 037A0 80B37450 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33CB0.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33CB0.s index 6e2a5b7ced..f1e198707e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33CB0.s @@ -1,5 +1,3 @@ glabel func_80B33CB0 /* 00000 80B33CB0 03E00008 */ jr $ra /* 00004 80B33CB4 AC8502DC */ sw $a1, 0x02DC($a0) ## 000002DC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33FB0.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33FB0.s index d1880e1a34..1e934289f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B33FB0.s @@ -265,5 +265,3 @@ glabel func_80B33FB0 /* 006C4 80B34374 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 006C8 80B34378 03E00008 */ jr $ra /* 006CC 80B3437C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s index efae3f704b..e0e951ea2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s @@ -42,5 +42,3 @@ glabel func_80B34380 /* 0076C 80B3441C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00770 80B34420 03E00008 */ jr $ra /* 00774 80B34424 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s index d2d393e4b6..1336ded383 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37B74 + .float 0.2 + +.text glabel func_80B34428 /* 00778 80B34428 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0077C 80B3442C AFBF0024 */ sw $ra, 0x0024($sp) @@ -83,5 +88,3 @@ glabel func_80B34428 /* 008A0 80B34550 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 008A4 80B34554 03E00008 */ jr $ra /* 008A8 80B34558 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s index c66cfda811..cdfcca93c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s @@ -34,5 +34,3 @@ glabel func_80B3455C /* 00928 80B345D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0092C 80B345DC 03E00008 */ jr $ra /* 00930 80B345E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s index 5025e9b8cd..14ac432b25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37B78 + .float 0.3 + +.text glabel func_80B345E4 /* 00934 80B345E4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00938 80B345E8 AFBF001C */ sw $ra, 0x001C($sp) @@ -149,5 +154,3 @@ glabel func_80B345E4 /* 00B40 80B347F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00B44 80B347F4 03E00008 */ jr $ra /* 00B48 80B347F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s index 7cebee9ec2..af5b3f89d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s @@ -33,5 +33,3 @@ glabel func_80B347FC /* 00BC0 80B34870 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00BC4 80B34874 03E00008 */ jr $ra /* 00BC8 80B34878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s index c2fa1ac305..903e05c285 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B37B7C + .word 0x3E333333 +glabel D_80B37B80 + .float 0.7 + +glabel D_80B37B84 + .float 0.03 + +.text glabel func_80B3487C /* 00BCC 80B3487C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00BD0 80B34880 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 @@ -319,5 +329,3 @@ glabel func_80B3487C /* 01040 80B34CF0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01044 80B34CF4 03E00008 */ jr $ra /* 01048 80B34CF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s index 1a0cc247f8..fad04ff6f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s @@ -18,5 +18,3 @@ glabel func_80B34CFC /* 0108C 80B34D3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01090 80B34D40 03E00008 */ jr $ra /* 01094 80B34D44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s index 9bbfe5c4d1..b7d29ca445 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37B88 + .float 0.8 + +.text glabel func_80B34D48 /* 01098 80B34D48 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0109C 80B34D4C AFB00018 */ sw $s0, 0x0018($sp) @@ -131,5 +136,3 @@ glabel func_80B34D48 /* 0126C 80B34F1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01270 80B34F20 03E00008 */ jr $ra /* 01274 80B34F24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s index 59c62a5780..e240f91709 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37B8C + .word 0x3E333333 + +.text glabel func_80B34F28 /* 01278 80B34F28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0127C 80B34F2C AFB00028 */ sw $s0, 0x0028($sp) @@ -67,5 +72,3 @@ glabel func_80B34F28 /* 01368 80B35018 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0136C 80B3501C 03E00008 */ jr $ra /* 01370 80B35020 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s index fc7fdf4e45..3b69b16aeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B37B90 + .word 0x3E333333 +glabel D_80B37B94 + .word 0x3E333333 +glabel D_80B37B98 + .float -0.85 + +.text glabel func_80B35024 /* 01374 80B35024 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01378 80B35028 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -363,5 +372,3 @@ glabel func_80B35024 /* 01884 80B35534 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01888 80B35538 03E00008 */ jr $ra /* 0188C 80B3553C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s index b9fa35ffda..1fa3841be9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s @@ -30,5 +30,3 @@ glabel func_80B35540 /* 01900 80B355B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01904 80B355B4 03E00008 */ jr $ra /* 01908 80B355B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s index 3d691e6b8e..15ca3cb832 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80B37B9C + .float 0.4 + +glabel D_80B37BA0 + .word 0x454CC000 +glabel D_80B37BA4 + .float 0.7 + +glabel D_80B37BA8 + .float 0.7 + +.text glabel func_80B355BC /* 0190C 80B355BC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01910 80B355C0 AFBF0034 */ sw $ra, 0x0034($sp) @@ -235,5 +248,3 @@ glabel func_80B355BC /* 01C50 80B35900 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01C54 80B35904 03E00008 */ jr $ra /* 01C58 80B35908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s index 3814a87416..426640de2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s @@ -40,5 +40,3 @@ glabel func_80B3590C /* 01CEC 80B3599C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01CF0 80B359A0 03E00008 */ jr $ra /* 01CF4 80B359A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s index aa5513b7df..2d797ed190 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B37BAC + .float 0.7 + +glabel D_80B37BB0 + .float 0.7 + +.text glabel func_80B359A8 /* 01CF8 80B359A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01CFC 80B359AC AFBF001C */ sw $ra, 0x001C($sp) @@ -137,5 +145,3 @@ glabel func_80B359A8 /* 01ED8 80B35B88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01EDC 80B35B8C 03E00008 */ jr $ra /* 01EE0 80B35B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s index 7b01fa7a6c..11cf40e437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s @@ -31,5 +31,3 @@ glabel func_80B35B94 /* 01F54 80B35C04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F58 80B35C08 03E00008 */ jr $ra /* 01F5C 80B35C0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s index 96bc929570..161ad108a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37BB4 + .float 0.2 + +.text glabel func_80B35C10 /* 01F60 80B35C10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01F64 80B35C14 AFB00018 */ sw $s0, 0x0018($sp) @@ -74,5 +79,3 @@ glabel func_80B35C10 /* 0205C 80B35D0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02060 80B35D10 03E00008 */ jr $ra /* 02064 80B35D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s index 6025f7c5d2..d64f34596d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s @@ -31,5 +31,3 @@ glabel func_80B35D18 /* 020D4 80B35D84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 020D8 80B35D88 03E00008 */ jr $ra /* 020DC 80B35D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D90.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D90.s index cfaaae9073..23a4ef70ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37BB8 + .float 0.05 + +.text glabel func_80B35D90 /* 020E0 80B35D90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 020E4 80B35D94 AFBF0014 */ sw $ra, 0x0014($sp) @@ -51,5 +56,3 @@ glabel func_80B35D90 /* 02190 80B35E40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02194 80B35E44 03E00008 */ jr $ra /* 02198 80B35E48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s index bf48637d90..5b5640a7a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s @@ -39,5 +39,3 @@ glabel func_80B35E4C /* 02228 80B35ED8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0222C 80B35EDC 03E00008 */ jr $ra /* 02230 80B35EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s index a9e464e88c..2b7a0f7f2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37BBC + .float 0.05 + +.text glabel func_80B35EE4 /* 02234 80B35EE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02238 80B35EE8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -141,5 +146,3 @@ glabel func_80B35EE4 /* 0242C 80B360DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02430 80B360E0 03E00008 */ jr $ra /* 02434 80B360E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s index f3f970d55b..f0cf87161b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s @@ -48,5 +48,3 @@ glabel func_80B360E8 /* 024E4 80B36194 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 024E8 80B36198 03E00008 */ jr $ra /* 024EC 80B3619C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s index b64f27d13b..4a71d2bb67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s @@ -62,5 +62,3 @@ glabel func_80B361A0 /* 025CC 80B3627C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 025D0 80B36280 03E00008 */ jr $ra /* 025D4 80B36284 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s index f40f62f1ee..6c92afcaf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s @@ -42,5 +42,3 @@ glabel func_80B36288 /* 0266C 80B3631C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02670 80B36320 03E00008 */ jr $ra /* 02674 80B36324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36328.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36328.s index 472ae985e5..885dd95f68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36328.s @@ -177,5 +177,3 @@ glabel func_80B36328 /* 028EC 80B3659C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 028F0 80B365A0 03E00008 */ jr $ra /* 028F4 80B365A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s index d80dbd8f9d..6d117bfb83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37BC0 + .word 0x3E333333 + +.text glabel func_80B365A8 /* 028F8 80B365A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 028FC 80B365AC AFB00028 */ sw $s0, 0x0028($sp) @@ -110,5 +115,3 @@ glabel func_80B365A8 /* 02A84 80B36734 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02A88 80B36738 03E00008 */ jr $ra /* 02A8C 80B3673C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s index 8f0091c3b0..8be2957035 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B37BC4 + .word 0x3E333333 +glabel D_80B37BC8 + .word 0x3E333333 + +.text glabel func_80B36740 /* 02A90 80B36740 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02A94 80B36744 AFBF0034 */ sw $ra, 0x0034($sp) @@ -377,5 +384,3 @@ glabel func_80B36740 /* 02FD0 80B36C80 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 02FD4 80B36C84 03E00008 */ jr $ra /* 02FD8 80B36C88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s index af9b78868b..5e906b6f84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s @@ -46,5 +46,3 @@ glabel func_80B36C8C /* 03080 80B36D30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03084 80B36D34 03E00008 */ jr $ra /* 03088 80B36D38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s index 118487adc6..f47c33eae2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s @@ -142,5 +142,3 @@ glabel func_80B36D3C /* 03284 80B36F34 8FB40070 */ lw $s4, 0x0070($sp) /* 03288 80B36F38 03E00008 */ jr $ra /* 0328C 80B36F3C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s index bc71afaa38..ca75c43ac1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B37BCC + .word 0x460B6000 + +.text glabel func_80B36F40 /* 03290 80B36F40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 03294 80B36F44 AFBF0024 */ sw $ra, 0x0024($sp) @@ -69,5 +74,3 @@ glabel func_80B36F40 /* 0337C 80B3702C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03380 80B37030 03E00008 */ jr $ra /* 03384 80B37034 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37038.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37038.s index 91a63fe76b..5f1d3bd504 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37038.s @@ -129,5 +129,3 @@ glabel func_80B37038 /* 0354C 80B371FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03550 80B37200 03E00008 */ jr $ra /* 03554 80B37204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37454.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37454.s index 6525eb77e8..29e01caf48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37454.s @@ -17,5 +17,3 @@ glabel func_80B37454 .L80B3748C: /* 037DC 80B3748C 03E00008 */ jr $ra /* 037E0 80B37490 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37494.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37494.s index c41c9a0fa3..d915c98057 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37494.s @@ -1,3 +1,41 @@ +.late_rodata +glabel jtbl_80B37BD4 +.late_rodata_alignment 4 +.word L80B375C0 +.word L80B375A0 +.word L80B37598 +.word L80B375C4 +.word L80B375A8 +.word L80B375B8 +.word L80B375C4 +.word L80B37590 +.word L80B375C4 +.word L80B37580 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B37578 +.word L80B375C4 +.word L80B37588 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375C4 +.word L80B375B0 + +.text glabel func_80B37494 /* 037E4 80B37494 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 037E8 80B37498 AFA60040 */ sw $a2, 0x0040($sp) @@ -121,5 +159,3 @@ glabel L80B375C4 /* 03980 80B37630 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03984 80B37634 03E00008 */ jr $ra /* 03988 80B37638 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37830.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37830.s index 9fda70c0fb..bbabf0fd1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B37830.s @@ -97,4 +97,3 @@ glabel func_80B37830 /* 03CD4 80B37984 03E00008 */ jr $ra /* 03CD8 80B37988 00000000 */ nop /* 03CDC 80B3798C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s index 6c9e48dae3..7f7a3de131 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s @@ -18,5 +18,3 @@ glabel EnWonderItem_Destroy /* 00034 80B38094 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00038 80B38098 03E00008 */ jr $ra /* 0003C 80B3809C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s index b47b7e0976..ae26d149b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80B38E10 + .asciz "\n\n" + .balign 4 + +glabel D_80B38E14 + .asciz "☆☆☆☆☆ 不思議不思議まか不思議 ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80B38E54 + .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.late_rodata +glabel jtbl_80B38ECC +.word L80B382D8 +.word L80B38338 +.word L80B38388 +.word L80B383A4 +.word L80B3855C +.word L80B38410 +.word L80B38470 +.word L80B384C0 +.word L80B384D0 +.word L80B38538 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnWonderItem_Init /* 0019C 80B381FC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 001A0 80B38200 AFB00018 */ sw $s0, 0x0018($sp) @@ -250,5 +278,3 @@ glabel L80B3855C /* 00504 80B38564 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00508 80B38568 03E00008 */ jr $ra /* 0050C 80B3856C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s index c6a660a3d6..8aea3904ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s @@ -94,4 +94,3 @@ glabel EnWonderItem_Update /* 00CD4 80B38D34 00000000 */ nop /* 00CD8 80B38D38 00000000 */ nop /* 00CDC 80B38D3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B380A0.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B380A0.s index 7f69ef5c15..2fa263a9ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B380A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B380A0.s @@ -101,5 +101,3 @@ glabel func_80B380A0 /* 00190 80B381F0 8FB60030 */ lw $s6, 0x0030($sp) /* 00194 80B381F4 03E00008 */ jr $ra /* 00198 80B381F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s index d20e61c55a..f2e685254e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s @@ -144,5 +144,3 @@ glabel func_80B38570 /* 0071C 80B3877C 8FBE0088 */ lw $s8, 0x0088($sp) /* 00720 80B38780 03E00008 */ jr $ra /* 00724 80B38784 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38788.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38788.s index dc6b8b5c36..60d22f5060 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38788.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38788.s @@ -26,5 +26,3 @@ glabel func_80B38788 /* 00784 80B387E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00788 80B387E8 03E00008 */ jr $ra /* 0078C 80B387EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B387F0.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B387F0.s index 4f278e3c6f..2745197048 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B387F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B387F0.s @@ -13,5 +13,3 @@ glabel func_80B387F0 /* 007B8 80B38818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007BC 80B3881C 03E00008 */ jr $ra /* 007C0 80B38820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38824.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38824.s index c402be0f56..ac446a60d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38824.s @@ -37,5 +37,3 @@ glabel func_80B38824 /* 00840 80B388A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00844 80B388A4 03E00008 */ jr $ra /* 00848 80B388A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s index 099b8fc01a..f6f18679a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s @@ -149,5 +149,3 @@ glabel func_80B388AC /* 00A6C 80B38ACC 8FBE0088 */ lw $s8, 0x0088($sp) /* 00A70 80B38AD0 03E00008 */ jr $ra /* 00A74 80B38AD4 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38AD8.s index aa191e50e8..e2ef605eb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38AD8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B38E94 + .asciz "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80B38AD8 /* 00A78 80B38AD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00A7C 80B38ADC AFBF0034 */ sw $ra, 0x0034($sp) @@ -46,5 +52,3 @@ glabel func_80B38AD8 /* 00B0C 80B38B6C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00B10 80B38B70 03E00008 */ jr $ra /* 00B14 80B38B74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38B78.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38B78.s index 634fc3fd1f..4c47312b2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38B78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38B78.s @@ -29,5 +29,3 @@ glabel func_80B38B78 /* 00B80 80B38BE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B84 80B38BE4 03E00008 */ jr $ra /* 00B88 80B38BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Destroy.s index e42ed53497..151707a14b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Destroy.s @@ -2,5 +2,3 @@ glabel EnWonderTalk_Destroy /* 00000 80B390F0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80B390F4 03E00008 */ jr $ra /* 00008 80B390F8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Init.s index 5c94073fc0..29e45d7c93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B39970 + .asciz "\n\n" + .balign 4 + +glabel D_80B39974 + .asciz "☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80B399A4 + .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel EnWonderTalk_Init /* 0000C 80B390FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00010 80B39100 AFB00018 */ sw $s0, 0x0018($sp) @@ -59,5 +73,3 @@ glabel EnWonderTalk_Init /* 000D0 80B391C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000D4 80B391C4 03E00008 */ jr $ra /* 000D8 80B391C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s index f57a411e96..b6fac83d61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s @@ -89,4 +89,3 @@ glabel EnWonderTalk_Update /* 00854 80B39944 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00858 80B39948 03E00008 */ jr $ra /* 0085C 80B3994C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s index f9b221a04f..a3fa1a60d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s @@ -1,3 +1,58 @@ +.rdata +glabel D_80B399E4 + .asciz " ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B39A10 + .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B39A44 + .asciz " ☆☆☆☆☆ こども ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B39A6C + .asciz " ☆☆☆☆☆ おとな ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B39A94 + .asciz "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80B39AD4 + .asciz " ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B39B08 + .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B39B3C + .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B39B70 + .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B39BA4 + .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B39BD8 + .asciz "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" + .balign 4 + +.late_rodata +glabel jtbl_80B39D78 +.word L80B39228 +.word L80B392C0 +.word L80B39314 +.word L80B39358 +.word L80B393B8 +.word 0x00000000 + +.text glabel func_80B391CC /* 000DC 80B391CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000E0 80B391D0 AFBF001C */ sw $ra, 0x001C($sp) @@ -179,5 +234,3 @@ glabel L80B393B8 /* 00340 80B39430 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00344 80B39434 03E00008 */ jr $ra /* 00348 80B39438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s index c5613eb883..eed30838c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80B39C18 + .asciz "\n\n" + .balign 4 + +glabel D_80B39C1C + .asciz "☆☆☆☆☆ セーブ情報 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B39C4C + .asciz "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B39C80 + .asciz "☆☆☆☆☆ 実質メッセージ種類 %x\n" + .balign 4 + +glabel D_80B39CB0 + .asciz "☆☆☆☆☆ 指定範囲 %d\n" + .balign 4 + +glabel D_80B39CE0 + .asciz "\n\n" + .balign 4 + +.text glabel func_80B3943C /* 0034C 80B3943C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00350 80B39440 AFBF001C */ sw $ra, 0x001C($sp) @@ -128,5 +154,3 @@ glabel func_80B3943C /* 004F4 80B395E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 004F8 80B395E8 03E00008 */ jr $ra /* 004FC 80B395EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s index ff4d9297b9..c76dd75c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B39CE4 + .asciz " ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B39D18 + .asciz " ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n" + .balign 4 + +glabel D_80B39D4C + .asciz " ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n" + .balign 4 + +.text glabel func_80B395F0 /* 00500 80B395F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00504 80B395F4 AFB0002C */ sw $s0, 0x002C($sp) @@ -152,5 +166,3 @@ glabel func_80B395F0 /* 00708 80B397F8 8FB10030 */ lw $s1, 0x0030($sp) /* 0070C 80B397FC 03E00008 */ jr $ra /* 00710 80B39800 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s index 228f716dc2..168215df9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s @@ -2,5 +2,3 @@ glabel EnWonderTalk2_Destroy /* 00000 80B39ED0 AFA40000 */ sw $a0, 0x0000($sp) /* 00004 80B39ED4 03E00008 */ jr $ra /* 00008 80B39ED8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s index f235feb428..1d2a2b9194 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s @@ -1,3 +1,45 @@ +.rdata +glabel D_80B3A8F0 + .asciz "\n\n" + .balign 4 + +glabel D_80B3A8F4 + .asciz "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80B3A928 + .asciz "\n\n" + .balign 4 + +glabel D_80B3A92C + .asciz "☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B3A95C + .asciz "☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B3A98C + .asciz "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B3A9BC + .asciz "\n\n" + .balign 4 + +glabel D_80B3A9C0 + .asciz "\n\n" + .balign 4 + +glabel D_80B3A9C4 + .asciz "\n\n" + .balign 4 + +glabel D_80B3A9C8 + .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel EnWonderTalk2_Init /* 0000C 80B39EDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00010 80B39EE0 AFB00018 */ sw $s0, 0x0018($sp) @@ -163,5 +205,3 @@ glabel EnWonderTalk2_Init /* 00230 80B3A100 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00234 80B3A104 03E00008 */ jr $ra /* 00238 80B3A108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s index 53483d0b02..07eec0dcac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s @@ -86,4 +86,3 @@ glabel EnWonderTalk2_Update /* 009E4 80B3A8B4 03E00008 */ jr $ra /* 009E8 80B3A8B8 00000000 */ nop /* 009EC 80B3A8BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s index c4a8b1fb8a..37e0c31d3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s @@ -21,5 +21,3 @@ glabel func_80B3A10C /* 00280 80B3A150 AC89014C */ sw $t1, 0x014C($a0) ## 0000014C /* 00284 80B3A154 03E00008 */ jr $ra /* 00288 80B3A158 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s index 590f73cee2..1e50936215 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s @@ -1,3 +1,49 @@ +.rdata +glabel D_80B3AA08 + .asciz "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" + .balign 4 + +glabel D_80B3AA3C + .asciz "\n\n" + .balign 4 + +glabel D_80B3AA40 + .asciz "☆☆☆☆☆ 透明メッセージ君せっと %x\n" + .balign 4 + +glabel D_80B3AA70 + .asciz "☆☆☆☆☆ セーブ情報 %x\n" + .balign 4 + +glabel D_80B3AAA0 + .asciz "☆☆☆☆☆ 指定メッセージ種類 %x\n" + .balign 4 + +glabel D_80B3AAD0 + .asciz "☆☆☆☆☆ 実質メッセージ種類 %x\n" + .balign 4 + +glabel D_80B3AB00 + .asciz "☆☆☆☆☆ 指定範囲 %d\n" + .balign 4 + +glabel D_80B3AB30 + .asciz "☆☆☆☆☆ 処理範囲 %f\n" + .balign 4 + +glabel D_80B3AB60 + .asciz " ☆☆ 通常 ☆☆ \n" + .balign 4 + +glabel D_80B3AB7C + .asciz " ☆☆ チェックのみ ☆☆ \n" + .balign 4 + +glabel D_80B3ABA0 + .asciz " ☆☆ ロックのみ ☆☆ \n" + .balign 4 + +.text glabel func_80B3A15C /* 0028C 80B3A15C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00290 80B3A160 AFBF0024 */ sw $ra, 0x0024($sp) @@ -183,5 +229,3 @@ glabel func_80B3A15C /* 004F8 80B3A3C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 004FC 80B3A3CC 03E00008 */ jr $ra /* 00500 80B3A3D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s index 1df66464f3..4ac5d3d3c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B3ABC0 + .asciz "☆☆☆☆☆ わー %d\n" + .balign 4 + +glabel D_80B3ABDC + .asciz "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" + .balign 4 + +.text glabel func_80B3A3D4 /* 00504 80B3A3D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00508 80B3A3D8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 @@ -82,5 +92,3 @@ glabel func_80B3A3D4 /* 0061C 80B3A4EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00620 80B3A4F0 03E00008 */ jr $ra /* 00624 80B3A4F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s index e001787b3c..2e25ac113c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s @@ -1,3 +1,61 @@ +.rdata +glabel D_80B3AC18 + .asciz "☆☆☆☆☆ きょり %f\n" + .balign 4 + +glabel D_80B3AC38 + .asciz "\n\n" + .balign 4 + +glabel D_80B3AC3C + .asciz "☆☆☆☆☆ 透明メッセージ君せっと %x\n" + .balign 4 + +glabel D_80B3AC6C + .asciz "☆☆☆☆☆ セーブ情報 %x\n" + .balign 4 + +glabel D_80B3AC9C + .asciz "☆☆☆☆☆ 指定メッセージ種類 %x\n" + .balign 4 + +glabel D_80B3ACCC + .asciz "☆☆☆☆☆ 実質メッセージ種類 %x\n" + .balign 4 + +glabel D_80B3ACFC + .asciz "☆☆☆☆☆ 指定範囲 %d\n" + .balign 4 + +glabel D_80B3AD2C + .asciz "☆☆☆☆☆ 処理範囲 %f\n" + .balign 4 + +glabel D_80B3AD5C + .asciz "☆☆☆☆☆ レンジは？ %d\n" + .balign 4 + +glabel D_80B3AD84 + .asciz "\n\n" + .balign 4 + +glabel D_80B3AD88 + .asciz "\n\n" + .balign 4 + +glabel D_80B3AD8C + .asciz " ☆☆ 強制 ☆☆ \n" + .balign 4 + +glabel D_80B3ADA8 + .asciz " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" + .balign 4 + +glabel D_80B3ADDC + .asciz "\n\n" + .balign 4 + +.text glabel func_80B3A4F8 /* 00628 80B3A4F8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0062C 80B3A4FC AFBF001C */ sw $ra, 0x001C($sp) @@ -182,5 +240,3 @@ glabel func_80B3A4F8 /* 00894 80B3A764 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00898 80B3A768 03E00008 */ jr $ra /* 0089C 80B3A76C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s index 4a466f504b..02f328c89f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s @@ -2,5 +2,3 @@ glabel func_80B3A770 /* 008A0 80B3A770 AFA40000 */ sw $a0, 0x0000($sp) /* 008A4 80B3A774 03E00008 */ jr $ra /* 008A8 80B3A778 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s index 16c65682f7..a16d12038f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s @@ -15,5 +15,3 @@ glabel EnWood02_Destroy /* 007A4 80B3B714 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007A8 80B3B718 03E00008 */ jr $ra /* 007AC 80B3B71C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s index 80a736ca7a..e445307b9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B3BFA0 + .asciz "../z_en_wood02.c" + .balign 4 + +glabel D_80B3BFB4 + .asciz "../z_en_wood02.c" + .balign 4 + +glabel D_80B3BFC8 + .asciz "../z_en_wood02.c" + .balign 4 + +glabel D_80B3BFDC + .asciz "../z_en_wood02.c" + .balign 4 + +.text glabel EnWood02_Draw /* 00CA4 80B3BC14 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00CA8 80B3BC18 AFBF001C */ sw $ra, 0x001C($sp) @@ -189,4 +207,3 @@ glabel EnWood02_Draw /* 00F64 80B3BED4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 00F68 80B3BED8 03E00008 */ jr $ra /* 00F6C 80B3BEDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s index 1a9322a13a..ae291b9689 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s @@ -1,3 +1,40 @@ +.late_rodata +glabel jtbl_80B3BFF0 +.word L80B3B3C4 +.word L80B3B40C +.word L80B3B438 +.word L80B3B3FC +.word L80B3B400 +.word L80B3B40C +.word L80B3B3FC +.word L80B3B400 +.word L80B3B3FC +.word L80B3B400 +.word L80B3B40C +.word L80B3B40C +.word L80B3B3C4 +.word L80B3B3FC +.word L80B3B400 +.word L80B3B3B4 +.word L80B3B3B8 +.word L80B3B40C +.word L80B3B3C4 +.word L80B3B3FC +.word L80B3B400 +.word L80B3B3B4 +.word L80B3B3B8 +.word L80B3B470 +.word L80B3B470 +glabel D_80B3C054 + .float 0.6 + +glabel D_80B3C058 + .float 0.02 + +glabel D_80B3C05C + .word 0xC0466666 + +.text glabel EnWood02_Init /* 0033C 80B3B2AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00340 80B3B2B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -306,5 +343,3 @@ glabel L80B3B470 /* 0076C 80B3B6DC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00770 80B3B6E0 03E00008 */ jr $ra /* 00774 80B3B6E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s index 4cc5efc91c..88698a1380 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B3C060 + .word 0x477FFF00, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EnWood02_Update /* 007B0 80B3B720 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 007B4 80B3B724 AFBF003C */ sw $ra, 0x003C($sp) @@ -357,5 +362,3 @@ glabel EnWood02_Update /* 00C98 80B3BC08 8FB20038 */ lw $s2, 0x0038($sp) /* 00C9C 80B3BC0C 03E00008 */ jr $ra /* 00CA0 80B3BC10 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3AF70.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3AF70.s index ea70bddcda..6f7b8e2cb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3AF70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3AF70.s @@ -75,5 +75,3 @@ glabel func_80B3AF70 /* 00118 80B3B088 8FB00018 */ lw $s0, 0x0018($sp) /* 0011C 80B3B08C 03E00008 */ jr $ra /* 00120 80B3B090 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s index 8e190bb234..d468ab74a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s @@ -142,5 +142,3 @@ glabel func_80B3B094 /* 00330 80B3B2A0 8FBE0058 */ lw $s8, 0x0058($sp) /* 00334 80B3B2A4 03E00008 */ jr $ra /* 00338 80B3B2A8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s index a9a2f47a64..8e948cc361 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s @@ -10,5 +10,3 @@ glabel EnXc_Destroy /* 000AC 80B3C28C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B0 80B3C290 03E00008 */ jr $ra /* 000B4 80B3C294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s index 775d2daabe..e52793e10f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B421C0 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnXc_Draw /* 05B04 80B41CE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 05B08 80B41CE8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,4 +32,3 @@ glabel EnXc_Draw /* 05B54 80B41D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05B58 80B41D38 03E00008 */ jr $ra /* 05B5C 80B41D3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s index 5282ad6efc..3298b0f272 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80B4215C + .asciz " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80B422B0 +.word L80B41A48 +.word L80B41994 +.word L80B419A8 +.word L80B419BC +.word L80B419D0 +.word L80B419E4 +.word L80B419F8 +.word L80B41A0C +.word L80B41A20 +.word L80B41A34 +.word 0x00000000, 0x00000000 + +.text glabel EnXc_Init /* 05720 80B41900 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 05724 80B41904 AFB10028 */ sw $s1, 0x0028($sp) @@ -111,5 +131,3 @@ glabel L80B41A48 /* 0589C 80B41A7C 8FB10028 */ lw $s1, 0x0028($sp) /* 058A0 80B41A80 03E00008 */ jr $ra /* 058A4 80B41A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s index e72f9a7abf..7570de15e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B42120 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnXc_Update /* 056C4 80B418A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 056C8 80B418A8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnXc_Update /* 05714 80B418F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05718 80B418F8 03E00008 */ jr $ra /* 0571C 80B418FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s index df8308604f..065d77b4d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s @@ -19,5 +19,3 @@ glabel func_80B3C1E0 /* 00040 80B3C220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00044 80B3C224 03E00008 */ jr $ra /* 00048 80B3C228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s index 7a25edd77f..12734f54bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s @@ -18,5 +18,3 @@ glabel func_80B3C22C /* 00084 80B3C264 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00088 80B3C268 03E00008 */ jr $ra /* 0008C 80B3C26C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s index 1d52ac0e4d..47af3faef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s @@ -32,5 +32,3 @@ glabel func_80B3C298 /* 00130 80B3C310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00134 80B3C314 03E00008 */ jr $ra /* 00138 80B3C318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s index 4d1ceb97f4..e578438d8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s @@ -38,5 +38,3 @@ glabel func_80B3C31C /* 001B8 80B3C398 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001BC 80B3C39C 03E00008 */ jr $ra /* 001C0 80B3C3A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s index 6ac11da33e..37865b15e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s @@ -51,5 +51,3 @@ glabel func_80B3C3A4 /* 0027C 80B3C45C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00280 80B3C460 03E00008 */ jr $ra /* 00284 80B3C464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s index 714807f11f..b379cce3b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s @@ -17,5 +17,3 @@ glabel func_80B3C468 /* 002C4 80B3C4A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002C8 80B3C4A8 03E00008 */ jr $ra /* 002CC 80B3C4AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s index a3423143bd..075cb9fef8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s @@ -8,5 +8,3 @@ glabel func_80B3C4B0 /* 002E4 80B3C4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002E8 80B3C4C8 03E00008 */ jr $ra /* 002EC 80B3C4CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s index 3a28728214..0702e8eca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s @@ -8,5 +8,3 @@ glabel func_80B3C4D0 .L80B3C4E8: /* 00308 80B3C4E8 03E00008 */ jr $ra /* 0030C 80B3C4EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s index cb62d47e84..4d74fe8f56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s @@ -20,5 +20,3 @@ glabel func_80B3C4F0 .L80B3C534: /* 00354 80B3C534 03E00008 */ jr $ra /* 00358 80B3C538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s index be4d1d62e3..3f98fd5941 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s @@ -20,5 +20,3 @@ glabel func_80B3C53C .L80B3C580: /* 003A0 80B3C580 03E00008 */ jr $ra /* 003A4 80B3C584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s index fd064cb224..235012d4d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s @@ -38,5 +38,3 @@ glabel func_80B3C588 /* 00434 80B3C614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00438 80B3C618 03E00008 */ jr $ra /* 0043C 80B3C61C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s index e98290e261..aab656ba75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s @@ -56,5 +56,3 @@ glabel func_80B3C620 /* 00514 80B3C6F4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00518 80B3C6F8 03E00008 */ jr $ra /* 0051C 80B3C6FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s index ab918b42db..3076c8e07c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s @@ -50,5 +50,3 @@ glabel func_80B3C700 /* 005D0 80B3C7B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 005D4 80B3C7B4 03E00008 */ jr $ra /* 005D8 80B3C7B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s index 238239924a..88233263d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s @@ -6,5 +6,3 @@ glabel func_80B3C7BC .L80B3C7CC: /* 005EC 80B3C7CC 03E00008 */ jr $ra /* 005F0 80B3C7D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s index a22a448752..bed068e09d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s @@ -12,5 +12,3 @@ glabel func_80B3C7D4 .L80B3C7F8: /* 00618 80B3C7F8 03E00008 */ jr $ra /* 0061C 80B3C7FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s index 0fa26b7db6..60a5d13864 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s @@ -8,5 +8,3 @@ glabel func_80B3C800 .L80B3C818: /* 00638 80B3C818 03E00008 */ jr $ra /* 0063C 80B3C81C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s index 88fa1b69dd..17f63a4822 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s @@ -27,5 +27,3 @@ glabel func_80B3C820 /* 0069C 80B3C87C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 006A0 80B3C880 03E00008 */ jr $ra /* 006A4 80B3C884 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s index 30832992bf..fa5b9c89c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s @@ -18,5 +18,3 @@ glabel func_80B3C888 /* 006E0 80B3C8C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E4 80B3C8C4 03E00008 */ jr $ra /* 006E8 80B3C8C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s index bc2092b8f1..391fc427ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s @@ -22,5 +22,3 @@ glabel func_80B3C8CC /* 00738 80B3C918 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0073C 80B3C91C 03E00008 */ jr $ra /* 00740 80B3C920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s index 7d719b979e..8bdea75f7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s @@ -15,5 +15,3 @@ glabel func_80B3C924 /* 00778 80B3C958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0077C 80B3C95C 03E00008 */ jr $ra /* 00780 80B3C960 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s index 75e738f2cd..282c496b0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s @@ -29,5 +29,3 @@ glabel func_80B3C964 /* 007F0 80B3C9D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007F4 80B3C9D4 03E00008 */ jr $ra /* 007F8 80B3C9D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s index 7a75abfad2..021eb58ad7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s @@ -3,5 +3,3 @@ glabel func_80B3C9DC /* 00800 80B3C9E0 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 /* 00804 80B3C9E4 03E00008 */ jr $ra /* 00808 80B3C9E8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s index 01ff145d07..d7527c21da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s @@ -18,5 +18,3 @@ glabel func_80B3C9EC /* 0084C 80B3CA2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00850 80B3CA30 03E00008 */ jr $ra /* 00854 80B3CA34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s index cb6717aca4..3961928b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s @@ -21,5 +21,3 @@ glabel func_80B3CA38 /* 00898 80B3CA78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0089C 80B3CA7C 03E00008 */ jr $ra /* 008A0 80B3CA80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s index 6207e174b2..e224892ade 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B421F8 + .float -2225.0 + +.text glabel func_80B3CA84 /* 008A4 80B3CA84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 008A8 80B3CA88 AFBF0014 */ sw $ra, 0x0014($sp) @@ -54,5 +59,3 @@ glabel func_80B3CA84 /* 0096C 80B3CB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00970 80B3CB50 03E00008 */ jr $ra /* 00974 80B3CB54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s index 9edd2943b0..e524368621 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s @@ -21,5 +21,3 @@ glabel func_80B3CB58 /* 009B8 80B3CB98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009BC 80B3CB9C 03E00008 */ jr $ra /* 009C0 80B3CBA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s index baacc9a262..8ca393e97a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B421FC + .float 447.0 +glabel D_80B42200 + .float 647.0 + +.text glabel func_80B3CBA4 /* 009C4 80B3CBA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 009C8 80B3CBA8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -88,5 +95,3 @@ glabel func_80B3CBA4 /* 00B14 80B3CCF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B18 80B3CCF8 03E00008 */ jr $ra /* 00B1C 80B3CCFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s index ac7009ad7d..4811cd6d63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s @@ -1,3 +1,12 @@ +.rdata +glabel D_80B41F50 + .asciz "水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n" + .balign 4 +glabel D_80B41F80 + .asciz "水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B3CD00 /* 00B20 80B3CD00 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00B24 80B3CD04 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 @@ -42,5 +51,3 @@ glabel func_80B3CD00 /* 00BAC 80B3CD8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00BB0 80B3CD90 03E00008 */ jr $ra /* 00BB4 80B3CD94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s index 515183f826..f0da2fcbeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s @@ -1,3 +1,12 @@ +.rdata +glabel D_80B41FB0 + .asciz "ブーツを取った!!!!!!!!!!!!!!!!!!\n" + .balign 4 +glabel D_80B41FD4 + .asciz "はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B3CD98 /* 00BB8 80B3CD98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00BBC 80B3CD9C AFBF0014 */ sw $ra, 0x0014($sp) @@ -60,5 +69,3 @@ glabel func_80B3CD98 /* 00C8C 80B3CE6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C90 80B3CE70 03E00008 */ jr $ra /* 00C94 80B3CE74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s index 3c957f9b91..266719217b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s @@ -2,5 +2,3 @@ glabel func_80B3CE78 /* 00C98 80B3CE78 AFA40000 */ sw $a0, 0x0000($sp) /* 00C9C 80B3CE7C 03E00008 */ jr $ra /* 00CA0 80B3CE80 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s index ac3b237985..b2df86c73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s @@ -34,5 +34,3 @@ glabel func_80B3CE84 /* 00D18 80B3CEF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00D1C 80B3CEFC 03E00008 */ jr $ra /* 00D20 80B3CF00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s index d20d19c567..2e7bf5b0ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s @@ -37,5 +37,3 @@ glabel func_80B3CF04 /* 00DA4 80B3CF84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00DA8 80B3CF88 03E00008 */ jr $ra /* 00DAC 80B3CF8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s index e530026623..e18ebf7ac2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s @@ -35,5 +35,3 @@ glabel func_80B3CF90 /* 00E28 80B3D008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E2C 80B3D00C 03E00008 */ jr $ra /* 00E30 80B3D010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s index 61f36736d4..8194098b12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s @@ -67,5 +67,3 @@ glabel func_80B3D014 /* 00F2C 80B3D10C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00F30 80B3D110 03E00008 */ jr $ra /* 00F34 80B3D114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s index fcf6d19a60..033942bafd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s @@ -17,5 +17,3 @@ glabel func_80B3D118 /* 00F6C 80B3D14C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F70 80B3D150 03E00008 */ jr $ra /* 00F74 80B3D154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s index 58f7689ed5..9c08a5d99e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s @@ -1,3 +1,18 @@ +.rdata +glabel D_80B42000 + .asciz "MAX speed = %f\n" + .balign 4 + +.late_rodata +glabel D_80B42204 + .word 0x40E1E2B0 +glabel D_80B42208 + .float 0.4 + +glabel D_80B4220C + .float 0.6 + +.text glabel func_80B3D158 /* 00F78 80B3D158 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00F7C 80B3D15C 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 @@ -85,5 +100,3 @@ glabel func_80B3D158 /* 010AC 80B3D28C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 010B0 80B3D290 03E00008 */ jr $ra /* 010B4 80B3D294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s index 078686beae..f11bd6bcb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s @@ -41,5 +41,3 @@ glabel func_80B3D298 /* 0114C 80B3D32C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01150 80B3D330 03E00008 */ jr $ra /* 01154 80B3D334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s index 40b16a84ce..5b90f7fd1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s @@ -30,5 +30,3 @@ glabel func_80B3D338 /* 011C4 80B3D3A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011C8 80B3D3A8 03E00008 */ jr $ra /* 011CC 80B3D3AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s index 9b89678fab..f84bde8d5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s @@ -18,5 +18,3 @@ glabel func_80B3D3B0 /* 01204 80B3D3E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01208 80B3D3E8 03E00008 */ jr $ra /* 0120C 80B3D3EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s index 5a45b2cf0d..0380b76a32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s @@ -42,5 +42,3 @@ glabel func_80B3D3F0 /* 012A0 80B3D480 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 012A4 80B3D484 03E00008 */ jr $ra /* 012A8 80B3D488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s index 9dcc48f655..0ffb5e2e45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s @@ -20,5 +20,3 @@ glabel func_80B3D48C /* 012EC 80B3D4CC 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 /* 012F0 80B3D4D0 03E00008 */ jr $ra /* 012F4 80B3D4D4 A48E00B6 */ sh $t6, 0x00B6($a0) ## 000000B6 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s index 551a537ac2..a971366d63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s @@ -41,5 +41,3 @@ glabel func_80B3D4D8 /* 01380 80B3D560 00C01025 */ or $v0, $a2, $zero ## $v0 = 06000B6C /* 01384 80B3D564 03E00008 */ jr $ra /* 01388 80B3D568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s index 13a6b9267e..c47ed0663b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B42210 + .float 0.01 + +glabel D_80B42214 + .float 1.2 + +glabel D_80B42218 + .float 0.01 + +glabel D_80B4221C + .float 1.2 + +.text glabel func_80B3D56C /* 0138C 80B3D56C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01390 80B3D570 AFBF0014 */ sw $ra, 0x0014($sp) @@ -57,5 +71,3 @@ glabel func_80B3D56C /* 01458 80B3D638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0145C 80B3D63C 03E00008 */ jr $ra /* 01460 80B3D640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s index 4d75e04509..cf95993896 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s @@ -8,5 +8,3 @@ glabel func_80B3D644 /* 01478 80B3D658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0147C 80B3D65C 03E00008 */ jr $ra /* 01480 80B3D660 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s index a7a85a2299..2eefff7af4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B42220 + .float 0.01 + +glabel D_80B42224 + .float 1.2 + +.text glabel func_80B3D664 /* 01484 80B3D664 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01488 80B3D668 AFBF0014 */ sw $ra, 0x0014($sp) @@ -37,5 +45,3 @@ glabel func_80B3D664 /* 01504 80B3D6E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01508 80B3D6E8 03E00008 */ jr $ra /* 0150C 80B3D6EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s index 641d35b85d..1dde2054e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s @@ -7,5 +7,3 @@ glabel func_80B3D6F0 /* 01524 80B3D704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01528 80B3D708 03E00008 */ jr $ra /* 0152C 80B3D70C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s index ac364726ba..2c427b44c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s @@ -8,5 +8,3 @@ glabel func_80B3D710 /* 01544 80B3D724 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01548 80B3D728 03E00008 */ jr $ra /* 0154C 80B3D72C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s index fd18fc9619..6eda42ddab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s @@ -7,5 +7,3 @@ glabel func_80B3D730 /* 01564 80B3D744 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01568 80B3D748 03E00008 */ jr $ra /* 0156C 80B3D74C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s index c7c0e0334c..69147ed77f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s @@ -17,5 +17,3 @@ glabel func_80B3D750 /* 015A8 80B3D788 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015AC 80B3D78C 03E00008 */ jr $ra /* 015B0 80B3D790 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s index 02911e8694..b65081fd10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s @@ -71,5 +71,3 @@ glabel func_80B3D794 /* 016B8 80B3D898 8FB10028 */ lw $s1, 0x0028($sp) /* 016BC 80B3D89C 03E00008 */ jr $ra /* 016C0 80B3D8A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s index b8d8820e67..b9052468bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B42228 + .float 0.01 + +.text glabel func_80B3D8A4 /* 016C4 80B3D8A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 016C8 80B3D8A8 AFB00028 */ sw $s0, 0x0028($sp) @@ -62,5 +67,3 @@ glabel func_80B3D8A4 /* 017A4 80B3D984 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 017A8 80B3D988 03E00008 */ jr $ra /* 017AC 80B3D98C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s index 501cd32dd4..c4f9d0bfcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B4222C + .float 0.01 + +glabel D_80B42230 + .float 1.2 + +.text glabel func_80B3D990 /* 017B0 80B3D990 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 017B4 80B3D994 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 @@ -28,5 +36,3 @@ glabel func_80B3D990 .L80B3D9F8: /* 01818 80B3D9F8 03E00008 */ jr $ra /* 0181C 80B3D9FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s index 6243f3d372..1cf2493643 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s @@ -44,5 +44,3 @@ glabel func_80B3DA00 /* 018BC 80B3DA9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 018C0 80B3DAA0 03E00008 */ jr $ra /* 018C4 80B3DAA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s index 464e465010..2d432f9e0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s @@ -18,5 +18,3 @@ glabel func_80B3DAA8 .L80B3DAE8: /* 01908 80B3DAE8 03E00008 */ jr $ra /* 0190C 80B3DAEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s index 485969e700..192fff30ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s @@ -51,5 +51,3 @@ glabel func_80B3DAF0 /* 019C0 80B3DBA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 019C4 80B3DBA4 03E00008 */ jr $ra /* 019C8 80B3DBA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s index ac6d10c1b9..706c5342d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s @@ -32,5 +32,3 @@ glabel func_80B3DBAC /* 01A38 80B3DC18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01A3C 80B3DC1C 03E00008 */ jr $ra /* 01A40 80B3DC20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s index 78e949e025..b8584113db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s @@ -35,5 +35,3 @@ glabel func_80B3DC24 /* 01ABC 80B3DC9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01AC0 80B3DCA0 03E00008 */ jr $ra /* 01AC4 80B3DCA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s index 3fb59a2f9b..d4eb7cd33a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s @@ -39,5 +39,3 @@ glabel func_80B3DCA8 /* 01B50 80B3DD30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01B54 80B3DD34 03E00008 */ jr $ra /* 01B58 80B3DD38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s index 8ff09b8544..da2bc78834 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s @@ -53,5 +53,3 @@ glabel func_80B3DD3C /* 01C14 80B3DDF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01C18 80B3DDF8 03E00008 */ jr $ra /* 01C1C 80B3DDFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s index c208aaece9..54ad5a800f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s @@ -32,5 +32,3 @@ glabel func_80B3DE00 /* 01C8C 80B3DE6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C90 80B3DE70 03E00008 */ jr $ra /* 01C94 80B3DE74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s index aa145d0e0c..c8f919b7d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s @@ -33,5 +33,3 @@ glabel func_80B3DE78 /* 01D08 80B3DEE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D0C 80B3DEEC 03E00008 */ jr $ra /* 01D10 80B3DEF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s index f081abf042..84197b1d6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s @@ -46,5 +46,3 @@ glabel func_80B3DEF4 /* 01DB8 80B3DF98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01DBC 80B3DF9C 03E00008 */ jr $ra /* 01DC0 80B3DFA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s index 78404ba4ce..46bd09512c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B42234 + .float 0.01 + +glabel D_80B42238 + .float 1.2 + +.text glabel func_80B3DFA4 /* 01DC4 80B3DFA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01DC8 80B3DFA8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 @@ -28,5 +36,3 @@ glabel func_80B3DFA4 .L80B3E00C: /* 01E2C 80B3E00C 03E00008 */ jr $ra /* 01E30 80B3E010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s index 9b33682ff0..f199606350 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s @@ -44,5 +44,3 @@ glabel func_80B3E014 /* 01ED0 80B3E0B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01ED4 80B3E0B4 03E00008 */ jr $ra /* 01ED8 80B3E0B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s index 9507a0076a..734e1ecdd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s @@ -44,5 +44,3 @@ glabel func_80B3E0BC /* 01F78 80B3E158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01F7C 80B3E15C 03E00008 */ jr $ra /* 01F80 80B3E160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s index d5edbaaef9..c3713ad5aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s @@ -21,5 +21,3 @@ glabel func_80B3E164 /* 01FCC 80B3E1AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FD0 80B3E1B0 03E00008 */ jr $ra /* 01FD4 80B3E1B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s index 945bcc9c7a..d58fa0f57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s @@ -30,5 +30,3 @@ glabel func_80B3E1B8 /* 02038 80B3E218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0203C 80B3E21C 03E00008 */ jr $ra /* 02040 80B3E220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s index 566d06a9e5..aa29bcfcf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s @@ -13,5 +13,3 @@ glabel func_80B3E224 /* 02070 80B3E250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02074 80B3E254 03E00008 */ jr $ra /* 02078 80B3E258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s index a63d7a7ee0..fc91e93e08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s @@ -13,5 +13,3 @@ glabel func_80B3E25C /* 020A8 80B3E288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 020AC 80B3E28C 03E00008 */ jr $ra /* 020B0 80B3E290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s index 40c9bbbf1e..2135ae99a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s @@ -29,5 +29,3 @@ glabel func_80B3E294 /* 02120 80B3E300 8FB10018 */ lw $s1, 0x0018($sp) /* 02124 80B3E304 03E00008 */ jr $ra /* 02128 80B3E308 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s index 31fd06b107..5d113815dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s @@ -22,5 +22,3 @@ glabel func_80B3E30C /* 0217C 80B3E35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02180 80B3E360 03E00008 */ jr $ra /* 02184 80B3E364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s index a83627695b..9cbdb07a5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s @@ -22,5 +22,3 @@ glabel func_80B3E368 /* 021D8 80B3E3B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 021DC 80B3E3BC 03E00008 */ jr $ra /* 021E0 80B3E3C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s index 2d61e0b802..f8b9505b50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s @@ -22,5 +22,3 @@ glabel func_80B3E3C4 /* 02234 80B3E414 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02238 80B3E418 03E00008 */ jr $ra /* 0223C 80B3E41C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s index 105b4783a0..6526137f73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s @@ -16,5 +16,3 @@ glabel func_80B3E420 /* 02278 80B3E458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0227C 80B3E45C 03E00008 */ jr $ra /* 02280 80B3E460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s index 0b1143b4c5..5d61ca9b78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s @@ -17,5 +17,3 @@ glabel func_80B3E464 /* 022C0 80B3E4A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022C4 80B3E4A4 03E00008 */ jr $ra /* 022C8 80B3E4A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s index a0185c8254..558715dd3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s @@ -18,5 +18,3 @@ glabel func_80B3E4AC /* 0230C 80B3E4EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02310 80B3E4F0 03E00008 */ jr $ra /* 02314 80B3E4F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s index b982bd028a..ab0e994846 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s @@ -16,5 +16,3 @@ glabel func_80B3E4F8 /* 02350 80B3E530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02354 80B3E534 03E00008 */ jr $ra /* 02358 80B3E538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s index 2a8a13a97c..c21d683653 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s @@ -16,5 +16,3 @@ glabel func_80B3E53C /* 02394 80B3E574 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02398 80B3E578 03E00008 */ jr $ra /* 0239C 80B3E57C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s index 7edf198d52..1f76a97ea0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s @@ -17,5 +17,3 @@ glabel func_80B3E580 /* 023DC 80B3E5BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 023E0 80B3E5C0 03E00008 */ jr $ra /* 023E4 80B3E5C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s index c0cf920f2c..f334ed0fa7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s @@ -17,5 +17,3 @@ glabel func_80B3E5C8 /* 02424 80B3E604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02428 80B3E608 03E00008 */ jr $ra /* 0242C 80B3E60C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s index aa2d045933..6cd083d014 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s @@ -21,5 +21,3 @@ glabel func_80B3E610 /* 0247C 80B3E65C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02480 80B3E660 03E00008 */ jr $ra /* 02484 80B3E664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s index 7889bc4c1f..7653390d32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s @@ -25,5 +25,3 @@ glabel func_80B3E668 /* 024E4 80B3E6C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024E8 80B3E6C8 03E00008 */ jr $ra /* 024EC 80B3E6CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s index 79f248a809..48aa9c7f77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s @@ -25,5 +25,3 @@ glabel func_80B3E6D0 /* 0254C 80B3E72C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02550 80B3E730 03E00008 */ jr $ra /* 02554 80B3E734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s index 3c81e99974..6e31fe33fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s @@ -25,5 +25,3 @@ glabel func_80B3E738 /* 025B4 80B3E794 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 025B8 80B3E798 03E00008 */ jr $ra /* 025BC 80B3E79C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s index b2d6705854..8309a694e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s @@ -24,5 +24,3 @@ glabel func_80B3E7A0 /* 02618 80B3E7F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0261C 80B3E7FC 03E00008 */ jr $ra /* 02620 80B3E800 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s index b378b0f261..a9e4fca5df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s @@ -21,5 +21,3 @@ glabel func_80B3E804 /* 02670 80B3E850 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02674 80B3E854 03E00008 */ jr $ra /* 02678 80B3E858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s index 710e54e302..b8d515047f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s @@ -7,5 +7,3 @@ glabel func_80B3E85C /* 02690 80B3E870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02694 80B3E874 03E00008 */ jr $ra /* 02698 80B3E878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s index f81583c776..9525be6d03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s @@ -12,5 +12,3 @@ glabel func_80B3E87C .L80B3E8A4: /* 026C4 80B3E8A4 03E00008 */ jr $ra /* 026C8 80B3E8A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s index ffe67adeb4..6056137e11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s @@ -14,5 +14,3 @@ glabel func_80B3E8AC /* 026F8 80B3E8D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 026FC 80B3E8DC 03E00008 */ jr $ra /* 02700 80B3E8E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s index e4f0726c0c..8477e5b712 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s @@ -9,5 +9,3 @@ glabel func_80B3E8E4 .L80B3E900: /* 02720 80B3E900 03E00008 */ jr $ra /* 02724 80B3E904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s index 7b0e388333..e2f32393ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B42010 + .asciz "../z_en_oA2_inSpot05.c" + .balign 4 + +glabel D_80B42028 + .asciz "../z_en_oA2_inSpot05.c" + .balign 4 + +.text glabel func_80B3E908 /* 02728 80B3E908 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0272C 80B3E90C AFBF002C */ sw $ra, 0x002C($sp) @@ -92,5 +102,3 @@ glabel func_80B3E908 /* 02890 80B3EA70 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 02894 80B3EA74 03E00008 */ jr $ra /* 02898 80B3EA78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s index 02f46c5c6f..81c5b2fd89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B42040 + .asciz "../z_en_oA2_inSpot05.c" + .balign 4 + +glabel D_80B42058 + .asciz "../z_en_oA2_inSpot05.c" + .balign 4 + +.text glabel func_80B3EA7C /* 0289C 80B3EA7C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 028A0 80B3EA80 AFBF002C */ sw $ra, 0x002C($sp) @@ -92,5 +102,3 @@ glabel func_80B3EA7C /* 02A04 80B3EBE4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 02A08 80B3EBE8 03E00008 */ jr $ra /* 02A0C 80B3EBEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s index b8232c570a..cee7fdb052 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s @@ -3,5 +3,3 @@ glabel func_80B3EBF0 /* 02A14 80B3EBF4 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 02A18 80B3EBF8 03E00008 */ jr $ra /* 02A1C 80B3EBFC AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s index 5d724a4206..c2da82bd3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s @@ -2,5 +2,3 @@ glabel func_80B3EC00 /* 02A20 80B3EC00 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 /* 02A24 80B3EC04 03E00008 */ jr $ra /* 02A28 80B3EC08 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s index 210c658abd..abe88654d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s @@ -33,5 +33,3 @@ glabel func_80B3EC0C .L80B3EC88: /* 02AA8 80B3EC88 03E00008 */ jr $ra /* 02AAC 80B3EC8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s index 1cd2eab601..ee220a571f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s @@ -18,5 +18,3 @@ glabel func_80B3EC90 /* 02AEC 80B3ECCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02AF0 80B3ECD0 03E00008 */ jr $ra /* 02AF4 80B3ECD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s index 3232b820f2..c1c9324e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B4223C + .float 0.01 + +glabel D_80B42240 + .float 1.2 + +.text glabel func_80B3ECD8 /* 02AF8 80B3ECD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02AFC 80B3ECDC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 @@ -28,5 +36,3 @@ glabel func_80B3ECD8 .L80B3ED40: /* 02B60 80B3ED40 03E00008 */ jr $ra /* 02B64 80B3ED44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s index 9408731f93..1b736ed7c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s @@ -7,5 +7,3 @@ glabel func_80B3ED48 /* 02B7C 80B3ED5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02B80 80B3ED60 03E00008 */ jr $ra /* 02B84 80B3ED64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s index 14fe44e425..b74a62e76d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s @@ -7,5 +7,3 @@ glabel func_80B3ED68 /* 02B9C 80B3ED7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02BA0 80B3ED80 03E00008 */ jr $ra /* 02BA4 80B3ED84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s index e727ece2ec..c513efa160 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s @@ -16,5 +16,3 @@ glabel func_80B3ED88 /* 02BE0 80B3EDC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02BE4 80B3EDC4 03E00008 */ jr $ra /* 02BE8 80B3EDC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s index f7e0e64823..6e70de6b50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s @@ -22,5 +22,3 @@ glabel func_80B3EDCC /* 02C3C 80B3EE1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02C40 80B3EE20 03E00008 */ jr $ra /* 02C44 80B3EE24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s index b18a59e0fe..5435bbc0a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s @@ -2,5 +2,3 @@ glabel func_80B3EE28 /* 02C48 80B3EE28 AFA40000 */ sw $a0, 0x0000($sp) /* 02C4C 80B3EE2C 03E00008 */ jr $ra /* 02C50 80B3EE30 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s index 4fbfec8eef..f5e0283e45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s @@ -2,5 +2,3 @@ glabel func_80B3EE34 /* 02C54 80B3EE34 AFA40000 */ sw $a0, 0x0000($sp) /* 02C58 80B3EE38 03E00008 */ jr $ra /* 02C5C 80B3EE3C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s index 60817022ef..e4ca7c03b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s @@ -2,5 +2,3 @@ glabel func_80B3EE40 /* 02C60 80B3EE40 AFA40000 */ sw $a0, 0x0000($sp) /* 02C64 80B3EE44 03E00008 */ jr $ra /* 02C68 80B3EE48 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s index 70c5ec11a1..462be2c364 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s @@ -2,5 +2,3 @@ glabel func_80B3EE4C /* 02C6C 80B3EE4C AFA40000 */ sw $a0, 0x0000($sp) /* 02C70 80B3EE50 03E00008 */ jr $ra /* 02C74 80B3EE54 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s index 1e18c3fd40..ac23e70a51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s @@ -2,5 +2,3 @@ glabel func_80B3EE58 /* 02C78 80B3EE58 AFA40000 */ sw $a0, 0x0000($sp) /* 02C7C 80B3EE5C 03E00008 */ jr $ra /* 02C80 80B3EE60 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s index 20f8f5d5cd..00525277a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s @@ -3,5 +3,3 @@ glabel func_80B3EE64 /* 02C88 80B3EE68 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D /* 02C8C 80B3EE6C 03E00008 */ jr $ra /* 02C90 80B3EE70 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s index c62af10167..2f7891bdae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s @@ -12,5 +12,3 @@ glabel func_80B3EE74 /* 02CB8 80B3EE98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02CBC 80B3EE9C 03E00008 */ jr $ra /* 02CC0 80B3EEA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s index 592638c3f5..a31048b9e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s @@ -8,5 +8,3 @@ glabel func_80B3EEA4 /* 02CDC 80B3EEBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02CE0 80B3EEC0 03E00008 */ jr $ra /* 02CE4 80B3EEC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s index 537d26addd..42ccfc60af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s @@ -8,5 +8,3 @@ glabel func_80B3EEC8 /* 02D00 80B3EEE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D04 80B3EEE4 03E00008 */ jr $ra /* 02D08 80B3EEE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s index 629d43d7b8..62ece95ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s @@ -8,5 +8,3 @@ glabel func_80B3EEEC /* 02D24 80B3EF04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D28 80B3EF08 03E00008 */ jr $ra /* 02D2C 80B3EF0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s index bdba91cd5e..2a582a303a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s @@ -8,5 +8,3 @@ glabel func_80B3EF10 /* 02D48 80B3EF28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D4C 80B3EF2C 03E00008 */ jr $ra /* 02D50 80B3EF30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s index 9adab42b88..b81dcd3653 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s @@ -8,5 +8,3 @@ glabel func_80B3EF34 /* 02D6C 80B3EF4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D70 80B3EF50 03E00008 */ jr $ra /* 02D74 80B3EF54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s index 9c5d485377..34a573a672 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s @@ -9,5 +9,3 @@ glabel func_80B3EF58 /* 02D94 80B3EF74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D98 80B3EF78 03E00008 */ jr $ra /* 02D9C 80B3EF7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s index fe8bc58c43..fe265879ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s @@ -8,5 +8,3 @@ glabel func_80B3EF80 /* 02DB8 80B3EF98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DBC 80B3EF9C 03E00008 */ jr $ra /* 02DC0 80B3EFA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s index 5224be7852..6398bf57a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s @@ -8,5 +8,3 @@ glabel func_80B3EFA4 /* 02DDC 80B3EFBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DE0 80B3EFC0 03E00008 */ jr $ra /* 02DE4 80B3EFC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s index 56885c01b4..8feaeea744 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s @@ -8,5 +8,3 @@ glabel func_80B3EFC8 /* 02E00 80B3EFE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E04 80B3EFE4 03E00008 */ jr $ra /* 02E08 80B3EFE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s index 12e108f6f1..614c530ad1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s @@ -8,5 +8,3 @@ glabel func_80B3EFEC /* 02E24 80B3F004 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02E28 80B3F008 03E00008 */ jr $ra /* 02E2C 80B3F00C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s index 61469c46d0..deddfb2a12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s @@ -44,5 +44,3 @@ glabel func_80B3F010 /* 02ECC 80B3F0AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02ED0 80B3F0B0 03E00008 */ jr $ra /* 02ED4 80B3F0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s index 67756c8116..d21df5912e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s @@ -8,5 +8,3 @@ glabel func_80B3F0B8 /* 02EF0 80B3F0D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02EF4 80B3F0D4 03E00008 */ jr $ra /* 02EF8 80B3F0D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s index d05e341cda..f3311f9759 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s @@ -8,5 +8,3 @@ glabel func_80B3F0DC /* 02F14 80B3F0F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F18 80B3F0F8 03E00008 */ jr $ra /* 02F1C 80B3F0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s index eb3960a1dc..2fecaabc79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s @@ -8,5 +8,3 @@ glabel func_80B3F100 /* 02F38 80B3F118 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F3C 80B3F11C 03E00008 */ jr $ra /* 02F40 80B3F120 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s index fffe2ddd7d..cb3ba2e0cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s @@ -7,5 +7,3 @@ glabel func_80B3F124 /* 02F58 80B3F138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F5C 80B3F13C 03E00008 */ jr $ra /* 02F60 80B3F140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s index d0fe69151f..f7b2a13456 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s @@ -9,5 +9,3 @@ glabel func_80B3F144 /* 02F80 80B3F160 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F84 80B3F164 03E00008 */ jr $ra /* 02F88 80B3F168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s index cb3ba00760..a36042e0ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s @@ -14,5 +14,3 @@ glabel func_80B3F16C /* 02FBC 80B3F19C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02FC0 80B3F1A0 03E00008 */ jr $ra /* 02FC4 80B3F1A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s index 8130534f7e..15ee221cac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s @@ -9,5 +9,3 @@ glabel func_80B3F1A8 /* 02FE4 80B3F1C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02FE8 80B3F1C8 03E00008 */ jr $ra /* 02FEC 80B3F1CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s index 1aad0c666f..453f23ec02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s @@ -9,5 +9,3 @@ glabel func_80B3F1D0 /* 0300C 80B3F1EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03010 80B3F1F0 03E00008 */ jr $ra /* 03014 80B3F1F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s index 28c0f0e906..25b79849b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s @@ -9,5 +9,3 @@ glabel func_80B3F1F8 /* 03034 80B3F214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03038 80B3F218 03E00008 */ jr $ra /* 0303C 80B3F21C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s index 58813fc003..5dd91b765e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s @@ -9,5 +9,3 @@ glabel func_80B3F220 /* 0305C 80B3F23C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03060 80B3F240 03E00008 */ jr $ra /* 03064 80B3F244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s index bea33c0ffb..3ff73a5c8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s @@ -9,5 +9,3 @@ glabel func_80B3F248 /* 03084 80B3F264 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03088 80B3F268 03E00008 */ jr $ra /* 0308C 80B3F26C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s index 9439c4941a..169d87e160 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s @@ -9,5 +9,3 @@ glabel func_80B3F270 /* 030AC 80B3F28C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 030B0 80B3F290 03E00008 */ jr $ra /* 030B4 80B3F294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s index 58bf14bdef..4497d863ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s @@ -9,5 +9,3 @@ glabel func_80B3F298 /* 030D4 80B3F2B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 030D8 80B3F2B8 03E00008 */ jr $ra /* 030DC 80B3F2BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s index b0583abdba..59b558e708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s @@ -9,5 +9,3 @@ glabel func_80B3F2C0 /* 030FC 80B3F2DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03100 80B3F2E0 03E00008 */ jr $ra /* 03104 80B3F2E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s index 660721fda5..ae2c3e2085 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s @@ -22,5 +22,3 @@ glabel func_80B3F2E8 /* 03158 80B3F338 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0315C 80B3F33C 03E00008 */ jr $ra /* 03160 80B3F340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s index 8d96183f07..bd19cd968b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s @@ -9,5 +9,3 @@ glabel func_80B3F344 /* 03180 80B3F360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03184 80B3F364 03E00008 */ jr $ra /* 03188 80B3F368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s index 14a55fdfc1..89532e8e2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s @@ -9,5 +9,3 @@ glabel func_80B3F36C /* 031A8 80B3F388 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 031AC 80B3F38C 03E00008 */ jr $ra /* 031B0 80B3F390 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s index 7ca32ac9e4..3295191d53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s @@ -9,5 +9,3 @@ glabel func_80B3F394 /* 031D0 80B3F3B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 031D4 80B3F3B4 03E00008 */ jr $ra /* 031D8 80B3F3B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s index 78d2e0ac4b..fd001266ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s @@ -2,5 +2,3 @@ glabel func_80B3F3BC /* 031DC 80B3F3BC AFA40000 */ sw $a0, 0x0000($sp) /* 031E0 80B3F3C0 03E00008 */ jr $ra /* 031E4 80B3F3C4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s index 303d904bd1..5c25ec1ab3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s @@ -3,5 +3,3 @@ glabel func_80B3F3C8 /* 031EC 80B3F3CC 240E002D */ addiu $t6, $zero, 0x002D ## $t6 = 0000002D /* 031F0 80B3F3D0 03E00008 */ jr $ra /* 031F4 80B3F3D4 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s index fec804db6d..271d7211b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s @@ -7,5 +7,3 @@ glabel func_80B3F3D8 /* 0320C 80B3F3EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03210 80B3F3F0 03E00008 */ jr $ra /* 03214 80B3F3F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s index 4a3143b006..92524a9efa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s @@ -20,5 +20,3 @@ glabel func_80B3F3F8 /* 03260 80B3F440 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03264 80B3F444 03E00008 */ jr $ra /* 03268 80B3F448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s index f9b5cf08fe..7ad5d2c06b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s @@ -58,5 +58,3 @@ glabel func_80B3F44C /* 03348 80B3F528 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0334C 80B3F52C 03E00008 */ jr $ra /* 03350 80B3F530 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s index bdf1996d3b..42507b85a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B42244 + .word 0xC49B6000 +glabel D_80B42248 + .word 0x45E91000 + +.text glabel func_80B3F534 /* 03354 80B3F534 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03358 80B3F538 AFBF002C */ sw $ra, 0x002C($sp) @@ -27,5 +34,3 @@ glabel func_80B3F534 /* 033B0 80B3F590 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 033B4 80B3F594 03E00008 */ jr $ra /* 033B8 80B3F598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s index 56eeaec217..a42230c29b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s @@ -37,5 +37,3 @@ glabel func_80B3F59C /* 03434 80B3F614 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03438 80B3F618 03E00008 */ jr $ra /* 0343C 80B3F61C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s index 961cee5ca5..46b87fe3bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s @@ -8,5 +8,3 @@ glabel func_80B3F620 /* 03458 80B3F638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0345C 80B3F63C 03E00008 */ jr $ra /* 03460 80B3F640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s index 5b6ccddf53..7f4aefee0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s @@ -8,5 +8,3 @@ glabel func_80B3F644 /* 0347C 80B3F65C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03480 80B3F660 03E00008 */ jr $ra /* 03484 80B3F664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s index f8a8b2512e..25ab2f5eb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s @@ -29,5 +29,3 @@ glabel func_80B3F668 /* 034F0 80B3F6D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 034F4 80B3F6D4 03E00008 */ jr $ra /* 034F8 80B3F6D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s index 44486191ce..d27d29ccd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s @@ -8,5 +8,3 @@ glabel func_80B3F6DC /* 03514 80B3F6F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03518 80B3F6F8 03E00008 */ jr $ra /* 0351C 80B3F6FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s index 1fd181e7d4..4245a29bae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s @@ -21,5 +21,3 @@ glabel func_80B3F700 /* 03568 80B3F748 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0356C 80B3F74C 03E00008 */ jr $ra /* 03570 80B3F750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s index 4d4a8522bd..5cad9488c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s @@ -26,5 +26,3 @@ glabel func_80B3F754 /* 035D0 80B3F7B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 035D4 80B3F7B4 03E00008 */ jr $ra /* 035D8 80B3F7B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s index fe79037221..793a834326 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s @@ -15,5 +15,3 @@ glabel func_80B3F7BC /* 0360C 80B3F7EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03610 80B3F7F0 03E00008 */ jr $ra /* 03614 80B3F7F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s index 82bada59bc..515db910e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s @@ -9,5 +9,3 @@ glabel func_80B3F7F8 /* 03634 80B3F814 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03638 80B3F818 03E00008 */ jr $ra /* 0363C 80B3F81C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s index a20a321a3d..f330426176 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s @@ -9,5 +9,3 @@ glabel func_80B3F820 /* 0365C 80B3F83C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03660 80B3F840 03E00008 */ jr $ra /* 03664 80B3F844 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s index b126301de9..59e1bf411a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s @@ -21,5 +21,3 @@ glabel func_80B3F848 /* 036B4 80B3F894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 036B8 80B3F898 03E00008 */ jr $ra /* 036BC 80B3F89C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s index 3263fc3466..8489807c85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s @@ -9,5 +9,3 @@ glabel func_80B3F8A0 /* 036DC 80B3F8BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 036E0 80B3F8C0 03E00008 */ jr $ra /* 036E4 80B3F8C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s index 4b6a201f34..ec8f58829c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s @@ -23,5 +23,3 @@ glabel func_80B3F8C8 /* 0373C 80B3F91C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03740 80B3F920 03E00008 */ jr $ra /* 03744 80B3F924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s index 6201f97ebe..da8abf008d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s @@ -23,5 +23,3 @@ glabel func_80B3F928 /* 0379C 80B3F97C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 037A0 80B3F980 03E00008 */ jr $ra /* 037A4 80B3F984 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s index 8aaff42ab3..9867ba71e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s @@ -23,5 +23,3 @@ glabel func_80B3F988 /* 037FC 80B3F9DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03800 80B3F9E0 03E00008 */ jr $ra /* 03804 80B3F9E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s index 0a39716e5c..92eca312d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s @@ -7,5 +7,3 @@ glabel func_80B3F9E8 /* 0381C 80B3F9FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03820 80B3FA00 03E00008 */ jr $ra /* 03824 80B3FA04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s index 9487d1882b..601ccca636 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s @@ -8,5 +8,3 @@ glabel func_80B3FA08 /* 03840 80B3FA20 271953FC */ addiu $t9, $t8, 0x53FC ## $t9 = 000053FC /* 03844 80B3FA24 03E00008 */ jr $ra /* 03848 80B3FA28 A49902A4 */ sh $t9, 0x02A4($a0) ## 000002A4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s index d65e5376e6..d51bbd98e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s @@ -7,5 +7,3 @@ glabel func_80B3FA2C /* 03860 80B3FA40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03864 80B3FA44 03E00008 */ jr $ra /* 03868 80B3FA48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s index 0db5d6ad03..a8f0ed2e90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s @@ -38,5 +38,3 @@ glabel func_80B3FA4C /* 038F4 80B3FAD4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 038F8 80B3FAD8 03E00008 */ jr $ra /* 038FC 80B3FADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s index 353a4d6cce..9ad4a2f9ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s @@ -17,5 +17,3 @@ glabel func_80B3FAE0 /* 03938 80B3FB18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0393C 80B3FB1C 03E00008 */ jr $ra /* 03940 80B3FB20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s index 428c2081e7..048b9e1bb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B4224C + .float 0.1 + +glabel D_80B42250 + .float 0.1 + +glabel D_80B42254 + .float 0.1 + +.text glabel func_80B3FB24 /* 03944 80B3FB24 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 03948 80B3FB28 AFBF002C */ sw $ra, 0x002C($sp) @@ -259,5 +270,3 @@ glabel func_80B3FB24 /* 03D20 80B3FF00 8FB00028 */ lw $s0, 0x0028($sp) /* 03D24 80B3FF04 03E00008 */ jr $ra /* 03D28 80B3FF08 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s index a7ae1923a6..9cbc3d2f99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s @@ -43,5 +43,3 @@ glabel func_80B3FF0C /* 03DC8 80B3FFA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03DCC 80B3FFAC 03E00008 */ jr $ra /* 03DD0 80B3FFB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s index f6dfc7eccc..b6909c9ae8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s @@ -37,5 +37,3 @@ glabel func_80B3FFB4 /* 03E54 80B40034 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03E58 80B40038 03E00008 */ jr $ra /* 03E5C 80B4003C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s index 56b5ee35e6..ef6dc905da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s @@ -29,5 +29,3 @@ glabel func_80B40040 /* 03EC0 80B400A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03EC4 80B400A4 03E00008 */ jr $ra /* 03EC8 80B400A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s index f7969b57ee..74cf7b1519 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s @@ -15,5 +15,3 @@ glabel func_80B400AC /* 03EF8 80B400D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03EFC 80B400DC 03E00008 */ jr $ra /* 03F00 80B400E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s index 3cb9304f95..8b0e24b88a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s @@ -7,5 +7,3 @@ glabel func_80B400E4 /* 03F18 80B400F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03F1C 80B400FC 03E00008 */ jr $ra /* 03F20 80B40100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s index 558a8304cd..fd4502158b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s @@ -21,5 +21,3 @@ glabel func_80B40104 /* 03F70 80B40150 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03F74 80B40154 03E00008 */ jr $ra /* 03F78 80B40158 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s index 5fe2e84e87..be91c5991a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s @@ -27,5 +27,3 @@ glabel func_80B4015C /* 03FE0 80B401C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03FE4 80B401C4 03E00008 */ jr $ra /* 03FE8 80B401C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s index dfcc091a58..0b41db7eb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s @@ -21,5 +21,3 @@ glabel func_80B401CC /* 04038 80B40218 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0403C 80B4021C 03E00008 */ jr $ra /* 04040 80B40220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s index 33f1cc4a44..70ca448d8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s @@ -9,5 +9,3 @@ glabel func_80B40224 .L80B40240: /* 04060 80B40240 03E00008 */ jr $ra /* 04064 80B40244 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s index d086282377..ef1d18b39a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s @@ -31,5 +31,3 @@ glabel func_80B40248 /* 040D8 80B402B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 040DC 80B402BC 03E00008 */ jr $ra /* 040E0 80B402C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index d4f5efb32c..735035c233 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80B42070 + .asciz "../z_en_oA2_inMetamol.c" + .balign 4 + +glabel D_80B42088 + .asciz "../z_en_oA2_inMetamol.c" + .balign 4 + +glabel D_80B420A0 + .asciz "../z_en_oA2_inMetamol.c" + .balign 4 + +.late_rodata +glabel D_80B42258 + .word 0x458B6000 +glabel D_80B4225C + .word 0x4494C000 + +.text glabel func_80B402C4 /* 040E4 80B402C4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 040E8 80B402C8 AFBF002C */ sw $ra, 0x002C($sp) @@ -180,5 +200,3 @@ glabel func_80B402C4 /* 043A4 80B40584 8FB10028 */ lw $s1, 0x0028($sp) /* 043A8 80B40588 03E00008 */ jr $ra /* 043AC 80B4058C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s index fec72f6820..f68f923b7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s @@ -5,5 +5,3 @@ glabel func_80B40590 /* 043BC 80B4059C AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 /* 043C0 80B405A0 03E00008 */ jr $ra /* 043C4 80B405A4 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s index 66ecc970e2..d89bb29262 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s @@ -53,5 +53,3 @@ glabel func_80B405A8 /* 04480 80B40660 8FB10018 */ lw $s1, 0x0018($sp) /* 04484 80B40664 03E00008 */ jr $ra /* 04488 80B40668 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s index 024bdb17e1..d4850c1186 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s @@ -13,5 +13,3 @@ glabel func_80B4066C /* 044B4 80B40694 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 044B8 80B40698 03E00008 */ jr $ra /* 044BC 80B4069C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s index 84dc705c2a..03ee224cf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s @@ -23,5 +23,3 @@ glabel func_80B406A0 /* 0450C 80B406EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04510 80B406F0 03E00008 */ jr $ra /* 04514 80B406F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s index 7eb8196604..5e61d9f8de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s @@ -4,5 +4,3 @@ glabel func_80B406F8 /* 04520 80B40700 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 /* 04524 80B40704 03E00008 */ jr $ra /* 04528 80B40708 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s index 1a03312bd2..32adf73405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s @@ -40,5 +40,3 @@ glabel func_80B4070C /* 045BC 80B4079C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 045C0 80B407A0 03E00008 */ jr $ra /* 045C4 80B407A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s index 5a848cbc89..514c532d94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s @@ -31,5 +31,3 @@ glabel func_80B407A8 /* 04634 80B40814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04638 80B40818 03E00008 */ jr $ra /* 0463C 80B4081C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s index 130e407b93..735835edad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s @@ -58,5 +58,3 @@ glabel func_80B40820 /* 04710 80B408F0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 04714 80B408F4 03E00008 */ jr $ra /* 04718 80B408F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s index 443488f426..7ee8329a0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s @@ -58,5 +58,3 @@ glabel func_80B408FC /* 047EC 80B409CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 047F0 80B409D0 03E00008 */ jr $ra /* 047F4 80B409D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s index 5ee8d5b360..781f85cc65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s @@ -41,5 +41,3 @@ glabel func_80B409D8 /* 0488C 80B40A6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 04890 80B40A70 03E00008 */ jr $ra /* 04894 80B40A74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s index dab5cf542e..9742760aa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s @@ -41,5 +41,3 @@ glabel func_80B40A78 /* 0492C 80B40B0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 04930 80B40B10 03E00008 */ jr $ra /* 04934 80B40B14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s index 1cfb8d295b..71ab7e58a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s @@ -40,5 +40,3 @@ glabel func_80B40B18 /* 049C8 80B40BA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 049CC 80B40BAC 03E00008 */ jr $ra /* 049D0 80B40BB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s index 6bade6ec9a..3504099c78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s @@ -40,5 +40,3 @@ glabel func_80B40BB4 /* 04A64 80B40C44 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 04A68 80B40C48 03E00008 */ jr $ra /* 04A6C 80B40C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s index 174e3d84e7..0fb347a530 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s @@ -8,5 +8,3 @@ glabel func_80B40C50 /* 04A88 80B40C68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04A8C 80B40C6C 03E00008 */ jr $ra /* 04A90 80B40C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s index e94dc6aa70..d765364e63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s @@ -8,5 +8,3 @@ glabel func_80B40C74 /* 04AAC 80B40C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04AB0 80B40C90 03E00008 */ jr $ra /* 04AB4 80B40C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s index b9b16a3c8c..a5ae8a8789 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s @@ -8,5 +8,3 @@ glabel func_80B40C98 /* 04AD0 80B40CB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04AD4 80B40CB4 03E00008 */ jr $ra /* 04AD8 80B40CB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s index d4cdadd9a8..b9647333ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s @@ -8,5 +8,3 @@ glabel func_80B40CBC /* 04AF4 80B40CD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04AF8 80B40CD8 03E00008 */ jr $ra /* 04AFC 80B40CDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s index f6f2652859..7160fd61a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s @@ -9,5 +9,3 @@ glabel func_80B40CE0 /* 04B1C 80B40CFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B20 80B40D00 03E00008 */ jr $ra /* 04B24 80B40D04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s index 1b8d2ab370..e9afb24a7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s @@ -8,5 +8,3 @@ glabel func_80B40D08 /* 04B40 80B40D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B44 80B40D24 03E00008 */ jr $ra /* 04B48 80B40D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s index 442617c3d8..d2400d6b5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s @@ -8,5 +8,3 @@ glabel func_80B40D2C /* 04B64 80B40D44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B68 80B40D48 03E00008 */ jr $ra /* 04B6C 80B40D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s index a6945dcb52..cf701164b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s @@ -8,5 +8,3 @@ glabel func_80B40D50 /* 04B88 80B40D68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B8C 80B40D6C 03E00008 */ jr $ra /* 04B90 80B40D70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s index 3f9b433711..57611d2e56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s @@ -8,5 +8,3 @@ glabel func_80B40D74 /* 04BAC 80B40D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04BB0 80B40D90 03E00008 */ jr $ra /* 04BB4 80B40D94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s index 2db093767a..375fcc956e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s @@ -44,5 +44,3 @@ glabel func_80B40D98 /* 04C54 80B40E34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04C58 80B40E38 03E00008 */ jr $ra /* 04C5C 80B40E3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s index 0c6acd6a96..586bcbb78e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s @@ -8,5 +8,3 @@ glabel func_80B40E40 /* 04C78 80B40E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04C7C 80B40E5C 03E00008 */ jr $ra /* 04C80 80B40E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s index 263ae69dd1..2495b3a2c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s @@ -8,5 +8,3 @@ glabel func_80B40E64 /* 04C9C 80B40E7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04CA0 80B40E80 03E00008 */ jr $ra /* 04CA4 80B40E84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s index 0677bfa88b..a0d3261ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s @@ -8,5 +8,3 @@ glabel func_80B40E88 /* 04CC0 80B40EA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04CC4 80B40EA4 03E00008 */ jr $ra /* 04CC8 80B40EA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s index 4a3bae0a38..bfcf032279 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s @@ -1,3 +1,32 @@ +.rdata +glabel D_80B420B8 + .asciz "En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80B42260 +.word L80B40F10 +.word L80B40FCC +.word L80B40FCC +.word L80B40FCC +.word L80B40FCC +.word L80B40F20 +.word L80B40FCC +.word L80B40FCC +.word L80B40FBC +.word L80B40FCC +.word L80B40FCC +.word L80B40FCC +.word L80B40FCC +.word L80B40F58 +.word L80B40F80 +.word L80B40F94 +.word L80B40FA8 +.word L80B40F44 +.word L80B40F6C +.word L80B40F34 + +.text glabel func_80B40EAC /* 04CCC 80B40EAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 04CD0 80B40EB0 AFB00018 */ sw $s0, 0x0018($sp) @@ -101,5 +130,3 @@ glabel L80B40FCC /* 04E14 80B40FF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04E18 80B40FF8 03E00008 */ jr $ra /* 04E1C 80B40FFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s index a510d0f4a5..0a6d82021d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s @@ -7,5 +7,3 @@ glabel func_80B41000 /* 04E34 80B41014 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04E38 80B41018 03E00008 */ jr $ra /* 04E3C 80B4101C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s index 6b391af642..5a31a69a54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s @@ -17,5 +17,3 @@ glabel func_80B41020 /* 04E7C 80B4105C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04E80 80B41060 03E00008 */ jr $ra /* 04E84 80B41064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s index 711490ebbd..13b6c2850a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s @@ -16,5 +16,3 @@ glabel func_80B41068 /* 04EC0 80B410A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04EC4 80B410A4 03E00008 */ jr $ra /* 04EC8 80B410A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s index 2b50b50ed7..7829866576 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s @@ -25,5 +25,3 @@ glabel func_80B410AC /* 04F24 80B41104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04F28 80B41108 03E00008 */ jr $ra /* 04F2C 80B4110C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s index cb83918554..f2f4250d1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s @@ -25,5 +25,3 @@ glabel func_80B41110 /* 04F88 80B41168 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04F8C 80B4116C 03E00008 */ jr $ra /* 04F90 80B41170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s index 208b6ebaf0..4de18c6233 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s @@ -13,5 +13,3 @@ glabel func_80B41174 /* 04FC0 80B411A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04FC4 80B411A4 03E00008 */ jr $ra /* 04FC8 80B411A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s index 9a42f35ce1..da222c8abf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s @@ -21,5 +21,3 @@ glabel func_80B411AC /* 05018 80B411F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0501C 80B411FC 03E00008 */ jr $ra /* 05020 80B41200 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s index 9a234bd86f..03fb55b21c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s @@ -16,5 +16,3 @@ glabel func_80B41204 /* 0505C 80B4123C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05060 80B41240 03E00008 */ jr $ra /* 05064 80B41244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s index c5a1fe6b27..8f3e3e8439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s @@ -14,5 +14,3 @@ glabel func_80B41248 /* 05098 80B41278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0509C 80B4127C 03E00008 */ jr $ra /* 050A0 80B41280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s index f756951861..dd1de3041c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s @@ -9,5 +9,3 @@ glabel func_80B41284 /* 050C0 80B412A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 050C4 80B412A4 03E00008 */ jr $ra /* 050C8 80B412A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s index 479f4518a8..1f7e0f995f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s @@ -9,5 +9,3 @@ glabel func_80B412AC /* 050E8 80B412C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 050EC 80B412CC 03E00008 */ jr $ra /* 050F0 80B412D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s index af8e7ee2ab..d7c0356c70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s @@ -9,5 +9,3 @@ glabel func_80B412D4 /* 05110 80B412F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05114 80B412F4 03E00008 */ jr $ra /* 05118 80B412F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s index ce39bc31a8..e6685d9d9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s @@ -9,5 +9,3 @@ glabel func_80B412FC /* 05138 80B41318 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0513C 80B4131C 03E00008 */ jr $ra /* 05140 80B41320 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s index e5b16a6450..de392caaa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s @@ -9,5 +9,3 @@ glabel func_80B41324 /* 05160 80B41340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05164 80B41344 03E00008 */ jr $ra /* 05168 80B41348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s index 7571005379..c6a871ae03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s @@ -9,5 +9,3 @@ glabel func_80B4134C /* 05188 80B41368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0518C 80B4136C 03E00008 */ jr $ra /* 05190 80B41370 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s index 59898079fc..9290bb9e13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s @@ -9,5 +9,3 @@ glabel func_80B41374 /* 051B0 80B41390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 051B4 80B41394 03E00008 */ jr $ra /* 051B8 80B41398 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s index e1706c4952..8644bb6141 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s @@ -9,5 +9,3 @@ glabel func_80B4139C /* 051D8 80B413B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 051DC 80B413BC 03E00008 */ jr $ra /* 051E0 80B413C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s index 2dea6d1720..7d5685a2ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s @@ -19,5 +19,3 @@ glabel func_80B413C4 /* 05228 80B41408 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0522C 80B4140C 03E00008 */ jr $ra /* 05230 80B41410 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s index 68e5aadf0c..d9c3300e5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s @@ -9,5 +9,3 @@ glabel func_80B41414 /* 05250 80B41430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05254 80B41434 03E00008 */ jr $ra /* 05258 80B41438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s index a49f7dddc9..ccbd3027d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s @@ -9,5 +9,3 @@ glabel func_80B4143C /* 05278 80B41458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0527C 80B4145C 03E00008 */ jr $ra /* 05280 80B41460 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s index b680e30243..21fef72e23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s @@ -9,5 +9,3 @@ glabel func_80B41464 /* 052A0 80B41480 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 052A4 80B41484 03E00008 */ jr $ra /* 052A8 80B41488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s index 638c8552ee..3b17ef86d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s @@ -8,5 +8,3 @@ glabel func_80B4148C /* 052C0 80B414A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 052C4 80B414A4 03E00008 */ jr $ra /* 052C8 80B414A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s index 2de0cb0844..8c62533c5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B420F0 + .asciz "../z_en_oA2_inStalker.c" + .balign 4 + +glabel D_80B42108 + .asciz "../z_en_oA2_inStalker.c" + .balign 4 + +.text glabel func_80B414AC /* 052CC 80B414AC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 052D0 80B414B0 AFBF002C */ sw $ra, 0x002C($sp) @@ -66,5 +76,3 @@ glabel func_80B414AC /* 053CC 80B415AC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 053D0 80B415B0 03E00008 */ jr $ra /* 053D4 80B415B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s index c820d95383..89e01d37bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s @@ -95,5 +95,3 @@ glabel func_80B415B8 /* 0552C 80B4170C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05530 80B41710 03E00008 */ jr $ra /* 05534 80B41714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s index f2d3721f38..5d9a9ec67f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s @@ -34,5 +34,3 @@ glabel func_80B41718 /* 055AC 80B4178C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 055B0 80B41790 03E00008 */ jr $ra /* 055B4 80B41794 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s index 1a25ae33ee..997e249900 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s @@ -19,5 +19,3 @@ glabel func_80B41798 /* 055F8 80B417D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 055FC 80B417DC 03E00008 */ jr $ra /* 05600 80B417E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s index ebad051199..2f6633d322 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s @@ -23,5 +23,3 @@ glabel func_80B417E4 /* 05658 80B41838 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0565C 80B4183C 03E00008 */ jr $ra /* 05660 80B41840 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s index 88c39619d2..b9e134df74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s @@ -23,5 +23,3 @@ glabel func_80B41844 /* 056B8 80B41898 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 056BC 80B4189C 03E00008 */ jr $ra /* 056C0 80B418A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s index d45fa4e53c..d0774d0e34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s @@ -34,5 +34,3 @@ glabel func_80B41A88 .L80B41B04: /* 05924 80B41B04 03E00008 */ jr $ra /* 05928 80B41B08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s index 2428d28727..4bed658c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s @@ -35,5 +35,3 @@ glabel func_80B41B0C /* 059AC 80B41B8C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 059B0 80B41B90 03E00008 */ jr $ra /* 059B4 80B41B94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s index bde61d39d4..a773898aff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s @@ -2,5 +2,3 @@ glabel func_80B41B98 /* 059B8 80B41B98 AFA40000 */ sw $a0, 0x0000($sp) /* 059BC 80B41B9C 03E00008 */ jr $ra /* 059C0 80B41BA0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s index 12755d1523..2aea307bf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B421A0 + .asciz "../z_en_oA2.c" + .balign 4 + +glabel D_80B421B0 + .asciz "../z_en_oA2.c" + .balign 4 + +.text glabel func_80B41BA4 /* 059C4 80B41BA4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 059C8 80B41BA8 AFBF002C */ sw $ra, 0x002C($sp) @@ -79,5 +89,3 @@ glabel func_80B41BA4 /* 05AF8 80B41CD8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 05AFC 80B41CDC 03E00008 */ jr $ra /* 05B00 80B41CE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s index 0daa99cd18..84d96fc928 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s @@ -9,5 +9,3 @@ glabel EnYabusameMark_Destroy /* 0001C 80B42DDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00020 80B42DE0 03E00008 */ jr $ra /* 00024 80B42DE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s index 5064b73824..2448a082a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B43680 + .asciz "\n\n" + .balign 4 + +glabel D_80B43684 + .asciz "☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n" + .balign 4 + +glabel D_80B436B4 + .asciz "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B436EC + .asciz "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" + .balign 4 + +glabel D_80B4371C + .asciz "☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n" + .balign 4 + +.text glabel EnYabusameMark_Init /* 00028 80B42DE8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0002C 80B42DEC AFB00018 */ sw $s0, 0x0018($sp) @@ -111,5 +133,3 @@ glabel EnYabusameMark_Init /* 001A8 80B42F68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001AC 80B42F6C 03E00008 */ jr $ra /* 001B0 80B42F70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s index af484c5a42..6c9adc2ae9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s @@ -109,4 +109,3 @@ glabel EnYabusameMark_Update /* 00724 80B434E4 00000000 */ nop /* 00728 80B434E8 00000000 */ nop /* 0072C 80B434EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s index 5fa798ebc9..ea83e73599 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s @@ -1,3 +1,49 @@ +.rdata +glabel D_80B4374C + .asciz "\n\n" + .balign 4 + +glabel D_80B43750 + .asciz "☆☆☆☆☆ posＸ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B43778 + .asciz "☆☆☆☆☆ posＹ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B437A0 + .asciz "☆☆☆☆☆ posＺ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B437C8 + .asciz "☆☆☆☆☆ hitＸ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B437F0 + .asciz "☆☆☆☆☆ hitＹ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B43818 + .asciz "☆☆☆☆☆ hitＺ ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B43840 + .asciz "☆☆☆☆☆ 小 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B43868 + .asciz "☆☆☆☆☆ 大 ☆☆☆☆☆ %f\n" + .balign 4 + +glabel D_80B43890 + .asciz "☆☆☆☆☆ point ☆☆☆☆☆ %d\n" + .balign 4 + +.late_rodata +glabel D_80B438B8 + .word 0x0A0A0000, 0x00000000 + +.text glabel func_80B42F74 /* 001B4 80B42F74 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 001B8 80B42F78 3C0F80B4 */ lui $t7, %hi(D_80B4365C) ## $t7 = 80B40000 @@ -264,5 +310,3 @@ glabel func_80B42F74 /* 00578 80B43338 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0057C 80B4333C 03E00008 */ jr $ra /* 00580 80B43340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s index 36b2fcc342..8233a419d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s @@ -10,5 +10,3 @@ glabel EnYukabyun_Destroy /* 000C8 80B43A88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000CC 80B43A8C 03E00008 */ jr $ra /* 000D0 80B43A90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s index 58412c21c8..adb9cab38e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B43F70 + .asciz "../z_en_yukabyun.c" + .balign 4 + +glabel D_80B43F84 + .asciz "../z_en_yukabyun.c" + .balign 4 + +glabel D_80B43F98 + .asciz "../z_en_yukabyun.c" + .balign 4 + +.text glabel EnYukabyun_Draw /* 00420 80B43DE0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00424 80B43DE4 AFBF001C */ sw $ra, 0x001C($sp) @@ -75,4 +89,3 @@ glabel EnYukabyun_Draw /* 00544 80B43F04 03E00008 */ jr $ra /* 00548 80B43F08 00000000 */ nop /* 0054C 80B43F0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s index d9682b9d8d..d5d6aa66ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s @@ -46,5 +46,3 @@ glabel EnYukabyun_Init /* 000A0 80B43A60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000A4 80B43A64 03E00008 */ jr $ra /* 000A8 80B43A68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s index 2be9d66f74..b51f31224c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s @@ -115,5 +115,3 @@ glabel EnYukabyun_Update /* 00414 80B43DD4 8FB10020 */ lw $s1, 0x0020($sp) /* 00418 80B43DD8 03E00008 */ jr $ra /* 0041C 80B43DDC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43A94.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43A94.s index 0a15f09606..98c04a0cfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43A94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43A94.s @@ -17,5 +17,3 @@ glabel func_80B43A94 .L80B43ACC: /* 0010C 80B43ACC 03E00008 */ jr $ra /* 00110 80B43AD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43AD4.s index cae761f347..e0e782b4e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43AD4.s @@ -39,5 +39,3 @@ glabel func_80B43AD4 /* 001A0 80B43B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A4 80B43B64 03E00008 */ jr $ra /* 001A8 80B43B68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43B6C.s index 9be2cc1ff2..e7bb43114d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43B6C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B43FAC + .float 5000.0 + +.text glabel func_80B43B6C /* 001AC 80B43B6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001B0 80B43B70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +31,3 @@ glabel func_80B43B6C /* 00200 80B43BC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00204 80B43BC4 03E00008 */ jr $ra /* 00208 80B43BC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43BCC.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43BCC.s index 8b588480ab..2b0f7d4ed9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/func_80B43BCC.s @@ -29,5 +29,3 @@ glabel func_80B43BCC /* 00274 80B43C34 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00278 80B43C38 03E00008 */ jr $ra /* 0027C 80B43C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s index 37521f6eda..82960e34e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B4A330 + .float 10000.0 + +.text glabel EnZf_Destroy /* 005D4 80B44624 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 005D8 80B44628 AFBF0024 */ sw $ra, 0x0024($sp) @@ -36,5 +41,3 @@ glabel EnZf_Destroy /* 0064C 80B4469C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00650 80B446A0 03E00008 */ jr $ra /* 00654 80B446A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s index c9d306df99..f48d5fffef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B4A310 + .asciz "../z_en_zf.c" + .balign 4 + +glabel D_80B4A320 + .asciz "../z_en_zf.c" + .balign 4 + +.late_rodata +glabel D_80B4A444 + .float 1.4 + +.text glabel EnZf_Draw /* 05888 80B498D8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0588C 80B498DC AFBF003C */ sw $ra, 0x003C($sp) @@ -164,5 +178,3 @@ glabel EnZf_Draw /* 05B04 80B49B54 8FB10038 */ lw $s1, 0x0038($sp) /* 05B08 80B49B58 03E00008 */ jr $ra /* 05B0C 80B49B5C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s index a3bbaf3f6d..82b9d6b089 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s @@ -222,5 +222,3 @@ glabel EnZf_Init /* 005C8 80B44618 8FB10028 */ lw $s1, 0x0028($sp) /* 005CC 80B4461C 03E00008 */ jr $ra /* 005D0 80B44620 27BD01F8 */ addiu $sp, $sp, 0x01F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s index 9f43ed2219..d255ecc7f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s @@ -262,5 +262,3 @@ glabel EnZf_Update /* 055A0 80B495F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 055A4 80B495F4 03E00008 */ jr $ra /* 055A8 80B495F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44050.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44050.s index dbd24d1256..bbf9cfff78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44050.s @@ -1,5 +1,3 @@ glabel func_80B44050 /* 00000 80B44050 03E00008 */ jr $ra /* 00004 80B44054 AC8503E8 */ sw $a1, 0x03E8($a0) ## 000003E8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s index 31384f0d47..60a0cb3699 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s @@ -97,5 +97,3 @@ glabel func_80B44058 /* 00168 80B441B8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0016C 80B441BC 03E00008 */ jr $ra /* 00170 80B441C0 00021403 */ sra $v0, $v0, 16 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s index 857e9617dd..81a0d11e46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s @@ -78,5 +78,3 @@ glabel func_80B441C4 /* 00294 80B442E4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00298 80B442E8 03E00008 */ jr $ra /* 0029C 80B442EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B446A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B446A8.s index 0ed2323638..cae66ff7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B446A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B446A8.s @@ -119,5 +119,3 @@ glabel func_80B446A8 .L80B44868: /* 00818 80B44868 03E00008 */ jr $ra /* 0081C 80B4486C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44870.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44870.s index 4692d25c6d..e0a51fde77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44870.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44870.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B4A334 + .word 0x44124000 +glabel D_80B4A338 + .word 0x47C34F00 +glabel D_80B4A33C + .word 0x47C34F80 + +.text glabel func_80B44870 /* 00820 80B44870 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 00824 80B44874 F7B80028 */ sdc1 $f24, 0x0028($sp) @@ -185,5 +194,3 @@ glabel func_80B44870 /* 00AB8 80B44B08 8FBE0058 */ lw $s8, 0x0058($sp) /* 00ABC 80B44B0C 03E00008 */ jr $ra /* 00AC0 80B44B10 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44B14.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44B14.s index c6208df92f..0dd2c3d8b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44B14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44B14.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B4A340 + .word 0x47C34F00 +glabel D_80B4A344 + .word 0x47C34F80 + +.text glabel func_80B44B14 /* 00AC4 80B44B14 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00AC8 80B44B18 AFBF0054 */ sw $ra, 0x0054($sp) @@ -129,5 +136,3 @@ glabel func_80B44B14 /* 00C94 80B44CE4 8FB7004C */ lw $s7, 0x004C($sp) /* 00C98 80B44CE8 03E00008 */ jr $ra /* 00C9C 80B44CEC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44CF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44CF0.s index c44ee55ae9..3ceaeaa0bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44CF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44CF0.s @@ -59,5 +59,3 @@ glabel func_80B44CF0 /* 00D68 80B44DB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D6C 80B44DBC 03E00008 */ jr $ra /* 00D70 80B44DC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44DC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44DC4.s index a6031cdb1e..f11a84ab3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44DC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44DC4.s @@ -53,5 +53,3 @@ glabel func_80B44DC4 /* 00E30 80B44E80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E34 80B44E84 03E00008 */ jr $ra /* 00E38 80B44E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44E8C.s index 050354ec49..2974fc874b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44E8C.s @@ -148,5 +148,3 @@ glabel func_80B44E8C /* 01050 80B450A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01054 80B450A4 03E00008 */ jr $ra /* 01058 80B450A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s index 08a70e91c0..148f4651c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s @@ -51,5 +51,3 @@ glabel func_80B450AC /* 01118 80B45168 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0111C 80B4516C 03E00008 */ jr $ra /* 01120 80B45170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s index 10cb60538f..eee20de911 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s @@ -146,5 +146,3 @@ glabel func_80B45174 /* 01328 80B45378 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0132C 80B4537C 03E00008 */ jr $ra /* 01330 80B45380 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s index a45c0b2e01..9a36452afc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s @@ -48,5 +48,3 @@ glabel func_80B45384 /* 013E0 80B45430 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 013E4 80B45434 03E00008 */ jr $ra /* 013E8 80B45438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s index bf2b9d63bd..11744af310 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B4A348 + .float 0.3 + +glabel D_80B4A34C + .float 0.3 + +.text glabel func_80B4543C /* 013EC 80B4543C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 013F0 80B45440 AFBF001C */ sw $ra, 0x001C($sp) @@ -175,5 +183,3 @@ glabel func_80B4543C /* 01658 80B456A8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0165C 80B456AC 03E00008 */ jr $ra /* 01660 80B456B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s index bd0c19c2e4..736ae60112 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s @@ -37,5 +37,3 @@ glabel func_80B456B4 /* 016EC 80B4573C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 016F0 80B45740 03E00008 */ jr $ra /* 016F4 80B45744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s index 791277e156..627048b8bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B4A350 + .float 1.2 + +glabel D_80B4A354 + .float 0.7 + +glabel D_80B4A358 + .float 0.05 + +glabel D_80B4A35C + .float 0.1 + +glabel D_80B4A360 + .float 0.1 + +.text glabel func_80B45748 /* 016F8 80B45748 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 016FC 80B4574C 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -487,5 +504,3 @@ glabel func_80B45748 /* 01DD4 80B45E24 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01DD8 80B45E28 03E00008 */ jr $ra /* 01DDC 80B45E2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s index a90ae6ad86..ed8ee9cf0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s @@ -51,5 +51,3 @@ glabel func_80B45E30 /* 01E94 80B45EE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01E98 80B45EE8 03E00008 */ jr $ra /* 01E9C 80B45EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s index 84789353ec..1adc038467 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s @@ -97,5 +97,3 @@ glabel func_80B45EF0 /* 01FF0 80B46040 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01FF4 80B46044 03E00008 */ jr $ra /* 01FF8 80B46048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s index 9431f3dd13..c71e478714 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s @@ -18,5 +18,3 @@ glabel func_80B4604C /* 0203C 80B4608C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02040 80B46090 03E00008 */ jr $ra /* 02044 80B46094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s index 428681beac..37db61553c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B4A364 + .float 0.8 + +.text glabel func_80B46098 /* 02048 80B46098 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0204C 80B4609C AFB00018 */ sw $s0, 0x0018($sp) @@ -159,5 +164,3 @@ glabel func_80B46098 /* 02288 80B462D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0228C 80B462DC 03E00008 */ jr $ra /* 02290 80B462E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s index 9c8e2daae5..c3bc43b3af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s @@ -68,5 +68,3 @@ glabel func_80B462E4 /* 02388 80B463D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0238C 80B463DC 03E00008 */ jr $ra /* 02390 80B463E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s index c559fa6ce1..5c9c865ab2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B4A368 + .float -0.8 + +glabel D_80B4A36C + .float -0.8 + +glabel D_80B4A370 + .float -0.85 + +.text glabel func_80B463E4 /* 02394 80B463E4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 02398 80B463E8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -447,5 +458,3 @@ glabel func_80B463E4 /* 029C8 80B46A18 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 029CC 80B46A1C 03E00008 */ jr $ra /* 029D0 80B46A20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s index 01946052fa..c0c331f3a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s @@ -50,5 +50,3 @@ glabel func_80B46A24 /* 02A84 80B46AD4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02A88 80B46AD8 03E00008 */ jr $ra /* 02A8C 80B46ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s index 1e410fd6bf..6b1a8e575b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B4A374 + .float 0.7 + +glabel D_80B4A378 + .float 0.7 + +.text glabel func_80B46AE0 /* 02A90 80B46AE0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02A94 80B46AE4 AFBF001C */ sw $ra, 0x001C($sp) @@ -180,5 +188,3 @@ glabel func_80B46AE0 /* 02D08 80B46D58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02D0C 80B46D5C 03E00008 */ jr $ra /* 02D10 80B46D60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s index 66d0a6e679..a36bbe2624 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s @@ -28,5 +28,3 @@ glabel func_80B46D64 /* 02D78 80B46DC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02D7C 80B46DCC 03E00008 */ jr $ra /* 02D80 80B46DD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s index 7173de3a3f..f7927be9e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B4A37C + .float 0.7 + +glabel D_80B4A380 + .float 0.2 + +.text glabel func_80B46DD4 /* 02D84 80B46DD4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02D88 80B46DD8 AFB00018 */ sw $s0, 0x0018($sp) @@ -51,5 +59,3 @@ glabel func_80B46DD4 /* 02E30 80B46E80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E34 80B46E84 03E00008 */ jr $ra /* 02E38 80B46E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s index 33eed35651..e428ba887d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s @@ -41,5 +41,3 @@ glabel func_80B46E8C /* 02ED0 80B46F20 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02ED4 80B46F24 03E00008 */ jr $ra /* 02ED8 80B46F28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s index d40f8f41bd..f513ca5a24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s @@ -82,5 +82,3 @@ glabel func_80B46F2C /* 02FF4 80B47044 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02FF8 80B47048 03E00008 */ jr $ra /* 02FFC 80B4704C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s index 7088e7d244..70a829d8b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s @@ -58,5 +58,3 @@ glabel func_80B47050 /* 030C4 80B47114 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 030C8 80B47118 03E00008 */ jr $ra /* 030CC 80B4711C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47120.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47120.s index 7cadc3875c..3fdea783ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47120.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47120.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B4A384 + .float 0.05 + +.text glabel func_80B47120 /* 030D0 80B47120 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 030D4 80B47124 AFBF0014 */ sw $ra, 0x0014($sp) @@ -158,5 +163,3 @@ glabel func_80B47120 /* 03304 80B47354 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03308 80B47358 03E00008 */ jr $ra /* 0330C 80B4735C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s index 646840b41f..9516ca2b06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s @@ -57,5 +57,3 @@ glabel func_80B47360 /* 033E0 80B47430 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 033E4 80B47434 03E00008 */ jr $ra /* 033E8 80B47438 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s index da78de2713..496697dd56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s @@ -44,5 +44,3 @@ glabel func_80B4743C /* 03488 80B474D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0348C 80B474DC 03E00008 */ jr $ra /* 03490 80B474E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s index f52a9c4e5d..2a9faaea43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s @@ -23,5 +23,3 @@ glabel func_80B474E4 /* 034E8 80B47538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 034EC 80B4753C 03E00008 */ jr $ra /* 034F0 80B47540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s index ca67dc0e81..c506e9f777 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s @@ -168,5 +168,3 @@ glabel func_80B47544 /* 03740 80B47790 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 03744 80B47794 03E00008 */ jr $ra /* 03748 80B47798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s index 77764a6229..27a2d43bd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s @@ -31,5 +31,3 @@ glabel func_80B4779C /* 037C0 80B47810 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 037C4 80B47814 03E00008 */ jr $ra /* 037C8 80B47818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s index b97bf7212f..d3a3627d79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B4A388 + .word 0x44098000 +glabel D_80B4A38C + .float 1.2 + +glabel D_80B4A390 + .float 1.2 + +.text glabel func_80B4781C /* 037CC 80B4781C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 037D0 80B47820 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -298,5 +308,3 @@ glabel func_80B4781C /* 03C08 80B47C58 8FB10038 */ lw $s1, 0x0038($sp) /* 03C0C 80B47C5C 03E00008 */ jr $ra /* 03C10 80B47C60 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s index e305a67a50..b287f9b979 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s @@ -36,5 +36,3 @@ glabel func_80B47C64 /* 03C9C 80B47CEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03CA0 80B47CF0 03E00008 */ jr $ra /* 03CA4 80B47CF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s index 3610bd04ff..75650fcb68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s @@ -49,5 +49,3 @@ glabel func_80B47CF8 /* 03D4C 80B47D9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03D50 80B47DA0 03E00008 */ jr $ra /* 03D54 80B47DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s index 16978b2e78..2d8ebda34f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s @@ -75,5 +75,3 @@ glabel func_80B47DA8 /* 03E58 80B47EA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03E5C 80B47EAC 03E00008 */ jr $ra /* 03E60 80B47EB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s index 54a4c8df91..6a2fd9a869 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B4A394 + .float 0.05 + +.text glabel func_80B47EB4 /* 03E64 80B47EB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 03E68 80B47EB8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -234,5 +239,3 @@ glabel func_80B47EB4 /* 041B4 80B48204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 041B8 80B48208 03E00008 */ jr $ra /* 041BC 80B4820C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s index 1dd51f8620..2f614c7f5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s @@ -43,5 +43,3 @@ glabel func_80B48210 /* 0425C 80B482AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04260 80B482B0 03E00008 */ jr $ra /* 04264 80B482B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s index 51caed567d..04ed89f060 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s @@ -82,5 +82,3 @@ glabel func_80B482B8 /* 04388 80B483D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0438C 80B483DC 03E00008 */ jr $ra /* 04390 80B483E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s index 1045c075ac..28b32de079 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s @@ -110,5 +110,3 @@ glabel func_80B483E4 /* 0451C 80B4856C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04520 80B48570 03E00008 */ jr $ra /* 04524 80B48574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s index 52e747a870..68e2569f5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B4A398 + .float -0.8 + +glabel D_80B4A39C + .float -0.8 + +.text glabel func_80B48578 /* 04528 80B48578 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 0452C 80B4857C AFBF0024 */ sw $ra, 0x0024($sp) @@ -535,5 +543,3 @@ glabel func_80B48578 /* 04C90 80B48CE0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 04C94 80B48CE4 03E00008 */ jr $ra /* 04C98 80B48CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s index de114a9441..3caa1453d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s @@ -97,5 +97,3 @@ glabel func_80B48CEC /* 04DF4 80B48E44 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04DF8 80B48E48 03E00008 */ jr $ra /* 04DFC 80B48E4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s index 7c4014359f..0253a73692 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s @@ -95,5 +95,3 @@ glabel func_80B48E50 /* 04F34 80B48F84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04F38 80B48F88 03E00008 */ jr $ra /* 04F3C 80B48F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s index 5269a3f058..e4c9021305 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B4A3A0 + .word 0x462AA000 + +.text glabel func_80B48F90 /* 04F40 80B48F90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 04F44 80B48F94 AFBF0014 */ sw $ra, 0x0014($sp) @@ -81,5 +86,3 @@ glabel func_80B48F90 /* 05058 80B490A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0505C 80B490AC 03E00008 */ jr $ra /* 05060 80B490B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B490B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B490B4.s index 10cc2017e7..5dcc9cd6ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B490B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B490B4.s @@ -113,5 +113,3 @@ glabel func_80B490B4 /* 051F0 80B49240 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 051F4 80B49244 03E00008 */ jr $ra /* 051F8 80B49248 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s index 3cd2fd09c6..83d0bf5276 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s @@ -38,5 +38,3 @@ glabel func_80B495FC .L80B49680: /* 05630 80B49680 03E00008 */ jr $ra /* 05634 80B49684 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s index bc896b31e6..18d73f6f38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s @@ -1,3 +1,47 @@ +.late_rodata +glabel jtbl_80B4A3A4 +.word L80B4985C +.word L80B49864 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B4988C +.word L80B498A0 +.word L80B49874 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B4987C +.word L80B498A0 +.word L80B4986C +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B49894 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B4989C +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B498A0 +.word L80B49884 + +.text glabel func_80B49688 /* 05638 80B49688 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0563C 80B4968C AFB10020 */ sw $s1, 0x0020($sp) @@ -166,5 +210,3 @@ glabel L80B498A0 /* 0587C 80B498CC 8FB10020 */ lw $s1, 0x0020($sp) /* 05880 80B498D0 03E00008 */ jr $ra /* 05884 80B498D4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s index d9e4f59017..66fa71bd50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s @@ -54,5 +54,3 @@ glabel func_80B49B60 /* 05BD0 80B49C20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05BD4 80B49C24 03E00008 */ jr $ra /* 05BD8 80B49C28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49C2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49C2C.s index da2510818a..dfa1201c3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49C2C.s @@ -152,5 +152,3 @@ glabel func_80B49C2C /* 05DF0 80B49E40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05DF4 80B49E44 03E00008 */ jr $ra /* 05DF8 80B49E48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49E4C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49E4C.s index 61eb66b15b..30497c5e6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49E4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49E4C.s @@ -166,4 +166,3 @@ glabel func_80B49E4C /* 06034 80B4A084 00000000 */ nop /* 06038 80B4A088 00000000 */ nop /* 0603C 80B4A08C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s index 73d37901fd..ca077012e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s @@ -14,5 +14,3 @@ glabel EnZl1_Destroy /* 002CC 80B4AE0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002D0 80B4AE10 03E00008 */ jr $ra /* 002D4 80B4AE14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s index 377ca27fd1..0913071f90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B4E720 + .asciz "../z_en_girlB.c" + .balign 4 + +glabel D_80B4E730 + .asciz "../z_en_girlB.c" + .balign 4 + +.text glabel EnZl1_Draw /* 0191C 80B4C45C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01920 80B4C460 AFBF002C */ sw $ra, 0x002C($sp) @@ -92,4 +102,3 @@ glabel EnZl1_Draw /* 01A84 80B4C5C4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01A88 80B4C5C8 03E00008 */ jr $ra /* 01A8C 80B4C5CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s index 5aa093fc2d..fa550ebf96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s @@ -192,5 +192,3 @@ glabel EnZl1_Init /* 00294 80B4ADD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00298 80B4ADD8 03E00008 */ jr $ra /* 0029C 80B4ADDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s index b3871861c8..d48db3f2c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s @@ -80,5 +80,3 @@ glabel EnZl1_Update /* 017F4 80B4C334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 017F8 80B4C338 03E00008 */ jr $ra /* 017FC 80B4C33C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s index 5d4020785a..f1d3d4dc3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s @@ -3,5 +3,3 @@ glabel func_80B4AB40 /* 00004 80B4AB44 00000000 */ nop /* 00008 80B4AB48 03E00008 */ jr $ra /* 0000C 80B4AB4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s index d11be70e22..4625c83338 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s @@ -71,5 +71,3 @@ glabel func_80B4AE18 /* 003CC 80B4AF0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003D0 80B4AF10 03E00008 */ jr $ra /* 003D4 80B4AF14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s index 8f8224c598..2c22c1c1d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s @@ -67,5 +67,3 @@ glabel func_80B4AF18 /* 004C4 80B4B004 8FB10028 */ lw $s1, 0x0028($sp) /* 004C8 80B4B008 03E00008 */ jr $ra /* 004CC 80B4B00C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s index 4d8b0df7cd..beeb9375cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s @@ -145,5 +145,3 @@ glabel func_80B4B010 /* 006F4 80B4B234 8FB10028 */ lw $s1, 0x0028($sp) /* 006F8 80B4B238 03E00008 */ jr $ra /* 006FC 80B4B23C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s index d70c005447..0ced76a965 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_80B4E740 +.word L80B4B308 +.word L80B4B3B8 +.word L80B4B44C +.word L80B4B4C4 +.word L80B4B524 +.word L80B4B59C +.word L80B4B5E0 +.word L80B4B640 +.word L80B4B684 +.word L80B4B6FC + +.text glabel func_80B4B240 /* 00700 80B4B240 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00704 80B4B244 3C0F80B5 */ lui $t7, %hi(D_80B4E654) ## $t7 = 80B50000 @@ -390,5 +404,3 @@ glabel L80B4B6FC /* 00CA8 80B4B7E8 8FB10028 */ lw $s1, 0x0028($sp) /* 00CAC 80B4B7EC 03E00008 */ jr $ra /* 00CB0 80B4B7F0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s index 1d5d21e48b..463231693d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s @@ -15,5 +15,3 @@ glabel func_80B4B7F4 /* 00CE8 80B4B828 468084A0 */ cvt.s.w $f18, $f16 /* 00CEC 80B4B82C 03E00008 */ jr $ra /* 00CF0 80B4B830 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s index f0851e8d57..f1cf978e13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s @@ -15,5 +15,3 @@ glabel func_80B4B834 /* 00D28 80B4B868 468084A0 */ cvt.s.w $f18, $f16 /* 00D2C 80B4B86C 03E00008 */ jr $ra /* 00D30 80B4B870 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s index 2a587fa048..e06d28df46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s @@ -15,5 +15,3 @@ glabel func_80B4B874 /* 00D68 80B4B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00D6C 80B4B8AC 03E00008 */ jr $ra /* 00D70 80B4B8B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s index 51705c45cb..db7cae79d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s @@ -205,5 +205,3 @@ glabel func_80B4B8B4 /* 01078 80B4BBB8 8FB20030 */ lw $s2, 0x0030($sp) /* 0107C 80B4BBBC 03E00008 */ jr $ra /* 01080 80B4BBC0 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s index acdcb013b7..12d4851112 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s @@ -46,5 +46,3 @@ glabel func_80B4BBC4 /* 0112C 80B4BC6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01130 80B4BC70 03E00008 */ jr $ra /* 01134 80B4BC74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s index 9b2f5a5b13..dbe498ebe6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s @@ -185,5 +185,3 @@ glabel func_80B4BC78 /* 013E0 80B4BF20 8FB10028 */ lw $s1, 0x0028($sp) /* 013E4 80B4BF24 03E00008 */ jr $ra /* 013E8 80B4BF28 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s index 516489b7bb..592104b526 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s @@ -1,3 +1,15 @@ +.late_rodata +glabel jtbl_80B4E768 +.word L80B4BF6C +.word L80B4BFE0 +.word L80B4C070 +.word L80B4C0E8 +.word L80B4C130 +.word L80B4C17C +.word L80B4C1A0 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel func_80B4BF2C /* 013EC 80B4BF2C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 013F0 80B4BF30 AFBF002C */ sw $ra, 0x002C($sp) @@ -201,5 +213,3 @@ glabel L80B4C1A0 /* 016D4 80B4C214 8FB10028 */ lw $s1, 0x0028($sp) /* 016D8 80B4C218 03E00008 */ jr $ra /* 016DC 80B4C21C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s index 1a3c3a5b6a..5be83fbcc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s @@ -51,5 +51,3 @@ glabel func_80B4C340 .L80B4C3F8: /* 018B8 80B4C3F8 03E00008 */ jr $ra /* 018BC 80B4C3FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s index 22195a0917..9bb1835daa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s @@ -23,5 +23,3 @@ glabel func_80B4C400 /* 01910 80B4C450 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01914 80B4C454 03E00008 */ jr $ra /* 01918 80B4C458 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s index 6a7dbc1057..9f0ce582a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s @@ -7,5 +7,3 @@ glabel EnZl2_Destroy /* 00014 80B4E9A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00018 80B4E9A8 03E00008 */ jr $ra /* 0001C 80B4E9AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s index 7aeed7138d..8e10ad5f9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B52B78 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnZl2_Draw /* 03E1C 80B527AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03E20 80B527B0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -28,4 +34,3 @@ glabel EnZl2_Draw /* 03E74 80B52804 00000000 */ nop /* 03E78 80B52808 00000000 */ nop /* 03E7C 80B5280C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s index 170663d066..5f4976c490 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s @@ -45,5 +45,3 @@ glabel EnZl2_Init /* 039AC 80B5233C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 039B0 80B52340 03E00008 */ jr $ra /* 039B4 80B52344 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s index 5922ee1947..cd0c6e3489 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B52ABC + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnZl2_Update /* 038B4 80B52244 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 038B8 80B52248 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnZl2_Update /* 03904 80B52294 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03908 80B52298 03E00008 */ jr $ra /* 0390C 80B5229C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s index 02e4717c0a..d0a1173b03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s @@ -40,5 +40,3 @@ glabel func_80B4E9B0 /* 000A4 80B4EA34 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000A8 80B4EA38 03E00008 */ jr $ra /* 000AC 80B4EA3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s index 0063293e19..1147590861 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s @@ -48,5 +48,3 @@ glabel func_80B4EA40 /* 00158 80B4EAE8 A4880194 */ sh $t0, 0x0194($a0) ## 00000194 /* 0015C 80B4EAEC 03E00008 */ jr $ra /* 00160 80B4EAF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s index a21d0d6a23..c6a48010b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s @@ -53,5 +53,3 @@ glabel func_80B4EAF4 /* 0021C 80B4EBAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00220 80B4EBB0 03E00008 */ jr $ra /* 00224 80B4EBB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s index 616b58843d..f05c43dc30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s @@ -38,5 +38,3 @@ glabel func_80B4EBB8 /* 002AC 80B4EC3C A4990194 */ sh $t9, 0x0194($a0) ## 00000194 /* 002B0 80B4EC40 03E00008 */ jr $ra /* 002B4 80B4EC44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s index a1222bbe45..e2b558bd65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s @@ -43,5 +43,3 @@ glabel func_80B4EC48 /* 0034C 80B4ECDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00350 80B4ECE0 03E00008 */ jr $ra /* 00354 80B4ECE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s index b82e9209e2..71c307e492 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s @@ -6,5 +6,3 @@ glabel func_80B4ECE8 /* 00368 80B4ECF8 848E0190 */ lh $t6, 0x0190($a0) ## 00000190 /* 0036C 80B4ECFC 03E00008 */ jr $ra /* 00370 80B4ED00 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s index 33ebb5ca14..8845818c44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s @@ -4,5 +4,3 @@ glabel func_80B4ED04 /* 0037C 80B4ED0C 00052C03 */ sra $a1, $a1, 16 /* 00380 80B4ED10 03E00008 */ jr $ra /* 00384 80B4ED14 A4850194 */ sh $a1, 0x0194($a0) ## 00000194 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s index 2c45dc64ad..267d007586 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s @@ -4,5 +4,3 @@ glabel func_80B4ED18 /* 00390 80B4ED20 00052C03 */ sra $a1, $a1, 16 /* 00394 80B4ED24 03E00008 */ jr $ra /* 00398 80B4ED28 A4850198 */ sh $a1, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s index 3790c3f08c..9402ed3f92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s @@ -17,5 +17,3 @@ glabel func_80B4ED2C /* 003D8 80B4ED68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 003DC 80B4ED6C 03E00008 */ jr $ra /* 003E0 80B4ED70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s index 8e3f2fd48c..8f13c75ca5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s @@ -8,5 +8,3 @@ glabel func_80B4ED74 /* 003F8 80B4ED88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003FC 80B4ED8C 03E00008 */ jr $ra /* 00400 80B4ED90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s index 79f88d1be9..7840fd6cb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s @@ -9,5 +9,3 @@ glabel func_80B4ED94 .L80B4EDB0: /* 00420 80B4EDB0 03E00008 */ jr $ra /* 00424 80B4EDB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s index b40f08078b..3cf56f0452 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s @@ -32,5 +32,3 @@ glabel func_80B4EDB8 /* 0049C 80B4EE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A0 80B4EE30 03E00008 */ jr $ra /* 004A4 80B4EE34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s index 1cdb14501b..a4d0b8b664 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s @@ -83,5 +83,3 @@ glabel func_80B4EE38 /* 005C8 80B4EF58 008A5821 */ addu $t3, $a0, $t2 /* 005CC 80B4EF5C 03E00008 */ jr $ra /* 005D0 80B4EF60 A565020C */ sh $a1, 0x020C($t3) ## 0000020C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s index 5f6efa9397..037c4cde1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B52BB0 + .word 0x455AC000 + +.text glabel func_80B4EF64 /* 005D4 80B4EF64 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 005D8 80B4EF68 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 @@ -204,5 +209,3 @@ glabel func_80B4EF64 /* 00894 80B4F224 00EFC821 */ addu $t9, $a3, $t7 /* 00898 80B4F228 03E00008 */ jr $ra /* 0089C 80B4F22C A72E020C */ sh $t6, 0x020C($t9) ## 0000020C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F230.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F230.s index cb2279df2a..8e0c5e039f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F230.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F230.s @@ -159,5 +159,3 @@ glabel func_80B4F230 /* 00AC0 80B4F450 008FC021 */ addu $t8, $a0, $t7 /* 00AC4 80B4F454 03E00008 */ jr $ra /* 00AC8 80B4F458 A707020C */ sh $a3, 0x020C($t8) ## 0000020C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s index 2d46c24417..ce60369cab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s @@ -1,3 +1,49 @@ +.rdata +glabel D_80B52900 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52910 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52920 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52930 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52940 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52950 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52960 + .asciz "../z_en_zl2.c" + .balign 4 + +.late_rodata +glabel D_80B52BB4 + .word 0xC47EC000 +glabel D_80B52BB8 + .word 0x43E98000 +glabel D_80B52BBC + .word 0x43848000 +glabel D_80B52BC0 + .word 0xC3D58000 +glabel D_80B52BC4 + .word 0x43E98000 +glabel D_80B52BC8 + .word 0x43848000 +glabel D_80B52BCC + .word 0xC3D58000 + +.text glabel func_80B4F45C /* 00ACC 80B4F45C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00AD0 80B4F460 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E @@ -462,5 +508,3 @@ glabel func_80B4F45C /* 011D8 80B4FB68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 011DC 80B4FB6C 03E00008 */ jr $ra /* 011E0 80B4FB70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s index f9f2c81dda..2cf6ebbd80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s @@ -1,3 +1,15 @@ +.rdata +glabel D_80B52970 + .asciz "../z_en_zl2.c" + .balign 4 + +.late_rodata +glabel D_80B52BD0 + .word 0x4474C000 +glabel D_80B52BD4 + .float 1.2 + +.text glabel func_80B4FB74 /* 011E4 80B4FB74 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 011E8 80B4FB78 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A @@ -88,5 +100,3 @@ glabel func_80B4FB74 /* 01330 80B4FCC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01334 80B4FCC4 03E00008 */ jr $ra /* 01338 80B4FCC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s index 0ba0e21a63..6c29919dd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s @@ -12,5 +12,3 @@ glabel func_80B4FCCC /* 01364 80B4FCF4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01368 80B4FCF8 03E00008 */ jr $ra /* 0136C 80B4FCFC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s index 50848ceff0..0cd5e9bd8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s @@ -39,5 +39,3 @@ glabel func_80B4FD00 /* 013F4 80B4FD84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 013F8 80B4FD88 03E00008 */ jr $ra /* 013FC 80B4FD8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s index 2c135a9a85..8b22547d26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s @@ -16,5 +16,3 @@ glabel func_80B4FD90 /* 01438 80B4FDC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0143C 80B4FDCC 03E00008 */ jr $ra /* 01440 80B4FDD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s index 8917daf5f0..d46d24b723 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s @@ -15,5 +15,3 @@ glabel func_80B4FDD4 /* 01474 80B4FE04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01478 80B4FE08 03E00008 */ jr $ra /* 0147C 80B4FE0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s index b0af367073..7562fedbeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s @@ -15,5 +15,3 @@ glabel func_80B4FE10 /* 014AC 80B4FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014B0 80B4FE40 03E00008 */ jr $ra /* 014B4 80B4FE44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s index ed60813022..932383f40a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s @@ -8,5 +8,3 @@ glabel func_80B4FE48 /* 014D0 80B4FE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014D4 80B4FE64 03E00008 */ jr $ra /* 014D8 80B4FE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s index 2cd426eada..9640eb038c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s @@ -8,5 +8,3 @@ glabel func_80B4FE6C /* 014F4 80B4FE84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 014F8 80B4FE88 03E00008 */ jr $ra /* 014FC 80B4FE8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s index 6db8e846d9..884947d12f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s @@ -8,5 +8,3 @@ glabel func_80B4FE90 /* 01518 80B4FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0151C 80B4FEAC 03E00008 */ jr $ra /* 01520 80B4FEB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s index 8ffc8efb32..a2bbf05739 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s @@ -8,5 +8,3 @@ glabel func_80B4FEB4 /* 0153C 80B4FECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01540 80B4FED0 03E00008 */ jr $ra /* 01544 80B4FED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s index 8250231fe9..745d0a8411 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s @@ -8,5 +8,3 @@ glabel func_80B4FED8 /* 01560 80B4FEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01564 80B4FEF4 03E00008 */ jr $ra /* 01568 80B4FEF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s index 92b1803d28..ed3be04138 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s @@ -35,5 +35,3 @@ glabel func_80B4FEFC /* 015E8 80B4FF78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 015EC 80B4FF7C 03E00008 */ jr $ra /* 015F0 80B4FF80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s index db1a836a98..a181216d15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s @@ -28,5 +28,3 @@ glabel func_80B4FF84 /* 01654 80B4FFE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01658 80B4FFE8 03E00008 */ jr $ra /* 0165C 80B4FFEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s index 0f6d4ec53a..e500655ecf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s @@ -40,5 +40,3 @@ glabel func_80B4FFF0 /* 016F0 80B50080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 016F4 80B50084 03E00008 */ jr $ra /* 016F8 80B50088 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s index cfd53d90f8..56836a4ba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s @@ -21,5 +21,3 @@ glabel func_80B5008C .L80B500D8: /* 01748 80B500D8 03E00008 */ jr $ra /* 0174C 80B500DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s index 4aaaeee26d..396e9239e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s @@ -57,5 +57,3 @@ glabel func_80B500E0 /* 01828 80B501B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0182C 80B501BC 03E00008 */ jr $ra /* 01830 80B501C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s index 24070da802..fa6a340d30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s @@ -9,5 +9,3 @@ glabel func_80B501C4 .L80B501E0: /* 01850 80B501E0 03E00008 */ jr $ra /* 01854 80B501E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s index da9471e908..81b0a62a02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s @@ -30,5 +30,3 @@ glabel func_80B501E8 /* 018C4 80B50254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018C8 80B50258 03E00008 */ jr $ra /* 018CC 80B5025C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s index 83fd738009..fe75500b54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s @@ -5,5 +5,3 @@ glabel func_80B50260 /* 018DC 80B5026C AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 /* 018E0 80B50270 03E00008 */ jr $ra /* 018E4 80B50274 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s index 035a4eb043..d31c7ca080 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s @@ -34,5 +34,3 @@ glabel func_80B50278 /* 01968 80B502F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0196C 80B502FC 03E00008 */ jr $ra /* 01970 80B50300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s index ecc83072e0..223b0243e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B52BD8 + .word 0x4622F983 + +.text glabel func_80B50304 /* 01974 80B50304 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01978 80B50308 AFB00020 */ sw $s0, 0x0020($sp) @@ -53,5 +58,3 @@ glabel func_80B50304 /* 01A40 80B503D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01A44 80B503D4 03E00008 */ jr $ra /* 01A48 80B503D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s index 299eb2a2f5..ba3de96989 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s @@ -20,5 +20,3 @@ glabel func_80B503DC /* 01A90 80B50420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A94 80B50424 03E00008 */ jr $ra /* 01A98 80B50428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s index 80b5d87471..cb6a6fd0a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s @@ -22,5 +22,3 @@ glabel func_80B5042C /* 01AEC 80B5047C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01AF0 80B50480 03E00008 */ jr $ra /* 01AF4 80B50484 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s index 419ee19df0..99f071263e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s @@ -19,5 +19,3 @@ glabel func_80B50488 /* 01B38 80B504C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01B3C 80B504CC 03E00008 */ jr $ra /* 01B40 80B504D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s index c9b45b6526..88b99bd50c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s @@ -25,5 +25,3 @@ glabel func_80B504D4 /* 01BA0 80B50530 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01BA4 80B50534 03E00008 */ jr $ra /* 01BA8 80B50538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s index b4b722f2ee..058f01ede7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s @@ -17,5 +17,3 @@ glabel func_80B5053C /* 01BE4 80B50574 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01BE8 80B50578 03E00008 */ jr $ra /* 01BEC 80B5057C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s index 4e32ae8cdf..d7f99a47b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s @@ -20,5 +20,3 @@ glabel func_80B50580 /* 01C38 80B505C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C3C 80B505CC 03E00008 */ jr $ra /* 01C40 80B505D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s index f739d6d4e4..90855d5e91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s @@ -17,5 +17,3 @@ glabel func_80B505D4 /* 01C7C 80B5060C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C80 80B50610 03E00008 */ jr $ra /* 01C84 80B50614 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s index a539ee8a5f..3dd0cc050e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s @@ -10,5 +10,3 @@ glabel func_80B50618 /* 01CA8 80B50638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CAC 80B5063C 03E00008 */ jr $ra /* 01CB0 80B50640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s index aec1bb00ee..a4b5e04e7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s @@ -10,5 +10,3 @@ glabel func_80B50644 /* 01CD4 80B50664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CD8 80B50668 03E00008 */ jr $ra /* 01CDC 80B5066C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s index 5b7827deff..f888f08f18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s @@ -20,5 +20,3 @@ glabel func_80B50670 /* 01D28 80B506B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01D2C 80B506BC 03E00008 */ jr $ra /* 01D30 80B506C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s index 18bd84dc17..6854e9dfed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s @@ -29,5 +29,3 @@ glabel func_80B506C4 /* 01DA0 80B50730 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01DA4 80B50734 03E00008 */ jr $ra /* 01DA8 80B50738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s index 2dc120e0f3..fd065fca4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s @@ -17,5 +17,3 @@ glabel func_80B5073C /* 01DE4 80B50774 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01DE8 80B50778 03E00008 */ jr $ra /* 01DEC 80B5077C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s index 61274563c5..ce31fc01ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s @@ -25,5 +25,3 @@ glabel func_80B50780 /* 01E4C 80B507DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E50 80B507E0 03E00008 */ jr $ra /* 01E54 80B507E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s index 4130db9439..d5412d43c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s @@ -17,5 +17,3 @@ glabel func_80B507E8 /* 01E90 80B50820 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E94 80B50824 03E00008 */ jr $ra /* 01E98 80B50828 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s index 1693de165f..71cb2b60b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s @@ -20,5 +20,3 @@ glabel func_80B5082C /* 01EE4 80B50874 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EE8 80B50878 03E00008 */ jr $ra /* 01EEC 80B5087C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s index 89cdb098d7..adb975fcab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s @@ -18,5 +18,3 @@ glabel func_80B50880 /* 01F2C 80B508BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F30 80B508C0 03E00008 */ jr $ra /* 01F34 80B508C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s index d1381a6c15..e59a363ee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s @@ -23,5 +23,3 @@ glabel func_80B508C8 /* 01F8C 80B5091C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F90 80B50920 03E00008 */ jr $ra /* 01F94 80B50924 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s index 302302a768..63db6d21dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s @@ -18,5 +18,3 @@ glabel func_80B50928 /* 01FD4 80B50964 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01FD8 80B50968 03E00008 */ jr $ra /* 01FDC 80B5096C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s index 31d33f2b13..5c1a1076a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s @@ -3,5 +3,3 @@ glabel func_80B50970 /* 01FE4 80B50974 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 /* 01FE8 80B50978 03E00008 */ jr $ra /* 01FEC 80B5097C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s index 349c6ecac6..c10fbb11ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s @@ -7,5 +7,3 @@ glabel func_80B50980 /* 02004 80B50994 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 /* 02008 80B50998 03E00008 */ jr $ra /* 0200C 80B5099C AC9801A8 */ sw $t8, 0x01A8($a0) ## 000001A8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s index be9b363c7b..9ab2b5adde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s @@ -26,5 +26,3 @@ glabel func_80B509A0 /* 02068 80B509F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0206C 80B509FC 03E00008 */ jr $ra /* 02070 80B50A00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s index 144f82c948..e39df4cda1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s @@ -1,3 +1,27 @@ +.rdata +glabel D_80B52980 + .asciz "En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80B52BDC +.word L80B50A6C +.word L80B50A80 +.word L80B50A94 +.word L80B50AA8 +.word L80B50ABC +.word L80B50AD0 +.word L80B50AE4 +.word L80B50AF8 +.word L80B50B0C +.word L80B50B20 +.word L80B50B34 +.word L80B50B48 +.word L80B50B5C +.word L80B50B70 +.word L80B50B84 + +.text glabel func_80B50A04 /* 02074 80B50A04 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02078 80B50A08 AFB00018 */ sw $s0, 0x0018($sp) @@ -129,5 +153,3 @@ glabel L80B50B84 /* 02220 80B50BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02224 80B50BB4 03E00008 */ jr $ra /* 02228 80B50BB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s index 02e745926f..a6b7bf0524 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s @@ -11,5 +11,3 @@ glabel func_80B50BBC /* 02250 80B50BE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02254 80B50BE4 03E00008 */ jr $ra /* 02258 80B50BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s index 991fbcbb1f..0b4acd2b33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s @@ -20,5 +20,3 @@ glabel func_80B50BEC /* 022A4 80B50C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022A8 80B50C38 03E00008 */ jr $ra /* 022AC 80B50C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s index 1f87e5c405..b1b72eace3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s @@ -25,5 +25,3 @@ glabel func_80B50C40 /* 0230C 80B50C9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02310 80B50CA0 03E00008 */ jr $ra /* 02314 80B50CA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s index 6c8a131ce5..b725c7c482 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s @@ -20,5 +20,3 @@ glabel func_80B50CA8 /* 02360 80B50CF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02364 80B50CF4 03E00008 */ jr $ra /* 02368 80B50CF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s index afa6a24b50..44230c0259 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s @@ -20,5 +20,3 @@ glabel func_80B50CFC /* 023B4 80B50D44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 023B8 80B50D48 03E00008 */ jr $ra /* 023BC 80B50D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s index 6563653deb..b42b854064 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s @@ -16,5 +16,3 @@ glabel func_80B50D50 /* 023F8 80B50D88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023FC 80B50D8C 03E00008 */ jr $ra /* 02400 80B50D90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s index 6237e53ee2..6e54f61a0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s @@ -20,5 +20,3 @@ glabel func_80B50D94 /* 0244C 80B50DDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02450 80B50DE0 03E00008 */ jr $ra /* 02454 80B50DE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s index b7733585e9..8b27e664e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s @@ -20,5 +20,3 @@ glabel func_80B50DE8 /* 024A0 80B50E30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024A4 80B50E34 03E00008 */ jr $ra /* 024A8 80B50E38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s index 2454ee5d7b..fa24de328b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s @@ -20,5 +20,3 @@ glabel func_80B50E3C /* 024F4 80B50E84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024F8 80B50E88 03E00008 */ jr $ra /* 024FC 80B50E8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s index c12034fa09..4ad0835bf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s @@ -20,5 +20,3 @@ glabel func_80B50E90 /* 02548 80B50ED8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0254C 80B50EDC 03E00008 */ jr $ra /* 02550 80B50EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s index 5021163883..d94fa009c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s @@ -20,5 +20,3 @@ glabel func_80B50EE4 /* 0259C 80B50F2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 025A0 80B50F30 03E00008 */ jr $ra /* 025A4 80B50F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s index 48c86be87b..7b4801bd75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s @@ -20,5 +20,3 @@ glabel func_80B50F38 /* 025F0 80B50F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 025F4 80B50F84 03E00008 */ jr $ra /* 025F8 80B50F88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s index 98b4d5ab64..f7f574d4ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s @@ -22,5 +22,3 @@ glabel func_80B50F8C /* 0264C 80B50FDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02650 80B50FE0 03E00008 */ jr $ra /* 02654 80B50FE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s index c52d11f844..caf9ae8af3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s @@ -18,5 +18,3 @@ glabel func_80B50FE8 /* 02698 80B51028 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0269C 80B5102C 03E00008 */ jr $ra /* 026A0 80B51030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s index 0ed87033d5..f27f40fd08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s @@ -18,5 +18,3 @@ glabel func_80B51034 /* 026E4 80B51074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 026E8 80B51078 03E00008 */ jr $ra /* 026EC 80B5107C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s index d6166a4b58..afef6176ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s @@ -18,5 +18,3 @@ glabel func_80B51080 /* 02730 80B510C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02734 80B510C4 03E00008 */ jr $ra /* 02738 80B510C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s index 031c27bbd0..624d586786 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s @@ -18,5 +18,3 @@ glabel func_80B510CC /* 0277C 80B5110C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02780 80B51110 03E00008 */ jr $ra /* 02784 80B51114 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s index 1bdf6109d1..e535cfa3c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s @@ -18,5 +18,3 @@ glabel func_80B51118 /* 027C8 80B51158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 027CC 80B5115C 03E00008 */ jr $ra /* 027D0 80B51160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s index 95f1a86cec..7d4ea9c25f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s @@ -18,5 +18,3 @@ glabel func_80B51164 /* 02814 80B511A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02818 80B511A8 03E00008 */ jr $ra /* 0281C 80B511AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s index 0b1304af2e..af39bc5b7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s @@ -18,5 +18,3 @@ glabel func_80B511B0 /* 02860 80B511F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02864 80B511F4 03E00008 */ jr $ra /* 02868 80B511F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s index 48a24956b6..fdc4735a75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s @@ -20,5 +20,3 @@ glabel func_80B511FC /* 028B4 80B51244 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 028B8 80B51248 03E00008 */ jr $ra /* 028BC 80B5124C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s index caafcbb132..98006fae20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s @@ -25,5 +25,3 @@ glabel func_80B51250 /* 0291C 80B512AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02920 80B512B0 03E00008 */ jr $ra /* 02924 80B512B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s index 25f645956a..3f031c20a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s @@ -21,5 +21,3 @@ glabel func_80B512B8 /* 02974 80B51304 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02978 80B51308 03E00008 */ jr $ra /* 0297C 80B5130C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s index 6e645625bb..0706b81f75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s @@ -22,5 +22,3 @@ glabel func_80B51310 /* 029C0 80B51350 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029C4 80B51354 03E00008 */ jr $ra /* 029C8 80B51358 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s index e0c255b8a4..548d3c9290 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s @@ -18,5 +18,3 @@ glabel func_80B5135C /* 02A0C 80B5139C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02A10 80B513A0 03E00008 */ jr $ra /* 02A14 80B513A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s index 058b695b4f..eebd9fce1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s @@ -29,5 +29,3 @@ glabel func_80B513A8 /* 02A7C 80B5140C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02A80 80B51410 03E00008 */ jr $ra /* 02A84 80B51414 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s index 540fbabde4..d8d30da7e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s @@ -22,5 +22,3 @@ glabel func_80B51418 /* 02AD0 80B51460 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02AD4 80B51464 03E00008 */ jr $ra /* 02AD8 80B51468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s index deee4c6211..7ac0136fb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s @@ -11,5 +11,3 @@ glabel func_80B5146C /* 02B00 80B51490 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02B04 80B51494 03E00008 */ jr $ra /* 02B08 80B51498 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s index 8ee6a22f74..debbbb4e8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s @@ -24,5 +24,3 @@ glabel func_80B5149C /* 02B5C 80B514EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02B60 80B514F0 03E00008 */ jr $ra /* 02B64 80B514F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s index 59c341fab0..29336daaef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s @@ -22,5 +22,3 @@ glabel func_80B514F8 /* 02BB0 80B51540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02BB4 80B51544 03E00008 */ jr $ra /* 02BB8 80B51548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s index 383cbd72cc..b92ad57f49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s @@ -34,5 +34,3 @@ glabel func_80B5154C /* 02C28 80B515B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C2C 80B515BC 03E00008 */ jr $ra /* 02C30 80B515C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s index 0ba3824302..bfa029a20e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s @@ -4,5 +4,3 @@ glabel func_80B515C4 /* 02C3C 80B515CC AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 /* 02C40 80B515D0 03E00008 */ jr $ra /* 02C44 80B515D4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s index 2dbfa78e82..ebfe783c1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s @@ -26,5 +26,3 @@ glabel func_80B515D8 /* 02CA8 80B51638 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02CAC 80B5163C 03E00008 */ jr $ra /* 02CB0 80B51640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s index c739c44bb6..f115ad9dd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s @@ -13,5 +13,3 @@ glabel func_80B51644 /* 02CDC 80B5166C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02CE0 80B51670 03E00008 */ jr $ra /* 02CE4 80B51674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s index e0eddaf5b5..e1da3006e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s @@ -21,5 +21,3 @@ glabel func_80B51678 /* 02D34 80B516C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D38 80B516C8 03E00008 */ jr $ra /* 02D3C 80B516CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s index 2313b38f72..b713f9bf79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s @@ -13,5 +13,3 @@ glabel func_80B516D0 /* 02D68 80B516F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02D6C 80B516FC 03E00008 */ jr $ra /* 02D70 80B51700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s index 97ba50d6f7..0e7a168c65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s @@ -21,5 +21,3 @@ glabel func_80B51704 /* 02DC0 80B51750 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02DC4 80B51754 03E00008 */ jr $ra /* 02DC8 80B51758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s index ec6d610e48..667aa4e43a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s @@ -13,5 +13,3 @@ glabel func_80B5175C /* 02DF4 80B51784 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02DF8 80B51788 03E00008 */ jr $ra /* 02DFC 80B5178C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s index 6084dbd031..23ee19e622 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s @@ -19,5 +19,3 @@ glabel func_80B51790 /* 02E44 80B517D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E48 80B517D8 03E00008 */ jr $ra /* 02E4C 80B517DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s index a83d6d4591..00d77216db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s @@ -17,5 +17,3 @@ glabel func_80B517E0 /* 02E88 80B51818 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E8C 80B5181C 03E00008 */ jr $ra /* 02E90 80B51820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s index 24d4244ffa..e0cde027e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s @@ -21,5 +21,3 @@ glabel func_80B51824 /* 02EE0 80B51870 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02EE4 80B51874 03E00008 */ jr $ra /* 02EE8 80B51878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s index 9e21d4e7ba..22eb3b5453 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s @@ -17,5 +17,3 @@ glabel func_80B5187C /* 02F24 80B518B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02F28 80B518B8 03E00008 */ jr $ra /* 02F2C 80B518BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s index 7750acb60a..3d60a41f41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s @@ -33,5 +33,3 @@ glabel func_80B518C0 /* 02FAC 80B5193C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02FB0 80B51940 03E00008 */ jr $ra /* 02FB4 80B51944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s index 3471fe3ba7..2fe3759a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s @@ -1,3 +1,34 @@ +.rdata +glabel D_80B529B8 + .asciz "En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80B52C18 +.word L80B519AC +.word L80B519BC +.word L80B51A34 +.word L80B51A00 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B51A34 +.word L80B519D0 +.word L80B519E0 +.word L80B519F0 +.word L80B51A34 +.word L80B51A10 +.word L80B51A20 +.word 0x00000000 + +.text glabel func_80B51948 /* 02FB8 80B51948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02FBC 80B5194C AFB00018 */ sw $s0, 0x0018($sp) @@ -82,5 +113,3 @@ glabel L80B51A34 /* 030C0 80B51A50 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 030C4 80B51A54 03E00008 */ jr $ra /* 030C8 80B51A58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s index d62d19d088..a8e85ef507 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s @@ -11,5 +11,3 @@ glabel func_80B51A5C /* 030F0 80B51A80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 030F4 80B51A84 03E00008 */ jr $ra /* 030F8 80B51A88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s index a534ec4506..304b12aa0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s @@ -21,5 +21,3 @@ glabel func_80B51A8C /* 03148 80B51AD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0314C 80B51ADC 03E00008 */ jr $ra /* 03150 80B51AE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s index c016cda3f0..dce3b12baa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s @@ -23,5 +23,3 @@ glabel func_80B51AE4 /* 031A8 80B51B38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 031AC 80B51B3C 03E00008 */ jr $ra /* 031B0 80B51B40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s index e737703082..4de7c1700f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s @@ -24,5 +24,3 @@ glabel func_80B51B44 /* 0320C 80B51B9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03210 80B51BA0 03E00008 */ jr $ra /* 03214 80B51BA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s index 849a06e2ab..57a5fb1f1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s @@ -24,5 +24,3 @@ glabel func_80B51BA8 /* 03270 80B51C00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03274 80B51C04 03E00008 */ jr $ra /* 03278 80B51C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s index 3167ae8efe..6d08d09ecc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s @@ -21,5 +21,3 @@ glabel func_80B51C0C /* 032C8 80B51C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 032CC 80B51C5C 03E00008 */ jr $ra /* 032D0 80B51C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s index c5d8e21ecf..59f3255102 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s @@ -16,5 +16,3 @@ glabel func_80B51C64 /* 0330C 80B51C9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03310 80B51CA0 03E00008 */ jr $ra /* 03314 80B51CA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s index d5efc6e095..2c502f3f44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s @@ -24,5 +24,3 @@ glabel func_80B51CA8 /* 03370 80B51D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03374 80B51D04 03E00008 */ jr $ra /* 03378 80B51D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s index c451b39649..7dfa2d7d3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s @@ -5,5 +5,3 @@ glabel func_80B51D0C /* 03388 80B51D18 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 /* 0338C 80B51D1C 03E00008 */ jr $ra /* 03390 80B51D20 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s index 912f5c2eb4..f50778a80a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s @@ -34,5 +34,3 @@ glabel func_80B51D24 /* 03408 80B51D98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0340C 80B51D9C 03E00008 */ jr $ra /* 03410 80B51DA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s index e71879d599..817331cb88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s @@ -66,5 +66,3 @@ glabel func_80B51DA4 /* 0350C 80B51E9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 03510 80B51EA0 03E00008 */ jr $ra /* 03514 80B51EA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s index 7398d03500..a97e922589 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s @@ -4,5 +4,3 @@ glabel func_80B51EA8 /* 03520 80B51EB0 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 /* 03524 80B51EB4 03E00008 */ jr $ra /* 03528 80B51EB8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s index a228afd832..fef81bd43b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s @@ -30,5 +30,3 @@ glabel func_80B51EBC /* 0359C 80B51F2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 035A0 80B51F30 03E00008 */ jr $ra /* 035A4 80B51F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s index 15ea990a63..b9f03b14da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s @@ -28,5 +28,3 @@ glabel func_80B51F38 /* 0360C 80B51F9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03610 80B51FA0 03E00008 */ jr $ra /* 03614 80B51FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s index f468f8362b..aa1c2096f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B529F4 + .asciz "En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text glabel func_80B51FA8 /* 03618 80B51FA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0361C 80B51FAC AFB00018 */ sw $s0, 0x0018($sp) @@ -55,5 +61,3 @@ glabel func_80B51FA8 /* 036CC 80B5205C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 036D0 80B52060 03E00008 */ jr $ra /* 036D4 80B52064 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s index 0b3f34a095..be383933c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s @@ -11,5 +11,3 @@ glabel func_80B52068 /* 036FC 80B5208C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03700 80B52090 03E00008 */ jr $ra /* 03704 80B52094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s index a042cc1bd5..7db9bfeac9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s @@ -27,5 +27,3 @@ glabel func_80B52098 /* 0376C 80B520FC 8FB10018 */ lw $s1, 0x0018($sp) /* 03770 80B52100 03E00008 */ jr $ra /* 03774 80B52104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s index 0cb4e9d59d..eaefd8afda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s @@ -2,5 +2,3 @@ glabel func_80B52108 /* 03778 80B52108 AFA40000 */ sw $a0, 0x0000($sp) /* 0377C 80B5210C 03E00008 */ jr $ra /* 03780 80B52110 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s index 0bc1aa5f81..bcb044bd5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B52A30 + .asciz " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B52114 /* 03784 80B52114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03788 80B52118 AFBF0014 */ sw $ra, 0x0014($sp) @@ -40,5 +46,3 @@ glabel func_80B52114 /* 03804 80B52194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03808 80B52198 03E00008 */ jr $ra /* 0380C 80B5219C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s index ae0f676d35..389b6ad17b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B52A74 + .asciz "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B521A0 /* 03810 80B521A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03814 80B521A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -47,5 +53,3 @@ glabel func_80B521A0 /* 038A8 80B52238 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 038AC 80B5223C 03E00008 */ jr $ra /* 038B0 80B52240 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s index 30dcdf64d0..d80262deba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B52AF8 + .asciz "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B52348 /* 039B8 80B52348 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 039BC 80B5234C 8FAE003C */ lw $t6, 0x003C($sp) @@ -32,5 +38,3 @@ glabel func_80B52348 /* 03A20 80B523B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03A24 80B523B4 03E00008 */ jr $ra /* 03A28 80B523B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s index fc5ef3df13..e22870c90b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s @@ -2,5 +2,3 @@ glabel func_80B523BC /* 03A2C 80B523BC AFA40000 */ sw $a0, 0x0000($sp) /* 03A30 80B523C0 03E00008 */ jr $ra /* 03A34 80B523C4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s index 9992002616..c14a2256d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B52B38 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52B48 + .asciz "../z_en_zl2.c" + .balign 4 + +.text glabel func_80B523C8 /* 03A38 80B523C8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) @@ -130,5 +140,3 @@ glabel func_80B523C8 /* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) /* 03C3C 80B525CC 03E00008 */ jr $ra /* 03C40 80B525D0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s index d0914cc134..e3cdee0777 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B52B58 + .asciz "../z_en_zl2.c" + .balign 4 + +glabel D_80B52B68 + .asciz "../z_en_zl2.c" + .balign 4 + +.text glabel func_80B525D4 /* 03C44 80B525D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) @@ -117,5 +127,3 @@ glabel func_80B525D4 /* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) /* 03E14 80B527A4 03E00008 */ jr $ra /* 03E18 80B527A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s index 7dd7deeeda..badf1cd9b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s @@ -10,5 +10,3 @@ glabel EnZl3_Destroy /* 000AC 80B5345C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B0 80B53460 03E00008 */ jr $ra /* 000B4 80B53464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s index b530f1f10f..f878c94dd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B5AA8C + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnZl3_Draw /* 06FF8 80B5A3A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 06FFC 80B5A3AC AFBF0014 */ sw $ra, 0x0014($sp) @@ -29,4 +35,3 @@ glabel EnZl3_Draw /* 07054 80B5A404 00000000 */ nop /* 07058 80B5A408 00000000 */ nop /* 0705C 80B5A40C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s index 0c4959fc67..477366d7cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5A994 + .asciz "ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80B5A9D0 + .asciz "ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnZl3_Init /* 06AEC 80B59E9C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 06AF0 80B59EA0 AFB00028 */ sw $s0, 0x0028($sp) @@ -59,5 +69,3 @@ glabel EnZl3_Init /* 06BB8 80B59F68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 06BBC 80B59F6C 03E00008 */ jr $ra /* 06BC0 80B59F70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s index cd7fef5953..c569ce4fb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B5A958 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel EnZl3_Update /* 06A90 80B59E40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 06A94 80B59E44 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +32,3 @@ glabel EnZl3_Update /* 06AE0 80B59E90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06AE4 80B59E94 03E00008 */ jr $ra /* 06AE8 80B59E98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s index 820059c459..aff2b436f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s @@ -19,5 +19,3 @@ glabel func_80B533B0 /* 00040 80B533F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00044 80B533F4 03E00008 */ jr $ra /* 00048 80B533F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s index f44105c43c..203ce7808e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s @@ -18,5 +18,3 @@ glabel func_80B533FC /* 00084 80B53434 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00088 80B53438 03E00008 */ jr $ra /* 0008C 80B5343C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s index c4f8659800..d93398770d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s @@ -8,5 +8,3 @@ glabel func_80B53468 /* 000CC 80B5347C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D0 80B53480 03E00008 */ jr $ra /* 000D4 80B53484 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s index c422fd36b8..b4e6fe35b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s @@ -20,5 +20,3 @@ glabel func_80B53488 .L80B534C4: /* 00114 80B534C4 03E00008 */ jr $ra /* 00118 80B534C8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s index e7d5dfc123..04e625ee05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s @@ -38,5 +38,3 @@ glabel func_80B534CC /* 00198 80B53548 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0019C 80B5354C 03E00008 */ jr $ra /* 001A0 80B53550 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s index 016559e9f8..992b643536 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s @@ -4,5 +4,3 @@ glabel func_80B53554 /* 001AC 80B5355C 00052C03 */ sra $a1, $a1, 16 /* 001B0 80B53560 03E00008 */ jr $ra /* 001B4 80B53564 A4850244 */ sh $a1, 0x0244($a0) ## 00000244 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s index 80643ff35b..44340e9c97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s @@ -4,5 +4,3 @@ glabel func_80B53568 /* 001C0 80B53570 00052C03 */ sra $a1, $a1, 16 /* 001C4 80B53574 03E00008 */ jr $ra /* 001C8 80B53578 A4850248 */ sh $a1, 0x0248($a0) ## 00000248 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s index ebc655de4e..bf0a3c86a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s @@ -40,5 +40,3 @@ glabel func_80B5357C /* 00258 80B53608 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0025C 80B5360C 03E00008 */ jr $ra /* 00260 80B53610 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s index 9d34fd8837..922976a4be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B5AAC4 + .word 0x45803000 +glabel D_80B5AAC8 + .word 0xC3B98000 + +.text glabel func_80B53614 /* 00264 80B53614 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00268 80B53618 3C0180B6 */ lui $at, %hi(D_80B5AAC4) ## $at = 80B60000 @@ -22,5 +29,3 @@ glabel func_80B53614 /* 002B0 80B53660 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002B4 80B53664 03E00008 */ jr $ra /* 002B8 80B53668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s index d4daa373c8..a070dca791 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s @@ -17,5 +17,3 @@ glabel func_80B5366C /* 002F8 80B536A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 002FC 80B536AC 03E00008 */ jr $ra /* 00300 80B536B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s index be5a4effdb..6f1e18d4d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s @@ -3,5 +3,3 @@ glabel func_80B536B4 /* 00308 80B536B8 31CFFFF6 */ andi $t7, $t6, 0xFFF6 ## $t7 = 00000000 /* 0030C 80B536BC 03E00008 */ jr $ra /* 00310 80B536C0 A48F0088 */ sh $t7, 0x0088($a0) ## 00000088 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s index 4d46167f31..241c786695 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s @@ -43,5 +43,3 @@ glabel func_80B536C4 /* 003A8 80B53758 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003AC 80B5375C 03E00008 */ jr $ra /* 003B0 80B53760 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s index dc449e0fdc..a81f616acf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s @@ -32,5 +32,3 @@ glabel func_80B53764 /* 0042C 80B537DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00430 80B537E0 03E00008 */ jr $ra /* 00434 80B537E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s index 7d9260cdfc..b73a193aa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s @@ -53,5 +53,3 @@ glabel func_80B537E8 /* 004F4 80B538A4 8FB00020 */ lw $s0, 0x0020($sp) /* 004F8 80B538A8 03E00008 */ jr $ra /* 004FC 80B538AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s index e6f70cfb1e..fb04399428 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s @@ -42,5 +42,3 @@ glabel func_80B538B0 /* 00590 80B53940 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00594 80B53944 03E00008 */ jr $ra /* 00598 80B53948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s index 0535646baa..a5ffa93522 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s @@ -8,5 +8,3 @@ glabel func_80B5394C /* 005B0 80B53960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005B4 80B53964 03E00008 */ jr $ra /* 005B8 80B53968 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s index 2cb26fbe90..1d1b1b59dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s @@ -1,5 +1,3 @@ glabel func_80B5396C /* 005BC 80B5396C 03E00008 */ jr $ra /* 005C0 80B53970 908203C8 */ lbu $v0, 0x03C8($a0) ## 000003C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s index d602c706bd..d0c3b121c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s @@ -2,5 +2,3 @@ glabel func_80B53974 /* 005C4 80B53974 AFA50004 */ sw $a1, 0x0004($sp) /* 005C8 80B53978 03E00008 */ jr $ra /* 005CC 80B5397C A08503C8 */ sb $a1, 0x03C8($a0) ## 000003C8 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s index 8c1ee45c9b..f65c2a92a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AACC + .word 0xC62BE000 + +.text glabel func_80B53980 /* 005D0 80B53980 AFA50004 */ sw $a1, 0x0004($sp) /* 005D4 80B53984 8C8E02FC */ lw $t6, 0x02FC($a0) ## 000002FC @@ -134,5 +139,3 @@ glabel func_80B53980 /* 007A8 80B53B58 008FC021 */ addu $t8, $a0, $t7 /* 007AC 80B53B5C 03E00008 */ jr $ra /* 007B0 80B53B60 A70502BC */ sh $a1, 0x02BC($t8) ## 000002BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53B64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53B64.s index e64c2fa810..f897df0c4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53B64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53B64.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B5AAD0 + .word 0x45C1C000 +glabel D_80B5AAD4 + .word 0xC5A28000 +glabel D_80B5AAD8 + .word 0x45834000 +glabel D_80B5AADC + .word 0xC5ED8000 +glabel D_80B5AAE0 + .word 0x46A41000 +glabel D_80B5AAE4 + .word 0xC5DAC000 +glabel D_80B5AAE8 + .word 0xC5DAC000 + +.text glabel func_80B53B64 /* 007B4 80B53B64 AFA40000 */ sw $a0, 0x0000($sp) /* 007B8 80B53B68 AFA50004 */ sw $a1, 0x0004($sp) @@ -565,5 +582,3 @@ glabel func_80B53B64 /* 00FA4 80B54354 01D87821 */ addu $t7, $t6, $t8 /* 00FA8 80B54358 03E00008 */ jr $ra /* 00FAC 80B5435C A5F902BC */ sh $t9, 0x02BC($t7) ## 000002BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s index 1ca31a7b1c..4aa259f9a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s @@ -159,5 +159,3 @@ glabel func_80B54360 /* 011D0 80B54580 008FC021 */ addu $t8, $a0, $t7 /* 011D4 80B54584 03E00008 */ jr $ra /* 011D8 80B54588 A70702BC */ sh $a3, 0x02BC($t8) ## 000002BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s index a80397ae19..ed71bffba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s @@ -1,3 +1,49 @@ +.rdata +glabel D_80B5A5A0 + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5A5B0 + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5A5C0 + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5A5D0 + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5A5E0 + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5A5F0 + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5A600 + .asciz "../z_en_zl3.c" + .balign 4 + +.late_rodata +glabel D_80B5AAEC + .word 0xC47EC000 +glabel D_80B5AAF0 + .word 0x43E98000 +glabel D_80B5AAF4 + .word 0x43848000 +glabel D_80B5AAF8 + .word 0xC3D58000 +glabel D_80B5AAFC + .word 0x43E98000 +glabel D_80B5AB00 + .word 0x43848000 +glabel D_80B5AB04 + .word 0xC3D58000 + +.text glabel func_80B5458C /* 011DC 80B5458C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 011E0 80B54590 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E @@ -480,5 +526,3 @@ glabel func_80B5458C /* 0192C 80B54CDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 01930 80B54CE0 03E00008 */ jr $ra /* 01934 80B54CE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s index 7b0c23c4eb..af12ee60bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s @@ -53,5 +53,3 @@ glabel func_80B54CE8 /* 019F8 80B54DA8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 019FC 80B54DAC 03E00008 */ jr $ra /* 01A00 80B54DB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s index a92b48dca9..07643dec39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s @@ -3,5 +3,3 @@ glabel func_80B54DB4 /* 01A08 80B54DB8 00031A03 */ sra $v1, $v1, 8 /* 01A0C 80B54DBC 03E00008 */ jr $ra /* 01A10 80B54DC0 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s index fdf2c30768..305854b8d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s @@ -3,5 +3,3 @@ glabel func_80B54DC4 /* 01A18 80B54DC8 00031903 */ sra $v1, $v1, 4 /* 01A1C 80B54DCC 03E00008 */ jr $ra /* 01A20 80B54DD0 3062000F */ andi $v0, $v1, 0x000F ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s index 37770e6aa1..2551e0fd2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s @@ -2,5 +2,3 @@ glabel func_80B54DD4 /* 01A24 80B54DD4 8483001C */ lh $v1, 0x001C($a0) ## 0000001C /* 01A28 80B54DD8 03E00008 */ jr $ra /* 01A2C 80B54DDC 3062000F */ andi $v0, $v1, 0x000F ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s index 82c9bccc84..d15c14aa63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s @@ -12,5 +12,3 @@ glabel func_80B54DE0 /* 01A58 80B54E08 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01A5C 80B54E0C 03E00008 */ jr $ra /* 01A60 80B54E10 AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s index 43f8538d0e..7c4b807789 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s @@ -39,5 +39,3 @@ glabel func_80B54E14 /* 01AE8 80B54E98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01AEC 80B54E9C 03E00008 */ jr $ra /* 01AF0 80B54EA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s index 225e269b57..c4273ae870 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s @@ -20,5 +20,3 @@ glabel func_80B54EA4 /* 01B38 80B54EE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01B3C 80B54EEC 03E00008 */ jr $ra /* 01B40 80B54EF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s index 49c9a99335..c7e20b3f4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s @@ -8,5 +8,3 @@ glabel func_80B54EF4 /* 01B5C 80B54F0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B60 80B54F10 03E00008 */ jr $ra /* 01B64 80B54F14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s index 8a0a77da42..a6431487a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s @@ -40,5 +40,3 @@ glabel func_80B54F18 /* 01BF8 80B54FA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01BFC 80B54FAC 03E00008 */ jr $ra /* 01C00 80B54FB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s index 940da737f0..2053d92b59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5A610 + .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80B5A654 + .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B54FB4 /* 01C04 80B54FB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01C08 80B54FB8 AFB00020 */ sw $s0, 0x0020($sp) @@ -41,5 +51,3 @@ glabel func_80B54FB4 /* 01C98 80B55048 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01C9C 80B5504C 03E00008 */ jr $ra /* 01CA0 80B55050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s index 069abfbe7d..1c1eb562be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s @@ -42,5 +42,3 @@ glabel func_80B55054 /* 01D34 80B550E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01D38 80B550E8 03E00008 */ jr $ra /* 01D3C 80B550EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s index fd0df2e408..209112ce61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s @@ -21,5 +21,3 @@ glabel func_80B550F0 .L80B5513C: /* 01D8C 80B5513C 03E00008 */ jr $ra /* 01D90 80B55140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s index 07f5d679f6..069c8985db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s @@ -41,5 +41,3 @@ glabel func_80B55144 /* 01E24 80B551D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E28 80B551D8 03E00008 */ jr $ra /* 01E2C 80B551DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s index 444ff8ddc9..031ea32890 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s @@ -15,5 +15,3 @@ glabel func_80B551E0 /* 01E64 80B55214 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E68 80B55218 03E00008 */ jr $ra /* 01E6C 80B5521C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s index 8f29eb7cee..47a76740b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s @@ -17,5 +17,3 @@ glabel func_80B55220 /* 01EAC 80B5525C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EB0 80B55260 03E00008 */ jr $ra /* 01EB4 80B55264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s index 1eda5e463a..3804121555 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s @@ -15,5 +15,3 @@ glabel func_80B55268 /* 01EEC 80B5529C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EF0 80B552A0 03E00008 */ jr $ra /* 01EF4 80B552A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s index 978bcfedfb..b45be3a2c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s @@ -13,5 +13,3 @@ glabel func_80B552A8 /* 01F20 80B552D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F24 80B552D4 03E00008 */ jr $ra /* 01F28 80B552D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s index 261e3f5d9e..8be4a0d98a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s @@ -21,5 +21,3 @@ glabel func_80B552DC /* 01F78 80B55328 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01F7C 80B5532C 03E00008 */ jr $ra /* 01F80 80B55330 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s index 7777515725..7118b33b49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s @@ -13,5 +13,3 @@ glabel func_80B55334 /* 01FAC 80B5535C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01FB0 80B55360 03E00008 */ jr $ra /* 01FB4 80B55364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s index e801555df2..539d6365ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s @@ -18,5 +18,3 @@ glabel func_80B55368 /* 01FF8 80B553A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01FFC 80B553AC 03E00008 */ jr $ra /* 02000 80B553B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s index dcee6086dc..164a6834ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s @@ -13,5 +13,3 @@ glabel func_80B553B4 /* 0202C 80B553DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02030 80B553E0 03E00008 */ jr $ra /* 02034 80B553E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s index 5f3d5b4fd8..a2b9090395 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s @@ -7,5 +7,3 @@ glabel func_80B553E8 /* 0204C 80B553FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02050 80B55400 03E00008 */ jr $ra /* 02054 80B55404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s index 6544968e9d..f62ff6f4c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s @@ -17,5 +17,3 @@ glabel func_80B55408 /* 02088 80B55438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0208C 80B5543C 03E00008 */ jr $ra /* 02090 80B55440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s index e8b6756cf2..60c97b0dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B5A69C + .asciz "En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80B5AB08 +.word L80B55490 +.word L80B554A0 +.word L80B55510 +.word L80B554BC +.word L80B554CC +.word L80B554DC +.word L80B554EC +.word L80B554FC +.word L80B55520 + +.text glabel func_80B55444 /* 02094 80B55444 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02098 80B55448 AFBF001C */ sw $ra, 0x001C($sp) @@ -80,5 +98,3 @@ glabel L80B55520 /* 02194 80B55544 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02198 80B55548 03E00008 */ jr $ra /* 0219C 80B5554C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s index b8ad3da781..2cc816b22d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s @@ -20,5 +20,3 @@ glabel func_80B55550 /* 021E8 80B55598 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 021EC 80B5559C 03E00008 */ jr $ra /* 021F0 80B555A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s index 33cc5455a6..cff4188d30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s @@ -23,5 +23,3 @@ glabel func_80B555A4 /* 02248 80B555F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0224C 80B555FC 03E00008 */ jr $ra /* 02250 80B55600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s index cfcd98ce66..dfc17b64f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s @@ -25,5 +25,3 @@ glabel func_80B55604 /* 022B0 80B55660 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 022B4 80B55664 03E00008 */ jr $ra /* 022B8 80B55668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s index beed3797ea..15f8cf01f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s @@ -23,5 +23,3 @@ glabel func_80B5566C /* 02310 80B556C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02314 80B556C4 03E00008 */ jr $ra /* 02318 80B556C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s index b0376560bb..9b5e5588f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s @@ -23,5 +23,3 @@ glabel func_80B556CC /* 02370 80B55720 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02374 80B55724 03E00008 */ jr $ra /* 02378 80B55728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s index 8ae7a7b909..3e1dbdbf22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s @@ -20,5 +20,3 @@ glabel func_80B5572C /* 023C4 80B55774 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 023C8 80B55778 03E00008 */ jr $ra /* 023CC 80B5577C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s index c5ded101d4..9046917f4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5A6D4 + .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80B5A71C + .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B55780 /* 023D0 80B55780 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 023D4 80B55784 AFB00020 */ sw $s0, 0x0020($sp) @@ -35,5 +45,3 @@ glabel func_80B55780 /* 0244C 80B557FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02450 80B55800 03E00008 */ jr $ra /* 02454 80B55804 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s index ebc3d4c4e0..4d1028f29c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s @@ -8,5 +8,3 @@ glabel func_80B55808 /* 02470 80B55820 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02474 80B55824 03E00008 */ jr $ra /* 02478 80B55828 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s index c5f44c4984..82aeeb10ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s @@ -11,5 +11,3 @@ glabel func_80B5582C /* 024A0 80B55850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 024A4 80B55854 03E00008 */ jr $ra /* 024A8 80B55858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s index f5e3873763..b66e46ece3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s @@ -19,5 +19,3 @@ glabel func_80B5585C /* 024EC 80B5589C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 024F0 80B558A0 03E00008 */ jr $ra /* 024F4 80B558A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s index f628b46f00..8d0edbda61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80B5AB2C + .word 0x404A5E38 +glabel D_80B5AB30 + .word 0xBFCDBF48 +glabel D_80B5AB34 + .word 0x404A5E38 +glabel D_80B5AB38 + .word 0xBFCDBF48 +glabel D_80B5AB3C + .word 0xBC47E000 + +.text glabel func_80B558A8 /* 024F8 80B558A8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 024FC 80B558AC AFBF001C */ sw $ra, 0x001C($sp) @@ -74,5 +87,3 @@ glabel func_80B558A8 /* 02608 80B559B8 8FB00014 */ lw $s0, 0x0014($sp) /* 0260C 80B559BC 03E00008 */ jr $ra /* 02610 80B559C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s index 5b8dbc92c7..3c2d3e12f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s @@ -37,5 +37,3 @@ glabel func_80B559C4 /* 0269C 80B55A4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 026A0 80B55A50 03E00008 */ jr $ra /* 026A4 80B55A54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s index 67644ec0c9..f0b608a61d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s @@ -11,5 +11,3 @@ glabel func_80B55A58 /* 026C8 80B55A78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 026CC 80B55A7C 03E00008 */ jr $ra /* 026D0 80B55A80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s index 3bb3ba0b9e..3b71086e4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s @@ -15,5 +15,3 @@ glabel func_80B55A84 /* 02708 80B55AB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0270C 80B55ABC 03E00008 */ jr $ra /* 02710 80B55AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s index f6621cce99..3d7db18947 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s @@ -15,5 +15,3 @@ glabel func_80B55AC4 /* 02748 80B55AF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0274C 80B55AFC 03E00008 */ jr $ra /* 02750 80B55B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s index 7efc7644b5..989eb18243 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s @@ -13,5 +13,3 @@ glabel func_80B55B04 /* 0277C 80B55B2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02780 80B55B30 03E00008 */ jr $ra /* 02784 80B55B34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s index 5401bf09a3..0c3e80eddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s @@ -15,5 +15,3 @@ glabel func_80B55B38 /* 027BC 80B55B6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 027C0 80B55B70 03E00008 */ jr $ra /* 027C4 80B55B74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s index 387df8f681..bf770766d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s @@ -13,5 +13,3 @@ glabel func_80B55B78 /* 027F0 80B55BA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 027F4 80B55BA4 03E00008 */ jr $ra /* 027F8 80B55BA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s index 66d7cc9e40..7329281ff8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s @@ -23,5 +23,3 @@ glabel func_80B55BAC /* 02850 80B55C00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02854 80B55C04 03E00008 */ jr $ra /* 02858 80B55C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s index 49ea8bd25f..63633fbccf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s @@ -15,5 +15,3 @@ glabel func_80B55C0C /* 02890 80B55C40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02894 80B55C44 03E00008 */ jr $ra /* 02898 80B55C48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s index c1e5e5b4fc..38198c6646 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s @@ -9,5 +9,3 @@ glabel func_80B55C4C /* 028B4 80B55C64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028B8 80B55C68 03E00008 */ jr $ra /* 028BC 80B55C6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s index 6965995758..6760e84f7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s @@ -22,5 +22,3 @@ glabel func_80B55C70 /* 02910 80B55CC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02914 80B55CC4 03E00008 */ jr $ra /* 02918 80B55CC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s index 22d4d07198..f96fde8c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s @@ -13,5 +13,3 @@ glabel func_80B55CCC /* 02944 80B55CF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02948 80B55CF8 03E00008 */ jr $ra /* 0294C 80B55CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s index 00766e097e..76645de6f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s @@ -48,5 +48,3 @@ glabel func_80B55D00 /* 029F4 80B55DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029F8 80B55DA8 03E00008 */ jr $ra /* 029FC 80B55DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s index 0e632f8f22..0660f994fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s @@ -22,5 +22,3 @@ glabel func_80B55DB0 /* 02A4C 80B55DFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A50 80B55E00 03E00008 */ jr $ra /* 02A54 80B55E04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s index 71a900d963..81ca01719c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s @@ -15,5 +15,3 @@ glabel func_80B55E08 /* 02A8C 80B55E3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02A90 80B55E40 03E00008 */ jr $ra /* 02A94 80B55E44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s index 2897029618..fac15cd00c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s @@ -13,5 +13,3 @@ glabel func_80B55E48 /* 02AC0 80B55E70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02AC4 80B55E74 03E00008 */ jr $ra /* 02AC8 80B55E78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s index 331a71feb4..fbec50a298 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s @@ -15,5 +15,3 @@ glabel func_80B55E7C /* 02B00 80B55EB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02B04 80B55EB4 03E00008 */ jr $ra /* 02B08 80B55EB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s index 37a2f6e14c..9aa7602dd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s @@ -13,5 +13,3 @@ glabel func_80B55EBC /* 02B34 80B55EE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02B38 80B55EE8 03E00008 */ jr $ra /* 02B3C 80B55EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s index 5a4e5b2096..6cda58676e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s @@ -17,5 +17,3 @@ glabel func_80B55EF0 /* 02B7C 80B55F2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02B80 80B55F30 03E00008 */ jr $ra /* 02B84 80B55F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s index a3478428e9..21c6961f25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s @@ -13,5 +13,3 @@ glabel func_80B55F38 /* 02BB0 80B55F60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02BB4 80B55F64 03E00008 */ jr $ra /* 02BB8 80B55F68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s index c39689b7eb..daab5b8c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB40 + .word 0x3DFCD6EA + +.text glabel func_80B55F6C /* 02BBC 80B55F6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02BC0 80B55F70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -60,5 +65,3 @@ glabel func_80B55F6C /* 02C90 80B56040 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C94 80B56044 03E00008 */ jr $ra /* 02C98 80B56048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s index 75fee6d5de..76d812f4d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s @@ -16,5 +16,3 @@ glabel func_80B5604C /* 02CD4 80B56084 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02CD8 80B56088 03E00008 */ jr $ra /* 02CDC 80B5608C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s index 1e56418858..7c17853aa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s @@ -31,5 +31,3 @@ glabel func_80B56090 /* 02D4C 80B560FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02D50 80B56100 03E00008 */ jr $ra /* 02D54 80B56104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s index e3ee34b523..6400ecff5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s @@ -22,5 +22,3 @@ glabel func_80B56108 /* 02DA4 80B56154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DA8 80B56158 03E00008 */ jr $ra /* 02DAC 80B5615C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s index 80b6bdff41..dccf0426ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s @@ -15,5 +15,3 @@ glabel func_80B56160 /* 02DE4 80B56194 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02DE8 80B56198 03E00008 */ jr $ra /* 02DEC 80B5619C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s index 4966c8d0ef..c979d521a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s @@ -15,5 +15,3 @@ glabel func_80B561A0 /* 02E24 80B561D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E28 80B561D8 03E00008 */ jr $ra /* 02E2C 80B561DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s index 4c524b49fe..884bfcf0a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s @@ -13,5 +13,3 @@ glabel func_80B561E0 /* 02E58 80B56208 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E5C 80B5620C 03E00008 */ jr $ra /* 02E60 80B56210 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s index a0db81dd65..b92551b722 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB44 + .word 0x3DFCD6EA + +.text glabel func_80B56214 /* 02E64 80B56214 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02E68 80B56218 AFBF0014 */ sw $ra, 0x0014($sp) @@ -60,5 +65,3 @@ glabel func_80B56214 /* 02F38 80B562E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F3C 80B562EC 03E00008 */ jr $ra /* 02F40 80B562F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s index c11d0fe9be..8ff617e0f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s @@ -22,5 +22,3 @@ glabel func_80B562F4 /* 02F90 80B56340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02F94 80B56344 03E00008 */ jr $ra /* 02F98 80B56348 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s index a45219a12e..b5a2d88934 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s @@ -15,5 +15,3 @@ glabel func_80B5634C /* 02FD0 80B56380 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02FD4 80B56384 03E00008 */ jr $ra /* 02FD8 80B56388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s index c51a2c1a24..8f88afe7af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s @@ -13,5 +13,3 @@ glabel func_80B5638C /* 03004 80B563B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03008 80B563B8 03E00008 */ jr $ra /* 0300C 80B563BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s index 094f47a1da..9f435c00d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s @@ -15,5 +15,3 @@ glabel func_80B563C0 /* 03044 80B563F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03048 80B563F8 03E00008 */ jr $ra /* 0304C 80B563FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s index 325ca5b610..091da46d1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s @@ -13,5 +13,3 @@ glabel func_80B56400 /* 03078 80B56428 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0307C 80B5642C 03E00008 */ jr $ra /* 03080 80B56430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s index 41f85a0683..f62d01af1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s @@ -15,5 +15,3 @@ glabel func_80B56434 /* 030B8 80B56468 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 030BC 80B5646C 03E00008 */ jr $ra /* 030C0 80B56470 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s index cb4d3514e2..1b82fc7f8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s @@ -13,5 +13,3 @@ glabel func_80B56474 /* 030EC 80B5649C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 030F0 80B564A0 03E00008 */ jr $ra /* 030F4 80B564A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s index 3b5221294a..29784c0902 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s @@ -1,3 +1,27 @@ +.rdata +glabel D_80B5A764 + .asciz "En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80B5AB48 +.word L80B56544 +.word L80B56554 +.word L80B56564 +.word L80B56574 +.word L80B56584 +.word L80B56594 +.word L80B565A4 +.word L80B565B4 +.word L80B565C4 +.word L80B565D4 +.word L80B565E4 +.word L80B565F4 +.word L80B56604 +.word L80B56614 +.word L80B56624 + +.text glabel func_80B564A8 /* 030F8 80B564A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 030FC 80B564AC AFBF001C */ sw $ra, 0x001C($sp) @@ -131,5 +155,3 @@ glabel L80B56624 /* 0329C 80B5664C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 032A0 80B56650 03E00008 */ jr $ra /* 032A4 80B56654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s index 5d49adc411..5200a283d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s @@ -20,5 +20,3 @@ glabel func_80B56658 /* 032F0 80B566A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 032F4 80B566A4 03E00008 */ jr $ra /* 032F8 80B566A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s index 9930f47dc5..855ac93416 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s @@ -23,5 +23,3 @@ glabel func_80B566AC /* 03350 80B56700 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03354 80B56704 03E00008 */ jr $ra /* 03358 80B56708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s index f016c4e84d..51c70dbb43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s @@ -23,5 +23,3 @@ glabel func_80B5670C /* 033B0 80B56760 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 033B4 80B56764 03E00008 */ jr $ra /* 033B8 80B56768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s index fbc34eac4b..ec83f1fc8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s @@ -23,5 +23,3 @@ glabel func_80B5676C /* 03410 80B567C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03414 80B567C4 03E00008 */ jr $ra /* 03418 80B567C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s index 6728b1d9e0..ad490ed294 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s @@ -23,5 +23,3 @@ glabel func_80B567CC /* 03470 80B56820 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03474 80B56824 03E00008 */ jr $ra /* 03478 80B56828 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s index 21e0fd44f6..0f42e8773b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s @@ -33,5 +33,3 @@ glabel func_80B5682C /* 034F8 80B568A8 8FB10018 */ lw $s1, 0x0018($sp) /* 034FC 80B568AC 03E00008 */ jr $ra /* 03500 80B568B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s index 346d4aaa08..8da7121b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s @@ -25,5 +25,3 @@ glabel func_80B568B4 /* 03560 80B56910 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03564 80B56914 03E00008 */ jr $ra /* 03568 80B56918 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s index cc0ff20d8f..1b2f994756 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s @@ -23,5 +23,3 @@ glabel func_80B5691C /* 035C0 80B56970 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 035C4 80B56974 03E00008 */ jr $ra /* 035C8 80B56978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s index 8918dd5bb3..862ad4e3ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s @@ -25,5 +25,3 @@ glabel func_80B5697C /* 03628 80B569D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0362C 80B569DC 03E00008 */ jr $ra /* 03630 80B569E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s index 1673d1f3b1..eb0ce887b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s @@ -32,5 +32,3 @@ glabel func_80B569E4 /* 036AC 80B56A5C 8FB10018 */ lw $s1, 0x0018($sp) /* 036B0 80B56A60 03E00008 */ jr $ra /* 036B4 80B56A64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s index 6a1c8995b3..32a9d36664 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s @@ -29,5 +29,3 @@ glabel func_80B56A68 /* 03724 80B56AD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03728 80B56AD8 03E00008 */ jr $ra /* 0372C 80B56ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s index 03cac40b0c..88f221bedc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s @@ -28,5 +28,3 @@ glabel func_80B56AE0 /* 03798 80B56B48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0379C 80B56B4C 03E00008 */ jr $ra /* 037A0 80B56B50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s index 5292e7a321..e7f7de3e28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s @@ -20,5 +20,3 @@ glabel func_80B56B54 /* 037EC 80B56B9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 037F0 80B56BA0 03E00008 */ jr $ra /* 037F4 80B56BA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s index 06334e5c6b..69d2a05e4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s @@ -30,5 +30,3 @@ glabel func_80B56BA8 /* 03868 80B56C18 8FB10018 */ lw $s1, 0x0018($sp) /* 0386C 80B56C1C 03E00008 */ jr $ra /* 03870 80B56C20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s index 2709c3cb81..f0854e74fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s @@ -23,5 +23,3 @@ glabel func_80B56C24 /* 038C8 80B56C78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 038CC 80B56C7C 03E00008 */ jr $ra /* 038D0 80B56C80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s index bdf9c0416a..2885e11335 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s @@ -23,5 +23,3 @@ glabel func_80B56C84 /* 03928 80B56CD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0392C 80B56CDC 03E00008 */ jr $ra /* 03930 80B56CE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s index f22f815de4..a72c73ae87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s @@ -23,5 +23,3 @@ glabel func_80B56CE4 /* 03988 80B56D38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0398C 80B56D3C 03E00008 */ jr $ra /* 03990 80B56D40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s index 953c3cff61..a6117a4873 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s @@ -23,5 +23,3 @@ glabel func_80B56D44 /* 039E8 80B56D98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 039EC 80B56D9C 03E00008 */ jr $ra /* 039F0 80B56DA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s index 0fc072ca09..222e8b4347 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s @@ -8,5 +8,3 @@ glabel func_80B56DA4 /* 03A0C 80B56DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A10 80B56DC0 03E00008 */ jr $ra /* 03A14 80B56DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s index 7e2a1014e5..ba077f4905 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s @@ -8,5 +8,3 @@ glabel func_80B56DC8 /* 03A30 80B56DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A34 80B56DE4 03E00008 */ jr $ra /* 03A38 80B56DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s index b99a160aa4..1f53646c79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s @@ -19,5 +19,3 @@ glabel func_80B56DEC /* 03A7C 80B56E2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03A80 80B56E30 03E00008 */ jr $ra /* 03A84 80B56E34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s index fcf72d263f..9be1bf262a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s @@ -34,5 +34,3 @@ glabel func_80B56E38 /* 03AFC 80B56EAC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 03B00 80B56EB0 03E00008 */ jr $ra /* 03B04 80B56EB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s index 3f4dece20a..b5c995d5c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s @@ -11,5 +11,3 @@ glabel func_80B56EB8 /* 03B28 80B56ED8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B2C 80B56EDC 03E00008 */ jr $ra /* 03B30 80B56EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s index ebc125fb0a..3083c70165 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s @@ -11,5 +11,3 @@ glabel func_80B56EE4 /* 03B54 80B56F04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03B58 80B56F08 03E00008 */ jr $ra /* 03B5C 80B56F0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s index 4cfea65a8b..999aa869d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5A7A0 + .asciz "En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80B5A7E4 + .asciz "En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B56F10 /* 03B60 80B56F10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 03B64 80B56F14 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 @@ -34,5 +44,3 @@ glabel func_80B56F10 /* 03BD0 80B56F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03BD4 80B56F84 03E00008 */ jr $ra /* 03BD8 80B56F88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s index 5c8ddea60a..732ea15b13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s @@ -8,5 +8,3 @@ glabel func_80B56F8C .L80B56FA4: /* 03BF4 80B56FA4 03E00008 */ jr $ra /* 03BF8 80B56FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s index 40b36f65fa..773e5457d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s @@ -35,5 +35,3 @@ glabel func_80B56FAC /* 03C78 80B57028 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03C7C 80B5702C 03E00008 */ jr $ra /* 03C80 80B57030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s index b4b7567ac4..482df951bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB84 + .word 0x4622F983 + +.text glabel func_80B57034 /* 03C84 80B57034 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 03C88 80B57038 AFBF0014 */ sw $ra, 0x0014($sp) @@ -54,5 +59,3 @@ glabel func_80B57034 /* 03D48 80B570F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03D4C 80B570FC 03E00008 */ jr $ra /* 03D50 80B57100 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s index 1db94dbe80..d6160488be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB88 + .word 0x4622F983 + +.text glabel func_80B57104 /* 03D54 80B57104 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03D58 80B57108 AFBF0014 */ sw $ra, 0x0014($sp) @@ -43,5 +48,3 @@ glabel func_80B57104 /* 03DEC 80B5719C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03DF0 80B571A0 03E00008 */ jr $ra /* 03DF4 80B571A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s index cf0a608563..ac0c62fb2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s @@ -22,5 +22,3 @@ glabel func_80B571A8 /* 03E40 80B571F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03E44 80B571F4 03E00008 */ jr $ra /* 03E48 80B571F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s index 65257de119..dadc4aaa1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s @@ -18,5 +18,3 @@ glabel func_80B571FC /* 03E84 80B57234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03E88 80B57238 03E00008 */ jr $ra /* 03E8C 80B5723C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s index 05537eacd8..c3bbe6d60c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s @@ -22,5 +22,3 @@ glabel func_80B57240 /* 03EDC 80B5728C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03EE0 80B57290 03E00008 */ jr $ra /* 03EE4 80B57294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s index bb59f12181..f54ec21308 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s @@ -22,5 +22,3 @@ glabel func_80B57298 /* 03F34 80B572E4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 03F38 80B572E8 03E00008 */ jr $ra /* 03F3C 80B572EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s index f32339e423..cc5a8fad53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s @@ -15,5 +15,3 @@ glabel func_80B572F0 .L80B5731C: /* 03F6C 80B5731C 03E00008 */ jr $ra /* 03F70 80B57320 00601025 */ or $v0, $v1, $zero ## $v0 = 000071AB - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s index da8166d2b8..73571a475c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s @@ -12,5 +12,3 @@ glabel func_80B57324 .L80B57348: /* 03F98 80B57348 03E00008 */ jr $ra /* 03F9C 80B5734C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s index 509c464559..b45f6a85a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s @@ -31,5 +31,3 @@ glabel func_80B57350 /* 0400C 80B573BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04010 80B573C0 03E00008 */ jr $ra /* 04014 80B573C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s index 40fd269e8f..108f6dbc85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s @@ -14,5 +14,3 @@ glabel func_80B573C8 .L80B573F4: /* 04044 80B573F4 03E00008 */ jr $ra /* 04048 80B573F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s index 53eb6d7553..993c882bc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s @@ -23,5 +23,3 @@ glabel func_80B573FC .L80B57450: /* 040A0 80B57450 03E00008 */ jr $ra /* 040A4 80B57454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s index d18e08adf7..85e073f80b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB8C + .word 0x4622F983 + +.text glabel func_80B57458 /* 040A8 80B57458 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 040AC 80B5745C AFBF0014 */ sw $ra, 0x0014($sp) @@ -70,5 +75,3 @@ glabel func_80B57458 /* 041A8 80B57558 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 041AC 80B5755C 03E00008 */ jr $ra /* 041B0 80B57560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s index d94585fa4b..ec5e14b6a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s @@ -20,5 +20,3 @@ glabel func_80B57564 /* 041F4 80B575A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 041F8 80B575A8 03E00008 */ jr $ra /* 041FC 80B575AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s index bcc13aad30..a8025e7711 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s @@ -7,5 +7,3 @@ glabel func_80B575B0 /* 04214 80B575C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04218 80B575C8 03E00008 */ jr $ra /* 0421C 80B575CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s index c70e757bc9..45652e2403 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s @@ -7,5 +7,3 @@ glabel func_80B575D0 /* 04234 80B575E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04238 80B575E8 03E00008 */ jr $ra /* 0423C 80B575EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s index 768ab580b3..393a77b711 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s @@ -24,5 +24,3 @@ glabel func_80B575F0 /* 04290 80B57640 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04294 80B57644 03E00008 */ jr $ra /* 04298 80B57648 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s index 2ba9c448d6..e6ac419ddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s @@ -32,5 +32,3 @@ glabel func_80B5764C /* 0430C 80B576BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04310 80B576C0 03E00008 */ jr $ra /* 04314 80B576C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s index 7b25e1717b..fe3d633dbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s @@ -16,5 +16,3 @@ glabel func_80B576C8 .L80B576FC: /* 0434C 80B576FC 03E00008 */ jr $ra /* 04350 80B57700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s index 34ced9428a..6c9b467800 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s @@ -10,5 +10,3 @@ glabel func_80B57704 /* 04370 80B57720 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04374 80B57724 03E00008 */ jr $ra /* 04378 80B57728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s index d522179e75..a37f03e340 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s @@ -10,5 +10,3 @@ glabel func_80B5772C /* 04398 80B57748 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0439C 80B5774C 03E00008 */ jr $ra /* 043A0 80B57750 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s index 6d84f5b5c1..d3ed5a3f03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s @@ -27,5 +27,3 @@ glabel func_80B57754 /* 04400 80B577B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 04404 80B577B4 03E00008 */ jr $ra /* 04408 80B577B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s index eb2e354df8..e3eddfa5bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB90 + .word 0x4622F983 + +.text glabel func_80B577BC /* 0440C 80B577BC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 04410 80B577C0 AFBF002C */ sw $ra, 0x002C($sp) @@ -39,5 +44,3 @@ glabel func_80B577BC /* 0449C 80B5784C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 044A0 80B57850 03E00008 */ jr $ra /* 044A4 80B57854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s index 206804e539..077b4f6ce3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s @@ -13,5 +13,3 @@ glabel func_80B57858 /* 044D4 80B57884 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 044D8 80B57888 03E00008 */ jr $ra /* 044DC 80B5788C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s index c6502cc56e..68fa2ecd5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s @@ -140,5 +140,3 @@ glabel func_80B57890 /* 046B8 80B57A68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 046BC 80B57A6C 03E00008 */ jr $ra /* 046C0 80B57A70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s index b6b2fe59b0..fbf9007cf0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s @@ -16,5 +16,3 @@ glabel func_80B57A74 .L80B57AA4: /* 046F4 80B57AA4 03E00008 */ jr $ra /* 046F8 80B57AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s index 40fa686394..5af0a7495c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s @@ -13,5 +13,3 @@ glabel func_80B57AAC /* 04724 80B57AD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04728 80B57AD8 03E00008 */ jr $ra /* 0472C 80B57ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s index 2f90a7ffe2..b4b6ff547f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s @@ -96,5 +96,3 @@ glabel func_80B57AE0 /* 04898 80B57C48 8FB00014 */ lw $s0, 0x0014($sp) /* 0489C 80B57C4C 03E00008 */ jr $ra /* 048A0 80B57C50 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s index 5e5a7a50ad..0b1e072a47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s @@ -10,5 +10,3 @@ glabel func_80B57C54 .L80B57C74: /* 048C4 80B57C74 03E00008 */ jr $ra /* 048C8 80B57C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s index ef15fdbe00..16b252474e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s @@ -3,5 +3,3 @@ glabel func_80B57C7C /* 048D0 80B57C80 AFA50004 */ sw $a1, 0x0004($sp) /* 048D4 80B57C84 03E00008 */ jr $ra /* 048D8 80B57C88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s index 3c7c47868b..f36cf81b1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s @@ -9,5 +9,3 @@ glabel func_80B57C8C /* 048F8 80B57CA8 2C420001 */ sltiu $v0, $v0, 0x0001 /* 048FC 80B57CAC 03E00008 */ jr $ra /* 04900 80B57CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s index 1b0d607485..d4df7b8fcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s @@ -42,5 +42,3 @@ glabel func_80B57CB4 /* 049A4 80B57D54 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 049A8 80B57D58 03E00008 */ jr $ra /* 049AC 80B57D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s index beb6537e51..2a000d4ffb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s @@ -7,5 +7,3 @@ glabel func_80B57D60 /* 049C4 80B57D74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 049C8 80B57D78 03E00008 */ jr $ra /* 049CC 80B57D7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s index a66be52537..569d61f1d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s @@ -79,5 +79,3 @@ glabel func_80B57D80 /* 04AF0 80B57EA0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 04AF4 80B57EA4 03E00008 */ jr $ra /* 04AF8 80B57EA8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s index 28fa235289..6df342219f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s @@ -17,5 +17,3 @@ glabel func_80B57EAC /* 04B30 80B57EE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B34 80B57EE4 03E00008 */ jr $ra /* 04B38 80B57EE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s index ce30f5913d..584afd4ce0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s @@ -12,5 +12,3 @@ glabel func_80B57EEC /* 04B60 80B57F10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04B64 80B57F14 03E00008 */ jr $ra /* 04B68 80B57F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s index 0a84b3b65d..0ddf4c4972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s @@ -26,5 +26,3 @@ glabel func_80B57F1C /* 04BC8 80B57F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04BCC 80B57F7C 03E00008 */ jr $ra /* 04BD0 80B57F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s index c1f5ad7c6f..861c6bd531 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s @@ -37,5 +37,3 @@ glabel func_80B57F84 /* 04C58 80B58008 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04C5C 80B5800C 03E00008 */ jr $ra /* 04C60 80B58010 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s index 284add89c9..26497d7ced 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s @@ -135,5 +135,3 @@ glabel func_80B58014 /* 04E58 80B58208 8FB10020 */ lw $s1, 0x0020($sp) /* 04E5C 80B5820C 03E00008 */ jr $ra /* 04E60 80B58210 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s index 756feafdb9..be350d83ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s @@ -21,5 +21,3 @@ glabel func_80B58214 /* 04EAC 80B5825C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04EB0 80B58260 03E00008 */ jr $ra /* 04EB4 80B58264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s index 74a96eb749..ca73f20a92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s @@ -25,5 +25,3 @@ glabel func_80B58268 /* 04F0C 80B582BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04F10 80B582C0 03E00008 */ jr $ra /* 04F14 80B582C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s index a850103448..a1a88f23f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s @@ -129,5 +129,3 @@ glabel func_80B582C8 /* 050F8 80B584A8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 050FC 80B584AC 03E00008 */ jr $ra /* 05100 80B584B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s index e5e9f70bf3..31e84ca562 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s @@ -99,5 +99,3 @@ glabel func_80B584B4 /* 05268 80B58618 8FB10020 */ lw $s1, 0x0020($sp) /* 0526C 80B5861C 03E00008 */ jr $ra /* 05270 80B58620 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s index 5d7c1cc34d..fdeba8bdca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s @@ -143,5 +143,3 @@ glabel func_80B58624 /* 05490 80B58840 8FB10020 */ lw $s1, 0x0020($sp) /* 05494 80B58844 03E00008 */ jr $ra /* 05498 80B58848 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s index 1492078484..47d49b9879 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s @@ -18,5 +18,3 @@ glabel func_80B5884C /* 054DC 80B5888C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 054E0 80B58890 03E00008 */ jr $ra /* 054E4 80B58894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s index c07afafdac..273dfa4921 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s @@ -19,5 +19,3 @@ glabel func_80B58898 /* 0552C 80B588DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05530 80B588E0 03E00008 */ jr $ra /* 05534 80B588E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s index 3a182c8b85..e1a47fee92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s @@ -19,5 +19,3 @@ glabel func_80B588E8 /* 0557C 80B5892C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05580 80B58930 03E00008 */ jr $ra /* 05584 80B58934 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s index 2c9c0e86ad..e4c2356409 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s @@ -26,5 +26,3 @@ glabel func_80B58938 /* 055E0 80B58990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 055E4 80B58994 03E00008 */ jr $ra /* 055E8 80B58998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s index 7a05ac0640..c719e7fa02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s @@ -33,5 +33,3 @@ glabel func_80B5899C /* 05660 80B58A10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05664 80B58A14 03E00008 */ jr $ra /* 05668 80B58A18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s index 49283ca8b0..a6199939f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s @@ -13,5 +13,3 @@ glabel func_80B58A1C /* 05694 80B58A44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05698 80B58A48 03E00008 */ jr $ra /* 0569C 80B58A4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s index 582c9b7b49..3e80c9436f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s @@ -24,5 +24,3 @@ glabel func_80B58A50 /* 056F0 80B58AA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 056F4 80B58AA4 03E00008 */ jr $ra /* 056F8 80B58AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s index 0c08bce828..52d477a837 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s @@ -91,5 +91,3 @@ glabel func_80B58AAC /* 0584C 80B58BFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05850 80B58C00 03E00008 */ jr $ra /* 05854 80B58C04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s index cd911e3770..7786b05618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s @@ -84,5 +84,3 @@ glabel func_80B58C08 /* 05994 80B58D44 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 05998 80B58D48 03E00008 */ jr $ra /* 0599C 80B58D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s index 4730d4789b..4e6a81fd46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s @@ -23,5 +23,3 @@ glabel func_80B58D50 /* 059F4 80B58DA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 059F8 80B58DA8 03E00008 */ jr $ra /* 059FC 80B58DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s index 48e393d2c2..d8128e96a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s @@ -23,5 +23,3 @@ glabel func_80B58DB0 /* 05A54 80B58E04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05A58 80B58E08 03E00008 */ jr $ra /* 05A5C 80B58E0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s index 46f98be2b7..6601819bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s @@ -27,5 +27,3 @@ glabel func_80B58E10 /* 05AC0 80B58E70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05AC4 80B58E74 03E00008 */ jr $ra /* 05AC8 80B58E78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s index 4fda10a1cf..7f1e4ce17b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s @@ -29,5 +29,3 @@ glabel func_80B58E7C /* 05B38 80B58EE8 8FB10018 */ lw $s1, 0x0018($sp) /* 05B3C 80B58EEC 03E00008 */ jr $ra /* 05B40 80B58EF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s index f36567a63b..70cdc2b455 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s @@ -29,5 +29,3 @@ glabel func_80B58EF4 /* 05BB0 80B58F60 8FB10018 */ lw $s1, 0x0018($sp) /* 05BB4 80B58F64 03E00008 */ jr $ra /* 05BB8 80B58F68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s index b8e036834a..1d83750d93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s @@ -27,5 +27,3 @@ glabel func_80B58F6C /* 05C20 80B58FD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05C24 80B58FD4 03E00008 */ jr $ra /* 05C28 80B58FD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s index d0a23d50f0..6026d95c5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s @@ -27,5 +27,3 @@ glabel func_80B58FDC /* 05C90 80B59040 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05C94 80B59044 03E00008 */ jr $ra /* 05C98 80B59048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s index 275ea38d5d..64af2217ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s @@ -27,5 +27,3 @@ glabel func_80B5904C /* 05D00 80B590B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05D04 80B590B4 03E00008 */ jr $ra /* 05D08 80B590B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s index 70815174f9..6b073ffbdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s @@ -27,5 +27,3 @@ glabel func_80B590BC /* 05D70 80B59120 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05D74 80B59124 03E00008 */ jr $ra /* 05D78 80B59128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s index a27641c709..3a92594be2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s @@ -35,5 +35,3 @@ glabel func_80B5912C /* 05E00 80B591B0 8FB10018 */ lw $s1, 0x0018($sp) /* 05E04 80B591B4 03E00008 */ jr $ra /* 05E08 80B591B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s index f31c8320e7..75978f7b6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s @@ -27,5 +27,3 @@ glabel func_80B591BC /* 05E70 80B59220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05E74 80B59224 03E00008 */ jr $ra /* 05E78 80B59228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s index a0a86326ab..b968744607 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s @@ -31,5 +31,3 @@ glabel func_80B5922C /* 05EEC 80B5929C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05EF0 80B592A0 03E00008 */ jr $ra /* 05EF4 80B592A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s index f37d5e5004..77afe4bea0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s @@ -38,5 +38,3 @@ glabel func_80B592A8 /* 05F84 80B59334 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 05F88 80B59338 03E00008 */ jr $ra /* 05F8C 80B5933C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s index 1093b1dde3..04101d4bcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s @@ -36,5 +36,3 @@ glabel func_80B59340 /* 06014 80B593C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06018 80B593C8 03E00008 */ jr $ra /* 0601C 80B593CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s index 1273ba9c45..f9115c517e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s @@ -31,5 +31,3 @@ glabel func_80B593D0 /* 06090 80B59440 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06094 80B59444 03E00008 */ jr $ra /* 06098 80B59448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s index 03994238ec..f2fc0efba3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s @@ -1,3 +1,39 @@ +.rdata +glabel D_80B5A824 + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +glabel D_80B5A83C + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +glabel D_80B5A854 + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +glabel D_80B5A86C + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +glabel D_80B5A884 + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +glabel D_80B5A89C + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +glabel D_80B5A8B4 + .asciz "../z_en_zl3_inEscape.c" + .balign 4 + +.late_rodata +glabel D_80B5AB94 + .word 0xC39E8000 +glabel D_80B5AB98 + .word 0xC47EC000 + +.text glabel func_80B5944C /* 0609C 80B5944C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 060A0 80B59450 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E @@ -148,5 +184,3 @@ glabel func_80B5944C /* 062DC 80B5968C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 062E0 80B59690 03E00008 */ jr $ra /* 062E4 80B59694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s index 3cfc2a14f4..3df6c72501 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s @@ -56,5 +56,3 @@ glabel func_80B59698 /* 063AC 80B5975C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 063B0 80B59760 03E00008 */ jr $ra /* 063B4 80B59764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s index 5323cb44c8..a2d35b31c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s @@ -51,5 +51,3 @@ glabel func_80B59768 /* 0646C 80B5981C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06470 80B59820 03E00008 */ jr $ra /* 06474 80B59824 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s index 5b5a8b2846..602b35aaae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B5AB9C + .word 0x455D8000 + +.text glabel func_80B59828 /* 06478 80B59828 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0647C 80B5982C AFBF0034 */ sw $ra, 0x0034($sp) @@ -172,5 +177,3 @@ glabel func_80B59828 /* 066C4 80B59A74 8FB10030 */ lw $s1, 0x0030($sp) /* 066C8 80B59A78 03E00008 */ jr $ra /* 066CC 80B59A7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s index cec82aedb1..0c3279b5ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s @@ -21,5 +21,3 @@ glabel func_80B59A80 /* 06714 80B59AC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06718 80B59AC8 03E00008 */ jr $ra /* 0671C 80B59ACC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s index 7d520f0cf3..68eca4acca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s @@ -39,5 +39,3 @@ glabel func_80B59AD0 /* 067B0 80B59B60 8FB00014 */ lw $s0, 0x0014($sp) /* 067B4 80B59B64 03E00008 */ jr $ra /* 067B8 80B59B68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s index d05f657fd1..c1e828e91a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B5A8CC + .asciz " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B59B6C /* 067BC 80B59B6C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 067C0 80B59B70 AFBF0024 */ sw $ra, 0x0024($sp) @@ -160,5 +166,3 @@ glabel func_80B59B6C /* 069FC 80B59DAC 8FB30020 */ lw $s3, 0x0020($sp) /* 06A00 80B59DB0 03E00008 */ jr $ra /* 06A04 80B59DB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s index 080af24261..ee7bd2ee46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B5A910 + .asciz "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B59DB8 /* 06A08 80B59DB8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 06A0C 80B59DBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -39,5 +45,3 @@ glabel func_80B59DB8 /* 06A84 80B59E34 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 06A88 80B59E38 03E00008 */ jr $ra /* 06A8C 80B59E3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s index 186018c4e6..8d1032ba6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B5AA0C + .asciz "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel func_80B59F74 /* 06BC4 80B59F74 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 06BC8 80B59F78 8FAE003C */ lw $t6, 0x003C($sp) @@ -32,5 +38,3 @@ glabel func_80B59F74 /* 06C2C 80B59FDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 06C30 80B59FE0 03E00008 */ jr $ra /* 06C34 80B59FE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s index 6ecd24f7c1..fdaf7eab77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s @@ -2,5 +2,3 @@ glabel func_80B59FE8 /* 06C38 80B59FE8 AFA40000 */ sw $a0, 0x0000($sp) /* 06C3C 80B59FEC 03E00008 */ jr $ra /* 06C40 80B59FF0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s index 0b2c6f4a2c..75a9aa6fa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5AA4C + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5AA5C + .asciz "../z_en_zl3.c" + .balign 4 + +.text glabel func_80B59FF4 /* 06C44 80B59FF4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 06C48 80B59FF8 AFBF002C */ sw $ra, 0x002C($sp) @@ -118,5 +128,3 @@ glabel func_80B59FF4 /* 06E14 80B5A1C4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 06E18 80B5A1C8 03E00008 */ jr $ra /* 06E1C 80B5A1CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s index cceaac2439..1b9fbbede9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5AA6C + .asciz "../z_en_zl3.c" + .balign 4 + +glabel D_80B5AA7C + .asciz "../z_en_zl3.c" + .balign 4 + +.text glabel func_80B5A1D0 /* 06E20 80B5A1D0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 06E24 80B5A1D4 AFBF002C */ sw $ra, 0x002C($sp) @@ -117,5 +127,3 @@ glabel func_80B5A1D0 /* 06FEC 80B5A39C 8FB10028 */ lw $s1, 0x0028($sp) /* 06FF0 80B5A3A0 03E00008 */ jr $ra /* 06FF4 80B5A3A4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s index ed60c65de5..65fa9245fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s @@ -10,5 +10,3 @@ glabel EnZl4_Destroy /* 007D4 80B5BF84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007D8 80B5BF88 03E00008 */ jr $ra /* 007DC 80B5BF8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s index 3f7d5d0858..2b911d5075 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B5FB80 + .asciz "../z_en_zl4.c" + .balign 4 + +glabel D_80B5FB90 + .asciz "../z_en_zl4.c" + .balign 4 + +.text glabel EnZl4_Draw /* 02D9C 80B5E54C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02DA0 80B5E550 3C0F80B6 */ lui $t7, %hi(D_80B5FB48) ## $t7 = 80B60000 @@ -132,4 +142,3 @@ glabel EnZl4_Draw /* 02FA4 80B5E754 03E00008 */ jr $ra /* 02FA8 80B5E758 00000000 */ nop /* 02FAC 80B5E75C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s index 296ba4bbf6..3844116ad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s @@ -119,5 +119,3 @@ glabel EnZl4_Init /* 007AC 80B5BF5C 8FB10028 */ lw $s1, 0x0028($sp) /* 007B0 80B5BF60 03E00008 */ jr $ra /* 007B4 80B5BF64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s index a6f0ed264b..71829c9bfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s @@ -46,5 +46,3 @@ glabel EnZl4_Update /* 02BA8 80B5E358 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02BAC 80B5E35C 03E00008 */ jr $ra /* 02BB0 80B5E360 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B7B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B7B0.s index 6b3e4d8d0e..d125292de8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B7B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B7B0.s @@ -53,5 +53,3 @@ glabel func_80B5B7B0 /* 000CC 80B5B87C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000D0 80B5B880 03E00008 */ jr $ra /* 000D4 80B5B884 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B888.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B888.s index 7ac5d709b1..def67f6466 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B888.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B888.s @@ -32,5 +32,3 @@ glabel func_80B5B888 /* 00150 80B5B900 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00154 80B5B904 03E00008 */ jr $ra /* 00158 80B5B908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s index 82e742e2b0..781b7d2fa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s @@ -46,5 +46,3 @@ glabel func_80B5B90C /* 001F4 80B5B9A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001F8 80B5B9A8 03E00008 */ jr $ra /* 001FC 80B5B9AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9B0.s index acc1108d1a..6a640272b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9B0.s @@ -15,5 +15,3 @@ glabel func_80B5B9B0 .L80B5B9E0: /* 00230 80B5B9E0 03E00008 */ jr $ra /* 00234 80B5B9E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s index db8521d878..92c83b5167 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80B5FBA0 +.word L80B5BA48 +.word L80B5BA68 +.word L80B5BA7C +.word L80B5BA94 +.word L80B5BAAC +.word L80B5BAC0 +.word L80B5BAD4 + +.text glabel func_80B5B9E8 /* 00238 80B5B9E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0023C 80B5B9EC AFBF0014 */ sw $ra, 0x0014($sp) @@ -100,5 +111,3 @@ glabel L80B5BAD4 /* 0037C 80B5BB2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00380 80B5BB30 03E00008 */ jr $ra /* 00384 80B5BB34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s index d274d6aec9..2fc66b6130 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s @@ -15,5 +15,3 @@ glabel func_80B5BB38 /* 003BC 80B5BB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003C0 80B5BB70 03E00008 */ jr $ra /* 003C4 80B5BB74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB78.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB78.s index ccbceb9e59..a73a5f4c25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB78.s @@ -17,5 +17,3 @@ glabel func_80B5BB78 /* 00404 80B5BBB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00408 80B5BBB8 03E00008 */ jr $ra /* 0040C 80B5BBBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BBC0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BBC0.s index 49e152e171..63eba9716a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BBC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BBC0.s @@ -15,5 +15,3 @@ glabel func_80B5BBC0 /* 00444 80B5BBF4 468084A0 */ cvt.s.w $f18, $f16 /* 00448 80B5BBF8 03E00008 */ jr $ra /* 0044C 80B5BBFC E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s index 8c3f582ca7..4b40b8e1bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s @@ -56,5 +56,3 @@ glabel func_80B5BC00 /* 00520 80B5BCD0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00524 80B5BCD4 03E00008 */ jr $ra /* 00528 80B5BCD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s index 6ed2e6d8e5..1335a01903 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s @@ -54,5 +54,3 @@ glabel func_80B5BCDC .L80B5BDA4: /* 005F4 80B5BDA4 03E00008 */ jr $ra /* 005F8 80B5BDA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BF90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BF90.s index 195679d867..1e9f7e92cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BF90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BF90.s @@ -22,5 +22,3 @@ glabel func_80B5BF90 /* 00828 80B5BFD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0082C 80B5BFDC 03E00008 */ jr $ra /* 00830 80B5BFE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BFE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BFE4.s index c63322ff2d..272111e5bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BFE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BFE4.s @@ -8,5 +8,3 @@ glabel func_80B5BFE4 /* 0084C 80B5BFFC E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C /* 00850 80B5C000 03E00008 */ jr $ra /* 00854 80B5C004 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s index d7ec7a423f..4564c05b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s @@ -93,5 +93,3 @@ glabel func_80B5C008 /* 009A4 80B5C154 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 009A8 80B5C158 03E00008 */ jr $ra /* 009AC 80B5C15C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s index 9a4e2be177..c236079089 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s @@ -1,3 +1,14 @@ +.late_rodata +glabel jtbl_80B5FBBC +.word L80B5C19C +.word L80B5C200 +.word L80B5C254 +.word L80B5C2F0 +.word L80B5C330 +.word L80B5C384 +.word L80B5C3C4 + +.text glabel func_80B5C160 /* 009B0 80B5C160 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 009B4 80B5C164 AFBF001C */ sw $ra, 0x001C($sp) @@ -208,5 +219,3 @@ glabel L80B5C3C4 /* 00C9C 80B5C44C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CA0 80B5C450 03E00008 */ jr $ra /* 00CA4 80B5C454 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C458.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C458.s index 3c34cb2cb0..8b714255d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C458.s @@ -1,3 +1,21 @@ +.late_rodata +glabel jtbl_80B5FBD8 +.word L80B5C494 +.word L80B5C4B4 +.word L80B5C508 +.word L80B5C550 +.word L80B5C628 +.word L80B5C670 +.word L80B5C6D4 +.word L80B5C7F0 +.word L80B5C838 +.word L80B5C8A4 +.word L80B5C8F4 +.word L80B5C958 +.word L80B5C704 +.word L80B5C71C + +.text glabel func_80B5C458 /* 00CA8 80B5C458 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00CAC 80B5C45C AFBF001C */ sw $ra, 0x001C($sp) @@ -371,5 +389,3 @@ glabel L80B5C958 /* 011C8 80B5C978 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 011CC 80B5C97C 03E00008 */ jr $ra /* 011D0 80B5C980 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s index 74f45c4dd4..fecdf53811 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s @@ -1,3 +1,25 @@ +.late_rodata +glabel jtbl_80B5FC10 +.word L80B5C9C0 +.word L80B5C9E4 +.word L80B5CA68 +.word L80B5CA88 +.word L80B5CAE0 +.word L80B5CB10 +.word L80B5CB70 +.word L80B5CBAC +.word L80B5CC08 +.word L80B5CC28 +.word L80B5CC64 +.word L80B5CD18 +.word L80B5CD84 +.word L80B5CDCC +.word L80B5CE30 +.word L80B5CE5C +.word L80B5CE98 +.word L80B5CED4 + +.text glabel func_80B5C984 /* 011D4 80B5C984 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 011D8 80B5C988 AFBF001C */ sw $ra, 0x001C($sp) @@ -410,5 +432,3 @@ glabel L80B5CED4 /* 017B4 80B5CF64 8FB10018 */ lw $s1, 0x0018($sp) /* 017B8 80B5CF68 03E00008 */ jr $ra /* 017BC 80B5CF6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5CF70.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5CF70.s index 286ddac1f2..a91156e5e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5CF70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5CF70.s @@ -1,3 +1,20 @@ +.late_rodata +glabel jtbl_80B5FC58 +.word L80B5CFBC +.word L80B5CFFC +.word L80B5D04C +.word L80B5D09C +.word L80B5D0CC +.word L80B5D178 +.word L80B5D198 +.word L80B5D1F4 +.word L80B5D238 +.word L80B5D278 +.word L80B5D2D0 +.word L80B5D2F0 +.word L80B5D364 + +.text glabel func_80B5CF70 /* 017C0 80B5CF70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 017C4 80B5CF74 AFBF001C */ sw $ra, 0x001C($sp) @@ -313,5 +330,3 @@ glabel L80B5D364 /* 01C10 80B5D3C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01C14 80B5D3C4 03E00008 */ jr $ra /* 01C18 80B5D3C8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s index eead85c06b..f906e276d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s @@ -155,5 +155,3 @@ glabel func_80B5D3CC /* 01E54 80B5D604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01E58 80B5D608 03E00008 */ jr $ra /* 01E5C 80B5D60C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s index 70131c3b7a..791f57cebc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s @@ -1,3 +1,20 @@ +.late_rodata +glabel jtbl_80B5FC8C +.word L80B5D650 +.word L80B5D704 +.word L80B5D734 +.word L80B5D788 +.word L80B5D7C8 +.word L80B5D83C +.word L80B5D870 +.word L80B5D8B4 +.word L80B5D980 +.word L80B5D9C8 +.word L80B5DA20 +.word L80B5DA50 +.word L80B5DA70 + +.text glabel func_80B5D610 /* 01E60 80B5D610 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01E64 80B5D614 AFBF001C */ sw $ra, 0x001C($sp) @@ -338,5 +355,3 @@ glabel L80B5DA70 /* 0231C 80B5DACC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02320 80B5DAD0 03E00008 */ jr $ra /* 02324 80B5DAD4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s index 097d62b6e9..0831f7607c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s @@ -1,3 +1,15 @@ +.late_rodata +glabel jtbl_80B5FCC0 +.word L80B5DB14 +.word L80B5DB54 +.word L80B5DB94 +.word L80B5DC08 +.word L80B5DC28 +.word L80B5DC94 +.word L80B5DCB4 +.word L80B5DD7C + +.text glabel func_80B5DAD8 /* 02328 80B5DAD8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0232C 80B5DADC AFBF0024 */ sw $ra, 0x0024($sp) @@ -227,5 +239,3 @@ glabel L80B5DD7C /* 02660 80B5DE10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02664 80B5DE14 03E00008 */ jr $ra /* 02668 80B5DE18 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s index 7af3a9713a..f244c0f495 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s @@ -1,3 +1,16 @@ +.late_rodata +glabel jtbl_80B5FCE0 +.word L80B5DE5C +.word L80B5DE84 +.word L80B5DEE0 +.word L80B5DF08 +.word L80B5DF30 +.word L80B5DF58 +.word L80B5DF80 +.word L80B5DFA8 +.word L80B5DFD0 + +.text glabel func_80B5DE1C /* 0266C 80B5DE1C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02670 80B5DE20 AFBF001C */ sw $ra, 0x001C($sp) @@ -169,5 +182,3 @@ glabel L80B5DFD0 /* 028D4 80B5E084 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 028D8 80B5E088 03E00008 */ jr $ra /* 028DC 80B5E08C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E090.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E090.s index 6d135e6842..1abd10c5e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E090.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E090.s @@ -29,5 +29,3 @@ glabel func_80B5E090 /* 0294C 80B5E0FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02950 80B5E100 03E00008 */ jr $ra /* 02954 80B5E104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s index 5b3a9e69d4..9f6ece6abc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s @@ -116,5 +116,3 @@ glabel func_80B5E108 /* 02AFC 80B5E2AC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 02B00 80B5E2B0 03E00008 */ jr $ra /* 02B04 80B5E2B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E364.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E364.s index ed36637d94..c0c71767dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E364.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B5FD04 + .float 3.14159274101 + +glabel D_80B5FD08 + .float 3.14159274101 + +glabel D_80B5FD0C + .float 3.14159274101 + +glabel D_80B5FD10 + .float 3.14159274101 + +.text glabel func_80B5E364 /* 02BB4 80B5E364 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02BB8 80B5E368 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 @@ -101,5 +115,3 @@ glabel func_80B5E364 /* 02D34 80B5E4E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02D38 80B5E4E8 03E00008 */ jr $ra /* 02D3C 80B5E4EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E4F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E4F0.s index c690e726ec..941bce0df7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E4F0.s @@ -23,5 +23,3 @@ glabel func_80B5E4F0 /* 02D90 80B5E540 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02D94 80B5E544 03E00008 */ jr $ra /* 02D98 80B5E548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Destroy.s index 53dcb3ba0a..7f120fb9cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Destroy.s @@ -2,5 +2,3 @@ glabel EnZo_Destroy /* 016C4 80B618E4 AFA40000 */ sw $a0, 0x0000($sp) /* 016C8 80B618E8 03E00008 */ jr $ra /* 016CC 80B618EC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s index 7c7c543143..828e5ebce4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B62674 + .asciz "../z_en_zo.c" + .balign 4 + +glabel D_80B62684 + .asciz "../z_en_zo.c" + .balign 4 + +.text glabel EnZo_Draw /* 02020 80B62240 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 02024 80B62244 3C0F80B6 */ lui $t7, %hi(D_80B625B0) ## $t7 = 80B60000 @@ -134,4 +144,3 @@ glabel EnZo_Draw /* 02224 80B62444 03E00008 */ jr $ra /* 02228 80B62448 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0222C 80B6244C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s index 7827fdf0b1..caa7289a46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s @@ -139,5 +139,3 @@ glabel EnZo_Init /* 016B8 80B618D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 016BC 80B618DC 03E00008 */ jr $ra /* 016C0 80B618E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s index d61a16942d..4371074022 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s @@ -129,5 +129,3 @@ glabel EnZo_Update /* 01DA0 80B61FC0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01DA4 80B61FC4 03E00008 */ jr $ra /* 01DA8 80B61FC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60220.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60220.s index 352c0fe030..a068cd6003 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60220.s @@ -39,5 +39,3 @@ glabel func_80B60220 .L80B602AC: /* 0008C 80B602AC 03E00008 */ jr $ra /* 00090 80B602B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B602B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B602B4.s index 40685afe1f..930a8dd815 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B602B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B602B4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B62694 + .float 0.02 + +glabel D_80B62698 + .float 0.12 + +.text glabel func_80B602B4 /* 00094 80B602B4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00098 80B602B8 3C0F80B6 */ lui $t7, %hi(D_80B6245C) ## $t7 = 80B60000 @@ -80,5 +88,3 @@ glabel func_80B602B4 /* 001B8 80B603D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 001BC 80B603DC 03E00008 */ jr $ra /* 001C0 80B603E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B603E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B603E4.s index 9cd8c3129d..9751115cbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B603E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B603E4.s @@ -97,5 +97,3 @@ glabel func_80B603E4 /* 00324 80B60544 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00328 80B60548 03E00008 */ jr $ra /* 0032C 80B6054C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60550.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60550.s index 02a4bf3b90..c4c937b5a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60550.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B6269C + .float 0.8 + +glabel D_80B626A0 + .float 0.2 + +.text glabel func_80B60550 /* 00330 80B60550 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00334 80B60554 F7B60020 */ sdc1 $f22, 0x0020($sp) @@ -51,5 +59,3 @@ glabel func_80B60550 /* 003E0 80B60600 8FB20030 */ lw $s2, 0x0030($sp) /* 003E4 80B60604 03E00008 */ jr $ra /* 003E8 80B60608 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6060C.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6060C.s index 58afaa2962..366b5f9aae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6060C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6060C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B626A4 + .float 0.12 + +glabel D_80B626A8 + .word 0x3D75C28F + +.text glabel func_80B6060C /* 003EC 80B6060C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 003F0 80B60610 F7BA0030 */ sdc1 $f26, 0x0030($sp) @@ -79,5 +87,3 @@ glabel func_80B6060C /* 00510 80B60730 8FB30048 */ lw $s3, 0x0048($sp) /* 00514 80B60734 03E00008 */ jr $ra /* 00518 80B60738 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6073C.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6073C.s index 48c5e16a98..8197253b1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6073C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6073C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B626AC + .float 0.12 + +glabel D_80B626B0 + .word 0x3D75C28F + +.text glabel func_80B6073C /* 0051C 80B6073C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00520 80B60740 F7B80028 */ sdc1 $f24, 0x0028($sp) @@ -81,5 +89,3 @@ glabel func_80B6073C /* 00648 80B60868 8FB30048 */ lw $s3, 0x0048($sp) /* 0064C 80B6086C 03E00008 */ jr $ra /* 00650 80B60870 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s index 569916368a..4d2258b6b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B625C0 + .asciz "../z_en_zo_eff.c" + .balign 4 + +glabel D_80B625D4 + .asciz "../z_en_zo_eff.c" + .balign 4 + +glabel D_80B625E8 + .asciz "../z_en_zo_eff.c" + .balign 4 + +.text glabel func_80B60874 /* 00654 80B60874 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00658 80B60878 AFBF0044 */ sw $ra, 0x0044($sp) @@ -125,5 +139,3 @@ glabel func_80B60874 /* 00834 80B60A54 8FBE0040 */ lw $s8, 0x0040($sp) /* 00838 80B60A58 03E00008 */ jr $ra /* 0083C 80B60A5C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s index a8cf07bec3..7350ac7c89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B625FC + .asciz "../z_en_zo_eff.c" + .balign 4 + +glabel D_80B62610 + .asciz "../z_en_zo_eff.c" + .balign 4 + +glabel D_80B62624 + .asciz "../z_en_zo_eff.c" + .balign 4 + +.text glabel func_80B60A60 /* 00840 80B60A60 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00844 80B60A64 AFB60038 */ sw $s6, 0x0038($sp) @@ -123,5 +137,3 @@ glabel func_80B60A60 /* 00A18 80B60C38 8FBE0040 */ lw $s8, 0x0040($sp) /* 00A1C 80B60C3C 03E00008 */ jr $ra /* 00A20 80B60C40 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s index 0835a776ea..1faa9dcf6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B62638 + .asciz "../z_en_zo_eff.c" + .balign 4 + +glabel D_80B6264C + .asciz "../z_en_zo_eff.c" + .balign 4 + +glabel D_80B62660 + .asciz "../z_en_zo_eff.c" + .balign 4 + +.text glabel func_80B60C44 /* 00A24 80B60C44 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00A28 80B60C48 AFB60038 */ sw $s6, 0x0038($sp) @@ -126,5 +140,3 @@ glabel func_80B60C44 /* 00C08 80B60E28 8FBE0040 */ lw $s8, 0x0040($sp) /* 00C0C 80B60E2C 03E00008 */ jr $ra /* 00C10 80B60E30 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60E34.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60E34.s index 9785c1856c..c159c7843f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60E34.s @@ -30,5 +30,3 @@ glabel func_80B60E34 /* 00C84 80B60EA4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00C88 80B60EA8 03E00008 */ jr $ra /* 00C8C 80B60EAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60EB0.s index 0ca0c7255f..2de71f6aa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60EB0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B626B4 + .float 6.28 + +.text glabel func_80B60EB0 /* 00C90 80B60EB0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00C94 80B60EB4 F7BE0038 */ sdc1 $f30, 0x0038($sp) @@ -98,5 +103,3 @@ glabel func_80B60EB0 /* 00DF8 80B61018 8FB50058 */ lw $s5, 0x0058($sp) /* 00DFC 80B6101C 03E00008 */ jr $ra /* 00E00 80B61020 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s index 510c68759e..7f9780bdfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s @@ -1,3 +1,16 @@ +.late_rodata +glabel jtbl_80B626B8 +.word L80B610A4 +.word L80B610E4 +.word L80B61144 +.word L80B611B4 +.word L80B611F4 +.word L80B61244 +.word L80B61094 +.word L80B6109C +.word L80B61074 + +.text glabel func_80B61024 /* 00E04 80B61024 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00E08 80B61028 AFBF0014 */ sw $ra, 0x0014($sp) @@ -178,5 +191,3 @@ glabel L80B61244 /* 0106C 80B6128C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01070 80B61290 03E00008 */ jr $ra /* 01074 80B61294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s index a9a8236852..37b386eef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s @@ -1,3 +1,17 @@ +.late_rodata +glabel jtbl_80B626DC +.word L80B612DC +.word L80B612DC +.word L80B612E4 +.word L80B612DC +.word L80B6135C +.word L80B613C4 +.word L80B612DC +.word L80B612DC +.word L80B612DC +.word L80B612DC + +.text glabel func_80B61298 /* 01078 80B61298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0107C 80B6129C AFBF0014 */ sw $ra, 0x0014($sp) @@ -102,5 +116,3 @@ glabel L80B613C4 /* 011CC 80B613EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011D0 80B613F0 03E00008 */ jr $ra /* 011D4 80B613F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B613F8.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B613F8.s index 05ce2380cc..20ef9ef800 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B613F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B613F8.s @@ -33,5 +33,3 @@ glabel func_80B613F8 /* 01244 80B61464 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01248 80B61468 03E00008 */ jr $ra /* 0124C 80B6146C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s index 8dcd3a7299..6c27efa228 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s @@ -58,5 +58,3 @@ glabel func_80B61470 /* 01320 80B61540 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01324 80B61544 03E00008 */ jr $ra /* 01328 80B61548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6154C.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6154C.s index 77c9f2c85d..73a43648b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6154C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6154C.s @@ -39,5 +39,3 @@ glabel func_80B6154C .L80B615DC: /* 013BC 80B615DC 03E00008 */ jr $ra /* 013C0 80B615E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B615E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B615E4.s index 9c14ad7e9a..d3ad0838af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B615E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B615E4.s @@ -69,5 +69,3 @@ glabel func_80B615E4 /* 014B0 80B616D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 014B4 80B616D4 03E00008 */ jr $ra /* 014B8 80B616D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B618F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B618F0.s index cf65687f70..1dec7a302d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B618F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B618F0.s @@ -61,5 +61,3 @@ glabel func_80B618F0 /* 017A8 80B619C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 017AC 80B619CC 03E00008 */ jr $ra /* 017B0 80B619D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B619D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B619D4.s index 5b8d2647f1..e09c0f2abe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B619D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B619D4.s @@ -16,5 +16,3 @@ glabel func_80B619D4 /* 017E8 80B61A08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 017EC 80B61A0C 03E00008 */ jr $ra /* 017F0 80B61A10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61A14.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61A14.s index 3ec9fe5dbb..f69f7c783a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61A14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61A14.s @@ -61,5 +61,3 @@ glabel func_80B61A14 /* 018C8 80B61AE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 018CC 80B61AEC 03E00008 */ jr $ra /* 018D0 80B61AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61AF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61AF4.s index 94fbe40c2f..b62a2b3d68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61AF4.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B62704 + .word 0xBF19999A +glabel D_80B62708 + .float 0.6 + +glabel D_80B6270C + .float 0.2 + +.text glabel func_80B61AF4 /* 018D4 80B61AF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 018D8 80B61AF8 AFB00018 */ sw $s0, 0x0018($sp) @@ -119,5 +129,3 @@ glabel func_80B61AF4 /* 01A78 80B61C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01A7C 80B61C9C 03E00008 */ jr $ra /* 01A80 80B61CA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61CA4.s index fa9664ac50..21530471f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61CA4.s @@ -88,5 +88,3 @@ glabel func_80B61CA4 /* 01BC0 80B61DE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01BC4 80B61DE4 03E00008 */ jr $ra /* 01BC8 80B61DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61FCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61FCC.s index 2a7c72e145..f9f48030f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61FCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61FCC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B62710 + .float 3.14159274101 + +glabel D_80B62714 + .float 3.14159274101 + +glabel D_80B62718 + .float 3.14159274101 + +glabel D_80B6271C + .float 3.14159274101 + +.text glabel func_80B61FCC /* 01DAC 80B61FCC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01DB0 80B61FD0 AFB00018 */ sw $s0, 0x0018($sp) @@ -139,5 +153,3 @@ glabel func_80B61FCC /* 01FB8 80B621D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 01FBC 80B621DC 03E00008 */ jr $ra /* 01FC0 80B621E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B621E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B621E4.s index d385d3fc3c..e7158a8062 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B621E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B621E4.s @@ -23,5 +23,3 @@ glabel func_80B621E4 /* 02014 80B62234 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02018 80B62238 03E00008 */ jr $ra /* 0201C 80B6223C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Destroy.s index 47bdf620a1..e962968f44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Destroy.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B65210 + .asciz "F DT1\n" + .balign 4 + +glabel D_80B65218 + .asciz "F DT2\n" + .balign 4 + +.text glabel EnfHG_Destroy /* 000FC 80B62ABC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00100 80B62AC0 AFA40018 */ sw $a0, 0x0018($sp) @@ -19,5 +29,3 @@ glabel EnfHG_Destroy /* 00138 80B62AF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0013C 80B62AFC 03E00008 */ jr $ra /* 00140 80B62B00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s index 2e00c962ac..0e1d7b6083 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B65378 + .asciz "../z_en_fhg.c" + .balign 4 + +glabel D_80B65388 + .asciz "../z_en_fhg.c" + .balign 4 + +.text glabel EnfHG_Draw /* 024E4 80B64EA4 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 024E8 80B64EA8 AFBF0034 */ sw $ra, 0x0034($sp) @@ -190,4 +200,3 @@ glabel EnfHG_Draw /* 027A4 80B65164 8FB20030 */ lw $s2, 0x0030($sp) /* 027A8 80B65168 03E00008 */ jr $ra /* 027AC 80B6516C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Init.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Init.s index 051eb81af8..10c7529f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Init.s @@ -68,5 +68,3 @@ glabel EnfHG_Init /* 000F0 80B62AB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000F4 80B62AB4 03E00008 */ jr $ra /* 000F8 80B62AB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s index e35fdf36f0..829ae30e4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B65454 + .float 1500.0 + +.text glabel EnfHG_Update /* 02340 80B64D00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02344 80B64D04 AFBF001C */ sw $ra, 0x001C($sp) @@ -108,5 +113,3 @@ glabel EnfHG_Update /* 024C8 80B64E88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024CC 80B64E8C 03E00008 */ jr $ra /* 024D0 80B64E90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s index 47d264a838..de291f6cc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B65398 + .word 0xC54F3000 + +.text glabel func_80B62B04 /* 00144 80B62B04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00148 80B62B08 AFA5001C */ sw $a1, 0x001C($sp) @@ -25,5 +30,3 @@ glabel func_80B62B04 /* 001A0 80B62B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A4 80B62B64 03E00008 */ jr $ra /* 001A8 80B62B68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index 143418bb32..ea086f8d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -1,3 +1,66 @@ +.rdata +glabel D_80B65220 + .asciz "TIME %d-------------------------------------------------\n" + .balign 4 + +.late_rodata +glabel jtbl_80B6539C +.word L80B62BD0 +.word L80B62CA4 +.word L80B62E10 +.word L80B62EFC +.word L80B630A4 +.word L80B6320C +.word L80B632DC +.word L80B63670 +.word L80B63988 +.word L80B63C0C +.word L80B63D54 +.word L80B63D54 +.word L80B63D54 +.word L80B63D54 +.word L80B63D54 +.word L80B62C2C +glabel D_80B653DC + .word 0xC54F3000 +glabel D_80B653E0 + .word 0xC53B8000 +glabel D_80B653E4 + .word 0xC53BF000 +glabel D_80B653E8 + .word 0x40BFAE14 +glabel D_80B653EC + .word 0xC5458000 +glabel D_80B653F0 + .word 0xC5449000 +glabel D_80B653F4 + .word 0xC53B8000 +glabel D_80B653F8 + .word 0xC53BF000 +glabel D_80B653FC + .word 0xC5485000 +glabel D_80B65400 + .word 0xC558E000 +glabel D_80B65404 + .word 0xC54DA000 +glabel D_80B65408 + .word 0xC5534000 +glabel D_80B6540C + .word 0xC5467000 +glabel D_80B65410 + .word 0xC5467000 +glabel D_80B65414 + .word 0xC548F000 +glabel D_80B65418 + .word 0xC5363800 +glabel D_80B6541C + .word 0xC5363800 +glabel D_80B65420 + .word 0xC5363800 +glabel D_80B65424 + .word 0xC548F000 + +.text glabel func_80B62B6C /* 001AC 80B62B6C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 001B0 80B62B70 AFBF003C */ sw $ra, 0x003C($sp) @@ -1272,5 +1335,3 @@ glabel L80B63D54 /* 013B8 80B63D78 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 013BC 80B63D7C 03E00008 */ jr $ra /* 013C0 80B63D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s index f143d85cb4..cdb5190937 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s @@ -1,3 +1,41 @@ +.rdata +glabel D_80B6525C + .asciz "KABE NO 1 = %d\n" + .balign 4 + +glabel D_80B6526C + .asciz "KABE NO 2 = %d\n" + .balign 4 + +glabel D_80B6527C + .asciz "XP1 = %f\n" + .balign 4 + +glabel D_80B65288 + .asciz "ZP1 = %f\n" + .balign 4 + +.late_rodata +glabel D_80B65428 + .float 1.3 + +glabel D_80B6542C + .word 0x454FD000 +glabel D_80B65430 + .float 0.01 + +glabel D_80B65434 + .float 1.3 + +glabel D_80B65438 + .word 0x454FD000 +glabel D_80B6543C + .float 0.002 + +glabel D_80B65440 + .float 0.001 + +.text glabel func_80B63D84 /* 013C4 80B63D84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 013C8 80B63D88 3C0F80B6 */ lui $t7, %hi(D_80B65204) ## $t7 = 80B60000 @@ -186,5 +224,3 @@ glabel func_80B63D84 /* 01680 80B64040 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 01684 80B64044 03E00008 */ jr $ra /* 01688 80B64048 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s index 33d21ccd43..9f078047ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B65294 + .asciz "STANDBY !!\n" + .balign 4 + +glabel D_80B652A0 + .asciz "XP2 = %f\n" + .balign 4 + +glabel D_80B652AC + .asciz "ZP2 = %f\n" + .balign 4 + +glabel D_80B652B8 + .asciz "arg_data ------------------------------------>%d\n" + .balign 4 + +.text glabel func_80B6404C /* 0168C 80B6404C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 01690 80B64050 AFB00038 */ sw $s0, 0x0038($sp) @@ -140,5 +158,3 @@ glabel func_80B6404C /* 01880 80B64240 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 01884 80B64244 03E00008 */ jr $ra /* 01888 80B64248 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s index de63d7ae5e..7820d8e976 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B652EC + .asciz "KABE OUT !!\n" + .balign 4 + +glabel D_80B652FC + .asciz "SPD X %f\n" + .balign 4 + +glabel D_80B65308 + .asciz "SPD Z %f\n" + .balign 4 + +glabel D_80B65314 + .asciz "X=%f\n" + .balign 4 + +glabel D_80B6531C + .asciz "Z=%f\n" + .balign 4 + +.text glabel func_80B6424C /* 0188C 80B6424C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 01890 80B64250 AFB00038 */ sw $s0, 0x0038($sp) @@ -370,5 +392,3 @@ glabel func_80B6424C /* 01DA0 80B64760 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01DA4 80B64764 03E00008 */ jr $ra /* 01DA8 80B64768 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s index 2e3f73f2a2..afab12aa13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s @@ -1,3 +1,16 @@ +.rdata +glabel D_80B65324 + .asciz "REVISE !!\n" + .balign 4 + +.late_rodata +glabel D_80B65444 + .float 1.3 + +glabel D_80B65448 + .word 0x454FD000 + +.text glabel func_80B6476C /* 01DAC 80B6476C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 01DB0 80B64770 AFB00040 */ sw $s0, 0x0040($sp) @@ -228,5 +241,3 @@ glabel func_80B6476C /* 020DC 80B64A9C 8FB00040 */ lw $s0, 0x0040($sp) /* 020E0 80B64AA0 03E00008 */ jr $ra /* 020E4 80B64AA4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s index 2e86964c77..aeb33e2023 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s @@ -1,3 +1,20 @@ +.rdata +glabel D_80B65330 + .asciz "KABE IN !!\n" + .balign 4 + +glabel D_80B6533C + .asciz "ac1 = %x `````````````````````````````````````````````````\n" + .balign 4 + +.late_rodata +glabel D_80B6544C + .float 0.001 + +glabel D_80B65450 + .word 0x40BFAE14 + +.text glabel func_80B64AA8 /* 020E8 80B64AA8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 020EC 80B64AAC AFB10040 */ sw $s1, 0x0040($sp) @@ -165,5 +182,3 @@ glabel func_80B64AA8 /* 02328 80B64CE8 8FB10040 */ lw $s1, 0x0040($sp) /* 0232C 80B64CEC 03E00008 */ jr $ra /* 02330 80B64CF0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64CF4.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64CF4.s index b84ae218d7..24568c9d9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64CF4.s @@ -2,5 +2,3 @@ glabel func_80B64CF4 /* 02334 80B64CF4 AFA50004 */ sw $a1, 0x0004($sp) /* 02338 80B64CF8 03E00008 */ jr $ra /* 0233C 80B64CFC A080014D */ sb $zero, 0x014D($a0) ## 0000014D - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64E94.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64E94.s index 81a3c5d830..2a2da12ad4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64E94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64E94.s @@ -3,5 +3,3 @@ glabel func_80B64E94 /* 024D8 80B64E98 AFA50004 */ sw $a1, 0x0004($sp) /* 024DC 80B64E9C 03E00008 */ jr $ra /* 024E0 80B64EA0 AFA60008 */ sw $a2, 0x0008($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Destroy.s b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Destroy.s index 86e520ef25..2fe129ffe6 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Destroy.s @@ -2,5 +2,3 @@ glabel EndTitle_Destroy /* 00030 80B65750 AFA40000 */ sw $a0, 0x0000($sp) /* 00034 80B65754 03E00008 */ jr $ra /* 00038 80B65758 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s index c9125d4ab8..204d2617d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80B69850 + .asciz "../z_end_title.c" + .balign 4 + +glabel D_80B69864 + .asciz "../z_end_title.c" + .balign 4 + +glabel D_80B69878 + .asciz "../z_end_title.c" + .balign 4 + +glabel D_80B6988C + .asciz "../z_end_title.c" + .balign 4 + +glabel D_80B698A0 + .asciz "../z_end_title.c" + .balign 4 + +.late_rodata +glabel D_80B698DC + .word 0x3E051EB8 +glabel D_80B698E0 + .word 0x3E93431D, 0x00000000, 0x00000000, 0x00000000 + +.text glabel EndTitle_Draw /* 00048 80B65768 27BDFF00 */ addiu $sp, $sp, 0xFF00 ## $sp = FFFFFF00 /* 0004C 80B6576C AFBF0014 */ sw $ra, 0x0014($sp) @@ -404,5 +432,3 @@ glabel EndTitle_Draw /* 0067C 80B65D9C 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 /* 00680 80B65DA0 03E00008 */ jr $ra /* 00684 80B65DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Init.s b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Init.s index cc4ab17e35..4f98d1f922 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Init.s @@ -12,5 +12,3 @@ glabel EndTitle_Init .L80B65748: /* 00028 80B65748 03E00008 */ jr $ra /* 0002C 80B6574C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Update.s b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Update.s index d77dafc2c2..2bf2c73e3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Update.s @@ -2,5 +2,3 @@ glabel EndTitle_Update /* 0003C 80B6575C AFA40000 */ sw $a0, 0x0000($sp) /* 00040 80B65760 03E00008 */ jr $ra /* 00044 80B65764 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s b/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s index f3c837d08f..856bf81470 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B698B4 + .asciz "../z_end_title.c" + .balign 4 + +glabel D_80B698C8 + .asciz "../z_end_title.c" + .balign 4 + +.text glabel func_80B65DA8 /* 00688 80B65DA8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0068C 80B65DAC AFBF0014 */ sw $ra, 0x0014($sp) @@ -55,4 +65,3 @@ glabel func_80B65DA8 /* 00754 80B65E74 03E00008 */ jr $ra /* 00758 80B65E78 00000000 */ nop /* 0075C 80B65E7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s index 333fcfe39e..dfb6bcf21d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s @@ -30,5 +30,3 @@ glabel Fishing_Destroy /* 0157C 80B6AF1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01580 80B6AF20 03E00008 */ jr $ra /* 01584 80B6AF24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s index 5c84781036..5b51ed6db6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s @@ -1,3 +1,29 @@ +.late_rodata +glabel D_80B7B758 + .float 3.14159274101 + +glabel D_80B7B75C + .float 3.14159274101 + +glabel D_80B7B760 + .float 3.14159274101 + +glabel D_80B7B764 + .float 9.58738019108e-05 + +glabel D_80B7B768 + .float 1.57079637051 + +glabel D_80B7B76C + .float 0.01 + +glabel D_80B7B770 + .float 9.58738019108e-05 + +glabel D_80B7B774 + .float -1.57079637051 + +.text glabel Fishing_Draw /* 0C444 80B75DE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0C448 80B75DE8 AFB00028 */ sw $s0, 0x0028($sp) @@ -146,5 +172,3 @@ glabel Fishing_Draw /* 0C67C 80B7601C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0C680 80B76020 03E00008 */ jr $ra /* 0C684 80B76024 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index bad1555428..c8553c2569 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -1,3 +1,29 @@ +.late_rodata +glabel D_80B7B374 + .float 0.7 + +glabel D_80B7B378 + .float 2.3 + +glabel D_80B7B37C + .float 4.6 + +glabel D_80B7B380 + .float 982.0 + +glabel D_80B7B384 + .float 4.99998998642 + +glabel D_80B7B388 + .float 0.05 + +glabel D_80B7B38C + .float 7.99998998642 + +glabel D_80B7B390 + .float 0.73 + +.text glabel Fishing_Init /* 00BA0 80B6A540 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00BA4 80B6A544 AFB30050 */ sw $s3, 0x0050($sp) @@ -666,5 +692,3 @@ glabel Fishing_Init /* 01510 80B6AEB0 8FB30050 */ lw $s3, 0x0050($sp) /* 01514 80B6AEB4 03E00008 */ jr $ra /* 01518 80B6AEB8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s index f703962947..601ead5073 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -1,3 +1,378 @@ +.rdata +glabel D_80B7B1F0 + .asciz "HIT FISH %dcm\n" + + +.late_rodata +glabel D_80B7B564 + .float 0.15 + +glabel D_80B7B568 + .float 0.3 + +glabel D_80B7B56C + .float 1150.0 + +glabel D_80B7B570 + .float 0.1 + +glabel D_80B7B574 + .float 9.99999974738e-06 + +glabel D_80B7B578 + .float -1.2 + +glabel D_80B7B57C + .float 1.6 + +glabel D_80B7B580 + .float 9.99999997475e-07 + +glabel D_80B7B584 + .float 1.1 + +glabel D_80B7B588 + .float 0.8 + +glabel D_80B7B58C + .float 2.1 + +glabel D_80B7B590 + .float 0.4 + +glabel D_80B7B594 + .float 0.6 + +glabel jtbl_80B7B598 +.word L80B72860 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B75278 +.word L80B73684 +.word L80B7260C +.word L80B723E8 +.word L80B72144 +.word L80B72260 +.word L80B72928 +.word L80B73004 +.word L80B7320C +.word L80B738A0 +.word L80B748A0 +.word L80B74FF0 +.word L80B75278 +.word L80B75278 +.word L80B71ED8 +.word L80B71FA8 +glabel D_80B7B62C + .float 1300.0 + +glabel D_80B7B630 + .float 0.02 + +glabel D_80B7B634 + .float 0.03 + + +glabel D_80B7B638 + .float 2500.0 + + +glabel D_80B7B63C + .float 1500.0 + + +glabel D_80B7B640 + .float 0.3 + + +glabel D_80B7B644 + .float 333.333343506 + + +glabel D_80B7B648 + .float 0.4 + + +glabel D_80B7B64C + .float 1.2 + + +glabel D_80B7B650 + .float 0.8 + + +glabel D_80B7B654 + .float 1500.0 + + +glabel D_80B7B658 + .float 0.4 + + +glabel D_80B7B65C + .float 0.6 + + +glabel D_80B7B660 + .float 0.7 + + +glabel D_80B7B664 + .float 0.1 + + +glabel D_80B7B668 + .float 0.005 + + +glabel D_80B7B66C + .float 0.01 + + +glabel D_80B7B670 + .float 0.05 + + +glabel D_80B7B674 + .float 0.008 + + +glabel D_80B7B678 + .float 3000.0 + + +glabel D_80B7B67C + .float 0.3 + + +glabel D_80B7B680 + .float 0.6 + + +glabel D_80B7B684 + .float 0.03 + + +glabel D_80B7B688 + .float 1.2 + + +glabel D_80B7B68C + .float 5000.0 + + +glabel D_80B7B690 + .float 3000.0 + + +glabel D_80B7B694 + .float 0.8 + + +glabel D_80B7B698 + .float 1.2 + + +glabel D_80B7B69C + .float 5000.0 + + +glabel D_80B7B6A0 + .float 1.2 + + +glabel D_80B7B6A4 + .float 5000.0 + + +glabel D_80B7B6A8 + .float 1.2 + + +glabel D_80B7B6AC + .float 5000.0 + + +glabel D_80B7B6B0 + .float 1.33333301544 + + +glabel D_80B7B6B4 + .float 1.7 + + +glabel D_80B7B6B8 + .float 7000.0 + + +glabel D_80B7B6BC + .float 2.35619449615 + + +glabel D_80B7B6C0 + .float 3.14159274101 + + +glabel D_80B7B6C4 + .float 562500.0 + + +glabel D_80B7B6C8 + .float 0.1 + + +glabel D_80B7B6CC + .float 1.6 + + +glabel D_80B7B6D0 + .float 6000.0 + + +glabel D_80B7B6D4 + .float 1.4 + + +glabel D_80B7B6D8 + .float 5000.0 + + +glabel D_80B7B6DC + .float 0.00899 + + +glabel D_80B7B6E0 + .float 0.00899 + + +glabel D_80B7B6E4 + .float 1.4 + + +glabel D_80B7B6E8 + .float 4500.0 + + +glabel D_80B7B6EC + .float 0.00899 + + +glabel D_80B7B6F0 + .float 1.3 + + +glabel D_80B7B6F4 + .float 0.00899 + + +glabel D_80B7B6F8 + .float 1.4 + + +glabel D_80B7B6FC + .float 1.3 + + +glabel D_80B7B700 + .float -0.8 + + +glabel D_80B7B704 + .float -0.9 + + +glabel D_80B7B708 + .float -0.85 + + +glabel D_80B7B70C + .float 0.1 + + +glabel D_80B7B710 + .float 0.05 + + +glabel D_80B7B714 + .float 3000.0 + + +glabel D_80B7B718 + .float 5000.0 + + +glabel D_80B7B71C + .float 3.14159274101 + + +glabel D_80B7B720 + .float 1.99000000954 + + +glabel D_80B7B724 + .float 5000.0 + + +glabel D_80B7B728 + .float 5000.0 + + +glabel D_80B7B72C + .float 5000.0 + + +glabel D_80B7B730 + .float 3.2 + + +glabel D_80B7B734 + .float 0.1 + + +glabel D_80B7B738 + .float -0.003 + +glabel D_80B7B73C + .float 5000.0 + +glabel D_80B7B740 + .float 5000.0 + +glabel D_80B7B744 + .float 0.005 + +glabel D_80B7B748 + .float 0.15 + +glabel D_80B7B74C + .float 0.075 + +glabel D_80B7B750 + .float 0.035 + +glabel D_80B7B754 + .float 0.04 + + +.text glabel Fishing_Update /* 07C54 80B715F4 27BDFEC8 */ addiu $sp, $sp, 0xFEC8 ## $sp = FFFFFEC8 /* 07C58 80B715F8 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A @@ -4893,5 +5268,3 @@ glabel L80B75278 /* 0C200 80B75BA0 8FB10030 */ lw $s1, 0x0030($sp) /* 0C204 80B75BA4 03E00008 */ jr $ra /* 0C208 80B75BA8 27BD0138 */ addiu $sp, $sp, 0x0138 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B699A0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B699A0.s index 7b6ae539a1..7b7c59de9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B699A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B699A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B7B344 + .float 1.6 + +.text glabel func_80B699A0 /* 00000 80B699A0 C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 /* 00004 80B699A4 8CB8001C */ lw $t8, 0x001C($a1) ## 0000001C @@ -40,5 +45,3 @@ glabel func_80B699A0 /* 00098 80B69A38 440A2000 */ mfc1 $t2, $f4 /* 0009C 80B69A3C 03E00008 */ jr $ra /* 000A0 80B69A40 A46A0036 */ sh $t2, 0x0036($v1) ## 00000036 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A44.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A44.s index 47c36f310f..f6aa1d0870 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A44.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A44.s @@ -6,5 +6,3 @@ glabel func_80B69A44 /* 000B4 80B69A54 3C0180B8 */ lui $at, %hi(D_80B7FEF0) ## $at = 80B80000 /* 000B8 80B69A58 03E00008 */ jr $ra /* 000BC 80B69A5C AC26FEF0 */ sw $a2, %lo(D_80B7FEF0)($at) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A60.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A60.s index d31eca5197..343ca35c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A60.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69A60.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B7B348 + .float 30269.0 + +glabel D_80B7B34C + .float 30307.0 + +glabel D_80B7B350 + .float 30323.0 + +.text glabel func_80B69A60 /* 000C0 80B69A60 3C0280B8 */ lui $v0, %hi(D_80B7FEE8) ## $v0 = 80B80000 /* 000C4 80B69A64 2442FEE8 */ addiu $v0, $v0, %lo(D_80B7FEE8) ## $v0 = 80B7FEE8 @@ -74,5 +85,3 @@ glabel func_80B69A60 .L80B69B7C: /* 001DC 80B69B7C 03E00008 */ jr $ra /* 001E0 80B69B80 46001005 */ abs.s $f0, $f2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69B84.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69B84.s index 8bf81cf20c..db20e5737d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69B84.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69B84.s @@ -45,5 +45,3 @@ glabel func_80B69B84 /* 00280 80B69C20 A4980000 */ sh $t8, 0x0000($a0) ## 00000000 /* 00284 80B69C24 03E00008 */ jr $ra /* 00288 80B69C28 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69C2C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69C2C.s index ec0d1e9cb8..303bbc3a46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69C2C.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B7B354 + .float 0.0025 + +glabel D_80B7B358 + .float 0.05 + +glabel D_80B7B35C + .float 0.1 + +.text glabel func_80B69C2C /* 0028C 80B69C2C 44876000 */ mtc1 $a3, $f12 ## $f12 = 0.00 /* 00290 80B69C30 1080000E */ beq $a0, $zero, .L80B69C6C @@ -91,5 +102,3 @@ glabel func_80B69C2C .L80B69D80: /* 003E0 80B69D80 03E00008 */ jr $ra /* 003E4 80B69D84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s index 025b354014..d690027cbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s @@ -89,5 +89,3 @@ glabel func_80B69D88 /* 00524 80B69EC4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00528 80B69EC8 03E00008 */ jr $ra /* 0052C 80B69ECC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s index c77f627287..3da35aa78a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s @@ -82,5 +82,3 @@ glabel func_80B69ED0 /* 0065C 80B69FFC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00660 80B6A000 03E00008 */ jr $ra /* 00664 80B6A004 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s index 874037abd4..d08f716eae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s @@ -80,5 +80,3 @@ glabel func_80B6A008 /* 0078C 80B6A12C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00790 80B6A130 03E00008 */ jr $ra /* 00794 80B6A134 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A138.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A138.s index 55c559b164..0c960ab0c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A138.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A138.s @@ -63,5 +63,3 @@ glabel func_80B6A138 /* 00880 80B6A220 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00884 80B6A224 03E00008 */ jr $ra /* 00888 80B6A228 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s index 227adb147a..ec00c989a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B7B360 + .float 0.3 + +glabel D_80B7B364 + .float 0.6 + +glabel D_80B7B368 + .float 6.28318548203 # 2*pi + +glabel D_80B7B36C + .float 0.08 + +glabel D_80B7B370 + .float 0.1 + +.text glabel func_80B6A22C /* 0088C 80B6A22C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00890 80B6A230 AFB00048 */ sw $s0, 0x0048($sp) @@ -209,5 +226,3 @@ glabel func_80B6A22C /* 00B94 80B6A534 8FBE0068 */ lw $s8, 0x0068($sp) /* 00B98 80B6A538 03E00008 */ jr $ra /* 00B9C 80B6A53C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s index eac312a524..1d37a05617 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s @@ -1,3 +1,26 @@ +.late_rodata +glabel D_80B7B394 + .float 0.001 + +glabel D_80B7B398 + .float 0.1 + +glabel D_80B7B39C + .float 0.3 + +glabel D_80B7B3A0 + .float 846400.0 + +glabel D_80B7B3A4 + .float 0.11 + +glabel D_80B7B3A8 + .float 0.0100000007078 + +glabel D_80B7B3AC + .float 0.147 + +.text glabel func_80B6AF28 /* 01588 80B6AF28 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0158C 80B6AF2C F7BC0040 */ sdc1 $f28, 0x0040($sp) @@ -495,5 +518,3 @@ glabel func_80B6AF28 /* 01CC8 80B6B668 8FB70068 */ lw $s7, 0x0068($sp) /* 01CCC 80B6B66C 03E00008 */ jr $ra /* 01CD0 80B6B670 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s index 88d7e3baac..8e38a0753a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -1,3 +1,67 @@ +.rdata +glabel D_80B7B000 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B010 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B020 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B030 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B040 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B050 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B060 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B070 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B080 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B090 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B3B0 + .float 0.002 + +glabel D_80B7B3B4 + .float 3.14159274101 + +glabel D_80B7B3B8 + .float 3.14159274101 + +glabel D_80B7B3BC + .float 3.14159274101 + +glabel D_80B7B3C0 + .float 3.14159274101 + +glabel D_80B7B3C4 + .float -1250.0 + +glabel D_80B7B3C8 + .float 1.57079637051 + +.text glabel func_80B6B674 /* 01CD4 80B6B674 27BDFEC8 */ addiu $sp, $sp, 0xFEC8 ## $sp = FFFFFEC8 /* 01CD8 80B6B678 AFB60058 */ sw $s6, 0x0058($sp) @@ -712,5 +776,3 @@ glabel func_80B6B674 /* 02788 80B6C128 8FBE0060 */ lw $s8, 0x0060($sp) /* 0278C 80B6C12C 03E00008 */ jr $ra /* 02790 80B6C130 27BD0138 */ addiu $sp, $sp, 0x0138 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s index 5262ba346b..086fd0262a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80B7B0A0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B0B0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B0C0 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B3CC + .float 670.0 + +glabel D_80B7B3D0 + .float 0.02 + +.text glabel func_80B6C134 /* 02794 80B6C134 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 02798 80B6C138 AFBF003C */ sw $ra, 0x003C($sp) @@ -109,5 +130,3 @@ glabel func_80B6C134 /* 02940 80B6C2E0 8FB10038 */ lw $s1, 0x0038($sp) /* 02944 80B6C2E4 03E00008 */ jr $ra /* 02948 80B6C2E8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C2EC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C2EC.s index 12567f0133..c3bad4fdeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C2EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C2EC.s @@ -64,5 +64,3 @@ glabel func_80B6C2EC .L80B6C3D8: /* 02A38 80B6C3D8 03E00008 */ jr $ra /* 02A3C 80B6C3DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s index 5601fbf22f..0ec7bed73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s @@ -1,3 +1,32 @@ +.late_rodata +glabel D_80B7B3D4 + .float 0.97 + +glabel D_80B7B3D8 + .float 0.001 + +glabel D_80B7B3DC + .float 0.299999982119 + +glabel D_80B7B3E0 + .float 846400.0 + +glabel D_80B7B3E4 + .float 0.11 + +glabel D_80B7B3E8 + .float 0.147 + +glabel D_80B7B3EC + .float 0.05 + +glabel D_80B7B3F0 + .float 0.02 + +glabel D_80B7B3F4 + .float 0.2 + +.text glabel func_80B6C3E0 /* 02A40 80B6C3E0 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 /* 02A44 80B6C3E4 3C0F80B8 */ lui $t7, %hi(D_80B7AE58) ## $t7 = 80B80000 @@ -372,5 +401,3 @@ glabel func_80B6C3E0 /* 02FB4 80B6C954 8FB60060 */ lw $s6, 0x0060($sp) /* 02FB8 80B6C958 03E00008 */ jr $ra /* 02FBC 80B6C95C 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s index 7be6f5918a..a4a91e3d13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s @@ -105,5 +105,3 @@ glabel func_80B6C960 /* 0314C 80B6CAEC 8FB60050 */ lw $s6, 0x0050($sp) /* 03150 80B6CAF0 03E00008 */ jr $ra /* 03154 80B6CAF4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s index 5324abef83..89ffb8a2cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s @@ -1,3 +1,41 @@ +.rdata +glabel D_80B7B0D0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B0E0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B0F0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B100 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B110 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B3F8 + .float 0.00399999972433 + +glabel D_80B7B3FC + .float 3.14159274101 + +glabel D_80B7B400 + .float 1.57079637051 + +glabel D_80B7B404 + .float -1250.0 + +glabel D_80B7B408 + .float 1.57079637051 + +.text glabel func_80B6CAF8 /* 03158 80B6CAF8 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 0315C 80B6CAFC 3C0F80B8 */ lui $t7, %hi(D_80B7AE70) ## $t7 = 80B80000 @@ -354,5 +392,3 @@ glabel func_80B6CAF8 /* 036A8 80B6D048 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 /* 036AC 80B6D04C 03E00008 */ jr $ra /* 036B0 80B6D050 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s index e99d98b05b..92ff21965a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B7B40C + .float 0.85 + +glabel D_80B7B410 + .float 9.58738019108e-05 + +glabel D_80B7B414 + .float 0.1 + +.text glabel func_80B6D054 /* 036B4 80B6D054 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 036B8 80B6D058 3C0E80B8 */ lui $t6, %hi(D_80B7AE7C) ## $t6 = 80B80000 @@ -200,5 +211,3 @@ glabel func_80B6D054 /* 039A8 80B6D348 8FBE0068 */ lw $s8, 0x0068($sp) /* 039AC 80B6D34C 03E00008 */ jr $ra /* 039B0 80B6D350 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s index 86d0331d01..8196a664eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s @@ -1,3 +1,30 @@ +.rdata +glabel D_80B7B120 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B130 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B140 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B150 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B418 + .float 0.04 + + +glabel D_80B7B41C + .float 0.04 + + +.text glabel func_80B6D354 /* 039B4 80B6D354 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 039B8 80B6D358 AFBF0044 */ sw $ra, 0x0044($sp) @@ -210,5 +237,3 @@ glabel func_80B6D354 /* 03CDC 80B6D67C 8FBE0040 */ lw $s8, 0x0040($sp) /* 03CE0 80B6D680 03E00008 */ jr $ra /* 03CE4 80B6D684 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s index 4084fe3af0..31b2d0d46a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s @@ -1,3 +1,66 @@ +.rdata +glabel D_80B7B160 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B170 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B180 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B190 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B1A0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B1B0 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B420 + .float 9.58738019108e-05 + + +glabel D_80B7B424 + .float 3.14159274101 + + +glabel D_80B7B428 + .float 0.00399999972433 + + +glabel D_80B7B42C + .float 1.57079637051 + + +glabel D_80B7B430 + .float 1.57079637051 + + +glabel D_80B7B434 + .float -850.0 + + +glabel D_80B7B438 + .float 2100.0 + + +glabel D_80B7B43C + .float 0.001 + + +glabel D_80B7B440 + .float 0.001 + + +.text glabel func_80B6D688 /* 03CE8 80B6D688 3C0180B8 */ lui $at, %hi(D_80B7E144) ## $at = 80B80000 /* 03CEC 80B6D68C C424E144 */ lwc1 $f4, %lo(D_80B7E144)($at) @@ -567,5 +630,3 @@ glabel func_80B6D688 /* 04584 80B6DF24 8FB10018 */ lw $s1, 0x0018($sp) /* 04588 80B6DF28 03E00008 */ jr $ra /* 0458C 80B6DF2C 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s index d8c843efd7..c273e17726 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s @@ -1,3 +1,74 @@ +.rdata +glabel D_80B7B1C0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B1D0 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B1E0 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B444 + .float 1500.0 + + +glabel D_80B7B448 + .float 0.02 + + +glabel D_80B7B44C + .float 0.02 + + +glabel D_80B7B450 + .float -0.01 + + +glabel D_80B7B454 + .float 0.01 + + +glabel D_80B7B458 + .float 0.025 + + +glabel D_80B7B45C + .float -0.03 + + +glabel D_80B7B460 + .float 1.75929188728 + + +glabel D_80B7B464 + .float 1.28805303574 + + +glabel D_80B7B468 + .float -0.628318488598 + + +glabel D_80B7B46C + .float 0.471238911152 + + +glabel D_80B7B470 + .float 0.01 + + +glabel D_80B7B474 + .float 3.14159274101 + + +glabel D_80B7B478 + .float 0.700000047684 + + +.text glabel func_80B6DF30 /* 04590 80B6DF30 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 04594 80B6DF34 AFBF0024 */ sw $ra, 0x0024($sp) @@ -730,5 +801,3 @@ glabel func_80B6DF30 /* 05034 80B6E9D4 8FB10020 */ lw $s1, 0x0020($sp) /* 05038 80B6E9D8 03E00008 */ jr $ra /* 0503C 80B6E9DC 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s index b153accf49..6ca4177e91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s @@ -1,3 +1,169 @@ +.late_rodata +glabel D_80B7B47C + .float 3.99900007248 + +glabel jtbl_80B7B480 +.word L80B6EE24 +.word L80B6F0C4 +.word L80B6F94C +.word L80B6FA3C +.word L80B70890 +.word L80B709D0 +glabel D_80B7B498 + .float 3.14159274101 + +glabel D_80B7B49C + .float 1.9 + +glabel D_80B7B4A0 + .float 0.9 + + +glabel D_80B7B4A4 + .float 3.14159274101 + + +glabel D_80B7B4A8 + .float 3.14159274101 + + +glabel D_80B7B4AC + .float 0.001 + + +glabel D_80B7B4B0 + .float 846400.0 + + +glabel D_80B7B4B4 + .float 1350.0 + + +glabel D_80B7B4B8 + .float 1100.0 + + +glabel D_80B7B4BC + .float 0.11 + + +glabel D_80B7B4C0 + .float 0.2 + + +glabel D_80B7B4C4 + .float 6.28 + + +glabel D_80B7B4C8 + .float 0.02 + + +glabel D_80B7B4CC + .float 0.025 + + +glabel D_80B7B4D0 + .float 250000.0 + + +glabel D_80B7B4D4 + .float -0.523598790169 + + +glabel D_80B7B4D8 + .float 846400.0 + + +glabel D_80B7B4DC + .float 0.0166666675359 + + +glabel D_80B7B4E0 + .float 0.0166666675359 + + +glabel D_80B7B4E4 + .float 0.3 + + +glabel D_80B7B4E8 + .float 0.3 + + +glabel D_80B7B4EC + .float 0.2 + + +glabel D_80B7B4F0 + .float 0.8 + + +glabel D_80B7B4F4 + .float 0.1 + + +glabel D_80B7B4F8 + .float 1.99899995327 + + +glabel D_80B7B4FC + .float 3.14159274101 + + +glabel D_80B7B500 + .float 0.2 + + +glabel D_80B7B504 + .float 3.14159274101 + + +glabel D_80B7B508 + .float 3.14159274101 + + +glabel D_80B7B50C + .float 0.11 + + +glabel D_80B7B510 + .float 3.14159274101 + + +glabel D_80B7B514 + .float 3.14159274101 + + +glabel D_80B7B518 + .float 3.14159274101 + + +glabel D_80B7B51C + .float 3.14159274101 + + +glabel D_80B7B520 + .float 3.14159274101 + + +glabel D_80B7B524 + .float 0.2 + + +glabel D_80B7B528 + .float 846400.0 + + +glabel D_80B7B52C + .float 0.1 + + +glabel D_80B7B530 + .float 0.000500000081956 + + +.text glabel func_80B6E9E0 /* 05040 80B6E9E0 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 05044 80B6E9E4 AFBF002C */ sw $ra, 0x002C($sp) @@ -2201,5 +2367,3 @@ glabel L80B709D0 /* 07080 80B70A20 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 /* 07084 80B70A24 03E00008 */ jr $ra /* 07088 80B70A28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s index aa437140c4..00d75bcf44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B7B534 + .float 1.2 + +glabel D_80B7B538 + .float 6.28 + +glabel D_80B7B53C + .float 0.02 + +glabel D_80B7B540 + .float 0.025 + +.text glabel func_80B70A2C /* 0708C 80B70A2C 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 07090 80B70A30 AFBF007C */ sw $ra, 0x007C($sp) @@ -188,5 +202,3 @@ glabel func_80B70A2C /* 07344 80B70CE4 8FBE0078 */ lw $s8, 0x0078($sp) /* 07348 80B70CE8 03E00008 */ jr $ra /* 0734C 80B70CEC 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s index 5b97799032..541a3ebb0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B7B544 + .float 0.3 + +glabel D_80B7B548 + .float 6.28 + +glabel D_80B7B54C + .float 0.02 + +glabel D_80B7B550 + .float 0.025 + +.text glabel func_80B70CF0 /* 07350 80B70CF0 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 /* 07354 80B70CF4 AFBF006C */ sw $ra, 0x006C($sp) @@ -130,5 +144,3 @@ glabel func_80B70CF0 /* 07528 80B70EC8 8FB60068 */ lw $s6, 0x0068($sp) /* 0752C 80B70ECC 03E00008 */ jr $ra /* 07530 80B70ED0 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s index a42a9eee6d..840920dd9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B7B554 + .float 3.14159274101 + +glabel D_80B7B558 + .float 40000.0 + +glabel D_80B7B55C + .float 4900.0 + +glabel D_80B7B560 + .float 10000.0 + +.text glabel func_80B70ED4 /* 07534 80B70ED4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 07538 80B70ED8 3C0380B8 */ lui $v1, %hi(D_80B7E0B8) ## $v1 = 80B80000 @@ -245,5 +259,3 @@ glabel func_80B70ED4 /* 078CC 80B7126C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 078D0 80B71270 03E00008 */ jr $ra /* 078D4 80B71274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71278.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71278.s index 7766f08ae9..25950e5261 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71278.s @@ -124,5 +124,3 @@ glabel func_80B71278 /* 07A8C 80B7142C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07A90 80B71430 03E00008 */ jr $ra /* 07A94 80B71434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s index 1ce01082aa..765ecf4f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s @@ -124,5 +124,3 @@ glabel func_80B71438 /* 07C48 80B715E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07C4C 80B715EC 03E00008 */ jr $ra /* 07C50 80B715F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75BAC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75BAC.s index a31ca06e4a..2570c93790 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75BAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75BAC.s @@ -85,5 +85,3 @@ glabel func_80B75BAC .L80B75CD8: /* 0C338 80B75CD8 03E00008 */ jr $ra /* 0C33C 80B75CDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75CE0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75CE0.s index 58e2e585c7..f6b0717722 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75CE0.s @@ -16,5 +16,3 @@ glabel func_80B75CE0 /* 0C374 80B75D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0C378 80B75D18 03E00008 */ jr $ra /* 0C37C 80B75D1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75D20.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75D20.s index 6c684ab760..0def4d4763 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75D20.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75D20.s @@ -35,5 +35,3 @@ glabel func_80B75D20 .L80B75D9C: /* 0C3FC 80B75D9C 03E00008 */ jr $ra /* 0C400 80B75DA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75DA4.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75DA4.s index f88c82579b..084bd18c6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B75DA4.s @@ -16,5 +16,3 @@ glabel func_80B75DA4 /* 0C438 80B75DD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0C43C 80B75DDC 03E00008 */ jr $ra /* 0C440 80B75DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s index 4cd8c1e242..ba85fef569 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B7B778 + .float 0.2 + +glabel D_80B7B77C + .float 0.03 + +.text glabel func_80B76028 /* 0C688 80B76028 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0C68C 80B7602C AFBF0014 */ sw $ra, 0x0014($sp) @@ -45,5 +53,3 @@ glabel func_80B76028 /* 0C728 80B760C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0C72C 80B760CC 03E00008 */ jr $ra /* 0C730 80B760D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s index af700a1ee8..d5dc719ffb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s @@ -63,5 +63,3 @@ glabel func_80B760D4 /* 0C80C 80B761AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0C810 80B761B0 03E00008 */ jr $ra /* 0C814 80B761B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s index 9d4dc6e061..addb77ed5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B7B780 + .float 0.05 + +.text glabel func_80B761B8 /* 0C818 80B761B8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0C81C 80B761BC F7B60018 */ sdc1 $f22, 0x0018($sp) @@ -195,5 +200,3 @@ glabel func_80B761B8 /* 0CAC8 80B76468 8FB50038 */ lw $s5, 0x0038($sp) /* 0CACC 80B7646C 03E00008 */ jr $ra /* 0CAD0 80B76470 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s index 070f42a831..5c18f3797a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80B7B200 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B210 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B220 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B230 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B240 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B250 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B784 + .float 9.58738019108e-05 + +.text glabel func_80B76474 /* 0CAD4 80B76474 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 0CAD8 80B76478 AFBF003C */ sw $ra, 0x003C($sp) @@ -305,5 +335,3 @@ glabel func_80B76474 /* 0CF50 80B768F0 8FBE0038 */ lw $s8, 0x0038($sp) /* 0CF54 80B768F4 03E00008 */ jr $ra /* 0CF58 80B768F8 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s index 4bbcc6b4a1..674e0e74f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s @@ -1,3 +1,49 @@ +.late_rodata +glabel D_80B7B788 + .float 2500.0 + + +glabel D_80B7B78C + .float 0.3 + + +glabel D_80B7B790 + .float 0.05 + + +glabel D_80B7B794 + .float 2500.0 + + +glabel D_80B7B798 + .float 0.3 + + +glabel D_80B7B79C + .float 0.05 + + +glabel D_80B7B7A0 + .float 2500.0 + + +glabel D_80B7B7A4 + .float 0.3 + + +glabel D_80B7B7A8 + .float 0.05 + + +glabel D_80B7B7AC + .float 0.8 + + +glabel D_80B7B7B0 + .float -9.99999974738e-05 + + +.text glabel func_80B768FC /* 0CF5C 80B768FC 27BDFF00 */ addiu $sp, $sp, 0xFF00 ## $sp = FFFFFF00 /* 0CF60 80B76900 3C0E80B8 */ lui $t6, %hi(D_80B7E114) ## $t6 = 80B80000 @@ -620,5 +666,3 @@ glabel func_80B768FC /* 0D820 80B771C0 8FB70074 */ lw $s7, 0x0074($sp) /* 0D824 80B771C4 03E00008 */ jr $ra /* 0D828 80B771C8 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s index 43b3e4d246..1a9643718d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s @@ -1,3 +1,47 @@ +.rdata +glabel D_80B7B260 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B270 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B280 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B290 + .asciz "\x1B[32m" + .balign 4 + +glabel D_80B7B298 + .asciz "\x1B[33m" + .balign 4 + +glabel D_80B7B2A0 + .asciz "plays %x\n" + .balign 4 + +glabel D_80B7B2AC + .asciz "ys %x\n" + .balign 4 + +glabel D_80B7B2B4 + .asciz "\x1B[m" + .balign 4 + +.late_rodata +glabel D_80B7B7B4 + .float 0.003325 + +glabel D_80B7B7B8 + .float 0.00475 + +glabel D_80B7B7BC + .float 3.14159274101 + +.text glabel func_80B771CC /* 0D82C 80B771CC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0D830 80B771D0 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 @@ -146,5 +190,3 @@ glabel func_80B771CC /* 0DA58 80B773F8 8FBE0050 */ lw $s8, 0x0050($sp) /* 0DA5C 80B773FC 03E00008 */ jr $ra /* 0DA60 80B77400 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s index 5c41bb49b2..74b690ad61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s @@ -1,3 +1,37 @@ +.late_rodata +glabel jtbl_80B7B7C0 +.word L80B7743C +.word L80B77558 +.word L80B77644 +.word L80B7768C +.word L80B776E0 +.word L80B777F0 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B77890 +.word L80B77C74 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78248 +.word L80B78068 +.word L80B780A0 +.word L80B7814C +.word L80B7819C +.word L80B781EC +glabel D_80B7B824 + .float 3.99900007248 + +glabel D_80B7B828 + .float 3.99900007248 + +.text glabel func_80B77404 /* 0DA64 80B77404 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0DA68 80B77408 AFBF0024 */ sw $ra, 0x0024($sp) @@ -1005,5 +1039,3 @@ glabel L80B78248 /* 0E8B0 80B78250 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0E8B4 80B78254 03E00008 */ jr $ra /* 0E8B8 80B78258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s index 7e1c589a4e..ecbb563cf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s @@ -1,3 +1,135 @@ +.rdata +glabel D_80B7B2B8 + .asciz "\x1b[32m" + .balign 4 + +glabel D_80B7B2C0 + .asciz "zelda_time %x\n" + .balign 4 + +glabel D_80B7B2D0 + .asciz "\x1b[m" + .balign 4 + +glabel D_80B7B2D4 + .asciz "HI_SCORE = %x\n" + .balign 4 + +.late_rodata +glabel D_80B7B82C + .float 846400.0 + +glabel D_80B7B830 + .float 0.3 + +glabel D_80B7B834 + .float 0.0015 + +glabel jtbl_80B7B838 +.word L80B7955C +.word L80B78890 +.word L80B78930 +.word L80B78DE8 +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B78EBC +.word L80B78F8C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B7955C +.word L80B79084 +.word L80B79158 +.word L80B791B0 +glabel D_80B7B894 + .float 0.2 + + +glabel D_80B7B898 + .float 0.1 + + +glabel D_80B7B89C + .float 0.001 + + +glabel D_80B7B8A0 + .float 0.3 + + +glabel D_80B7B8A4 + .float 0.1 + + +glabel D_80B7B8A8 + .float 0.4 + + +glabel D_80B7B8AC + .float 0.4 + + +glabel D_80B7B8B0 + .float 0.000500000081956 + + +glabel D_80B7B8B4 + .float 3.14159274101 + + +glabel D_80B7B8B8 + .float 6.28 + + +glabel D_80B7B8BC + .float 0.01 + + +glabel D_80B7B8C0 + .float 0.0200000014156 + + +glabel D_80B7B8C4 + .float 1.2 + + +glabel D_80B7B8C8 + .float 0.03 + + +glabel D_80B7B8CC + .float 0.8 + + +glabel D_80B7B8D0 + .float 150.1 + + +glabel D_80B7B8D4 + .float 1500.0 + + +glabel D_80B7B8D8 + .float 1.67079639435 + + +glabel D_80B7B8DC + .float -9.58738019108e-05 + + +glabel D_80B7B8E0 + .float 0.0036 + + +.text glabel func_80B7825C /* 0E8BC 80B7825C 27BDFED8 */ addiu $sp, $sp, 0xFED8 ## $sp = FFFFFED8 /* 0E8C0 80B78260 AFBF0024 */ sw $ra, 0x0024($sp) @@ -2115,5 +2247,3 @@ glabel L80B7955C /* 10760 80B7A100 27BD0128 */ addiu $sp, $sp, 0x0128 ## $sp = 00000000 /* 10764 80B7A104 03E00008 */ jr $ra /* 10768 80B7A108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A10C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A10C.s index 3e6abf3452..d1fae5d1a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A10C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A10C.s @@ -13,5 +13,3 @@ glabel func_80B7A10C .L80B7A138: /* 10798 80B7A138 03E00008 */ jr $ra /* 1079C 80B7A13C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s index d6a0db1d77..70edec1890 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B7B2E4 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B2F4 + .asciz "../z_fishing.c" + .balign 4 + +.text glabel func_80B7A140 /* 107A0 80B7A140 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 107A4 80B7A144 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 @@ -80,5 +90,3 @@ glabel func_80B7A140 /* 108CC 80B7A26C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 108D0 80B7A270 03E00008 */ jr $ra /* 108D4 80B7A274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s index bb406545f9..fcd44c5718 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -1,3 +1,31 @@ +.rdata +glabel D_80B7B304 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B314 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B324 + .asciz "../z_fishing.c" + .balign 4 + +glabel D_80B7B334 + .asciz "../z_fishing.c" + .balign 4 + +.late_rodata +glabel D_80B7B8E4 + .float 1500.0 + +glabel D_80B7B8E8 + .float 0.08 + +glabel D_80B7B8EC + .float 0.12 + +.text glabel func_80B7A278 /* 108D8 80B7A278 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 108DC 80B7A27C AFB00028 */ sw $s0, 0x0028($sp) @@ -248,4 +276,3 @@ glabel func_80B7A278 /* 10C84 80B7A624 00000000 */ nop /* 10C88 80B7A628 00000000 */ nop /* 10C8C 80B7A62C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Destroy.s index 15d0986352..27240b0686 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Destroy.s @@ -2,5 +2,3 @@ glabel ItemBHeart_Destroy /* 00068 80B851B8 AFA40000 */ sw $a0, 0x0000($sp) /* 0006C 80B851BC 03E00008 */ jr $ra /* 00070 80B851C0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s index 2928a95b00..28a357adae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B85540 + .asciz "../z_item_b_heart.c" + .balign 4 + +glabel D_80B85554 + .asciz "../z_item_b_heart.c" + .balign 4 + +glabel D_80B85568 + .asciz "../z_item_b_heart.c" + .balign 4 + +glabel D_80B8557C + .asciz "../z_item_b_heart.c" + .balign 4 + +.text glabel ItemBHeart_Draw /* 00204 80B85354 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00208 80B85358 AFBF001C */ sw $ra, 0x001C($sp) @@ -115,4 +133,3 @@ glabel ItemBHeart_Draw /* 003B4 80B85504 8FB10018 */ lw $s1, 0x0018($sp) /* 003B8 80B85508 03E00008 */ jr $ra /* 003BC 80B8550C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Init.s index 41c63974b7..117b88cb73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Init.s @@ -31,5 +31,3 @@ glabel ItemBHeart_Init /* 0005C 80B851AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00060 80B851B0 03E00008 */ jr $ra /* 00064 80B851B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Update.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Update.s index ac986435ce..864cf10fbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Update.s @@ -43,5 +43,3 @@ glabel ItemBHeart_Update /* 00108 80B85258 8FB10020 */ lw $s1, 0x0020($sp) /* 0010C 80B8525C 03E00008 */ jr $ra /* 00110 80B85260 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/func_80B85264.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/func_80B85264.s index 4446885a43..fc9f0509d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/func_80B85264.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/func_80B85264.s @@ -63,5 +63,3 @@ glabel func_80B85264 /* 001F8 80B85348 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001FC 80B8534C 03E00008 */ jr $ra /* 00200 80B85350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Destroy.s index e82acc29c5..93134be2dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Destroy.s @@ -2,5 +2,3 @@ glabel ItemEtcetera_Destroy /* 001D4 80B857C4 AFA40000 */ sw $a0, 0x0000($sp) /* 001D8 80B857C8 03E00008 */ jr $ra /* 001DC 80B857CC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s index d3cb1ed541..03794a6e66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s @@ -1,3 +1,37 @@ +.rdata +glabel D_80B85DA0 + .asciz "no = %d\n" + .balign 4 + +glabel D_80B85DAC + .asciz "bank_ID = %d\n" + .balign 4 + +glabel D_80B85DBC + .asciz "0" + .balign 4 + +glabel D_80B85DC0 + .asciz "../z_item_etcetera.c" + .balign 4 + +.late_rodata +glabel jtbl_80B85E24 +.word L80B85710 +.word L80B857B0 +.word L80B857B0 +.word L80B857B0 +.word L80B857B0 +.word L80B857B0 +.word L80B8574C +.word L80B85778 +.word L80B85778 +.word L80B85778 +.word L80B85778 +.word L80B85778 +.word L80B85778 + +.text glabel ItemEtcetera_Init /* 00008 80B855F8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 80B855FC AFBF001C */ sw $ra, 0x001C($sp) @@ -131,5 +165,3 @@ glabel L80B857B0 /* 001C8 80B857B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001CC 80B857BC 03E00008 */ jr $ra /* 001D0 80B857C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Update.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Update.s index c8cac58ed5..48bade3c9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Update.s @@ -8,5 +8,3 @@ glabel ItemEtcetera_Update /* 00668 80B85C58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0066C 80B85C5C 03E00008 */ jr $ra /* 00670 80B85C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B855F0.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B855F0.s index ef6c941542..026e7e55c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B855F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B855F0.s @@ -1,5 +1,3 @@ glabel func_80B855F0 /* 00000 80B855F0 03E00008 */ jr $ra /* 00004 80B855F4 AC85015C */ sw $a1, 0x015C($a0) ## 0000015C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B857D0.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B857D0.s index ca9f270926..59bc70e180 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B857D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B857D0.s @@ -22,5 +22,3 @@ glabel func_80B857D0 /* 00228 80B85818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0022C 80B8581C 03E00008 */ jr $ra /* 00230 80B85820 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s index 350b367fdb..8b41e98780 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s @@ -40,5 +40,3 @@ glabel func_80B85824 /* 002B8 80B858A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002BC 80B858AC 03E00008 */ jr $ra /* 002C0 80B858B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s index 7c913bc9f2..118c8e1e35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B85E58 + .float 0.13 + +.text glabel func_80B858B4 /* 002C4 80B858B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 002C8 80B858B8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -59,5 +64,3 @@ glabel func_80B858B4 /* 00390 80B85980 8FB10020 */ lw $s1, 0x0020($sp) /* 00394 80B85984 03E00008 */ jr $ra /* 00398 80B85988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B8598C.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B8598C.s index 57ad9de139..aa4d026404 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B8598C.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B8598C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B85E5C + .float -0.05 +glabel D_80B85E60 + .float -0.025 + +.text glabel func_80B8598C /* 0039C 80B8598C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 003A0 80B85990 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -71,5 +78,3 @@ glabel func_80B8598C /* 0049C 80B85A8C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 004A0 80B85A90 03E00008 */ jr $ra /* 004A4 80B85A94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85A98.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85A98.s index dc7fe8c43c..0706ada74f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85A98.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85A98.s @@ -37,5 +37,3 @@ glabel func_80B85A98 /* 0052C 80B85B1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00530 80B85B20 03E00008 */ jr $ra /* 00534 80B85B24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B28.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B28.s index 79b91f6dac..c69893664b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B28.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B28.s @@ -19,5 +19,3 @@ glabel func_80B85B28 /* 00570 80B85B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00574 80B85B64 03E00008 */ jr $ra /* 00578 80B85B68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B6C.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B6C.s index 21364c0d53..48d27834b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B6C.s @@ -1,3 +1,19 @@ +.rdata +glabel D_80B85DD8 + .asciz "../z_item_etcetera.c" + .balign 4 + +glabel D_80B85DF0 + .asciz "(game_play->demo_play.npcdemopnt[0]->dousa) = %d\n" + .balign 4 + +.late_rodata +glabel D_80B85E64 + .float -0.1 +glabel D_80B85E68 + .float -0.1 + +.text glabel func_80B85B6C /* 0057C 80B85B6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00580 80B85B70 AFBF0014 */ sw $ra, 0x0014($sp) @@ -57,5 +73,3 @@ glabel func_80B85B6C /* 00644 80B85C34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00648 80B85C38 03E00008 */ jr $ra /* 0064C 80B85C3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85C64.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85C64.s index ac7b719c5f..15c79eb446 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85C64.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85C64.s @@ -21,5 +21,3 @@ glabel func_80B85C64 /* 006BC 80B85CAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006C0 80B85CB0 03E00008 */ jr $ra /* 006C4 80B85CB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85CB8.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85CB8.s index b4b251d2dc..176e4f4195 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85CB8.s @@ -17,4 +17,3 @@ glabel func_80B85CB8 /* 00704 80B85CF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00708 80B85CF8 03E00008 */ jr $ra /* 0070C 80B85CFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Destroy.s index 9c87cdeb24..b0c47da123 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Destroy.s @@ -2,5 +2,3 @@ glabel ItemOcarina_Destroy /* 001B0 80B862E0 AFA40000 */ sw $a0, 0x0000($sp) /* 001B4 80B862E4 03E00008 */ jr $ra /* 001B8 80B862E8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Draw.s index 74506cae8c..6793e01c66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Draw.s @@ -16,4 +16,3 @@ glabel ItemOcarina_Draw /* 006B4 80B867E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006B8 80B867E8 03E00008 */ jr $ra /* 006BC 80B867EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s index 1e5544b145..966cf7249b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B86810 + .asciz "../z_item_ocarina.c" + .balign 4 + +glabel D_80B86824 + .asciz "no = %d\n" + .balign 4 + +.text glabel ItemOcarina_Init /* 00008 80B86138 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0000C 80B8613C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -122,5 +132,3 @@ glabel ItemOcarina_Init /* 001A4 80B862D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 001A8 80B862D8 03E00008 */ jr $ra /* 001AC 80B862DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Update.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Update.s index 92d231388b..6ded2c2901 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Update.s @@ -8,5 +8,3 @@ glabel ItemOcarina_Update /* 00670 80B867A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00674 80B867A4 03E00008 */ jr $ra /* 00678 80B867A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86130.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86130.s index 2757c887c1..0e246779b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86130.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86130.s @@ -1,5 +1,3 @@ glabel func_80B86130 /* 00000 80B86130 03E00008 */ jr $ra /* 00004 80B86134 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B862EC.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B862EC.s index b8f021480c..0062f1a026 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B862EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B862EC.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B86830 + .word 0x44866000 +glabel D_80B86834 + .word 0xBDCCCCCD +glabel D_80B86838 + .word 0x4462C000 + +.text glabel func_80B862EC /* 001BC 80B862EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 001C0 80B862F0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -111,5 +120,3 @@ glabel func_80B862EC /* 00358 80B86488 8FB10020 */ lw $s1, 0x0020($sp) /* 0035C 80B8648C 03E00008 */ jr $ra /* 00360 80B86490 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86494.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86494.s index 7e61e73911..869c16312d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86494.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86494.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B8683C + .word 0xBE99999A + +.text glabel func_80B86494 /* 00364 80B86494 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00368 80B86498 3C0180B8 */ lui $at, %hi(D_80B8683C) ## $at = 80B80000 @@ -21,5 +26,3 @@ glabel func_80B86494 /* 003B0 80B864E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003B4 80B864E4 03E00008 */ jr $ra /* 003B8 80B864E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B864EC.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B864EC.s index 16959f4c30..1550dbb731 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B864EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B864EC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B86840 + .word 0x44D2C000 +glabel D_80B86844 + .word 0xBE19999A + +.text glabel func_80B864EC /* 003BC 80B864EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 003C0 80B864F0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -63,5 +70,3 @@ glabel func_80B864EC /* 004A4 80B865D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A8 80B865D8 03E00008 */ jr $ra /* 004AC 80B865DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B865E0.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B865E0.s index 30f1fc1f70..28bbc6d140 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B865E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B865E0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B86848 + .word 0xBE99999A + +.text glabel func_80B865E0 /* 004B0 80B865E0 3C0180B8 */ lui $at, %hi(D_80B86848) ## $at = 80B80000 /* 004B4 80B865E4 C4246848 */ lwc1 $f4, %lo(D_80B86848)($at) @@ -23,5 +28,3 @@ glabel func_80B865E0 /* 00504 80B86634 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00508 80B86638 03E00008 */ jr $ra /* 0050C 80B8663C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86640.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86640.s index df014fcfd6..5e8071c615 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86640.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B86640.s @@ -2,5 +2,3 @@ glabel func_80B86640 /* 00510 80B86640 AFA40000 */ sw $a0, 0x0000($sp) /* 00514 80B86644 03E00008 */ jr $ra /* 00518 80B86648 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s index 4f66b1c7a3..9a40c5d46b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s @@ -28,5 +28,3 @@ glabel func_80B8664C /* 00580 80B866B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00584 80B866B4 03E00008 */ jr $ra /* 00588 80B866B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s index 3b33b6e8da..f9498c9306 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B8684C + .word 0x3E051EB8 + +.text glabel func_80B866BC /* 0058C 80B866BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00590 80B866C0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -53,5 +58,3 @@ glabel func_80B866BC /* 0064C 80B8677C 8FB10020 */ lw $s1, 0x0020($sp) /* 00650 80B86780 03E00008 */ jr $ra /* 00654 80B86784 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s index 65521e25c8..9f078a49d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s @@ -10,5 +10,3 @@ glabel ItemShield_Destroy /* 0019C 80B86ABC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A0 80B86AC0 03E00008 */ jr $ra /* 001A4 80B86AC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s index 68c0373ddc..2da7263cc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B87298 + .asciz "../z_item_shield.c" + .balign 4 + +glabel D_80B872AC + .asciz "../z_item_shield.c" + .balign 4 + +glabel D_80B872C0 + .asciz "../z_item_shield.c" + .balign 4 + +.text glabel ItemShield_Draw /* 00778 80B87098 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0077C 80B8709C AFBF001C */ sw $ra, 0x001C($sp) @@ -66,4 +80,3 @@ glabel ItemShield_Draw /* 00874 80B87194 00000000 */ nop /* 00878 80B87198 00000000 */ nop /* 0087C 80B8719C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s index 39b4f3e8db..191ac12978 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B87280 + .asciz "Item_Shild %d \n" + .balign 4 + +.text glabel ItemShield_Init /* 00008 80B86928 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 80B8692C AFBF0034 */ sw $ra, 0x0034($sp) @@ -106,5 +112,3 @@ glabel ItemShield_Init /* 00174 80B86A94 8FB40030 */ lw $s4, 0x0030($sp) /* 00178 80B86A98 03E00008 */ jr $ra /* 0017C 80B86A9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Update.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Update.s index 54ebdbdf2e..594dd59b04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Update.s @@ -8,5 +8,3 @@ glabel ItemShield_Update /* 0076C 80B8708C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00770 80B87090 03E00008 */ jr $ra /* 00774 80B87094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86920.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86920.s index 909d0ca170..aadc9eb828 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86920.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86920.s @@ -1,5 +1,3 @@ glabel func_80B86920 /* 00000 80B86920 03E00008 */ jr $ra /* 00004 80B86924 AC850208 */ sw $a1, 0x0208($a0) ## 00000208 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s index cd7f789188..1e9f0b0c63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s @@ -70,5 +70,3 @@ glabel func_80B86AC8 /* 0029C 80B86BBC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 002A0 80B86BC0 03E00008 */ jr $ra /* 002A4 80B86BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s index 4a43f238c8..d94435204c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B872D4 + .float -0.8 + +.text glabel func_80B86BC8 /* 002A8 80B86BC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 002AC 80B86BCC AFBF0024 */ sw $ra, 0x0024($sp) @@ -62,5 +67,3 @@ glabel func_80B86BC8 /* 0037C 80B86C9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00380 80B86CA0 03E00008 */ jr $ra /* 00384 80B86CA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s index 58eeece97b..d63443ea84 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B872D8 + .float 1500.0 + +glabel D_80B872DC + .float 0.01 + +glabel D_80B872E0 + .float 0.2 + +glabel D_80B872E4 + .word 0x3A23D70A + +.text glabel func_80B86CA8 /* 00388 80B86CA8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0038C 80B86CAC AFBF006C */ sw $ra, 0x006C($sp) @@ -194,5 +208,3 @@ glabel func_80B86CA8 /* 0063C 80B86F5C 8FBE0068 */ lw $s8, 0x0068($sp) /* 00640 80B86F60 03E00008 */ jr $ra /* 00644 80B86F64 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s index 52924c7f1a..fdca04bc82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B872E8 + .float -0.8 + +.text glabel func_80B86F68 /* 00648 80B86F68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0064C 80B86F6C AFBF001C */ sw $ra, 0x001C($sp) @@ -70,5 +75,3 @@ glabel func_80B86F68 /* 00748 80B87068 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0074C 80B8706C 03E00008 */ jr $ra /* 00750 80B87070 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s index b5fcb79046..6015c7f714 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s @@ -13,5 +13,3 @@ glabel MagicDark_Destroy /* 00108 80B874D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0010C 80B874DC 03E00008 */ jr $ra /* 00110 80B874E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s index 8085004bca..bf3623b3a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s @@ -1,3 +1,30 @@ +.rdata +glabel D_80B88B5C + .asciz "../z_magic_dark.c" + .balign 4 + +glabel D_80B88B70 + .asciz "../z_magic_dark.c" + .balign 4 + +glabel D_80B88B84 + .asciz "../z_magic_dark.c" + .balign 4 + +glabel D_80B88B98 + .asciz "../z_magic_dark.c" + .balign 4 + +.late_rodata +glabel D_80B88BFC + .float 1.4 + +glabel D_80B88C00 + .word 0x3DC90FDB +glabel D_80B88C04 + .word 0x3DC90FDB, 0x00000000, 0x00000000 + +.text glabel MagicDark_Draw /* 008EC 80B87CBC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 008F0 80B87CC0 AFBF0024 */ sw $ra, 0x0024($sp) @@ -266,4 +293,3 @@ glabel MagicDark_Draw /* 00CE4 80B880B4 00000000 */ nop /* 00CE8 80B880B8 00000000 */ nop /* 00CEC 80B880BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s index e33145632d..781f74b527 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80B88BAC + .float 0.4 + +glabel D_80B88BB0 + .float 0.6 + +glabel D_80B88BB4 + .float 1.6 + +glabel D_80B88BB8 + .float 0.8 + +.text glabel MagicDark_Init /* 00000 80B873D0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00004 80B873D4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 @@ -60,5 +74,3 @@ glabel MagicDark_Init /* 000D4 80B874A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000D8 80B874A8 03E00008 */ jr $ra /* 000DC 80B874AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Update.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Update.s index a0c095fb80..6e11bd3d0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Update.s @@ -1,3 +1,23 @@ +.late_rodata +glabel D_80B88BD8 + .word 0x3CB60B61 +glabel D_80B88BDC + .word 0x3DAAAAAA +glabel D_80B88BE0 + .word 0x38D1B717 +glabel D_80B88BE4 + .float 0.9 + +glabel D_80B88BE8 + .float 0.2 + +glabel D_80B88BEC + .float 1.6 + +glabel D_80B88BF0 + .float 0.8 + +.text glabel MagicDark_Update /* 004A8 80B87878 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 004AC 80B8787C AFBF0024 */ sw $ra, 0x0024($sp) @@ -110,5 +130,3 @@ glabel MagicDark_Update /* 0063C 80B87A0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00640 80B87A10 03E00008 */ jr $ra /* 00644 80B87A14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s index b03543ee5e..cffe500c5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B88BBC + .float 0.03 + +glabel D_80B88BC0 + .float 1.6 + +glabel D_80B88BC4 + .float 0.01 + +glabel D_80B88BC8 + .float 0.8 + +glabel D_80B88BCC + .float 1.3 + +.text glabel func_80B874E4 /* 00114 80B874E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00118 80B874E8 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 @@ -159,5 +176,3 @@ glabel func_80B874E4 /* 00350 80B87720 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00354 80B87724 03E00008 */ jr $ra /* 00358 80B87728 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B8772C.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B8772C.s index 22c670f542..3f701fe589 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B8772C.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B8772C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B88BD0 + .float 0.2 + +glabel D_80B88BD4 + .word 0x44548000 + +.text glabel func_80B8772C /* 0035C 80B8772C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00360 80B87730 00811021 */ addu $v0, $a0, $at @@ -90,5 +98,3 @@ glabel func_80B8772C .L80B87870: /* 004A0 80B87870 03E00008 */ jr $ra /* 004A4 80B87874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s index 3677d08088..e1a3f67ae9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s @@ -1,3 +1,24 @@ +.rdata +glabel D_80B88B20 + .asciz "../z_magic_dark.c" + .balign 4 + +glabel D_80B88B34 + .asciz "../z_magic_dark.c" + .balign 4 + +glabel D_80B88B48 + .asciz "../z_magic_dark.c" + .balign 4 + +.late_rodata +glabel D_80B88BF4 + .float 9.58738019108e-05 + +glabel D_80B88BF8 + .float 0.6 + +.text glabel func_80B87A18 /* 00648 80B87A18 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0064C 80B87A1C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 @@ -172,5 +193,3 @@ glabel func_80B87A18 /* 008E0 80B87CB0 8FB20040 */ lw $s2, 0x0040($sp) /* 008E4 80B87CB4 03E00008 */ jr $ra /* 008E8 80B87CB8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Destroy.s index 84d05c5d70..d9d49825a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Destroy.s @@ -8,5 +8,3 @@ glabel MagicFire_Destroy /* 000C0 80B88E30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000C4 80B88E34 03E00008 */ jr $ra /* 000C8 80B88E38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s index 0f610a26e5..823f611d4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B8AFC0 + .asciz "../z_magic_fire.c" + .balign 4 + +glabel D_80B8AFD4 + .asciz "../z_magic_fire.c" + .balign 4 + +glabel D_80B8AFE8 + .asciz "../z_magic_fire.c" + .balign 4 + +.late_rodata +glabel D_80B8B010 + .float 0.15 + +.text glabel MagicFire_Draw /* 00504 80B89274 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 /* 00508 80B89278 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -419,4 +437,3 @@ glabel MagicFire_Draw /* 00B64 80B898D4 03E00008 */ jr $ra /* 00B68 80B898D8 00000000 */ nop /* 00B6C 80B898DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s index 415a5b363b..40415bea6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s @@ -46,5 +46,3 @@ glabel MagicFire_Init /* 0009C 80B88E0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 000A0 80B88E10 03E00008 */ jr $ra /* 000A4 80B88E14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s index 4d63241aa5..5c70ac0850 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s @@ -1,3 +1,19 @@ +.late_rodata +glabel D_80B8AFFC + .word 0x43A28000 +glabel D_80B8B000 + .float 0.08 + +glabel D_80B8B004 + .float 0.001 + +glabel D_80B8B008 + .float 0.05 + +glabel D_80B8B00C + .word 0x3D89AE40 + +.text glabel MagicFire_Update /* 00170 80B88EE0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00174 80B88EE4 AFBF0024 */ sw $ra, 0x0024($sp) @@ -258,5 +274,3 @@ glabel MagicFire_Update /* 004F8 80B89268 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 004FC 80B8926C 03E00008 */ jr $ra /* 00500 80B89270 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/func_80B88E3C.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/func_80B88E3C.s index 3e8a7a7052..d883bbe91f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/func_80B88E3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/func_80B88E3C.s @@ -46,5 +46,3 @@ glabel func_80B88E3C /* 00164 80B88ED4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00168 80B88ED8 03E00008 */ jr $ra /* 0016C 80B88EDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s index 4b20cd5b7a..bd975eac68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B8CE10 + .asciz "../z_magic_wind.c" + .balign 4 + +glabel D_80B8CE24 + .asciz "\"消滅\" = %s\n" + .balign 4 + +glabel D_80B8CE34 + .asciz "消滅" + .balign 4 + +.text glabel MagicWind_Destroy /* 00150 80B8B250 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00154 80B8B254 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -23,5 +37,3 @@ glabel MagicWind_Destroy /* 0019C 80B8B29C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A0 80B8B2A0 03E00008 */ jr $ra /* 001A4 80B8B2A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s index 93b91f7cac..4f15fe47f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B8CE98 + .asciz "../z_magic_wind.c" + .balign 4 + +glabel D_80B8CEAC + .asciz "../z_magic_wind.c" + .balign 4 + +.text glabel MagicWind_Draw /* 006AC 80B8B7AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 006B0 80B8B7B0 AFBF002C */ sw $ra, 0x002C($sp) @@ -45,4 +55,3 @@ glabel MagicWind_Draw /* 00754 80B8B854 00000000 */ nop /* 00758 80B8B858 00000000 */ nop /* 0075C 80B8B85C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s index e82dc791ae..7403bb1629 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B8CDB0 + .asciz "Magic_Wind_Actor_ct():コンストラクト失敗\n" + .balign 4 + +glabel D_80B8CDDC + .asciz "../z_magic_wind.c" + .balign 4 + +glabel D_80B8CDF0 + .asciz "\"表示開始\" = %s\n" + .balign 4 + +glabel D_80B8CE04 + .asciz "表示開始" + .balign 4 + +.text glabel MagicWind_Init /* 00008 80B8B108 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 80B8B10C AFB00020 */ sw $s0, 0x0020($sp) @@ -88,5 +106,3 @@ glabel MagicWind_Init /* 00144 80B8B244 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00148 80B8B248 03E00008 */ jr $ra /* 0014C 80B8B24C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s index 55ebee60ce..7e90d376e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s @@ -24,5 +24,3 @@ glabel MagicWind_Update /* 004E8 80B8B5E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004EC 80B8B5EC 03E00008 */ jr $ra /* 004F0 80B8B5F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s index 7ed6780af7..89888cba66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s @@ -1,5 +1,3 @@ glabel func_80B8B100 /* 00000 80B8B100 03E00008 */ jr $ra /* 00004 80B8B104 AC850170 */ sw $a1, 0x0170($a0) ## 00000170 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s index f456e2b2bc..e8f704023c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s @@ -75,5 +75,3 @@ glabel func_80B8B2A8 /* 002BC 80B8B3BC A184000F */ sb $a0, 0x000F($t4) ## 0000000F /* 002C0 80B8B3C0 03E00008 */ jr $ra /* 002C4 80B8B3C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s index 0d0530203b..0de2cb4916 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B8CE3C + .asciz "../z_magic_wind.c" + .balign 4 + +glabel D_80B8CE50 + .asciz "\"表示開始\" = %s\n" + .balign 4 + +glabel D_80B8CE64 + .asciz "表示開始" + .balign 4 + +.text glabel func_80B8B3C8 /* 002C8 80B8B3C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 002CC 80B8B3CC AFBF0014 */ sw $ra, 0x0014($sp) @@ -43,5 +57,3 @@ glabel func_80B8B3C8 /* 0035C 80B8B45C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00360 80B8B460 03E00008 */ jr $ra /* 00364 80B8B464 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s index 3f94adb02e..e4c020c9f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s @@ -19,5 +19,3 @@ glabel func_80B8B468 /* 003A8 80B8B4A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003AC 80B8B4AC 03E00008 */ jr $ra /* 003B0 80B8B4B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s index ac95cb9948..42fa48143c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s @@ -20,5 +20,3 @@ glabel func_80B8B4B4 /* 003F4 80B8B4F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003F8 80B8B4F8 03E00008 */ jr $ra /* 003FC 80B8B4FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s index 2272af40d1..8fa58e990e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B8CEC0 + .float 0.033333335 + +.text glabel func_80B8B500 /* 00400 80B8B500 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00404 80B8B504 AFBF0014 */ sw $ra, 0x0014($sp) @@ -27,5 +32,3 @@ glabel func_80B8B500 /* 00458 80B8B558 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0045C 80B8B55C 03E00008 */ jr $ra /* 00460 80B8B560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s index 2f978972d3..905b777d95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s @@ -16,5 +16,3 @@ glabel func_80B8B564 /* 00494 80B8B594 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00498 80B8B598 03E00008 */ jr $ra /* 0049C 80B8B59C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s index 70cb341c48..6f00de80a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B8CE70 + .asciz "../z_magic_wind.c" + .balign 4 + +glabel D_80B8CE84 + .asciz "../z_magic_wind.c" + .balign 4 + +.text glabel func_80B8B5F4 /* 004F4 80B8B5F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 004F8 80B8B5F8 AFBF003C */ sw $ra, 0x003C($sp) @@ -111,5 +121,3 @@ glabel func_80B8B5F4 /* 006A0 80B8B7A0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 006A4 80B8B7A4 03E00008 */ jr $ra /* 006A8 80B8B7A8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s index 4a6d080367..1fe9a3a313 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s @@ -31,5 +31,3 @@ glabel MirRay_Destroy /* 005A8 80B8D5F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005AC 80B8D5FC 03E00008 */ jr $ra /* 005B0 80B8D600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s index 44c8fe4fe7..36db138c00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B8E8E4 + .asciz "../z_mir_ray.c" + .balign 4 + +glabel D_80B8E8F4 + .asciz "../z_mir_ray.c" + .balign 4 + +glabel D_80B8E904 + .asciz "../z_mir_ray.c" + .balign 4 + +glabel D_80B8E914 + .asciz "../z_mir_ray.c" + .balign 4 + +.late_rodata +glabel D_80B8E93C + .float 0.01 + +.text glabel MirRay_Draw /* 01094 80B8E0E4 27BDFD80 */ addiu $sp, $sp, 0xFD80 ## $sp = FFFFFD80 /* 01098 80B8E0E8 F7B40018 */ sdc1 $f20, 0x0018($sp) @@ -206,5 +228,3 @@ glabel MirRay_Draw /* 013A8 80B8E3F8 8FB40030 */ lw $s4, 0x0030($sp) /* 013AC 80B8E3FC 03E00008 */ jr $ra /* 013B0 80B8E400 27BD0280 */ addiu $sp, $sp, 0x0280 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s index fd91e4e15b..87788439bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s @@ -1,3 +1,41 @@ +.rdata +glabel D_80B8E850 + .asciz "反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +glabel D_80B8E880 + .asciz "../z_mir_ray.c" + .balign 4 + +glabel D_80B8E890 + .asciz "this->actor.arg_data = %d\n" + .balign 4 + +glabel D_80B8E8AC + .asciz "../z_mir_ray.c" + .balign 4 + +glabel D_80B8E8BC + .asciz "\"反射光 発生失敗\" = %s\n" + .balign 4 + +glabel D_80B8E8D4 + .asciz "反射光 発生失敗" + .balign 4 + +.late_rodata +glabel D_80B8E924 + .float 758.0 +glabel D_80B8E928 + .float -939.0 +glabel D_80B8E92C + .float -1690.0 +glabel D_80B8E930 + .float 938.0 +glabel D_80B8E934 + .float 921.0 + +.text glabel MirRay_Init /* 00260 80B8D2B0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00264 80B8D2B4 AFBF002C */ sw $ra, 0x002C($sp) @@ -196,5 +234,3 @@ glabel MirRay_Init /* 00530 80B8D580 8FB10028 */ lw $s1, 0x0028($sp) /* 00534 80B8D584 03E00008 */ jr $ra /* 00538 80B8D588 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s index 79ea578edf..548348e387 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s @@ -64,5 +64,3 @@ glabel MirRay_Update /* 00694 80B8D6E4 8FB10018 */ lw $s1, 0x0018($sp) /* 00698 80B8D6E8 03E00008 */ jr $ra /* 0069C 80B8D6EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D050.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D050.s index dfa91482be..7b4477a56a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D050.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D050.s @@ -47,5 +47,3 @@ glabel func_80B8D050 /* 000B4 80B8D104 44082000 */ mfc1 $t0, $f4 /* 000B8 80B8D108 03E00008 */ jr $ra /* 000BC 80B8D10C A4680036 */ sh $t0, 0x0036($v1) ## 00000036 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D110.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D110.s index c59c246f97..0f23fbdd92 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D110.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D110.s @@ -113,5 +113,3 @@ glabel func_80B8D110 /* 00254 80B8D2A4 8FB10028 */ lw $s1, 0x0028($sp) /* 00258 80B8D2A8 03E00008 */ jr $ra /* 0025C 80B8D2AC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D6F0.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D6F0.s index e7fec672d7..d98f1db648 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D6F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D6F0.s @@ -112,5 +112,3 @@ glabel func_80B8D6F0 /* 00844 80B8D894 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00848 80B8D898 03E00008 */ jr $ra /* 0084C 80B8D89C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D8A0.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D8A0.s index 80a232a608..77915f391a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8D8A0.s @@ -120,5 +120,3 @@ glabel func_80B8D8A0 /* 00A1C 80B8DA6C 8FBE0040 */ lw $s8, 0x0040($sp) /* 00A20 80B8DA70 03E00008 */ jr $ra /* 00A24 80B8DA74 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DA78.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DA78.s index 7470e3357c..2a80d49e2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DA78.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DA78.s @@ -71,5 +71,3 @@ glabel func_80B8DA78 /* 00B20 80B8DB70 00801025 */ or $v0, $a0, $zero ## $v0 = 00000001 /* 00B24 80B8DB74 03E00008 */ jr $ra /* 00B28 80B8DB78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DB7C.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DB7C.s index 2e19621c65..aa2b83be3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8DB7C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B8E938 + .float 3.051851E-5 + +.text glabel func_80B8DB7C /* 00B2C 80B8DB7C 27BDFEB8 */ addiu $sp, $sp, 0xFEB8 ## $sp = FFFFFEB8 /* 00B30 80B8DB80 AFBF007C */ sw $ra, 0x007C($sp) @@ -352,5 +357,3 @@ glabel func_80B8DB7C /* 01088 80B8E0D8 8FBE0078 */ lw $s8, 0x0078($sp) /* 0108C 80B8E0DC 03E00008 */ jr $ra /* 01090 80B8E0E0 27BD0148 */ addiu $sp, $sp, 0x0148 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8E404.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8E404.s index 05b4dfd7a2..3209e63e8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8E404.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/func_80B8E404.s @@ -151,4 +151,3 @@ glabel func_80B8E404 /* 015F4 80B8E644 00000000 */ nop /* 015F8 80B8E648 00000000 */ nop /* 015FC 80B8E64C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s index 1c7aae56f5..d21a2a9a3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s @@ -35,5 +35,3 @@ glabel ObjBean_Destroy /* 012C4 80B8FD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012C8 80B8FD48 03E00008 */ jr $ra /* 012CC 80B8FD4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s index a10b4c80d1..ad4444d032 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s @@ -45,4 +45,3 @@ glabel ObjBean_Draw /* 023A4 80B90E24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 023A8 80B90E28 03E00008 */ jr $ra /* 023AC 80B90E2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s index 4c162fd81d..027e9acf07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s @@ -1,3 +1,41 @@ +.rdata +glabel D_80B90F10 + .asciz "\x1b[41;37m" + .balign 4 + +glabel D_80B90F1C + .asciz "パスデータが無い？(%s %d)(arg_data %xH)\n" + .balign 4 + +glabel D_80B90F48 + .asciz "../z_obj_bean.c" + .balign 4 + +glabel D_80B90F58 + .asciz "\x1b[m" + .balign 4 + +glabel D_80B90F5C + .asciz "" + .balign 4 + +glabel D_80B90F68 + .asciz "パスデータ数が不正(%s %d)(arg_data %xH)\n" + .balign 4 + +glabel D_80B90F94 + .asciz "../z_obj_bean.c" + .balign 4 + +glabel D_80B90FA4 + .asciz "\x1b[m" + .balign 4 + +glabel D_80B90FA8 + .asciz "(魔法の豆の木リフト)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel ObjBean_Init /* 00FFC 80B8FA7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01000 80B8FA80 AFA50024 */ sw $a1, 0x0024($sp) @@ -174,5 +212,3 @@ glabel ObjBean_Init /* 01248 80B8FCC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0124C 80B8FCCC 03E00008 */ jr $ra /* 01250 80B8FCD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s index 2fb6ee10a5..d79004868e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B90FD0 + .asciz "\x1b[36m" + .balign 4 + +glabel D_80B90FD8 + .asciz "馬と豆の木リフト衝突！！！\n" + .balign 4 + +glabel D_80B90FF4 + .asciz "\x1b[m" + .balign 4 + +.text glabel ObjBean_Update /* 02048 80B90AC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0204C 80B90ACC AFBF001C */ sw $ra, 0x001C($sp) @@ -121,5 +135,3 @@ glabel ObjBean_Update /* 021F0 80B90C70 8FB10018 */ lw $s1, 0x0018($sp) /* 021F4 80B90C74 03E00008 */ jr $ra /* 021F8 80B90C78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s index 006b0031d3..4d1e511167 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s @@ -24,5 +24,3 @@ glabel func_80B8EA80 /* 0004C 80B8EACC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00050 80B8EAD0 03E00008 */ jr $ra /* 00054 80B8EAD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s index 220db11d71..21d9b930a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EAD8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B90EC0 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B90F00 + .asciz "../z_obj_bean.c" + .balign 4 + +.text glabel func_80B8EAD8 /* 00058 80B8EAD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0005C 80B8EADC AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_80B8EAD8 /* 000D4 80B8EB54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000D8 80B8EB58 03E00008 */ jr $ra /* 000DC 80B8EB5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s index 647d270fc7..9ff42ee4b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EB60.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B90FF8 + .float 29.999998 + +.text glabel func_80B8EB60 /* 000E0 80B8EB60 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 000E4 80B8EB64 AFBF001C */ sw $ra, 0x001C($sp) @@ -25,5 +30,3 @@ glabel func_80B8EB60 /* 0013C 80B8EBBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00140 80B8EBC0 03E00008 */ jr $ra /* 00144 80B8EBC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s index 88f4437f3e..f691b551fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBC8.s @@ -6,5 +6,3 @@ glabel func_80B8EBC8 /* 00158 80B8EBD8 A48201B6 */ sh $v0, 0x01B6($a0) ## 000001B6 /* 0015C 80B8EBDC 03E00008 */ jr $ra /* 00160 80B8EBE0 E48401E4 */ swc1 $f4, 0x01E4($a0) ## 000001E4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s index 7c207752b0..04753a267b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s @@ -1,3 +1,26 @@ +.late_rodata +glabel D_80B90FFC + .float 0.01 + +glabel D_80B91000 + .float 0.06 + +glabel D_80B91004 + .float 1.07 + +glabel D_80B91008 + .float 0.1 + +glabel D_80B9100C + .float 0.2 + +glabel D_80B91010 + .float 0.1 + +glabel D_80B91014 + .float 2100.0 + +.text glabel func_80B8EBE4 /* 00164 80B8EBE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00168 80B8EBE8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -141,5 +164,3 @@ glabel func_80B8EBE4 /* 00368 80B8EDE8 D7B40018 */ ldc1 $f20, 0x0018($sp) /* 0036C 80B8EDEC 03E00008 */ jr $ra /* 00370 80B8EDF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s index 4ab6ef5de8..f594b1a01e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EDF4.s @@ -12,5 +12,3 @@ glabel func_80B8EDF4 /* 00398 80B8EE18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0039C 80B8EE1C 03E00008 */ jr $ra /* 003A0 80B8EE20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s index 8ddfed644f..2a8d14b9a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B91018 + .float 0.16970563 +glabel D_80B9101C + .float 0.10700001 + +.text glabel func_80B8EE24 /* 003A4 80B8EE24 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 003A8 80B8EE28 AFBF001C */ sw $ra, 0x001C($sp) @@ -60,5 +67,3 @@ glabel func_80B8EE24 /* 00470 80B8EEF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00474 80B8EEF4 03E00008 */ jr $ra /* 00478 80B8EEF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s index 26a2ee7eea..ad2777f86b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EEFC.s @@ -10,5 +10,3 @@ glabel func_80B8EEFC /* 0049C 80B8EF1C E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 /* 004A0 80B8EF20 03E00008 */ jr $ra /* 004A4 80B8EF24 E484002C */ swc1 $f4, 0x002C($a0) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s index 5fbceebd2c..6d80c7ab17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF28.s @@ -6,5 +6,3 @@ glabel func_80B8EF28 /* 004B8 80B8EF38 0305C825 */ or $t9, $t8, $a1 ## $t9 = 00000000 /* 004BC 80B8EF3C 03E00008 */ jr $ra /* 004C0 80B8EF40 A09901F7 */ sb $t9, 0x01F7($a0) ## 000001F7 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s index 15570f2403..a656c14682 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF44.s @@ -14,5 +14,3 @@ glabel func_80B8EF44 /* 004F4 80B8EF74 A48B01F0 */ sh $t3, 0x01F0($a0) ## 000001F0 /* 004F8 80B8EF78 03E00008 */ jr $ra /* 004FC 80B8EF7C A48C01F4 */ sh $t4, 0x01F4($a0) ## 000001F4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s index cddb922f07..a3b20b10eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s @@ -29,5 +29,3 @@ glabel func_80B8EF80 /* 00568 80B8EFE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0056C 80B8EFEC 03E00008 */ jr $ra /* 00570 80B8EFF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s index eedc6f9807..35cc3cd550 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s @@ -181,5 +181,3 @@ glabel func_80B8EFF4 /* 0080C 80B8F28C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 00810 80B8F290 03E00008 */ jr $ra /* 00814 80B8F294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s index 6256327805..b7328d9f33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F298.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B91020 + .float 10000.0 + +.text glabel func_80B8F298 /* 00818 80B8F298 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0081C 80B8F29C AFBF002C */ sw $ra, 0x002C($sp) @@ -38,5 +43,3 @@ glabel func_80B8F298 /* 00898 80B8F318 8FB20028 */ lw $s2, 0x0028($sp) /* 0089C 80B8F31C 03E00008 */ jr $ra /* 008A0 80B8F320 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s index c68e430ad8..2ff943d788 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B91024 + .float 0.1 + +.text glabel func_80B8F324 /* 008A4 80B8F324 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 008A8 80B8F328 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -169,5 +174,3 @@ glabel func_80B8F324 /* 00B10 80B8F590 8FBE0098 */ lw $s8, 0x0098($sp) /* 00B14 80B8F594 03E00008 */ jr $ra /* 00B18 80B8F598 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s index 5ef7b6d44d..cb245d34d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B91028 + .float 6372.0 +glabel D_80B9102C + .float 0.17434467 +glabel D_80B91030 + .float 0.12207746 + +.text glabel func_80B8F59C /* 00B1C 80B8F59C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00B20 80B8F5A0 AFB00018 */ sw $s0, 0x0018($sp) @@ -52,5 +61,3 @@ glabel func_80B8F59C /* 00BD0 80B8F650 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00BD4 80B8F654 03E00008 */ jr $ra /* 00BD8 80B8F658 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s index a00b43fe8e..fcd8df1b40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s @@ -30,5 +30,3 @@ glabel func_80B8F65C /* 00C40 80B8F6C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00C44 80B8F6C4 03E00008 */ jr $ra /* 00C48 80B8F6C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s index ca12b361f6..f21cd993b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F6CC.s @@ -17,5 +17,3 @@ glabel func_80B8F6CC /* 00C84 80B8F704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C88 80B8F708 03E00008 */ jr $ra /* 00C8C 80B8F70C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s index ad7f8f577e..70f185906b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s @@ -32,5 +32,3 @@ glabel func_80B8F710 /* 00CFC 80B8F77C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D00 80B8F780 03E00008 */ jr $ra /* 00D04 80B8F784 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s index ed057f35e8..befd544866 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s @@ -36,5 +36,3 @@ glabel func_80B8F788 /* 00D80 80B8F800 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D84 80B8F804 03E00008 */ jr $ra /* 00D88 80B8F808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s index d5a3d5cc80..ccb85dcec0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F80C.s @@ -15,5 +15,3 @@ glabel func_80B8F80C /* 00DC0 80B8F840 A48901CC */ sh $t1, 0x01CC($a0) ## 000001CC /* 00DC4 80B8F844 03E00008 */ jr $ra /* 00DC8 80B8F848 A48A01D0 */ sh $t2, 0x01D0($a0) ## 000001D0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s index 726d6548ab..7e193a94cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B91034 + .float 0.1 + +.text glabel func_80B8F84C /* 00DCC 80B8F84C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00DD0 80B8F850 AFBF001C */ sw $ra, 0x001C($sp) @@ -38,5 +43,3 @@ glabel func_80B8F84C /* 00E48 80B8F8C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E4C 80B8F8CC 03E00008 */ jr $ra /* 00E50 80B8F8D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s index ccb560e4e5..e79013821d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8D4.s @@ -3,5 +3,3 @@ glabel func_80B8F8D4 /* 00E58 80B8F8D8 25CEF8E4 */ addiu $t6, $t6, %lo(func_80B8F8E4) ## $t6 = 80B8F8E4 /* 00E5C 80B8F8DC 03E00008 */ jr $ra /* 00E60 80B8F8E0 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s index 3afb75a519..b789d2ee23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B91038 + .float 0.17434467 +glabel D_80B9103C + .float 0.12207746 + +.text glabel func_80B8F8E4 /* 00E64 80B8F8E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00E68 80B8F8E8 AFB00018 */ sw $s0, 0x0018($sp) @@ -28,5 +35,3 @@ glabel func_80B8F8E4 /* 00EC0 80B8F940 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EC4 80B8F944 03E00008 */ jr $ra /* 00EC8 80B8F948 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s index e66162c2b8..85bf231ab7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F94C.s @@ -5,5 +5,3 @@ glabel func_80B8F94C /* 00ED8 80B8F958 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC /* 00EDC 80B8F95C 03E00008 */ jr $ra /* 00EE0 80B8F960 A48F01D0 */ sh $t7, 0x01D0($a0) ## 000001D0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s index f8389d77ca..66d4e32aaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B91040 + .float 0.17434467 +glabel D_80B91044 + .float 0.12207746 + +.text glabel func_80B8F964 /* 00EE4 80B8F964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00EE8 80B8F968 AFBF0014 */ sw $ra, 0x0014($sp) @@ -33,5 +40,3 @@ glabel func_80B8F964 /* 00F54 80B8F9D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F58 80B8F9D8 03E00008 */ jr $ra /* 00F5C 80B8F9DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s index 57d27ac87f..98e344ccd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F9E0.s @@ -15,5 +15,3 @@ glabel func_80B8F9E0 /* 00F94 80B8FA14 A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC /* 00F98 80B8FA18 03E00008 */ jr $ra /* 00F9C 80B8FA1C A48901C0 */ sh $t1, 0x01C0($a0) ## 000001C0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s index 03c265ef29..1ffdc2c79f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FA20.s @@ -24,5 +24,3 @@ glabel func_80B8FA20 /* 00FF0 80B8FA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00FF4 80B8FA74 03E00008 */ jr $ra /* 00FF8 80B8FA78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s index 875e49915a..ae3245f42d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD50.s @@ -14,5 +14,3 @@ glabel func_80B8FD50 /* 01300 80B8FD80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01304 80B8FD84 03E00008 */ jr $ra /* 01308 80B8FD88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s index f07e5d1858..ff0443fe78 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FD8C.s @@ -31,5 +31,3 @@ glabel func_80B8FD8C /* 01374 80B8FDF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01378 80B8FDF8 03E00008 */ jr $ra /* 0137C 80B8FDFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s index 8b047d3cd8..c38d685245 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE00.s @@ -14,5 +14,3 @@ glabel func_80B8FE00 /* 013B0 80B8FE30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013B4 80B8FE34 03E00008 */ jr $ra /* 013B8 80B8FE38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s index 7dbe92af34..d1dd341711 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE3C.s @@ -12,5 +12,3 @@ glabel func_80B8FE3C /* 013E0 80B8FE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 013E4 80B8FE64 03E00008 */ jr $ra /* 013E8 80B8FE68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s index 21e99d26ae..4d8a575aa9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FE6C.s @@ -16,5 +16,3 @@ glabel func_80B8FE6C /* 01420 80B8FEA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01424 80B8FEA4 03E00008 */ jr $ra /* 01428 80B8FEA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s index 815ebc8176..6dd7de7812 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s @@ -44,5 +44,3 @@ glabel func_80B8FEAC /* 014C4 80B8FF44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 014C8 80B8FF48 03E00008 */ jr $ra /* 014CC 80B8FF4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s index 64b9a2de0a..7376ff8a55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF50.s @@ -14,5 +14,3 @@ glabel func_80B8FF50 /* 01500 80B8FF80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01504 80B8FF84 03E00008 */ jr $ra /* 01508 80B8FF88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s index 10af0ed195..419cc7ed79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B91048 + .float 0.17434467 +glabel D_80B9104C + .float 0.12207746 + +.text glabel func_80B8FF8C /* 0150C 80B8FF8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01510 80B8FF90 AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,5 +42,3 @@ glabel func_80B8FF8C /* 01584 80B90004 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01588 80B90008 03E00008 */ jr $ra /* 0158C 80B9000C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s index eb7d085a16..0f30d4b929 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90010.s @@ -15,5 +15,3 @@ glabel func_80B90010 /* 015C4 80B90044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015C8 80B90048 03E00008 */ jr $ra /* 015CC 80B9004C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s index 3a854c52c4..26d0364358 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_80B91050 + .float 6372.0 +glabel D_80B91054 + .float 0.17434467 +glabel D_80B91058 + .float 0.12207746 + +.text glabel func_80B90050 /* 015D0 80B90050 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 015D4 80B90054 AFBF001C */ sw $ra, 0x001C($sp) @@ -51,5 +60,3 @@ glabel func_80B90050 /* 01684 80B90104 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01688 80B90108 03E00008 */ jr $ra /* 0168C 80B9010C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s index af7c7032b0..3ca6c165e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90110.s @@ -18,5 +18,3 @@ glabel func_80B90110 /* 016CC 80B9014C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 016D0 80B90150 03E00008 */ jr $ra /* 016D4 80B90154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s index 14cb45a452..d5ab86c9f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90158.s @@ -63,5 +63,3 @@ glabel func_80B90158 /* 017C0 80B90240 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 017C4 80B90244 03E00008 */ jr $ra /* 017C8 80B90248 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s index 606e678e4c..26cd3f6604 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9024C.s @@ -16,5 +16,3 @@ glabel func_80B9024C /* 01804 80B90284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01808 80B90288 03E00008 */ jr $ra /* 0180C 80B9028C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s index 3a649cc537..09f92d8f1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90290.s @@ -17,5 +17,3 @@ glabel func_80B90290 /* 01848 80B902C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0184C 80B902CC 03E00008 */ jr $ra /* 01850 80B902D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s index d6f1dd100a..501e4ad0ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B902D4.s @@ -15,5 +15,3 @@ glabel func_80B902D4 /* 01888 80B90308 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0188C 80B9030C 03E00008 */ jr $ra /* 01890 80B90310 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s index 7ec3b04bb4..556a158e88 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90314.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80B9105C + .float 0.001 + +glabel D_80B91060 + .float 700000.0 +glabel D_80B91064 + .float 0.1 + +.text glabel func_80B90314 /* 01894 80B90314 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01898 80B90318 AFBF0014 */ sw $ra, 0x0014($sp) @@ -44,5 +54,3 @@ glabel func_80B90314 /* 01938 80B903B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0193C 80B903BC 03E00008 */ jr $ra /* 01940 80B903C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s index 9d4e7158a8..c152a1abfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B903C4.s @@ -14,5 +14,3 @@ glabel func_80B903C4 /* 01974 80B903F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01978 80B903F8 03E00008 */ jr $ra /* 0197C 80B903FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s index f36579fa9a..d80a49a065 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90400.s @@ -73,5 +73,3 @@ glabel func_80B90400 /* 01A84 80B90504 8FB40028 */ lw $s4, 0x0028($sp) /* 01A88 80B90508 03E00008 */ jr $ra /* 01A8C 80B9050C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s index d1463f143b..fec4b795f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90510.s @@ -13,5 +13,3 @@ glabel func_80B90510 /* 01ABC 80B9053C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AC0 80B90540 03E00008 */ jr $ra /* 01AC4 80B90544 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s index 34b049fc89..7c4b68c59d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90548.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B91068 + .float 0.001 + +glabel D_80B9106C + .float 700000.0 + +.text glabel func_80B90548 /* 01AC8 80B90548 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01ACC 80B9054C AFBF0014 */ sw $ra, 0x0014($sp) @@ -39,5 +47,3 @@ glabel func_80B90548 /* 01B58 80B905D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B5C 80B905DC 03E00008 */ jr $ra /* 01B60 80B905E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s index 865a80140c..77b24e8525 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B905E4.s @@ -14,5 +14,3 @@ glabel func_80B905E4 /* 01B94 80B90614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B98 80B90618 03E00008 */ jr $ra /* 01B9C 80B9061C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s index c5cac74ea8..d07b66d860 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90620.s @@ -22,5 +22,3 @@ glabel func_80B90620 /* 01BEC 80B9066C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01BF0 80B90670 03E00008 */ jr $ra /* 01BF4 80B90674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s index cdfec0e3b7..903606dfee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90678.s @@ -10,5 +10,3 @@ glabel func_80B90678 /* 01C18 80B90698 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C1C 80B9069C 03E00008 */ jr $ra /* 01C20 80B906A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s index 38bbfa8fc2..95ab402008 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B906A4.s @@ -29,5 +29,3 @@ glabel func_80B906A4 /* 01C88 80B90708 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01C8C 80B9070C 03E00008 */ jr $ra /* 01C90 80B90710 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s index cb4ba679d6..36a97f52df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90714.s @@ -17,5 +17,3 @@ glabel func_80B90714 /* 01CD0 80B90750 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CD4 80B90754 03E00008 */ jr $ra /* 01CD8 80B90758 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s index 9e6090276f..cbb5081f47 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B9075C.s @@ -79,5 +79,3 @@ glabel func_80B9075C /* 01DF8 80B90878 8FB10018 */ lw $s1, 0x0018($sp) /* 01DFC 80B9087C 03E00008 */ jr $ra /* 01E00 80B90880 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s index e8c15bb237..03dfa0215e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90884.s @@ -10,5 +10,3 @@ glabel func_80B90884 /* 01E24 80B908A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E28 80B908A8 03E00008 */ jr $ra /* 01E2C 80B908AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s index 94ba82a579..1615fd3370 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908B0.s @@ -15,5 +15,3 @@ glabel func_80B908B0 /* 01E60 80B908E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E64 80B908E4 03E00008 */ jr $ra /* 01E68 80B908E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s index 3cf87267d4..e31d408024 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B908EC.s @@ -10,5 +10,3 @@ glabel func_80B908EC /* 01E8C 80B9090C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E90 80B90910 03E00008 */ jr $ra /* 01E94 80B90914 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s index 2ee73e305a..c785c367e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90918.s @@ -22,5 +22,3 @@ glabel func_80B90918 /* 01EE4 80B90964 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01EE8 80B90968 03E00008 */ jr $ra /* 01EEC 80B9096C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s index 282776e8d0..3393b4a605 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90970.s @@ -15,5 +15,3 @@ glabel func_80B90970 /* 01F24 80B909A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F28 80B909A8 03E00008 */ jr $ra /* 01F2C 80B909AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s index 72140ea82c..fb9a00e7fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909B0.s @@ -20,5 +20,3 @@ glabel func_80B909B0 /* 01F6C 80B909EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01F70 80B909F0 03E00008 */ jr $ra /* 01F74 80B909F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s index 421b3895c4..260b59b784 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B909F8.s @@ -14,5 +14,3 @@ glabel func_80B909F8 /* 01FA8 80B90A28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01FAC 80B90A2C 03E00008 */ jr $ra /* 01FB0 80B90A30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s index 4cbb7c412f..96de803645 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90A34.s @@ -39,5 +39,3 @@ glabel func_80B90A34 /* 0203C 80B90ABC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02040 80B90AC0 03E00008 */ jr $ra /* 02044 80B90AC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s index 103e3addc7..4b73fdb472 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B91070 + .float 9.58738019108e-05 + +glabel D_80B91074 + .float 0.1 + +.text glabel func_80B90C7C /* 021FC 80B90C7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02200 80B90C80 AFBF0014 */ sw $ra, 0x0014($sp) @@ -34,5 +42,3 @@ glabel func_80B90C7C /* 02278 80B90CF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0227C 80B90CFC 03E00008 */ jr $ra /* 02280 80B90D00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s index b95ac3381a..e1d5e0e243 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B91078 + .float 9.58738019108e-05 + +glabel D_80B9107C + .float 0.1 + +.text glabel func_80B90D04 /* 02284 80B90D04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02288 80B90D08 AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,5 +43,3 @@ glabel func_80B90D04 /* 02304 80B90D84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02308 80B90D88 03E00008 */ jr $ra /* 0230C 80B90D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Destroy.s index b1f6bb3e55..cf47832efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Destroy.s @@ -2,5 +2,3 @@ glabel ObjDekujr_Destroy /* 0010C 80B9252C AFA40000 */ sw $a0, 0x0000($sp) /* 00110 80B92530 03E00008 */ jr $ra /* 00114 80B92534 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s index bbb40d1881..65b8fdf8a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B92A40 + .asciz "../z_obj_dekujr.c" + .balign 4 + +glabel D_80B92A54 + .asciz "../z_obj_dekujr.c" + .balign 4 + +glabel D_80B92A68 + .asciz "../z_obj_dekujr.c" + .balign 4 + +glabel D_80B92A7C + .asciz "../z_obj_dekujr.c" + .balign 4 + +.text glabel ObjDekujr_Draw /* 00434 80B92854 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00438 80B92858 AFB10038 */ sw $s1, 0x0038($sp) @@ -98,4 +116,3 @@ glabel ObjDekujr_Draw /* 005B4 80B929D4 8FB10038 */ lw $s1, 0x0038($sp) /* 005B8 80B929D8 03E00008 */ jr $ra /* 005BC 80B929DC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s index 7d1516ffc3..c3c6903090 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s @@ -76,5 +76,3 @@ glabel ObjDekujr_Init /* 00100 80B92520 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00104 80B92524 03E00008 */ jr $ra /* 00108 80B92528 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s index bfe0a5b5b5..420773b24a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s @@ -65,5 +65,3 @@ glabel ObjDekujr_Update /* 00428 80B92848 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0042C 80B9284C 03E00008 */ jr $ra /* 00430 80B92850 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92538.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92538.s index d2d9493ff5..37cef4def8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92538.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92538.s @@ -15,5 +15,3 @@ glabel func_80B92538 /* 0014C 80B9256C 468084A0 */ cvt.s.w $f18, $f16 /* 00150 80B92570 03E00008 */ jr $ra /* 00154 80B92574 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92578.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92578.s index 5d77c5920a..49bdaf7d14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92578.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B92578.s @@ -15,5 +15,3 @@ glabel func_80B92578 /* 0018C 80B925AC 468084A0 */ cvt.s.w $f18, $f16 /* 00190 80B925B0 03E00008 */ jr $ra /* 00194 80B925B4 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B925B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B925B8.s index 1261c42948..babac8a38f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B925B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/func_80B925B8.s @@ -114,5 +114,3 @@ glabel func_80B925B8 /* 0033C 80B9275C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00340 80B92760 03E00008 */ jr $ra /* 00344 80B92764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s index 63553f683d..dcd7f0fd12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s @@ -10,5 +10,3 @@ glabel ObjHamishi_Destroy /* 00580 80B93510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00584 80B93514 03E00008 */ jr $ra /* 00588 80B93518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s index 1b856c99d2..c3f253a1ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B937B0 + .asciz "../z_obj_hamishi.c" + .balign 4 + +glabel D_80B937C4 + .asciz "../z_obj_hamishi.c" + .balign 4 + +glabel D_80B937D8 + .asciz "../z_obj_hamishi.c" + .balign 4 + +.text glabel ObjHamishi_Draw /* 006B8 80B93648 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 006BC 80B9364C AFBF001C */ sw $ra, 0x001C($sp) @@ -57,4 +71,3 @@ glabel ObjHamishi_Draw /* 00794 80B93724 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00798 80B93728 03E00008 */ jr $ra /* 0079C 80B9372C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Init.s index 91df8865c0..7b6ac53e68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Init.s @@ -64,5 +64,3 @@ glabel ObjHamishi_Init /* 00558 80B934E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0055C 80B934EC 03E00008 */ jr $ra /* 00560 80B934F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s index 0ca3d14c45..78a063f3d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s @@ -83,5 +83,3 @@ glabel ObjHamishi_Update /* 006AC 80B9363C 8FB10018 */ lw $s1, 0x0018($sp) /* 006B0 80B93640 03E00008 */ jr $ra /* 006B4 80B93644 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s index 96dbe404db..83e53e9bf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s @@ -24,5 +24,3 @@ glabel func_80B92F90 /* 0004C 80B92FDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00050 80B92FE0 03E00008 */ jr $ra /* 00054 80B92FE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92FE8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92FE8.s index 955e24063f..9e8b4baa64 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92FE8.s @@ -106,5 +106,3 @@ glabel func_80B92FE8 /* 001C8 80B93158 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001CC 80B9315C 03E00008 */ jr $ra /* 001D0 80B93160 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s index 5dd4de75e9..56713b838d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s @@ -184,5 +184,3 @@ glabel func_80B93164 /* 00474 80B93404 8FBE0098 */ lw $s8, 0x0098($sp) /* 00478 80B93408 03E00008 */ jr $ra /* 0047C 80B9340C 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s index 3be177d4ae..63d503926f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s @@ -19,5 +19,3 @@ glabel ObjHana_Destroy /* 00134 80B93994 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00138 80B93998 03E00008 */ jr $ra /* 0013C 80B9399C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s index 21d50176d4..7077d39575 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s @@ -16,4 +16,3 @@ glabel ObjHana_Draw /* 001E4 80B93A44 03E00008 */ jr $ra /* 001E8 80B93A48 00000000 */ nop /* 001EC 80B93A4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s index 971cb875ec..ca73c0e5a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s @@ -70,5 +70,3 @@ glabel ObjHana_Init /* 000EC 80B9394C 8FB10018 */ lw $s1, 0x0018($sp) /* 000F0 80B93950 03E00008 */ jr $ra /* 000F4 80B93954 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s index 453379d6ab..eef82237da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s @@ -29,5 +29,3 @@ glabel ObjHana_Update /* 001A4 80B93A04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A8 80B93A08 03E00008 */ jr $ra /* 001AC 80B93A0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Destroy.s index b17b7695a2..834b6e216f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Destroy.s @@ -12,5 +12,3 @@ glabel ObjHsblock_Destroy /* 00224 80B93D84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00228 80B93D88 03E00008 */ jr $ra /* 0022C 80B93D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s index 9c9e492bc6..ed9c92a3b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B94154 + .asciz "../z_obj_hsblock.c" + .balign 4 + +glabel D_80B94168 + .asciz "../z_obj_hsblock.c" + .balign 4 + +glabel D_80B9417C + .asciz "../z_obj_hsblock.c" + .balign 4 + +.text glabel ObjHsblock_Draw /* 003F0 80B93F50 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 003F4 80B93F54 AFB10018 */ sw $s1, 0x0018($sp) @@ -85,4 +99,3 @@ glabel ObjHsblock_Draw /* 00534 80B94094 8FB10018 */ lw $s1, 0x0018($sp) /* 00538 80B94098 03E00008 */ jr $ra /* 0053C 80B9409C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s index 9381b95025..07ac57380b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s @@ -64,5 +64,3 @@ glabel ObjHsblock_Init /* 001F4 80B93D54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 001F8 80B93D58 03E00008 */ jr $ra /* 001FC 80B93D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Update.s index 0f9d8e38e4..faff3c5f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Update.s @@ -20,5 +20,3 @@ glabel ObjHsblock_Update /* 003E4 80B93F44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003E8 80B93F48 03E00008 */ jr $ra /* 003EC 80B93F4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B60.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B60.s index acdb66fd44..0f0ed0a915 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B60.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B60.s @@ -1,5 +1,3 @@ glabel func_80B93B60 /* 00000 80B93B60 03E00008 */ jr $ra /* 00004 80B93B64 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B68.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B68.s index 3cf88ccafb..4321d6bfda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B68.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93B68.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B94100 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B94140 + .asciz "../z_obj_hsblock.c" + .balign 4 + +.text glabel func_80B93B68 /* 00008 80B93B68 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 80B93B6C AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_80B93B68 /* 00084 80B93BE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00088 80B93BE8 03E00008 */ jr $ra /* 0008C 80B93BEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93BF0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93BF0.s index 1285de6d8a..bd7e264e69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93BF0.s @@ -34,5 +34,3 @@ glabel func_80B93BF0 /* 00108 80B93C68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0010C 80B93C6C 03E00008 */ jr $ra /* 00110 80B93C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93D90.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93D90.s index f631724be6..9857fda184 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93D90.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93D90.s @@ -7,5 +7,3 @@ glabel func_80B93D90 /* 00244 80B93DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00248 80B93DA8 03E00008 */ jr $ra /* 0024C 80B93DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DB0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DB0.s index 045dcaff67..c567d6834f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DB0.s @@ -16,5 +16,3 @@ glabel func_80B93DB0 /* 00288 80B93DE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0028C 80B93DEC 03E00008 */ jr $ra /* 00290 80B93DF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DF4.s index 7e2107b8ad..683f85778a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93DF4.s @@ -18,5 +18,3 @@ glabel func_80B93DF4 /* 002CC 80B93E2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002D0 80B93E30 03E00008 */ jr $ra /* 002D4 80B93E34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E38.s index 2f3ee5b59f..1365927931 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E38.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E38.s @@ -8,5 +8,3 @@ glabel func_80B93E38 /* 002F0 80B93E50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F4 80B93E54 03E00008 */ jr $ra /* 002F8 80B93E58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E5C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E5C.s index 3fcc48df1e..e15c555316 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/func_80B93E5C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B94190 + .float 0.3 + +glabel D_80B94194 + .float 0.001 + +.text glabel func_80B93E5C /* 002FC 80B93E5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00300 80B93E60 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -44,5 +52,3 @@ glabel func_80B93E5C /* 00398 80B93EF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0039C 80B93EFC 03E00008 */ jr $ra /* 003A0 80B93F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s index 236c3c0c14..cf3aa0c8c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s @@ -22,5 +22,3 @@ glabel ObjIcePoly_Destroy /* 00204 80B94464 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00208 80B94468 03E00008 */ jr $ra /* 0020C 80B9446C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s index 0edd37741e..af8a813abd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B94BB0 + .asciz "../z_obj_ice_poly.c" + .balign 4 + +glabel D_80B94BC4 + .asciz "../z_obj_ice_poly.c" + .balign 4 + +glabel D_80B94BD8 + .asciz "../z_obj_ice_poly.c" + .balign 4 + +.text glabel ObjIcePoly_Draw /* 0071C 80B9497C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00720 80B94980 AFB10038 */ sw $s1, 0x0038($sp) @@ -100,4 +114,3 @@ glabel ObjIcePoly_Draw /* 008A4 80B94B04 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 008A8 80B94B08 00000000 */ nop /* 008AC 80B94B0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s index bbda2a60b1..dd0b11cdea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s @@ -123,5 +123,3 @@ glabel ObjIcePoly_Init /* 001B4 80B94414 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001B8 80B94418 03E00008 */ jr $ra /* 001BC 80B9441C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Update.s index 5f704cf36d..6a7f0195c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Update.s @@ -8,5 +8,3 @@ glabel ObjIcePoly_Update /* 00710 80B94970 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00714 80B94974 03E00008 */ jr $ra /* 00718 80B94978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s index b59a7396c6..5fb51f3613 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s @@ -156,5 +156,3 @@ glabel func_80B94470 /* 00434 80B94694 8FB10028 */ lw $s1, 0x0028($sp) /* 00438 80B94698 03E00008 */ jr $ra /* 0043C 80B9469C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B946A0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B946A0.s index 907ab788bf..64915d6c3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B946A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B946A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B94BEC + .float 0.0125 + +.text glabel func_80B946A0 /* 00440 80B946A0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 00444 80B946A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -189,5 +194,3 @@ glabel func_80B946A0 /* 006EC 80B9494C 8FBE0060 */ lw $s8, 0x0060($sp) /* 006F0 80B94950 03E00008 */ jr $ra /* 006F4 80B94954 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s index 2bd0d7920f..27671e2713 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s @@ -10,5 +10,3 @@ glabel ObjKibako_Destroy /* 0018C 80B94E2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00190 80B94E30 03E00008 */ jr $ra /* 00194 80B94E34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s index 3ac285bced..6cd962b039 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s @@ -14,4 +14,3 @@ glabel ObjKibako_Draw /* 00B84 80B95824 00000000 */ nop /* 00B88 80B95828 00000000 */ nop /* 00B8C 80B9582C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s index ff737a6aae..950a068f12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B958A0 + .asciz "(dungeon keep 木箱)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel D_80B958C8 + .float -1.2 + +.text glabel ObjKibako_Init /* 000EC 80B94D8C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000F0 80B94D90 AFA50024 */ sw $a1, 0x0024($sp) @@ -34,5 +44,3 @@ glabel ObjKibako_Init /* 00164 80B94E04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00168 80B94E08 03E00008 */ jr $ra /* 0016C 80B94E0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s index d8f1e137e0..b38d1d8613 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s @@ -8,5 +8,3 @@ glabel ObjKibako_Update /* 00B4C 80B957EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B50 80B957F0 03E00008 */ jr $ra /* 00B54 80B957F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s index 597d4e09cb..817ed1358a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s @@ -25,5 +25,3 @@ glabel func_80B94CA0 /* 00054 80B94CF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00058 80B94CF8 03E00008 */ jr $ra /* 0005C 80B94CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s index f3c78e35b0..c09eafdc61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s @@ -13,5 +13,3 @@ glabel func_80B94D00 .L80B94D2C: /* 0008C 80B94D2C 03E00008 */ jr $ra /* 00090 80B94D30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s index da08120c90..c8e1afb65f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s @@ -24,5 +24,3 @@ glabel func_80B94D34 /* 000E0 80B94D80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000E4 80B94D84 03E00008 */ jr $ra /* 000E8 80B94D88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s index 9c54627c38..4f5ad9570e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80B958CC + .float 0.2 + +glabel D_80B958D0 + .float 0.1 + +glabel D_80B958D4 + .float 0.7 + +.text glabel func_80B94E38 /* 00198 80B94E38 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 0019C 80B94E3C F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -169,5 +180,3 @@ glabel func_80B94E38 /* 0040C 80B950AC 8FBE0098 */ lw $s8, 0x0098($sp) /* 00410 80B950B0 03E00008 */ jr $ra /* 00414 80B950B4 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s index f3cc55268f..bfde98cc3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B958D8 + .word 0x3E3851EC +glabel D_80B958DC + .float 0.2 + +.text glabel func_80B950B8 /* 00418 80B950B8 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 0041C 80B950BC AFB1007C */ sw $s1, 0x007C($sp) @@ -167,5 +174,3 @@ glabel func_80B950B8 /* 00688 80B95328 8FBE0098 */ lw $s8, 0x0098($sp) /* 0068C 80B9532C 03E00008 */ jr $ra /* 00690 80B95330 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s index 6737d9f0fb..0fcf27b3b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s @@ -5,5 +5,3 @@ glabel func_80B95334 /* 006A0 80B95340 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 006A4 80B95344 03E00008 */ jr $ra /* 006A8 80B95348 A08F00AE */ sb $t7, 0x00AE($a0) ## 000000AE - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s index 55135f26d6..fccdcefc89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s @@ -139,5 +139,3 @@ glabel func_80B9534C /* 00894 80B95534 8FB10020 */ lw $s1, 0x0020($sp) /* 00898 80B95538 03E00008 */ jr $ra /* 0089C 80B9553C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s index f175362dbb..599c7cba62 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s @@ -12,5 +12,3 @@ glabel func_80B95540 /* 008C8 80B95568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008CC 80B9556C 03E00008 */ jr $ra /* 008D0 80B95570 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s index f1544961a4..e36776169a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B958E0 + .float 0.1 + +.text glabel func_80B95574 /* 008D4 80B95574 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 008D8 80B95578 AFBF0024 */ sw $ra, 0x0024($sp) @@ -52,5 +57,3 @@ glabel func_80B95574 /* 0098C 80B9562C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00990 80B95630 03E00008 */ jr $ra /* 00994 80B95634 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s index 0cd2778c8f..9418b0b8d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s @@ -26,5 +26,3 @@ glabel func_80B95638 /* 009F0 80B95690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 009F4 80B95694 03E00008 */ jr $ra /* 009F8 80B95698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s index 8692a2e63b..6e00bbb4ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s @@ -88,5 +88,3 @@ glabel func_80B9569C /* 00B28 80B957C8 8FB10020 */ lw $s1, 0x0020($sp) /* 00B2C 80B957CC 03E00008 */ jr $ra /* 00B30 80B957D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s index 8455d4f787..e99c826581 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s @@ -19,5 +19,3 @@ glabel ObjKibako2_Destroy /* 00420 80B95DF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00424 80B95DF4 03E00008 */ jr $ra /* 00428 80B95DF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s index b9c5c669c7..7f7b7656d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s @@ -13,4 +13,3 @@ glabel ObjKibako2_Draw /* 005D4 80B95FA4 00000000 */ nop /* 005D8 80B95FA8 00000000 */ nop /* 005DC 80B95FAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s index e6fc0fe519..dcf0fb6871 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80B96010 + .asciz "木箱(据置)(arg %04xH)(item %04xH %d)\n" + .balign 4 + +.text glabel ObjKibako2_Init /* 00324 80B95CF4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00328 80B95CF8 AFBF001C */ sw $ra, 0x001C($sp) @@ -52,5 +58,3 @@ glabel ObjKibako2_Init /* 003D8 80B95DA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 003DC 80B95DAC 03E00008 */ jr $ra /* 003E0 80B95DB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Update.s index 7ad55083a5..a8e51c005e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Update.s @@ -8,5 +8,3 @@ glabel ObjKibako2_Update /* 005A0 80B95F70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005A4 80B95F74 03E00008 */ jr $ra /* 005A8 80B95F78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s index af3816c99d..74adb90d5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s @@ -24,5 +24,3 @@ glabel func_80B959D0 /* 0004C 80B95A1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00050 80B95A20 03E00008 */ jr $ra /* 00054 80B95A24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s index 6603e0abb2..8de44fb5d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_80B96038 + .float 0.2 + +glabel D_80B9603C + .float 0.2 + +glabel D_80B96040 + .float 0.05 +glabel D_80B96044 + .float 0.7 + +.text glabel func_80B95A28 /* 00058 80B95A28 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 /* 0005C 80B95A2C F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -169,5 +182,3 @@ glabel func_80B95A28 /* 002C8 80B95C98 8FBE0098 */ lw $s8, 0x0098($sp) /* 002CC 80B95C9C 03E00008 */ jr $ra /* 002D0 80B95CA0 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95CA4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95CA4.s index d80c04f726..5208d29db8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95CA4.s @@ -21,5 +21,3 @@ glabel func_80B95CA4 /* 00318 80B95CE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0031C 80B95CEC 03E00008 */ jr $ra /* 00320 80B95CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s index ac75ce695e..c8b8ac2ef5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s @@ -59,5 +59,3 @@ glabel func_80B95DFC /* 004F8 80B95EC8 8FB10018 */ lw $s1, 0x0018($sp) /* 004FC 80B95ECC 03E00008 */ jr $ra /* 00500 80B95ED0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95ED4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95ED4.s index efb1e29e53..0c64080ede 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95ED4.s @@ -35,5 +35,3 @@ glabel func_80B95ED4 /* 0057C 80B95F4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00580 80B95F50 03E00008 */ jr $ra /* 00584 80B95F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Destroy.s index e931c42a90..9e0888afdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Destroy.s @@ -12,5 +12,3 @@ glabel ObjLift_Destroy /* 00440 80B96510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00444 80B96514 03E00008 */ jr $ra /* 00448 80B96518 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s index 86f55b6f4e..8b73407d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s @@ -11,4 +11,3 @@ glabel ObjLift_Draw /* 008C4 80B96994 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C8 80B96998 03E00008 */ jr $ra /* 008CC 80B9699C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s index e069e546bf..df49a795b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B96A70 + .asciz "(Dungeon Lift)(arg_data 0x%04x)\n" + .balign 4 + +.late_rodata +glabel D_80B96A98 + .word 0x477FFF80 +glabel D_80B96A9C + .word 0x477FFF80 +glabel D_80B96AA0 + .word 0x477FFF80 + +.text glabel ObjLift_Init /* 00314 80B963E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00318 80B963E8 AFBF001C */ sw $ra, 0x001C($sp) @@ -75,5 +89,3 @@ glabel ObjLift_Init /* 00410 80B964E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00414 80B964E4 03E00008 */ jr $ra /* 00418 80B964E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Update.s index e3434600bd..28553b5f56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Update.s @@ -13,5 +13,3 @@ glabel ObjLift_Update /* 00898 80B96968 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0089C 80B9696C 03E00008 */ jr $ra /* 008A0 80B96970 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D0.s index f9678f1deb..0e9a458815 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D0.s @@ -1,5 +1,3 @@ glabel func_80B960D0 /* 00000 80B960D0 03E00008 */ jr $ra /* 00004 80B960D4 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D8.s index e20dd901ef..0aad13e7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B960D8.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B96A20 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B96A60 + .asciz "../z_obj_lift.c" + .balign 4 + +.text glabel func_80B960D8 /* 00008 80B960D8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0000C 80B960DC AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_80B960D8 /* 00084 80B96154 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00088 80B96158 03E00008 */ jr $ra /* 0008C 80B9615C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s index 9d8fc2ea04..10d074de63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B96A94 + .float 0.8 + +.text glabel func_80B96160 /* 00090 80B96160 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 00094 80B96164 F7BC0068 */ sdc1 $f28, 0x0068($sp) @@ -169,5 +174,3 @@ glabel func_80B96160 /* 00308 80B963D8 8FBE0090 */ lw $s8, 0x0090($sp) /* 0030C 80B963DC 03E00008 */ jr $ra /* 00310 80B963E0 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9651C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9651C.s index 6d6963379d..c2acbdf29d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9651C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9651C.s @@ -16,5 +16,3 @@ glabel func_80B9651C /* 00484 80B96554 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00488 80B96558 03E00008 */ jr $ra /* 0048C 80B9655C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s index 43f6fc13d6..f3ddcb31fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s @@ -61,5 +61,3 @@ glabel func_80B96560 /* 00570 80B96640 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00574 80B96644 03E00008 */ jr $ra /* 00578 80B96648 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9664C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9664C.s index f549a0678d..c3b4a30d2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9664C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B9664C.s @@ -10,5 +10,3 @@ glabel func_80B9664C /* 0059C 80B9666C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005A0 80B96670 03E00008 */ jr $ra /* 005A4 80B96674 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s index 8ef049cd71..23910cecf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s @@ -90,5 +90,3 @@ glabel func_80B96678 /* 006E4 80B967B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 006E8 80B967B8 03E00008 */ jr $ra /* 006EC 80B967BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B967C0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B967C0.s index f8073efd90..6e89461ce9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B967C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B967C0.s @@ -32,5 +32,3 @@ glabel func_80B967C0 /* 00764 80B96834 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00768 80B96838 03E00008 */ jr $ra /* 0076C 80B9683C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96840.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96840.s index 0195ad19f3..96cf158d1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96840.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96840.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B96AA4 + .float 0.001 + +.text glabel func_80B96840 /* 00770 80B96840 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00774 80B96844 AFBF0024 */ sw $ra, 0x0024($sp) @@ -69,5 +74,3 @@ glabel func_80B96840 /* 00864 80B96934 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00868 80B96938 03E00008 */ jr $ra /* 0086C 80B9693C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s index e561c32c2d..410ef52425 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s @@ -9,5 +9,3 @@ glabel ObjLightswitch_Destroy /* 005FC 80B9719C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00600 80B971A0 03E00008 */ jr $ra /* 00604 80B971A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s index 6955928bf9..5960e71294 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s @@ -45,4 +45,3 @@ glabel ObjLightswitch_Draw /* 01354 80B97EF4 03E00008 */ jr $ra /* 01358 80B97EF8 00000000 */ nop /* 0135C 80B97EFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s index 124497e5e3..165a939e5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B97F90 + .asciz "" + .balign 4 + +glabel D_80B97F9C + .asciz "押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B97FCC + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B97FE4 + .asciz "\x1b[m" + .balign 4 + +glabel D_80B97FE8 + .asciz "(光スイッチ)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel ObjLightswitch_Init /* 00408 80B96FA8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0040C 80B96FAC AFB00038 */ sw $s0, 0x0038($sp) @@ -134,5 +156,3 @@ glabel ObjLightswitch_Init /* 005D4 80B97174 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 005D8 80B97178 03E00008 */ jr $ra /* 005DC 80B9717C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s index db555a835e..d8938e003d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s @@ -62,5 +62,3 @@ glabel ObjLightswitch_Update /* 00C24 80B977C4 8FB10018 */ lw $s1, 0x0018($sp) /* 00C28 80B977C8 03E00008 */ jr $ra /* 00C2C 80B977CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s index 7b9f9a694b..2c35ea8726 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s @@ -38,5 +38,3 @@ glabel func_80B96BA0 /* 00090 80B96C30 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00094 80B96C34 03E00008 */ jr $ra /* 00098 80B96C38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s index 5853ec9444..d6d0abdb90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s @@ -54,5 +54,3 @@ glabel func_80B96C3C /* 00154 80B96CF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00158 80B96CF8 03E00008 */ jr $ra /* 0015C 80B96CFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s index 4c673e65e8..a809fb5cbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s @@ -35,5 +35,3 @@ glabel func_80B96D00 /* 001D4 80B96D74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001D8 80B96D78 03E00008 */ jr $ra /* 001DC 80B96D7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s index 6ac850069e..c290c6eaf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B980F8 + .word 0x38808081, 0x00000000 + +.text glabel func_80B96D80 /* 001E0 80B96D80 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 001E4 80B96D84 AFB00048 */ sw $s0, 0x0048($sp) @@ -147,5 +152,3 @@ glabel func_80B96D80 /* 003FC 80B96F9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 00400 80B96FA0 03E00008 */ jr $ra /* 00404 80B96FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s index 2fa1fc1d44..54daf647ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s @@ -11,5 +11,3 @@ glabel func_80B971A8 /* 0062C 80B971CC A48201BA */ sh $v0, 0x01BA($a0) ## 000001BA /* 00630 80B971D0 03E00008 */ jr $ra /* 00634 80B971D4 A48201BC */ sh $v0, 0x01BC($a0) ## 000001BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s index 7c04a5049e..79864cb066 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s @@ -60,5 +60,3 @@ glabel func_80B971D8 /* 0070C 80B972AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00710 80B972B0 03E00008 */ jr $ra /* 00714 80B972B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s index b26239fb49..1bc652b799 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s @@ -7,5 +7,3 @@ glabel func_80B972B8 /* 0072C 80B972CC A48001B0 */ sh $zero, 0x01B0($a0) ## 000001B0 /* 00730 80B972D0 03E00008 */ jr $ra /* 00734 80B972D4 A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s index 79bea9b661..9e4eeab5d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s @@ -67,5 +67,3 @@ glabel func_80B972D8 /* 0081C 80B973BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00820 80B973C0 03E00008 */ jr $ra /* 00824 80B973C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s index 86d0984285..6ceba63e45 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s @@ -13,5 +13,3 @@ glabel func_80B973C8 /* 00854 80B973F4 A49801C0 */ sh $t8, 0x01C0($a0) ## 000001C0 /* 00858 80B973F8 03E00008 */ jr $ra /* 0085C 80B973FC A48001B0 */ sh $zero, 0x01B0($a0) ## 000001B0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s index ae820807e3..58d48b4e1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s @@ -76,5 +76,3 @@ glabel func_80B97400 /* 0096C 80B9750C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00970 80B97510 03E00008 */ jr $ra /* 00974 80B97514 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s index e1983bc76d..c8696de9f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s @@ -9,5 +9,3 @@ glabel func_80B97518 /* 00994 80B97534 A49801B0 */ sh $t8, 0x01B0($a0) ## 000001B0 /* 00998 80B97538 03E00008 */ jr $ra /* 0099C 80B9753C A49901B4 */ sh $t9, 0x01B4($a0) ## 000001B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s index 5f58693e73..162a28928f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s @@ -65,5 +65,3 @@ glabel func_80B97540 /* 00A84 80B97624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A88 80B97628 03E00008 */ jr $ra /* 00A8C 80B9762C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s index 637427dce6..f61e6fbf7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s @@ -5,5 +5,3 @@ glabel func_80B97630 /* 00A9C 80B9763C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 00AA0 80B97640 03E00008 */ jr $ra /* 00AA4 80B97644 A48F01B2 */ sh $t7, 0x01B2($a0) ## 000001B2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s index 35ef74e250..6fb6f8fd72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s @@ -19,5 +19,3 @@ glabel func_80B97648 /* 00AE4 80B97684 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AE8 80B97688 03E00008 */ jr $ra /* 00AEC 80B9768C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s index cce6976bb4..a2b926abf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s @@ -5,5 +5,3 @@ glabel func_80B97690 /* 00AFC 80B9769C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 00B00 80B976A0 03E00008 */ jr $ra /* 00B04 80B976A4 A48F01BC */ sh $t7, 0x01BC($a0) ## 000001BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s index 3a30bf35fb..9f0382c972 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s @@ -18,5 +18,3 @@ glabel func_80B976A8 /* 00B40 80B976E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B44 80B976E4 03E00008 */ jr $ra /* 00B48 80B976E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s index 886703c4d2..fdd1bc5e6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B98008 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B98020 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B98038 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B98050 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B98068 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +.text glabel func_80B977D0 /* 00C30 80B977D0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00C34 80B977D4 AFBF001C */ sw $ra, 0x001C($sp) @@ -226,5 +248,3 @@ glabel func_80B977D0 /* 00FA4 80B97B44 8FB10018 */ lw $s1, 0x0018($sp) /* 00FA8 80B97B48 03E00008 */ jr $ra /* 00FAC 80B97B4C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s index b20ba32546..0ebb505e84 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B98080 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B98098 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B980B0 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B980C8 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +glabel D_80B980E0 + .asciz "../z_obj_lightswitch.c" + .balign 4 + +.text glabel func_80B97B50 /* 00FB0 80B97B50 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00FB4 80B97B54 AFBF001C */ sw $ra, 0x001C($sp) @@ -193,5 +215,3 @@ glabel func_80B97B50 /* 012AC 80B97E4C 8FB10018 */ lw $s1, 0x0018($sp) /* 012B0 80B97E50 03E00008 */ jr $ra /* 012B4 80B97E54 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Draw.s index 32cd6d1026..1bba011b80 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Draw.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B98A04 + .float 0.001 + +.text glabel ObjMakeoshihiki_Draw /* 001BC 80B986CC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 001C0 80B986D0 AFBF002C */ sw $ra, 0x002C($sp) @@ -143,4 +148,3 @@ glabel ObjMakeoshihiki_Draw /* 003B4 80B988C4 03E00008 */ jr $ra /* 003B8 80B988C8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 003BC 80B988CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Init.s index 63d62998fa..c880971038 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Makeoshihiki/ObjMakeoshihiki_Init.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80B98970 + .asciz "\x1B[41;37m" + .balign 4 + +glabel D_80B9897C + .asciz "Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n" + .balign 4 + +glabel D_80B989AC + .asciz "../z_obj_makeoshihiki.c" + .balign 4 + +glabel D_80B989C4 + .asciz "\x1B[m" + .balign 4 + +glabel D_80B989C8 + .asciz "(%s)(arg_data %04xF)(angleZ %d)\n" + .balign 4 + +glabel D_80B989EC + .asciz "../z_obj_makeoshihiki.c" + .balign 4 + +.text glabel ObjMakeoshihiki_Init /* 00000 80B98510 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00004 80B98514 AFBF003C */ sw $ra, 0x003C($sp) @@ -124,5 +150,3 @@ glabel ObjMakeoshihiki_Init /* 001B0 80B986C0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 001B4 80B986C4 03E00008 */ jr $ra /* 001B8 80B986C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Destroy.s index 1ea43ae2a0..acb258265c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Destroy.s @@ -2,5 +2,3 @@ glabel ObjMure_Destroy /* 001DC 80B98C7C AFA40000 */ sw $a0, 0x0000($sp) /* 001E0 80B98C80 03E00008 */ jr $ra /* 001E4 80B98C84 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Init.s index 016456e5f9..2d7711990c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Init.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80B99B04 + .asciz "Error 群れな敵 (%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B99B30 + .asciz "../z_obj_mure.c" + .balign 4 + +glabel D_80B99B40 + .asciz "Error 群れな敵 (%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B99B6C + .asciz "../z_obj_mure.c" + .balign 4 + +glabel D_80B99B7C + .asciz "群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n" + .balign 4 + +glabel D_80B99BC0 + .asciz "Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B99C00 + .asciz "../z_obj_mure.c" + .balign 4 + +.text glabel ObjMure_Init /* 000A8 80B98B48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 000AC 80B98B4C AFBF0024 */ sw $ra, 0x0024($sp) @@ -88,5 +118,3 @@ glabel ObjMure_Init /* 001D0 80B98C70 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 001D4 80B98C74 03E00008 */ jr $ra /* 001D8 80B98C78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Update.s index 29ec32f82f..1ad16d6349 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/ObjMure_Update.s @@ -14,4 +14,3 @@ glabel ObjMure_Update /* 00F84 80B99A24 03E00008 */ jr $ra /* 00F88 80B99A28 00000000 */ nop /* 00F8C 80B99A2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98AA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98AA0.s index 3d16b8c70e..56bf3fb3a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98AA0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B99AB0 + .asciz "Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B99AF4 + .asciz "../z_obj_mure.c" + .balign 4 + +.text glabel func_80B98AA0 /* 00000 80B98AA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80B98AA4 AFBF0014 */ sw $ra, 0x0014($sp) @@ -35,5 +45,3 @@ glabel func_80B98AA0 /* 00070 80B98B10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00074 80B98B14 03E00008 */ jr $ra /* 00078 80B98B18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98B1C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98B1C.s index 7925ab521c..58dde7d4b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98B1C.s @@ -12,5 +12,3 @@ glabel func_80B98B1C .L80B98B40: /* 000A0 80B98B40 03E00008 */ jr $ra /* 000A4 80B98B44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98C88.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98C88.s index ca6be75980..b30f5e233e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98C88.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98C88.s @@ -11,5 +11,3 @@ glabel func_80B98C88 .L80B98CAC: /* 0020C 80B98CAC 03E00008 */ jr $ra /* 00210 80B98CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98CB4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98CB4.s index a5b5e67133..b8e0b5a559 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98CB4.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B99C10 + .asciz "おかしなの (%s %d)\n" + .balign 4 + +glabel D_80B99C24 + .asciz "../z_obj_mure.c" + .balign 4 + +.text glabel func_80B98CB4 /* 00214 80B98CB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00218 80B98CB8 28C10004 */ slti $at, $a2, 0x0004 @@ -26,5 +36,3 @@ glabel func_80B98CB4 /* 0026C 80B98D0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00270 80B98D10 03E00008 */ jr $ra /* 00274 80B98D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98D18.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98D18.s index 3944f366e1..d04e19332b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98D18.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98D18.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80B99C34 + .asciz "Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B99C64 + .asciz "../z_obj_mure.c" + .balign 4 + +glabel D_80B99C74 + .asciz "warning 発生失敗 (%s %d)\n" + .balign 4 + +glabel D_80B99C90 + .asciz "../z_obj_mure.c" + .balign 4 + +glabel D_80B99CA0 + .asciz "warning 発生失敗 (%s %d)\n" + .balign 4 + +glabel D_80B99CBC + .asciz "../z_obj_mure.c" + .balign 4 + +.text glabel func_80B98D18 /* 00278 80B98D18 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 0027C 80B98D1C AFBF0054 */ sw $ra, 0x0054($sp) @@ -148,5 +174,3 @@ glabel func_80B98D18 /* 0048C 80B98F2C 8FBE0050 */ lw $s8, 0x0050($sp) /* 00490 80B98F30 03E00008 */ jr $ra /* 00494 80B98F34 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98F38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98F38.s index 5ab1fcdde7..8a67624263 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B98F38.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80B99CCC + .asciz "Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B99CFC + .asciz "../z_obj_mure.c" + .balign 4 + +glabel D_80B99D0C + .asciz "warning 発生失敗 (%s %d)\n" + .balign 4 + +glabel D_80B99D28 + .asciz "../z_obj_mure.c" + .balign 4 + +.text glabel func_80B98F38 /* 00498 80B98F38 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0049C 80B98F3C AFBF0054 */ sw $ra, 0x0054($sp) @@ -106,5 +124,3 @@ glabel func_80B98F38 /* 00610 80B990B0 8FBE0050 */ lw $s8, 0x0050($sp) /* 00614 80B990B4 03E00008 */ jr $ra /* 00618 80B990B8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B990BC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B990BC.s index 1787127fc5..58bf8bce51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B990BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B990BC.s @@ -22,5 +22,3 @@ glabel func_80B990BC /* 00660 80B99100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00664 80B99104 03E00008 */ jr $ra /* 00668 80B99108 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s index c3a923ef88..56c21485cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s @@ -71,5 +71,3 @@ glabel func_80B9910C /* 00758 80B991F8 8FB60030 */ lw $s6, 0x0030($sp) /* 0075C 80B991FC 03E00008 */ jr $ra /* 00760 80B99200 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99204.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99204.s index 289499dbd0..3921b41474 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99204.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99204.s @@ -7,5 +7,3 @@ glabel func_80B99204 /* 00778 80B99218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0077C 80B9921C 03E00008 */ jr $ra /* 00780 80B99220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99224.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99224.s index f49d92d81c..046ca90964 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99224.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99224.s @@ -53,5 +53,3 @@ glabel func_80B99224 /* 00838 80B992D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0083C 80B992DC 03E00008 */ jr $ra /* 00840 80B992E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992E4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992E4.s index ded5dbd75e..df66a53c8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992E4.s @@ -4,5 +4,3 @@ glabel func_80B992E4 /* 0084C 80B992EC 25CE92F8 */ addiu $t6, $t6, %lo(func_80B992F8) ## $t6 = 80B992F8 /* 00850 80B992F0 03E00008 */ jr $ra /* 00854 80B992F4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992F8.s index 6f3e109c1c..f7abb085d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B992F8.s @@ -24,5 +24,3 @@ glabel func_80B992F8 /* 008AC 80B9934C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008B0 80B99350 03E00008 */ jr $ra /* 008B4 80B99354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s index 17a2924e15..2a34e33bdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s @@ -58,5 +58,3 @@ glabel func_80B99358 /* 00980 80B99420 8FB30030 */ lw $s3, 0x0030($sp) /* 00984 80B99424 03E00008 */ jr $ra /* 00988 80B99428 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9942C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9942C.s index 0bd664b36f..040ce070f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9942C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9942C.s @@ -107,5 +107,3 @@ glabel func_80B9942C /* 00AF8 80B99598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AFC 80B9959C 03E00008 */ jr $ra /* 00B00 80B995A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s index 28bf343ed5..4fa3267395 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_80B99D38 + .float 0.1 + +glabel D_80B99D3C + .float 0.2 + +glabel D_80B99D40 + .float 0.8 + +glabel D_80B99D44 + .float 0.2 + +glabel D_80B99D48 + .float 0.6 + +.text glabel func_80B995A4 /* 00B04 80B995A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00B08 80B995A8 AFBF001C */ sw $ra, 0x001C($sp) @@ -152,5 +169,3 @@ glabel func_80B995A4 /* 00D20 80B997C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D24 80B997C4 03E00008 */ jr $ra /* 00D28 80B997C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s index ffdb117e99..2eb444737a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80B99D4C + .float 0.2 + +glabel D_80B99D50 + .float 0.7 + +.text glabel func_80B997CC /* 00D2C 80B997CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00D30 80B997D0 AFBF001C */ sw $ra, 0x001C($sp) @@ -107,5 +115,3 @@ glabel func_80B997CC /* 00EA4 80B99944 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EA8 80B99948 03E00008 */ jr $ra /* 00EAC 80B9994C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99950.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99950.s index 1344820f64..c39fcc8dd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99950.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99950.s @@ -43,5 +43,3 @@ glabel func_80B99950 /* 00F4C 80B999EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F50 80B999F0 03E00008 */ jr $ra /* 00F54 80B999F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Init.s index 8b36df5c34..9033f42670 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Init.s @@ -25,5 +25,3 @@ glabel ObjMure2_Init /* 006DC 80B9A61C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006E0 80B9A620 03E00008 */ jr $ra /* 006E4 80B9A624 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Update.s index c841bfb2e0..4260bdfec9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/ObjMure2_Update.s @@ -24,4 +24,3 @@ glabel ObjMure2_Update /* 00894 80B9A7D4 00000000 */ nop /* 00898 80B9A7D8 00000000 */ nop /* 0089C 80B9A7DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s index bd2c7c076b..efd41b686a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s @@ -75,5 +75,3 @@ glabel func_80B99F40 /* 0010C 80B9A04C 8FB60038 */ lw $s6, 0x0038($sp) /* 00110 80B9A050 03E00008 */ jr $ra /* 00114 80B9A054 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s index 07c4ae14d4..8ee78b83ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s @@ -68,5 +68,3 @@ glabel func_80B9A058 /* 0020C 80B9A14C 8FB50028 */ lw $s5, 0x0028($sp) /* 00210 80B9A150 03E00008 */ jr $ra /* 00214 80B9A154 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s index 9941388a67..d3f4bc2e79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s @@ -70,5 +70,3 @@ glabel func_80B9A158 /* 00314 80B9A254 8FB60038 */ lw $s6, 0x0038($sp) /* 00318 80B9A258 03E00008 */ jr $ra /* 0031C 80B9A25C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A260.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A260.s index 6c090bc3cc..9dee9596bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A260.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A260.s @@ -20,5 +20,3 @@ glabel func_80B9A260 /* 00364 80B9A2A4 01095025 */ or $t2, $t0, $t1 ## $t2 = 00000000 /* 00368 80B9A2A8 03E00008 */ jr $ra /* 0036C 80B9A2AC A48A0000 */ sh $t2, 0x0000($a0) ## 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A2B0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A2B0.s index aab22952b9..86a6c92c06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A2B0.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B9A880 + .asciz "Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B9A8B4 + .asciz "../z_obj_mure2.c" + .balign 4 + +.text glabel func_80B9A2B0 /* 00370 80B9A2B0 27BDFEF8 */ addiu $sp, $sp, 0xFEF8 ## $sp = FFFFFEF8 /* 00374 80B9A2B4 AFBF0054 */ sw $ra, 0x0054($sp) @@ -104,5 +114,3 @@ glabel func_80B9A2B0 /* 004EC 80B9A42C 8FBE0050 */ lw $s8, 0x0050($sp) /* 004F0 80B9A430 03E00008 */ jr $ra /* 004F4 80B9A434 27BD0108 */ addiu $sp, $sp, 0x0108 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s index 9aa1aa8920..304247a70b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s @@ -70,5 +70,3 @@ glabel func_80B9A438 /* 005E8 80B9A528 8FB30020 */ lw $s3, 0x0020($sp) /* 005EC 80B9A52C 03E00008 */ jr $ra /* 005F0 80B9A530 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A534.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A534.s index da7fb6f48a..3be19067e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A534.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A534.s @@ -40,5 +40,3 @@ glabel func_80B9A534 .L80B9A5C0: /* 00680 80B9A5C0 03E00008 */ jr $ra /* 00684 80B9A5C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A628.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A628.s index e848e9d9c9..5dea862610 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A628.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A628.s @@ -3,5 +3,3 @@ glabel func_80B9A628 /* 006EC 80B9A62C 25CEA638 */ addiu $t6, $t6, %lo(func_80B9A638) ## $t6 = 80B9A638 /* 006F0 80B9A630 03E00008 */ jr $ra /* 006F4 80B9A634 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A638.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A638.s index dccfc46ca8..20fd8665fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A638.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A638.s @@ -7,5 +7,3 @@ glabel func_80B9A638 /* 0070C 80B9A64C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00710 80B9A650 03E00008 */ jr $ra /* 00714 80B9A654 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A658.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A658.s index 17af363e07..dd7b871216 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A658.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A658.s @@ -3,5 +3,3 @@ glabel func_80B9A658 /* 0071C 80B9A65C 25CEA668 */ addiu $t6, $t6, %lo(func_80B9A668) ## $t6 = 80B9A668 /* 00720 80B9A660 03E00008 */ jr $ra /* 00724 80B9A664 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A668.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A668.s index 0cfd9f4742..a227cc268c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A668.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A668.s @@ -32,5 +32,3 @@ glabel func_80B9A668 /* 0079C 80B9A6DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 007A0 80B9A6E0 03E00008 */ jr $ra /* 007A4 80B9A6E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6E8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6E8.s index 3e7d54c010..9ae380875d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6E8.s @@ -3,5 +3,3 @@ glabel func_80B9A6E8 /* 007AC 80B9A6EC 25CEA6F8 */ addiu $t6, $t6, %lo(func_80B9A6F8) ## $t6 = 80B9A6F8 /* 007B0 80B9A6F0 03E00008 */ jr $ra /* 007B4 80B9A6F4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6F8.s index bde7d94dc7..ac35b85cf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A6F8.s @@ -35,5 +35,3 @@ glabel func_80B9A6F8 /* 00838 80B9A778 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0083C 80B9A77C 03E00008 */ jr $ra /* 00840 80B9A780 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Destroy.s index 5a1db9914e..f33f554108 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Destroy.s @@ -2,5 +2,3 @@ glabel ObjMure3_Destroy /* 00548 80B9AF18 AFA40000 */ sw $a0, 0x0000($sp) /* 0054C 80B9AF1C 03E00008 */ jr $ra /* 00550 80B9AF20 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Init.s index c298592053..065eb6c10d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Init.s @@ -27,5 +27,3 @@ glabel ObjMure3_Init /* 0053C 80B9AF0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00540 80B9AF10 03E00008 */ jr $ra /* 00544 80B9AF14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Update.s index 8b5fb301c0..dcf3a5a874 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/ObjMure3_Update.s @@ -11,4 +11,3 @@ glabel ObjMure3_Update /* 006C4 80B9B094 00000000 */ nop /* 006C8 80B9B098 00000000 */ nop /* 006CC 80B9B09C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9A9D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9A9D0.s index c2ebccedf0..6bf415cc9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9A9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9A9D0.s @@ -51,5 +51,3 @@ glabel func_80B9A9D0 /* 000B4 80B9AA84 8FB50030 */ lw $s5, 0x0030($sp) /* 000B8 80B9AA88 03E00008 */ jr $ra /* 000BC 80B9AA8C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s index 4c5a67f69d..e9f9506e27 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s @@ -73,5 +73,3 @@ glabel func_80B9AA90 /* 001C4 80B9AB94 8FB50048 */ lw $s5, 0x0048($sp) /* 001C8 80B9AB98 03E00008 */ jr $ra /* 001CC 80B9AB9C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s index 6960237a46..21a11d82b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s @@ -88,5 +88,3 @@ glabel func_80B9ABA0 /* 00308 80B9ACD8 8FB60038 */ lw $s6, 0x0038($sp) /* 0030C 80B9ACDC 03E00008 */ jr $ra /* 00310 80B9ACE0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s index 4875191a99..723161e506 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s @@ -64,5 +64,3 @@ glabel func_80B9ACE4 /* 003F0 80B9ADC0 8FB50028 */ lw $s5, 0x0028($sp) /* 003F4 80B9ADC4 03E00008 */ jr $ra /* 003F8 80B9ADC8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s index b54536842a..1dee3287e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s @@ -64,5 +64,3 @@ glabel func_80B9ADCC /* 004E0 80B9AEB0 8FB50028 */ lw $s5, 0x0028($sp) /* 004E4 80B9AEB4 03E00008 */ jr $ra /* 004E8 80B9AEB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF24.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF24.s index f5f9a88909..43a9156ce9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF24.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF24.s @@ -3,5 +3,3 @@ glabel func_80B9AF24 /* 00558 80B9AF28 25CEAF34 */ addiu $t6, $t6, %lo(func_80B9AF34) ## $t6 = 80B9AF34 /* 0055C 80B9AF2C 03E00008 */ jr $ra /* 00560 80B9AF30 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF34.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF34.s index 7be8d081ce..bb405ecfe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF34.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF34.s @@ -7,5 +7,3 @@ glabel func_80B9AF34 /* 00578 80B9AF48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0057C 80B9AF4C 03E00008 */ jr $ra /* 00580 80B9AF50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF54.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF54.s index ec61992804..839d1501ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF54.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF54.s @@ -3,5 +3,3 @@ glabel func_80B9AF54 /* 00588 80B9AF58 25CEAF64 */ addiu $t6, $t6, %lo(func_80B9AF64) ## $t6 = 80B9AF64 /* 0058C 80B9AF5C 03E00008 */ jr $ra /* 00590 80B9AF60 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF64.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF64.s index 14a43316fe..b2ce145d3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF64.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AF64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B9B0E0 + .float 1322500.0 + +.text glabel func_80B9AF64 /* 00594 80B9AF64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00598 80B9AF68 AFBF0014 */ sw $ra, 0x0014($sp) @@ -34,5 +39,3 @@ glabel func_80B9AF64 /* 00610 80B9AFE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00614 80B9AFE4 03E00008 */ jr $ra /* 00618 80B9AFE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFEC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFEC.s index 476145c0ad..a5eb63809d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFEC.s @@ -3,5 +3,3 @@ glabel func_80B9AFEC /* 00620 80B9AFF0 25CEAFFC */ addiu $t6, $t6, %lo(func_80B9AFFC) ## $t6 = 80B9AFFC /* 00624 80B9AFF4 03E00008 */ jr $ra /* 00628 80B9AFF8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFFC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFFC.s index 60d568e5b8..d54efbec86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AFFC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B9B0E4 + .float 2102500.0 + +.text glabel func_80B9AFFC /* 0062C 80B9AFFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00630 80B9B000 AFBF001C */ sw $ra, 0x001C($sp) @@ -29,5 +34,3 @@ glabel func_80B9AFFC /* 00694 80B9B064 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00698 80B9B068 03E00008 */ jr $ra /* 0069C 80B9B06C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s index 5aded680ee..f8b6cdf108 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Destroy.s @@ -12,5 +12,3 @@ glabel ObjOshihiki_Destroy /* 0073C 80B9B8BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00740 80B9B8C0 03E00008 */ jr $ra /* 00744 80B9B8C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s index 88788f9ced..b2cfa8317e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s @@ -147,4 +147,3 @@ glabel L80B9C8F8 /* 01814 80B9C994 00000000 */ nop /* 01818 80B9C998 00000000 */ nop /* 0181C 80B9C99C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s index 4003b6f324..b8f45ceece 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s @@ -86,5 +86,3 @@ glabel ObjOshihiki_Init /* 0070C 80B9B88C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00710 80B9B890 03E00008 */ jr $ra /* 00714 80B9B894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s index afc58bb33d..ae716e38ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Update.s @@ -37,5 +37,3 @@ glabel ObjOshihiki_Update /* 015D8 80B9C758 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 015DC 80B9C75C 03E00008 */ jr $ra /* 015E0 80B9C760 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s index a77645a549..18835d7cf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B180.s @@ -38,5 +38,3 @@ glabel func_80B9B180 /* 0007C 80B9B1FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00080 80B9B200 03E00008 */ jr $ra /* 00084 80B9B204 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s index db455fb737..7592dd4b83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B208.s @@ -18,5 +18,3 @@ glabel func_80B9B208 /* 000C8 80B9B248 460A4401 */ sub.s $f16, $f8, $f10 /* 000CC 80B9B24C 03E00008 */ jr $ra /* 000D0 80B9B250 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s index 65213b3530..702a911301 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s @@ -37,5 +37,3 @@ glabel L80B9B2BC /* 0014C 80B9B2CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00150 80B9B2D0 03E00008 */ jr $ra /* 00154 80B9B2D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s index 7a90f0a209..3b32913993 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B2D8.s @@ -9,5 +9,3 @@ glabel func_80B9B2D8 /* 00174 80B9B2F4 AC65018C */ sw $a1, 0x018C($v1) ## 0000018C /* 00178 80B9B2F8 03E00008 */ jr $ra /* 0017C 80B9B2FC AC650180 */ sw $a1, 0x0180($v1) ## 00000180 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s index 3ac07a0cf5..adee3630c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B300.s @@ -37,5 +37,3 @@ glabel func_80B9B300 /* 00200 80B9B380 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00204 80B9B384 03E00008 */ jr $ra /* 00208 80B9B388 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s index 3a4bebec4c..82b8298659 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B38C.s @@ -84,5 +84,3 @@ glabel func_80B9B38C .L80B9B4B4: /* 00334 80B9B4B4 03E00008 */ jr $ra /* 00338 80B9B4B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s index 8869629e22..881d1d47ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B4BC.s @@ -55,5 +55,3 @@ glabel func_80B9B4BC /* 003F8 80B9B578 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003FC 80B9B57C 03E00008 */ jr $ra /* 00400 80B9B580 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s index 2dd3acc36c..1788aa3689 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B584.s @@ -31,5 +31,3 @@ glabel L80B9B5B8 /* 00468 80B9B5E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0046C 80B9B5EC 03E00008 */ jr $ra /* 00470 80B9B5F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s index c724432dde..0b95b4fdc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B5F4.s @@ -14,5 +14,3 @@ glabel func_80B9B5F4 /* 004A0 80B9B620 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004A4 80B9B624 03E00008 */ jr $ra /* 004A8 80B9B628 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s index c8fa04b780..650dd0231b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s @@ -15,5 +15,3 @@ glabel L80B9B658 /* 004DC 80B9B65C 27183350 */ addiu $t8, $t8, 0x3350 ## $t8 = 05003350 /* 004E0 80B9B660 03E00008 */ jr $ra /* 004E4 80B9B664 AC9801CC */ sw $t8, 0x01CC($a0) ## 000001CC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s index b7e56308f5..f824ea158c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s @@ -3,5 +3,3 @@ glabel func_80B9B668 /* 004EC 80B9B66C 27393B50 */ addiu $t9, $t9, 0x3B50 ## $t9 = 05003B50 /* 004F0 80B9B670 03E00008 */ jr $ra /* 004F4 80B9B674 AC9901CC */ sw $t9, 0x01CC($a0) ## 000001CC - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s index 1c4855e8a0..e6b7f400ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s @@ -5,5 +5,3 @@ glabel func_80B9B678 .L80B9B684: /* 00504 80B9B684 03E00008 */ jr $ra /* 00508 80B9B688 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s index 8295d8968a..4ccbc9b9b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s @@ -59,5 +59,3 @@ glabel func_80B9B68C /* 005DC 80B9B75C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005E0 80B9B760 03E00008 */ jr $ra /* 005E4 80B9B764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s index 445e096734..5bd979026e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B8C8.s @@ -88,5 +88,3 @@ glabel func_80B9B8C8 /* 0089C 80B9BA1C 8FBE0050 */ lw $s8, 0x0050($sp) /* 008A0 80B9BA20 03E00008 */ jr $ra /* 008A4 80B9BA24 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s index f4cbe0ce3c..b7e4aca5c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BA28.s @@ -93,5 +93,3 @@ glabel func_80B9BA28 .L80B9BB68: /* 009E8 80B9BB68 03E00008 */ jr $ra /* 009EC 80B9BB6C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000004 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s index 6cd31f5161..105f4f64a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BB70.s @@ -21,5 +21,3 @@ glabel func_80B9BB70 /* 00A3C 80B9BBBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A40 80B9BBC0 03E00008 */ jr $ra /* 00A44 80B9BBC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s index d75c0cfef1..f6a110210b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BBC8.s @@ -22,5 +22,3 @@ glabel func_80B9BBC8 /* 00A94 80B9BC14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A98 80B9BC18 03E00008 */ jr $ra /* 00A9C 80B9BC1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s index 13509b1a63..49cf5941cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BC20.s @@ -41,5 +41,3 @@ glabel func_80B9BC20 /* 00B2C 80B9BCAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00B30 80B9BCB0 03E00008 */ jr $ra /* 00B34 80B9BCB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s index 5b256b6203..3b3e4d6374 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BCB8.s @@ -154,5 +154,3 @@ glabel func_80B9BCB8 /* 00D7C 80B9BEFC 8FBE0088 */ lw $s8, 0x0088($sp) /* 00D80 80B9BF00 03E00008 */ jr $ra /* 00D84 80B9BF04 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s index df9cd43030..1e3c733539 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BF08.s @@ -63,5 +63,3 @@ glabel func_80B9BF08 /* 00E6C 80B9BFEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E70 80B9BFF0 03E00008 */ jr $ra /* 00E74 80B9BFF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s index b80bc58221..68accad73f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9BFF8.s @@ -12,5 +12,3 @@ glabel func_80B9BFF8 /* 00EA0 80B9C020 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 /* 00EA4 80B9C024 03E00008 */ jr $ra /* 00EA8 80B9C028 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s index a60b4ef497..cdb138cdbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C02C.s @@ -61,5 +61,3 @@ glabel func_80B9C02C /* 00F84 80B9C104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F88 80B9C108 03E00008 */ jr $ra /* 00F8C 80B9C10C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s index 7ef4d8ef5e..0e20339d73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C110.s @@ -14,5 +14,3 @@ glabel func_80B9C110 /* 00FC0 80B9C140 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C /* 00FC4 80B9C144 03E00008 */ jr $ra /* 00FC8 80B9C148 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s index 110a3103a2..34c26cb9b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C14C.s @@ -137,5 +137,3 @@ glabel func_80B9C14C /* 011B4 80B9C334 8FB10018 */ lw $s1, 0x0018($sp) /* 011B8 80B9C338 03E00008 */ jr $ra /* 011BC 80B9C33C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s index 7a319ca1fa..16fab40936 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C340.s @@ -9,5 +9,3 @@ glabel func_80B9C340 /* 011DC 80B9C35C AC980164 */ sw $t8, 0x0164($a0) ## 00000164 /* 011E0 80B9C360 03E00008 */ jr $ra /* 011E4 80B9C364 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s index 020f07ba9f..21f0ae7393 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C368.s @@ -145,5 +145,3 @@ glabel func_80B9C368 /* 013F8 80B9C578 8FB10018 */ lw $s1, 0x0018($sp) /* 013FC 80B9C57C 03E00008 */ jr $ra /* 01400 80B9C580 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s index 48167ffcd3..8d58f67eb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C584.s @@ -21,5 +21,3 @@ glabel func_80B9C584 /* 01450 80B9C5D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01454 80B9C5D4 03E00008 */ jr $ra /* 01458 80B9C5D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s index c8f9de5598..008ef31630 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9C5DC.s @@ -70,5 +70,3 @@ glabel func_80B9C5DC /* 01550 80B9C6D0 8FB10018 */ lw $s1, 0x0018($sp) /* 01554 80B9C6D4 03E00008 */ jr $ra /* 01558 80B9C6D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s index 4e4905452c..e6cbac5827 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s @@ -46,5 +46,3 @@ glabel ObjSwitch_Destroy /* 0082C 80B9DA3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00830 80B9DA40 03E00008 */ jr $ra /* 00834 80B9DA44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Draw.s index 946cab526c..dc5fe9ab78 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Draw.s @@ -16,4 +16,3 @@ glabel ObjSwitch_Draw /* 019E4 80B9EBF4 00000000 */ nop /* 019E8 80B9EBF8 00000000 */ nop /* 019EC 80B9EBFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Init.s index 0a1413f84d..f0d251cdfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Init.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80B9EE54 + .asciz "" + .balign 4 + +glabel D_80B9EE5C + .asciz "Error : 氷発生失敗 (%s %d)\n" + .balign 4 + +glabel D_80B9EE78 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EE8C + .asciz "\x1b[m" + .balign 4 + +glabel D_80B9EE90 + .asciz "(Dungeon switch)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel ObjSwitch_Init /* 004B4 80B9D6C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 004B8 80B9D6C8 AFB00018 */ sw $s0, 0x0018($sp) @@ -211,5 +233,3 @@ glabel ObjSwitch_Init /* 00788 80B9D998 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0078C 80B9D99C 03E00008 */ jr $ra /* 00790 80B9D9A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s index a7a4515bec..fb3ff29e9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jtbl_80B9EF80 +.word L80B9E684 +.word L80B9E684 +.word L80B9E690 +.word L80B9E6C0 +.word L80B9E6C0 +.word 0x00000000, 0x00000000, 0x00000000 + +.text glabel ObjSwitch_Update /* 013FC 80B9E60C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01400 80B9E610 AFBF001C */ sw $ra, 0x001C($sp) @@ -90,5 +100,3 @@ glabel L80B9E6C0 /* 0152C 80B9E73C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01530 80B9E740 03E00008 */ jr $ra /* 01534 80B9E744 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D210.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D210.s index 08ca3ccf46..6f67899470 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D210.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D210.s @@ -34,5 +34,3 @@ glabel func_80B9D210 /* 00078 80B9D288 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0007C 80B9D28C 03E00008 */ jr $ra /* 00080 80B9D290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D294.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D294.s index 8e6ea0ceee..b10dc0c03b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D294.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D294.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80B9EE00 + .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" + .balign 4 + +glabel D_80B9EE40 + .asciz "../z_obj_switch.c" + .balign 4 + +.text glabel func_80B9D294 /* 00084 80B9D294 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00088 80B9D298 AFBF0024 */ sw $ra, 0x0024($sp) @@ -38,5 +48,3 @@ glabel func_80B9D294 /* 00100 80B9D310 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00104 80B9D314 03E00008 */ jr $ra /* 00108 80B9D318 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s index 3597118792..7ef13808d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s @@ -38,5 +38,3 @@ glabel func_80B9D31C /* 0019C 80B9D3AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001A0 80B9D3B0 03E00008 */ jr $ra /* 001A4 80B9D3B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s index 472fd71133..43d0131b1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s @@ -74,5 +74,3 @@ glabel func_80B9D3B8 /* 002BC 80B9D4CC 8FBE0040 */ lw $s8, 0x0040($sp) /* 002C0 80B9D4D0 03E00008 */ jr $ra /* 002C4 80B9D4D4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s index 3e634d096e..7ef153cbfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s @@ -29,5 +29,3 @@ glabel func_80B9D4D8 /* 00330 80B9D540 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00334 80B9D544 03E00008 */ jr $ra /* 00338 80B9D548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D54C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D54C.s index 38efa581fc..94daa5cbe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D54C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D54C.s @@ -49,5 +49,3 @@ glabel func_80B9D54C /* 003DC 80B9D5EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 003E0 80B9D5F0 03E00008 */ jr $ra /* 003E4 80B9D5F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D5F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D5F8.s index 207512d8c3..93ceb1c52a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D5F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D5F8.s @@ -37,5 +37,3 @@ glabel func_80B9D5F8 /* 00464 80B9D674 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00468 80B9D678 03E00008 */ jr $ra /* 0046C 80B9D67C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D680.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D680.s index 938541e321..06a6a7f793 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D680.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D680.s @@ -16,5 +16,3 @@ glabel func_80B9D680 /* 004A8 80B9D6B8 A08C017A */ sb $t4, 0x017A($a0) ## 0000017A /* 004AC 80B9D6BC 03E00008 */ jr $ra /* 004B0 80B9D6C0 A08F017B */ sb $t7, 0x017B($a0) ## 0000017B - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA48.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA48.s index dd1a2ca633..8b3ddac0d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA48.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA48.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B9EF68 + .word 0x3E28F5C3 + +.text glabel func_80B9DA48 /* 00838 80B9DA48 3C0180BA */ lui $at, %hi(D_80B9EF68) ## $at = 80BA0000 /* 0083C 80B9DA4C C424EF68 */ lwc1 $f4, %lo(D_80B9EF68)($at) @@ -6,5 +11,3 @@ glabel func_80B9DA48 /* 00848 80B9DA58 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 0084C 80B9DA5C 03E00008 */ jr $ra /* 00850 80B9DA60 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s index 645a266a93..c2a5966962 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s @@ -101,5 +101,3 @@ glabel func_80B9DA64 /* 009BC 80B9DBCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009C0 80B9DBD0 03E00008 */ jr $ra /* 009C4 80B9DBD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBD8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBD8.s index b2fd6fef03..78f4f85ffe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBD8.s @@ -5,5 +5,3 @@ glabel func_80B9DBD8 /* 009D4 80B9DBE4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 009D8 80B9DBE8 03E00008 */ jr $ra /* 009DC 80B9DBEC A48F016C */ sh $t7, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBF0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBF0.s index 739675c223..8ec0fe45be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DBF0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B9EF6C + .word 0x3D4AC083 +glabel D_80B9EF70 + .word 0x3C872B02 + +.text glabel func_80B9DBF0 /* 009E0 80B9DBF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 009E4 80B9DBF4 AFBF001C */ sw $ra, 0x001C($sp) @@ -51,5 +58,3 @@ glabel func_80B9DBF0 /* 00A94 80B9DCA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00A98 80B9DCA8 03E00008 */ jr $ra /* 00A9C 80B9DCAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCB0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCB0.s index fcd859c05d..8bcf904d36 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCB0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80B9EF74 + .word 0x3C872B02 + +.text glabel func_80B9DCB0 /* 00AA0 80B9DCB0 3C0180BA */ lui $at, %hi(D_80B9EF74) ## $at = 80BA0000 /* 00AA4 80B9DCB4 C424EF74 */ lwc1 $f4, %lo(D_80B9EF74)($at) @@ -8,5 +13,3 @@ glabel func_80B9DCB0 /* 00AB8 80B9DCC8 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 /* 00ABC 80B9DCCC 03E00008 */ jr $ra /* 00AC0 80B9DCD0 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s index d2714740d9..8d14f1c0e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s @@ -90,5 +90,3 @@ glabel func_80B9DCD4 /* 00C04 80B9DE14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C08 80B9DE18 03E00008 */ jr $ra /* 00C0C 80B9DE1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE20.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE20.s index 711e41ffa0..24b2e223df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE20.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE20.s @@ -5,5 +5,3 @@ glabel func_80B9DE20 /* 00C1C 80B9DE2C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00C20 80B9DE30 03E00008 */ jr $ra /* 00C24 80B9DE34 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE38.s index c8641a65fc..48cee32b93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE38.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DE38.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80B9EF78 + .word 0x3D4AC083 +glabel D_80B9EF7C + .word 0x3E28F5C3 + +.text glabel func_80B9DE38 /* 00C28 80B9DE38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00C2C 80B9DE3C AFBF001C */ sw $ra, 0x001C($sp) @@ -61,5 +68,3 @@ glabel func_80B9DE38 /* 00D00 80B9DF10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D04 80B9DF14 03E00008 */ jr $ra /* 00D08 80B9DF18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF1C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF1C.s index 984f6e7e35..a87901ac29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF1C.s @@ -30,5 +30,3 @@ glabel func_80B9DF1C .L80B9DF84: /* 00D74 80B9DF84 03E00008 */ jr $ra /* 00D78 80B9DF88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF8C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF8C.s index c702a317a6..223dc82f4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF8C.s @@ -3,5 +3,3 @@ glabel func_80B9DF8C /* 00D80 80B9DF90 25CEDF9C */ addiu $t6, $t6, %lo(func_80B9DF9C) ## $t6 = 80B9DF9C /* 00D84 80B9DF94 03E00008 */ jr $ra /* 00D88 80B9DF98 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF9C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF9C.s index 4a900a41b4..c2263d8459 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DF9C.s @@ -23,5 +23,3 @@ glabel func_80B9DF9C /* 00DD4 80B9DFE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DD8 80B9DFE8 03E00008 */ jr $ra /* 00DDC 80B9DFEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DFF0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DFF0.s index 44e8a06caf..a4a81c059d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DFF0.s @@ -4,5 +4,3 @@ glabel func_80B9DFF0 /* 00DE8 80B9DFF8 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00DEC 80B9DFFC 03E00008 */ jr $ra /* 00DF0 80B9E000 A4800170 */ sh $zero, 0x0170($a0) ## 00000170 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E004.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E004.s index d674da6f5c..c3c6655534 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E004.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E004.s @@ -27,5 +27,3 @@ glabel func_80B9E004 /* 00E50 80B9E060 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E54 80B9E064 03E00008 */ jr $ra /* 00E58 80B9E068 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E06C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E06C.s index 5c226a1c22..2c5d77f047 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E06C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E06C.s @@ -5,5 +5,3 @@ glabel func_80B9E06C /* 00E68 80B9E078 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00E6C 80B9E07C 03E00008 */ jr $ra /* 00E70 80B9E080 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E084.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E084.s index 8b10b2e060..6402382efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E084.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E084.s @@ -33,5 +33,3 @@ glabel func_80B9E084 /* 00EE4 80B9E0F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00EE8 80B9E0F8 03E00008 */ jr $ra /* 00EEC 80B9E0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E100.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E100.s index 9de8499ff7..326ce0b9b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E100.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E100.s @@ -5,5 +5,3 @@ glabel func_80B9E100 /* 00EFC 80B9E10C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00F00 80B9E110 03E00008 */ jr $ra /* 00F04 80B9E114 A48F0170 */ sh $t7, 0x0170($a0) ## 00000170 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E118.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E118.s index 2f7f0ade8f..18cd297fbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E118.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E118.s @@ -53,5 +53,3 @@ glabel func_80B9E118 /* 00FBC 80B9E1CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00FC0 80B9E1D0 03E00008 */ jr $ra /* 00FC4 80B9E1D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1D8.s index 733ca1d0d6..a59834223d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1D8.s @@ -5,5 +5,3 @@ glabel func_80B9E1D8 /* 00FD4 80B9E1E4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 00FD8 80B9E1E8 03E00008 */ jr $ra /* 00FDC 80B9E1EC A48F016C */ sh $t7, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1F0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1F0.s index b34896fcd9..c2c9ee726c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E1F0.s @@ -38,5 +38,3 @@ glabel func_80B9E1F0 /* 01064 80B9E274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01068 80B9E278 03E00008 */ jr $ra /* 0106C 80B9E27C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E280.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E280.s index 50b2334e01..19885a7bfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E280.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E280.s @@ -9,5 +9,3 @@ glabel func_80B9E280 /* 0108C 80B9E29C AC8E0174 */ sw $t6, 0x0174($a0) ## 00000174 /* 01090 80B9E2A0 03E00008 */ jr $ra /* 01094 80B9E2A4 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E2A8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E2A8.s index 0a220cf5db..5682b37e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E2A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E2A8.s @@ -85,5 +85,3 @@ glabel func_80B9E2A8 /* 011C0 80B9E3D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 011C4 80B9E3D4 03E00008 */ jr $ra /* 011C8 80B9E3D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3DC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3DC.s index 42aa21fc4f..9a6b43e3ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3DC.s @@ -5,5 +5,3 @@ glabel func_80B9E3DC /* 011D8 80B9E3E8 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 011DC 80B9E3EC 03E00008 */ jr $ra /* 011E0 80B9E3F0 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3F4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3F4.s index c733738b1b..cb73948aed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E3F4.s @@ -37,5 +37,3 @@ glabel func_80B9E3F4 /* 01260 80B9E470 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01264 80B9E474 03E00008 */ jr $ra /* 01268 80B9E478 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E47C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E47C.s index 87fc9fee4a..aec9b9a332 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E47C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E47C.s @@ -10,5 +10,3 @@ glabel func_80B9E47C /* 0128C 80B9E49C AC8E0174 */ sw $t6, 0x0174($a0) ## 00000174 /* 01290 80B9E4A0 03E00008 */ jr $ra /* 01294 80B9E4A4 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E4A8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E4A8.s index dd2242a65e..0ac5746e92 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E4A8.s @@ -52,5 +52,3 @@ glabel func_80B9E4A8 /* 01350 80B9E560 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01354 80B9E564 03E00008 */ jr $ra /* 01358 80B9E568 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E56C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E56C.s index 708b14c533..f62d7bd618 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E56C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E56C.s @@ -5,5 +5,3 @@ glabel func_80B9E56C /* 01368 80B9E578 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 0136C 80B9E57C 03E00008 */ jr $ra /* 01370 80B9E580 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E584.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E584.s index c83e13697b..727fad6193 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E584.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E584.s @@ -36,5 +36,3 @@ glabel func_80B9E584 /* 013F0 80B9E600 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 013F4 80B9E604 03E00008 */ jr $ra /* 013F8 80B9E608 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s index fad49d7a6e..a211a4200d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s @@ -16,5 +16,3 @@ glabel func_80B9E748 /* 0156C 80B9E77C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01570 80B9E780 03E00008 */ jr $ra /* 01574 80B9E784 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s index f2b867b73a..49273b6798 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s @@ -11,5 +11,3 @@ glabel func_80B9E788 /* 01598 80B9E7A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0159C 80B9E7AC 03E00008 */ jr $ra /* 015A0 80B9E7B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s index 419d7e616e..5f1802d391 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80B9EEB4 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EEC8 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EEDC + .asciz "../z_obj_switch.c" + .balign 4 + +.text glabel func_80B9E7B4 /* 015A4 80B9E7B4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 015A8 80B9E7B8 AFBF001C */ sw $ra, 0x001C($sp) @@ -83,5 +97,3 @@ glabel func_80B9E7B4 /* 016E8 80B9E8F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 016EC 80B9E8FC 03E00008 */ jr $ra /* 016F0 80B9E900 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s index b20dfdad32..a66723b614 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s @@ -1,3 +1,29 @@ +.rdata +glabel D_80B9EEF0 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EF04 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EF18 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EF2C + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EF40 + .asciz "../z_obj_switch.c" + .balign 4 + +glabel D_80B9EF54 + .asciz "../z_obj_switch.c" + .balign 4 + +.text glabel func_80B9E904 /* 016F4 80B9E904 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 016F8 80B9E908 AFBF003C */ sw $ra, 0x003C($sp) @@ -174,5 +200,3 @@ glabel func_80B9E904 /* 019A0 80B9EBB0 8FB10038 */ lw $s1, 0x0038($sp) /* 019A4 80B9EBB4 03E00008 */ jr $ra /* 019A8 80B9EBB8 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s index d424ca02e6..84bae763f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s @@ -23,5 +23,3 @@ glabel ObjSyokudai_Destroy /* 00208 80B9F4B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0020C 80B9F4BC 03E00008 */ jr $ra /* 00210 80B9F4C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s index 6d7276951a..f93da78e83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s @@ -1,3 +1,28 @@ +.rdata +glabel D_80B9FE90 + .asciz "../z_obj_syokudai.c" + .balign 4 + +glabel D_80B9FEA4 + .asciz "../z_obj_syokudai.c" + .balign 4 + +glabel D_80B9FEB8 + .asciz "../z_obj_syokudai.c" + .balign 4 + +glabel D_80B9FECC + .asciz "../z_obj_syokudai.c" + .balign 4 + +.late_rodata +glabel D_80B9FEE0 + .float 0.0027 + +glabel D_80B9FEE4 + .float 9.58738019108e-05 + +.text glabel ObjSyokudai_Draw /* 00834 80B9FAE4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00838 80B9FAE8 AFBF0044 */ sw $ra, 0x0044($sp) @@ -197,4 +222,3 @@ glabel ObjSyokudai_Draw /* 00B34 80B9FDE4 8FB20040 */ lw $s2, 0x0040($sp) /* 00B38 80B9FDE8 03E00008 */ jr $ra /* 00B3C 80B9FDEC 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s index dbd47e703b..7cd5b06bb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s @@ -124,5 +124,3 @@ glabel ObjSyokudai_Init /* 001B4 80B9F464 8FB10028 */ lw $s1, 0x0028($sp) /* 001B8 80B9F468 03E00008 */ jr $ra /* 001BC 80B9F46C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s index 8b56418871..c506861e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s @@ -436,5 +436,3 @@ glabel ObjSyokudai_Update /* 00828 80B9FAD8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0082C 80B9FADC 03E00008 */ jr $ra /* 00830 80B9FAE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Destroy.s index ea5aacadf6..fc40771d58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Destroy.s @@ -12,5 +12,3 @@ glabel ObjTimeblock_Destroy /* 00380 80BA0320 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00384 80BA0324 03E00008 */ jr $ra /* 00388 80BA0328 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s index 26bf82d921..f7af37262a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80BA0C00 + .asciz "../z_obj_timeblock.c" + .balign 4 + +glabel D_80BA0C18 + .asciz "../z_obj_timeblock.c" + .balign 4 + +glabel D_80BA0C30 + .asciz "../z_obj_timeblock.c" + .balign 4 + +.text glabel ObjTimeblock_Draw /* 009F8 80BA0998 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 009FC 80BA099C AFBF001C */ sw $ra, 0x001C($sp) @@ -78,4 +92,3 @@ glabel ObjTimeblock_Draw /* 00B24 80BA0AC4 00000000 */ nop /* 00B28 80BA0AC8 00000000 */ nop /* 00B2C 80BA0ACC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Init.s index 372714ec4a..671891eb25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BA0B50 + .asciz "時のブロック ( %04xH save:%d color:%d range:%d move:%d)\n" + .balign 4 + +.text glabel ObjTimeblock_Init /* 00174 80BA0114 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00178 80BA0118 AFBF0024 */ sw $ra, 0x0024($sp) @@ -138,5 +144,3 @@ glabel ObjTimeblock_Init /* 00350 80BA02F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00354 80BA02F4 03E00008 */ jr $ra /* 00358 80BA02F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Update.s index ecb825b889..8b12209d28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Update.s @@ -33,5 +33,3 @@ glabel ObjTimeblock_Update /* 009EC 80BA098C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 009F0 80BA0990 03E00008 */ jr $ra /* 009F4 80BA0994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s index 2c0ee35e91..e2d79f3f0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s @@ -52,5 +52,3 @@ glabel func_80B9FFA0 /* 000AC 80BA004C 006E1026 */ xor $v0, $v1, $t6 /* 000B0 80BA0050 03E00008 */ jr $ra /* 000B4 80BA0054 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0058.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0058.s index fb27ea3667..ccb3cdb66b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0058.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0058.s @@ -29,5 +29,3 @@ glabel func_80BA0058 /* 00120 80BA00C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00124 80BA00C4 03E00008 */ jr $ra /* 00128 80BA00C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA00CC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA00CC.s index 44697b14d2..d27bebc2d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA00CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA00CC.s @@ -22,5 +22,3 @@ glabel func_80BA00CC /* 00168 80BA0108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0016C 80BA010C 03E00008 */ jr $ra /* 00170 80BA0110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA032C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA032C.s index cf8f72c6dd..a72b0868a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA032C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA032C.s @@ -59,5 +59,3 @@ glabel func_80BA032C /* 00460 80BA0400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00464 80BA0404 03E00008 */ jr $ra /* 00468 80BA0408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA040C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA040C.s index 59a21c5fb5..6322f837da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA040C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA040C.s @@ -30,5 +30,3 @@ glabel func_80BA040C /* 004D4 80BA0474 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 004D8 80BA0478 03E00008 */ jr $ra /* 004DC 80BA047C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0480.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0480.s index b9390f0662..9a0c2845c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0480.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0480.s @@ -32,5 +32,3 @@ glabel func_80BA0480 .L80BA04F0: /* 00550 80BA04F0 03E00008 */ jr $ra /* 00554 80BA04F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA04F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA04F8.s index 7218caccb9..2ca872f2a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA04F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA04F8.s @@ -3,5 +3,3 @@ glabel func_80BA04F8 /* 0055C 80BA04FC 25CE0508 */ addiu $t6, $t6, %lo(func_80BA0508) ## $t6 = 80BA0508 /* 00560 80BA0500 03E00008 */ jr $ra /* 00564 80BA0504 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0508.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0508.s index e3aac421eb..d6d914962c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0508.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0508.s @@ -2,5 +2,3 @@ glabel func_80BA0508 /* 00568 80BA0508 AFA40000 */ sw $a0, 0x0000($sp) /* 0056C 80BA050C 03E00008 */ jr $ra /* 00570 80BA0510 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0514.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0514.s index a0c8368ac1..eb014c8fdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0514.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0514.s @@ -3,5 +3,3 @@ glabel func_80BA0514 /* 00578 80BA0518 25CE0524 */ addiu $t6, $t6, %lo(func_80BA0524) ## $t6 = 80BA0524 /* 0057C 80BA051C 03E00008 */ jr $ra /* 00580 80BA0520 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0524.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0524.s index 15e9c9b7f5..df152d6a87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0524.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0524.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BA0B98 + .asciz "◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n" + .balign 4 + +.text glabel func_80BA0524 /* 00584 80BA0524 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00588 80BA0528 AFB00018 */ sw $s0, 0x0018($sp) @@ -108,5 +114,3 @@ glabel func_80BA0524 /* 00700 80BA06A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00704 80BA06A4 03E00008 */ jr $ra /* 00708 80BA06A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA06AC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA06AC.s index c58e68abda..ca0ebce906 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA06AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA06AC.s @@ -48,5 +48,3 @@ glabel func_80BA06AC /* 007AC 80BA074C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 007B0 80BA0750 03E00008 */ jr $ra /* 007B4 80BA0754 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0758.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0758.s index 36974a4942..72155e6b4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0758.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0758.s @@ -3,5 +3,3 @@ glabel func_80BA0758 /* 007BC 80BA075C 25CE0768 */ addiu $t6, $t6, %lo(func_80BA0768) ## $t6 = 80BA0768 /* 007C0 80BA0760 03E00008 */ jr $ra /* 007C4 80BA0764 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0768.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0768.s index 6e54307fdc..bccec4adef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0768.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA0768.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BA0BCC + .asciz "◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n" + .balign 4 + +.text glabel func_80BA0768 /* 007C8 80BA0768 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 007CC 80BA076C AFB00014 */ sw $s0, 0x0014($sp) @@ -57,5 +63,3 @@ glabel func_80BA0768 /* 00890 80BA0830 8FB10018 */ lw $s1, 0x0018($sp) /* 00894 80BA0834 03E00008 */ jr $ra /* 00898 80BA0838 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA083C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA083C.s index 83c29db779..2dfb02d2c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA083C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA083C.s @@ -3,5 +3,3 @@ glabel func_80BA083C /* 008A0 80BA0840 25CE084C */ addiu $t6, $t6, %lo(func_80BA084C) ## $t6 = 80BA084C /* 008A4 80BA0844 03E00008 */ jr $ra /* 008A8 80BA0848 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA084C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA084C.s index f6dd2fded8..607e233f10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA084C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80BA084C.s @@ -57,5 +57,3 @@ glabel func_80BA084C /* 00970 80BA0910 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00974 80BA0914 03E00008 */ jr $ra /* 00978 80BA0918 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s index f69e3e8e44..dd29778fcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s @@ -10,5 +10,3 @@ glabel ObjTsubo_Destroy /* 002A0 80BA1000 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002A4 80BA1004 03E00008 */ jr $ra /* 002A8 80BA1008 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Init.s index 6ccfbac03f..d5c3835a55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Init.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80BA1BF0 + .asciz "Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n" + .balign 4 + +glabel D_80BA1C20 + .asciz "../z_obj_tsubo.c" + .balign 4 + +glabel D_80BA1C34 + .asciz "(dungeon keep 壷)(arg_data 0x%04x)\n" + .balign 4 + +.text glabel ObjTsubo_Init /* 00190 80BA0EF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00194 80BA0EF4 AFA50024 */ sw $a1, 0x0024($sp) @@ -69,5 +83,3 @@ glabel ObjTsubo_Init /* 00278 80BA0FD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0027C 80BA0FDC 03E00008 */ jr $ra /* 00280 80BA0FE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Update.s index 30ca3bed3e..2ccb33a8a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Update.s @@ -8,5 +8,3 @@ glabel ObjTsubo_Update /* 00DA0 80BA1B00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DA4 80BA1B04 03E00008 */ jr $ra /* 00DA8 80BA1B08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0D60.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0D60.s index 9e1e5d8d6d..28145e7e61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0D60.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0D60.s @@ -25,5 +25,3 @@ glabel func_80BA0D60 /* 00054 80BA0DB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00058 80BA0DB8 03E00008 */ jr $ra /* 0005C 80BA0DBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DC0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DC0.s index d7a4f7b277..48ab219930 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DC0.s @@ -13,5 +13,3 @@ glabel func_80BA0DC0 .L80BA0DEC: /* 0008C 80BA0DEC 03E00008 */ jr $ra /* 00090 80BA0DF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DF4.s index c8e7921594..70acc2b934 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0DF4.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BA1BE0 + .asciz "地面に付着失敗\n" + .balign 4 + +.text glabel func_80BA0DF4 /* 00094 80BA0DF4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00098 80BA0DF8 AFBF001C */ sw $ra, 0x001C($sp) @@ -44,5 +50,3 @@ glabel func_80BA0DF4 /* 0012C 80BA0E8C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00130 80BA0E90 03E00008 */ jr $ra /* 00134 80BA0E94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s index c1d5429c58..5052d68f68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s @@ -24,5 +24,3 @@ glabel func_80BA0E98 /* 00184 80BA0EE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00188 80BA0EE8 03E00008 */ jr $ra /* 0018C 80BA0EEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s index 5ca414de9c..0cb4949f2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80BA1C58 + .word 0x3E6B851F +glabel D_80BA1C5C + .float 0.2 + +glabel D_80BA1C60 + .float 0.6 + +.text glabel func_80BA100C /* 002AC 80BA100C 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 002B0 80BA1010 F7BE0070 */ sdc1 $f30, 0x0070($sp) @@ -172,5 +182,3 @@ glabel func_80BA100C /* 00528 80BA1288 8FBE0098 */ lw $s8, 0x0098($sp) /* 0052C 80BA128C 03E00008 */ jr $ra /* 00530 80BA1290 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s index b636cc9572..597efb2007 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80BA1C64 + .float 0.2 + +glabel D_80BA1C68 + .float 0.2 + +.text glabel func_80BA1294 /* 00534 80BA1294 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 00538 80BA1298 AFB40088 */ sw $s4, 0x0088($sp) @@ -175,5 +183,3 @@ glabel func_80BA1294 /* 007C0 80BA1520 8FBE0098 */ lw $s8, 0x0098($sp) /* 007C4 80BA1524 03E00008 */ jr $ra /* 007C8 80BA1528 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA152C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA152C.s index 96ec60b468..4d92160809 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA152C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA152C.s @@ -3,5 +3,3 @@ glabel func_80BA152C /* 007D0 80BA1530 25CE153C */ addiu $t6, $t6, %lo(func_80BA153C) ## $t6 = 80BA153C /* 007D4 80BA1534 03E00008 */ jr $ra /* 007D8 80BA1538 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA153C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA153C.s index 143a7b54be..758031d10b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA153C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA153C.s @@ -29,5 +29,3 @@ glabel func_80BA153C /* 00840 80BA15A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00844 80BA15A4 03E00008 */ jr $ra /* 00848 80BA15A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15AC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15AC.s index 9ef89b3629..c68f1e19d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15AC.s @@ -3,5 +3,3 @@ glabel func_80BA15AC /* 00850 80BA15B0 25CE15BC */ addiu $t6, $t6, %lo(func_80BA15BC) ## $t6 = 80BA15BC /* 00854 80BA15B4 03E00008 */ jr $ra /* 00858 80BA15B8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s index dc3c933bcd..ce441a642c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s @@ -143,5 +143,3 @@ glabel func_80BA15BC /* 00A58 80BA17B8 8FB10020 */ lw $s1, 0x0020($sp) /* 00A5C 80BA17BC 03E00008 */ jr $ra /* 00A60 80BA17C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA17C4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA17C4.s index b69a8b0a57..4974b31460 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA17C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA17C4.s @@ -17,5 +17,3 @@ glabel func_80BA17C4 /* 00AA0 80BA1800 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AA4 80BA1804 03E00008 */ jr $ra /* 00AA8 80BA1808 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s index 1238523d3e..23ccd196c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s @@ -32,5 +32,3 @@ glabel func_80BA180C /* 00B20 80BA1880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00B24 80BA1884 03E00008 */ jr $ra /* 00B28 80BA1888 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s index beccbf021d..72432848fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80BA1C6C + .float 0.7 + +.text glabel func_80BA188C /* 00B2C 80BA188C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00B30 80BA1890 AFB00018 */ sw $s0, 0x0018($sp) @@ -54,5 +59,3 @@ glabel func_80BA188C /* 00BEC 80BA194C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00BF0 80BA1950 03E00008 */ jr $ra /* 00BF4 80BA1954 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s index a5cc43a98c..62e729b00b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s @@ -112,5 +112,3 @@ glabel func_80BA1958 /* 00D7C 80BA1ADC 8FB10020 */ lw $s1, 0x0020($sp) /* 00D80 80BA1AE0 03E00008 */ jr $ra /* 00D84 80BA1AE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s index b7a4c0825e..bbaa42bf41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s @@ -17,4 +17,3 @@ glabel func_80BA1B0C /* 00DE4 80BA1B44 03E00008 */ jr $ra /* 00DE8 80BA1B48 00000000 */ nop /* 00DEC 80BA1B4C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Destroy.s index bf070c1992..60349dd1d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Destroy.s @@ -17,5 +17,3 @@ glabel ObjWarp2block_Destroy /* 006CC 80BA24BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006D0 80BA24C0 03E00008 */ jr $ra /* 006D4 80BA24C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s index ee48b2a9d0..5779ab9b3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80BA294C + .asciz "../z_obj_warp2block.c" + .balign 4 + +glabel D_80BA2964 + .asciz "../z_obj_warp2block.c" + .balign 4 + +glabel D_80BA297C + .asciz "../z_obj_warp2block.c" + .balign 4 + +.text glabel ObjWarp2block_Draw /* 00904 80BA26F4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00908 80BA26F8 AFBF001C */ sw $ra, 0x001C($sp) @@ -74,4 +88,3 @@ glabel ObjWarp2block_Draw /* 00A24 80BA2814 03E00008 */ jr $ra /* 00A28 80BA2818 00000000 */ nop /* 00A2C 80BA281C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s index 2791892e6b..f3028a39fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BA28A0 + .asciz "時のブロック(ワープ２) ( %04xH color:%d range:%d)\n" + .balign 4 + +.text glabel ObjWarp2block_Init /* 00558 80BA2348 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0055C 80BA234C AFBF001C */ sw $ra, 0x001C($sp) @@ -90,5 +96,3 @@ glabel ObjWarp2block_Init /* 0068C 80BA247C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00690 80BA2480 03E00008 */ jr $ra /* 00694 80BA2484 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Update.s index c1d22007a4..6c6875d0e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Update.s @@ -15,5 +15,3 @@ glabel ObjWarp2block_Update /* 008F8 80BA26E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008FC 80BA26EC 03E00008 */ jr $ra /* 00900 80BA26F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1DF0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1DF0.s index ebef6acbab..ec99f78ef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1DF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1DF0.s @@ -56,5 +56,3 @@ glabel func_80BA1DF0 /* 000D0 80BA1EC0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 000D4 80BA1EC4 03E00008 */ jr $ra /* 000D8 80BA1EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1ECC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1ECC.s index 463ac4946d..9f94def0e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1ECC.s @@ -99,5 +99,3 @@ glabel func_80BA1ECC /* 0024C 80BA203C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00250 80BA2040 03E00008 */ jr $ra /* 00254 80BA2044 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2048.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2048.s index 99dc6bc79c..f4bd27a3c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2048.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2048.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80BA2994 + .float 0.01 + +.text glabel func_80BA2048 /* 00258 80BA2048 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0025C 80BA204C AFB00014 */ sw $s0, 0x0014($sp) @@ -128,5 +133,3 @@ glabel func_80BA2048 /* 0041C 80BA220C 8FB10018 */ lw $s1, 0x0018($sp) /* 00420 80BA2210 03E00008 */ jr $ra /* 00424 80BA2214 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2218.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2218.s index 603b6f6288..3040c1d2c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2218.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2218.s @@ -30,5 +30,3 @@ glabel func_80BA2218 /* 00490 80BA2280 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00494 80BA2284 03E00008 */ jr $ra /* 00498 80BA2288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA228C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA228C.s index 3fb4f319e8..ac20eb9376 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA228C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA228C.s @@ -32,5 +32,3 @@ glabel func_80BA228C .L80BA22FC: /* 0050C 80BA22FC 03E00008 */ jr $ra /* 00510 80BA2300 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2304.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2304.s index 7384d86b6e..97832af288 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2304.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2304.s @@ -16,5 +16,3 @@ glabel func_80BA2304 /* 0054C 80BA233C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00550 80BA2340 03E00008 */ jr $ra /* 00554 80BA2344 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24C8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24C8.s index 840ad20fd1..574e81abb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24C8.s @@ -4,5 +4,3 @@ glabel func_80BA24C8 /* 006E0 80BA24D0 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 /* 006E4 80BA24D4 03E00008 */ jr $ra /* 006E8 80BA24D8 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24DC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24DC.s index 940fa54aae..b2d2cb1617 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24DC.s @@ -2,5 +2,3 @@ glabel func_80BA24DC /* 006EC 80BA24DC AFA40000 */ sw $a0, 0x0000($sp) /* 006F0 80BA24E0 03E00008 */ jr $ra /* 006F4 80BA24E4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24E8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24E8.s index 51e4389576..ad1593fabe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24E8.s @@ -3,5 +3,3 @@ glabel func_80BA24E8 /* 006FC 80BA24EC 25CE24F8 */ addiu $t6, $t6, %lo(func_80BA24F8) ## $t6 = 80BA24F8 /* 00700 80BA24F0 03E00008 */ jr $ra /* 00704 80BA24F4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24F8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24F8.s index 70c3f0201e..215f03f532 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA24F8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80BA28E0 + .asciz "\x1B[41;37m" + .balign 4 + +glabel D_80BA28EC + .asciz "Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n" + .balign 4 + +glabel D_80BA2930 + .asciz "../z_obj_warp2block.c" + .balign 4 + +glabel D_80BA2948 + .asciz "\x1B[m" + .balign 4 + +.text glabel func_80BA24F8 /* 00708 80BA24F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0070C 80BA24FC AFBF001C */ sw $ra, 0x001C($sp) @@ -75,5 +93,3 @@ glabel func_80BA24F8 /* 00804 80BA25F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00808 80BA25F8 03E00008 */ jr $ra /* 0080C 80BA25FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2600.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2600.s index d0bc8e367b..2d301df2b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2600.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2600.s @@ -3,5 +3,3 @@ glabel func_80BA2600 /* 00814 80BA2604 25CE2610 */ addiu $t6, $t6, %lo(func_80BA2610) ## $t6 = 80BA2610 /* 00818 80BA2608 03E00008 */ jr $ra /* 0081C 80BA260C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2610.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2610.s index 4e8fae3b6a..94b74a6f73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2610.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA2610.s @@ -45,5 +45,3 @@ glabel func_80BA2610 /* 008BC 80BA26AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 008C0 80BA26B0 03E00008 */ jr $ra /* 008C4 80BA26B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Destroy.s index 118d37dc20..9d94e20bc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Destroy.s @@ -8,5 +8,3 @@ glabel ObjectKankyo_Destroy /* 0031C 80BA2DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00320 80BA2DC0 03E00008 */ jr $ra /* 00324 80BA2DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Draw.s index 414e15cf40..772898707d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Draw.s @@ -40,5 +40,3 @@ glabel L80BA3C84 /* 011E8 80BA3C88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 011EC 80BA3C8C 03E00008 */ jr $ra /* 011F0 80BA3C90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s index 9a208ef71c..6df2fc37bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s @@ -33,7 +33,7 @@ glabel L80BA2B10 /* 0007C 80BA2B1C 3C0580BA */ lui $a1, %hi(func_80BA2DD4) ## $a1 = 80BA0000 /* 00080 80BA2B20 15000007 */ bne $t0, $zero, .L80BA2B40 /* 00084 80BA2B24 00000000 */ nop -/* 00088 80BA2B28 0C2E8AA8 */ jal func_80BA2AA0 +/* 00088 80BA2B28 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 0008C 80BA2B2C 24A52DD4 */ addiu $a1, $a1, %lo(func_80BA2DD4) ## $a1 = 80BA2DD4 /* 00090 80BA2B30 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00094 80BA2B34 3C0180BA */ lui $at, %hi(D_80BA5940) ## $at = 80BA0000 @@ -52,7 +52,7 @@ glabel L80BA2B50 /* 000BC 80BA2B5C 3C0580BA */ lui $a1, %hi(func_80BA2DC8) ## $a1 = 80BA0000 /* 000C0 80BA2B60 15400007 */ bne $t2, $zero, .L80BA2B80 /* 000C4 80BA2B64 00000000 */ nop -/* 000C8 80BA2B68 0C2E8AA8 */ jal func_80BA2AA0 +/* 000C8 80BA2B68 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 000CC 80BA2B6C 24A52DC8 */ addiu $a1, $a1, %lo(func_80BA2DC8) ## $a1 = 80BA2DC8 /* 000D0 80BA2B70 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 000D4 80BA2B74 3C0180BA */ lui $at, %hi(D_80BA5940) ## $at = 80BA0000 @@ -67,7 +67,7 @@ glabel L80BA2B50 glabel L80BA2B90 /* 000F0 80BA2B90 3C0580BA */ lui $a1, %hi(func_80BA4914) ## $a1 = 80BA0000 /* 000F4 80BA2B94 24A54914 */ addiu $a1, $a1, %lo(func_80BA4914) ## $a1 = 80BA4914 -/* 000F8 80BA2B98 0C2E8AA8 */ jal func_80BA2AA0 +/* 000F8 80BA2B98 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 000FC 80BA2B9C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00100 80BA2BA0 1000007E */ beq $zero, $zero, .L80BA2D9C /* 00104 80BA2BA4 8FBF0014 */ lw $ra, 0x0014($sp) @@ -84,7 +84,7 @@ glabel L80BA2BA8 /* 00128 80BA2BC8 8FA40018 */ lw $a0, 0x0018($sp) /* 0012C 80BA2BCC 3C0580BA */ lui $a1, %hi(func_80BA4BFC) ## $a1 = 80BA0000 /* 00130 80BA2BD0 24A54BFC */ addiu $a1, $a1, %lo(func_80BA4BFC) ## $a1 = 80BA4BFC -/* 00134 80BA2BD4 0C2E8AA8 */ jal func_80BA2AA0 +/* 00134 80BA2BD4 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 00138 80BA2BD8 A0801659 */ sb $zero, 0x1659($a0) ## 00001659 /* 0013C 80BA2BDC 1000006F */ beq $zero, $zero, .L80BA2D9C /* 00140 80BA2BE0 8FBF0014 */ lw $ra, 0x0014($sp) @@ -215,7 +215,7 @@ glabel L80BA2BE4 /* 002E8 80BA2D88 00000000 */ nop /* 002EC 80BA2D8C E4C00334 */ swc1 $f0, 0x0334($a2) ## 00000334 .L80BA2D90: -/* 002F0 80BA2D90 0C2E8AA8 */ jal func_80BA2AA0 +/* 002F0 80BA2D90 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 002F4 80BA2D94 A0C01659 */ sb $zero, 0x1659($a2) ## 00001659 glabel L80BA2D98 .L80BA2D98: @@ -224,5 +224,3 @@ glabel L80BA2D98 /* 002FC 80BA2D9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00300 80BA2DA0 03E00008 */ jr $ra /* 00304 80BA2DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2AA0.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_SetupAction.s similarity index 81% rename from asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2AA0.s rename to asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_SetupAction.s index 55fb618139..7a133be15e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_SetupAction.s @@ -1,5 +1,3 @@ -glabel func_80BA2AA0 +glabel ObjectKankyo_SetupAction /* 00000 80BA2AA0 03E00008 */ jr $ra /* 00004 80BA2AA4 AC85165C */ sw $a1, 0x165C($a0) ## 0000165C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Update.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Update.s index 225def0bb8..c893162b6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Update.s @@ -8,5 +8,3 @@ glabel ObjectKankyo_Update /* 01164 80BA3C04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01168 80BA3C08 03E00008 */ jr $ra /* 0116C 80BA3C0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DC8.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DC8.s index a0dd17c3b8..f6e0cfede9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DC8.s @@ -2,5 +2,3 @@ glabel func_80BA2DC8 /* 00328 80BA2DC8 AFA40000 */ sw $a0, 0x0000($sp) /* 0032C 80BA2DCC 03E00008 */ jr $ra /* 00330 80BA2DD0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s index 5587a6c13a..9a3d1f99ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s @@ -994,5 +994,3 @@ glabel func_80BA2DD4 /* 01140 80BA3BE0 8FB60068 */ lw $s6, 0x0068($sp) /* 01144 80BA3BE4 03E00008 */ jr $ra /* 01148 80BA3BE8 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s index dc81bb5056..2cbc4dc6bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s @@ -316,5 +316,3 @@ glabel func_80BA3C94 /* 016A0 80BA4140 8FB70038 */ lw $s7, 0x0038($sp) /* 016A4 80BA4144 03E00008 */ jr $ra /* 016A8 80BA4148 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s index 2b5454c8ca..6517d38bca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s @@ -523,5 +523,3 @@ glabel func_80BA414C /* 01E68 80BA4908 8FB50058 */ lw $s5, 0x0058($sp) /* 01E6C 80BA490C 03E00008 */ jr $ra /* 01E70 80BA4910 27BD0118 */ addiu $sp, $sp, 0x0118 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4914.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4914.s index 68e6f5c69a..1330536e57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4914.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4914.s @@ -47,5 +47,3 @@ glabel func_80BA4914 .L80BA49B4: /* 01F14 80BA49B4 03E00008 */ jr $ra /* 01F18 80BA49B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s index 4141b3a583..1e4b42b855 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s @@ -144,5 +144,3 @@ glabel func_80BA49BC /* 02150 80BA4BF0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 02154 80BA4BF4 03E00008 */ jr $ra /* 02158 80BA4BF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4BFC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4BFC.s index 81f0c76450..16bdf27fe9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4BFC.s @@ -24,11 +24,9 @@ glabel func_80BA4BFC .L80BA4C48: /* 021A8 80BA4C48 3C0580BA */ lui $a1, %hi(func_80BA4C68) ## $a1 = 80BA0000 /* 021AC 80BA4C4C 24A54C68 */ addiu $a1, $a1, %lo(func_80BA4C68) ## $a1 = 80BA4C68 -/* 021B0 80BA4C50 0C2E8AA8 */ jal func_80BA2AA0 +/* 021B0 80BA4C50 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 021B4 80BA4C54 8FA40018 */ lw $a0, 0x0018($sp) /* 021B8 80BA4C58 8FBF0014 */ lw $ra, 0x0014($sp) /* 021BC 80BA4C5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 021C0 80BA4C60 03E00008 */ jr $ra /* 021C4 80BA4C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4C68.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4C68.s index 3724f7e70e..b45ed88bfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4C68.s @@ -21,12 +21,10 @@ glabel func_80BA4C68 /* 02210 80BA4CB0 24A54CD4 */ addiu $a1, $a1, %lo(func_80BA4CD4) ## $a1 = 80BA4CD4 /* 02214 80BA4CB4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 02218 80BA4CB8 A0CF001E */ sb $t7, 0x001E($a2) ## 0000001E -/* 0221C 80BA4CBC 0C2E8AA8 */ jal func_80BA2AA0 +/* 0221C 80BA4CBC 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 02220 80BA4CC0 E4C40190 */ swc1 $f4, 0x0190($a2) ## 00000190 .L80BA4CC4: /* 02224 80BA4CC4 8FBF0014 */ lw $ra, 0x0014($sp) /* 02228 80BA4CC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0222C 80BA4CCC 03E00008 */ jr $ra /* 02230 80BA4CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s index 054b383cc6..a200e058cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s @@ -46,5 +46,3 @@ glabel func_80BA4CD4 /* 022D0 80BA4D70 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 022D4 80BA4D74 03E00008 */ jr $ra /* 022D8 80BA4D78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s index 551d4c8df6..ee11ad651c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s @@ -367,5 +367,3 @@ glabel func_80BA4D7C /* 02858 80BA52F8 8FB10018 */ lw $s1, 0x0018($sp) /* 0285C 80BA52FC 03E00008 */ jr $ra /* 02860 80BA5300 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5304.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5304.s index c2bf8b5c44..d911cb9c72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5304.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5304.s @@ -24,11 +24,9 @@ glabel func_80BA5304 .L80BA5350: /* 028B0 80BA5350 3C0580BA */ lui $a1, %hi(func_80BA5370) ## $a1 = 80BA0000 /* 028B4 80BA5354 24A55370 */ addiu $a1, $a1, %lo(func_80BA5370) ## $a1 = 80BA5370 -/* 028B8 80BA5358 0C2E8AA8 */ jal func_80BA2AA0 +/* 028B8 80BA5358 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 028BC 80BA535C 8FA40018 */ lw $a0, 0x0018($sp) /* 028C0 80BA5360 8FBF0014 */ lw $ra, 0x0014($sp) /* 028C4 80BA5364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 028C8 80BA5368 03E00008 */ jr $ra /* 028CC 80BA536C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5370.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5370.s index adddbc3d82..19e79f420a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5370.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA5370.s @@ -17,12 +17,10 @@ glabel func_80BA5370 /* 02908 80BA53A8 A0CE1659 */ sb $t6, 0x1659($a2) ## 00001659 /* 0290C 80BA53AC 24A553CC */ addiu $a1, $a1, %lo(func_80BA53CC) ## $a1 = 80BA53CC /* 02910 80BA53B0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02914 80BA53B4 0C2E8AA8 */ jal func_80BA2AA0 +/* 02914 80BA53B4 0C2E8AA8 */ jal ObjectKankyo_SetupAction /* 02918 80BA53B8 A0CF001E */ sb $t7, 0x001E($a2) ## 0000001E .L80BA53BC: /* 0291C 80BA53BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02920 80BA53C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02924 80BA53C4 03E00008 */ jr $ra /* 02928 80BA53C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s index 2856edbc7c..f1c850709a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s @@ -60,5 +60,3 @@ glabel func_80BA53CC /* 02A00 80BA54A0 8FB50030 */ lw $s5, 0x0030($sp) /* 02A04 80BA54A4 03E00008 */ jr $ra /* 02A08 80BA54A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s index 0d019775ce..4309519fe6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s @@ -271,4 +271,3 @@ glabel func_80BA54AC /* 02E34 80BA58D4 27BD0138 */ addiu $sp, $sp, 0x0138 ## $sp = 00000000 /* 02E38 80BA58D8 00000000 */ nop /* 02E3C 80BA58DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s index 2707ae5bad..2b2136a86a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s @@ -38,5 +38,3 @@ glabel OceffSpot_Destroy /* 001E4 80BA6254 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 001E8 80BA6258 03E00008 */ jr $ra /* 001EC 80BA625C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s index 37abfd8e0f..411cf96b37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80BA6F94 + .asciz "../z_oceff_spot.c" + .balign 4 + +glabel D_80BA6FA8 + .asciz "../z_oceff_spot.c" + .balign 4 + +glabel D_80BA6FBC + .asciz "../z_oceff_spot.c" + .balign 4 + +.text glabel OceffSpot_Draw /* 00674 80BA66E4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 00678 80BA66E8 AFBF003C */ sw $ra, 0x003C($sp) @@ -86,4 +100,3 @@ glabel OceffSpot_Draw /* 007C4 80BA6834 03E00008 */ jr $ra /* 007C8 80BA6838 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 007CC 80BA683C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s index 0181c2c523..7caf66be01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80BA6FD0 + .word 0x4019999A +glabel D_80BA6FD4 + .float 0.3 + +.text glabel OceffSpot_Init /* 00008 80BA6078 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0000C 80BA607C AFA50044 */ sw $a1, 0x0044($sp) @@ -92,5 +99,3 @@ glabel OceffSpot_Init /* 00154 80BA61C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00158 80BA61C8 03E00008 */ jr $ra /* 0015C 80BA61CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Update.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Update.s index 9425dde8f6..566bab87f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Update.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80BA6FE0 + .float 3.14159274101 + +glabel D_80BA6FE4 + .word 0x3ED70A3D +glabel D_80BA6FE8 + .float 0.9 + +.text glabel OceffSpot_Update /* 003A0 80BA6410 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 003A4 80BA6414 AFBF002C */ sw $ra, 0x002C($sp) @@ -185,5 +195,3 @@ glabel OceffSpot_Update /* 00668 80BA66D8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0066C 80BA66DC 03E00008 */ jr $ra /* 00670 80BA66E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6070.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6070.s index 794a5a3373..3112f015ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6070.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6070.s @@ -1,5 +1,3 @@ glabel func_80BA6070 /* 00000 80BA6070 03E00008 */ jr $ra /* 00004 80BA6074 AC85017C */ sw $a1, 0x017C($a0) ## 0000017C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s index c58fe26e73..b89449dc70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s @@ -1,3 +1,33 @@ +.rdata +glabel D_80BA6F40 + .asciz "" + .balign 4 + +glabel D_80BA6F48 + .asciz "z_oceff_spot 太陽の歌フラグ\n" + .balign 4 + +glabel D_80BA6F68 + .asciz "\x1b[m" + .balign 4 + +glabel D_80BA6F6C + .asciz "" + .balign 4 + +glabel D_80BA6F74 + .asciz "z_oceff_spot オカリナ終了\n" + .balign 4 + +glabel D_80BA6F90 + .asciz "\x1b[m" + .balign 4 + +.late_rodata +glabel D_80BA6FD8 + .float 0.05 + +.text glabel func_80BA6260 /* 001F0 80BA6260 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001F4 80BA6264 AFBF0014 */ sw $ra, 0x0014($sp) @@ -80,5 +110,3 @@ glabel func_80BA6260 /* 002F4 80BA6364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002F8 80BA6368 03E00008 */ jr $ra /* 002FC 80BA636C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6370.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6370.s index 5bac12c37e..7d068e4dba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6370.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6370.s @@ -16,5 +16,3 @@ glabel func_80BA6370 /* 00330 80BA63A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00334 80BA63A4 03E00008 */ jr $ra /* 00338 80BA63A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA63AC.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA63AC.s index 3c68defc7d..832c306753 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA63AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA63AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80BA6FDC + .float 0.05 + +.text glabel func_80BA63AC /* 0033C 80BA63AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00340 80BA63B0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -26,5 +31,3 @@ glabel func_80BA63AC /* 00394 80BA6404 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00398 80BA6408 03E00008 */ jr $ra /* 0039C 80BA640C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s index 1632d08165..2ae131308f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s @@ -19,5 +19,3 @@ glabel OceffStorm_Destroy /* 00114 80BA71F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00118 80BA71F8 03E00008 */ jr $ra /* 0011C 80BA71FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s index f817a833e8..8cdabe785f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80BA8C48 + .asciz "../z_oceff_storm.c" + .balign 4 + +glabel D_80BA8C5C + .asciz "../z_oceff_storm.c" + .balign 4 + +glabel D_80BA8C70 + .asciz "../z_oceff_storm.c" + .balign 4 + +.text glabel OceffStorm_Draw /* 00554 80BA7634 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00558 80BA7638 AFBF003C */ sw $ra, 0x003C($sp) @@ -142,4 +156,3 @@ glabel OceffStorm_Draw /* 00784 80BA7864 00000000 */ nop /* 00788 80BA7868 00000000 */ nop /* 0078C 80BA786C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Init.s index 16654f8826..84ae55e3f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Init.s @@ -53,5 +53,3 @@ glabel OceffStorm_Init /* 000C8 80BA71A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 000CC 80BA71AC 03E00008 */ jr $ra /* 000D0 80BA71B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Update.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Update.s index ad384c68b6..57ef85ada1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Update.s @@ -26,5 +26,3 @@ glabel OceffStorm_Update /* 00364 80BA7444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00368 80BA7448 03E00008 */ jr $ra /* 0036C 80BA744C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA70E0.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA70E0.s index b2e9087abc..e119e59c6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA70E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA70E0.s @@ -1,5 +1,3 @@ glabel func_80BA70E0 /* 00000 80BA70E0 03E00008 */ jr $ra /* 00004 80BA70E4 AC850154 */ sw $a1, 0x0154($a0) ## 00000154 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7200.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7200.s index f4c6d97134..54aec2c727 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7200.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7200.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80BA8C84 + .float 0.4 + +glabel D_80BA8C88 + .float 0.3 + +glabel D_80BA8C8C + .float 0.4 + +glabel D_80BA8C90 + .float 0.01 + +.text glabel func_80BA7200 /* 00120 80BA7200 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00124 80BA7204 AFBF0014 */ sw $ra, 0x0014($sp) @@ -126,5 +140,3 @@ glabel func_80BA7200 /* 002D8 80BA73B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 002DC 80BA73BC 03E00008 */ jr $ra /* 002E0 80BA73C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA73C4.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA73C4.s index 691a3bb501..3ebd4c90ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA73C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA73C4.s @@ -8,5 +8,3 @@ glabel func_80BA73C4 .L80BA73DC: /* 002FC 80BA73DC 03E00008 */ jr $ra /* 00300 80BA73E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s index 352306971a..d36c4c5ede 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80BA8C20 + .asciz "../z_oceff_storm.c" + .balign 4 + +glabel D_80BA8C34 + .asciz "../z_oceff_storm.c" + .balign 4 + +.text glabel func_80BA7450 /* 00370 80BA7450 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00374 80BA7454 AFBF0034 */ sw $ra, 0x0034($sp) @@ -120,5 +130,3 @@ glabel func_80BA7450 /* 00548 80BA7628 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0054C 80BA762C 03E00008 */ jr $ra /* 00550 80BA7630 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s index a83c1099a3..f7c9859369 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s @@ -19,5 +19,3 @@ glabel OceffWipe_Destroy /* 000B0 80BA8E40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000B4 80BA8E44 03E00008 */ jr $ra /* 000B8 80BA8E48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s index 2dc8cc8789..bc965e47dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s @@ -1,3 +1,21 @@ +.rdata +glabel D_80BA9AE0 + .asciz "../z_oceff_wipe.c" + .balign 4 + +glabel D_80BA9AF4 + .asciz "../z_oceff_wipe.c" + .balign 4 + +glabel D_80BA9B08 + .asciz "../z_oceff_wipe.c" + .balign 4 + +.late_rodata +glabel D_80BA9B1C + .float 0.1 + +.text glabel OceffWipe_Draw /* 0011C 80BA8EAC 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 00120 80BA8EB0 AFBF003C */ sw $ra, 0x003C($sp) @@ -268,4 +286,3 @@ glabel OceffWipe_Draw /* 00524 80BA92B4 00000000 */ nop /* 00528 80BA92B8 00000000 */ nop /* 0052C 80BA92BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Init.s index 5cb29cb877..34cb28cd67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BA9AC0 + .asciz " WIPE arg_data = %d\n" + .balign 4 + +.text glabel OceffWipe_Init /* 00000 80BA8D90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80BA8D94 AFA5001C */ sw $a1, 0x001C($sp) @@ -29,5 +35,3 @@ glabel OceffWipe_Init /* 00064 80BA8DF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00068 80BA8DF8 03E00008 */ jr $ra /* 0006C 80BA8DFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Update.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Update.s index ac6757f3cc..0227e0ad0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Update.s @@ -26,5 +26,3 @@ glabel OceffWipe_Update /* 00110 80BA8EA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00114 80BA8EA4 03E00008 */ jr $ra /* 00118 80BA8EA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s index 5174c479d9..054ab680cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s @@ -19,5 +19,3 @@ glabel OceffWipe2_Destroy /* 000B0 80BA9C60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000B4 80BA9C64 03E00008 */ jr $ra /* 000B8 80BA9C68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s index 1ee7b0ab51..6dcdf7f7d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80BAB2C0 + .asciz "../z_oceff_wipe2.c" + .balign 4 + +glabel D_80BAB2D4 + .asciz "../z_oceff_wipe2.c" + .balign 4 + +glabel D_80BAB2E8 + .asciz "../z_oceff_wipe2.c" + .balign 4 + +.late_rodata +glabel D_80BAB2FC + .float 1330.0 +glabel D_80BAB300 + .float 1330.0 +glabel D_80BAB304 + .float 0.1 + +.text glabel OceffWipe2_Draw /* 0011C 80BA9CCC 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 00120 80BA9CD0 AFBF003C */ sw $ra, 0x003C($sp) @@ -213,4 +235,3 @@ glabel OceffWipe2_Draw /* 00454 80BAA004 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 00458 80BAA008 00000000 */ nop /* 0045C 80BAA00C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Init.s index d72ddc73bc..99321e2265 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BAB2A0 + .asciz " WIPE2 arg_data = %d\n" + .balign 4 + +.text glabel OceffWipe2_Init /* 00000 80BA9BB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80BA9BB4 AFA5001C */ sw $a1, 0x001C($sp) @@ -29,5 +35,3 @@ glabel OceffWipe2_Init /* 00064 80BA9C14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00068 80BA9C18 03E00008 */ jr $ra /* 0006C 80BA9C1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Update.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Update.s index b94cdfa9da..5198c84900 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Update.s @@ -26,5 +26,3 @@ glabel OceffWipe2_Update /* 00110 80BA9CC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00114 80BA9CC4 03E00008 */ jr $ra /* 00118 80BA9CC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s index eea6222826..73422d014b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s @@ -19,5 +19,3 @@ glabel OceffWipe3_Destroy /* 000B0 80BAB4A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000B4 80BAB4A4 03E00008 */ jr $ra /* 000B8 80BAB4A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s index a9069c40ad..15c36291ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80BACAE0 + .asciz "../z_oceff_wipe3.c" + .balign 4 + +glabel D_80BACAF4 + .asciz "../z_oceff_wipe3.c" + .balign 4 + +glabel D_80BACB08 + .asciz "../z_oceff_wipe3.c" + .balign 4 + +.late_rodata +glabel D_80BACB1C + .float 1330.0 +glabel D_80BACB20 + .float 1330.0 +glabel D_80BACB24 + .float 0.1 + +.text glabel OceffWipe3_Draw /* 0011C 80BAB50C 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 00120 80BAB510 AFBF003C */ sw $ra, 0x003C($sp) @@ -213,4 +235,3 @@ glabel OceffWipe3_Draw /* 00454 80BAB844 8FB10038 */ lw $s1, 0x0038($sp) /* 00458 80BAB848 03E00008 */ jr $ra /* 0045C 80BAB84C 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Init.s index 1c7726b49a..f123a0005b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BACAC0 + .asciz " WIPE2 arg_data = %d\n" + .balign 4 + +.text glabel OceffWipe3_Init /* 00000 80BAB3F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80BAB3F4 AFA5001C */ sw $a1, 0x001C($sp) @@ -29,5 +35,3 @@ glabel OceffWipe3_Init /* 00064 80BAB454 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00068 80BAB458 03E00008 */ jr $ra /* 0006C 80BAB45C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Update.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Update.s index 4a9b1db755..e603a824c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Update.s @@ -26,5 +26,3 @@ glabel OceffWipe3_Update /* 00110 80BAB500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00114 80BAB504 03E00008 */ jr $ra /* 00118 80BAB508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Destroy.s index f84e5d6be9..c80c19bce3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Destroy.s @@ -8,5 +8,3 @@ glabel OceffWipe4_Destroy /* 00088 80BACC98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0008C 80BACC9C 03E00008 */ jr $ra /* 00090 80BACCA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s index 4f24a5016e..49c460d2bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s @@ -1,3 +1,27 @@ +.rdata +glabel D_80BADB80 + .asciz "../z_oceff_wipe4.c" + .balign 4 + +glabel D_80BADB94 + .asciz "../z_oceff_wipe4.c" + .balign 4 + +glabel D_80BADBA8 + .asciz "../z_oceff_wipe4.c" + .balign 4 + +.late_rodata +glabel D_80BADBBC + .float 1330.0 + +glabel D_80BADBC0 + .float 1330.0 + +glabel D_80BADBC4 + .float 0.1 + +.text glabel OceffWipe4_Draw /* 000F4 80BACD04 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 000F8 80BACD08 AFBF003C */ sw $ra, 0x003C($sp) @@ -217,4 +241,3 @@ glabel OceffWipe4_Draw /* 00434 80BAD044 00000000 */ nop /* 00438 80BAD048 00000000 */ nop /* 0043C 80BAD04C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Init.s index a0f1253a71..75b0e9d7ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BADB60 + .asciz " WIPE4 arg_data = %d\n" + .balign 4 + +.text glabel OceffWipe4_Init /* 00000 80BACC10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80BACC14 AFA5001C */ sw $a1, 0x001C($sp) @@ -29,5 +35,3 @@ glabel OceffWipe4_Init /* 00064 80BACC74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00068 80BACC78 03E00008 */ jr $ra /* 0006C 80BACC7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Update.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Update.s index cc62831c08..24ec337c93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Update.s @@ -26,5 +26,3 @@ glabel OceffWipe4_Update /* 000E8 80BACCF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000EC 80BACCFC 03E00008 */ jr $ra /* 000F0 80BACD00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s index a8ba033f55..10f8612367 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s @@ -17,5 +17,3 @@ glabel ShotSun_Destroy /* 00100 80BADDC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00104 80BADDC4 03E00008 */ jr $ra /* 00108 80BADDC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s index 175e4a5bc3..d2372909d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80BAE320 + .asciz "%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n" + .balign 4 + +.text glabel ShotSun_Init /* 00000 80BADCC0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80BADCC4 AFB00018 */ sw $s0, 0x0018($sp) @@ -56,5 +62,3 @@ glabel ShotSun_Init /* 000C0 80BADD80 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 000C4 80BADD84 03E00008 */ jr $ra /* 000C8 80BADD88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s index 9cb559b303..4bdba76da0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s @@ -11,4 +11,3 @@ glabel ShotSun_Update /* 00604 80BAE2C4 00000000 */ nop /* 00608 80BAE2C8 00000000 */ nop /* 0060C 80BAE2CC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s index fa0f7ef4f6..be1b39e288 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s @@ -49,5 +49,3 @@ glabel func_80BADDCC /* 001A8 80BADE68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 001AC 80BADE6C 03E00008 */ jr $ra /* 001B0 80BADE70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s index 96e1b17dd2..68751b971e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s @@ -40,5 +40,3 @@ glabel func_80BADE74 /* 00240 80BADF00 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00244 80BADF04 03E00008 */ jr $ra /* 00248 80BADF08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s index 65d7e3f57c..fb6db93b38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80BAE36C + .word 0x46AFC800 + +.text glabel func_80BADF0C /* 0024C 80BADF0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00250 80BADF10 AFBF0014 */ sw $ra, 0x0014($sp) @@ -91,5 +96,3 @@ glabel func_80BADF0C /* 00390 80BAE050 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00394 80BAE054 03E00008 */ jr $ra /* 00398 80BAE058 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s index af4450d4c6..f1b9e800ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_80BAE34C + .asciz "SHOT_SUN HIT!!!!!!!\n" + .balign 4 + +.late_rodata +glabel D_80BAE370 + .word 0x45E2E800 +glabel D_80BAE374 + .word 0x45E2E800 +glabel D_80BAE378 + .word 0x3E2AAAAB, 0x00000000 + +.text glabel func_80BAE05C /* 0039C 80BAE05C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 003A0 80BAE060 AFBF0034 */ sw $ra, 0x0034($sp) @@ -154,5 +168,3 @@ glabel func_80BAE05C /* 005D4 80BAE294 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 005D8 80BAE298 03E00008 */ jr $ra /* 005DC 80BAE29C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s index 05b4cca492..550d86133b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s @@ -2499,5 +2499,3 @@ glabel func_80813820 /* 0249C 80815CBC 8FBE0040 */ lw $s8, 0x0040($sp) /* 024A0 80815CC0 03E00008 */ jr $ra /* 024A4 80815CC4 27BD0230 */ addiu $sp, $sp, 0x0230 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CC8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CC8.s index 784b15ad69..9d0f28e574 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CC8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CC8.s @@ -5,5 +5,3 @@ glabel func_80815CC8 /* 024B4 80815CD4 00000000 */ nop /* 024B8 80815CD8 00000000 */ nop /* 024BC 80815CDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s index 3cef016992..4ae10f5c2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s @@ -221,5 +221,3 @@ glabel func_80815CE0 /* 027A8 80815FC8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 027AC 80815FCC 03E00008 */ jr $ra /* 027B0 80815FD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s index 0fa309eab9..bf2b6d770a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s @@ -117,5 +117,3 @@ glabel func_80815FD4 /* 02980 808161A0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 02984 808161A4 03E00008 */ jr $ra /* 02988 808161A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s index 5054e0e7ad..d11a634401 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s @@ -1905,5 +1905,3 @@ glabel func_808161AC /* 04524 80817D44 8FBE0038 */ lw $s8, 0x0038($sp) /* 04528 80817D48 03E00008 */ jr $ra /* 0452C 80817D4C 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s index 29a2b7ad72..5d2bf632be 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s @@ -285,5 +285,3 @@ glabel func_80817D50 /* 04970 80818190 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 /* 04974 80818194 03E00008 */ jr $ra /* 04978 80818198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s index 5eb423df36..5cbbcd9bc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s @@ -109,5 +109,3 @@ glabel func_8081819C /* 04B14 80818334 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 04B18 80818338 03E00008 */ jr $ra /* 04B1C 8081833C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s index 48b8e4d00d..5df6cd3acc 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s @@ -1457,5 +1457,3 @@ glabel func_80818340 /* 06074 80819894 8FBE0040 */ lw $s8, 0x0040($sp) /* 06078 80819898 03E00008 */ jr $ra /* 0607C 8081989C 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s index 642779b50f..1e5d720a50 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s @@ -363,5 +363,3 @@ glabel func_808198A0 /* 065E8 80819E08 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 065EC 80819E0C 03E00008 */ jr $ra /* 065F0 80819E10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E14.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E14.s index aa4e382ac1..2cf10459b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E14.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E14.s @@ -10,5 +10,3 @@ glabel func_80819E14 /* 06614 80819E34 84590002 */ lh $t9, 0x0002($v0) ## 00000002 /* 06618 80819E38 03E00008 */ jr $ra /* 0661C 80819E3C A5190002 */ sh $t9, 0x0002($t0) ## 00000002 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E40.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E40.s index 51daa9c056..549d89f469 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E40.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E40.s @@ -10,5 +10,3 @@ glabel func_80819E40 /* 06640 80819E60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06644 80819E64 03E00008 */ jr $ra /* 06648 80819E68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s index 2b8f0b3cc6..3c2e4de42f 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s @@ -1023,5 +1023,3 @@ glabel func_80819E6C /* 07518 8081AD38 8FB50030 */ lw $s5, 0x0030($sp) /* 0751C 8081AD3C 03E00008 */ jr $ra /* 07520 8081AD40 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s index 80e4f923e3..d1f818710a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s @@ -974,5 +974,3 @@ glabel func_8081AD44 /* 082E4 8081BB04 00000000 */ nop /* 082E8 8081BB08 00000000 */ nop /* 082EC 8081BB0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s index 17cad90967..f6fc72fdd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s @@ -1625,5 +1625,3 @@ glabel func_8081BB10 /* 09B6C 8081D38C 8FB20028 */ lw $s2, 0x0028($sp) /* 09B70 8081D390 03E00008 */ jr $ra /* 09B74 8081D394 27BD01F0 */ addiu $sp, $sp, 0x01F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s index 0397848e2b..75905a62b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s @@ -1911,5 +1911,3 @@ glabel func_8081D398 /* 0B7C4 8081EFE4 8FBE0058 */ lw $s8, 0x0058($sp) /* 0B7C8 8081EFE8 03E00008 */ jr $ra /* 0B7CC 8081EFEC 27BD0288 */ addiu $sp, $sp, 0x0288 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s index de3dcd637a..19f2b9261d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s @@ -139,5 +139,3 @@ glabel func_8081EFF0 /* 0B9C4 8081F1E4 00000000 */ nop /* 0B9C8 8081F1E8 00000000 */ nop /* 0B9CC 8081F1EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s index e2fb902883..2dc6a869b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s @@ -66,5 +66,3 @@ glabel func_8081F1F0 /* 0BAD0 8081F2F0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0BAD4 8081F2F4 03E00008 */ jr $ra /* 0BAD8 8081F2F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F2FC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F2FC.s index 425fa9499f..58b5e5f781 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F2FC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F2FC.s @@ -13,5 +13,3 @@ glabel func_8081F2FC /* 0BB08 8081F328 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0BB0C 8081F32C 03E00008 */ jr $ra /* 0BB10 8081F330 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F334.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F334.s index 045ecead6c..006f633947 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F334.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F334.s @@ -126,5 +126,3 @@ glabel func_8081F334 /* 0BCE0 8081F500 AC790004 */ sw $t9, 0x0004($v1) ## 0000003C /* 0BCE4 8081F504 03E00008 */ jr $ra /* 0BCE8 8081F508 00801025 */ or $v0, $a0, $zero ## $v0 = 00000040 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F50C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F50C.s index e9058a4f53..828cb25003 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F50C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F50C.s @@ -126,5 +126,3 @@ glabel func_8081F50C /* 0BEB8 8081F6D8 AC780000 */ sw $t8, 0x0000($v1) ## 00000038 /* 0BEBC 8081F6DC 03E00008 */ jr $ra /* 0BEC0 8081F6E0 00801025 */ or $v0, $a0, $zero ## $v0 = 00000040 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F6E4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F6E4.s index 8d27713520..ae0ff6b588 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F6E4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F6E4.s @@ -91,5 +91,3 @@ glabel func_8081F6E4 .L8081F814: /* 0BFF4 8081F814 03E00008 */ jr $ra /* 0BFF8 8081F818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s index b349f8e077..6fde5a4fb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s @@ -24,5 +24,3 @@ glabel func_8081F81C /* 0C050 8081F870 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0C054 8081F874 03E00008 */ jr $ra /* 0C058 8081F878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s index 8e28638d3b..4455c3bd0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s @@ -151,5 +151,3 @@ glabel func_8081F87C /* 0C290 8081FAB0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 0C294 8081FAB4 03E00008 */ jr $ra /* 0C298 8081FAB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s index a1519838fa..41223c3fc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s @@ -54,5 +54,3 @@ glabel func_8081FABC .L8081FB74: /* 0C354 8081FB74 03E00008 */ jr $ra /* 0C358 8081FB78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s index d65903403a..9836e9d01c 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s @@ -98,5 +98,3 @@ glabel func_8081FB7C /* 0C4C8 8081FCE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0C4CC 8081FCEC 03E00008 */ jr $ra /* 0C4D0 8081FCF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FCF4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FCF4.s index 3b9a0f7c52..7bb567a91b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FCF4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FCF4.s @@ -87,5 +87,3 @@ glabel func_8081FCF4 /* 0C604 8081FE24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0C608 8081FE28 03E00008 */ jr $ra /* 0C60C 8081FE2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s index 74eb3591d9..eff8485e5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s @@ -222,5 +222,3 @@ glabel func_8081FE30 /* 0C960 80820180 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0C964 80820184 03E00008 */ jr $ra /* 0C968 80820188 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082018C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082018C.s index e1bee12241..317d452b70 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082018C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082018C.s @@ -171,5 +171,3 @@ glabel func_8082018C /* 0CC08 80820428 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0CC0C 8082042C 03E00008 */ jr $ra /* 0CC10 80820430 00801025 */ or $v0, $a0, $zero ## $v0 = 000000A0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s index 7c9b006fdf..53aae0da8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s @@ -1594,5 +1594,3 @@ glabel func_80820434 /* 0E3E4 80821C04 8FB10020 */ lw $s1, 0x0020($sp) /* 0E3E8 80821C08 03E00008 */ jr $ra /* 0E3EC 80821C0C 27BD0118 */ addiu $sp, $sp, 0x0118 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s index 9b7700e8e7..eff682648a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s @@ -1673,5 +1673,3 @@ glabel func_80821C10 /* 0FD1C 8082353C 27BD0108 */ addiu $sp, $sp, 0x0108 ## $sp = 00000000 /* 0FD20 80823540 03E00008 */ jr $ra /* 0FD24 80823544 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s index 3a1106ce57..de9f497ee3 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s @@ -172,5 +172,3 @@ glabel func_80823548 /* 0FF88 808237A8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0FF8C 808237AC 03E00008 */ jr $ra /* 0FF90 808237B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s index 4331795710..4a6c6d19f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s @@ -131,5 +131,3 @@ glabel func_808237B4 .L8082398C: /* 1016C 8082398C 03E00008 */ jr $ra /* 10170 80823990 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823994.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823994.s index ee99e44280..d567e41079 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823994.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823994.s @@ -29,5 +29,3 @@ glabel func_80823994 /* 101E0 80823A00 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 101E4 80823A04 03E00008 */ jr $ra /* 101E8 80823A08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s index dcbe9d3f9c..73654b2a77 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s @@ -431,5 +431,3 @@ glabel func_80823A0C /* 10870 80824090 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 10874 80824094 03E00008 */ jr $ra /* 10878 80824098 01201025 */ or $v0, $t1, $zero ## $v0 = 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s index dbcb8a2ae2..74e66bb19d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s @@ -1795,5 +1795,3 @@ glabel func_8082409C /* 123E8 80825C08 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 123EC 80825C0C 03E00008 */ jr $ra /* 123F0 80825C10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s index 7500677c5c..9046fe9cc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s @@ -424,5 +424,3 @@ glabel func_80825C14 /* 12A8C 808262AC 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 /* 12A90 808262B0 03E00008 */ jr $ra /* 12A94 808262B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s index 82f5ed2d10..f9259fdeb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s @@ -154,5 +154,3 @@ glabel func_808262B8 /* 12CE0 80826500 8FB10018 */ lw $s1, 0x0018($sp) /* 12CE4 80826504 03E00008 */ jr $ra /* 12CE8 80826508 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s index b34a0a152a..ec46d465d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s @@ -47,5 +47,3 @@ glabel func_8082650C .L808265B4: /* 12D94 808265B4 03E00008 */ jr $ra /* 12D98 808265B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s index 610aa57e86..8835459c40 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s @@ -125,5 +125,3 @@ glabel func_808265BC /* 12F80 808267A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 12F84 808267A4 03E00008 */ jr $ra /* 12F88 808267A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808267AC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808267AC.s index 5b5fbce1d2..60df681afc 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808267AC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808267AC.s @@ -216,5 +216,3 @@ glabel func_808267AC /* 132C0 80826AE0 8C4A0168 */ lw $t2, 0x0168($v0) ## 00000168 /* 132C4 80826AE4 03E00008 */ jr $ra /* 132C8 80826AE8 A54400E2 */ sh $a0, 0x00E2($t2) ## 000000E2 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s index 9a7b751d21..5a26309111 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s @@ -46,5 +46,3 @@ glabel func_80826AEC /* 1337C 80826B9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 13380 80826BA0 03E00008 */ jr $ra /* 13384 80826BA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s index 866c26504b..19672c7c9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s @@ -69,5 +69,3 @@ glabel func_80826BA8 /* 13488 80826CA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1348C 80826CAC 03E00008 */ jr $ra /* 13490 80826CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s index bdaf7992b7..6e9142c858 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s @@ -3153,5 +3153,3 @@ glabel L80829940 /* 16134 80829954 00000000 */ nop /* 16138 80829958 00000000 */ nop /* 1613C 8082995C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s index 2360cefff6..afa5b869dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s @@ -11,5 +11,3 @@ glabel func_80829960 /* 16164 80829984 AFA40000 */ sw $a0, 0x0000($sp) /* 16168 80829988 03E00008 */ jr $ra /* 1616C 8082998C AC2E13A0 */ sw $t6, 0x13A0($at) ## 801613A0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s index 9d55599f38..4aba288c23 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s @@ -3,5 +3,3 @@ glabel func_80829990 /* 16174 80829994 AFA40000 */ sw $a0, 0x0000($sp) /* 16178 80829998 03E00008 */ jr $ra /* 1617C 8082999C AC2013A0 */ sw $zero, 0x13A0($at) ## 801613A0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s index d42f5f2371..6df8e55fa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s @@ -434,5 +434,3 @@ glabel L80829C28 /* 167E0 8082A000 8FBE0050 */ lw $s8, 0x0050($sp) /* 167E4 8082A004 03E00008 */ jr $ra /* 167E8 8082A008 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s index 9360b50916..8d571ec075 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s @@ -26,4 +26,3 @@ glabel L8082A044 /* 16844 8082A064 00000000 */ nop /* 16848 8082A068 00000000 */ nop /* 1684C 8082A06C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s index 30a4532433..b8432ba8a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s @@ -4,5 +4,3 @@ glabel func_80832210 /* 00008 80832218 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 0000C 8083221C 03E00008 */ jr $ra /* 00010 80832220 E4800838 */ swc1 $f0, 0x0838($a0) ## 00000838 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s index e9be212d70..e9b28ef3c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s @@ -9,5 +9,3 @@ glabel func_80832224 /* 00030 80832240 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00034 80832244 03E00008 */ jr $ra /* 00038 80832248 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s index 9272201073..1b40533fa8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s @@ -5,5 +5,3 @@ glabel func_8083224C /* 00048 80832258 38420100 */ xori $v0, $v0, 0x0100 ## $v0 = 00000100 /* 0004C 8083225C 03E00008 */ jr $ra /* 00050 80832260 2C420001 */ sltiu $v0, $v0, 0x0001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s index d1cd37d63e..0d05623ae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s @@ -7,5 +7,3 @@ glabel func_80832264 /* 00068 80832278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0006C 8083227C 03E00008 */ jr $ra /* 00070 80832280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s index 56f3da7e92..2af2b027bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s @@ -7,5 +7,3 @@ glabel func_80832284 /* 00088 80832298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0008C 8083229C 03E00008 */ jr $ra /* 00090 808322A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s index 83c671feab..b965fab0aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s @@ -10,5 +10,3 @@ glabel func_808322A4 /* 000B4 808322C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000B8 808322C8 03E00008 */ jr $ra /* 000BC 808322CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s index 24810d04eb..ed7c2479bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s @@ -10,5 +10,3 @@ glabel func_808322D0 /* 000E0 808322F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 000E4 808322F4 03E00008 */ jr $ra /* 000E8 808322F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s index a4d5d256b7..7df020df9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s @@ -6,5 +6,3 @@ glabel func_808322FC /* 000FC 8083230C A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 /* 00100 80832310 03E00008 */ jr $ra /* 00104 80832314 A4400008 */ sh $zero, 0x0008($v0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s index 3725031af0..66ddf1bac0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s @@ -9,5 +9,3 @@ glabel func_80832318 /* 00124 80832334 AC8008D0 */ sw $zero, 0x08D0($a0) ## 000008D0 /* 00128 80832338 03E00008 */ jr $ra /* 0012C 8083233C AC8008B4 */ sw $zero, 0x08B4($a0) ## 000008B4 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s index f42600f8f7..6d8d9a29aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s @@ -30,5 +30,3 @@ glabel func_80832340 /* 00198 808323A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0019C 808323AC 03E00008 */ jr $ra /* 001A0 808323B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s index c7b1481661..3f04d42b0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s @@ -36,5 +36,3 @@ glabel func_808323B4 /* 00224 80832434 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00228 80832438 03E00008 */ jr $ra /* 0022C 8083243C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s index 025c9e6f9a..4ab0212e82 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s @@ -58,5 +58,3 @@ glabel func_80832440 /* 0030C 8083251C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00310 80832520 03E00008 */ jr $ra /* 00314 80832524 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s index e059bef71b..c9cf9102e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s @@ -15,5 +15,3 @@ glabel func_80832528 /* 00348 80832558 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0034C 8083255C 03E00008 */ jr $ra /* 00350 80832560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s index 4b67a1ebb5..9a13c8eb65 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s @@ -11,5 +11,3 @@ glabel func_80832564 /* 00378 80832588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0037C 8083258C 03E00008 */ jr $ra /* 00380 80832590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s index ecf53858ae..aec0be19af 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085534C + .word 0x362A9004 + +.text glabel func_80832594 /* 00384 80832594 3C0F8085 */ lui $t7, %hi(D_808535D8) ## $t7 = 80850000 /* 00388 80832598 85EF35D8 */ lh $t7, %lo(D_808535D8)($t7) @@ -41,5 +46,3 @@ glabel func_80832594 /* 00414 80832624 84880850 */ lh $t0, 0x0850($a0) ## 00000850 /* 00418 80832628 03E00008 */ jr $ra /* 0041C 8083262C 00C8102A */ slt $v0, $a2, $t0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s index 5c929fb787..3de2dda7d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s @@ -7,5 +7,3 @@ glabel func_80832630 .L80832644: /* 00434 80832644 03E00008 */ jr $ra /* 00438 80832648 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s index e551b47250..d6e1584ab3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s @@ -19,5 +19,3 @@ glabel func_8083264C /* 0047C 8083268C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00480 80832690 03E00008 */ jr $ra /* 00484 80832694 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s index 51f9b86694..203454659d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s @@ -23,5 +23,3 @@ glabel func_80832698 /* 004D4 808326E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 004D8 808326E8 03E00008 */ jr $ra /* 004DC 808326EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s index 050a08fdfe..84f36e5d26 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s @@ -27,5 +27,3 @@ glabel func_808326F0 /* 00540 80832750 8FB30020 */ lw $s3, 0x0020($sp) /* 00544 80832754 03E00008 */ jr $ra /* 00548 80832758 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s index ab1ded1bfa..ac8a7647c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s @@ -4,5 +4,3 @@ glabel func_8083275C /* 00554 80832764 00AE1021 */ addu $v0, $a1, $t6 /* 00558 80832768 03E00008 */ jr $ra /* 0055C 8083276C 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s index c98caa029e..28293d1252 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s @@ -12,5 +12,3 @@ glabel func_80832770 /* 00588 80832798 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0058C 8083279C 03E00008 */ jr $ra /* 00590 808327A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s index 3367e258a1..4ea538058e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s @@ -7,5 +7,3 @@ glabel func_808327A4 /* 005A8 808327B8 01F91021 */ addu $v0, $t7, $t9 /* 005AC 808327BC 03E00008 */ jr $ra /* 005B0 808327C0 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s index f65cfe82af..553d5f40e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s @@ -12,5 +12,3 @@ glabel func_808327C4 /* 005DC 808327EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005E0 808327F0 03E00008 */ jr $ra /* 005E4 808327F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s index a7c9bb328b..51ae62733e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s @@ -24,5 +24,3 @@ glabel func_808327F8 /* 00638 80832848 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0063C 8083284C 03E00008 */ jr $ra /* 00640 80832850 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s index f0ed62c9ad..42ebd72527 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s @@ -20,5 +20,3 @@ glabel func_80832854 /* 00684 80832894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00688 80832898 03E00008 */ jr $ra /* 0068C 8083289C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s index 76f93e42f1..15ece49966 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s @@ -20,5 +20,3 @@ glabel func_808328A0 /* 006D0 808328E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 006D4 808328E4 03E00008 */ jr $ra /* 006D8 808328E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s index ef81a03715..fc6273715e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s @@ -13,5 +13,3 @@ glabel func_808328EC /* 00708 80832918 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0070C 8083291C 03E00008 */ jr $ra /* 00710 80832920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s index e96f1eabbd..b82e0a73fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s @@ -133,5 +133,3 @@ glabel func_80832924 /* 008F0 80832B00 8FBE0048 */ lw $s8, 0x0048($sp) /* 008F4 80832B04 03E00008 */ jr $ra /* 008F8 80832B08 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s index 0b83126ccc..6b901389d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s @@ -27,5 +27,3 @@ glabel func_80832B0C /* 0095C 80832B6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00960 80832B70 03E00008 */ jr $ra /* 00964 80832B74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s index 5ed86dc6d0..5e364f7050 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s @@ -28,5 +28,3 @@ glabel func_80832B78 /* 009CC 80832BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 009D0 80832BE0 03E00008 */ jr $ra /* 009D4 80832BE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s index 10a66c28bd..7243d4c85f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s @@ -16,5 +16,3 @@ glabel func_80832BE8 /* 00A10 80832C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A14 80832C24 03E00008 */ jr $ra /* 00A18 80832C28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s index 8f390849f3..e6ce33ba7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s @@ -15,5 +15,3 @@ glabel func_80832C2C /* 00A50 80832C60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A54 80832C64 03E00008 */ jr $ra /* 00A58 80832C68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s index 8d7bcda509..30b93fdff5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s @@ -16,5 +16,3 @@ glabel func_80832C6C /* 00A94 80832CA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00A98 80832CA8 03E00008 */ jr $ra /* 00A9C 80832CAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s index 4a3c0a222a..b73fa95652 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s @@ -20,5 +20,3 @@ glabel func_80832CB0 /* 00AE0 80832CF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00AE4 80832CF4 03E00008 */ jr $ra /* 00AE8 80832CF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s index 6e8d1a1110..ffd5188287 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s @@ -8,5 +8,3 @@ glabel func_80832CFC /* 00B04 80832D14 A49801EA */ sh $t8, 0x01EA($a0) ## 000001EA /* 00B08 80832D18 03E00008 */ jr $ra /* 00B0C 80832D1C A48F01F0 */ sh $t7, 0x01F0($a0) ## 000001F0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s index 7c3edec074..7a7a525473 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s @@ -35,5 +35,3 @@ glabel func_80832D20 /* 00B94 80832DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00B98 80832DA8 03E00008 */ jr $ra /* 00B9C 80832DAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s index 1bc70e6b9c..fb2a8eb6d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s @@ -2,5 +2,3 @@ glabel func_80832DB0 /* 00BA0 80832DB0 8C8E01D4 */ lw $t6, 0x01D4($a0) ## 000001D4 /* 00BA4 80832DB4 03E00008 */ jr $ra /* 00BA8 80832DB8 A5C00008 */ sh $zero, 0x0008($t6) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s index 013df0cca3..d8d6cb1617 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s @@ -37,5 +37,3 @@ glabel func_80832DBC /* 00C2C 80832E3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C30 80832E40 03E00008 */ jr $ra /* 00C34 80832E44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s index ec4ea2ce40..8988d8b7c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855350 + .word 0x3F23D70A + +.text glabel func_80832E48 /* 00C38 80832E48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00C3C 80832E4C AFBF0014 */ sw $ra, 0x0014($sp) @@ -70,5 +75,3 @@ glabel func_80832E48 /* 00D38 80832F48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00D3C 80832F4C 03E00008 */ jr $ra /* 00D40 80832F50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s index 1806b444fc..67a92bc644 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s @@ -45,5 +45,3 @@ glabel func_80832F54 /* 00DE0 80832FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DE4 80832FF4 03E00008 */ jr $ra /* 00DE8 80832FF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s index f30355e4df..1e0d5a9645 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s @@ -15,5 +15,3 @@ glabel func_80832FFC /* 00E20 80833030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E24 80833034 03E00008 */ jr $ra /* 00E28 80833038 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s index 411843afd5..3736968875 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s @@ -9,5 +9,3 @@ glabel func_8083303C /* 00E48 80833058 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E4C 8083305C 03E00008 */ jr $ra /* 00E50 80833060 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s index 2dbaada25e..818a4cc0ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855354 + .word 0x3F2AAAAB + +.text glabel func_80833064 /* 00E54 80833064 3C018085 */ lui $at, %hi(D_80855354) ## $at = 80850000 /* 00E58 80833068 C4245354 */ lwc1 $f4, %lo(D_80855354)($at) @@ -9,5 +14,3 @@ glabel func_80833064 /* 00E70 80833080 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E74 80833084 03E00008 */ jr $ra /* 00E78 80833088 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s index 3e4dae502c..b963e54f64 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s @@ -7,5 +7,3 @@ glabel func_8083308C /* 00E90 808330A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00E94 808330A4 03E00008 */ jr $ra /* 00E98 808330A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s index 28fc2ef8be..900113c9de 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s @@ -15,5 +15,3 @@ glabel func_808330AC /* 00ED0 808330E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00ED4 808330E4 03E00008 */ jr $ra /* 00ED8 808330E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s index 12aa2c504b..cede17106f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s @@ -9,5 +9,3 @@ glabel func_808330EC /* 00EF8 80833108 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00EFC 8083310C 03E00008 */ jr $ra /* 00F00 80833110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s index c9e50e7a54..3b0da1822a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855358 + .word 0x3F2AAAAB + +.text glabel func_80833114 /* 00F04 80833114 3C018085 */ lui $at, %hi(D_80855358) ## $at = 80850000 /* 00F08 80833118 C4245358 */ lwc1 $f4, %lo(D_80855358)($at) @@ -9,5 +14,3 @@ glabel func_80833114 /* 00F20 80833130 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00F24 80833134 03E00008 */ jr $ra /* 00F28 80833138 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s index 3f684e5c49..ed8db04285 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s @@ -7,5 +7,3 @@ glabel func_8083313C /* 00F40 80833150 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00F44 80833154 03E00008 */ jr $ra /* 00F48 80833158 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s index 0ee067d837..55547544b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s @@ -78,5 +78,3 @@ glabel func_8083315C /* 01070 80833280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01074 80833284 03E00008 */ jr $ra /* 01078 80833288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s index de8cc36ef9..5a97cda0cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s @@ -10,5 +10,3 @@ glabel func_8083328C /* 0109C 808332AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 010A0 808332B0 03E00008 */ jr $ra /* 010A4 808332B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s index e4bee1d52b..761e26b09a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s @@ -11,5 +11,3 @@ glabel func_808332B8 .L808332DC: /* 010CC 808332DC 03E00008 */ jr $ra /* 010D0 808332E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s index ad4faf4cc6..5106343792 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s @@ -3,5 +3,3 @@ glabel func_808332E4 /* 010D8 808332E8 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 010DC 808332EC 03E00008 */ jr $ra /* 010E0 808332F0 00411024 */ and $v0, $v0, $at - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s index 342f7f25f0..be45be778f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s @@ -17,5 +17,3 @@ glabel func_808332F4 /* 0111C 8083332C A0880862 */ sb $t0, 0x0862($a0) ## 00000862 /* 01120 80833330 03E00008 */ jr $ra /* 01124 80833334 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s index c223a3849e..5b7cbf11ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s @@ -5,5 +5,3 @@ glabel func_80833338 /* 01134 80833344 004F1021 */ addu $v0, $v0, $t7 /* 01138 80833348 03E00008 */ jr $ra /* 0113C 8083334C 8C423914 */ lw $v0, %lo(D_80853914)($v0) - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s index 9f51ddc9cc..e779730dcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s @@ -49,5 +49,3 @@ glabel func_80833350 .L808333F4: /* 011E4 808333F4 03E00008 */ jr $ra /* 011E8 808333F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s index 184ecc027b..508cedaf48 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s @@ -15,5 +15,3 @@ glabel func_808333FC /* 0121C 8083342C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01220 80833430 03E00008 */ jr $ra /* 01224 80833434 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s index 4c8a85f94e..4c7bba19a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s @@ -34,5 +34,3 @@ glabel func_80833438 /* 01298 808334A8 8C423944 */ lw $v0, %lo(D_80853944)($v0) /* 0129C 808334AC 03E00008 */ jr $ra /* 012A0 808334B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s index a4f6415c03..86e5b4e292 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s @@ -12,5 +12,3 @@ glabel func_808334B4 .L808334DC: /* 012CC 808334DC 03E00008 */ jr $ra /* 012D0 808334E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s index 8e35a40661..b043bf3106 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s @@ -18,5 +18,3 @@ glabel func_808334E4 .L80833520: /* 01310 80833520 03E00008 */ jr $ra /* 01314 80833524 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s index 60c8d02b6a..a26b9c70c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s @@ -18,5 +18,3 @@ glabel func_80833528 .L80833564: /* 01354 80833564 03E00008 */ jr $ra /* 01358 80833568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s index 611d113bf8..89e178ba01 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s @@ -18,5 +18,3 @@ glabel func_8083356C .L808335A8: /* 01398 808335A8 03E00008 */ jr $ra /* 0139C 808335AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s index e67d1e010d..b8c6b22395 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s @@ -18,5 +18,3 @@ glabel func_808335B0 .L808335EC: /* 013DC 808335EC 03E00008 */ jr $ra /* 013E0 808335F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s index ebb0ae4a68..a99e7609dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s @@ -18,5 +18,3 @@ glabel func_808335F4 .L80833630: /* 01420 80833630 03E00008 */ jr $ra /* 01424 80833634 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s index b1f04ef4e7..ee10c20122 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s @@ -10,5 +10,3 @@ glabel func_80833638 /* 01448 80833658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0144C 8083365C 03E00008 */ jr $ra /* 01450 80833660 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s index e78bee4a95..096ed7c051 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s @@ -50,5 +50,3 @@ glabel func_80833664 /* 01508 80833718 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0150C 8083371C 03E00008 */ jr $ra /* 01510 80833720 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s index 84cea0b9db..f23e76451e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s @@ -23,5 +23,3 @@ glabel func_80833724 /* 01554 80833764 80423E9C */ lb $v0, %lo(D_80853E9C)($v0) /* 01558 80833768 03E00008 */ jr $ra /* 0155C 8083376C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s index d3373a6ba6..427951fbe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s @@ -2,5 +2,3 @@ glabel func_80833770 /* 01560 80833770 AFA40000 */ sw $a0, 0x0000($sp) /* 01564 80833774 03E00008 */ jr $ra /* 01568 80833778 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s index f17e34b6a5..c9ecfa422c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s @@ -4,5 +4,3 @@ glabel func_8083377C /* 01574 80833784 AFA40000 */ sw $a0, 0x0000($sp) /* 01578 80833788 03E00008 */ jr $ra /* 0157C 8083378C E4A4085C */ swc1 $f4, 0x085C($a1) ## 0000085C - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s index fa50ad2599..97411cfa3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s @@ -2,5 +2,3 @@ glabel func_80833790 /* 01580 80833790 AFA40000 */ sw $a0, 0x0000($sp) /* 01584 80833794 03E00008 */ jr $ra /* 01588 80833798 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s index c55c276a76..27c7917dc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s @@ -14,5 +14,3 @@ glabel func_8083379C /* 015B8 808337C8 A4A80860 */ sh $t0, 0x0860($a1) ## 00000860 /* 015BC 808337CC 03E00008 */ jr $ra /* 015C0 808337D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s index 5adebf31e1..a9527b4d78 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s @@ -84,5 +84,3 @@ glabel func_808337D4 /* 016F4 80833904 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 016F8 80833908 03E00008 */ jr $ra /* 016FC 8083390C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s index 3804f394d4..f5a1734b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s @@ -29,5 +29,3 @@ glabel func_80833910 /* 01768 80833978 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0176C 8083397C 03E00008 */ jr $ra /* 01770 80833980 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s index 4c91ee9ff4..069f29fcb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s @@ -5,5 +5,3 @@ glabel func_80833984 /* 01780 80833990 01C17825 */ or $t7, $t6, $at ## $t7 = 01000000 /* 01784 80833994 03E00008 */ jr $ra /* 01788 80833998 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s index bdfee59b51..5d4f841361 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s @@ -32,5 +32,3 @@ glabel func_8083399C /* 01804 80833A14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01808 80833A18 03E00008 */ jr $ra /* 0180C 80833A1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s index 59ff6b9812..b8cf8e0dcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s @@ -74,5 +74,3 @@ glabel func_80833A20 /* 01910 80833B20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01914 80833B24 03E00008 */ jr $ra /* 01918 80833B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s index f6e1412f77..2817fe4515 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s @@ -10,5 +10,3 @@ glabel func_80833B2C .L80833B4C: /* 0193C 80833B4C 03E00008 */ jr $ra /* 01940 80833B50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s index fd6306a8a5..ad92b1d039 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s @@ -32,5 +32,3 @@ glabel func_80833B54 .L80833BC4: /* 019B4 80833BC4 03E00008 */ jr $ra /* 019B8 80833BC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s index 7145810913..5c7d520153 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s @@ -14,5 +14,3 @@ glabel func_80833BCC /* 019E8 80833BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 019EC 80833BFC 03E00008 */ jr $ra /* 019F0 80833C00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s index 7d5c38dcbb..365f261201 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s @@ -14,5 +14,3 @@ glabel func_80833C04 /* 01A20 80833C30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A24 80833C34 03E00008 */ jr $ra /* 01A28 80833C38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s index 34ccd7c968..7befb6cca3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s @@ -4,5 +4,3 @@ glabel func_80833C3C /* 01A34 80833C44 E4800874 */ swc1 $f0, 0x0874($a0) ## 00000874 /* 01A38 80833C48 03E00008 */ jr $ra /* 01A3C 80833C4C E4800870 */ swc1 $f0, 0x0870($a0) ## 00000870 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s index 94174a7c96..70a9b23d60 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s @@ -19,5 +19,3 @@ glabel func_80833C50 /* 01A7C 80833C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01A80 80833C90 03E00008 */ jr $ra /* 01A84 80833C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s index 6396c4ae97..a10f107618 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s @@ -18,5 +18,3 @@ glabel func_80833C98 /* 01AC0 80833CD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AC4 80833CD4 03E00008 */ jr $ra /* 01AC8 80833CD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s index 5a6ba10b1c..bc957849a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s @@ -84,5 +84,3 @@ glabel func_80833CDC /* 01BDC 80833DEC 00601025 */ or $v0, $v1, $zero ## $v0 = 000000FF /* 01BE0 80833DF0 03E00008 */ jr $ra /* 01BE4 80833DF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s index e4ed9a1d2a..3019ebce17 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s @@ -203,5 +203,3 @@ glabel func_80833DF8 /* 01EC0 808340D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01EC4 808340D4 03E00008 */ jr $ra /* 01EC8 808340D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s index 5f8354e5d8..0e78e124d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8085535C + .float 1.2 + +glabel D_80855360 + .float -1.2 + +.text glabel func_808340DC /* 01ECC 808340DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 01ED0 808340E0 AFB00028 */ sw $s0, 0x0028($sp) @@ -119,5 +127,3 @@ glabel func_808340DC /* 0207C 8083428C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02080 80834290 03E00008 */ jr $ra /* 02084 80834294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s index 4f57f3f81b..7d21967063 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s @@ -60,5 +60,3 @@ glabel func_80834298 /* 02164 80834374 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02168 80834378 03E00008 */ jr $ra /* 0216C 8083437C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s index 4612269f90..6d357abf40 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s @@ -48,5 +48,3 @@ glabel func_80834380 /* 02210 80834420 8322008C */ lb $v0, 0x008C($t9) ## 0000008C /* 02214 80834424 03E00008 */ jr $ra /* 02218 80834428 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s index b1d39936f1..130217783c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s @@ -96,5 +96,3 @@ glabel func_8083442C /* 02378 80834588 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0237C 8083458C 03E00008 */ jr $ra /* 02380 80834590 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s index 49209220f2..e25ebd3eb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s @@ -47,5 +47,3 @@ glabel func_80834594 /* 02428 80834638 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0242C 8083463C 03E00008 */ jr $ra /* 02430 80834640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s index f3cedc5d9a..c22e83b8a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s @@ -32,5 +32,3 @@ glabel func_80834644 /* 024A8 808346B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 024AC 808346BC 03E00008 */ jr $ra /* 024B0 808346C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s index f2136687c1..4e91445643 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s @@ -38,5 +38,3 @@ glabel func_808346C4 /* 0253C 8083474C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02540 80834750 03E00008 */ jr $ra /* 02544 80834754 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s index 8932e63059..0ae12d2cda 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s @@ -67,5 +67,3 @@ glabel func_80834758 /* 02640 80834850 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 02644 80834854 03E00008 */ jr $ra /* 02648 80834858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s index a295379a6e..6d3020fbd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s @@ -15,5 +15,3 @@ glabel func_8083485C .L8083488C: /* 0267C 8083488C 03E00008 */ jr $ra /* 02680 80834890 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s index 53b0646bff..cc1f68b97b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s @@ -22,5 +22,3 @@ glabel func_80834894 /* 026D0 808348E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 026D4 808348E4 03E00008 */ jr $ra /* 026D8 808348E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s index fd461814c6..09ce7031a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s @@ -46,5 +46,3 @@ glabel func_808348EC /* 02780 80834990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02784 80834994 03E00008 */ jr $ra /* 02788 80834998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s index 330bd5b979..8c8db1b2cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s @@ -17,5 +17,3 @@ glabel func_8083499C /* 027C0 808349D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 027C4 808349D4 03E00008 */ jr $ra /* 027C8 808349D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s index 645f5bc9f5..10a34a027a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s @@ -21,5 +21,3 @@ glabel func_808349DC /* 02810 80834A20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02814 80834A24 03E00008 */ jr $ra /* 02818 80834A28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s index 27742a5de4..d2eb3d63bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s @@ -81,5 +81,3 @@ glabel func_80834A2C /* 02940 80834B50 8FB10018 */ lw $s1, 0x0018($sp) /* 02944 80834B54 03E00008 */ jr $ra /* 02948 80834B58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s index ed692c9621..f35a02e011 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s @@ -31,5 +31,3 @@ glabel func_80834B5C /* 029B8 80834BC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 029BC 80834BCC 03E00008 */ jr $ra /* 029C0 80834BD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s index b513c9553f..1ba2d56b72 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s @@ -41,5 +41,3 @@ glabel func_80834BD4 /* 02A58 80834C68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02A5C 80834C6C 03E00008 */ jr $ra /* 02A60 80834C70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s index 5e1dca0872..0ac40cd6a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s @@ -47,5 +47,3 @@ glabel func_80834C74 /* 02B10 80834D20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02B14 80834D24 03E00008 */ jr $ra /* 02B18 80834D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s index 03e0e94281..d47bf7adf0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s @@ -77,5 +77,3 @@ glabel func_80834D2C /* 02C28 80834E38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02C2C 80834E3C 03E00008 */ jr $ra /* 02C30 80834E40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s index c68cfce6cf..878716b37c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s @@ -14,5 +14,3 @@ glabel func_80834E44 .L80834E74: /* 02C64 80834E74 03E00008 */ jr $ra /* 02C68 80834E78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s index 5e1bad0b55..96741590ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s @@ -15,5 +15,3 @@ glabel func_80834E7C .L80834EB0: /* 02CA0 80834EB0 03E00008 */ jr $ra /* 02CA4 80834EB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s index 035d64fcde..4ef513f78f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s @@ -32,5 +32,3 @@ glabel func_80834EB8 /* 02D10 80834F20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02D14 80834F24 03E00008 */ jr $ra /* 02D18 80834F28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s index 80109e184b..1e8ccbb885 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s @@ -39,5 +39,3 @@ glabel func_80834F2C /* 02DA0 80834FB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02DA4 80834FB4 03E00008 */ jr $ra /* 02DA8 80834FB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s index a46c4d3a48..554a474936 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s @@ -25,5 +25,3 @@ glabel func_80834FBC /* 02E00 80835010 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E04 80835014 03E00008 */ jr $ra /* 02E08 80835018 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s index 1d47494f93..706d72186d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s @@ -37,5 +37,3 @@ glabel func_8083501C /* 02E88 80835098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 02E8C 8083509C 03E00008 */ jr $ra /* 02E90 808350A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s index b0ad9f2866..9a5bcfb4c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s @@ -82,5 +82,3 @@ glabel func_808350A4 /* 02FB8 808351C8 8FB10020 */ lw $s1, 0x0020($sp) /* 02FBC 808351CC 03E00008 */ jr $ra /* 02FC0 808351D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s index c9ff437f37..c2f9db38a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s @@ -145,5 +145,3 @@ glabel func_808351D4 /* 031BC 808353CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 031C0 808353D0 03E00008 */ jr $ra /* 031C4 808353D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s index 6a61015ee3..029f2e2049 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s @@ -122,5 +122,3 @@ glabel func_808353D8 /* 0336C 8083557C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03370 80835580 03E00008 */ jr $ra /* 03374 80835584 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s index 9a3ac562f6..1839ff6311 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s @@ -22,5 +22,3 @@ glabel func_80835588 /* 033C0 808355D0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 033C4 808355D4 03E00008 */ jr $ra /* 033C8 808355D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s index f9df31e33f..52ca881d99 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s @@ -27,5 +27,3 @@ glabel func_808355DC .L8083563C: /* 0342C 8083563C 03E00008 */ jr $ra /* 03430 80835640 A48B083E */ sh $t3, 0x083E($a0) ## 0000083E - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s index c3b21826b2..83d0a62536 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s @@ -18,5 +18,3 @@ glabel func_80835644 /* 0346C 8083567C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03470 80835680 03E00008 */ jr $ra /* 03474 80835684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s index 8fd9d23822..54b88dedf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s @@ -24,5 +24,3 @@ glabel func_80835688 /* 034CC 808356DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 034D0 808356E0 03E00008 */ jr $ra /* 034D4 808356E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s index 60ebb0eab8..5e9c235c1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s @@ -69,5 +69,3 @@ glabel func_808356E8 /* 035CC 808357DC 8FB10018 */ lw $s1, 0x0018($sp) /* 035D0 808357E0 03E00008 */ jr $ra /* 035D4 808357E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s index 774f5cdec0..42bb52f6be 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s @@ -5,5 +5,3 @@ glabel func_808357E8 /* 035E4 808357F4 01E5C021 */ addu $t8, $t7, $a1 /* 035E8 808357F8 03E00008 */ jr $ra /* 035EC 808357FC AC980164 */ sw $t8, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s index 8565ddb387..b13a879040 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s @@ -35,5 +35,3 @@ glabel func_80835800 /* 03668 80835878 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0366C 8083587C 03E00008 */ jr $ra /* 03670 80835880 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s index 6852f41d90..b85a8cac5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s @@ -27,5 +27,3 @@ glabel func_80835884 /* 036D4 808358E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 036D8 808358E8 03E00008 */ jr $ra /* 036DC 808358EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s index e32aecd73d..b77819d363 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s @@ -71,5 +71,3 @@ glabel func_808358F0 /* 037E0 808359F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 037E4 808359F4 03E00008 */ jr $ra /* 037E8 808359F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s index 4124fdb36e..d6b7e318d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s @@ -97,5 +97,3 @@ glabel func_808359FC /* 03944 80835B54 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 03948 80835B58 03E00008 */ jr $ra /* 0394C 80835B5C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s index 216b88776e..f3de7cca35 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s @@ -43,5 +43,3 @@ glabel func_80835B60 /* 039EC 80835BFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 039F0 80835C00 03E00008 */ jr $ra /* 039F4 80835C04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s index c74f262e97..b2d9474d9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s @@ -20,5 +20,3 @@ glabel func_80835C08 /* 03A3C 80835C4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03A40 80835C50 03E00008 */ jr $ra /* 03A44 80835C54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s index bd6ab9f4bc..460e79e070 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s @@ -92,5 +92,3 @@ glabel func_80835C58 /* 03B90 80835DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03B94 80835DA4 03E00008 */ jr $ra /* 03B98 80835DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s index 6d574fb576..472adbd9b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s @@ -13,5 +13,3 @@ glabel func_80835DAC /* 03BC8 80835DD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 03BCC 80835DDC 03E00008 */ jr $ra /* 03BD0 80835DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s index 0af2992702..f22ef5b239 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s @@ -24,5 +24,3 @@ glabel func_80835DE4 /* 03C28 80835E38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03C2C 80835E3C 03E00008 */ jr $ra /* 03C30 80835E40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s index 417bb3587b..a4b1867c01 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s @@ -25,5 +25,3 @@ glabel func_80835E44 /* 03C88 80835E98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03C8C 80835E9C 03E00008 */ jr $ra /* 03C90 80835EA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s index 722e3700e5..80b13956c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s @@ -22,5 +22,3 @@ glabel func_80835EA4 /* 03CE0 80835EF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 03CE4 80835EF4 03E00008 */ jr $ra /* 03CE8 80835EF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s index 711c0f2587..04ac6b803c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s @@ -20,5 +20,3 @@ glabel func_80835EFC /* 03D28 80835F38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03D2C 80835F3C 03E00008 */ jr $ra /* 03D30 80835F40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s index 348158ef42..9533f017b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s @@ -350,5 +350,3 @@ glabel func_80835F44 /* 0422C 8083643C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04230 80836440 03E00008 */ jr $ra /* 04234 80836444 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s index 1586f6ba3f..16d9595630 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s @@ -103,5 +103,3 @@ glabel func_80836448 /* 043AC 808365BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 043B0 808365C0 03E00008 */ jr $ra /* 043B4 808365C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s index 4bdb374b58..2cc78467e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s @@ -43,5 +43,3 @@ glabel func_808365C8 /* 04454 80836664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 04458 80836668 03E00008 */ jr $ra /* 0445C 8083666C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s index d3be2da42b..edc1432944 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s @@ -148,5 +148,3 @@ glabel func_80836670 /* 0467C 8083688C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 04680 80836890 03E00008 */ jr $ra /* 04684 80836894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s index 7be3d173aa..40a17419c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s @@ -20,5 +20,3 @@ glabel func_80836898 /* 046D0 808368E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 046D4 808368E4 03E00008 */ jr $ra /* 046D8 808368E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s index 4a8b2a1655..825294fe4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s @@ -63,5 +63,3 @@ glabel func_808368EC /* 047AC 808369BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 047B0 808369C0 03E00008 */ jr $ra /* 047B4 808369C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s index 75c40d03aa..087b6d2dce 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s @@ -66,5 +66,3 @@ glabel func_808369C8 /* 0489C 80836AAC 00A31023 */ subu $v0, $a1, $v1 /* 048A0 80836AB0 03E00008 */ jr $ra /* 048A4 80836AB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s index cdd86bb0a7..f7b46f1ca2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s @@ -78,5 +78,3 @@ glabel func_80836AB8 /* 049D0 80836BE0 8FB0001C */ lw $s0, 0x001C($sp) /* 049D4 80836BE4 03E00008 */ jr $ra /* 049D8 80836BE8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s index 9f0722a427..de2fa06b9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s @@ -272,5 +272,3 @@ glabel func_80836BEC /* 04D90 80836FA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 04D94 80836FA4 03E00008 */ jr $ra /* 04D98 80836FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s index f152006af4..e3bc624e26 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_80855364 + .float 0.8 + +glabel D_80855368 + .float 0.6 + +glabel D_8085536C + .float 0.008 + +glabel D_80855370 + .word 0x3E0F5C29 + +.text glabel func_80836FAC /* 04D9C 80836FAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 04DA0 80836FB0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -170,5 +184,3 @@ glabel func_80836FAC /* 05000 80837210 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05004 80837214 03E00008 */ jr $ra /* 05008 80837218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s index 21a4f1b11b..f04a2e288d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s @@ -19,5 +19,3 @@ glabel func_8083721C /* 0504C 8083725C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05050 80837260 03E00008 */ jr $ra /* 05054 80837264 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s index 6dae3ba7c7..ac511df247 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s @@ -60,5 +60,3 @@ glabel func_80837268 /* 0512C 8083733C 8FB10020 */ lw $s1, 0x0020($sp) /* 05130 80837340 03E00008 */ jr $ra /* 05134 80837344 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s index d4253235bc..876908564e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s @@ -92,5 +92,3 @@ glabel func_80837348 /* 05284 80837494 8FB30020 */ lw $s3, 0x0020($sp) /* 05288 80837498 03E00008 */ jr $ra /* 0528C 8083749C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s index 99c186f39e..11068a0036 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s @@ -37,5 +37,3 @@ glabel func_808374A0 /* 05314 80837524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 05318 80837528 03E00008 */ jr $ra /* 0531C 8083752C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s index 92d3f41026..a5331e15ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s @@ -45,5 +45,3 @@ glabel func_80837530 /* 053BC 808375CC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 053C0 808375D0 03E00008 */ jr $ra /* 053C4 808375D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s index c2fca1aea7..693a0194f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s @@ -85,5 +85,3 @@ glabel func_808375D8 /* 054E8 808376F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 054EC 808376FC 03E00008 */ jr $ra /* 054F0 80837700 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s index ac4d0941b3..f1b5f1eb21 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s @@ -56,5 +56,3 @@ glabel func_80837704 /* 055C0 808377D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 055C4 808377D4 03E00008 */ jr $ra /* 055C8 808377D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s index e54fc04a22..e5b85d5c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s @@ -14,5 +14,3 @@ glabel func_808377DC /* 055FC 8083780C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05600 80837810 03E00008 */ jr $ra /* 05604 80837814 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s index 8470fd7d34..0a11192101 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s @@ -72,5 +72,3 @@ glabel func_80837818 /* 056FC 8083790C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 /* 05700 80837910 03E00008 */ jr $ra /* 05704 80837914 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s index f00edef60b..6c7e25cb6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s @@ -12,5 +12,3 @@ glabel func_80837918 /* 0572C 8083793C A0580511 */ sb $t8, 0x0511($v0) ## 00000511 /* 05730 80837940 03E00008 */ jr $ra /* 05734 80837944 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s index 5a38f996be..953ea2bb8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s @@ -111,5 +111,3 @@ glabel func_80837948 /* 058C4 80837AD4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 058C8 80837AD8 03E00008 */ jr $ra /* 058CC 80837ADC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s index 4030bac71d..320d405601 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s @@ -7,5 +7,3 @@ glabel func_80837AE0 .L80837AF4: /* 058E4 80837AF4 03E00008 */ jr $ra /* 058E8 80837AF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s index 2f992e7254..e721edd740 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s @@ -7,5 +7,3 @@ glabel func_80837AFC .L80837B10: /* 05900 80837B10 03E00008 */ jr $ra /* 05904 80837B14 A080088F */ sb $zero, 0x088F($a0) ## 0000088F - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s index 29f60199e4..f712cb13df 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s @@ -20,5 +20,3 @@ glabel func_80837B18 /* 05944 80837B54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05948 80837B58 03E00008 */ jr $ra /* 0594C 80837B5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s index 83bbacb845..c31dd89281 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s @@ -14,5 +14,3 @@ glabel func_80837B60 /* 05980 80837B90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 05984 80837B94 03E00008 */ jr $ra /* 05988 80837B98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s index fc77ef364a..faf9a0c75a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s @@ -28,5 +28,3 @@ glabel func_80837B9C /* 059F0 80837C00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 059F4 80837C04 03E00008 */ jr $ra /* 059F8 80837C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s index 095613a0ea..727714c80c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s @@ -359,5 +359,3 @@ glabel func_80837C0C /* 05F28 80838138 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 05F2C 8083813C 03E00008 */ jr $ra /* 05F30 80838140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s index da5dad977f..62e0c98a36 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s @@ -11,5 +11,3 @@ glabel func_80838144 .L80838164: /* 05F54 80838164 03E00008 */ jr $ra /* 05F58 80838168 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s index d507687d8d..ed7dd2449d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s @@ -12,5 +12,3 @@ glabel func_8083816C .L80838194: /* 05F84 80838194 03E00008 */ jr $ra /* 05F88 80838198 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s index 5137bc60c7..17be6fcbf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s @@ -33,5 +33,3 @@ glabel func_8083819C /* 06000 80838210 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 06004 80838214 03E00008 */ jr $ra /* 06008 80838218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s index d073418a77..c1a095929d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s @@ -26,5 +26,3 @@ glabel func_8083821C /* 06064 80838274 8FB00018 */ lw $s0, 0x0018($sp) /* 06068 80838278 03E00008 */ jr $ra /* 0606C 8083827C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s index e041f62c1f..201f84f5dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s @@ -15,5 +15,3 @@ glabel func_80838280 /* 060A0 808382B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 060A4 808382B4 03E00008 */ jr $ra /* 060A8 808382B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s index aaef163a72..e1ea31f570 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s @@ -8,5 +8,3 @@ glabel func_808382BC .L808382D4: /* 060C4 808382D4 03E00008 */ jr $ra /* 060C8 808382D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s index fa9aca985a..42ddee613c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s @@ -449,5 +449,3 @@ glabel func_808382DC /* 06724 80838934 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 06728 80838938 03E00008 */ jr $ra /* 0672C 8083893C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s index 9fdcfd5a58..78a94268f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s @@ -42,5 +42,3 @@ glabel func_80838940 /* 067CC 808389DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 067D0 808389E0 03E00008 */ jr $ra /* 067D4 808389E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s index b34ef4dafb..7f58578787 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s @@ -10,5 +10,3 @@ glabel func_808389E8 /* 067F8 80838A08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 067FC 80838A0C 03E00008 */ jr $ra /* 06800 80838A10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s index 603f435b31..e5e1a4e7cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80855374 + .word 0x38000100 +glabel D_80855378 + .float 0.08 + +.text glabel func_80838A14 /* 06804 80838A14 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 06808 80838A18 AFBF001C */ sw $ra, 0x001C($sp) @@ -297,5 +304,3 @@ glabel func_80838A14 /* 06C54 80838E64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 06C58 80838E68 03E00008 */ jr $ra /* 06C5C 80838E6C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s index 401cc62f11..76f2e91f71 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s @@ -43,5 +43,3 @@ glabel func_80838E70 /* 06CFC 80838F0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 06D00 80838F10 03E00008 */ jr $ra /* 06D04 80838F14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s index 38d1ed2355..597e9952ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s @@ -16,5 +16,3 @@ glabel func_80838F18 /* 06D40 80838F50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06D44 80838F54 03E00008 */ jr $ra /* 06D48 80838F58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s index 303a004c6f..b5dbebcf50 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s @@ -22,5 +22,3 @@ glabel func_80838F5C /* 06D9C 80838FAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06DA0 80838FB0 03E00008 */ jr $ra /* 06DA4 80838FB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s index 82bf98f216..3575671429 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s @@ -31,5 +31,3 @@ glabel func_80838FB8 /* 06E18 80839028 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 06E1C 8083902C 03E00008 */ jr $ra /* 06E20 80839030 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s index 4f11bd9199..714e15f7f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s @@ -393,5 +393,3 @@ glabel func_80839034 /* 073C0 808395D0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 073C4 808395D4 03E00008 */ jr $ra /* 073C8 808395D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s index 04c0c1c473..460c3f5846 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s @@ -42,5 +42,3 @@ glabel func_808395DC /* 07464 80839674 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 07468 80839678 03E00008 */ jr $ra /* 0746C 8083967C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s index a564deca39..8f280157ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s @@ -29,5 +29,3 @@ glabel func_80839680 /* 074D8 808396E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 074DC 808396EC 03E00008 */ jr $ra /* 074E0 808396F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s index 1c8d36019e..2ba0b86c40 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s @@ -17,5 +17,3 @@ glabel func_808396F4 /* 07520 80839730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07524 80839734 03E00008 */ jr $ra /* 07528 80839738 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s index 1bd5f314f1..ad57e9237e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s @@ -10,5 +10,3 @@ glabel func_8083973C /* 0754C 8083975C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 07550 80839760 03E00008 */ jr $ra /* 07554 80839764 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s index 60eeec9d74..c5126feb72 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s @@ -37,5 +37,3 @@ glabel func_80839768 /* 075E4 808397F4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 075E8 808397F8 03E00008 */ jr $ra /* 075EC 808397FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s index 520002594a..3d502a6087 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8085537C + .float 0.1 + +glabel D_80855380 + .float 0.1 + +.text glabel func_80839800 /* 075F0 80839800 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 075F4 80839804 AFBF002C */ sw $ra, 0x002C($sp) @@ -453,5 +461,3 @@ glabel func_80839800 /* 07C6C 80839E7C 8FB10028 */ lw $s1, 0x0028($sp) /* 07C70 80839E80 03E00008 */ jr $ra /* 07C74 80839E84 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s index 41b7e100a8..88f48a9de1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s @@ -43,5 +43,3 @@ glabel func_80839E88 /* 07D14 80839F24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 07D18 80839F28 03E00008 */ jr $ra /* 07D1C 80839F2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s index e3712427c1..ffea8e9b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s @@ -23,5 +23,3 @@ glabel func_80839F30 /* 07D74 80839F84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 07D78 80839F88 03E00008 */ jr $ra /* 07D7C 80839F8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s index 7ef2e43179..d1299d3c29 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s @@ -29,5 +29,3 @@ glabel func_80839F90 /* 07DE0 80839FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07DE4 80839FF4 03E00008 */ jr $ra /* 07DE8 80839FF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s index c6f0cb4848..e9c6393866 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s @@ -27,5 +27,3 @@ glabel func_80839FFC /* 07E44 8083A054 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07E48 8083A058 03E00008 */ jr $ra /* 07E4C 8083A05C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s index 1172203fd0..f1e1c2ea4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s @@ -14,5 +14,3 @@ glabel func_8083A060 /* 07E7C 8083A08C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07E80 8083A090 03E00008 */ jr $ra /* 07E84 8083A094 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s index 0099981b12..f3e9dd1d70 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s @@ -14,5 +14,3 @@ glabel func_8083A098 /* 07EB8 8083A0C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07EBC 8083A0CC 03E00008 */ jr $ra /* 07EC0 8083A0D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s index e1a0c68720..d98ceb43f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s @@ -8,5 +8,3 @@ glabel func_8083A0D4 .L8083A0EC: /* 07EDC 8083A0EC 03E00008 */ jr $ra /* 07EE0 8083A0F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s index 59f03decba..b369706f23 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s @@ -140,5 +140,3 @@ glabel func_8083A0F4 /* 080DC 8083A2EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 080E0 8083A2F0 03E00008 */ jr $ra /* 080E4 8083A2F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s index 47187f6700..d638233def 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s @@ -26,5 +26,3 @@ glabel func_8083A2F8 /* 08144 8083A354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 08148 8083A358 03E00008 */ jr $ra /* 0814C 8083A35C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s index 758f2e14c3..7cf2cb33e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s @@ -9,5 +9,3 @@ glabel func_8083A360 /* 0816C 8083A37C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08170 8083A380 03E00008 */ jr $ra /* 08174 8083A384 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s index 3e3124694e..48b3c28da2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s @@ -9,5 +9,3 @@ glabel func_8083A388 /* 08194 8083A3A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08198 8083A3A8 03E00008 */ jr $ra /* 0819C 8083A3AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s index 48ade685b9..bc35ac5390 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s @@ -22,5 +22,3 @@ glabel func_8083A3B0 /* 081F0 8083A400 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 081F4 8083A404 03E00008 */ jr $ra /* 081F8 8083A408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s index 9029b90831..4ea2297e37 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s @@ -9,5 +9,3 @@ glabel func_8083A40C /* 08218 8083A428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0821C 8083A42C 03E00008 */ jr $ra /* 08220 8083A430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s index dba88c278c..6b652404b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s @@ -31,5 +31,3 @@ glabel func_8083A434 /* 0828C 8083A49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08290 8083A4A0 03E00008 */ jr $ra /* 08294 8083A4A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s index 87eafc3666..14491504fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s @@ -75,5 +75,3 @@ glabel func_8083A4A8 /* 083A8 8083A5B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 083AC 8083A5BC 03E00008 */ jr $ra /* 083B0 8083A5C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s index 2b895ce3a4..88d32b150f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855384 + .word 0x38000100 + +.text glabel func_8083A5C4 /* 083B4 8083A5C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 083B8 8083A5C8 AFBF001C */ sw $ra, 0x001C($sp) @@ -58,5 +63,3 @@ glabel func_8083A5C4 /* 08490 8083A6A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 08494 8083A6A4 03E00008 */ jr $ra /* 08498 8083A6A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s index f4b777f582..f565192cb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855388 + .word 0x38000100 + +.text glabel func_8083A6AC /* 0849C 8083A6AC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 084A0 8083A6B0 AFBF0034 */ sw $ra, 0x0034($sp) @@ -205,5 +210,3 @@ glabel func_8083A6AC /* 0879C 8083A9AC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 087A0 8083A9B0 03E00008 */ jr $ra /* 087A4 8083A9B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s index dce1b681a6..ce0b563fe7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s @@ -21,5 +21,3 @@ glabel func_8083A9B8 /* 087F4 8083AA04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 087F8 8083AA08 03E00008 */ jr $ra /* 087FC 8083AA0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s index d431c25e37..6b565d79b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s @@ -220,5 +220,3 @@ glabel func_8083AA10 /* 08B30 8083AD40 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 08B34 8083AD44 03E00008 */ jr $ra /* 08B38 8083AD48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s index 5c1824e86e..3221f1fa6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s @@ -36,5 +36,3 @@ glabel func_8083AD4C /* 08BB8 8083ADC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 08BBC 8083ADCC 03E00008 */ jr $ra /* 08BC0 8083ADD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s index f22c606b39..b020d96136 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s @@ -28,5 +28,3 @@ glabel func_8083ADD4 /* 08C24 8083AE34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 08C28 8083AE38 03E00008 */ jr $ra /* 08C2C 8083AE3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s index 6d11a419a1..8e93ee1be9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s @@ -1,3 +1,25 @@ +.rdata +glabel D_80855240 + .asciz "../z_player.c" + .balign 4 + +glabel D_80855250 + .asciz "size = %x\n" + .balign 4 + +glabel D_8085525C + .asciz "size <= 1024 * 8" + .balign 4 + +glabel D_80855270 + .asciz "../z_player.c" + .balign 4 + +glabel D_80855280 + .asciz "../z_player.c" + .balign 4 + +.text glabel func_8083AE40 /* 08C30 8083AE40 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 08C34 8083AE44 00053C00 */ sll $a3, $a1, 16 @@ -70,5 +92,3 @@ glabel func_8083AE40 /* 08D28 8083AF38 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 08D2C 8083AF3C 03E00008 */ jr $ra /* 08D30 8083AF40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s index 2db9b29c32..4a003168f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s @@ -52,5 +52,3 @@ glabel func_8083AF44 /* 08DF4 8083B004 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 08DF8 8083B008 03E00008 */ jr $ra /* 08DFC 8083B00C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s index 96539b042a..cf15e7c9ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s @@ -11,5 +11,3 @@ glabel func_8083B010 /* 08E24 8083B034 A4820044 */ sh $v0, 0x0044($a0) ## 00000044 /* 08E28 8083B038 03E00008 */ jr $ra /* 08E2C 8083B03C A48E0046 */ sh $t6, 0x0046($a0) ## 00000046 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s index ed43100ecd..bea8f79bbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s @@ -422,5 +422,3 @@ glabel func_8083B040 /* 09428 8083B638 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0942C 8083B63C 03E00008 */ jr $ra /* 09430 8083B640 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s index 98e17d9537..0bc7f613a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s @@ -196,5 +196,3 @@ glabel func_8083B644 /* 096D8 8083B8E8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 096DC 8083B8EC 03E00008 */ jr $ra /* 096E0 8083B8F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s index 4986311020..72d0c9473d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s @@ -43,5 +43,3 @@ glabel func_8083B8F4 /* 0977C 8083B98C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09780 8083B990 03E00008 */ jr $ra /* 09784 8083B994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s index f608d61489..503b820dec 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s @@ -66,5 +66,3 @@ glabel func_8083B998 /* 09874 8083BA84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09878 8083BA88 03E00008 */ jr $ra /* 0987C 8083BA8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s index d3278e2da6..8739a6ede1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s @@ -35,5 +35,3 @@ glabel func_8083BA90 /* 09904 8083BB14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 09908 8083BB18 03E00008 */ jr $ra /* 0990C 8083BB1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s index caffcc89c4..cc2a687c64 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s @@ -34,5 +34,3 @@ glabel func_8083BB20 /* 09984 8083BB94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09988 8083BB98 03E00008 */ jr $ra /* 0998C 8083BB9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s index c4fbf88bb4..8ee7863126 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s @@ -26,5 +26,3 @@ glabel func_8083BBA0 /* 099E8 8083BBF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 099EC 8083BBFC 03E00008 */ jr $ra /* 099F0 8083BC00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s index a18c440088..43e9fe33b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s @@ -29,5 +29,3 @@ glabel func_8083BC04 /* 09A60 8083BC70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09A64 8083BC74 03E00008 */ jr $ra /* 09A68 8083BC78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s index 74859148a0..745174a42d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s @@ -21,5 +21,3 @@ glabel func_8083BC7C /* 09AB4 8083BCC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09AB8 8083BCC8 03E00008 */ jr $ra /* 09ABC 8083BCCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s index 5bf8fcb9bf..37662f520c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085538C + .word 0x40B9999A + +.text glabel func_8083BCD0 /* 09AC0 8083BCD0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 09AC4 8083BCD4 AFB00020 */ sw $s0, 0x0020($sp) @@ -64,5 +69,3 @@ glabel func_8083BCD0 /* 09BA0 8083BDB0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 09BA4 8083BDB4 03E00008 */ jr $ra /* 09BA8 8083BDB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s index e4c4fdfb7f..10fb4280d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s @@ -107,5 +107,3 @@ glabel func_8083BDBC /* 09D34 8083BF44 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 09D38 8083BF48 03E00008 */ jr $ra /* 09D3C 8083BF4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s index 09cc6fa8f6..e8efde6d31 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s @@ -95,5 +95,3 @@ glabel func_8083BF50 /* 09E9C 8083C0AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 09EA0 8083C0B0 03E00008 */ jr $ra /* 09EA4 8083C0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s index 83944e278f..4ab199ecee 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s @@ -11,5 +11,3 @@ glabel func_8083C0B8 /* 09ECC 8083C0DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 09ED0 8083C0E0 03E00008 */ jr $ra /* 09ED4 8083C0E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s index dbd7f30b59..e71e29d39c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s @@ -23,5 +23,3 @@ glabel func_8083C0E8 /* 09F2C 8083C13C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 09F30 8083C140 03E00008 */ jr $ra /* 09F34 8083C144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s index ae33f18fa7..935db5d0b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s @@ -39,5 +39,3 @@ glabel func_8083C148 /* 09FC0 8083C1D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 09FC4 8083C1D4 03E00008 */ jr $ra /* 09FC8 8083C1D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s index ccd4ba70f2..060725164e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s @@ -56,5 +56,3 @@ glabel func_8083C1DC /* 0A094 8083C2A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A098 8083C2A8 03E00008 */ jr $ra /* 0A09C 8083C2AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s index 82c6dc20f4..d739b7e70f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s @@ -126,5 +126,3 @@ glabel func_8083C2B0 /* 0A268 8083C478 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0A26C 8083C47C 03E00008 */ jr $ra /* 0A270 8083C480 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s index d31d0b4010..faef3b9965 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s @@ -37,5 +37,3 @@ glabel func_8083C484 /* 0A2F0 8083C500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A2F4 8083C504 03E00008 */ jr $ra /* 0A2F8 8083C508 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s index a7744b3f41..77133da7ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s @@ -14,5 +14,3 @@ glabel func_8083C50C .L8083C53C: /* 0A32C 8083C53C 03E00008 */ jr $ra /* 0A330 8083C540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s index c0a3e0d9d2..09861aae02 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s @@ -58,5 +58,3 @@ glabel func_8083C544 /* 0A400 8083C610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A404 8083C614 03E00008 */ jr $ra /* 0A408 8083C618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s index 3e48b4bda9..00cc36da7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s @@ -39,5 +39,3 @@ glabel func_8083C61C /* 0A49C 8083C6AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A4A0 8083C6B0 03E00008 */ jr $ra /* 0A4A4 8083C6B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s index 828c7efb40..0903e8d309 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855390 + .float 1300.0 + +.text glabel func_8083C6B8 /* 0A4A8 8083C6B8 3C0E8085 */ lui $t6, %hi(D_80853614) ## $t6 = 80850000 /* 0A4AC 8083C6BC 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) @@ -110,5 +115,3 @@ glabel func_8083C6B8 /* 0A63C 8083C84C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0A640 8083C850 03E00008 */ jr $ra /* 0A644 8083C854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s index 201eda0170..4afb00f521 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s @@ -34,5 +34,3 @@ glabel func_8083C858 /* 0A6C0 8083C8D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0A6C4 8083C8D4 03E00008 */ jr $ra /* 0A6C8 8083C8D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s index 502465a840..522e327782 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s @@ -12,5 +12,3 @@ glabel func_8083C8DC /* 0A6F4 8083C904 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A6F8 8083C908 03E00008 */ jr $ra /* 0A6FC 8083C90C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s index f3019034e5..d0b7615c43 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s @@ -70,5 +70,3 @@ glabel func_8083C910 /* 0A804 8083CA14 8FB10020 */ lw $s1, 0x0020($sp) /* 0A808 8083CA18 03E00008 */ jr $ra /* 0A80C 8083CA1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s index d55a21725a..51d1e98a33 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s @@ -13,5 +13,3 @@ glabel func_8083CA20 /* 0A838 8083CA48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A83C 8083CA4C 03E00008 */ jr $ra /* 0A840 8083CA50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s index 833e0b3501..7643c03951 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s @@ -18,5 +18,3 @@ glabel func_8083CA54 /* 0A880 8083CA90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A884 8083CA94 03E00008 */ jr $ra /* 0A888 8083CA98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s index 7fe2ab16e4..53ea2d820c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855394 + .float 0.1 + +.text glabel func_8083CA9C /* 0A88C 8083CA9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0A890 8083CAA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 @@ -38,5 +43,3 @@ glabel func_8083CA9C /* 0A910 8083CB20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A914 8083CB24 03E00008 */ jr $ra /* 0A918 8083CB28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s index e40b400427..c04f6c9c8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s @@ -25,5 +25,3 @@ glabel func_8083CB2C /* 0A978 8083CB88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0A97C 8083CB8C 03E00008 */ jr $ra /* 0A980 8083CB90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s index 1924b8b961..57493ea100 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s @@ -22,5 +22,3 @@ glabel func_8083CB94 /* 0A9D4 8083CBE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0A9D8 8083CBE8 03E00008 */ jr $ra /* 0A9DC 8083CBEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s index a4124bb6ca..142051618f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s @@ -43,5 +43,3 @@ glabel func_8083CBF0 /* 0AA80 8083CC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0AA84 8083CC94 03E00008 */ jr $ra /* 0AA88 8083CC98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s index c6bd6fa845..2997af3e0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s @@ -24,5 +24,3 @@ glabel func_8083CC9C /* 0AAE4 8083CCF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0AAE8 8083CCF8 03E00008 */ jr $ra /* 0AAEC 8083CCFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s index 3a4468ca0d..a44ee10cc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s @@ -20,5 +20,3 @@ glabel func_8083CD00 /* 0AB38 8083CD48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0AB3C 8083CD4C 03E00008 */ jr $ra /* 0AB40 8083CD50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s index 2fe32f4682..912c07962f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s @@ -45,5 +45,3 @@ glabel func_8083CD54 /* 0ABF0 8083CE00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0ABF4 8083CE04 03E00008 */ jr $ra /* 0ABF8 8083CE08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s index e6887c95ac..71125e20b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s @@ -41,5 +41,3 @@ glabel func_8083CE0C /* 0AC90 8083CEA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0AC94 8083CEA4 03E00008 */ jr $ra /* 0AC98 8083CEA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s index f363a20f90..64b83e1c54 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s @@ -24,5 +24,3 @@ glabel func_8083CEAC /* 0ACF4 8083CF04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0ACF8 8083CF08 03E00008 */ jr $ra /* 0ACFC 8083CF0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s index bd1efb4ff6..74895358bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s @@ -20,5 +20,3 @@ glabel func_8083CF10 /* 0AD40 8083CF50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0AD44 8083CF54 03E00008 */ jr $ra /* 0AD48 8083CF58 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s index 79ce0ed47d..fbd26f3c02 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s @@ -20,5 +20,3 @@ glabel func_8083CF5C /* 0AD8C 8083CF9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0AD90 8083CFA0 03E00008 */ jr $ra /* 0AD94 8083CFA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s index c1f768f9c5..eaf3fdc872 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s @@ -66,5 +66,3 @@ glabel func_8083CFA8 /* 0AE8C 8083D09C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0AE90 8083D0A0 03E00008 */ jr $ra /* 0AE94 8083D0A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s index 76e5c8bc6e..cf69e4cb06 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s @@ -33,5 +33,3 @@ glabel func_8083D0A8 /* 0AF10 8083D120 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0AF14 8083D124 03E00008 */ jr $ra /* 0AF18 8083D128 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s index e8adbc340f..468a53d064 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s @@ -138,5 +138,3 @@ glabel func_8083D12C /* 0B114 8083D324 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0B118 8083D328 03E00008 */ jr $ra /* 0B11C 8083D32C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s index 859c44aa4c..d28f538586 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s @@ -14,5 +14,3 @@ glabel func_8083D330 /* 0B150 8083D360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0B154 8083D364 03E00008 */ jr $ra /* 0B158 8083D368 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s index 31d21f6758..24b90a362a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s @@ -125,5 +125,3 @@ glabel func_8083D36C /* 0B320 8083D530 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0B324 8083D534 03E00008 */ jr $ra /* 0B328 8083D538 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s index dd7d87895e..0dc2eb3de7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s @@ -115,5 +115,3 @@ glabel func_8083D53C /* 0B4D0 8083D6E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0B4D4 8083D6E4 03E00008 */ jr $ra /* 0B4D8 8083D6E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s index 3c77e57894..c281ee0bdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s @@ -1,3 +1,24 @@ +.late_rodata +glabel D_80855398 + .float 1300.0 + +glabel D_8085539C + .float 0.3 + +glabel D_808553A0 + .word 0x469C4000 +glabel D_808553A4 + .float 0.02 + +glabel D_808553A8 + .word 0x3B83126F +glabel D_808553AC + .float 0.2 + +glabel D_808553B0 + .word 0x3E051EB8 + +.text glabel func_8083D6EC /* 0B4DC 8083D6EC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 0B4E0 8083D6F0 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 @@ -325,5 +346,3 @@ glabel func_8083D6EC /* 0B97C 8083DB8C 8FB00028 */ lw $s0, 0x0028($sp) /* 0B980 8083DB90 03E00008 */ jr $ra /* 0B984 8083DB94 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s index aa1f91063a..7010a60813 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s @@ -50,5 +50,3 @@ glabel func_8083DB98 /* 0BA38 8083DC48 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0BA3C 8083DC4C 03E00008 */ jr $ra /* 0BA40 8083DC50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s index 252cbc6904..ed6ebb88d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s @@ -106,5 +106,3 @@ glabel func_8083DC54 /* 0BBAC 8083DDBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0BBB0 8083DDC0 03E00008 */ jr $ra /* 0BBB4 8083DDC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s index cef66ef013..822c707c8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553B4 + .float 0.1 + +.text glabel func_8083DDC8 /* 0BBB8 8083DDC8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0BBBC 8083DDCC AFBF001C */ sw $ra, 0x001C($sp) @@ -115,5 +120,3 @@ glabel func_8083DDC8 /* 0BD4C 8083DF5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0BD50 8083DF60 03E00008 */ jr $ra /* 0BD54 8083DF64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s index ebaea9e06f..834fe504b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s @@ -30,5 +30,3 @@ glabel func_8083DF68 /* 0BDC4 8083DFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0BDC8 8083DFD8 03E00008 */ jr $ra /* 0BDCC 8083DFDC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s index 7829dff740..5e2db90d9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s @@ -78,5 +78,3 @@ glabel func_8083DFE0 /* 0BEE0 8083E0F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0BEE4 8083E0F4 03E00008 */ jr $ra /* 0BEE8 8083E0F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s index 7da6bbf0c3..c43f1e7bff 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s @@ -108,5 +108,3 @@ glabel func_8083E0FC /* 0C07C 8083E28C 8FB20020 */ lw $s2, 0x0020($sp) /* 0C080 8083E290 03E00008 */ jr $ra /* 0C084 8083E294 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s index 665b6dfc33..35a9edac93 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553B8 + .word 0x38000100 + +.text glabel func_8083E298 /* 0C088 8083E298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0C08C 8083E29C AFBF0014 */ sw $ra, 0x0014($sp) @@ -32,5 +37,3 @@ glabel func_8083E298 /* 0C0FC 8083E30C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0C100 8083E310 03E00008 */ jr $ra /* 0C104 8083E314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s index b8d1d3be35..7b884e6252 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808553BC + .float 1.2 + +glabel D_808553C0 + .word 0x3C75C28F + +.text glabel func_8083E318 /* 0C108 8083E318 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0C10C 8083E31C AFBF001C */ sw $ra, 0x001C($sp) @@ -114,5 +122,3 @@ glabel func_8083E318 /* 0C2A8 8083E4B8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0C2AC 8083E4BC 03E00008 */ jr $ra /* 0C2B0 8083E4C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s index 0e121bff07..0f62c8b8a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s @@ -61,5 +61,3 @@ glabel func_8083E4C4 /* 0C38C 8083E59C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0C390 8083E5A0 03E00008 */ jr $ra /* 0C394 8083E5A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s index 9e0b99879a..f7028c498c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808553C4 + .word 0x41EB7972 +glabel D_808553C8 + .word 0x41EB7972 + +.text glabel func_8083E5A8 /* 0C398 8083E5A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0C39C 8083E5AC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -338,5 +345,3 @@ glabel func_8083E5A8 /* 0C878 8083EA88 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0C87C 8083EA8C 03E00008 */ jr $ra /* 0C880 8083EA90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s index 1710702609..7c6fb47b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s @@ -22,5 +22,3 @@ glabel func_8083EA94 /* 0C8D4 8083EAE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0C8D8 8083EAE8 03E00008 */ jr $ra /* 0C8DC 8083EAEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s index 06c4a04bca..c6ea34a9de 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553CC + .float 1.1 + +.text glabel func_8083EAF0 /* 0C8E0 8083EAF0 10A00012 */ beq $a1, $zero, .L8083EB3C /* 0C8E4 8083EAF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 @@ -22,5 +27,3 @@ glabel func_8083EAF0 .L8083EB3C: /* 0C92C 8083EB3C 03E00008 */ jr $ra /* 0C930 8083EB40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s index 1344d14730..026b43ce63 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s @@ -55,5 +55,3 @@ glabel func_8083EB44 /* 0C9FC 8083EC0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0CA00 8083EC10 03E00008 */ jr $ra /* 0CA04 8083EC14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s index b83b9a9aea..9b93a5d07e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_808553D0 + .word 0x38000100 +glabel D_808553D4 + .word 0x38000100 +glabel D_808553D8 + .word 0x402E0000, 0x07800000 +glabel D_808553E0 + .word 0x402E0000, 0x07800000 +glabel D_808553E8 + .word 0x38000100 + +.text glabel func_8083EC18 /* 0CA08 8083EC18 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0CA0C 8083EC1C AFBF0024 */ sw $ra, 0x0024($sp) @@ -299,5 +312,3 @@ glabel func_8083EC18 /* 0CE54 8083F064 8FB00020 */ lw $s0, 0x0020($sp) /* 0CE58 8083F068 03E00008 */ jr $ra /* 0CE5C 8083F06C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s index 1884fbdab6..486939d1f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s @@ -21,5 +21,3 @@ glabel func_8083F070 /* 0CEAC 8083F0BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0CEB0 8083F0C0 03E00008 */ jr $ra /* 0CEB4 8083F0C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s index e990bfb75a..25f3940ce5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553EC + .word 0x38000100 + +.text glabel func_8083F0C8 /* 0CEB8 8083F0C8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 0CEBC 8083F0CC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 @@ -173,5 +178,3 @@ glabel func_8083F0C8 /* 0D144 8083F354 8FB10018 */ lw $s1, 0x0018($sp) /* 0D148 8083F358 03E00008 */ jr $ra /* 0D14C 8083F35C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s index 5203941e2e..3699d3d114 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553F0 + .word 0x38000100 + +.text glabel func_8083F360 /* 0D150 8083F360 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 0D154 8083F364 AFBF0034 */ sw $ra, 0x0034($sp) @@ -120,5 +125,3 @@ glabel func_8083F360 /* 0D308 8083F518 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 0D30C 8083F51C 03E00008 */ jr $ra /* 0D310 8083F520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s index c38b592d3c..bfdff606b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s @@ -18,5 +18,3 @@ glabel func_8083F524 /* 0D354 8083F564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0D358 8083F568 03E00008 */ jr $ra /* 0D35C 8083F56C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s index 7b615a8ace..a2bed119c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s @@ -117,5 +117,3 @@ glabel func_8083F570 /* 0D510 8083F720 8FB10028 */ lw $s1, 0x0028($sp) /* 0D514 8083F724 03E00008 */ jr $ra /* 0D518 8083F728 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s index 9c24033cd3..4b49722662 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s @@ -36,5 +36,3 @@ glabel func_8083F72C /* 0D5A0 8083F7B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0D5A4 8083F7B4 03E00008 */ jr $ra /* 0D5A8 8083F7B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s index 7cf7384fb2..3aed71185c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s @@ -142,5 +142,3 @@ glabel func_8083F7BC /* 0D7B4 8083F9C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 0D7B8 8083F9C8 03E00008 */ jr $ra /* 0D7BC 8083F9CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s index 60fc11f329..b0494d0d08 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s @@ -63,5 +63,3 @@ glabel func_8083F9D0 /* 0D89C 8083FAAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0D8A0 8083FAB0 03E00008 */ jr $ra /* 0D8A4 8083FAB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s index 1140d82979..9690509599 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s @@ -22,5 +22,3 @@ glabel func_8083FAB8 /* 0D8F8 8083FB08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0D8FC 8083FB0C 03E00008 */ jr $ra /* 0D900 8083FB10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s index c2deac5382..3df1af907c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s @@ -25,5 +25,3 @@ glabel func_8083FB14 /* 0D960 8083FB70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0D964 8083FB74 03E00008 */ jr $ra /* 0D968 8083FB78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s index 698501a573..91063f1696 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553F4 + .word 0xBECCCCCD + +.text glabel func_8083FB7C /* 0D96C 8083FB7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0D970 8083FB80 AFBF0014 */ sw $ra, 0x0014($sp) @@ -16,5 +21,3 @@ glabel func_8083FB7C /* 0D9A4 8083FBB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0D9A8 8083FBB8 03E00008 */ jr $ra /* 0D9AC 8083FBBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s index e92b4ee745..89513030f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s @@ -45,5 +45,3 @@ glabel func_8083FBC0 /* 0DA4C 8083FC5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0DA50 8083FC60 03E00008 */ jr $ra /* 0DA54 8083FC64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s index 72b776fe65..af0e65a58b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808553F8 + .word 0x40D9999A + +.text glabel func_8083FC68 /* 0DA58 8083FC68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0DA5C 8083FC6C AFBF0014 */ sw $ra, 0x0014($sp) @@ -71,5 +76,3 @@ glabel func_8083FC68 .L8083FD70: /* 0DB60 8083FD70 03E00008 */ jr $ra /* 0DB64 8083FD74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s index 34edcf4ffc..2d1aa983f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s @@ -159,5 +159,3 @@ glabel func_8083FD78 /* 0DD9C 8083FFAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0DDA0 8083FFB0 03E00008 */ jr $ra /* 0DDA4 8083FFB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s index 2dbec21d18..881ea67725 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s @@ -44,5 +44,3 @@ glabel func_8083FFB8 .L80840050: /* 0DE40 80840050 03E00008 */ jr $ra /* 0DE44 80840054 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s index bbafd33630..aebde08bd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s @@ -61,5 +61,3 @@ glabel func_80840058 /* 0DF1C 8084012C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0DF20 80840130 03E00008 */ jr $ra /* 0DF24 80840134 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s index 242039eae7..cfe8549fc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s @@ -32,5 +32,3 @@ glabel func_80840138 /* 0DF94 808401A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0DF98 808401A8 03E00008 */ jr $ra /* 0DF9C 808401AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s index b2e90ebb11..b21cc4cfe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s @@ -26,5 +26,3 @@ glabel func_808401B0 /* 0E000 80840210 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0E004 80840214 03E00008 */ jr $ra /* 0E008 80840218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s index e7a9c309b4..9ff2645c22 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s @@ -33,5 +33,3 @@ glabel func_8084021C .L80840294: /* 0E084 80840294 03E00008 */ jr $ra /* 0E088 80840298 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s index 8d7b2672f5..31fbec526f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s @@ -117,5 +117,3 @@ glabel func_8084029C /* 0E234 80840444 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0E238 80840448 03E00008 */ jr $ra /* 0E23C 8084044C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s index adb51f87df..43ab0d48ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_808553FC + .float 0.3 + +glabel D_80855400 + .float 0.3 + +glabel D_80855404 + .float 0.1 + +.text glabel func_80840450 /* 0E240 80840450 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0E244 80840454 AFBF0024 */ sw $ra, 0x0024($sp) @@ -245,5 +256,3 @@ glabel func_80840450 /* 0E5B0 808407C0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0E5B4 808407C4 03E00008 */ jr $ra /* 0E5B8 808407C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s index eed3bf8e41..ae3f171edd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855408 + .word 0x409CCCCD + +.text glabel func_808407CC /* 0E5BC 808407CC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0E5C0 808407D0 AFB0001C */ sw $s0, 0x001C($sp) @@ -138,5 +143,3 @@ glabel func_808407CC /* 0E7B0 808409C0 8FB10020 */ lw $s1, 0x0020($sp) /* 0E7B4 808409C4 03E00008 */ jr $ra /* 0E7B8 808409C8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s index cb64a54ce0..fdf1c5c2d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085540C + .word 0x3F2AAAAB + +.text glabel func_808409CC /* 0E7BC 808409CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0E7C0 808409D0 AFBF002C */ sw $ra, 0x002C($sp) @@ -140,5 +145,3 @@ glabel func_808409CC /* 0E9AC 80840BBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0E9B0 80840BC0 03E00008 */ jr $ra /* 0E9B4 80840BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s index e953b69e2f..5ac93c484e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s @@ -148,5 +148,3 @@ glabel func_80840BC8 /* 0EBC8 80840DD8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 0EBCC 80840DDC 03E00008 */ jr $ra /* 0EBD0 80840DE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s index 01acc79bec..7920a280c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80855410 + .word 0x409CCCCD +glabel D_80855414 + .float 0.4 + +glabel D_80855418 + .float 0.1 + +.text glabel func_80840DE4 /* 0EBD4 80840DE4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0EBD8 80840DE8 AFB00020 */ sw $s0, 0x0020($sp) @@ -230,5 +240,3 @@ glabel func_80840DE4 /* 0EF1C 8084112C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 0EF20 80841130 03E00008 */ jr $ra /* 0EF24 80841134 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s index 53e6d84e2e..3960f07a35 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_8085541C + .float 1.2 + +glabel D_80855420 + .word 0x3F0D3DCB + +.text glabel func_80841138 /* 0EF28 80841138 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0EF2C 8084113C F7B60018 */ sdc1 $f22, 0x0018($sp) @@ -188,5 +196,3 @@ glabel func_80841138 /* 0F1F0 80841400 8FB10028 */ lw $s1, 0x0028($sp) /* 0F1F4 80841404 03E00008 */ jr $ra /* 0F1F8 80841408 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s index b7c321f37c..43391c04e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s @@ -18,5 +18,3 @@ glabel func_8084140C /* 0F23C 8084144C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0F240 80841450 03E00008 */ jr $ra /* 0F244 80841454 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s index 9c5ec306b6..3e5bfd3e0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s @@ -43,5 +43,3 @@ glabel func_80841458 /* 0F2DC 808414EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0F2E0 808414F0 03E00008 */ jr $ra /* 0F2E4 808414F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s index ad99c5ea9b..0e1f6479e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_80855424 + .word 0x409CCCCD +glabel D_80855428 + .float 0.1 + +.text glabel func_808414F8 /* 0F2E8 808414F8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0F2EC 808414FC AFBF0024 */ sw $ra, 0x0024($sp) @@ -120,5 +127,3 @@ glabel func_808414F8 /* 0F4A4 808416B4 8FB10020 */ lw $s1, 0x0020($sp) /* 0F4A8 808416B8 03E00008 */ jr $ra /* 0F4AC 808416BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s index 710c112bef..c54183bc25 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s @@ -18,5 +18,3 @@ glabel func_808416C0 /* 0F4F0 80841700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0F4F4 80841704 03E00008 */ jr $ra /* 0F4F8 80841708 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s index 5a30e353cf..21418d26ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s @@ -63,5 +63,3 @@ glabel func_8084170C /* 0F5E0 808417F0 8FB10020 */ lw $s1, 0x0020($sp) /* 0F5E4 808417F4 03E00008 */ jr $ra /* 0F5E8 808417F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s index 76c083d473..4464ef157e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s @@ -25,5 +25,3 @@ glabel func_808417FC /* 0F644 80841854 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0F648 80841858 03E00008 */ jr $ra /* 0F64C 8084185C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s index ca8d274854..51e5d7f768 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085542C + .word 0x3F0D3DCB + +.text glabel func_80841860 /* 0F650 80841860 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0F654 80841864 AFBF002C */ sw $ra, 0x002C($sp) @@ -54,5 +59,3 @@ glabel func_80841860 /* 0F720 80841930 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0F724 80841934 03E00008 */ jr $ra /* 0F728 80841938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s index f63591edfa..0969f49c05 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80855430 + .word 0x40666666 +glabel D_80855434 + .float 0.9 + +glabel D_80855438 + .float 0.1 + +.text glabel func_8084193C /* 0F72C 8084193C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0F730 80841940 AFB00020 */ sw $s0, 0x0020($sp) @@ -169,5 +179,3 @@ glabel func_8084193C /* 0F98C 80841B9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0F990 80841BA0 03E00008 */ jr $ra /* 0F994 80841BA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s index 19a9cbe874..0906195ded 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s @@ -76,5 +76,3 @@ glabel func_80841BA8 /* 0FAA8 80841CB8 8FB10020 */ lw $s1, 0x0020($sp) /* 0FAAC 80841CBC 03E00008 */ jr $ra /* 0FAB0 80841CC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s index a1c614b5c4..5f0756279d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8085543C + .word 0x462AA800 +glabel D_80855440 + .word 0x3A1D4952 + +.text glabel func_80841CC4 /* 0FAB4 80841CC4 3C028085 */ lui $v0, %hi(D_80853610) ## $v0 = 80850000 /* 0FAB8 80841CC8 84423610 */ lh $v0, %lo(D_80853610)($v0) @@ -151,5 +158,3 @@ glabel func_80841CC4 /* 0FCC8 80841ED8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 0FCCC 80841EDC 03E00008 */ jr $ra /* 0FCD0 80841EE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s index 13fe9d29a0..fe97502a87 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80855444 + .float 1.2 + +glabel D_80855448 + .word 0x3F308D3E + +.text glabel func_80841EE4 /* 0FCD4 80841EE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0FCD8 80841EE8 F7B60020 */ sdc1 $f22, 0x0020($sp) @@ -174,5 +182,3 @@ glabel func_80841EE4 /* 0FF64 80842174 8FB00028 */ lw $s0, 0x0028($sp) /* 0FF68 80842178 03E00008 */ jr $ra /* 0FF6C 8084217C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s index a71941ce30..4f6fd63ef3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s @@ -65,5 +65,3 @@ glabel func_80842180 /* 10060 80842270 8FB10020 */ lw $s1, 0x0020($sp) /* 10064 80842274 03E00008 */ jr $ra /* 10068 80842278 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s index f679d6bd8f..1504d59d19 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s @@ -96,5 +96,3 @@ glabel func_8084227C /* 101D0 808423E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 101D4 808423E4 03E00008 */ jr $ra /* 101D8 808423E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s index 9d1783aabb..2fc748b481 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s @@ -79,5 +79,3 @@ glabel func_808423EC /* 10300 80842510 8FB10020 */ lw $s1, 0x0020($sp) /* 10304 80842514 03E00008 */ jr $ra /* 10308 80842518 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s index 4abab443da..5e100414e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s @@ -63,5 +63,3 @@ glabel func_8084251C /* 103F0 80842600 8FB10020 */ lw $s1, 0x0020($sp) /* 103F4 80842604 03E00008 */ jr $ra /* 103F8 80842608 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s index fd872ed436..e910459969 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s @@ -38,5 +38,3 @@ glabel func_8084260C /* 10480 80842690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10484 80842694 03E00008 */ jr $ra /* 10488 80842698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s index f40a8d288f..828466719b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s @@ -65,5 +65,3 @@ glabel func_8084269C /* 10580 80842790 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 10584 80842794 03E00008 */ jr $ra /* 10588 80842798 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s index b7f9cf7231..2bd73d408c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s @@ -51,5 +51,3 @@ glabel func_8084279C /* 10640 80842850 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 10644 80842854 03E00008 */ jr $ra /* 10648 80842858 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s index 4d254d0e25..dd36827b7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s @@ -33,5 +33,3 @@ glabel func_8084285C /* 106BC 808428CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 106C0 808428D0 03E00008 */ jr $ra /* 106C4 808428D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s index 1e3c9d1e11..98766c506a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s @@ -36,5 +36,3 @@ glabel func_808428D8 /* 10748 80842958 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1074C 8084295C 03E00008 */ jr $ra /* 10750 80842960 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s index 93d1b0d748..87ed120107 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s @@ -20,5 +20,3 @@ glabel func_80842964 /* 10798 808429A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1079C 808429AC 03E00008 */ jr $ra /* 107A0 808429B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s index 505fd54ac3..e8cadcb69c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s @@ -28,5 +28,3 @@ glabel func_808429B4 /* 1080C 80842A1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 10810 80842A20 03E00008 */ jr $ra /* 10814 80842A24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s index 8820916146..1b37195823 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s @@ -23,5 +23,3 @@ glabel func_80842A28 /* 1086C 80842A7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 10870 80842A80 03E00008 */ jr $ra /* 10874 80842A84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s index c3f876cdfa..2b323d0423 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s @@ -14,5 +14,3 @@ glabel func_80842A88 /* 108A8 80842AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 108AC 80842ABC 03E00008 */ jr $ra /* 108B0 80842AC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s index 558df5e515..1113ce96e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s @@ -47,5 +47,3 @@ glabel func_80842AC4 /* 10960 80842B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10964 80842B74 03E00008 */ jr $ra /* 10968 80842B78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s index 33c5e7f233..299513d214 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s @@ -99,5 +99,3 @@ glabel func_80842B7C /* 10AD4 80842CE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10AD8 80842CE8 03E00008 */ jr $ra /* 10ADC 80842CEC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s index 0803cfa897..76bd7b1605 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s @@ -11,5 +11,3 @@ glabel func_80842CF0 /* 10B04 80842D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 10B08 80842D18 03E00008 */ jr $ra /* 10B0C 80842D1C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s index 45babd7076..a1a747069b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s @@ -55,5 +55,3 @@ glabel func_80842D20 /* 10BD8 80842DE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 10BDC 80842DEC 03E00008 */ jr $ra /* 10BE0 80842DF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s index 7ed5280ed7..94a957f908 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s @@ -242,5 +242,3 @@ glabel func_80842DF4 /* 10F6C 8084317C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 10F70 80843180 03E00008 */ jr $ra /* 10F74 80843184 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s index fe0ba25362..286544a952 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s @@ -296,5 +296,3 @@ glabel func_80843188 /* 113A8 808435B8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 113AC 808435BC 03E00008 */ jr $ra /* 113B0 808435C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s index fca7ec4f28..a70f507170 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s @@ -87,5 +87,3 @@ glabel func_808435C4 /* 114F0 80843700 8FB10028 */ lw $s1, 0x0028($sp) /* 114F4 80843704 03E00008 */ jr $ra /* 114F8 80843708 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s index d55ae849bb..f685ff73ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s @@ -30,5 +30,3 @@ glabel func_8084370C /* 11560 80843770 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 11564 80843774 03E00008 */ jr $ra /* 11568 80843778 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s index 49ff51f9f9..7124667b1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s @@ -128,5 +128,3 @@ glabel func_8084377C /* 11738 80843948 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1173C 8084394C 03E00008 */ jr $ra /* 11740 80843950 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s index ffee2e64e2..e3727c0d14 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s @@ -60,5 +60,3 @@ glabel func_80843954 /* 1181C 80843A2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 11820 80843A30 03E00008 */ jr $ra /* 11824 80843A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s index 3de3b0cd6d..648c756515 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s @@ -46,5 +46,3 @@ glabel func_80843A38 /* 118CC 80843ADC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 118D0 80843AE0 03E00008 */ jr $ra /* 118D4 80843AE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s index d87849eb9a..e422093489 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s @@ -139,5 +139,3 @@ glabel func_80843AE8 /* 11AD0 80843CE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 11AD4 80843CE4 03E00008 */ jr $ra /* 11AD8 80843CE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s index 8c949f5d1f..d8eed99072 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s @@ -79,5 +79,3 @@ glabel func_80843CEC /* 11BF8 80843E08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 11BFC 80843E0C 03E00008 */ jr $ra /* 11C00 80843E10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s index d215335e86..ab266b8e1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s @@ -21,5 +21,3 @@ glabel func_80843E14 /* 11C48 80843E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 11C4C 80843E5C 03E00008 */ jr $ra /* 11C50 80843E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s index baf4d83b08..302e5adc1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085544C + .float 0.1 + +.text glabel func_80843E64 /* 11C54 80843E64 3C028085 */ lui $v0, %hi(D_808535E4) ## $v0 = 80850000 /* 11C58 80843E68 8C4235E4 */ lw $v0, %lo(D_808535E4)($v0) @@ -153,5 +158,3 @@ glabel func_80843E64 /* 11E80 80844090 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 11E84 80844094 03E00008 */ jr $ra /* 11E88 80844098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s index 433958275d..8dbeabbd69 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s @@ -32,5 +32,3 @@ glabel func_8084409C /* 11F00 80844110 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 11F04 80844114 03E00008 */ jr $ra /* 11F08 80844118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s index 7e9286c43c..2727519aef 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855450 + .float -1.2 + +.text glabel func_8084411C /* 11F0C 8084411C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 11F10 80844120 81CEFA13 */ lb $t6, -0x05ED($t6) ## 8015FA13 @@ -405,5 +410,3 @@ glabel func_8084411C /* 124EC 808446FC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 124F0 80844700 03E00008 */ jr $ra /* 124F4 80844704 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s index 3810e3e6a1..1d2fbe2215 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s @@ -225,5 +225,3 @@ glabel func_80844708 /* 12828 80844A38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 1282C 80844A3C 03E00008 */ jr $ra /* 12830 80844A40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s index 70a9ef111a..cfa4e0a727 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s @@ -46,5 +46,3 @@ glabel func_80844A44 /* 128D8 80844AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 128DC 80844AEC 03E00008 */ jr $ra /* 128E0 80844AF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s index 4212d7fb28..05a17827a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855454 + .float -1.2 + +.text glabel func_80844AF4 /* 128E4 80844AF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 128E8 80844AF8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -62,5 +67,3 @@ glabel func_80844AF4 /* 129C8 80844BD8 8FB10020 */ lw $s1, 0x0020($sp) /* 129CC 80844BDC 03E00008 */ jr $ra /* 129D0 80844BE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s index 7ce7ef818d..e701ef14aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855458 + .float 0.85 + +.text glabel func_80844BE4 /* 129D4 80844BE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 129D8 80844BE8 AFB00018 */ sw $s0, 0x0018($sp) @@ -75,5 +80,3 @@ glabel func_80844BE4 /* 12ADC 80844CEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 12AE0 80844CF0 03E00008 */ jr $ra /* 12AE4 80844CF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s index c6f2bf5c84..3d2f6e9ef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s @@ -13,5 +13,3 @@ glabel func_80844CF8 /* 12B14 80844D24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 12B18 80844D28 03E00008 */ jr $ra /* 12B1C 80844D2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s index bf8cad4740..b9a6e33bc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s @@ -13,5 +13,3 @@ glabel func_80844D30 /* 12B4C 80844D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 12B50 80844D60 03E00008 */ jr $ra /* 12B54 80844D64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s index 3c41ba4e8f..7dd3b084c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s @@ -23,5 +23,3 @@ glabel func_80844D68 /* 12BAC 80844DBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 12BB0 80844DC0 03E00008 */ jr $ra /* 12BB4 80844DC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s index a93098233a..c5c362ebaf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s @@ -28,5 +28,3 @@ glabel func_80844DC8 /* 12C20 80844E30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 12C24 80844E34 03E00008 */ jr $ra /* 12C28 80844E38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s index 00e25b3d52..ae635b003f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s @@ -11,5 +11,3 @@ glabel func_80844E3C /* 12C4C 80844E5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 12C50 80844E60 03E00008 */ jr $ra /* 12C54 80844E64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s index bad94d64a4..2cc74e2c19 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085545C + .float 0.1 + +.text glabel func_80844E68 /* 12C58 80844E68 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 12C5C 80844E6C AFBF0024 */ sw $ra, 0x0024($sp) @@ -107,5 +112,3 @@ glabel func_80844E68 /* 12DE4 80844FF4 8FB10020 */ lw $s1, 0x0020($sp) /* 12DE8 80844FF8 03E00008 */ jr $ra /* 12DEC 80844FFC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s index 43d88f0673..58bc396565 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80855460 + .word 0x3F39611A +glabel D_80855464 + .float 0.2 + +glabel D_80855468 + .float 0.1 + +.text glabel func_80845000 /* 12DF0 80845000 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 12DF4 80845004 AFBF002C */ sw $ra, 0x002C($sp) @@ -208,5 +218,3 @@ glabel func_80845000 /* 130EC 808452FC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 130F0 80845300 03E00008 */ jr $ra /* 130F4 80845304 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s index f10601dd14..5b37fbb437 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_8085546C + .float 0.0015 + +glabel D_80855470 + .word 0x3F39611A +glabel D_80855474 + .float 0.2 + +glabel D_80855478 + .float 0.1 + +.text glabel func_80845308 /* 130F8 80845308 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 130FC 8084530C AFBF002C */ sw $ra, 0x002C($sp) @@ -232,5 +245,3 @@ glabel func_80845308 /* 1344C 8084565C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 13450 80845660 03E00008 */ jr $ra /* 13454 80845664 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s index 89beaab967..35cd9a291d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8085547C + .word 0x3DAE147B +glabel D_80855480 + .word 0x3D9374BC + +.text glabel func_80845668 /* 13458 80845668 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 1345C 8084566C AFBF0024 */ sw $ra, 0x0024($sp) @@ -172,5 +179,3 @@ glabel func_80845668 /* 136B4 808458C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 136B8 808458C8 03E00008 */ jr $ra /* 136BC 808458CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s index 7f53425f32..736e93772e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s @@ -39,5 +39,3 @@ glabel func_808458D0 /* 13748 80845958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1374C 8084595C 03E00008 */ jr $ra /* 13750 80845960 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s index beb9111274..71bd203631 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s @@ -150,5 +150,3 @@ glabel func_80845964 /* 13984 80845B94 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 13988 80845B98 03E00008 */ jr $ra /* 1398C 80845B9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s index d01692ca20..19b12a399e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s @@ -53,5 +53,3 @@ glabel func_80845BA0 /* 13A4C 80845C5C 8FB00020 */ lw $s0, 0x0020($sp) /* 13A50 80845C60 03E00008 */ jr $ra /* 13A54 80845C64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s index f29f8812e3..13a23a56f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s @@ -15,5 +15,3 @@ glabel func_80845C68 /* 13A88 80845C98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 13A8C 80845C9C 03E00008 */ jr $ra /* 13A90 80845CA0 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s index d72a49c1a3..a0ca15cf9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855484 + .float 0.1 + +.text glabel func_80845CA4 /* 13A94 80845CA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 13A98 80845CA8 AFBF001C */ sw $ra, 0x001C($sp) @@ -160,5 +165,3 @@ glabel func_80845CA4 /* 13CDC 80845EEC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 13CE0 80845EF0 03E00008 */ jr $ra /* 13CE4 80845EF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s index 68bb77a6d9..43eb02e72d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s @@ -92,5 +92,3 @@ glabel func_80845EF8 /* 13E34 80846044 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 13E38 80846048 03E00008 */ jr $ra /* 13E3C 8084604C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s index b4bd9d0983..00ff96d08a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s @@ -56,5 +56,3 @@ glabel func_80846050 /* 13F04 80846114 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 13F08 80846118 03E00008 */ jr $ra /* 13F0C 8084611C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s index 12186350e6..044c84a157 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s @@ -86,5 +86,3 @@ glabel func_80846120 /* 14044 80846254 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 14048 80846258 03E00008 */ jr $ra /* 1404C 8084625C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s index 9da0b6a3db..fad64adf1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s @@ -66,5 +66,3 @@ glabel func_80846260 /* 1413C 8084634C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 14140 80846350 03E00008 */ jr $ra /* 14144 80846354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s index 774d14f034..d5859a4e6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s @@ -46,5 +46,3 @@ glabel func_80846358 /* 141EC 808463FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 141F0 80846400 03E00008 */ jr $ra /* 141F4 80846404 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s index 2ad11b4930..6e4d3f9b80 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s @@ -43,5 +43,3 @@ glabel func_80846408 /* 14294 808464A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 14298 808464A8 03E00008 */ jr $ra /* 1429C 808464AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s index 4af11ba75e..cda73559c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s @@ -52,5 +52,3 @@ glabel func_808464B0 /* 1435C 8084656C 8FB10018 */ lw $s1, 0x0018($sp) /* 14360 80846570 03E00008 */ jr $ra /* 14364 80846574 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s index 1afa901457..786c1d604d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s @@ -52,5 +52,3 @@ glabel func_80846578 /* 14420 80846630 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 14424 80846634 03E00008 */ jr $ra /* 14428 80846638 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s index 5bf695e1dd..482ccd93ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s @@ -2,5 +2,3 @@ glabel func_8084663C /* 1442C 8084663C AFA40000 */ sw $a0, 0x0000($sp) /* 14430 80846640 03E00008 */ jr $ra /* 14434 80846644 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s index 07ee7e3715..9b44c4c6dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s @@ -5,5 +5,3 @@ glabel func_80846648 /* 14444 80846654 ACAE0130 */ sw $t6, 0x0130($a1) ## 00000130 /* 14448 80846658 03E00008 */ jr $ra /* 1444C 8084665C ACA00134 */ sw $zero, 0x0134($a1) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s index 2e392f393b..b2ff40d69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s @@ -49,5 +49,3 @@ glabel func_80846660 /* 14504 80846714 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 14508 80846718 03E00008 */ jr $ra /* 1450C 8084671C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s index cd9622981b..e4c94b473c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s @@ -45,5 +45,3 @@ glabel func_80846720 /* 145B8 808467C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 145BC 808467CC 03E00008 */ jr $ra /* 145C0 808467D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s index 2fcd780fb1..87244bd9bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s @@ -54,5 +54,3 @@ glabel func_808467D4 /* 1468C 8084689C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 14690 808468A0 03E00008 */ jr $ra /* 14694 808468A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s index ad8c284353..9b82221bdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s @@ -15,5 +15,3 @@ glabel func_808468A8 /* 146CC 808468DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 146D0 808468E0 03E00008 */ jr $ra /* 146D4 808468E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s index 452d91be3f..4ff23714b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s @@ -35,5 +35,3 @@ glabel func_808468E8 /* 1475C 8084696C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 14760 80846970 03E00008 */ jr $ra /* 14764 80846974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s index e3d95106a0..c6cf81f0b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s @@ -16,5 +16,3 @@ glabel func_80846978 /* 147A0 808469B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 147A4 808469B4 03E00008 */ jr $ra /* 147A8 808469B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s index 3dc547ac4a..1638ad3eba 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s @@ -16,5 +16,3 @@ glabel func_808469BC /* 147E4 808469F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 147E8 808469F8 03E00008 */ jr $ra /* 147EC 808469FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s index 15d894bf8f..be3276326c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s @@ -26,5 +26,3 @@ glabel func_80846A00 /* 1484C 80846A5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 14850 80846A60 03E00008 */ jr $ra /* 14854 80846A64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s index 8ec344d683..294e7cc9c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s @@ -16,5 +16,3 @@ glabel func_80846A68 /* 14890 80846AA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 14894 80846AA4 03E00008 */ jr $ra /* 14898 80846AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s index cb66c1a079..b753d55112 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s @@ -143,5 +143,3 @@ glabel func_80846AAC /* 14ABC 80846CCC 8FB10028 */ lw $s1, 0x0028($sp) /* 14AC0 80846CD0 03E00008 */ jr $ra /* 14AC4 80846CD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s index 1b91a3e2c1..2c87bc0a8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80855290 + .asciz "../z_player.c" + .balign 4 + +.text glabel func_80846CD8 /* 14AC8 80846CD8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 14ACC 80846CDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -354,5 +360,3 @@ glabel func_80846CD8 /* 14FD8 808471E8 8FB00028 */ lw $s0, 0x0028($sp) /* 14FDC 808471EC 03E00008 */ jr $ra /* 14FE0 808471F0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s index 3b734ecc61..320317c50d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s @@ -45,5 +45,3 @@ glabel func_808471F4 /* 1507C 8084728C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 15080 80847290 03E00008 */ jr $ra /* 15084 80847294 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s index 13f6bec5b7..61e5fa1e71 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s @@ -89,5 +89,3 @@ glabel func_80847298 /* 151B8 808473C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 151BC 808473CC 03E00008 */ jr $ra /* 151C0 808473D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s index a8b6544341..b4e64986fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s @@ -480,5 +480,3 @@ glabel func_808473D4 /* 1585C 80847A6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 15860 80847A70 03E00008 */ jr $ra /* 15864 80847A74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s index fd7f2356d1..771818caae 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s @@ -82,5 +82,3 @@ glabel func_80847A78 /* 15984 80847B94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 15988 80847B98 03E00008 */ jr $ra /* 1598C 80847B9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s index 7d67ea2f6b..284cb452c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s @@ -1,3 +1,23 @@ +.late_rodata +glabel D_80855488 + .word 0x38A7C5AC +glabel D_8085548C + .float 0.1 + +glabel D_80855490 + .word 0x38000100 +glabel D_80855494 + .word 0x43C7FAE2 +glabel D_80855498 + .word 0x43C7FAE2 +glabel D_8085549C + .word 0x38000100 +glabel D_808554A0 + .word 0x38000100 +glabel D_808554A4 + .word 0x38000100 + +.text glabel func_80847BA0 /* 15990 80847BA0 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 /* 15994 80847BA4 AFBF002C */ sw $ra, 0x002C($sp) @@ -768,5 +788,3 @@ glabel func_80847BA0 /* 1648C 8084869C 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 /* 16490 808486A0 03E00008 */ jr $ra /* 16494 808486A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s index f2dee01e96..475e4ba7e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s @@ -244,5 +244,3 @@ glabel func_808486A8 /* 167E8 808489F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 167EC 808489FC 03E00008 */ jr $ra /* 167F0 80848A00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s index a920dfc88c..b4a9f2fba3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s @@ -87,5 +87,3 @@ glabel func_80848A04 /* 16928 80848B38 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 1692C 80848B3C 03E00008 */ jr $ra /* 16930 80848B40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s index ab9c78f635..061cec61ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_808554A8 + .word 0x418F3333 + +.text glabel func_80848B44 /* 16934 80848B44 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 16938 80848B48 AFBF0024 */ sw $ra, 0x0024($sp) @@ -81,5 +86,3 @@ glabel func_80848B44 /* 16A58 80848C68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 16A5C 80848C6C 03E00008 */ jr $ra /* 16A60 80848C70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s index 59e015d6ac..688a1bdf05 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_808554AC + .float 0.4 + +glabel D_808554B0 + .float 0.2 + +glabel D_808554B4 + .word 0x3E4CCCCC +glabel D_808554B8 + .float 0.01 + +glabel D_808554BC + .float 0.02 + +glabel D_808554C0 + .float 0.01 + +.text glabel func_80848C74 /* 16A64 80848C74 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 16A68 80848C78 AFBF0044 */ sw $ra, 0x0044($sp) @@ -179,5 +198,3 @@ glabel func_80848C74 /* 16CDC 80848EEC 8FB30040 */ lw $s3, 0x0040($sp) /* 16CE0 80848EF0 03E00008 */ jr $ra /* 16CE4 80848EF4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s index a7b7ff3804..9cd6e43751 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_808554C4 + .word 0x48435000 +glabel D_808554C8 + .word 0x4A742400 + +.text glabel func_80848EF8 /* 16CE8 80848EF8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 /* 16CEC 80848EFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 @@ -43,5 +50,3 @@ glabel func_80848EF8 /* 16D80 80848F90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 16D84 80848F94 03E00008 */ jr $ra /* 16D88 80848F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s index 233edb27d7..602c1aadf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_808554CC + .float 0.1 + +glabel D_808554D0 + .word 0x7F7FFFFF +glabel D_808554D4 + .word 0x7F7FFFFF +glabel D_808554D8 + .float 0.8 + +.text glabel func_80848F9C /* 16D8C 80848F9C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 16D90 80848FA0 3C018086 */ lui $at, %hi(D_80858AB4) ## $at = 80860000 @@ -1073,5 +1085,3 @@ glabel func_80848F9C /* 17C8C 80849E9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 17C90 80849EA0 03E00008 */ jr $ra /* 17C94 80849EA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s index 39b095e5f5..68744fdacd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s @@ -154,5 +154,3 @@ glabel func_80849EA8 /* 17ECC 8084A0DC 8FB0002C */ lw $s0, 0x002C($sp) /* 17ED0 8084A0E0 03E00008 */ jr $ra /* 17ED4 8084A0E4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s index f887fa3db4..64ce068cd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s @@ -1,3 +1,33 @@ +.rdata +glabel D_808552A0 + .asciz "../z_player.c" + .balign 4 + +glabel D_808552B0 + .asciz "../z_player.c" + .balign 4 + +glabel D_808552C0 + .asciz "../z_player.c" + .balign 4 + +glabel D_808552D0 + .asciz "../z_player.c" + .balign 4 + +glabel D_808552E0 + .asciz "../z_player.c" + .balign 4 + +.late_rodata +glabel D_808554DC + .word 0xC4966000 +glabel D_808554E0 + .word 0xC4966000 +glabel D_808554E4 + .word 0x3DE38E39 + +.text glabel func_8084A0E8 /* 17ED8 8084A0E8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 17EDC 8084A0EC AFB00034 */ sw $s0, 0x0034($sp) @@ -319,5 +349,3 @@ glabel func_8084A0E8 /* 183A8 8084A5B8 8FB10038 */ lw $s1, 0x0038($sp) /* 183AC 8084A5BC 03E00008 */ jr $ra /* 183B0 8084A5C0 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s index f29984a5ad..9636a4d863 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s @@ -1,3 +1,27 @@ +.rdata +glabel D_808552F0 + .asciz "../z_player.c" + .balign 4 + +glabel D_80855300 + .asciz "../z_player.c" + .balign 4 + +glabel D_80855310 + .asciz "../z_player.c" + .balign 4 + +.late_rodata +glabel D_808554E8 + .float 3.14159274101 + +glabel D_808554EC + .float 1.1 + +glabel D_808554F0 + .word 0x3F733333 + +.text glabel func_8084A5C4 /* 183B4 8084A5C4 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 /* 183B8 8084A5C8 AFBF003C */ sw $ra, 0x003C($sp) @@ -372,5 +396,3 @@ glabel func_8084A5C4 /* 18938 8084AB48 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 1893C 8084AB4C 03E00008 */ jr $ra /* 18940 8084AB50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s index e9272374a4..39d59e8b30 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s @@ -33,5 +33,3 @@ glabel func_8084AB54 /* 189BC 8084ABCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 189C0 8084ABD0 03E00008 */ jr $ra /* 189C4 8084ABD4 AC2EE664 */ sw $t6, -0x199C($at) ## 8015E664 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s index 266f834ee0..72fdf5d454 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_808554F4 + .float 1500.0 + +glabel D_808554F8 + .word 0xC4BB8000 + +.text glabel func_8084ABD8 /* 189C8 8084ABD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 189CC 8084ABDC AFBF0024 */ sw $ra, 0x0024($sp) @@ -215,5 +223,3 @@ glabel func_8084ABD8 /* 18CD0 8084AEE0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 18CD4 8084AEE4 03E00008 */ jr $ra /* 18CD8 8084AEE8 00021403 */ sra $v0, $v0, 16 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s index 8b7f281dd3..74180a3e5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_808554FC + .float 0.8 + +glabel D_80855500 + .float 0.02 + +glabel D_80855504 + .float 0.05 + +.text glabel func_8084AEEC /* 18CDC 8084AEEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 18CE0 8084AEF0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 @@ -72,5 +83,3 @@ glabel func_8084AEEC /* 18DE4 8084AFF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 18DE8 8084AFF8 03E00008 */ jr $ra /* 18DEC 8084AFFC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s index 56eefaf785..1b90d5aaf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_80855508 + .word 0xBDCCCCCD +glabel D_8085550C + .word 0xBE4CCCCD +glabel D_80855510 + .word 0xBE99999A +glabel D_80855514 + .float 0.1 + +.text glabel func_8084B000 /* 18DF0 8084B000 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 18DF4 8084B004 C4800060 */ lwc1 $f0, 0x0060($a0) ## 00000060 @@ -97,5 +108,3 @@ glabel func_8084B000 .L8084B150: /* 18F40 8084B150 03E00008 */ jr $ra /* 18F44 8084B154 E482006C */ swc1 $f2, 0x006C($a0) ## 0000006C - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s index 5f490f62f2..d7e31d4a8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s @@ -35,5 +35,3 @@ glabel func_8084B158 /* 18FBC 8084B1CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 18FC0 8084B1D0 03E00008 */ jr $ra /* 18FC4 8084B1D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s index ea15102b0e..0157a922eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s @@ -140,5 +140,3 @@ glabel func_8084B1D8 /* 191B0 8084B3C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 191B4 8084B3C4 03E00008 */ jr $ra /* 191B8 8084B3C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s index 67da2e29f5..308e3abb9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s @@ -53,5 +53,3 @@ glabel func_8084B3CC /* 1927C 8084B48C 8FB10018 */ lw $s1, 0x0018($sp) /* 19280 8084B490 03E00008 */ jr $ra /* 19284 8084B494 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s index 101522316e..05875312d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s @@ -16,5 +16,3 @@ glabel func_8084B498 .L8084B4CC: /* 192BC 8084B4CC 03E00008 */ jr $ra /* 192C0 8084B4D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s index f72a892066..c257ca9621 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s @@ -24,5 +24,3 @@ glabel func_8084B4D4 /* 19314 8084B524 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 19318 8084B528 03E00008 */ jr $ra /* 1931C 8084B52C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s index 64e745bc6f..b066df8ee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s @@ -165,5 +165,3 @@ glabel func_8084B530 /* 19570 8084B780 8FB10018 */ lw $s1, 0x0018($sp) /* 19574 8084B784 03E00008 */ jr $ra /* 19578 8084B788 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s index 6da87a5863..a7f9f7bab5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s @@ -47,5 +47,3 @@ glabel func_8084B78C /* 19624 8084B834 8FB10020 */ lw $s1, 0x0020($sp) /* 19628 8084B838 03E00008 */ jr $ra /* 1962C 8084B83C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s index 2db4ed5cc8..17b833c43b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s @@ -23,5 +23,3 @@ glabel func_8084B840 /* 1967C 8084B88C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 19680 8084B890 03E00008 */ jr $ra /* 19684 8084B894 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s index 679237b65e..41d38c2512 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s @@ -89,5 +89,3 @@ glabel func_8084B898 /* 197C8 8084B9D8 8FB10020 */ lw $s1, 0x0020($sp) /* 197CC 8084B9DC 03E00008 */ jr $ra /* 197D0 8084B9E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s index 8d137e9ed7..bf4007102a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s @@ -139,5 +139,3 @@ glabel func_8084B9E4 /* 199C8 8084BBD8 8FB10030 */ lw $s1, 0x0030($sp) /* 199CC 8084BBDC 03E00008 */ jr $ra /* 199D0 8084BBE0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s index 515fb036aa..f5b9d40892 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80855518 + .float -0.8 + +glabel D_8085551C + .float 0.8 + +.text glabel func_8084BBE4 /* 199D4 8084BBE4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 199D8 8084BBE8 AFBF0024 */ sw $ra, 0x0024($sp) @@ -150,5 +158,3 @@ glabel func_8084BBE4 /* 19BE0 8084BDF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 19BE4 8084BDF4 03E00008 */ jr $ra /* 19BE8 8084BDF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s index 54d714bed2..05e67ae82e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s @@ -61,5 +61,3 @@ glabel func_8084BDFC /* 19CC8 8084BED8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 19CCC 8084BEDC 03E00008 */ jr $ra /* 19CD0 8084BEE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s index 4d91ad652a..b46c9656ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s @@ -14,5 +14,3 @@ glabel func_8084BEE4 /* 19D00 8084BF10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 19D04 8084BF14 03E00008 */ jr $ra /* 19D08 8084BF18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s index edbed9629a..1386fe2de5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_80855520 + .word 0x3D051EB8 +glabel D_80855524 + .float 0.05 + +glabel D_80855528 + .word 0x40566666 + +.text glabel func_8084BF1C /* 19D0C 8084BF1C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 19D10 8084BF20 AFBF002C */ sw $ra, 0x002C($sp) @@ -479,5 +489,3 @@ glabel func_8084BF1C /* 1A3DC 8084C5EC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 /* 1A3E0 8084C5F0 03E00008 */ jr $ra /* 1A3E4 8084C5F4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s index 581142c885..82e317b9d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s @@ -96,5 +96,3 @@ glabel func_8084C5F8 /* 1A544 8084C754 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 1A548 8084C758 03E00008 */ jr $ra /* 1A54C 8084C75C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s index b19f3208cd..ffddb3a21d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085552C + .float 0.03 + +.text glabel func_8084C760 /* 1A550 8084C760 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 1A554 8084C764 AFBF0014 */ sw $ra, 0x0014($sp) @@ -50,5 +55,3 @@ glabel func_8084C760 /* 1A600 8084C810 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1A604 8084C814 03E00008 */ jr $ra /* 1A608 8084C818 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s index 19c416bc04..4a74e2106d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s @@ -33,5 +33,3 @@ glabel func_8084C81C /* 1A680 8084C890 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1A684 8084C894 03E00008 */ jr $ra /* 1A688 8084C898 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s index 27dd89b834..12b4a21a7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s @@ -75,5 +75,3 @@ glabel func_8084C89C /* 1A7A0 8084C9B0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 1A7A4 8084C9B4 03E00008 */ jr $ra /* 1A7A8 8084C9B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s index cf41369592..a5e0269572 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s @@ -158,5 +158,3 @@ glabel func_8084C9BC /* 1A9D8 8084CBE8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 1A9DC 8084CBEC 03E00008 */ jr $ra /* 1A9E0 8084CBF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s index 1766aa786e..be48836aac 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s @@ -44,5 +44,3 @@ glabel func_8084CBF4 .L8084CC90: /* 1AA80 8084CC90 03E00008 */ jr $ra /* 1AA84 8084CC94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s index 2f48bfb755..5d723dd6cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80855530 + .float 0.1 + +glabel D_80855534 + .float 0.2 + +.text glabel func_8084CC98 /* 1AA88 8084CC98 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 1AA8C 8084CC9C AFBF0024 */ sw $ra, 0x0024($sp) @@ -516,5 +524,3 @@ glabel func_8084CC98 /* 1B1C8 8084D3D8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 1B1CC 8084D3DC 03E00008 */ jr $ra /* 1B1D0 8084D3E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s index 12a51c9375..62fc070403 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s @@ -89,5 +89,3 @@ glabel func_8084D3E4 /* 1B314 8084D524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1B318 8084D528 03E00008 */ jr $ra /* 1B31C 8084D52C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s index 617c70906b..a4ef9f9399 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s @@ -16,5 +16,3 @@ glabel func_8084D530 /* 1B358 8084D568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1B35C 8084D56C 03E00008 */ jr $ra /* 1B360 8084D570 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s index 4694c36617..d91b06c77b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s @@ -21,5 +21,3 @@ glabel func_8084D574 /* 1B3B0 8084D5C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1B3B4 8084D5C4 03E00008 */ jr $ra /* 1B3B8 8084D5C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s index b265b44535..f00b3399e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s @@ -16,5 +16,3 @@ glabel func_8084D5CC /* 1B3F4 8084D604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1B3F8 8084D608 03E00008 */ jr $ra /* 1B3FC 8084D60C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s index ed2c24ac69..9499ed6462 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s @@ -117,5 +117,3 @@ glabel func_8084D610 /* 1B5A8 8084D7B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 1B5AC 8084D7BC 03E00008 */ jr $ra /* 1B5B0 8084D7C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s index e53b8192cd..8f6326bdb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s @@ -37,5 +37,3 @@ glabel func_8084D7C4 /* 1B630 8084D840 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1B634 8084D844 03E00008 */ jr $ra /* 1B638 8084D848 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s index 23748c0009..e1fd6f1396 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s @@ -82,5 +82,3 @@ glabel func_8084D84C /* 1B764 8084D974 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 1B768 8084D978 03E00008 */ jr $ra /* 1B76C 8084D97C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s index b9eb296331..de04de72a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s @@ -84,5 +84,3 @@ glabel func_8084D980 /* 1B898 8084DAA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1B89C 8084DAAC 03E00008 */ jr $ra /* 1B8A0 8084DAB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s index a5a19061a2..ae26cbe95e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s @@ -71,5 +71,3 @@ glabel func_8084DAB4 /* 1B9A8 8084DBB8 8FB10020 */ lw $s1, 0x0020($sp) /* 1B9AC 8084DBBC 03E00008 */ jr $ra /* 1B9B0 8084DBC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s index 7d5b8e7a8f..84f538a18b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s @@ -32,5 +32,3 @@ glabel func_8084DBC4 /* 1BA2C 8084DC3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1BA30 8084DC40 03E00008 */ jr $ra /* 1BA34 8084DC44 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s index 4b6388d876..67cd4ef12d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_80855538 + .word 0x3C9374BC + +.text glabel func_8084DC48 /* 1BA38 8084DC48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 1BA3C 8084DC4C AFBF001C */ sw $ra, 0x001C($sp) @@ -214,5 +219,3 @@ glabel func_8084DC48 /* 1BD50 8084DF60 8FB10018 */ lw $s1, 0x0018($sp) /* 1BD54 8084DF64 03E00008 */ jr $ra /* 1BD58 8084DF68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s index 800722901e..dc9ab8e9a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s @@ -15,5 +15,3 @@ glabel func_8084DF6C /* 1BD90 8084DFA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1BD94 8084DFA4 03E00008 */ jr $ra /* 1BD98 8084DFA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s index 3031657278..b6437dfcda 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s @@ -17,5 +17,3 @@ glabel func_8084DFAC /* 1BDD8 8084DFE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1BDDC 8084DFEC 03E00008 */ jr $ra /* 1BDE0 8084DFF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s index 454f2aa73a..4ef51e5155 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s @@ -140,5 +140,3 @@ glabel func_8084DFF4 /* 1BFD0 8084E1E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1BFD4 8084E1E4 03E00008 */ jr $ra /* 1BFD8 8084E1E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s index 7ddb9c9e4a..c6fbc7d7e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s @@ -76,5 +76,3 @@ glabel func_8084E1EC /* 1C0F0 8084E300 8FB10018 */ lw $s1, 0x0018($sp) /* 1C0F4 8084E304 03E00008 */ jr $ra /* 1C0F8 8084E308 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s index 7c37a2ef2f..0d24873cae 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s @@ -23,5 +23,3 @@ glabel func_8084E30C /* 1C14C 8084E35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1C150 8084E360 03E00008 */ jr $ra /* 1C154 8084E364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s index 444f7f0cb9..6a4b91bd54 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s @@ -23,5 +23,3 @@ glabel func_8084E368 /* 1C1A8 8084E3B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1C1AC 8084E3BC 03E00008 */ jr $ra /* 1C1B0 8084E3C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s index 9bb442e6df..1d66a75e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s @@ -154,5 +154,3 @@ glabel func_8084E3C4 /* 1C3E8 8084E5F8 8FB10030 */ lw $s1, 0x0030($sp) /* 1C3EC 8084E5FC 03E00008 */ jr $ra /* 1C3F0 8084E600 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s index 706fa7b27c..3d4c216eae 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s @@ -54,5 +54,3 @@ glabel func_8084E604 /* 1C4B8 8084E6C8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 1C4BC 8084E6CC 03E00008 */ jr $ra /* 1C4C0 8084E6D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s index 4a6f3bdec4..1d63216c23 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s @@ -189,5 +189,3 @@ glabel func_8084E6D4 /* 1C76C 8084E97C 8FB10030 */ lw $s1, 0x0030($sp) /* 1C770 8084E980 03E00008 */ jr $ra /* 1C774 8084E984 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s index 2e8b1e37bc..9adbf49a34 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s @@ -8,5 +8,3 @@ glabel func_8084E988 /* 1C790 8084E9A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1C794 8084E9A4 03E00008 */ jr $ra /* 1C798 8084E9A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s index 055d09f28d..acf2dc38a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s @@ -76,5 +76,3 @@ glabel func_8084E9AC /* 1C8A4 8084EAB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1C8A8 8084EAB8 03E00008 */ jr $ra /* 1C8AC 8084EABC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s index 362d0d2744..c651bacdc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s @@ -135,5 +135,3 @@ glabel func_8084EAC0 /* 1CA88 8084EC98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1CA8C 8084EC9C 03E00008 */ jr $ra /* 1CA90 8084ECA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s index d7debbf37a..7d2fb450ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s @@ -152,5 +152,3 @@ glabel func_8084ECA4 /* 1CCBC 8084EECC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1CCC0 8084EED0 03E00008 */ jr $ra /* 1CCC4 8084EED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s index a91914f56e..397d3a1f16 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s @@ -61,5 +61,3 @@ glabel func_8084EED8 /* 1CDA4 8084EFB4 8FB10020 */ lw $s1, 0x0020($sp) /* 1CDA8 8084EFB8 03E00008 */ jr $ra /* 1CDAC 8084EFBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s index 61d95558e5..f6b3e9ec8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s @@ -86,5 +86,3 @@ glabel func_8084EFC0 /* 1CEE8 8084F0F8 8FB10030 */ lw $s1, 0x0030($sp) /* 1CEEC 8084F0FC 03E00008 */ jr $ra /* 1CEF0 8084F100 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s index 3f6cd7096c..fd63c63787 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s @@ -142,5 +142,3 @@ glabel func_8084F104 /* 1D0EC 8084F2FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1D0F0 8084F300 03E00008 */ jr $ra /* 1D0F4 8084F304 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s index da4dd0e8b4..22888400a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s @@ -35,5 +35,3 @@ glabel func_8084F308 /* 1D174 8084F384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1D178 8084F388 03E00008 */ jr $ra /* 1D17C 8084F38C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s index 52f067067c..89617ec5df 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_8085553C + .word 0x3C75C28F +glabel D_80855540 + .float 0.01 + +.text glabel func_8084F390 /* 1D180 8084F390 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 1D184 8084F394 AFBF0024 */ sw $ra, 0x0024($sp) @@ -172,5 +179,3 @@ glabel func_8084F390 /* 1D3EC 8084F5FC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 1D3F0 8084F600 03E00008 */ jr $ra /* 1D3F4 8084F604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s index 73232d7d5a..7d48e4fb8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s @@ -39,5 +39,3 @@ glabel func_8084F608 /* 1D47C 8084F68C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1D480 8084F690 03E00008 */ jr $ra /* 1D484 8084F694 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s index f9d55e415c..b0c4e5ffb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s @@ -30,5 +30,3 @@ glabel func_8084F698 /* 1D4F4 8084F704 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1D4F8 8084F708 03E00008 */ jr $ra /* 1D4FC 8084F70C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s index e17ed3a05f..8ee3e23162 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s @@ -105,5 +105,3 @@ glabel func_8084F710 /* 1D670 8084F880 8FB10020 */ lw $s1, 0x0020($sp) /* 1D674 8084F884 03E00008 */ jr $ra /* 1D678 8084F888 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s index 4228edb91a..40836aed09 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s @@ -76,5 +76,3 @@ glabel func_8084F88C /* 1D784 8084F994 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1D788 8084F998 03E00008 */ jr $ra /* 1D78C 8084F99C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s index 20d5b02cd4..c5a71dd905 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s @@ -7,5 +7,3 @@ glabel func_8084F9A0 /* 1D7A4 8084F9B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1D7A8 8084F9B8 03E00008 */ jr $ra /* 1D7AC 8084F9BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s index 9d67aacea1..c31217680d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s @@ -39,5 +39,3 @@ glabel func_8084F9C0 /* 1D838 8084FA48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1D83C 8084FA4C 03E00008 */ jr $ra /* 1D840 8084FA50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s index 3c53d9e5c7..25bdb60073 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s @@ -48,5 +48,3 @@ glabel func_8084FA54 /* 1D8F4 8084FB04 8FB10018 */ lw $s1, 0x0018($sp) /* 1D8F8 8084FB08 03E00008 */ jr $ra /* 1D8FC 8084FB0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s index 4c74fbfe0b..19d11bce71 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s @@ -62,5 +62,3 @@ glabel func_8084FB10 /* 1D9D8 8084FBE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1D9DC 8084FBEC 03E00008 */ jr $ra /* 1D9E0 8084FBF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s index 7157878ed5..e36418b8f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s @@ -50,5 +50,3 @@ glabel func_8084FBF4 /* 1DA90 8084FCA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1DA94 8084FCA4 03E00008 */ jr $ra /* 1DA98 8084FCA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s index 5308209d44..eb4a78b993 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80855320 + .asciz "DEBUG MODE" + .balign 4 + +.text glabel func_8084FCAC /* 1DA9C 8084FCAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 1DAA0 8084FCB0 3C078086 */ lui $a3, %hi(D_80858AB4) ## $a3 = 80860000 @@ -199,5 +205,3 @@ glabel func_8084FCAC /* 1DD60 8084FF70 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1DD64 8084FF74 03E00008 */ jr $ra /* 1DD68 8084FF78 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s index d6321444fc..5a7176fb0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_80855544 + .float 0.3 + +glabel D_80855548 + .float 9.99999974738e-06 + +.text glabel func_8084FF7C /* 1DD6C 8084FF7C C482085C */ lwc1 $f2, 0x085C($a0) ## 0000085C /* 1DD70 8084FF80 C4840858 */ lwc1 $f4, 0x0858($a0) ## 00000858 @@ -47,5 +55,3 @@ glabel func_8084FF7C .L80850024: /* 1DE14 80850024 03E00008 */ jr $ra /* 1DE18 80850028 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s index 5d2bb6f9f2..8638a89911 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s @@ -135,5 +135,3 @@ glabel func_8085002C /* 1E008 80850218 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1E00C 8085021C 03E00008 */ jr $ra /* 1E010 80850220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s index faac63a413..24c6d896f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s @@ -44,5 +44,3 @@ glabel func_80850224 /* 1E0B4 808502C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1E0B8 808502C8 03E00008 */ jr $ra /* 1E0BC 808502CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s index 9e57e1a17d..cf2b07bcb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s @@ -212,5 +212,3 @@ glabel func_808502D0 /* 1E3C0 808505D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 1E3C4 808505D4 03E00008 */ jr $ra /* 1E3C8 808505D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s index 3cb97273bf..bcb3674ab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s @@ -24,5 +24,3 @@ glabel func_808505DC /* 1E420 80850630 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1E424 80850634 03E00008 */ jr $ra /* 1E428 80850638 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s index 3f8e56d067..436e6d0790 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s @@ -80,5 +80,3 @@ glabel func_8085063C /* 1E550 80850760 8FB10018 */ lw $s1, 0x0018($sp) /* 1E554 80850764 03E00008 */ jr $ra /* 1E558 80850768 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s index bcfe35b00f..1583c1adb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s @@ -36,5 +36,3 @@ glabel func_8085076C /* 1E5D8 808507E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1E5DC 808507EC 03E00008 */ jr $ra /* 1E5E0 808507F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s index e79536349e..8ba64811e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s @@ -201,5 +201,3 @@ glabel func_808507F4 /* 1E8D0 80850AE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1E8D4 80850AE4 03E00008 */ jr $ra /* 1E8D8 80850AE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s index 7bf714bfbe..04548804e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s @@ -103,5 +103,3 @@ glabel func_80850AEC /* 1EA4C 80850C5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1EA50 80850C60 03E00008 */ jr $ra /* 1EA54 80850C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s index e7e8ea4516..99d29a644e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s @@ -144,5 +144,3 @@ glabel func_80850C68 /* 1EC68 80850E78 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 1EC6C 80850E7C 03E00008 */ jr $ra /* 1EC70 80850E80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s index 0ec458c4d6..11a09b40df 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s @@ -21,5 +21,3 @@ glabel func_80850E84 /* 1ECBC 80850ECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1ECC0 80850ED0 03E00008 */ jr $ra /* 1ECC4 80850ED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s index 45b164c4a2..0194b0b25f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s @@ -16,5 +16,3 @@ glabel func_80850ED8 /* 1ED00 80850F10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1ED04 80850F14 03E00008 */ jr $ra /* 1ED08 80850F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s index dac00da7b6..a3b48477ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s @@ -32,5 +32,3 @@ glabel func_80850F1C /* 1ED80 80850F90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1ED84 80850F94 03E00008 */ jr $ra /* 1ED88 80850F98 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s index 3854a36347..9d239656b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s @@ -26,5 +26,3 @@ glabel func_80850F9C /* 1EDEC 80850FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1EDF0 80851000 03E00008 */ jr $ra /* 1EDF4 80851004 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s index bc675edc57..65b285c1ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s @@ -9,5 +9,3 @@ glabel func_80851008 /* 1EE14 80851024 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EE18 80851028 03E00008 */ jr $ra /* 1EE1C 8085102C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s index f8dcbe68e2..8c6bd4820d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s @@ -7,5 +7,3 @@ glabel func_80851030 /* 1EE34 80851044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EE38 80851048 03E00008 */ jr $ra /* 1EE3C 8085104C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s index e10683e313..5f13945855 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s @@ -16,5 +16,3 @@ glabel func_80851050 /* 1EE78 80851088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EE7C 8085108C 03E00008 */ jr $ra /* 1EE80 80851090 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s index e28bc5024f..0ff33385e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s @@ -7,5 +7,3 @@ glabel func_80851094 /* 1EE98 808510A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EE9C 808510AC 03E00008 */ jr $ra /* 1EEA0 808510B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s index 890ffef56b..c174ebe2a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s @@ -7,5 +7,3 @@ glabel func_808510B4 /* 1EEB8 808510C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EEBC 808510CC 03E00008 */ jr $ra /* 1EEC0 808510D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s index ce2e3e5445..97fdc127c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s @@ -7,5 +7,3 @@ glabel func_808510D4 /* 1EED8 808510E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EEDC 808510EC 03E00008 */ jr $ra /* 1EEE0 808510F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s index 04a918c5f9..80c22a397e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s @@ -7,5 +7,3 @@ glabel func_808510F4 /* 1EEF8 80851108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EEFC 8085110C 03E00008 */ jr $ra /* 1EF00 80851110 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s index 02512df1e8..8c2c6024e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s @@ -7,5 +7,3 @@ glabel func_80851114 /* 1EF18 80851128 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EF1C 8085112C 03E00008 */ jr $ra /* 1EF20 80851130 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s index f737984291..c899fe1d3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s @@ -7,5 +7,3 @@ glabel func_80851134 /* 1EF38 80851148 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EF3C 8085114C 03E00008 */ jr $ra /* 1EF40 80851150 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s index 377d412183..c9afc936d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s @@ -7,5 +7,3 @@ glabel func_80851154 /* 1EF58 80851168 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EF5C 8085116C 03E00008 */ jr $ra /* 1EF60 80851170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s index ceaf4e02c3..6a131675ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s @@ -7,5 +7,3 @@ glabel func_80851174 /* 1EF78 80851188 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EF7C 8085118C 03E00008 */ jr $ra /* 1EF80 80851190 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s index 7090a40c66..bbd28af0f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s @@ -7,5 +7,3 @@ glabel func_80851194 /* 1EF98 808511A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EF9C 808511AC 03E00008 */ jr $ra /* 1EFA0 808511B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s index 6d458b85b8..4f7ec758fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s @@ -7,5 +7,3 @@ glabel func_808511B4 /* 1EFB8 808511C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EFBC 808511CC 03E00008 */ jr $ra /* 1EFC0 808511D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s index c6a4569bd1..b0d734a267 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s @@ -9,5 +9,3 @@ glabel func_808511D4 /* 1EFE0 808511F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1EFE4 808511F4 03E00008 */ jr $ra /* 1EFE8 808511F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s index d15a026646..07338462cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s @@ -19,5 +19,3 @@ glabel func_808511FC /* 1F02C 8085123C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F030 80851240 03E00008 */ jr $ra /* 1F034 80851244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s index b1d56358bd..f16f5ab93d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s @@ -19,5 +19,3 @@ glabel func_80851248 /* 1F078 80851288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F07C 8085128C 03E00008 */ jr $ra /* 1F080 80851290 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s index 32aef7bfcd..91646f9b00 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s @@ -19,5 +19,3 @@ glabel func_80851294 /* 1F0C4 808512D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F0C8 808512D8 03E00008 */ jr $ra /* 1F0CC 808512DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s index cacb419f12..5f6a57d0dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s @@ -12,5 +12,3 @@ glabel func_808512E0 /* 1F0F8 80851308 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F0FC 8085130C 03E00008 */ jr $ra /* 1F100 80851310 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s index d05c643ff9..cafcdcd73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s @@ -23,5 +23,3 @@ glabel func_80851314 /* 1F14C 8085135C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F150 80851360 03E00008 */ jr $ra /* 1F154 80851364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s index 4c5890600e..9de95b0f55 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s @@ -20,5 +20,3 @@ glabel func_80851368 /* 1F1A0 808513B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F1A4 808513B4 03E00008 */ jr $ra /* 1F1A8 808513B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s index a85a1d2803..67e40c490a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s @@ -71,5 +71,3 @@ glabel func_808513BC /* 1F2A4 808514B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1F2A8 808514B8 03E00008 */ jr $ra /* 1F2AC 808514BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s index 27c3d4f8a8..28553f42b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s @@ -50,5 +50,3 @@ glabel func_808514C0 /* 1F360 80851570 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1F364 80851574 03E00008 */ jr $ra /* 1F368 80851578 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s index b139c16206..94b08f7998 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s @@ -9,5 +9,3 @@ glabel func_8085157C /* 1F388 80851598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F38C 8085159C 03E00008 */ jr $ra /* 1F390 808515A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s index 92e0b87e96..e86c6f268b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s @@ -62,5 +62,3 @@ glabel func_808515A4 /* 1F46C 8085167C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 1F470 80851680 03E00008 */ jr $ra /* 1F474 80851684 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s index f6c4fde479..1cded6c2ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s @@ -53,5 +53,3 @@ glabel func_80851688 /* 1F534 80851744 8FB10018 */ lw $s1, 0x0018($sp) /* 1F538 80851748 03E00008 */ jr $ra /* 1F53C 8085174C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s index ac0db036df..d622b5a643 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s @@ -13,5 +13,3 @@ glabel func_80851750 /* 1F56C 8085177C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F570 80851780 03E00008 */ jr $ra /* 1F574 80851784 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s index edd0861e57..34967caf18 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_8085554C + .float 0.1 + +.text glabel func_80851788 /* 1F578 80851788 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 1F57C 8085178C AFBF0014 */ sw $ra, 0x0014($sp) @@ -43,5 +48,3 @@ glabel func_80851788 /* 1F60C 8085181C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F610 80851820 03E00008 */ jr $ra /* 1F614 80851824 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s index fe297908b1..1f42e0b1aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s @@ -49,5 +49,3 @@ glabel func_80851828 /* 1F6C0 808518D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1F6C4 808518D4 03E00008 */ jr $ra /* 1F6C8 808518D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s index eb1f7b539d..5b7b935173 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s @@ -11,5 +11,3 @@ glabel func_808518DC /* 1F6F0 80851900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F6F4 80851904 03E00008 */ jr $ra /* 1F6F8 80851908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s index fc667a2aec..02484dd012 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s @@ -37,5 +37,3 @@ glabel func_8085190C /* 1F77C 8085198C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1F780 80851990 03E00008 */ jr $ra /* 1F784 80851994 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s index 6133bc7453..558480556f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s @@ -9,5 +9,3 @@ glabel func_80851998 /* 1F7A4 808519B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1F7A8 808519B8 03E00008 */ jr $ra /* 1F7AC 808519BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s index 25df4cee55..40996a7dbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s @@ -10,5 +10,3 @@ glabel func_808519C0 /* 1F7D0 808519E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1F7D4 808519E4 03E00008 */ jr $ra /* 1F7D8 808519E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s index 3d885b2062..f583f8435c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s @@ -25,5 +25,3 @@ glabel func_808519EC /* 1F834 80851A44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1F838 80851A48 03E00008 */ jr $ra /* 1F83C 80851A4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s index 5be2214902..0bd7dbc6ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s @@ -87,5 +87,3 @@ glabel func_80851A50 /* 1F974 80851B84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 1F978 80851B88 03E00008 */ jr $ra /* 1F97C 80851B8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s index 9b7319895d..0c8d966506 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s @@ -21,5 +21,3 @@ glabel func_80851B90 /* 1F9CC 80851BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1F9D0 80851BE0 03E00008 */ jr $ra /* 1F9D4 80851BE4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s index ea60fd8225..8c7b549792 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s @@ -49,5 +49,3 @@ glabel func_80851BE8 /* 1FA88 80851C98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 1FA8C 80851C9C 03E00008 */ jr $ra /* 1FA90 80851CA0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s index 48b4bcd8bc..0724379239 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s @@ -36,5 +36,3 @@ glabel func_80851CA4 /* 1FB10 80851D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FB14 80851D24 03E00008 */ jr $ra /* 1FB18 80851D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s index a3684ccfd2..11959bf08e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s @@ -20,5 +20,3 @@ glabel func_80851D2C /* 1FB64 80851D74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1FB68 80851D78 03E00008 */ jr $ra /* 1FB6C 80851D7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s index 9ca74e5cb4..98e1ef88db 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s @@ -28,5 +28,3 @@ glabel func_80851D80 /* 1FBD0 80851DE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1FBD4 80851DE4 03E00008 */ jr $ra /* 1FBD8 80851DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s index 33f2b690fb..c4fbaac43e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s @@ -15,5 +15,3 @@ glabel func_80851DEC /* 1FC0C 80851E1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FC10 80851E20 03E00008 */ jr $ra /* 1FC14 80851E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s index 5a0de41d09..09021b3876 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s @@ -15,5 +15,3 @@ glabel func_80851E28 /* 1FC48 80851E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FC4C 80851E5C 03E00008 */ jr $ra /* 1FC50 80851E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s index 3bf9120d7c..30b1b6c2ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s @@ -10,5 +10,3 @@ glabel func_80851E64 /* 1FC74 80851E84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FC78 80851E88 03E00008 */ jr $ra /* 1FC7C 80851E8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s index 1538e398bc..0d53896b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s @@ -14,5 +14,3 @@ glabel func_80851E90 /* 1FCB0 80851EC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FCB4 80851EC4 03E00008 */ jr $ra /* 1FCB8 80851EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s index 96c87fa2ad..918af4b17d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s @@ -18,5 +18,3 @@ glabel func_80851ECC /* 1FCF8 80851F08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FCFC 80851F0C 03E00008 */ jr $ra /* 1FD00 80851F10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s index 21858a17ad..056c3e02f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s @@ -30,5 +30,3 @@ glabel func_80851F14 /* 1FD68 80851F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 1FD6C 80851F7C 03E00008 */ jr $ra /* 1FD70 80851F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s index e27b183ffe..80c8690333 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s @@ -10,5 +10,3 @@ glabel func_80851F84 /* 1FD94 80851FA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FD98 80851FA8 03E00008 */ jr $ra /* 1FD9C 80851FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s index ca2f65b4fe..02ff30d264 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s @@ -40,5 +40,3 @@ glabel func_80851FB0 /* 1FE2C 8085203C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 1FE30 80852040 03E00008 */ jr $ra /* 1FE34 80852044 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s index adcab84245..fd7b888b5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s @@ -13,5 +13,3 @@ glabel func_80852048 /* 1FE64 80852074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FE68 80852078 03E00008 */ jr $ra /* 1FE6C 8085207C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s index 6caf43a787..897aee86e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s @@ -14,5 +14,3 @@ glabel func_80852080 /* 1FEA0 808520B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FEA4 808520B4 03E00008 */ jr $ra /* 1FEA8 808520B8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s index f758659b21..b074688244 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s @@ -45,5 +45,3 @@ glabel func_808520BC /* 1FF58 80852168 460C2180 */ add.s $f6, $f4, $f12 /* 1FF5C 8085216C 03E00008 */ jr $ra /* 1FF60 80852170 E4A6002C */ swc1 $f6, 0x002C($a1) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s index 3426f937e1..deeea0d19d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s @@ -16,5 +16,3 @@ glabel func_80852174 /* 1FF9C 808521AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FFA0 808521B0 03E00008 */ jr $ra /* 1FFA4 808521B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s index e9213c4dce..a2de23f234 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s @@ -15,5 +15,3 @@ glabel func_808521B8 /* 1FFD8 808521E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 1FFDC 808521EC 03E00008 */ jr $ra /* 1FFE0 808521F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s index 2f04c9d6b9..1f82f38695 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s @@ -15,5 +15,3 @@ glabel func_808521F4 /* 20018 80852228 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 2001C 8085222C 03E00008 */ jr $ra /* 20020 80852230 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s index 3dcc74284f..f3ec25eabf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s @@ -9,5 +9,3 @@ glabel func_80852234 /* 20040 80852250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20044 80852254 03E00008 */ jr $ra /* 20048 80852258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s index fa8b14decf..98bb8aa2f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s @@ -8,5 +8,3 @@ glabel func_8085225C /* 20064 80852274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20068 80852278 03E00008 */ jr $ra /* 2006C 8085227C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s index 4c17d3ed4f..04fc668121 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s @@ -5,5 +5,3 @@ glabel func_80852280 /* 2007C 8085228C 25CEA5C4 */ addiu $t6, $t6, %lo(func_8084A5C4) ## $t6 = 8084A5C4 /* 20080 80852290 03E00008 */ jr $ra /* 20084 80852294 ACAE0134 */ sw $t6, 0x0134($a1) ## 00000134 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s index c6a4f40018..1790dbe4b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s @@ -38,5 +38,3 @@ glabel func_80852298 /* 2010C 8085231C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 20110 80852320 03E00008 */ jr $ra /* 20114 80852324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s index a7a08566f7..b7027982fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s @@ -11,5 +11,3 @@ glabel func_80852328 /* 2013C 8085234C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20140 80852350 03E00008 */ jr $ra /* 20144 80852354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s index 58a6c0be94..071eb057c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s @@ -11,5 +11,3 @@ glabel func_80852358 /* 2016C 8085237C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20170 80852380 03E00008 */ jr $ra /* 20174 80852384 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s index 575e09f253..5fb54074c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s @@ -36,5 +36,3 @@ glabel func_80852388 /* 201F8 80852408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 201FC 8085240C 03E00008 */ jr $ra /* 20200 80852410 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s index 1a62917f9b..1d3ddb480a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s @@ -15,5 +15,3 @@ glabel func_80852414 /* 20234 80852444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20238 80852448 03E00008 */ jr $ra /* 2023C 8085244C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s index aa8e550967..d3a9739a7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s @@ -11,5 +11,3 @@ glabel func_80852450 /* 20264 80852474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20268 80852478 03E00008 */ jr $ra /* 2026C 8085247C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s index 926e34b91b..819332452a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s @@ -11,5 +11,3 @@ glabel func_80852480 /* 20294 808524A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20298 808524A8 03E00008 */ jr $ra /* 2029C 808524AC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s index c73b747dc7..89f557b1d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s @@ -7,5 +7,3 @@ glabel func_808524B0 /* 202B4 808524C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 202B8 808524C8 03E00008 */ jr $ra /* 202BC 808524CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s index 7643daf623..f3e920cb01 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s @@ -16,5 +16,3 @@ glabel func_808524D0 /* 202F8 80852508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 202FC 8085250C 03E00008 */ jr $ra /* 20300 80852510 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s index cdb6781eee..67b93f55e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s @@ -11,5 +11,3 @@ glabel func_80852514 /* 20328 80852538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 2032C 8085253C 03E00008 */ jr $ra /* 20330 80852540 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s index ad2e6d1d2e..d560e8a269 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s @@ -3,5 +3,3 @@ glabel func_80852544 /* 20338 80852548 AFA50004 */ sw $a1, 0x0004($sp) /* 2033C 8085254C 03E00008 */ jr $ra /* 20340 80852550 AFA60008 */ sw $a2, 0x0008($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s index d502dffb80..8a5fd88e9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s @@ -3,5 +3,3 @@ glabel func_80852554 /* 20348 80852558 AFA50004 */ sw $a1, 0x0004($sp) /* 2034C 8085255C 03E00008 */ jr $ra /* 20350 80852560 AFA60008 */ sw $a2, 0x0008($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s index 31ccf0cd58..0f0c75145d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s @@ -22,5 +22,3 @@ glabel func_80852564 /* 203A4 808525B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 203A8 808525B8 03E00008 */ jr $ra /* 203AC 808525BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s index 173fb6f910..71bd786626 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s @@ -17,5 +17,3 @@ glabel func_808525C0 /* 203EC 808525FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 203F0 80852600 03E00008 */ jr $ra /* 203F4 80852604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s index 1fb0fc83b4..5b4e96eb94 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s @@ -15,5 +15,3 @@ glabel func_80852608 /* 2042C 8085263C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20430 80852640 03E00008 */ jr $ra /* 20434 80852644 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s index 4a914cccc0..41130e03cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s @@ -41,5 +41,3 @@ glabel func_80852648 /* 204D0 808526E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 204D4 808526E4 03E00008 */ jr $ra /* 204D8 808526E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s index a592e8f0dd..0e9c8f8be5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s @@ -88,5 +88,3 @@ glabel func_808526EC /* 20620 80852830 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 20624 80852834 03E00008 */ jr $ra /* 20628 80852838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s index 535cf13088..8c3c71c634 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s @@ -37,5 +37,3 @@ glabel func_8085283C /* 206AC 808528BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 206B0 808528C0 03E00008 */ jr $ra /* 206B4 808528C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s index 37b3d88cd7..a916158470 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s @@ -32,5 +32,3 @@ glabel func_808528C8 /* 20728 80852938 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 2072C 8085293C 03E00008 */ jr $ra /* 20730 80852940 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s index eafc5ce01a..56aef84bc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s @@ -37,5 +37,3 @@ glabel func_80852944 /* 207B4 808529C4 8FB00014 */ lw $s0, 0x0014($sp) /* 207B8 808529C8 03E00008 */ jr $ra /* 207BC 808529CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s index fe1cc8532f..b078f6e5be 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s @@ -33,5 +33,3 @@ glabel func_808529D0 /* 20838 80852A48 A4A200B6 */ sh $v0, 0x00B6($a1) ## 000000B6 /* 2083C 80852A4C 03E00008 */ jr $ra /* 20840 80852A50 A4A2083C */ sh $v0, 0x083C($a1) ## 0000083C - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s index b5101ffccd..f4ecb3a3d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s @@ -65,5 +65,3 @@ glabel func_80852A54 /* 20930 80852B40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20934 80852B44 03E00008 */ jr $ra /* 20938 80852B48 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s index a72fafa2fd..a337541ae6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s @@ -50,5 +50,3 @@ glabel func_80852B4C /* 209F0 80852C00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 209F4 80852C04 03E00008 */ jr $ra /* 209F8 80852C08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s index 9a3098e6ec..dd767b1f59 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s @@ -18,5 +18,3 @@ glabel func_80852C0C /* 20A34 80852C44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 20A38 80852C48 03E00008 */ jr $ra /* 20A3C 80852C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s index 57256530e5..bacad69cc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8085532C + .asciz "TOOL MODE=%d\n" + .balign 4 + +.text glabel func_80852C50 /* 20A40 80852C50 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 20A44 80852C54 AFBF001C */ sw $ra, 0x001C($sp) @@ -127,5 +133,3 @@ glabel func_80852C50 /* 20BF8 80852E08 8FB10018 */ lw $s1, 0x0018($sp) /* 20BFC 80852E0C 03E00008 */ jr $ra /* 20C00 80852E10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s index 5d1bc129ed..9e180490de 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s @@ -1,3 +1,9 @@ +.rdata +glabel D_8085533C + .asciz "DEMO MODE=%d\n" + .balign 4 + +.text glabel func_80852E14 /* 20C04 80852E14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 20C08 80852E18 AFBF001C */ sw $ra, 0x001C($sp) @@ -46,5 +52,3 @@ glabel func_80852E14 /* 20CAC 80852EBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 20CB0 80852EC0 03E00008 */ jr $ra /* 20CB4 80852EC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s index b507c68767..9f3d2ea1fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s @@ -13,5 +13,3 @@ glabel func_80852EC8 .L80852EF4: /* 20CE4 80852EF4 03E00008 */ jr $ra /* 20CE8 80852EF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s index 5edda1b5ac..db47b08d61 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s @@ -14,5 +14,3 @@ glabel func_80852EFC /* 20D1C 80852F2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 20D20 80852F30 03E00008 */ jr $ra /* 20D24 80852F34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s index fe3df0b9e0..1e8de07940 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s @@ -49,5 +49,3 @@ glabel func_80852F38 /* 20DE0 80852FF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 20DE4 80852FF4 03E00008 */ jr $ra /* 20DE8 80852FF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s index 1b260259e3..d8a193babc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s @@ -34,5 +34,3 @@ glabel func_80852FFC /* 20E64 80853074 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 20E68 80853078 03E00008 */ jr $ra /* 20E6C 8085307C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s index 53690b0060..1c1d3d6986 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s @@ -23,5 +23,3 @@ glabel func_80853080 /* 20EC4 808530D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 20EC8 808530D8 03E00008 */ jr $ra /* 20ECC 808530DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s index f9ba7b0c69..5e01a93988 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s @@ -27,5 +27,3 @@ glabel func_808530E0 /* 20F2C 8085313C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 20F30 80853140 03E00008 */ jr $ra /* 20F34 80853144 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s index 3c5aef62c7..fc0ddd824b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s @@ -194,4 +194,3 @@ glabel func_80853148 /* 211F4 80853404 00000000 */ nop /* 211F8 80853408 00000000 */ nop /* 211FC 8085340C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s index 8e2ceabe60..d96ab59528 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s @@ -87,5 +87,3 @@ glabel func_8099EDB0 /* 0014C 8099EEFC 84ED0030 */ lh $t5, 0x0030($a3) ## 00000030 /* 00150 8099EF00 03E00008 */ jr $ra /* 00154 8099EF04 A4CD0056 */ sh $t5, 0x0056($a2) ## 00000056 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s index a2d87daa62..49d86bb459 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s @@ -104,5 +104,3 @@ glabel func_8099EF08 /* 002F0 8099F0A0 8FB10018 */ lw $s1, 0x0018($sp) /* 002F4 8099F0A4 03E00008 */ jr $ra /* 002F8 8099F0A8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099F0AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099F0AC.s index a5b92047ca..5edca5831a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099F0AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099F0AC.s @@ -26,4 +26,3 @@ glabel func_8099F0AC /* 00354 8099F104 00000000 */ nop /* 00358 8099F108 00000000 */ nop /* 0035C 8099F10C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s index aa67e51012..868eff7927 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s @@ -51,5 +51,3 @@ glabel func_8099F1B0 /* 000B8 8099F268 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 000BC 8099F26C 03E00008 */ jr $ra /* 000C0 8099F270 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s index 7b78852c09..8bd27cd317 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s @@ -153,5 +153,3 @@ glabel func_8099F274 /* 0031C 8099F4CC 27BD0170 */ addiu $sp, $sp, 0x0170 ## $sp = 00000000 /* 00320 8099F4D0 03E00008 */ jr $ra /* 00324 8099F4D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s index 436e52d1ef..d69f5412cb 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s @@ -45,4 +45,3 @@ glabel func_8099F4D8 /* 003C4 8099F574 00000000 */ nop /* 003C8 8099F578 00000000 */ nop /* 003CC 8099F57C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s index 14865ead4f..b1b8a9af50 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s @@ -64,5 +64,3 @@ glabel func_8099F650 /* 000EC 8099F73C 8FB00014 */ lw $s0, 0x0014($sp) /* 000F0 8099F740 03E00008 */ jr $ra /* 000F4 8099F744 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s index d7ee761cfb..b6d17b86ca 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s @@ -134,5 +134,3 @@ glabel func_8099F748 /* 00304 8099F954 8FB10018 */ lw $s1, 0x0018($sp) /* 00308 8099F958 03E00008 */ jr $ra /* 0030C 8099F95C 27BD0160 */ addiu $sp, $sp, 0x0160 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s index 6779985361..87def5e2f3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s @@ -220,5 +220,3 @@ glabel func_8099F960 /* 00670 8099FCC0 8FB60048 */ lw $s6, 0x0048($sp) /* 00674 8099FCC4 03E00008 */ jr $ra /* 00678 8099FCC8 27BD01F8 */ addiu $sp, $sp, 0x01F8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099FCCC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099FCCC.s index 77f4f149e3..565fdac272 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099FCCC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099FCCC.s @@ -133,4 +133,3 @@ glabel func_8099FCCC /* 00874 8099FEC4 8FB10018 */ lw $s1, 0x0018($sp) /* 00878 8099FEC8 03E00008 */ jr $ra /* 0087C 8099FECC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s index db539be932..0891eda998 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s @@ -108,5 +108,3 @@ glabel func_809A0040 /* 00180 809A01C0 D7B40010 */ ldc1 $f20, 0x0010($sp) /* 00184 809A01C4 03E00008 */ jr $ra /* 00188 809A01C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s index e36468034a..783c2e9ca8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s @@ -100,5 +100,3 @@ glabel func_809A01CC /* 00314 809A0354 8FB10018 */ lw $s1, 0x0018($sp) /* 00318 809A0358 03E00008 */ jr $ra /* 0031C 809A035C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s index f2727e4ace..02d5eee27f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s @@ -81,4 +81,3 @@ glabel func_809A0360 /* 00444 809A0484 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00448 809A0488 03E00008 */ jr $ra /* 0044C 809A048C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s index 65c9330d36..f196c93351 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s @@ -84,5 +84,3 @@ glabel func_809A0550 /* 0013C 809A068C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00140 809A0690 03E00008 */ jr $ra /* 00144 809A0694 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s index 4ac54c4cd1..55ab32332e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s @@ -158,5 +158,3 @@ glabel func_809A0698 /* 003B0 809A0900 8FB10018 */ lw $s1, 0x0018($sp) /* 003B4 809A0904 03E00008 */ jr $ra /* 003B8 809A0908 27BD0168 */ addiu $sp, $sp, 0x0168 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s index 5cbdb29c1d..207a5cddfc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s @@ -61,4 +61,3 @@ glabel func_809A090C /* 00494 809A09E4 03E00008 */ jr $ra /* 00498 809A09E8 00000000 */ nop /* 0049C 809A09EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s index c228f9e559..e7e4d4f357 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s @@ -69,5 +69,3 @@ glabel func_809A0AA0 /* 0010C 809A0BAC 90EB002E */ lbu $t3, 0x002E($a3) ## 0000002E /* 00110 809A0BB0 03E00008 */ jr $ra /* 00114 809A0BB4 A4CB0050 */ sh $t3, 0x0050($a2) ## 00000050 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s index 5c47267770..28ab2a0bb5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s @@ -127,5 +127,3 @@ glabel func_809A0BB8 /* 00308 809A0DA8 8FB10018 */ lw $s1, 0x0018($sp) /* 0030C 809A0DAC 03E00008 */ jr $ra /* 00310 809A0DB0 27BD0118 */ addiu $sp, $sp, 0x0118 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s index 6b251a2e89..dd2ecbf527 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s @@ -99,4 +99,3 @@ glabel func_809A0DB4 /* 00474 809A0F14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00478 809A0F18 03E00008 */ jr $ra /* 0047C 809A0F1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s index b48ed4c12b..31b058bcc5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s @@ -190,4 +190,3 @@ glabel func_809A0FE0 /* 0002C8 809A12A8 8FB20038 */ lw $s2, 0x38($sp) /* 0002CC 809A12AC 03E00008 */ jr $ra /* 0002D0 809A12B0 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s index b7f505c759..8d447a6283 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s @@ -127,4 +127,3 @@ glabel func_809A12B4 /* 0004C4 809A14A4 8FB10018 */ lw $s1, 0x18($sp) /* 0004C8 809A14A8 03E00008 */ jr $ra /* 0004CC 809A14AC 27BD0120 */ addiu $sp, $sp, 0x120 - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s index 3bd325fceb..dc67bcf93b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1610.s @@ -59,5 +59,3 @@ glabel func_809A1610 /* 000D8 809A16E8 A4C00042 */ sh $zero, 0x0042($a2) ## 00000042 /* 000DC 809A16EC 03E00008 */ jr $ra /* 000E0 809A16F0 A4CA004A */ sh $t2, 0x004A($a2) ## 0000004A - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s index 774108fd6d..cf3d3b5ba1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s @@ -200,5 +200,3 @@ glabel func_809A16F4 /* 003EC 809A19FC 8FB10028 */ lw $s1, 0x0028($sp) /* 003F0 809A1A00 03E00008 */ jr $ra /* 003F4 809A1A04 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s index e68582ccfb..bef0677e32 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s @@ -27,4 +27,3 @@ glabel func_809A1A08 /* 00454 809A1A64 03E00008 */ jr $ra /* 00458 809A1A68 00000000 */ nop /* 0045C 809A1A6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s index c8b69a94a5..0a7dc4cc68 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s @@ -41,4 +41,3 @@ glabel func_809A1B30 /* 00009C 809A1BCC 24020001 */ li $v0, 1 /* 0000A0 809A1BD0 03E00008 */ jr $ra /* 0000A4 809A1BD4 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s index 5b10eb97a7..e64891b379 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s @@ -155,5 +155,3 @@ glabel func_809A1CB0 /* 00248 809A1EF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 0024C 809A1EFC 03E00008 */ jr $ra /* 00250 809A1F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s index acfc28412e..c0fceac1af 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s @@ -162,5 +162,3 @@ glabel func_809A1F04 /* 004C4 809A2174 8FB10018 */ lw $s1, 0x0018($sp) /* 004C8 809A2178 03E00008 */ jr $ra /* 004CC 809A217C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s index 9efdf2185c..b83fbdaff4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s @@ -34,4 +34,3 @@ glabel func_809A2180 /* 00544 809A21F4 03E00008 */ jr $ra /* 00548 809A21F8 00000000 */ nop /* 0054C 809A21FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s index 42001303b0..80fee09484 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s @@ -113,5 +113,3 @@ glabel func_809A22D0 /* 001A4 809A2474 8FB00014 */ lw $s0, 0x0014($sp) /* 001A8 809A2478 03E00008 */ jr $ra /* 001AC 809A247C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s index 2fcecc877b..042f58b59c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s @@ -223,5 +223,3 @@ glabel func_809A2480 /* 00514 809A27E4 8FB10018 */ lw $s1, 0x0018($sp) /* 00518 809A27E8 03E00008 */ jr $ra /* 0051C 809A27EC 27BD0188 */ addiu $sp, $sp, 0x0188 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s index c67869f201..4d92a79d79 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s @@ -70,5 +70,3 @@ glabel func_809A27F0 /* 00610 809A28E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00614 809A28E4 03E00008 */ jr $ra /* 00618 809A28E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s index b73f404c63..74c01d37af 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s @@ -93,4 +93,3 @@ glabel func_809A28EC /* 00764 809A2A34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00768 809A2A38 03E00008 */ jr $ra /* 0076C 809A2A3C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s index 363afa0777..262b9a6891 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2B60.s @@ -119,5 +119,3 @@ glabel func_809A2B60 /* 001BC 809A2D1C 8FB00018 */ lw $s0, 0x0018($sp) /* 001C0 809A2D20 03E00008 */ jr $ra /* 001C4 809A2D24 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s index 1305047d8e..62499564ce 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s @@ -213,5 +213,3 @@ glabel func_809A2D28 /* 004F4 809A3054 8FB10038 */ lw $s1, 0x0038($sp) /* 004F8 809A3058 03E00008 */ jr $ra /* 004FC 809A305C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s index b63fbbc2b2..d71ef90ce7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s @@ -126,4 +126,3 @@ glabel func_809A3060 /* 006D4 809A3234 00000000 */ nop /* 006D8 809A3238 00000000 */ nop /* 006DC 809A323C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s index ab67e3d0e9..87f2132b16 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s @@ -177,5 +177,3 @@ glabel func_809A3330 /* 002A0 809A35D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002A4 809A35D4 03E00008 */ jr $ra /* 002A8 809A35D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s index d5c46589b9..a832ce7d92 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s @@ -240,5 +240,3 @@ glabel func_809A35DC /* 0064C 809A397C 8FB10038 */ lw $s1, 0x0038($sp) /* 00650 809A3980 03E00008 */ jr $ra /* 00654 809A3984 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s index 573fabf123..da05efb196 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s @@ -131,5 +131,3 @@ glabel func_809A3988 /* 00824 809A3B54 8FB00020 */ lw $s0, 0x0020($sp) /* 00828 809A3B58 03E00008 */ jr $ra /* 0082C 809A3B5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s index 7e04aa9c2f..d55bcdb6e0 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s @@ -7,4 +7,3 @@ glabel func_809A3B60 /* 00844 809A3B74 03E00008 */ jr $ra /* 00848 809A3B78 A4D80044 */ sh $t8, 0x0044($a2) ## 00000044 /* 0084C 809A3B7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s index ecaff77088..406f069ed2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3CC0.s @@ -81,4 +81,3 @@ glabel func_809A3CC0 /* 000134 809A3DF4 27BD0030 */ addiu $sp, $sp, 0x30 /* 000138 809A3DF8 03E00008 */ jr $ra /* 00013C 809A3DFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s index f8467a1d1d..6fcb68ddf6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s @@ -125,4 +125,3 @@ glabel func_809A3E00 /* 00032C 809A3FEC 8FB20020 */ lw $s2, 0x20($sp) /* 000330 809A3FF0 03E00008 */ jr $ra /* 000334 809A3FF4 27BD0060 */ addiu $sp, $sp, 0x60 - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s index a332cd1a7d..45ed34f315 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A4120.s @@ -46,5 +46,3 @@ glabel func_809A4120 /* 000B0 809A41D0 872800B6 */ lh $t0, 0x00B6($t9) ## 000000B6 /* 000B4 809A41D4 03E00008 */ jr $ra /* 000B8 809A41D8 A4C80054 */ sh $t0, 0x0054($a2) ## 00000054 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s index e14b82bee8..9787ee5978 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s @@ -195,5 +195,3 @@ glabel func_809A41DC /* 003B4 809A44D4 8FB10038 */ lw $s1, 0x0038($sp) /* 003B8 809A44D8 03E00008 */ jr $ra /* 003BC 809A44DC 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s index fd647cfc14..2f9f621c41 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s @@ -47,4 +47,3 @@ glabel func_809A44E0 /* 00464 809A4584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00468 809A4588 03E00008 */ jr $ra /* 0046C 809A458C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s index 5cd2abf176..d432f1cd1d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s @@ -223,5 +223,3 @@ glabel func_809A4660 /* 0034C 809A49AC 8FB10018 */ lw $s1, 0x0018($sp) /* 00350 809A49B0 03E00008 */ jr $ra /* 00354 809A49B4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s index 5923c33bc5..2dbebc06a5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s @@ -139,5 +139,3 @@ glabel func_809A49B8 /* 0057C 809A4BDC 8FB10018 */ lw $s1, 0x0018($sp) /* 00580 809A4BE0 03E00008 */ jr $ra /* 00584 809A4BE4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s index b9a0083f44..73e90bccd3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s @@ -145,5 +145,3 @@ glabel func_809A4BE8 /* 007BC 809A4E1C 8FB10018 */ lw $s1, 0x0018($sp) /* 007C0 809A4E20 03E00008 */ jr $ra /* 007C4 809A4E24 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s index 21e0b92d61..27c20e2a23 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s @@ -42,5 +42,3 @@ glabel func_809A4E28 /* 00854 809A4EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00858 809A4EB8 03E00008 */ jr $ra /* 0085C 809A4EBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s index 73a89b9315..6bf7c91663 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s @@ -124,4 +124,3 @@ glabel func_809A4EC0 /* 00A14 809A5074 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00A18 809A5078 03E00008 */ jr $ra /* 00A1C 809A507C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s index bb11633098..40b7f4bba4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5740.s @@ -70,5 +70,3 @@ glabel func_809A5740 /* 0010C 809A584C 84EF002A */ lh $t7, 0x002A($a3) ## 0000002A /* 00110 809A5850 03E00008 */ jr $ra /* 00114 809A5854 A4CF0058 */ sh $t7, 0x0058($a2) ## 00000058 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s index 037f44c1ff..030e3c080f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s @@ -347,5 +347,3 @@ glabel func_809A5858 /* 0064C 809A5D8C 8FB20040 */ lw $s2, 0x0040($sp) /* 00650 809A5D90 03E00008 */ jr $ra /* 00654 809A5D94 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s index 4795067f61..4d59c9c91d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s @@ -13,4 +13,3 @@ glabel func_809A5D98 /* 00684 809A5DC4 03E00008 */ jr $ra /* 00688 809A5DC8 A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 /* 0068C 809A5DCC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s index 002b04c6bd..466cea07f4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s @@ -79,5 +79,3 @@ glabel func_809A5ED0 /* 00134 809A6004 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00138 809A6008 03E00008 */ jr $ra /* 0013C 809A600C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s index 268bdad127..2cc6102ec9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s @@ -40,5 +40,3 @@ glabel func_809A6010 /* 001D8 809A60A8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 001DC 809A60AC 03E00008 */ jr $ra /* 001E0 809A60B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s index 9fec988e78..4e7d2e0715 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s @@ -6,4 +6,3 @@ glabel func_809A60B4 /* 001F4 809A60C4 01CFC021 */ addu $t8, $t6, $t7 /* 001F8 809A60C8 03E00008 */ jr $ra /* 001FC 809A60CC A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s index 80537f058c..a3ca3bdd16 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s @@ -86,5 +86,3 @@ glabel func_809A6150 /* 0014C 809A629C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00150 809A62A0 03E00008 */ jr $ra /* 00154 809A62A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s index f8b5670841..aba7eff06d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s @@ -22,5 +22,3 @@ glabel func_809A62A8 /* 001A4 809A62F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001A8 809A62F8 03E00008 */ jr $ra /* 001AC 809A62FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s index 8c4beb8ec4..163c050688 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s @@ -7,4 +7,3 @@ glabel func_809A6300 /* 001C4 809A6314 03E00008 */ jr $ra /* 001C8 809A6318 A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 /* 001CC 809A631C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s index 25ef7ce728..10de62f296 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s @@ -117,5 +117,3 @@ glabel func_809A63A0 /* 001BC 809A655C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 001C0 809A6560 03E00008 */ jr $ra /* 001C4 809A6564 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s index ec0bd5fbde..7916a55332 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s @@ -151,5 +151,3 @@ glabel func_809A6568 /* 00414 809A67B4 8FB10018 */ lw $s1, 0x0018($sp) /* 00418 809A67B8 03E00008 */ jr $ra /* 0041C 809A67BC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s index 64410f5fbc..5b4f273a09 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s @@ -42,4 +42,3 @@ glabel func_809A67C0 /* 004B4 809A6854 03E00008 */ jr $ra /* 004B8 809A6858 00000000 */ nop /* 004BC 809A685C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s index 1a976da61f..3058e5469f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s @@ -93,5 +93,3 @@ glabel func_809A6960 /* 0016C 809A6ACC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 00170 809A6AD0 03E00008 */ jr $ra /* 00174 809A6AD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s index db16598537..7e3e0e961e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s @@ -141,5 +141,3 @@ glabel func_809A6AD8 /* 0039C 809A6CFC 8FB10018 */ lw $s1, 0x0018($sp) /* 003A0 809A6D00 03E00008 */ jr $ra /* 003A4 809A6D04 27BD0128 */ addiu $sp, $sp, 0x0128 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s index 3bfbd84983..bba759e6d0 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s @@ -14,5 +14,3 @@ glabel func_809A6D08 /* 003D4 809A6D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 003D8 809A6D38 03E00008 */ jr $ra /* 003DC 809A6D3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s index 4a37e70877..fd01b56fcf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s @@ -85,4 +85,3 @@ glabel func_809A6D40 /* 00514 809A6E74 03E00008 */ jr $ra /* 00518 809A6E78 00000000 */ nop /* 0051C 809A6E7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s index ecd4069e82..1377027eab 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s @@ -96,5 +96,3 @@ glabel func_809A6F30 /* 00164 809A7094 8FB00014 */ lw $s0, 0x0014($sp) /* 00168 809A7098 03E00008 */ jr $ra /* 0016C 809A709C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s index 716f497607..d08651b793 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s @@ -136,5 +136,3 @@ glabel func_809A70A0 /* 00384 809A72B4 8FB10018 */ lw $s1, 0x0018($sp) /* 00388 809A72B8 03E00008 */ jr $ra /* 0038C 809A72BC 27BD0160 */ addiu $sp, $sp, 0x0160 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A72C0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A72C0.s index 64f0daf15f..91ba51b430 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A72C0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A72C0.s @@ -69,5 +69,3 @@ glabel func_809A72C0 /* 0048C 809A73BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00490 809A73C0 03E00008 */ jr $ra /* 00494 809A73C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A73C8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A73C8.s index 851ca9cfe2..fd8ec9b502 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A73C8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A73C8.s @@ -52,4 +52,3 @@ glabel func_809A73C8 /* 00554 809A7484 00000000 */ nop /* 00558 809A7488 00000000 */ nop /* 0055C 809A748C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s index b20b2bf3f6..e18e798913 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s @@ -142,5 +142,3 @@ glabel func_809A7540 .L809A7758: /* 00218 809A7758 03E00008 */ jr $ra /* 0021C 809A775C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s index 752f95a8c5..ac4b1e2208 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s @@ -71,5 +71,3 @@ glabel func_809A7760 /* 00318 809A7858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0031C 809A785C 03E00008 */ jr $ra /* 00320 809A7860 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s index 1382ce0b4b..137783a17f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s @@ -56,4 +56,3 @@ glabel func_809A7864 /* 003F4 809A7934 00000000 */ nop /* 003F8 809A7938 00000000 */ nop /* 003FC 809A793C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s index 23d0a297ad..d967dc5b1c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s @@ -31,5 +31,3 @@ glabel func_809A79F0 /* 00064 809A7A54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00068 809A7A58 03E00008 */ jr $ra /* 0006C 809A7A5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s index b24cf51037..643d7b95e4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s @@ -108,5 +108,3 @@ glabel func_809A7A60 /* 00200 809A7BF0 8FB00014 */ lw $s0, 0x0014($sp) /* 00204 809A7BF4 03E00008 */ jr $ra /* 00208 809A7BF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s index 54fe36373a..699fffd911 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s @@ -104,5 +104,3 @@ glabel func_809A7BFC /* 003A0 809A7D90 8FB10018 */ lw $s1, 0x0018($sp) /* 003A4 809A7D94 03E00008 */ jr $ra /* 003A8 809A7D98 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s index 9f6e8ba933..8c3bdfce0c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s @@ -122,5 +122,3 @@ glabel func_809A7D9C /* 00588 809A7F78 8FB10018 */ lw $s1, 0x0018($sp) /* 0058C 809A7F7C 03E00008 */ jr $ra /* 00590 809A7F80 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s index 5ba0e345da..50dcf51a39 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s @@ -36,4 +36,3 @@ glabel func_809A7F84 /* 00614 809A8004 03E00008 */ jr $ra /* 00618 809A8008 00000000 */ nop /* 0061C 809A800C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s index 0028bd3afa..615f09d81a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s @@ -64,5 +64,3 @@ glabel func_809A8150 /* 000F0 809A8240 84F90004 */ lh $t9, 0x0004($a3) ## 00000004 /* 000F4 809A8244 03E00008 */ jr $ra /* 000F8 809A8248 A4D90050 */ sh $t9, 0x0050($a2) ## 00000050 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s index b193a18c36..24466b6943 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s @@ -142,5 +142,3 @@ glabel func_809A824C /* 00328 809A8478 8FB10018 */ lw $s1, 0x0018($sp) /* 0032C 809A847C 03E00008 */ jr $ra /* 00330 809A8480 27BD0160 */ addiu $sp, $sp, 0x0160 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s index f0d3597b85..62c1e3fc7c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s @@ -78,4 +78,3 @@ glabel func_809A8484 /* 00454 809A85A4 03E00008 */ jr $ra /* 00458 809A85A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0045C 809A85AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s index 63d04f7171..b758600df2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8700.s @@ -85,5 +85,3 @@ glabel func_809A8700 /* 00144 809A8844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00148 809A8848 03E00008 */ jr $ra /* 0014C 809A884C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s index 609371121b..e699fe221c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s @@ -157,5 +157,3 @@ glabel func_809A8850 /* 003B4 809A8AB4 8FB10038 */ lw $s1, 0x0038($sp) /* 003B8 809A8AB8 03E00008 */ jr $ra /* 003BC 809A8ABC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s index b51e59b6af..9a176b37c3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s @@ -19,4 +19,3 @@ glabel func_809A8AC0 /* 00404 809A8B04 E4D20014 */ swc1 $f18, 0x0014($a2) ## 00000014 /* 00408 809A8B08 00000000 */ nop /* 0040C 809A8B0C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s index 6c8cdbf7c3..ba138e5ce2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s @@ -81,5 +81,3 @@ glabel func_809A8BF0 /* 0011C 809A8D0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 00120 809A8D10 03E00008 */ jr $ra /* 00124 809A8D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s index 39bd547e96..83118285cd 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s @@ -202,5 +202,3 @@ glabel func_809A8D18 /* 00434 809A9024 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 00438 809A9028 03E00008 */ jr $ra /* 0043C 809A902C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s index 7a4d3c9d51..9527a016a1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s @@ -35,4 +35,3 @@ glabel func_809A9030 /* 004B4 809A90A4 00000000 */ nop /* 004B8 809A90A8 00000000 */ nop /* 004BC 809A90AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s index e07f32ad50..921e71350a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A91B0.s @@ -52,5 +52,3 @@ glabel func_809A91B0 /* 000C4 809A9274 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 000C8 809A9278 03E00008 */ jr $ra /* 000CC 809A927C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s index 10dbe2fb99..afb24ea92e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s @@ -169,5 +169,3 @@ glabel func_809A9280 /* 00360 809A9510 8FB10038 */ lw $s1, 0x0038($sp) /* 00364 809A9514 03E00008 */ jr $ra /* 00368 809A9518 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s index e4cd43aede..76a6dfcfb5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s @@ -44,4 +44,3 @@ glabel func_809A951C /* 00404 809A95B4 00000000 */ nop /* 00408 809A95B8 00000000 */ nop /* 0040C 809A95BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s index dd1a1b6a61..4b58aef4db 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s @@ -108,5 +108,3 @@ glabel func_809A9680 /* 0018C 809A980C 8FB00014 */ lw $s0, 0x0014($sp) /* 00190 809A9810 03E00008 */ jr $ra /* 00194 809A9814 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s index e6f2dce932..295d617a3a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s @@ -25,5 +25,3 @@ glabel func_809A9818 /* 001E8 809A9868 460E3201 */ sub.s $f8, $f6, $f14 /* 001EC 809A986C 03E00008 */ jr $ra /* 001F0 809A9870 460A4000 */ add.s $f0, $f8, $f10 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s index 9f19e4cd43..7e18c805ca 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s @@ -211,5 +211,3 @@ glabel func_809A9874 /* 0051C 809A9B9C 8FB10018 */ lw $s1, 0x0018($sp) /* 00520 809A9BA0 03E00008 */ jr $ra /* 00524 809A9BA4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s index bdbff0e038..443f68db8d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s @@ -29,5 +29,3 @@ glabel func_809A9BA8 /* 00584 809A9C04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00588 809A9C08 03E00008 */ jr $ra /* 0058C 809A9C0C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s index b14f0c515a..b48973d9cf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s @@ -113,5 +113,3 @@ glabel func_809A9C10 /* 00734 809A9DB4 8FB00028 */ lw $s0, 0x0028($sp) /* 00738 809A9DB8 03E00008 */ jr $ra /* 0073C 809A9DBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s index 32e2d92a4d..897b727bfb 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s @@ -5,5 +5,3 @@ glabel func_809A9DC0 /* 0074C 809A9DCC E480001C */ swc1 $f0, 0x001C($a0) ## 0000001C /* 00750 809A9DD0 03E00008 */ jr $ra /* 00754 809A9DD4 E4800018 */ swc1 $f0, 0x0018($a0) ## 00000018 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s index 97fecd3edf..ead82b37fa 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s @@ -4,5 +4,3 @@ glabel func_809A9DD8 /* 00760 809A9DE0 E7AC0000 */ swc1 $f12, 0x0000($sp) /* 00764 809A9DE4 03E00008 */ jr $ra /* 00768 809A9DE8 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s index 89b48481e6..6b78937206 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s @@ -16,5 +16,3 @@ glabel func_809A9DEC /* 0079C 809A9E1C 00000000 */ nop /* 007A0 809A9E20 03E00008 */ jr $ra /* 007A4 809A9E24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s index caa5e468de..b4a22b3341 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s @@ -17,5 +17,3 @@ glabel func_809A9E28 /* 007DC 809A9E5C 00000000 */ nop /* 007E0 809A9E60 03E00008 */ jr $ra /* 007E4 809A9E64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s index e9e3850205..eca7862347 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s @@ -7,5 +7,3 @@ glabel func_809A9E68 /* 007FC 809A9E7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00800 809A9E80 03E00008 */ jr $ra /* 00804 809A9E84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s index 900cebc45c..bf6d741a5f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s @@ -35,5 +35,3 @@ glabel func_809A9E88 .L809A9F08: /* 00888 809A9F08 03E00008 */ jr $ra /* 0088C 809A9F0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s index ab2ada2d70..f598b0b4b6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s @@ -15,5 +15,3 @@ glabel func_809A9F10 .L809A9F44: /* 008C4 809A9F44 03E00008 */ jr $ra /* 008C8 809A9F48 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s index 44fcc9e612..1417b820c8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s @@ -36,5 +36,3 @@ glabel func_809A9F4C .L809A9FD0: /* 00950 809A9FD0 03E00008 */ jr $ra /* 00954 809A9FD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s index 1376ce1113..f0eb8d241f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s @@ -55,5 +55,3 @@ glabel func_809A9FD8 /* 00A2C 809AA0AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00A30 809AA0B0 03E00008 */ jr $ra /* 00A34 809AA0B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s index 1c1c594b14..2745972a8d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s @@ -12,5 +12,3 @@ glabel func_809AA0B8 /* 00A60 809AA0E0 460A8480 */ add.s $f18, $f16, $f10 /* 00A64 809AA0E4 03E00008 */ jr $ra /* 00A68 809AA0E8 E492001C */ swc1 $f18, 0x001C($a0) ## 0000001C - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s index d6356f5310..0d153c35ae 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s @@ -86,5 +86,3 @@ glabel func_809AA0EC /* 00BA4 809AA224 8FB00020 */ lw $s0, 0x0020($sp) /* 00BA8 809AA228 03E00008 */ jr $ra /* 00BAC 809AA22C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s index 9e50ffe887..c393eb3113 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s @@ -134,5 +134,3 @@ glabel func_809AA230 /* 00DA4 809AA424 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00DA8 809AA428 03E00008 */ jr $ra /* 00DAC 809AA42C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s index a58fcffb42..734306f609 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s @@ -65,4 +65,3 @@ glabel func_809AA430 /* 00E94 809AA514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00E98 809AA518 03E00008 */ jr $ra /* 00E9C 809AA51C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s index 3a496c1ebb..971fda2c49 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s @@ -106,5 +106,3 @@ glabel func_809AA810 /* 00190 809AA9A0 8CEE0030 */ lw $t6, 0x0030($a3) ## 00000030 /* 00194 809AA9A4 03E00008 */ jr $ra /* 00198 809AA9A8 A4CE0058 */ sh $t6, 0x0058($a2) ## 00000058 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s index 5760791f98..1b84cc1ce4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s @@ -145,5 +145,3 @@ glabel func_809AA9AC /* 003D4 809AABE4 8FB10018 */ lw $s1, 0x0018($sp) /* 003D8 809AABE8 03E00008 */ jr $ra /* 003DC 809AABEC 27BD01E0 */ addiu $sp, $sp, 0x01E0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s index 0a6c9c6ab0..313e9e4bbe 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s @@ -50,5 +50,3 @@ glabel func_809AABF0 /* 00490 809AACA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00494 809AACA4 03E00008 */ jr $ra /* 00498 809AACA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s index bdca448a55..c057cbd69e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s @@ -51,5 +51,3 @@ glabel func_809AACAC /* 00550 809AAD60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00554 809AAD64 03E00008 */ jr $ra /* 00558 809AAD68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s index 1c3cb64523..c9a9982b9a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s @@ -37,4 +37,3 @@ glabel func_809AAD6C /* 005E4 809AADF4 03E00008 */ jr $ra /* 005E8 809AADF8 00000000 */ nop /* 005EC 809AADFC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s index 193c315ee4..babe052217 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s @@ -56,5 +56,3 @@ glabel func_809AAEF0 /* 000D8 809AAFC8 84F90018 */ lh $t9, 0x0018($a3) ## 00000018 /* 000DC 809AAFCC 03E00008 */ jr $ra /* 000E0 809AAFD0 A4D90056 */ sh $t9, 0x0056($a2) ## 00000056 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s index 20e760f803..57ac8bf410 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s @@ -41,5 +41,3 @@ glabel func_809AAFD4 /* 0017C 809AB06C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 00180 809AB070 03E00008 */ jr $ra /* 00184 809AB074 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s index 721a50556c..87834d4a3d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s @@ -177,5 +177,3 @@ glabel func_809AB078 /* 0043C 809AB32C 8FB10018 */ lw $s1, 0x0018($sp) /* 00440 809AB330 03E00008 */ jr $ra /* 00444 809AB334 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s index 0fc5b08427..62f5929ec3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s @@ -134,4 +134,3 @@ glabel func_809AB338 /* 00634 809AB524 00000000 */ nop /* 00638 809AB528 00000000 */ nop /* 0063C 809AB52C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s index f6f0520dd8..31b39e470f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s @@ -113,5 +113,3 @@ glabel func_809AB630 /* 001B0 809AB7E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 001B4 809AB7E4 03E00008 */ jr $ra /* 001B8 809AB7E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s index 1f25a3ba19..5e2c4a7048 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s @@ -123,5 +123,3 @@ glabel func_809AB7EC /* 003A0 809AB9D0 8FB10018 */ lw $s1, 0x0018($sp) /* 003A4 809AB9D4 03E00008 */ jr $ra /* 003A8 809AB9D8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s index aee75bd83f..0db0faa25e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s @@ -178,4 +178,3 @@ glabel func_809AB9DC /* 00644 809ABC74 03E00008 */ jr $ra /* 00648 809ABC78 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0064C 809ABC7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s index f952ebd819..a13d55284a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABD60.s @@ -42,5 +42,3 @@ glabel func_809ABD60 /* 000A0 809ABE00 A4C00050 */ sh $zero, 0x0050($a2) ## 00000050 /* 000A4 809ABE04 03E00008 */ jr $ra /* 000A8 809ABE08 A4CD0052 */ sh $t5, 0x0052($a2) ## 00000052 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s index 72336dadd5..aacb7eb3a5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s @@ -136,5 +136,3 @@ glabel func_809ABE0C /* 002C4 809AC024 8FB10018 */ lw $s1, 0x0018($sp) /* 002C8 809AC028 03E00008 */ jr $ra /* 002CC 809AC02C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s index 8b3fa60fbc..76925f8704 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s @@ -12,4 +12,3 @@ glabel func_809AC030 /* 002F4 809AC054 00000000 */ nop /* 002F8 809AC058 00000000 */ nop /* 002FC 809AC05C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s index 89f30e2d9f..6b47976cfa 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s @@ -30,5 +30,3 @@ glabel func_809AC130 /* 00070 809AC1A0 8CED0028 */ lw $t5, 0x0028($a3) ## 00000028 /* 00074 809AC1A4 03E00008 */ jr $ra /* 00078 809AC1A8 ACCD003C */ sw $t5, 0x003C($a2) ## 0000003C - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s index e09911308e..b0928e9a9e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s @@ -59,4 +59,3 @@ glabel func_809AC1AC /* 00154 809AC284 03E00008 */ jr $ra /* 00158 809AC288 00000000 */ nop /* 0015C 809AC28C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s index 15da172065..516cd767a6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s @@ -89,5 +89,3 @@ glabel func_809AC2D0 /* 00150 809AC420 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00154 809AC424 03E00008 */ jr $ra /* 00158 809AC428 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index 0e50158028..639b58807d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -119,5 +119,3 @@ glabel func_809AC42C /* 00328 809AC5F8 8FB10018 */ lw $s1, 0x0018($sp) /* 0032C 809AC5FC 03E00008 */ jr $ra /* 00330 809AC600 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s index 17da5fa666..6104e5a7f1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s @@ -6,4 +6,3 @@ glabel func_809AC604 /* 00344 809AC614 00000000 */ nop /* 00348 809AC618 00000000 */ nop /* 0034C 809AC61C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s index c9236be668..51737ed1ea 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC700.s @@ -34,5 +34,3 @@ glabel func_809AC700 /* 00080 809AC780 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 /* 00084 809AC784 03E00008 */ jr $ra /* 00088 809AC788 A4CB0040 */ sh $t3, 0x0040($a2) ## 00000040 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s index 67af37d1ed..0af6499013 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s @@ -142,5 +142,3 @@ glabel func_809AC78C /* 002B4 809AC9B4 8FB10018 */ lw $s1, 0x0018($sp) /* 002B8 809AC9B8 03E00008 */ jr $ra /* 002BC 809AC9BC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s index da336db4f3..13f29981b6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s @@ -16,4 +16,3 @@ glabel func_809AC9C0 /* 002F4 809AC9F4 00000000 */ nop /* 002F8 809AC9F8 00000000 */ nop /* 002FC 809AC9FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803D40.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803D40.s index 3e282045d4..9f650b748c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803D40.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803D40.s @@ -109,5 +109,3 @@ glabel func_80803D40 .L80803ED0: /* 00190 80803ED0 03E00008 */ jr $ra /* 00194 80803ED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s index 42e3f499b0..6111eaf74b 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s @@ -237,5 +237,3 @@ glabel func_80803ED8 /* 004FC 8080423C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00500 80804240 03E00008 */ jr $ra /* 00504 80804244 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804248.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804248.s index d18fbba802..ff3adb2cea 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804248.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804248.s @@ -107,5 +107,3 @@ glabel func_80804248 .L808043D0: /* 00690 808043D0 03E00008 */ jr $ra /* 00694 808043D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808043D8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808043D8.s index b2a027aa78..8fbca088dd 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808043D8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808043D8.s @@ -50,5 +50,3 @@ glabel func_808043D8 .L80804498: /* 00758 80804498 03E00008 */ jr $ra /* 0075C 8080449C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s index f76c34038b..5b8b68b84d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s @@ -255,5 +255,3 @@ glabel func_808044A0 /* 00B0C 8080484C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00B10 80804850 03E00008 */ jr $ra /* 00B14 80804854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804858.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804858.s index ed01e151f5..268c3302c4 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804858.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804858.s @@ -51,5 +51,3 @@ glabel func_80804858 .L8080491C: /* 00BDC 8080491C 03E00008 */ jr $ra /* 00BE0 80804920 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804924.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804924.s index c3321f0972..6a05eeab5a 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804924.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804924.s @@ -82,5 +82,3 @@ glabel func_80804924 .L80804A48: /* 00D08 80804A48 03E00008 */ jr $ra /* 00D0C 80804A4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s index 1deefb7300..ee445e3ead 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s @@ -145,5 +145,3 @@ glabel func_80804A50 /* 00F28 80804C68 8FB40014 */ lw $s4, 0x0014($sp) /* 00F2C 80804C6C 03E00008 */ jr $ra /* 00F30 80804C70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804C74.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804C74.s index 85de88ec9e..4e8b19dddd 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804C74.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804C74.s @@ -23,5 +23,3 @@ glabel func_80804C74 .L80804CC8: /* 00F88 80804CC8 03E00008 */ jr $ra /* 00F8C 80804CCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s index 1d577335ed..525a2d921d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s @@ -139,5 +139,3 @@ glabel func_80804CD0 /* 0118C 80804ECC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 01190 80804ED0 03E00008 */ jr $ra /* 01194 80804ED4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s index 61bff1fe8b..9aec5bee1c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s @@ -151,5 +151,3 @@ glabel func_80804ED8 /* 013C0 80805100 8FB30014 */ lw $s3, 0x0014($sp) /* 013C4 80805104 03E00008 */ jr $ra /* 013C8 80805108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080510C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080510C.s index eddafa145e..c3f8f420bd 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080510C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080510C.s @@ -48,5 +48,3 @@ glabel func_8080510C /* 0147C 808051BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 01480 808051C0 03E00008 */ jr $ra /* 01484 808051C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808051C8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808051C8.s index 33c1ef3994..72d02a304a 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808051C8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808051C8.s @@ -89,5 +89,3 @@ glabel func_808051C8 .L80805310: /* 015D0 80805310 03E00008 */ jr $ra /* 015D4 80805314 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s index 9dac7c7968..9fd8449885 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s @@ -75,5 +75,3 @@ glabel func_80805318 /* 016E8 80805428 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 016EC 8080542C 03E00008 */ jr $ra /* 016F0 80805430 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805434.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805434.s index b0752dec79..049cd341f2 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805434.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805434.s @@ -60,5 +60,3 @@ glabel func_80805434 .L8080551C: /* 017DC 8080551C 03E00008 */ jr $ra /* 017E0 80805520 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s index f996c5796a..e37ff99862 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s @@ -206,5 +206,3 @@ glabel func_80805524 /* 01AD8 80805818 8FB40014 */ lw $s4, 0x0014($sp) /* 01ADC 8080581C 03E00008 */ jr $ra /* 01AE0 80805820 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805824.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805824.s index d2154a038f..b1b09fe343 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805824.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805824.s @@ -85,5 +85,3 @@ glabel func_80805824 /* 01C10 80805950 A5024A94 */ sh $v0, 0x4A94($t0) ## 00004A94 /* 01C14 80805954 03E00008 */ jr $ra /* 01C18 80805958 A422CA9A */ sh $v0, -0x3566($at) ## 0001CA9A - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s index d98bdff8e4..bc4b9bcbe8 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s @@ -124,5 +124,3 @@ glabel func_8080595C .L80805B24: /* 01DE4 80805B24 03E00008 */ jr $ra /* 01DE8 80805B28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s index b57aeba27e..450ca95490 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s @@ -245,5 +245,3 @@ glabel func_80805B2C /* 0216C 80805EAC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 02170 80805EB0 03E00008 */ jr $ra /* 02174 80805EB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s index 2458a4eb40..f6cfbfeaab 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s @@ -193,5 +193,3 @@ glabel func_80805EB8 /* 02434 80806174 8FB2000C */ lw $s2, 0x000C($sp) /* 02438 80806178 03E00008 */ jr $ra /* 0243C 8080617C 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806180.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806180.s index b617fbd254..831297c8cf 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806180.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806180.s @@ -55,5 +55,3 @@ glabel func_80806180 .L80806254: /* 02514 80806254 03E00008 */ jr $ra /* 02518 80806258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s index 288a4f2108..d0676e3e38 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s @@ -131,5 +131,3 @@ glabel func_8080625C /* 026F8 80806438 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 026FC 8080643C 03E00008 */ jr $ra /* 02700 80806440 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806444.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806444.s index 3bdb96e62e..9f9bc15f86 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806444.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806444.s @@ -44,5 +44,3 @@ glabel func_80806444 .L808064EC: /* 027AC 808064EC 03E00008 */ jr $ra /* 027B0 808064F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s index 2aaeb05017..f40dc0654d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s @@ -145,5 +145,3 @@ glabel func_808064F4 /* 029C4 80806704 8FB1000C */ lw $s1, 0x000C($sp) /* 029C8 80806708 03E00008 */ jr $ra /* 029CC 8080670C 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s index 2a2ccb678f..c27f64acd8 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s @@ -125,5 +125,3 @@ glabel func_80806710 /* 02BA4 808068E4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 02BA8 808068E8 03E00008 */ jr $ra /* 02BAC 808068EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s index b2301369a0..17cdd6b1a3 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s @@ -51,5 +51,3 @@ glabel func_808068F0 /* 02C68 808069A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 02C6C 808069AC 03E00008 */ jr $ra /* 02C70 808069B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s index 1c79fd677b..cd205ac4de 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s @@ -166,5 +166,3 @@ glabel func_808069B4 /* 02ED4 80806C14 8FB00008 */ lw $s0, 0x0008($sp) /* 02ED8 80806C18 03E00008 */ jr $ra /* 02EDC 80806C1C 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s index 93bc58f380..83d1209cd6 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s @@ -108,5 +108,3 @@ glabel func_80806C20 /* 03064 80806DA4 A5024A94 */ sh $v0, 0x4A94($t0) ## 00004A94 /* 03068 80806DA8 03E00008 */ jr $ra /* 0306C 80806DAC A422CA9A */ sh $v0, -0x3566($at) ## 0001CA9A - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s index 420f13cbe6..1d5ff16609 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s @@ -96,5 +96,3 @@ glabel func_80806DB0 /* 031E8 80806F28 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 031EC 80806F2C 03E00008 */ jr $ra /* 031F0 80806F30 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806F34.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806F34.s index ad845bdafe..bc8d7cad33 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806F34.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806F34.s @@ -196,5 +196,3 @@ glabel func_80806F34 /* 034F0 80807230 8FB20020 */ lw $s2, 0x0020($sp) /* 034F4 80807234 03E00008 */ jr $ra /* 034F8 80807238 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s index efcd00be63..a0508178aa 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s @@ -759,5 +759,3 @@ glabel func_8080723C /* 04080 80807DC0 8FB10018 */ lw $s1, 0x0018($sp) /* 04084 80807DC4 03E00008 */ jr $ra /* 04088 80807DC8 27BD0120 */ addiu $sp, $sp, 0x0120 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s index a50976f87d..943ee26fc1 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s @@ -142,5 +142,3 @@ glabel func_80807DCC /* 042B4 80807FF4 8FBE0038 */ lw $s8, 0x0038($sp) /* 042B8 80807FF8 03E00008 */ jr $ra /* 042BC 80807FFC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s index b5ac8fcc91..82f1865d06 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s @@ -1047,5 +1047,3 @@ glabel func_80808000 /* 05238 80808F78 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 /* 0523C 80808F7C 03E00008 */ jr $ra /* 05240 80808F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808F84.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808F84.s index fb51d9d536..3e9e823da9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808F84.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808F84.s @@ -46,5 +46,3 @@ glabel func_80808F84 .L80809030: /* 052F0 80809030 03E00008 */ jr $ra /* 052F4 80809034 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s index da86a5752a..71379efe10 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s @@ -398,5 +398,3 @@ glabel func_80809038 /* 058C0 80809600 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 058C4 80809604 03E00008 */ jr $ra /* 058C8 80809608 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080960C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080960C.s index 474380c9ba..e162d327e3 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080960C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080960C.s @@ -37,5 +37,3 @@ glabel func_8080960C .L80809694: /* 05954 80809694 03E00008 */ jr $ra /* 05958 80809698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s index 75bf0e77fc..f0d07274c1 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s @@ -227,5 +227,3 @@ glabel func_8080969C /* 05C7C 808099BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 05C80 808099C0 03E00008 */ jr $ra /* 05C84 808099C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s index 7c6116051e..888c5f5594 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s @@ -1442,5 +1442,3 @@ glabel func_808099C8 /* 071E4 8080AF24 8FB20020 */ lw $s2, 0x0020($sp) /* 071E8 8080AF28 03E00008 */ jr $ra /* 071EC 8080AF2C 27BD01B8 */ addiu $sp, $sp, 0x01B8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF30.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF30.s index 72aa25ffca..aa84a3c62b 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF30.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF30.s @@ -7,5 +7,3 @@ glabel func_8080AF30 /* 07204 8080AF44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 07208 8080AF48 03E00008 */ jr $ra /* 0720C 8080AF4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF50.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF50.s index 6fd51f62c9..57dbb65246 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF50.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AF50.s @@ -31,5 +31,3 @@ glabel func_8080AF50 /* 07284 8080AFC4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 07288 8080AFC8 03E00008 */ jr $ra /* 0728C 8080AFCC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AFD0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AFD0.s index a3ce993db7..a9e78e1f24 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AFD0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080AFD0.s @@ -126,5 +126,3 @@ glabel func_8080AFD0 /* 0745C 8080B19C AC780000 */ sw $t8, 0x0000($v1) ## 00000038 /* 07460 8080B1A0 03E00008 */ jr $ra /* 07464 8080B1A4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000040 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B1A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B1A8.s index 8d2efb358e..5b11ef9244 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B1A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B1A8.s @@ -36,5 +36,3 @@ glabel func_8080B1A8 glabel L8080B224 /* 074E4 8080B224 03E00008 */ jr $ra /* 074E8 8080B228 AFA40000 */ sw $a0, 0x0000($sp) - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s index 5b1ee30423..172a5a2941 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s @@ -92,5 +92,3 @@ glabel func_8080B22C /* 07648 8080B388 8FB00008 */ lw $s0, 0x0008($sp) /* 0764C 8080B38C 03E00008 */ jr $ra /* 07650 8080B390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B394.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B394.s index 72dd53c909..49acf4b0b0 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B394.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B394.s @@ -33,5 +33,3 @@ glabel func_8080B394 .L8080B404: /* 076C4 8080B404 03E00008 */ jr $ra /* 076C8 8080B408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B40C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B40C.s index 44aab332f5..2d6dc99a2d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B40C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B40C.s @@ -34,5 +34,3 @@ glabel func_8080B40C /* 07748 8080B488 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0774C 8080B48C 03E00008 */ jr $ra /* 07750 8080B490 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s index 1f618723cf..0ff788398c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s @@ -38,5 +38,3 @@ glabel func_8080B494 /* 077E0 8080B520 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 077E4 8080B524 03E00008 */ jr $ra /* 077E8 8080B528 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s index 64644f1fc2..ba5735a953 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s @@ -610,5 +610,3 @@ glabel func_8080B52C glabel L8080BE28 /* 080E8 8080BE28 03E00008 */ jr $ra /* 080EC 8080BE2C AFA40000 */ sw $a0, 0x0000($sp) - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s index 92f347d485..a45a8caf4f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s @@ -21,5 +21,3 @@ glabel func_8080BE30 .L8080BE7C: /* 0813C 8080BE7C 03E00008 */ jr $ra /* 08140 8080BE80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s index 1b4ad26250..49bee17536 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s @@ -29,5 +29,3 @@ glabel func_8080BE84 .L8080BEF0: /* 081B0 8080BEF0 03E00008 */ jr $ra /* 081B4 8080BEF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s index 35064c1e7c..8dfcb7e71f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s @@ -29,5 +29,3 @@ glabel func_8080BEF8 .L8080BF64: /* 08224 8080BF64 03E00008 */ jr $ra /* 08228 8080BF68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s index dcb6191bbe..1844e59bbb 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s @@ -30,5 +30,3 @@ glabel func_8080BF6C .L8080BFDC: /* 0829C 8080BFDC 03E00008 */ jr $ra /* 082A0 8080BFE0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s index 0345b524de..a9e84bbf42 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s @@ -211,5 +211,3 @@ glabel func_8080BFE4 /* 085A8 8080C2E8 8FB10020 */ lw $s1, 0x0020($sp) /* 085AC 8080C2EC 03E00008 */ jr $ra /* 085B0 8080C2F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C2F4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C2F4.s index ec2e019d5b..0da9adee22 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C2F4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C2F4.s @@ -14,5 +14,3 @@ glabel func_8080C2F4 /* 085E4 8080C324 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 085E8 8080C328 03E00008 */ jr $ra /* 085EC 8080C32C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C330.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C330.s index ed54c211b9..2ca4eaa1ef 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C330.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C330.s @@ -187,5 +187,3 @@ glabel func_8080C330 /* 088C0 8080C600 8FB10018 */ lw $s1, 0x0018($sp) /* 088C4 8080C604 03E00008 */ jr $ra /* 088C8 8080C608 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s index e39d5f5be4..74c830a086 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s @@ -1232,5 +1232,3 @@ glabel func_8080C60C /* 09B80 8080D8C0 8FB00014 */ lw $s0, 0x0014($sp) /* 09B84 8080D8C4 03E00008 */ jr $ra /* 09B88 8080D8C8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s index 3ea64a416e..ad21ef5050 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s @@ -502,5 +502,3 @@ glabel func_8080D8CC /* 0A328 8080E068 8FB60038 */ lw $s6, 0x0038($sp) /* 0A32C 8080E06C 03E00008 */ jr $ra /* 0A330 8080E070 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s index 239bd49909..69f99bfffa 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s @@ -1361,5 +1361,3 @@ glabel func_8080E074 /* 0B814 8080F554 8FBE0038 */ lw $s8, 0x0038($sp) /* 0B818 8080F558 03E00008 */ jr $ra /* 0B81C 8080F55C 27BD02A0 */ addiu $sp, $sp, 0x02A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s index f235527eb7..45e8c91a3f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s @@ -570,5 +570,3 @@ glabel func_8080F560 /* 0C0E0 8080FE20 8FB10028 */ lw $s1, 0x0028($sp) /* 0C0E4 8080FE24 03E00008 */ jr $ra /* 0C0E8 8080FE28 27BD0110 */ addiu $sp, $sp, 0x0110 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s index e0a20f9bb6..182c240091 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s @@ -95,5 +95,3 @@ glabel func_8080FE2C /* 0C24C 8080FF8C 8FB1000C */ lw $s1, 0x000C($sp) /* 0C250 8080FF90 03E00008 */ jr $ra /* 0C254 8080FF94 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FF98.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FF98.s index d7f004f26b..7f04396d3e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FF98.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FF98.s @@ -69,5 +69,3 @@ glabel func_8080FF98 .L80810094: /* 0C354 80810094 03E00008 */ jr $ra /* 0C358 80810098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081009C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081009C.s index c317497689..79fdb1f86f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081009C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081009C.s @@ -57,5 +57,3 @@ glabel func_8081009C /* 0C430 80810170 A4434A98 */ sh $v1, 0x4A98($v0) ## 00004A98 /* 0C434 80810174 03E00008 */ jr $ra /* 0C438 80810178 A4434A96 */ sh $v1, 0x4A96($v0) ## 00004A96 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s index a4b45ee1e1..d781ec0f8d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s @@ -128,5 +128,3 @@ glabel func_8081017C /* 0C608 80810348 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 /* 0C60C 8081034C 03E00008 */ jr $ra /* 0C610 80810350 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810354.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810354.s index e8d76c3759..89ba076d96 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810354.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810354.s @@ -59,5 +59,3 @@ glabel func_80810354 /* 0C6F4 80810434 A4434A98 */ sh $v1, 0x4A98($v0) ## 00004A98 /* 0C6F8 80810438 03E00008 */ jr $ra /* 0C6FC 8081043C A4434A96 */ sh $v1, 0x4A96($v0) ## 00004A96 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s index c6eb3f8d59..e8199c1a9b 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s @@ -160,5 +160,3 @@ glabel func_80810440 /* 0C94C 8081068C 8FB40014 */ lw $s4, 0x0014($sp) /* 0C950 80810690 03E00008 */ jr $ra /* 0C954 80810694 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s index df98d3c13f..989d50ab73 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s @@ -23,5 +23,3 @@ glabel func_80810698 .L808106EC: /* 0C9AC 808106EC 03E00008 */ jr $ra /* 0C9B0 808106F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s index c291881a3f..a26206c51f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s @@ -169,5 +169,3 @@ glabel func_808106F4 /* 0CC30 80810970 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0CC34 80810974 03E00008 */ jr $ra /* 0CC38 80810978 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081097C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081097C.s index 76c2e720c2..5bb54282e2 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081097C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081097C.s @@ -14,5 +14,3 @@ glabel func_8081097C /* 0CC6C 808109AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0CC70 808109B0 03E00008 */ jr $ra /* 0CC74 808109B4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s index daaf6055e5..9f9baa5d52 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s @@ -256,5 +256,3 @@ glabel func_808109B8 /* 0D060 80810DA0 8FB10028 */ lw $s1, 0x0028($sp) /* 0D064 80810DA4 03E00008 */ jr $ra /* 0D068 80810DA8 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s index 7fa2a1933d..de39b7ec77 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s @@ -398,5 +398,3 @@ glabel func_80810DAC /* 0D65C 8081139C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 0D660 808113A0 03E00008 */ jr $ra /* 0D664 808113A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s index 6c82a645ad..e6c33412c0 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s @@ -412,4 +412,3 @@ glabel func_808113A8 /* 0DCCC 80811A0C 8FB20020 */ lw $s2, 0x0020($sp) /* 0DCD0 80811A10 03E00008 */ jr $ra /* 0DCD4 80811A14 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index aec526e62f..ba0483b311 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -107,4 +107,3 @@ glabel func_80811A20 /* 0DE64 80811BA4 03E00008 */ jr $ra /* 0DE68 80811BA8 00000000 */ nop /* 0DE6C 80811BAC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s index 9334a21457..f4f09d886e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s @@ -6,5 +6,3 @@ glabel func_80800B90 /* 00010 80800BA0 AC8F0010 */ sw $t7, 0x0010($a0) ## 00000010 /* 00014 80800BA4 03E00008 */ jr $ra /* 00018 80800BA8 AC8E000C */ sw $t6, 0x000C($a0) ## 0000000C - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s index 1076457d27..f2ba6e2323 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s @@ -66,5 +66,3 @@ glabel func_80800BAC /* 00118 80800CA8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 0011C 80800CAC 03E00008 */ jr $ra /* 00120 80800CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s index 08cd20b332..6b593cb9c0 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s @@ -669,5 +669,3 @@ glabel func_80800CB4 /* 00A78 80801608 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 00A7C 8080160C 03E00008 */ jr $ra /* 00A80 80801610 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801614.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801614.s index 0d17efc0e3..e3b44b74a9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801614.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801614.s @@ -124,5 +124,3 @@ glabel func_80801614 /* 00C54 808017E4 8FB70038 */ lw $s7, 0x0038($sp) /* 00C58 808017E8 03E00008 */ jr $ra /* 00C5C 808017EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_808017F0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_808017F0.s index 2f3aa26592..35898b6a96 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_808017F0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_808017F0.s @@ -34,5 +34,3 @@ glabel func_808017F0 /* 00CE0 80801870 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00CE4 80801874 03E00008 */ jr $ra /* 00CE8 80801878 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_8080187C.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_8080187C.s index 70a1ca632c..b0f4ad6ec0 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_8080187C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_8080187C.s @@ -28,5 +28,3 @@ glabel func_8080187C /* 00D54 808018E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 00D58 808018E8 03E00008 */ jr $ra /* 00D5C 808018EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s index 7ed751b88a..4b6e98d4b7 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s @@ -125,5 +125,3 @@ glabel L80801A6C /* 00F10 80801AA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 00F14 80801AA4 03E00008 */ jr $ra /* 00F18 80801AA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s index d35d64343c..4fedc0cb0e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s @@ -80,5 +80,3 @@ glabel func_80801AAC /* 01054 80801BE4 8FDE0030 */ lw $s8, 0x0030($s8) ## FFFFFFC0 /* 01058 80801BE8 03E00008 */ jr $ra /* 0105C 80801BEC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s index 3b4c86aa77..e17ca02081 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s @@ -68,5 +68,3 @@ glabel func_80801BF0 /* 01168 80801CF8 8FDE0030 */ lw $s8, 0x0030($s8) ## FFFFFFC0 /* 0116C 80801CFC 03E00008 */ jr $ra /* 01170 80801D00 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s index 5fda22ecd9..baeda181f2 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s @@ -57,5 +57,3 @@ glabel func_80801D04 /* 01248 80801DD8 8FB10018 */ lw $s1, 0x0018($sp) /* 0124C 80801DDC 03E00008 */ jr $ra /* 01250 80801DE0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801DE4.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801DE4.s index ed7e9ef2d8..85140e48c2 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801DE4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801DE4.s @@ -9,5 +9,3 @@ glabel func_80801DE4 /* 01270 80801E00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01274 80801E04 03E00008 */ jr $ra /* 01278 80801E08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E0C.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E0C.s index 05ae750293..1fde437b51 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E0C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E0C.s @@ -13,5 +13,3 @@ glabel func_80801E0C /* 012A8 80801E38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 012AC 80801E3C 03E00008 */ jr $ra /* 012B0 80801E40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s index 5f930ec7c0..aeab57eb8c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s @@ -95,4 +95,3 @@ glabel func_80801E44 /* 01424 80801FB4 03E00008 */ jr $ra /* 01428 80801FB8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 /* 0142C 80801FBC 00000000 */ nop - diff --git a/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s b/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s index ef35264e51..1835309ae3 100644 --- a/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s +++ b/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s @@ -5,8 +5,6 @@ .set noreorder # don't insert nops after branches .set gp=64 # allow use of 64-bit general purposee registers -.section .text - .section .data D_80858B70: .word 0x00010347, 0x32000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000FF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000FF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010140, 0x3E000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000FF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x044C2500, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x002E3205, 0x4C340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000FF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000101, 0xFF321700, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0002022E, 0x32063A3C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000FF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000FF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 @@ -32,10 +30,6 @@ glabel gMapMarkDataTable .word D_8085EC1C .word D_8085F090 -.section .rodata - - - .section .rodata D_8085F610: .incbin "baserom/ovl_map_mark_data", 0x6AA0, 0x00000040 diff --git a/data/overlays/actors/z_arms_hook.rodata.s b/data/overlays/actors/z_arms_hook.rodata.s deleted file mode 100644 index 5e2ae1fe20..0000000000 --- a/data/overlays/actors/z_arms_hook.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80865BC0 - .asciz "../z_arms_hook.c" - .balign 4 - -glabel D_80865BD4 - .asciz "../z_arms_hook.c" - .balign 4 - -glabel D_80865BE8 - .asciz "../z_arms_hook.c" - .balign 4 - -glabel D_80865BFC - .asciz "../z_arms_hook.c" - .balign 4 - -glabel D_80865C10 - .word 0x38000100 -glabel D_80865C14 - .word 0x3C75C28F -glabel D_80865C18 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_bombwall.rodata.s b/data/overlays/actors/z_bg_bombwall.rodata.s deleted file mode 100644 index bf59f80795..0000000000 --- a/data/overlays/actors/z_bg_bombwall.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8086F040 - - .asciz "Warning : move BG 登録失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8086F074 - - .asciz "../z_bg_bombwall.c" - .balign 4 - -glabel D_8086F088 - - .asciz "(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n" - .balign 4 - -.balign 8 diff --git a/data/overlays/actors/z_bg_bowl_wall.rodata.s b/data/overlays/actors/z_bg_bowl_wall.rodata.s deleted file mode 100644 index e5c0ccc1e0..0000000000 --- a/data/overlays/actors/z_bg_bowl_wall.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8086FA90 - .word 0x0A0A0000 -glabel D_8086FA94 - - .asciz " ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_8086FAD0 - .word 0x0A0A0000 -glabel D_8086FAD4 - - .asciz "../z_bg_bowl_wall.c" - .balign 4 - -glabel D_8086FAE8 - - .asciz "../z_bg_bowl_wall.c" - .balign 4 - -glabel D_8086FAFC - - .asciz "../z_bg_bowl_wall.c" - .balign 4 - -glabel D_8086FB10 - .word 0x403F5C29, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_breakwall.rodata.s b/data/overlays/actors/z_bg_breakwall.rodata.s deleted file mode 100644 index c7b04a84b5..0000000000 --- a/data/overlays/actors/z_bg_breakwall.rodata.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80870970 - - .asciz "../z_bg_breakwall.c" - .balign 4 - -glabel D_80870984 - - .asciz "../z_bg_breakwall.c" - .balign 4 - -glabel D_80870998 - - .asciz "../z_bg_breakwall.c" - .balign 4 - -glabel D_808709AC - .word 0x455AC000 -glabel D_808709B0 - .word 0x3A83126F -glabel D_808709B4 - .word 0x3F19999A -glabel D_808709B8 - .word 0x453B8000 -glabel D_808709BC - .word 0x40CCCCCD - - diff --git a/data/overlays/actors/z_bg_ddan_kd.rodata.s b/data/overlays/actors/z_bg_ddan_kd.rodata.s deleted file mode 100644 index ad62353ac4..0000000000 --- a/data/overlays/actors/z_bg_ddan_kd.rodata.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80871920 - - .asciz "dam %d\n" - .balign 4 - -glabel D_8087192C - .word 0x3BF5C28F -glabel D_80871930 - .word 0x3F19999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_dodoago.rodata.s b/data/overlays/actors/z_bg_dodoago.rodata.s deleted file mode 100644 index c870c75e4e..0000000000 --- a/data/overlays/actors/z_bg_dodoago.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80872650 - - .asciz "../z_bg_dodoago.c" - .balign 4 - -glabel D_80872664 - - .asciz "../z_bg_dodoago.c" - .balign 4 - -glabel D_80872678 - - .asciz "../z_bg_dodoago.c" - .balign 4 - -.balign 8 diff --git a/data/overlays/actors/z_bg_dy_yoseizo.rodata.s b/data/overlays/actors/z_bg_dy_yoseizo.rodata.s deleted file mode 100644 index f4244a66a2..0000000000 --- a/data/overlays/actors/z_bg_dy_yoseizo.rodata.s +++ /dev/null @@ -1,106 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808754E0 - - .asciz "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80875510 - - .asciz "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80875540 - - .asciz "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_8087556C - - .asciz " ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_808755A0 - - .asciz " ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_808755D8 - - .asciz " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80875608 - - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875620 - - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875638 - - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875650 - - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875668 - - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875680 - .word 0x3C23D70A -glabel D_80875684 - .word 0x455AC000 -glabel D_80875688 - .word 0x3ECCCCCD -glabel D_8087568C - .word 0x3E4CCCCD -glabel D_80875690 - .word 0x3DCCCCCD -glabel D_80875694 - .word 0x3ECCCCCD -glabel D_80875698 - .word 0x3D0B4396 -glabel D_8087569C - .word 0x449F2000 -glabel D_808756A0 - .word 0x449F2000 -glabel D_808756A4 - .word 0x44A28000 -glabel D_808756A8 - .word 0x3B449BA6 -glabel D_808756AC - .word 0x3D0B4396 -glabel D_808756B0 - .word 0x3E99999A -glabel D_808756B4 - .word 0x45EA6000 -glabel D_808756B8 - .word 0x46EA6000 -glabel D_808756BC - .word 0x459C4000 -glabel D_808756C0 - .word 0x3F666666 -glabel D_808756C4 - .word 0x453B8000 -glabel D_808756C8 - .word 0x40490FDB -glabel D_808756CC - .word 0x40490FDB - - diff --git a/data/overlays/actors/z_bg_ganon_otyuka.rodata.s b/data/overlays/actors/z_bg_ganon_otyuka.rodata.s deleted file mode 100644 index a6de8d6871..0000000000 --- a/data/overlays/actors/z_bg_ganon_otyuka.rodata.s +++ /dev/null @@ -1,75 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80877EC0 - .word 0x1B5B3332, 0x6D000000 -glabel D_80877EC8 - - .asciz "WHY !!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80877EE0 - .word 0x1B5B6D00 -glabel D_80877EE4 - .word 0x4F544320, 0x4F20310A, 0x00000000 -glabel D_80877EF0 - .word 0x4F544320, 0x4F20320A, 0x00000000 -glabel D_80877EFC - .word 0x4F544320, 0x4F20330A, 0x00000000 -glabel D_80877F08 - - .asciz "MODE DOWN\n" - .balign 4 - -glabel D_80877F14 - - .asciz "MODE DOWN END\n" - .balign 4 - -glabel D_80877F24 - - .asciz "../z_bg_ganon_otyuka.c" - .balign 4 - -glabel D_80877F3C - - .asciz "../z_bg_ganon_otyuka.c" - .balign 4 - -glabel D_80877F54 - - .asciz "../z_bg_ganon_otyuka.c" - .balign 4 - -glabel D_80877F6C - - .asciz "../z_bg_ganon_otyuka.c" - .balign 4 - -glabel D_80877F84 - - .asciz "../z_bg_ganon_otyuka.c" - .balign 4 - -glabel D_80877F9C - .word 0x45992000 -glabel D_80877FA0 - .word 0xC43B8000 -glabel D_80877FA4 - .word 0x3DCCCCCD -glabel D_80877FA8 - .word 0xC43B8000 -glabel D_80877FAC - .word 0x40490FDB -glabel D_80877FB0 - .word 0x40490FDB -glabel D_80877FB4 - .word 0x3E99999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_gnd_darkmeiro.rodata.s b/data/overlays/actors/z_bg_gnd_darkmeiro.rodata.s deleted file mode 100644 index 3516a89971..0000000000 --- a/data/overlays/actors/z_bg_gnd_darkmeiro.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808793E0 - .asciz "../z_bg_gnd_darkmeiro.c" - .balign 4 - -glabel D_808793F8 - .asciz "../z_bg_gnd_darkmeiro.c" - .balign 4 - -glabel D_80879410 - .asciz "../z_bg_gnd_darkmeiro.c" - .balign 4 - -glabel D_80879428 - .asciz "../z_bg_gnd_darkmeiro.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_bg_gnd_firemeiro.rodata.s b/data/overlays/actors/z_bg_gnd_firemeiro.rodata.s deleted file mode 100644 index 78f8398986..0000000000 --- a/data/overlays/actors/z_bg_gnd_firemeiro.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808799E0 - .asciz "../z_bg_gnd_firemeiro.c" - .balign 4 - -glabel D_808799F8 - .asciz "../z_bg_gnd_firemeiro.c" - .balign 4 - -glabel D_80879A10 - .asciz "../z_bg_gnd_firemeiro.c" - .balign 4 - -.balign 16 - diff --git a/data/overlays/actors/z_bg_gnd_soulmeiro.rodata.s b/data/overlays/actors/z_bg_gnd_soulmeiro.rodata.s deleted file mode 100644 index 0350540a06..0000000000 --- a/data/overlays/actors/z_bg_gnd_soulmeiro.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087B590 - .asciz "../z_bg_gnd_soulmeiro.c" - .balign 4 - -glabel D_8087B5A8 - .asciz "../z_bg_gnd_soulmeiro.c" - .balign 4 - -glabel D_8087B5C0 - .asciz "../z_bg_gnd_soulmeiro.c" - .balign 4 - -glabel D_8087B5D8 - .word 0x462AA800 -glabel D_8087B5DC - .word 0x3C088889 -glabel D_8087B5E0 - .word 0x3F333333, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka.rodata.s b/data/overlays/actors/z_bg_haka.rodata.s deleted file mode 100644 index 4f30e848b7..0000000000 --- a/data/overlays/actors/z_bg_haka.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087BD00 - .asciz "../z_bg_haka.c" - .balign 4 - -glabel D_8087BD10 - .asciz "../z_bg_haka.c" - .balign 4 - -glabel D_8087BD20 - .asciz "../z_bg_haka.c" - .balign 4 - -glabel D_8087BD30 - .asciz "../z_bg_haka.c" - .balign 4 - -glabel D_8087BD40 - .word 0x420A6666 -glabel D_8087BD44 - .word 0xC2E1999A -glabel D_8087BD48 - .word 0x3D4CCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_gate.rodata.s b/data/overlays/actors/z_bg_haka_gate.rodata.s deleted file mode 100644 index 8ecfc3abc3..0000000000 --- a/data/overlays/actors/z_bg_haka_gate.rodata.s +++ /dev/null @@ -1,50 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087CD10 - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD24 - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD38 - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD4C - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD60 - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD74 - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD88 - .asciz "../z_bg_haka_gate.c" - .balign 4 - -glabel D_8087CD9C - .word 0x3DCCCCCD -glabel D_8087CDA0 - .word 0x43360B61 -glabel D_8087CDA4 - .word 0x38C90FDB -glabel D_8087CDA8 - .word 0x3727C5AC -glabel D_8087CDAC - .word 0x38C90FDB -glabel D_8087CDB0 - .word 0x38C90FDB, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_haka_huta.rodata.s b/data/overlays/actors/z_bg_haka_huta.rodata.s deleted file mode 100644 index 4d7a44709f..0000000000 --- a/data/overlays/actors/z_bg_haka_huta.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087D970 - .word 0x38C90FDB -glabel D_8087D974 - .word 0x3E23DA21, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_meganebg.rodata.s b/data/overlays/actors/z_bg_haka_meganebg.rodata.s deleted file mode 100644 index d329dfb958..0000000000 --- a/data/overlays/actors/z_bg_haka_meganebg.rodata.s +++ /dev/null @@ -1,17 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087E420 - .word 0x453B8000 -glabel D_8087E424 - .word 0x3CCCCCCD -glabel D_8087E428 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_sgami.rodata.s b/data/overlays/actors/z_bg_haka_sgami.rodata.s deleted file mode 100644 index 8b3cffc71f..0000000000 --- a/data/overlays/actors/z_bg_haka_sgami.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087EFE0 - .word 0x3E490FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_ship.rodata.s b/data/overlays/actors/z_bg_haka_ship.rodata.s deleted file mode 100644 index 397ee5a44a..0000000000 --- a/data/overlays/actors/z_bg_haka_ship.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8087FAD0 - .word 0xA5B7A1BC, 0xA5F320B3, 0xB0CED8C1, 0xA5202E2E, 0x2E2020A5, 0xA2A5A1A5, 0xAFA5B7A5, 0xE7A5F3A1, 0xAAA1AA0A, 0x00000000 -glabel D_8087FAF8 - .asciz "../z_bg_haka_ship.c" - .balign 4 - -glabel D_8087FB0C - .asciz "../z_bg_haka_ship.c" - .balign 4 - -glabel D_8087FB20 - .asciz "../z_bg_haka_ship.c" - .balign 4 - -glabel D_8087FB34 - .asciz "../z_bg_haka_ship.c" - .balign 4 - -glabel D_8087FB48 - .asciz "../z_bg_haka_ship.c" - .balign 4 - -glabel D_8087FB5C - .asciz "../z_bg_haka_ship.c" - .balign 4 - -glabel D_8087FB70 - .word 0x3E00ADFD -glabel D_8087FB74 - .word 0x3E00ADFD -glabel D_8087FB78 - .word 0x45EF1000 -glabel D_8087FB7C - .word 0x45ED8000 -glabel D_8087FB80 - .word 0x424989D9 -glabel D_8087FB84 - .word 0x3E00ADFD -glabel D_8087FB88 - .word 0x38C90FDB -glabel D_8087FB8C - .word 0xC5656000 -glabel D_8087FB90 - .word 0xC3B78000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_trap.rodata.s b/data/overlays/actors/z_bg_haka_trap.rodata.s deleted file mode 100644 index 35df2d1d7f..0000000000 --- a/data/overlays/actors/z_bg_haka_trap.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80881040 - .word 0x3DCCCCCD -glabel D_80881044 - .word 0x3DCCCCCD -glabel D_80881048 - .word 0x3FCCCCCD -glabel D_8088104C - .word 0x3C23D70A -glabel D_80881050 - .word 0x3C23D70A -glabel D_80881054 - .word 0x3D75C28F -glabel D_80881058 - .word 0x388D3DCB -glabel D_8088105C - .word 0x3F2AAAAB -glabel D_80881060 - .word 0x3CF5C28F -glabel D_80881064 - .word 0x3CF5C28F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_tubo.rodata.s b/data/overlays/actors/z_bg_haka_tubo.rodata.s deleted file mode 100644 index 776dc3bb13..0000000000 --- a/data/overlays/actors/z_bg_haka_tubo.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80881BD0 - .asciz "../z_bg_haka_tubo.c" - .balign 4 - -glabel D_80881BE4 - .asciz "../z_bg_haka_tubo.c" - .balign 4 - -glabel D_80881BF8 - .asciz "../z_bg_haka_tubo.c" - .balign 4 - -glabel D_80881C0C - .word 0xC5ADB800 -glabel D_80881C10 - .word 0xC4C66000 -glabel D_80881C14 - .word 0x3E4CCCCD -glabel D_80881C18 - .word 0x3ECCCCCD -glabel D_80881C1C - .word 0x3F19999A -glabel D_80881C20 - .word 0x3F4CCCCD -glabel D_80881C24 - .word 0x38C90FDB -glabel D_80881C28 - .word 0x3D8F5C29 -glabel D_80881C2C - .word 0x3D23D70A - - diff --git a/data/overlays/actors/z_bg_haka_water.rodata.s b/data/overlays/actors/z_bg_haka_water.rodata.s deleted file mode 100644 index 5d6a56fe54..0000000000 --- a/data/overlays/actors/z_bg_haka_water.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808824C0 - .asciz "../z_bg_haka_water.c" - .balign 4 - -glabel D_808824D8 - .asciz "../z_bg_haka_water.c" - .balign 4 - -glabel D_808824F0 - .asciz "../z_bg_haka_water.c" - .balign 4 - -glabel D_80882508 - .asciz "../z_bg_haka_water.c" - .balign 4 - -glabel D_80882520 - .word 0x3F43D70A -glabel D_80882524 - .word 0x3DCCCCCD -glabel D_80882528 - .word 0x40A33333, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_haka_zou.rodata.s b/data/overlays/actors/z_bg_haka_zou.rodata.s deleted file mode 100644 index bfe284ac9d..0000000000 --- a/data/overlays/actors/z_bg_haka_zou.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80883660 - .word 0x3BA3D70A -glabel D_80883664 - .word 0x3CCCCCCD -glabel D_80883668 - .word 0x453B8000 -glabel D_8088366C - .word 0x44BB8000 -glabel D_80883670 - .word 0xBF19999A -glabel D_80883674 - .word 0x44098000 -glabel D_80883678 - .word 0x3D23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_heavy_block.rodata.s b/data/overlays/actors/z_bg_heavy_block.rodata.s deleted file mode 100644 index dc21784a93..0000000000 --- a/data/overlays/actors/z_bg_heavy_block.rodata.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80884EE0 - .asciz " 最大 ブロック セーブビット %x\n" - .balign 4 - -glabel D_80884F08 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884F20 - .asciz "\"NA_SE_PL_PULL_UP_BIGROCK\" = %s\n" - .balign 4 - -glabel D_80884F44 - .asciz "NA_SE_PL_PULL_UP_BIGROCK" - .balign 4 - -glabel D_80884F60 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884F78 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884F90 - .asciz "../z_bg_heavy_block.c" - .balign 4 - -glabel D_80884FA8 - .word 0xBF19999A -glabel D_80884FAC - .word 0x3E4CCCCD -glabel jtbl_80884FB0 -.word L80883BF8 -.word L80883B2C -.word L80883A9C -.word L80883AE4 -.word L80883B6C -glabel D_80884FC4 - .word 0x3F7AE148 -glabel D_80884FC8 - .word 0x44D1C000 -glabel D_80884FCC - .word 0x44A0C000 -glabel D_80884FD0 - .word 0x44D82000 -glabel D_80884FD4 - .word 0x449EA000 -glabel D_80884FD8 - .word 0xC437C000 -glabel D_80884FDC - .word 0xC555A000 - - diff --git a/data/overlays/actors/z_bg_hidan_curtain.rodata.s b/data/overlays/actors/z_bg_hidan_curtain.rodata.s deleted file mode 100644 index 5522f0d82a..0000000000 --- a/data/overlays/actors/z_bg_hidan_curtain.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80885BF0 - .asciz "Curtain (arg_data 0x%04x)\n" - .balign 4 - -glabel D_80885C0C - .asciz "Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80885C50 - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885C68 - .asciz "Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80885CB4 - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885CCC - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885CE4 - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885CFC - .word 0x2E2E2F7A, 0x5F62675F, 0x68696461, 0x6E5F6375, 0x72746169, 0x6E2E6300, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_fwbig.rodata.s b/data/overlays/actors/z_bg_hidan_fwbig.rodata.s deleted file mode 100644 index 2a91e8d4a8..0000000000 --- a/data/overlays/actors/z_bg_hidan_fwbig.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80887F00 - .asciz "../z_bg_hidan_fwbig.c" - .balign 4 - -glabel D_80887F18 - .asciz "../z_bg_hidan_fwbig.c" - .balign 4 - -glabel D_80887F30 - .asciz "../z_bg_hidan_fwbig.c" - .balign 4 - -glabel D_80887F48 - .word 0x445D599A -glabel D_80887F4C - .word 0x445D599A -glabel D_80887F50 - .word 0x448FC000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_hamstep.rodata.s b/data/overlays/actors/z_bg_hidan_hamstep.rodata.s deleted file mode 100644 index eec22f8be3..0000000000 --- a/data/overlays/actors/z_bg_hidan_hamstep.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80888EA0 - .word 0xA2FEA2FE, 0xA2FEB1EA, 0xA4CEBFC0, 0xC5C2A5AA, 0xA5D6A5B8, 0xA5A7A5AF, 0xA5C8A1DA, 0xA5CFA5F3, 0xA5DEA1BC, 0xA5B9A5C6, 0xA5C3A5D7, 0xA1DBBDD0, 0xB8BD0A00 -glabel D_80888ED4 - .word 0xA1DAA5CF, 0xA5F3A5DE, 0xA1BCA5B9, 0xA5C6A5C3, 0xA5D7A1DB, 0x20C2ADBE, 0xECBBBAA4, 0xECA4CAA4, 0xA4A1AAA1, 0xAA0A0000 -glabel D_80888EFC - .word 0x25732025, 0x640A0000 -glabel D_80888F04 - .asciz "../z_bg_hidan_hamstep.c" - .balign 4 - -glabel D_80888F1C - .word 0x41282564, 0x290A0000 -glabel D_80888F24 - .asciz "【ハンマーステップ】 arg_data おかしい (arg_data = %d)" - .balign 4 - -glabel D_80888F5C - .word 0x25732025, 0x640A0000 -glabel D_80888F64 - .asciz "../z_bg_hidan_hamstep.c" - .balign 4 - -glabel D_80888F7C - .word 0x42282564, 0x290A0000 -glabel D_80888F84 - .asciz "../z_bg_hidan_hamstep.c" - .balign 4 - -glabel D_80888F9C - .asciz "../z_bg_hidan_hamstep.c" - .balign 4 - -glabel D_80888FB4 - .asciz "../z_bg_hidan_hamstep.c" - .balign 4 - -glabel D_80888FCC - .word 0xBF99999A -glabel D_80888FD0 - .word 0xBE75C28F -glabel D_80888FD4 - .word 0xBE75C28F -glabel D_80888FD8 - .word 0x461C4000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_hrock.rodata.s b/data/overlays/actors/z_bg_hidan_hrock.rodata.s deleted file mode 100644 index db42de6293..0000000000 --- a/data/overlays/actors/z_bg_hidan_hrock.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808898C0 - .word 0x453B8000 -glabel D_808898C4 - .word 0x453B8000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_kousi.rodata.s b/data/overlays/actors/z_bg_hidan_kousi.rodata.s deleted file mode 100644 index acc796e126..0000000000 --- a/data/overlays/actors/z_bg_hidan_kousi.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80889E90 - .asciz "◯◯◯炎の神殿オブジェクト【格子(arg_data : %0x)】出現 (%d %d)\n" - .balign 4 - -glabel D_80889ED0 - .asciz "arg_data おかしい 【格子】\n" - .balign 4 - -glabel D_80889EEC - .asciz "../z_bg_hidan_kousi.c" - .balign 4 - -glabel D_80889F04 - .asciz "../z_bg_hidan_kousi.c" - .balign 4 - -glabel D_80889F1C - .asciz "../z_bg_hidan_kousi.c" - .balign 4 - -glabel D_80889F34 - .word 0x3E4CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_kowarerukabe.rodata.s b/data/overlays/actors/z_bg_hidan_kowarerukabe.rodata.s deleted file mode 100644 index 876951a506..0000000000 --- a/data/overlays/actors/z_bg_hidan_kowarerukabe.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8088AE90 - .asciz "Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8088AEE0 - .asciz "../z_bg_hidan_kowarerukabe.c" - .balign 4 - -glabel D_8088AF00 - .asciz "(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8088AF30 - .asciz "../z_bg_hidan_kowarerukabe.c" - .balign 4 - -glabel D_8088AF50 - .asciz "../z_bg_hidan_kowarerukabe.c" - .balign 4 - -glabel D_8088AF70 - .asciz "../z_bg_hidan_kowarerukabe.c" - .balign 4 - -glabel D_8088AF90 - .word 0x3FB33333 -glabel D_8088AF94 - .word 0x3FB33333 -glabel D_8088AF98 - .word 0x3FCCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_rock.rodata.s b/data/overlays/actors/z_bg_hidan_rock.rodata.s deleted file mode 100644 index faa466f9b5..0000000000 --- a/data/overlays/actors/z_bg_hidan_rock.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8088BFF0 - .asciz "../z_bg_hidan_rock.c" - .balign 4 - -glabel D_8088C008 - .asciz "../z_bg_hidan_rock.c" - .balign 4 - -glabel D_8088C020 - .asciz "../z_bg_hidan_rock.c" - .balign 4 - -glabel D_8088C038 - .word 0x3C23D70A -glabel D_8088C03C - .word 0x3C23D70A -glabel D_8088C040 - .word 0x3D4CCCCD -glabel D_8088C044 - .word 0x3C4DE32F -glabel D_8088C048 - .word 0x44E38000 -glabel D_8088C04C - .word 0x3DCCCCCD -glabel D_8088C050 - .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_rsekizou.rodata.s b/data/overlays/actors/z_bg_hidan_rsekizou.rodata.s deleted file mode 100644 index 48ce5d8c78..0000000000 --- a/data/overlays/actors/z_bg_hidan_rsekizou.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8088CDA0 - .asciz "../z_bg_hidan_rsekizou.c" - .balign 4 - -glabel D_8088CDBC - .asciz "../z_bg_hidan_rsekizou.c" - .balign 4 - -glabel D_8088CDD8 - .asciz "../z_bg_hidan_rsekizou.c" - .balign 4 - -glabel D_8088CDF4 - .asciz "../z_bg_hidan_rsekizou.c" - .balign 4 - -glabel D_8088CE10 - .word 0x3E124925 -glabel D_8088CE14 - .word 0x3EAAAAAB -glabel D_8088CE18 - .word 0x3F333333 -glabel D_8088CE1C - .word 0x3F333333 - - diff --git a/data/overlays/actors/z_bg_hidan_sekizou.rodata.s b/data/overlays/actors/z_bg_hidan_sekizou.rodata.s deleted file mode 100644 index 351aff00f6..0000000000 --- a/data/overlays/actors/z_bg_hidan_sekizou.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8088E2A0 - .asciz "../z_bg_hidan_sekizou.c" - .balign 4 - -glabel D_8088E2B8 - .asciz "../z_bg_hidan_sekizou.c" - .balign 4 - -glabel D_8088E2D0 - .asciz "../z_bg_hidan_sekizou.c" - .balign 4 - -glabel D_8088E2E8 - .asciz "../z_bg_hidan_sekizou.c" - .balign 4 - -glabel D_8088E300 - .word 0x3E124925 -glabel D_8088E304 - .word 0x3F333333 -glabel D_8088E308 - .word 0x3F333333, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_hidan_sima.rodata.s b/data/overlays/actors/z_bg_hidan_sima.rodata.s deleted file mode 100644 index b6b60565a4..0000000000 --- a/data/overlays/actors/z_bg_hidan_sima.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8088F220 - .asciz "../z_bg_hidan_sima.c" - .balign 4 - -glabel D_8088F238 - .asciz "../z_bg_hidan_sima.c" - .balign 4 - -glabel D_8088F250 - .asciz "../z_bg_hidan_sima.c" - .balign 4 - -glabel D_8088F268 - .asciz "../z_bg_hidan_sima.c" - .balign 4 - -glabel D_8088F280 - .asciz "../z_bg_hidan_sima.c" - .balign 4 - -glabel D_8088F298 - .word 0x3F9111F0, 0xC34C1A8B -glabel D_8088F2A0 - .word 0x400921FB, 0x60000000 -glabel D_8088F2A8 - .word 0x3F9111F0, 0xC34C1A8B -glabel D_8088F2B0 - .word 0x400921FB, 0x60000000 -glabel D_8088F2B8 - .word 0x3E20D97C -glabel D_8088F2BC - .word 0x3ECCCCCD - - diff --git a/data/overlays/actors/z_bg_ice_objects.rodata.s b/data/overlays/actors/z_bg_ice_objects.rodata.s deleted file mode 100644 index d506b29d46..0000000000 --- a/data/overlays/actors/z_bg_ice_objects.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80890520 - .word 0xC49D8000 -glabel D_80890524 - .word 0xC4DE8000 -glabel D_80890528 - .word 0xC4CF8000 -glabel D_8089052C - .word 0xC4848000 -glabel D_80890530 - .word 0xC4C58000 -glabel D_80890534 - .word 0xC4938000 -glabel D_80890538 - .word 0x44AD6000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_ice_shelter.rodata.s b/data/overlays/actors/z_bg_ice_shelter.rodata.s deleted file mode 100644 index 53d17721da..0000000000 --- a/data/overlays/actors/z_bg_ice_shelter.rodata.s +++ /dev/null @@ -1,62 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80891800 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80891840 - .asciz "../z_bg_ice_shelter.c" - .balign 4 - -glabel D_80891858 - .asciz "(ice shelter)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80891878 - .asciz "../z_bg_ice_shelter.c" - .balign 4 - -glabel D_80891890 - .asciz "../z_bg_ice_shelter.c" - .balign 4 - -glabel D_808918A8 - .asciz "../z_bg_ice_shelter.c" - .balign 4 - -glabel jtbl_808918C0 -.word L80890B5C -.word L80890B5C -.word L80890B40 -.word L80890B40 -.word L80890B5C -glabel D_808918D4 - .word 0x3D8F5C29 -glabel D_808918D8 - .word 0x3F4CCCCD -glabel D_808918DC - .word 0x3D8F5C29 -glabel D_808918E0 - .word 0x3E0F5C29 -glabel D_808918E4 - .word 0x3E4CCCCD -glabel D_808918E8 - .word 0x3F4CCCCD -glabel D_808918EC - .word 0x38D1B717 -glabel jtbl_808918F0 -.word L808914C8 -.word L808914C8 -.word L80891568 -.word L80891680 -.word L808914C8 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_ice_turara.rodata.s b/data/overlays/actors/z_bg_ice_turara.rodata.s deleted file mode 100644 index e19461a542..0000000000 --- a/data/overlays/actors/z_bg_ice_turara.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80892690 - .word 0x3DCCCCCD -glabel D_80892694 - .word 0x3E4CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_ingate.rodata.s b/data/overlays/actors/z_bg_ingate.rodata.s deleted file mode 100644 index 1202823555..0000000000 --- a/data/overlays/actors/z_bg_ingate.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80892AB0 - - .asciz "../z_bg_ingate.c" - .balign 4 - -glabel D_80892AC4 - - .asciz "../z_bg_ingate.c" - .balign 4 - -glabel D_80892AD8 - .word 0x2E2E2F7A, 0x5F62675F, 0x696E6761, 0x74652E63, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_1flift.rodata.s b/data/overlays/actors/z_bg_jya_1flift.rodata.s deleted file mode 100644 index 236a07ad18..0000000000 --- a/data/overlays/actors/z_bg_jya_1flift.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80893150 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80893190 - .asciz "../z_bg_jya_1flift.c" - .balign 4 - -glabel D_808931A8 - .asciz "(１Ｆリフト)(flag %d)(room %d)\n" - .balign 4 - -glabel D_808931C8 - .word 0x3A83126F, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_bigmirror.rodata.s b/data/overlays/actors/z_bg_jya_bigmirror.rodata.s deleted file mode 100644 index 862c6fd645..0000000000 --- a/data/overlays/actors/z_bg_jya_bigmirror.rodata.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80893F60 - .asciz "Error : コブラ削除された (%s %d)\n" - .balign 4 - -glabel D_80893F84 - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80893F9C - .asciz "Error : コブラ発生失敗 (%s %d)\n" - .balign 4 - -glabel D_80893FBC - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80893FD4 - .asciz "Error : Mir Ray 発生失敗 (%s %d)\n" - .balign 4 - -glabel D_80893FF8 - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80894010 - .asciz "(jya 大鏡)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80894030 - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80894048 - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80894060 - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80894078 - .asciz "../z_bg_jya_bigmirror.c" - .balign 4 - -glabel D_80894090 - .word 0x3DCCCCCD -glabel D_80894094 - .word 0xBA4CCCCD -glabel D_80894098 - .word 0x3FB1F0A4 -glabel D_8089409C - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_bg_jya_block.rodata.s b/data/overlays/actors/z_bg_jya_block.rodata.s deleted file mode 100644 index 1a88694579..0000000000 --- a/data/overlays/actors/z_bg_jya_block.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80894410 - .asciz "../z_bg_jya_block.c" - .balign 4 - -glabel D_80894424 - .asciz "../z_bg_jya_block.c" - .balign 4 - -glabel D_80894438 - .asciz "../z_bg_jya_block.c" - .balign 4 - -.balign 16 - diff --git a/data/overlays/actors/z_bg_jya_bombchuiwa.rodata.s b/data/overlays/actors/z_bg_jya_bombchuiwa.rodata.s deleted file mode 100644 index 5a47405807..0000000000 --- a/data/overlays/actors/z_bg_jya_bombchuiwa.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80894FA0 - .asciz "Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80894FD8 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80894FF4 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895010 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_8089502C - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895048 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895064 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_80895080 - .asciz "../z_bg_jya_bombchuiwa.c" - .balign 4 - -glabel D_8089509C - .word 0x3E99999A -glabel D_808950A0 - .word 0x3ECCCCCD -glabel D_808950A4 - .word 0x3E99999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_bombiwa.rodata.s b/data/overlays/actors/z_bg_jya_bombiwa.rodata.s deleted file mode 100644 index b17ec361c4..0000000000 --- a/data/overlays/actors/z_bg_jya_bombiwa.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80895770 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808957B0 - .asciz "../z_bg_jya_bombiwa.c" - .balign 4 - -glabel D_808957C8 - .word 0x1B5B3433, 0x3B33306D, 0x00000000 -glabel D_808957D4 - .asciz "Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n" - .balign 4 - -glabel D_80895810 - .asciz "../z_bg_jya_bombiwa.c" - .balign 4 - -glabel D_80895828 - .word 0x1B5B6D00 -glabel D_8089582C - .asciz "(jya 爆弾で破壊岩)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80895854 - .word 0x3FE66666 -glabel D_80895858 - .word 0x3ECCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_cobra.rodata.s b/data/overlays/actors/z_bg_jya_cobra.rodata.s deleted file mode 100644 index 4802448778..0000000000 --- a/data/overlays/actors/z_bg_jya_cobra.rodata.s +++ /dev/null @@ -1,107 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80897570 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808975B0 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_808975C4 - .word 0x1B5B3331, 0x6D000000 -glabel D_808975CC - .asciz "Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n" - .balign 4 - -glabel D_808975F4 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_80897608 - .word 0x1B5B6D00 -glabel D_8089760C - .asciz "(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n" - .balign 4 - -glabel D_80897648 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_8089765C - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_80897670 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_80897684 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_80897698 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_808976AC - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_808976C0 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_808976D4 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_808976E8 - .asciz "../z_bg_jya_cobra.c" - .balign 4 - -glabel D_808976FC - .word 0x38C90FDB -glabel D_80897700 - .word 0x38C90FDB -glabel D_80897704 - .word 0x3DCCCCCD -glabel D_80897708 - .word 0x3DCCCCCD -glabel D_8089770C - .word 0x3EAE147B -glabel D_80897710 - .word 0x3EAE147B -glabel D_80897714 - .word 0x3DCCCCCD -glabel D_80897718 - .word 0x3EAE147B -glabel D_8089771C - .word 0x3EAE147B -glabel D_80897720 - .word 0x3F490FDB -glabel D_80897724 - .word 0x38C90FDB -glabel D_80897728 - .word 0x3F666666 -glabel D_8089772C - .word 0x3F23D70A -glabel D_80897730 - .word 0x3E4CCCCD -glabel D_80897734 - .word 0x3A83126F -glabel D_80897738 - .word 0x3A83126F -glabel D_8089773C - .word 0x3A83126F -glabel D_80897740 - .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_goroiwa.rodata.s b/data/overlays/actors/z_bg_jya_goroiwa.rodata.s deleted file mode 100644 index a8e6c3dc70..0000000000 --- a/data/overlays/actors/z_bg_jya_goroiwa.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80897FC0 - .word 0x432F4CEB -glabel D_80897FC4 - .word 0x3C23D70A -glabel D_80897FC8 - .word 0x44B74000 -glabel D_80897FCC - .word 0x44D12000 -glabel D_80897FD0 - .word 0xC3018000 -glabel D_80897FD4 - .word 0x44C42000 -glabel D_80897FD8 - .word 0x3EC2C859 -glabel D_80897FDC - .word 0x43018000 -glabel D_80897FE0 - .word 0x4414C000 -glabel D_80897FE4 - .word 0x44DA2000 -glabel D_80897FE8 - .word 0x44AE2000 -glabel D_80897FEC - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_bg_jya_haheniron.rodata.s b/data/overlays/actors/z_bg_jya_haheniron.rodata.s deleted file mode 100644 index a6056c8a49..0000000000 --- a/data/overlays/actors/z_bg_jya_haheniron.rodata.s +++ /dev/null @@ -1,17 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808987D0 - .word 0x3F4CCCCD -glabel D_808987D4 - .word 0x3E4CCCCD -glabel D_808987D8 - .word 0x477FFF00, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_ironobj.rodata.s b/data/overlays/actors/z_bg_jya_ironobj.rodata.s deleted file mode 100644 index 16617adddb..0000000000 --- a/data/overlays/actors/z_bg_jya_ironobj.rodata.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80899560 - .asciz "Error 攻撃方法が分からない(%s %d)\n" - .balign 4 - -glabel D_80899584 - .asciz "../z_bg_jya_ironobj.c" - .balign 4 - -glabel D_8089959C - .asciz "¢ attack_type(%d)\n" - .balign 4 - -glabel D_808995B0 - .asciz "Error 攻撃方法が分からない(%s %d)\n" - .balign 4 - -glabel D_808995D4 - .asciz "../z_bg_jya_ironobj.c" - .balign 4 - -glabel D_808995EC - .asciz "¢ attack_type(%d)\n" - .balign 4 - -glabel D_80899600 - .word 0x3DCCCCCD -glabel D_80899604 - .word 0x3F4CCCCD -glabel D_80899608 - .word 0x3D042108 -glabel D_8089960C - .word 0x3E851EB8 -glabel D_80899610 - .word 0x3DCCCCCD -glabel D_80899614 - .word 0x3F4CCCCD -glabel D_80899618 - .word 0x3D042108 -glabel D_8089961C - .word 0x3E851EB8 - - diff --git a/data/overlays/actors/z_bg_jya_lift.rodata.s b/data/overlays/actors/z_bg_jya_lift.rodata.s deleted file mode 100644 index 7ba66c4619..0000000000 --- a/data/overlays/actors/z_bg_jya_lift.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089A060 - .asciz "女神リフト CT\n" - .balign 4 - -glabel D_8089A070 - .asciz "女神リフト DT\n" - .balign 4 - -glabel D_8089A080 - .word 0x44C9A000 -glabel D_8089A084 - .word 0x3E4CCCCD -glabel D_8089A088 - .word 0x3A83126F -glabel D_8089A08C - .word 0x44734000 - - diff --git a/data/overlays/actors/z_bg_jya_megami.rodata.s b/data/overlays/actors/z_bg_jya_megami.rodata.s deleted file mode 100644 index deae5e5c9d..0000000000 --- a/data/overlays/actors/z_bg_jya_megami.rodata.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089B210 - .asciz "../z_bg_jya_megami.c" - .balign 4 - -glabel D_8089B228 - .asciz "../z_bg_jya_megami.c" - .balign 4 - -glabel D_8089B240 - .asciz "../z_bg_jya_megami.c" - .balign 4 - -glabel D_8089B258 - .asciz "../z_bg_jya_megami.c" - .balign 4 - -glabel D_8089B270 - .asciz "../z_bg_jya_megami.c" - .balign 4 - -glabel D_8089B288 - .asciz "../z_bg_jya_megami.c" - .balign 4 - -glabel D_8089B2A0 - .word 0x3EE66666 -glabel D_8089B2A4 - .word 0x3F333333 -glabel D_8089B2A8 - .word 0x3D23D70A -glabel D_8089B2AC - .word 0x3D4CCCCD -glabel D_8089B2B0 - .word 0x3D89374C -glabel D_8089B2B4 - .word 0x3F7EB852 -glabel D_8089B2B8 - .word 0x3F19999A -glabel D_8089B2BC - .word 0x38C90FDB -glabel D_8089B2C0 - .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_jya_zurerukabe.rodata.s b/data/overlays/actors/z_bg_jya_zurerukabe.rodata.s deleted file mode 100644 index bf0a91a1e1..0000000000 --- a/data/overlays/actors/z_bg_jya_zurerukabe.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089BA50 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_8089BA90 - .asciz "../z_bg_jya_zurerukabe.c" - .balign 4 - -glabel D_8089BAAC - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_8089BAB8 - .asciz "home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_8089BAF0 - .asciz "../z_bg_jya_zurerukabe.c" - .balign 4 - -glabel D_8089BB0C - .word 0x1B5B6D00 -glabel D_8089BB10 - .asciz "(jya ずれる壁)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel jtbl_8089BB34 -.word L8089B574 -.word L8089B5D8 -.word L8089B574 -.word L8089B574 -.word L8089B5D8 -.word L8089B574 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_bg_menkuri_eye.rodata.s b/data/overlays/actors/z_bg_menkuri_eye.rodata.s deleted file mode 100644 index fb6333c732..0000000000 --- a/data/overlays/actors/z_bg_menkuri_eye.rodata.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089C0D0 - .asciz "../z_bg_menkuri_eye.c" - .balign 4 - -glabel D_8089C0E8 - .asciz "../z_bg_menkuri_eye.c" - .balign 4 - -glabel D_8089C100 - .word 0x2E2E2F7A, 0x5F62675F, 0x6D656E6B, 0x7572695F, 0x6579652E, 0x63000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mizu_bwall.rodata.s b/data/overlays/actors/z_bg_mizu_bwall.rodata.s deleted file mode 100644 index 47d931a985..0000000000 --- a/data/overlays/actors/z_bg_mizu_bwall.rodata.s +++ /dev/null @@ -1,77 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089D870 - .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8089D8AC - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089D8C4 - .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8089D900 - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089D918 - .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8089D954 - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089D96C - .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8089D9A8 - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089D9C0 - .asciz "Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_8089D9FC - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089DA14 - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089DA2C - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel D_8089DA44 - .asciz "../z_bg_mizu_bwall.c" - .balign 4 - -glabel jtbl_8089DA5C -.word L8089C5B0 -.word L8089C740 -.word L8089C8D4 -.word L8089CA5C -.word L8089CBF0 -glabel D_8089DA70 - .word 0x43DE8000 -glabel D_8089DA74 - .word 0x43DE8000 -glabel D_8089DA78 - .word 0x443F4000 -glabel D_8089DA7C - .word 0xC450C000 - - diff --git a/data/overlays/actors/z_bg_mizu_movebg.rodata.s b/data/overlays/actors/z_bg_mizu_movebg.rodata.s deleted file mode 100644 index b74fed4151..0000000000 --- a/data/overlays/actors/z_bg_mizu_movebg.rodata.s +++ /dev/null @@ -1,67 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089EBC0 - .asciz "../z_bg_mizu_movebg.c" - .balign 4 - -glabel D_8089EBD8 - .asciz "../z_bg_mizu_movebg.c" - .balign 4 - -glabel D_8089EBF0 - .asciz "../z_bg_mizu_movebg.c" - .balign 4 - -glabel jtbl_8089EC08 -.word L8089DD64 -.word L8089DDC8 -.word L8089DE2C -.word L8089DE90 -.word L8089DED0 -.word L8089DED0 -.word L8089DED0 -.word L8089DF24 -glabel D_8089EC28 - .word 0x44318000, 0x00000000 -glabel D_8089EC30 - .word 0x405CCCCC, 0xCCCCCCCC -glabel D_8089EC38 - .word 0x38C90FDB -glabel jtbl_8089EC3C -.word L8089E0AC -.word L8089E0AC -.word L8089E0AC -.word L8089E0AC -.word L8089E0D4 -glabel D_8089EC50 - .word 0x43DE8000 -glabel D_8089EC54 - .word 0x43DE8000 -glabel D_8089EC58 - .word 0x443F4000 -glabel D_8089EC5C - .word 0xC450C000 -glabel jtbl_8089EC60 -.word L8089E36C -.word L8089E3C0 -.word L8089E36C -.word L8089E414 -.word L8089E4D8 -.word L8089E4D8 -.word L8089E4D8 -glabel D_8089EC7C - .word 0x44318000 -glabel D_8089EC80 - .word 0x42E66667 -glabel D_8089EC84 - .word 0x38C90FDB -glabel D_8089EC88 - .word 0x3DCCCCCD, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mizu_shutter.rodata.s b/data/overlays/actors/z_bg_mizu_shutter.rodata.s deleted file mode 100644 index 94d0ad7639..0000000000 --- a/data/overlays/actors/z_bg_mizu_shutter.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8089F580 - .asciz "../z_bg_mizu_shutter.c" - .balign 4 - -glabel D_8089F598 - .asciz "../z_bg_mizu_shutter.c" - .balign 4 - -glabel D_8089F5B0 - .asciz "../z_bg_mizu_shutter.c" - .balign 4 - -glabel D_8089F5C8 - .word 0x38C90FDB -glabel D_8089F5CC - .word 0x38C90FDB -glabel D_8089F5D0 - .word 0x38C90FDB -glabel D_8089F5D4 - .word 0x3DCCCCCD -glabel D_8089F5D8 - .word 0x3DCCCCCD -glabel D_8089F5DC - .word 0x3DCCCCCD -glabel D_8089F5E0 - .word 0x3DCCCCCD -glabel D_8089F5E4 - .word 0x3DCCCCCD -glabel D_8089F5E8 - .word 0x3DCCCCCD -glabel D_8089F5EC - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_bg_mizu_water.rodata.s b/data/overlays/actors/z_bg_mizu_water.rodata.s deleted file mode 100644 index cee796e56e..0000000000 --- a/data/overlays/actors/z_bg_mizu_water.rodata.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A0580 - .asciz "<コンストラクト>%x %x %x\n" - .balign 4 - -glabel D_808A059C - .word 0x25782025, 0x78202578, 0x0A000000 -glabel D_808A05A8 - .asciz "../z_bg_mizu_water.c" - .balign 4 - -glabel D_808A05C0 - .asciz "../z_bg_mizu_water.c" - .balign 4 - -glabel D_808A05D8 - .asciz "../z_bg_mizu_water.c" - .balign 4 - -glabel jtbl_808A05F0 -.word L8089FAB4 -.word L8089FCCC -.word L8089FBFC -.word L8089FC3C -.word L8089FC84 -glabel jtbl_808A0604 -.word L8089FD30 -.word L8089FE8C -.word L8089FDE8 -.word L8089FE20 -.word L8089FE58 -glabel jtbl_808A0618 -.word L8089FF08 -.word L808A0154 -.word L8089FFE0 -.word L808A005C -.word L808A00D8 -glabel D_808A062C - .word 0xC450C000 -glabel D_808A0630 - .word 0x43DE8000 -glabel D_808A0634 - .word 0x443F4000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_mori_bigst.rodata.s b/data/overlays/actors/z_bg_mori_bigst.rodata.s deleted file mode 100644 index e61b02d847..0000000000 --- a/data/overlays/actors/z_bg_mori_bigst.rodata.s +++ /dev/null @@ -1,67 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A1500 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A1540 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A1558 - .asciz "mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n" - .balign 4 - -glabel D_808A15A4 - .word 0xA1DAA5D3, 0xA5C3A5B0, 0xA5B9A5BF, 0xA5EBA5D5, 0xA5A9A5B9, 0xB8B0B7BF, 0xC5B7B0E6, 0xA1DB20A5, 0xD0A5F3A5, 0xAFB4EDB8, 0xB1A1AA0A, 0x00000000 -glabel D_808A15D4 - .word 0x25732025, 0x640A0000 -glabel D_808A15DC - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A15F4 - .asciz "Warning : 第２スタルフォス発生失敗\n" - .balign 4 - -glabel D_808A1618 - .asciz "Warning : 第３-1スタルフォス発生失敗\n" - .balign 4 - -glabel D_808A1640 - .asciz "Warning : 第３-2スタルフォス発生失敗\n" - .balign 4 - -glabel D_808A1668 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A1680 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A1698 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A16B0 - .word 0x444EC000 -glabel D_808A16B4 - .word 0xC54F8000 -glabel D_808A16B8 - .word 0x444EC000 -glabel D_808A16BC - .word 0xC5537000 -glabel D_808A16C0 - .word 0x444EC000 -glabel D_808A16C4 - .word 0xC54BC000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_mori_elevator.rodata.s b/data/overlays/actors/z_bg_mori_elevator.rodata.s deleted file mode 100644 index 794e756628..0000000000 --- a/data/overlays/actors/z_bg_mori_elevator.rodata.s +++ /dev/null @@ -1,73 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A2250 - .asciz "Error : 森の神殿 obj elevator バンク危険！(%s %d)\n" - .balign 4 - -glabel D_808A2284 - .asciz "../z_bg_mori_elevator.c" - .balign 4 - -glabel D_808A229C - .asciz "森の神殿 elevator CT\n" - .balign 4 - -glabel D_808A22B4 - .asciz "森の神殿 elevator DT\n" - .balign 4 - -glabel D_808A22CC - .asciz "Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n" - .balign 4 - -glabel D_808A2304 - .asciz "../z_bg_mori_elevator.c" - .balign 4 - -glabel D_808A231C - .asciz "Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n" - .balign 4 - -glabel D_808A2354 - .asciz "../z_bg_mori_elevator.c" - .balign 4 - -glabel D_808A236C - .asciz "../z_bg_mori_elevator.c" - .balign 4 - -glabel D_808A2384 - .asciz "../z_bg_mori_elevator.c" - .balign 4 - -glabel D_808A239C - .asciz "../z_bg_mori_elevator.c" - .balign 4 - -glabel D_808A23B4 - .word 0x3DB851EC -glabel D_808A23B8 - .word 0x3A83126F -glabel D_808A23BC - .word 0x3A83126F -glabel D_808A23C0 - .word 0xC442C000 -glabel D_808A23C4 - .word 0xC3898000 -glabel D_808A23C8 - .word 0xC3898000 -glabel D_808A23CC - .word 0xC442C000 -glabel D_808A23D0 - .word 0x3E99999A -glabel D_808A23D4 - .word 0x3A83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_mori_hashigo.rodata.s b/data/overlays/actors/z_bg_mori_hashigo.rodata.s deleted file mode 100644 index f28da7b306..0000000000 --- a/data/overlays/actors/z_bg_mori_hashigo.rodata.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A2E10 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A2E50 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2E68 - .asciz "Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A2E98 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2EB0 - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808A2EE0 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2EF8 - .asciz "(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A2F28 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2F40 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2F58 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_bg_mori_hashira4.rodata.s b/data/overlays/actors/z_bg_mori_hashira4.rodata.s deleted file mode 100644 index 58d199e061..0000000000 --- a/data/overlays/actors/z_bg_mori_hashira4.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A35E0 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_808A3620 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A3638 - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808A3668 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A3680 - .asciz "(森の神殿 ４本柱)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A36A4 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A36BC - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A36D4 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -.balign 16 - diff --git a/data/overlays/actors/z_bg_mori_hineri.rodata.s b/data/overlays/actors/z_bg_mori_hineri.rodata.s deleted file mode 100644 index c9cd55d105..0000000000 --- a/data/overlays/actors/z_bg_mori_hineri.rodata.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A4420 - .asciz "../z_bg_mori_hineri.c" - .balign 4 - -glabel D_808A4438 - .asciz "../z_bg_mori_hineri.c" - .balign 4 - -glabel D_808A4450 - .asciz "../z_bg_mori_hineri.c" - .balign 4 - -glabel D_808A4468 - .asciz "../z_bg_mori_hineri.c" - .balign 4 - -glabel D_808A4480 - .asciz "../z_bg_mori_hineri.c" - .balign 4 - -glabel D_808A4498 - .asciz "../z_bg_mori_hineri.c" - .balign 4 - -glabel D_808A44B0 - .word 0xC3E28000 -glabel D_808A44B4 - .word 0x44898000 -glabel D_808A44B8 - .word 0x4183126F -glabel D_808A44BC - .word 0x44898000 -glabel D_808A44C0 - .word 0xC4DC2000 -glabel D_808A44C4 - .word 0x449FC000 -glabel D_808A44C8 - .word 0x44F9E000 -glabel D_808A44CC - .word 0x449FC000 -glabel D_808A44D0 - .word 0x3FC90FDB -glabel D_808A44D4 - .word 0x3C23D70A -glabel D_808A44D8 - .word 0x3FA68121 -glabel D_808A44DC - .word 0x40490FDB -glabel D_808A44E0 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_mori_idomizu.rodata.s b/data/overlays/actors/z_bg_mori_idomizu.rodata.s deleted file mode 100644 index 69269b3a37..0000000000 --- a/data/overlays/actors/z_bg_mori_idomizu.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A4C40 - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808A4C70 - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4C88 - .asciz "(森の神殿 井戸水)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A4CAC - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4CC4 - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4CDC - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4CF4 - .word 0x3F8CCCCD -glabel D_808A4CF8 - .word 0xC4E38000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_mori_kaitenkabe.rodata.s b/data/overlays/actors/z_bg_mori_kaitenkabe.rodata.s deleted file mode 100644 index f7b4b05650..0000000000 --- a/data/overlays/actors/z_bg_mori_kaitenkabe.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A53E0 - .asciz "◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n" - .balign 4 - -glabel D_808A5420 - .asciz "【回転壁】 バンク危険！(%s %d)\n" - .balign 4 - -glabel D_808A5440 - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -glabel D_808A545C - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -glabel D_808A5478 - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -glabel D_808A5494 - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -glabel D_808A54B0 - .word 0x3A83126F -glabel D_808A54B4 - .word 0x3A83126F -glabel D_808A54B8 - .word 0x43360B61 -glabel D_808A54BC - .word 0x3A83126F - - diff --git a/data/overlays/actors/z_bg_mori_rakkatenjo.rodata.s b/data/overlays/actors/z_bg_mori_rakkatenjo.rodata.s deleted file mode 100644 index 329c3ad104..0000000000 --- a/data/overlays/actors/z_bg_mori_rakkatenjo.rodata.s +++ /dev/null @@ -1,81 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A5EA0 - .asciz "森の神殿 obj. 落下天井 (home posY %f)\n" - .balign 4 - -glabel D_808A5EC8 - .asciz "Warning : セット位置が変更されています。プログラムを修正しましょう。\n" - .balign 4 - -glabel D_808A5F10 - .asciz "Warning : セット Angle が変更されています。プログラムを修正しましょう。\n" - .balign 4 - -glabel D_808A5F5C - .asciz "Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n" - .balign 4 - -glabel D_808A5F90 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -glabel D_808A5FAC - .asciz "camera changed (mori rakka tenjyo) ... \n" - .balign 4 - -glabel D_808A5FD8 - .asciz "camera changed (previous) ... \n" - .balign 4 - -glabel D_808A5FF8 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -glabel D_808A6014 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -glabel D_808A6030 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -glabel D_808A604C - .word 0x3A83126F -glabel D_808A6050 - .word 0x44F8E000 -glabel D_808A6054 - .word 0x442AC000 -glabel D_808A6058 - .word 0xC51D8000 -glabel D_808A605C - .word 0xC54E4000 -glabel D_808A6060 - .word 0x44DFE000 -glabel D_808A6064 - .word 0x4508F000 -glabel D_808A6068 - .word 0x44DFE000 -glabel D_808A606C - .word 0x4508F000 -glabel D_808A6070 - .word 0x442AC000 -glabel D_808A6074 - .word 0x43C98000 -glabel D_808A6078 - .word 0x43C98000 -glabel D_808A607C - .word 0x43C98000 -glabel D_808A6080 - .word 0xBDCCCCCD -glabel D_808A6084 - .word 0x442AC000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_po_event.rodata.s b/data/overlays/actors/z_bg_po_event.rodata.s deleted file mode 100644 index 2643656352..0000000000 --- a/data/overlays/actors/z_bg_po_event.rodata.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A7DB0 - .asciz "../z_bg_po_event.c" - .balign 4 - -glabel D_808A7DC4 - .asciz "../z_bg_po_event.c" - .balign 4 - -glabel D_808A7DD8 - .asciz "../z_bg_po_event.c" - .balign 4 - -glabel D_808A7DEC - .word 0x4019999A -glabel D_808A7DF0 - .word 0x3FE8B439 -glabel D_808A7DF4 - .word 0x44504000 -glabel D_808A7DF8 - .word 0x44504000 -glabel D_808A7DFC - .word 0x3DCCCCCD -glabel D_808A7E00 - .word 0x44504000 -glabel D_808A7E04 - .word 0x3B23D70A -glabel D_808A7E08 - .word 0x3E99999A -glabel D_808A7E0C - .word 0x3ECCCCCD - diff --git a/data/overlays/actors/z_bg_po_syokudai.rodata.s b/data/overlays/actors/z_bg_po_syokudai.rodata.s deleted file mode 100644 index 12b76fd977..0000000000 --- a/data/overlays/actors/z_bg_po_syokudai.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A89D0 - .asciz "../z_bg_po_syokudai.c" - .balign 4 - -glabel D_808A89E8 - .asciz "../z_bg_po_syokudai.c" - .balign 4 - -glabel D_808A8A00 - .asciz "../z_bg_po_syokudai.c" - .balign 4 - -glabel D_808A8A18 - .asciz "../z_bg_po_syokudai.c" - .balign 4 - -glabel D_808A8A30 - .word 0xC4C3C000 -glabel D_808A8A34 - .word 0x3E99999A -glabel D_808A8A38 - .word 0x3F333333 -glabel D_808A8A3C - .word 0x38C90FDB -glabel D_808A8A40 - .word 0x3B30F27C, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_relay_objects.rodata.s b/data/overlays/actors/z_bg_relay_objects.rodata.s deleted file mode 100644 index 3ad1288a2f..0000000000 --- a/data/overlays/actors/z_bg_relay_objects.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808A9510 - .word 0x3A924925, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot00_hanebasi.rodata.s b/data/overlays/actors/z_bg_spot00_hanebasi.rodata.s deleted file mode 100644 index 3c74c1f8b5..0000000000 --- a/data/overlays/actors/z_bg_spot00_hanebasi.rodata.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808AA7D0 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA7EC - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA808 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA824 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA840 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA85C - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA878 - .word 0x3ECCCCCD -glabel D_808AA87C - .word 0x459C4000 -glabel D_808AA880 - .word 0x47127C00 -glabel D_808AA884 - .word 0x44D48000 -glabel D_808AA888 - .word 0x3B3B3EE7 -glabel D_808AA88C - .word 0x3C03126F -glabel D_808AA890 - .word 0x3583126F -glabel D_808AA894 - .word 0x38C90FDB -glabel D_808AA898 - .word 0x442C8000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot01_idohashira.rodata.s b/data/overlays/actors/z_bg_spot01_idohashira.rodata.s deleted file mode 100644 index 1f728286de..0000000000 --- a/data/overlays/actors/z_bg_spot01_idohashira.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808AB870 - .asciz "Bg_Spot01_Idohashira_Get_FreeFallで割り算出来ない!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_808AB8BC - .asciz "Bg_Spot01_Idohashira_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_808AB8FC - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_808AB938 - .asciz "../z_bg_spot01_idohashira.c" - .balign 4 - -glabel D_808AB954 - .asciz "../z_bg_spot01_idohashira.c" - .balign 4 - -glabel D_808AB970 - .asciz "../z_bg_spot01_idohashira.c" - .balign 4 - -glabel D_808AB98C - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_808AB9C4 - .word 0x44A28000 -glabel D_808AB9C8 - .word 0x44A28000 -glabel D_808AB9CC - .word 0x44898000 -glabel D_808AB9D0 - .word 0x44898000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot01_idomizu.rodata.s b/data/overlays/actors/z_bg_spot01_idomizu.rodata.s deleted file mode 100644 index bf9d77d841..0000000000 --- a/data/overlays/actors/z_bg_spot01_idomizu.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808ABDC0 - .asciz "../z_bg_spot01_idomizu.c" - .balign 4 - -glabel D_808ABDDC - .asciz "../z_bg_spot01_idomizu.c" - .balign 4 - -glabel D_808ABDF8 - .asciz "../z_bg_spot01_idomizu.c" - .balign 4 - -glabel D_808ABE14 - .word 0xC4098000 -glabel D_808ABE18 - .word 0xC4098000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot01_objects2.rodata.s b/data/overlays/actors/z_bg_spot01_objects2.rodata.s deleted file mode 100644 index 862df11a06..0000000000 --- a/data/overlays/actors/z_bg_spot01_objects2.rodata.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808AC530 - .word 0x2D2D2D2D, 0x2D2D2D2D, 0x2D2D2D2D, 0x2D2D2D2D, 0x2D2D2D2D, 0x2D2D2D2D, 0x2D2D2D2D, 0x2DA5D0A5, 0xF3A5AFC0, 0xDFC4EAA4, 0xA2A4EAA4, 0xDEA4BBA4, 0xF3A4C7A4, 0xB7A4BF2E, 0x00000000 -glabel D_808AC56C - .word 0x2D2D2D2D, 0x2DA5D0A5, 0xF3A5AFC0, 0xDAA4EAB4, 0xB9A4A8C0, 0xAEB8F9A1, 0xAAA1AA0A, 0x00000000 -glabel jtbl_808AC58C -.word L808AC17C -.word L808AC17C -.word L808AC17C -.word L808AC188 -.word L808AC194 -glabel jtbl_808AC5A0 -.word L808AC448 -.word L808AC448 -.word L808AC448 -.word L808AC394 -.word L808AC368 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot02_objects.rodata.s b/data/overlays/actors/z_bg_spot02_objects.rodata.s deleted file mode 100644 index 3e8ccde645..0000000000 --- a/data/overlays/actors/z_bg_spot02_objects.rodata.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808AD8C0 - .asciz "../z_bg_spot02_objects.c" - .balign 4 - -glabel D_808AD8DC - .asciz "../z_bg_spot02_objects.c" - .balign 4 - -glabel D_808AD8F8 - .asciz "../z_bg_spot02_objects.c" - .balign 4 - -glabel D_808AD914 - .asciz "../z_bg_spot02_objects.c" - .balign 4 - -glabel D_808AD930 - .asciz "../z_bg_spot02_objects.c" - .balign 4 - -glabel D_808AD94C - .asciz "../z_bg_spot02_objects.c" - .balign 4 - -glabel jtbl_808AD968 -.word L808AC6BC -.word L808AC6BC -.word L808AC6BC -.word L808AC824 -.word L808AC87C -glabel D_808AD97C - .word 0x38C90FDB -glabel D_808AD980 - .word 0x38C90FDB -glabel D_808AD984 - .word 0x38C90FDB -glabel D_808AD988 - .word 0x3BB400B9 -glabel D_808AD98C - .word 0x38C90FDB -glabel D_808AD990 - .word 0x38C90FDB -glabel D_808AD994 - .word 0x3F666666 -glabel D_808AD998 - .word 0x3DCCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot03_taki.rodata.s b/data/overlays/actors/z_bg_spot03_taki.rodata.s deleted file mode 100644 index 5c032f9451..0000000000 --- a/data/overlays/actors/z_bg_spot03_taki.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808AE3C0 - .asciz "../z_bg_spot03_taki.c" - .balign 4 - -glabel D_808AE3D8 - .asciz "../z_bg_spot03_taki.c" - .balign 4 - -glabel D_808AE3F0 - .word 0x2E2E2F7A, 0x5F62675F, 0x73706F74, 0x30335F74, 0x616B692E, 0x63000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot06_objects.rodata.s b/data/overlays/actors/z_bg_spot06_objects.rodata.s deleted file mode 100644 index bfca3cd869..0000000000 --- a/data/overlays/actors/z_bg_spot06_objects.rodata.s +++ /dev/null @@ -1,73 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808AF970 - .asciz "spot06 obj nthisx->arg_data=[%d]" - .balign 4 - -glabel D_808AF994 - .asciz "../z_bg_spot06_objects.c" - .balign 4 - -glabel D_808AF9B0 - .asciz "../z_bg_spot06_objects.c" - .balign 4 - -glabel D_808AF9CC - .asciz "../z_bg_spot06_objects.c" - .balign 4 - -glabel D_808AF9E8 - .word 0xC4F92000 -glabel D_808AF9EC - .word 0xC4A42000 -glabel D_808AF9F0 - .word 0xC42A4000 -glabel D_808AF9F4 - .word 0xC42A4000 -glabel D_808AF9F8 - .word 0xC4A42000 -glabel D_808AF9FC - .word 0x3D4CCCCD -glabel D_808AFA00 - .word 0x3E333333 -glabel D_808AFA04 - .word 0x3D4CCCCD -glabel D_808AFA08 - .word 0x3E333333 -glabel D_808AFA0C - .word 0x3F333333 -glabel D_808AFA10 - .word 0x3DCCCCCD -glabel D_808AFA14 - .word 0x3E99999A -glabel D_808AFA18 - .word 0x3E99999A -glabel D_808AFA1C - .word 0x4089999A -glabel D_808AFA20 - .word 0x3FA66666 -glabel D_808AFA24 - .word 0xC4F92000 -glabel D_808AFA28 - .word 0xC4F6A000 -glabel D_808AFA2C - .word 0x3CA3D70A -glabel D_808AFA30 - .word 0xC4F92000 -glabel D_808AFA34 - .word 0x3E490FDB -glabel D_808AFA38 - .word 0xC4A42000 -glabel D_808AFA3C - .word 0x38D1B717 -glabel D_808AFA40 - .word 0x3A83126F, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot07_taki.rodata.s b/data/overlays/actors/z_bg_spot07_taki.rodata.s deleted file mode 100644 index 1248c7fe44..0000000000 --- a/data/overlays/actors/z_bg_spot07_taki.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B0210 - - .asciz "../z_bg_spot07_taki.c" - .balign 4 - -glabel D_808B0228 - - .asciz "../z_bg_spot07_taki.c" - .balign 4 - -glabel D_808B0240 - - .asciz "../z_bg_spot07_taki.c" - .balign 4 - -glabel D_808B0258 - - .asciz "../z_bg_spot07_taki.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_bg_spot08_bakudankabe.rodata.s b/data/overlays/actors/z_bg_spot08_bakudankabe.rodata.s deleted file mode 100644 index 4dc02c11f8..0000000000 --- a/data/overlays/actors/z_bg_spot08_bakudankabe.rodata.s +++ /dev/null @@ -1,17 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B08E0 - .word 0x40AD5555 -glabel D_808B08E4 - .word 0x3E4CCCCD -glabel D_808B08E8 - .word 0x3ECCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot08_iceblock.rodata.s b/data/overlays/actors/z_bg_spot08_iceblock.rodata.s index a02fce0a82..c567806fe7 100644 --- a/data/overlays/actors/z_bg_spot08_iceblock.rodata.s +++ b/data/overlays/actors/z_bg_spot08_iceblock.rodata.s @@ -66,19 +66,29 @@ glabel jtbl_808B17E4 .word L808B0A74 .word L808B0A74 glabel D_808B1874 - .word 0x3E19999A + .float 0.15 + .balign 4 + glabel D_808B1878 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_808B187C - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_808B1880 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_808B1884 .word 0x3AD1B717 glabel D_808B1888 .word 0x3AD1B717 glabel D_808B188C - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_808B1890 .word 0x477FFF80 glabel D_808B1894 @@ -90,6 +100,8 @@ glabel jtbl_808B1898 .word L808B1328 .word L808B133C glabel D_808B18AC - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + diff --git a/data/overlays/actors/z_bg_spot11_bakudankabe.rodata.s b/data/overlays/actors/z_bg_spot11_bakudankabe.rodata.s deleted file mode 100644 index 7f3e01b312..0000000000 --- a/data/overlays/actors/z_bg_spot11_bakudankabe.rodata.s +++ /dev/null @@ -1,19 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B2750 - .asciz "(spot11 爆弾壁)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B2774 - .word 0x3E4CCCCD -glabel D_808B2778 - .word 0x3ECCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot11_oasis.rodata.s b/data/overlays/actors/z_bg_spot11_oasis.rodata.s deleted file mode 100644 index 9d62c9c76d..0000000000 --- a/data/overlays/actors/z_bg_spot11_oasis.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B2E70 - .asciz "../z_bg_spot11_oasis.c" - .balign 4 - -glabel D_808B2E88 - .asciz "../z_bg_spot11_oasis.c" - .balign 4 - -glabel D_808B2EA0 - .asciz "../z_bg_spot11_oasis.c" - .balign 4 - -glabel D_808B2EB8 - .word 0x3DF5C28F -glabel D_808B2EBC - .word 0x3CA3D70A -glabel D_808B2EC0 - .word 0x3E99999A -glabel D_808B2EC4 - .word 0x409CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot15_rrbox.rodata.s b/data/overlays/actors/z_bg_spot15_rrbox.rodata.s deleted file mode 100644 index 332a6d338b..0000000000 --- a/data/overlays/actors/z_bg_spot15_rrbox.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B4620 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_808B4660 - .asciz "../z_bg_spot15_rrbox.c" - .balign 4 - -glabel D_808B4678 - .asciz "(spot15 ロンロン木箱)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B46A0 - .asciz "Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B46DC - .asciz "../z_bg_spot15_rrbox.c" - .balign 4 - -glabel D_808B46F4 - .word 0x3C23D70A -glabel D_808B46F8 - .word 0x44688000 -glabel D_808B46FC - .word 0xBA83126F -glabel D_808B4700 - .word 0x3A83126F -glabel D_808B4704 - .word 0x3A83126F -glabel D_808B4708 - .word 0xC6F9EC00 -glabel D_808B470C - .word 0xBA83126F - - diff --git a/data/overlays/actors/z_bg_spot16_bombstone.rodata.s b/data/overlays/actors/z_bg_spot16_bombstone.rodata.s deleted file mode 100644 index 5c8f1dcce4..0000000000 --- a/data/overlays/actors/z_bg_spot16_bombstone.rodata.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B60A0 - .asciz "Spot16 obj 爆弾石 破壊済み\n" - .balign 4 - -glabel D_808B60BC - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808B60EC - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B6108 - .asciz "Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B6140 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B615C - .asciz "Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B618C - .asciz "Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n" - .balign 4 - -glabel D_808B61C8 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B61E4 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B6200 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B621C - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B6238 - .word 0x3ADA740E -glabel jtbl_808B623C -.word L808B50DC -.word L808B50DC -.word L808B50DC -.word L808B50DC -.word L808B50DC -.word L808B50DC -glabel D_808B6254 - .word 0x3FA66666 -glabel D_808B6258 - .word 0x44C56000 -glabel D_808B625C - .word 0x44458000 -glabel D_808B6260 - .word 0x481C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot16_doughnut.rodata.s b/data/overlays/actors/z_bg_spot16_doughnut.rodata.s deleted file mode 100644 index ca5eac33b1..0000000000 --- a/data/overlays/actors/z_bg_spot16_doughnut.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B6A30 - .word 0x1B5B3336, 0x6D25661B, 0x5B6D0A00 -glabel D_808B6A3C - .asciz "(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B6A68 - .asciz "../z_bg_spot16_doughnut.c" - .balign 4 - -glabel D_808B6A84 - .asciz "../z_bg_spot16_doughnut.c" - .balign 4 - -glabel D_808B6AA0 - .asciz "../z_bg_spot16_doughnut.c" - .balign 4 - -glabel D_808B6ABC - .asciz "../z_bg_spot16_doughnut.c" - .balign 4 - -glabel D_808B6AD8 - .asciz "../z_bg_spot16_doughnut.c" - .balign 4 - -glabel D_808B6AF4 - .asciz "../z_bg_spot16_doughnut.c" - .balign 4 - -glabel D_808B6B10 - .word 0x38D1B717 -glabel D_808B6B14 - .word 0x3B03126E, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot17_bakudankabe.rodata.s b/data/overlays/actors/z_bg_spot17_bakudankabe.rodata.s deleted file mode 100644 index 378021dd57..0000000000 --- a/data/overlays/actors/z_bg_spot17_bakudankabe.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B72B0 - .asciz "../z_bg_spot17_bakudankabe.c" - .balign 4 - -glabel D_808B72D0 - .asciz "../z_bg_spot17_bakudankabe.c" - .balign 4 - -glabel D_808B72F0 - .asciz "../z_bg_spot17_bakudankabe.c" - .balign 4 - -glabel D_808B7310 - .asciz "../z_bg_spot17_bakudankabe.c" - .balign 4 - -glabel D_808B7330 - .asciz "../z_bg_spot17_bakudankabe.c" - .balign 4 - -glabel D_808B7350 - .asciz "../z_bg_spot17_bakudankabe.c" - .balign 4 - -glabel D_808B7370 - .word 0x3E4CCCCD -glabel D_808B7374 - .word 0x3ECCCCCD -glabel D_808B7378 - .word 0x44228000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot18_basket.rodata.s b/data/overlays/actors/z_bg_spot18_basket.rodata.s deleted file mode 100644 index 64ce239168..0000000000 --- a/data/overlays/actors/z_bg_spot18_basket.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B85F0 - .word 0x1B5B3331, 0x6D000000 -glabel D_808B85F8 - .asciz "Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n" - .balign 4 - -glabel D_808B8620 - .asciz "../z_bg_spot18_basket.c" - .balign 4 - -glabel D_808B8638 - .word 0x1B5B6D00 -glabel D_808B863C - .word 0x3C23D70A -glabel D_808B8640 - .word 0x3A1D4952 -glabel D_808B8644 - .word 0x3A1D4952, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot18_obj.rodata.s b/data/overlays/actors/z_bg_spot18_obj.rodata.s deleted file mode 100644 index 5fcd7589c3..0000000000 --- a/data/overlays/actors/z_bg_spot18_obj.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B9150 - .asciz "Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B9184 - .asciz "../z_bg_spot18_obj.c" - .balign 4 - -glabel D_808B919C - .asciz "出現しない Object (0x%04x)\n" - .balign 4 - -glabel D_808B91B8 - .asciz "Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B91F8 - .asciz "../z_bg_spot18_obj.c" - .balign 4 - -glabel D_808B9210 - .asciz "Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B9244 - .asciz "../z_bg_spot18_obj.c" - .balign 4 - -glabel D_808B925C - .asciz "Spot18 Object [arg_data : 0x%04x]\n" - .balign 4 - -glabel D_808B9280 - .word 0x3A83126F -glabel D_808B9284 - .word 0xBA83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_sst_floor.rodata.s b/data/overlays/actors/z_bg_sst_floor.rodata.s deleted file mode 100644 index 850d0c80ce..0000000000 --- a/data/overlays/actors/z_bg_sst_floor.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B9E40 - .asciz "../z_bg_sst_floor.c" - .balign 4 - -glabel D_808B9E54 - .asciz "../z_bg_sst_floor.c" - .balign 4 - -glabel D_808B9E68 - .asciz "../z_bg_sst_floor.c" - .balign 4 - -glabel D_808B9E7C - .word 0x3B3B3EE7 -glabel D_808B9E80 - .word 0x3B3B3EE7 -glabel D_808B9E84 - .word 0x3FC90FDB -glabel D_808B9E88 - .word 0xBB23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_toki_hikari.rodata.s b/data/overlays/actors/z_bg_toki_hikari.rodata.s deleted file mode 100644 index 42f6046f70..0000000000 --- a/data/overlays/actors/z_bg_toki_hikari.rodata.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808BAC80 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BAC98 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BACB0 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BACC8 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BACE0 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BACF8 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BAD10 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BAD28 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BAD40 - .asciz "../z_bg_toki_hikari.c" - .balign 4 - -glabel D_808BAD58 - .word 0x3D4CCCCD -glabel D_808BAD5C - .word 0x3E4CCCCD -glabel D_808BAD60 - .word 0x3CCCCCCD -glabel D_808BAD64 - .word 0x3EA3D70A -glabel D_808BAD68 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_treemouth.rodata.s b/data/overlays/actors/z_bg_treemouth.rodata.s deleted file mode 100644 index 72ce3a9103..0000000000 --- a/data/overlays/actors/z_bg_treemouth.rodata.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808BD9E0 - .asciz "../z_bg_treemouth.c" - .balign 4 - -glabel D_808BD9F4 - .asciz "../z_bg_treemouth.c" - .balign 4 - -glabel D_808BDA08 - .asciz "../z_bg_treemouth.c" - .balign 4 - -glabel D_808BDA1C - .word 0x3C23D70A -glabel D_808BDA20 - .word 0x4490C000 -glabel D_808BDA24 - .word 0x4554F000 -glabel D_808BDA28 - .word 0x44728000 -glabel D_808BDA2C - .word 0x44FD4000 -glabel D_808BDA30 - .word 0xC5073000 -glabel D_808BDA34 - .word 0x3D4CCCCD -glabel D_808BDA38 - .word 0x3F4CCCCD -glabel D_808BDA3C - .word 0x3CF5C28F -glabel D_808BDA40 - .word 0x456F3000 -glabel D_808BDA44 - .word 0xC48EC000 -glabel D_808BDA48 - .word 0x457BD000 -glabel D_808BDA4C - .word 0xC3C78000 -glabel D_808BDA50 - .word 0xC49CE000 -glabel D_808BDA54 - .word 0x3DCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_vb_sima.rodata.s b/data/overlays/actors/z_bg_vb_sima.rodata.s deleted file mode 100644 index 6b0374cc8d..0000000000 --- a/data/overlays/actors/z_bg_vb_sima.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808BE420 - .asciz "../z_bg_vb_sima.c" - .balign 4 - -glabel D_808BE434 - .asciz "../z_bg_vb_sima.c" - .balign 4 - -glabel D_808BE448 - .asciz "../z_bg_vb_sima.c" - .balign 4 - -glabel D_808BE45C - .word 0x3ECCCCCD -glabel D_808BE460 - .word 0x3EA8F5C3 -glabel D_808BE464 - .word 0x3D4CCCCD -glabel D_808BE468 - .word 0x3D4CCCCD -glabel D_808BE46C - .word 0xBE99999A - - diff --git a/data/overlays/actors/z_bg_ydan_hasi.rodata.s b/data/overlays/actors/z_bg_ydan_hasi.rodata.s deleted file mode 100644 index 0844382552..0000000000 --- a/data/overlays/actors/z_bg_ydan_hasi.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808BEC30 - .asciz "../z_bg_ydan_hasi.c" - .balign 4 - -glabel D_808BEC44 - .asciz "../z_bg_ydan_hasi.c" - .balign 4 - -glabel D_808BEC58 - .asciz "../z_bg_ydan_hasi.c" - .balign 4 - -glabel D_808BEC6C - .word 0x3E19999A -glabel D_808BEC70 - .word 0x3CC90FDB -glabel D_808BEC74 - .word 0x3E00ADFD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_ydan_sp.rodata.s b/data/overlays/actors/z_bg_ydan_sp.rodata.s deleted file mode 100644 index 4b154e9e98..0000000000 --- a/data/overlays/actors/z_bg_ydan_sp.rodata.s +++ /dev/null @@ -1,59 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808C09F0 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A04 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A18 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A2C - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A40 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A54 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A68 - .word 0x462AA800 -glabel D_808C0A6C - .word 0x3C088889 -glabel D_808C0A70 - .word 0x3F333333 -glabel D_808C0A74 - .word 0x3E20D97C -glabel D_808C0A78 - .word 0x443B8000 -glabel D_808C0A7C - .word 0x3DCCCCCD -glabel D_808C0A80 - .word 0x3EE5C8FA -glabel D_808C0A84 - .word 0x462AA800 -glabel D_808C0A88 - .word 0x3BEA0EA1 -glabel D_808C0A8C - .word 0x3F266666 -glabel D_808C0A90 - .word 0x3DCCCCCD -glabel D_808C0A94 - .word 0x3DCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_boss_dodongo.rodata.s b/data/overlays/actors/z_boss_dodongo.rodata.s deleted file mode 100644 index 3728451e89..0000000000 --- a/data/overlays/actors/z_boss_dodongo.rodata.s +++ /dev/null @@ -1,234 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808CA5A0 - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA5B4 - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA5C8 - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA5DC - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA5F0 - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA604 - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA618 - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA62C - .asciz "../z_boss_dodongo.c" - .balign 4 - -glabel D_808CA640 - .word 0x3E490FDB -glabel D_808CA644 - .word 0x4478C000 -glabel D_808CA648 - .word 0x460FC000 -glabel D_808CA64C - .word 0xC45E8000 -glabel D_808CA650 - .word 0xC4BE7852 -glabel D_808CA654 - .word 0xC54E8000 -glabel D_808CA658 - .word 0xC4BE7852 -glabel D_808CA65C - .word 0xC54E8000 -glabel D_808CA660 - .word 0xC4BE7852 -glabel D_808CA664 - .word 0xC54E8000 -glabel jtbl_808CA668 -.word L808C1D84 -.word L808C1DCC -.word L808C1E60 -.word L808C2190 -.word L808C23A8 -glabel D_808CA67C - .word 0xC498F852 -glabel D_808CA680 - .word 0xC4ADC000 -glabel D_808CA684 - .word 0xC552E000 -glabel D_808CA688 - .word 0xC47FF0A4 -glabel D_808CA68C - .word 0xC45E8000 -glabel D_808CA690 - .word 0xC52F4000 -glabel D_808CA694 - .word 0xC48B4000 -glabel D_808CA698 - .word 0xC52F4000 -glabel D_808CA69C - .word 0x3D4CCCCD -glabel D_808CA6A0 - .word 0x3DCCCCCD -glabel D_808CA6A4 - .word 0x40490E56 -glabel D_808CA6A8 - .word 0x3F333333 -glabel D_808CA6AC - .word 0x40490E56 -glabel D_808CA6B0 - .word 0x3F333333 -glabel D_808CA6B4 - .word 0x3A83126F -glabel D_808CA6B8 - .word 0xBDCCCCCD -glabel D_808CA6BC - .word 0x3A83126F -glabel D_808CA6C0 - .word 0x3A83126F -glabel D_808CA6C4 - .word 0x3F333333 -glabel D_808CA6C8 - .word 0x4622F983 -glabel D_808CA6CC - .word 0x45F0A000 -glabel D_808CA6D0 - .word 0x4622F983 -glabel D_808CA6D4 - .word 0x460FC000 -glabel D_808CA6D8 - .word 0x3DCCCCCD -glabel D_808CA6DC - .word 0x3FF33333 -glabel D_808CA6E0 - .word 0x3FD9999A -glabel D_808CA6E4 - .word 0x3FB33333 -glabel D_808CA6E8 - .word 0x3FF33333 -glabel D_808CA6EC - .word 0x3F8CCCCD -glabel D_808CA6F0 - .word 0x3FF33333 -glabel D_808CA6F4 - .word 0x40C8F5C3 -glabel D_808CA6F8 - .word 0xC45E8000 -glabel D_808CA6FC - .word 0xC4BE7852 -glabel D_808CA700 - .word 0xC54E8000 -glabel D_808CA704 - .word 0x40C8F5C3 -glabel D_808CA708 - .word 0xC45E8000 -glabel D_808CA70C - .word 0xC4BE7852 -glabel D_808CA710 - .word 0xC54E8000 -glabel D_808CA714 - .word 0x3ECCCCCD -glabel D_808CA718 - .word 0x40C8F5C3 -glabel D_808CA71C - .word 0xC45E8000 -glabel D_808CA720 - .word 0xC4BD3852 -glabel D_808CA724 - .word 0xC54E8000 -glabel D_808CA728 - .word 0x3DEB851F -glabel D_808CA72C - .word 0x3E051EB8 -glabel D_808CA730 - .word 0x3DCCCCCD -glabel D_808CA734 - .word 0x3DCCCCCD -glabel D_808CA738 - .word 0x3E051EB8 -glabel D_808CA73C - .word 0x3DEB851F -glabel D_808CA740 - .word 0x40490FD0 -glabel jtbl_808CA744 -.word L808C55E0 -.word L808C6C84 -.word L808C6C84 -.word L808C6C84 -.word L808C6C84 -.word L808C5670 -.word L808C5934 -.word L808C5A4C -.word L808C5FE4 -.word L808C5FE4 -glabel D_808CA76C - .word 0x3DCCCCCD -glabel D_808CA770 - .word 0x3DCCCCCD -glabel D_808CA774 - .word 0x3DCCCCCD -glabel D_808CA778 - .word 0x3DCCCCCD -glabel D_808CA77C - .word 0x3DCCCCCD -glabel D_808CA780 - .word 0x3DCCCCCD -glabel D_808CA784 - .word 0xC4BE7852 -glabel D_808CA788 - .word 0xC54E8000 -glabel D_808CA78C - .word 0x3DCCCCCD -glabel D_808CA790 - .word 0x3DCCCCCD -glabel D_808CA794 - .word 0x3DCCCCCD -glabel D_808CA798 - .word 0x45F0A000 -glabel D_808CA79C - .word 0x3DCCCCCD -glabel D_808CA7A0 - .word 0x3DCCCCCD -glabel D_808CA7A4 - .word 0x38C90FDB -glabel D_808CA7A8 - .word 0x4622F983 -glabel D_808CA7AC - .word 0xC4BB5852 -glabel D_808CA7B0 - .word 0x3FF33333 -glabel D_808CA7B4 - .word 0x3C23D70A -glabel D_808CA7B8 - .word 0x3C23D70A -glabel D_808CA7BC - .word 0x3DCCCCCD -glabel D_808CA7C0 - .word 0x3DCCCCCD -glabel D_808CA7C4 - .word 0x3DCCCCCD -glabel D_808CA7C8 - .word 0xC45E8000 -glabel D_808CA7CC - .word 0xC4BE7852 -glabel D_808CA7D0 - .word 0xC54E8000 -glabel D_808CA7D4 - .word 0xC4BB5852, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_boss_fd.rodata.s b/data/overlays/actors/z_boss_fd.rodata.s deleted file mode 100644 index 6c4dc630ec..0000000000 --- a/data/overlays/actors/z_boss_fd.rodata.s +++ /dev/null @@ -1,325 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808D1C30 - .word 0x4D4F4445, 0x2025640A, 0x00000000 -glabel D_808D1C3C - .asciz "WAY_SPD X = %f\n" - .balign 4 - -glabel D_808D1C4C - .asciz "WAY_SPD Y = %f\n" - .balign 4 - -glabel D_808D1C5C - .asciz "WAY_SPD Z = %f\n" - .balign 4 - -glabel D_808D1C6C - .asciz "this->timer[2] = %d\n" - .balign 4 - -glabel D_808D1C84 - .asciz "this->timer[5] = %d\n" - .balign 4 - -glabel D_808D1C9C - .asciz "BGCHECKKKKKKKKKKKKKKKKKKKKKKK\n" - .balign 4 - -glabel D_808D1CBC - .asciz "FD MOVE START \n" - .balign 4 - -glabel D_808D1CCC - .asciz "FD MOVE END 1\n" - .balign 4 - -glabel D_808D1CDC - .asciz "FD MOVE END 2\n" - .balign 4 - -glabel D_808D1CEC - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1CFC - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D0C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D1C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D2C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D3C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D4C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D5C - .asciz "FD DRAW START\n" - .balign 4 - -glabel D_808D1D6C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D7C - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1D8C - .word 0x46442044, 0x52415720, 0x454E440A, 0x00000000 -glabel D_808D1D9C - .asciz "FD DRAW END2\n" - .balign 4 - -glabel D_808D1DAC - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1DBC - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1DCC - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1DDC - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1DEC - .word 0x4C480A00 -glabel D_808D1DF0 - .word 0x52480A00 -glabel D_808D1DF4 - .word 0x42440A00 -glabel D_808D1DF8 - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1E08 - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1E18 - .word 0x42480A00 -glabel D_808D1E1C - .word 0x4248430A, 0x00000000 -glabel D_808D1E24 - .word 0x42484345, 0x0A000000 -glabel D_808D1E2C - .word 0x534B0A00 -glabel D_808D1E30 - .word 0x454E440A, 0x00000000 -glabel D_808D1E38 - .asciz "../z_boss_fd.c" - .balign 4 - -glabel D_808D1E48 - .word 0x44E08000 -glabel D_808D1E4C - .word 0x4622F983 -glabel jtbl_808D1E50 -.word L808CB988 -.word L808CBCD4 -.word L808CBCF8 -.word L808CBE20 -.word L808CBF44 -.word L808CC140 -glabel D_808D1E68 - .word 0x461C4000 -glabel D_808D1E6C - .word 0x3D4CCCCD -glabel D_808D1E70 - .word 0x3DCCCCCD -glabel D_808D1E74 - .word 0x3BA3D70A, 0x3DCCCCCD -glabel D_808D1E7C - .word 0x3A831270 -glabel D_808D1E80 - .word 0x3E4CCCCD -glabel D_808D1E84 - .word 0x3CA3D70A -glabel D_808D1E88 - .word 0x3BA3D70A -glabel D_808D1E8C - .word 0x3DCCCCCD -glabel D_808D1E90 - .word 0x3DCCCCCD -glabel D_808D1E94 - .word 0x3DCCCCCD -glabel D_808D1E98 - .word 0x3DCCCCCD -glabel D_808D1E9C - .word 0x3DCCCCCD -glabel D_808D1EA0 - .word 0x3DCCCCCD -glabel D_808D1EA4 - .word 0x3D4CCCCD -glabel D_808D1EA8 - .word 0x3D4CCCCD -glabel D_808D1EAC - .word 0x3D4CCCCD -glabel D_808D1EB0 - .word 0x42AB1EB8, 0x3DCCCCCD -glabel jtbl_808D1EB8 -.word L808CCCF4 -.word L808CCDF0 -.word L808CD0E4 -.word L808CD154 -.word L808CD178 -.word L808CD3A8 -glabel jtbl_808D1ED0 -.word L808CD598 -.word L808CC6A4 -.word L808CC878 -.word L808CC91C -.word L808CC944 -glabel D_808D1EE4 - .word 0x410E6666 -glabel D_808D1EE8 - .word 0x461C4000 -glabel D_808D1EEC - .word 0x453B8000 -glabel D_808D1EF0 - .word 0x461C4000 -glabel D_808D1EF4 - .word 0xC68FA000 -glabel D_808D1EF8 - .word 0x4515C000 -glabel D_808D1EFC - .word 0x461C4000 -glabel D_808D1F00 - .word 0x3ECCCCCD -glabel D_808D1F04 - .word 0x42C7CCCD -glabel D_808D1F08 - .word 0x3CF5C28F -glabel D_808D1F0C - .word 0x3E99999A -glabel D_808D1F10 - .word 0x3CF5C28F -glabel D_808D1F14 - .word 0x40490FDB -glabel D_808D1F18 - .word 0x45AEE000 -glabel D_808D1F1C - .word 0x3E99999A -glabel D_808D1F20 - .word 0x45ABC000 -glabel D_808D1F24 - .word 0x3E99999A -glabel D_808D1F28 - .word 0x3E99999A -glabel D_808D1F2C - .word 0x44BB8000 -glabel D_808D1F30 - .word 0x453B8000 -glabel D_808D1F34 - .word 0x45098000 -glabel D_808D1F38 - .word 0x44D48000 -glabel D_808D1F3C - .word 0x44ED8000 -glabel D_808D1F40 - .word 0xC53B8000 -glabel D_808D1F44 - .word 0xC53B8000 -glabel D_808D1F48 - .word 0x410E6666 -glabel D_808D1F4C - .word 0x3D4CCCCD -glabel D_808D1F50 - .word 0x3F0CCCCD -glabel D_808D1F54 - .word 0x3D8F5C29 -glabel D_808D1F58 - .word 0x3E570A3D -glabel D_808D1F5C - .word 0x3C23D70A -glabel D_808D1F60 - .word 0x3E99999A -glabel D_808D1F64 - .word 0x45BB8000 -glabel D_808D1F68 - .word 0x44A28000 -glabel D_808D1F6C - .word 0xBE99999A -glabel D_808D1F70 - .word 0xBE99999A -glabel D_808D1F74 - .word 0x3ECCCCCD -glabel D_808D1F78 - .word 0x40490FDB -glabel D_808D1F7C - .word 0x3E99999A -glabel D_808D1F80 - .word 0x40C90FDB -glabel D_808D1F84 - .word 0x40C90FDB -glabel D_808D1F88 - .word 0x3ECCCCCD -glabel D_808D1F8C - .word 0x410E6666 -glabel D_808D1F90 - .word 0x41EF3333 -glabel D_808D1F94 - .word 0x3ECCCCCD -glabel D_808D1F98 - .word 0x3F0CCCCD -glabel D_808D1F9C - .word 0x3DCCCCCD -glabel D_808D1FA0 - .word 0x3E99999A -glabel D_808D1FA4 - .word 0x3DA3D70A -glabel D_808D1FA8 - .word 0x3DCCCCCD -glabel D_808D1FAC - .word 0x3C23D70A -glabel D_808D1FB0 - .word 0x3F333333 -glabel D_808D1FB4 - .word 0x3A51B717 -glabel D_808D1FB8 - .word 0xBFC90FDB -glabel D_808D1FBC - .word 0x3DCCCCCD -glabel D_808D1FC0 - .word 0x3DCCCCCD -glabel D_808D1FC4 - .word 0x45DAC000 -glabel D_808D1FC8 - .word 0x459C4000 -glabel D_808D1FCC - .word 0x459C4000 -glabel D_808D1FD0 - .word 0x3FC90FDB -glabel D_808D1FD4 - .word 0xC0490FDB -glabel D_808D1FD8 - .word 0x3E4CCCCD -glabel D_808D1FDC - .word 0x40490FDB - - diff --git a/data/overlays/actors/z_boss_fd2.rodata.s b/data/overlays/actors/z_boss_fd2.rodata.s deleted file mode 100644 index b030d5f621..0000000000 --- a/data/overlays/actors/z_boss_fd2.rodata.s +++ /dev/null @@ -1,156 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808D62D0 - .asciz "UP INIT 1\n" - .balign 4 - -glabel D_808D62DC - .asciz "UP INIT 2\n" - .balign 4 - -glabel D_808D62E8 - .asciz "UP 1 mode %d\n" - .balign 4 - -glabel D_808D62FC - .word 0x55502031, 0x2E35200A, 0x00000000 -glabel D_808D6308 - .word 0x55502074, 0x696D6520, 0x2564200A, 0x00000000 -glabel D_808D6318 - .word 0x504C2074, 0x696D6520, 0x2578200A, 0x00000000 -glabel D_808D6328 - .word 0x4D542074, 0x696D6520, 0x2578200A, 0x00000000 -glabel D_808D6338 - .word 0x55502031, 0x2E36200A, 0x00000000 -glabel D_808D6344 - .word 0x55502031, 0x2E37200A, 0x00000000 -glabel D_808D6350 - .word 0x55502032, 0x0A000000 -glabel D_808D6358 - .asciz "UP INIT 1\n" - .balign 4 - -glabel D_808D6364 - .word 0x53573120, 0x3D202564, 0x0A000000 -glabel D_808D6370 - .word 0x53573220, 0x3D202564, 0x0A000000 -glabel D_808D637C - .word 0x1B5B3332, 0x6D000000 -glabel D_808D6384 - .word 0x64616D61, 0x67652020, 0x2025640A, 0x00000000 -glabel D_808D6394 - .word 0x1B5B6D00 -glabel D_808D6398 - .word 0x68702025, 0x640A0000 -glabel D_808D63A0 - .asciz "FD2 move start \n" - .balign 4 - -glabel D_808D63B4 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D63C4 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D63D4 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D63E4 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D63F4 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6404 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6414 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6424 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6434 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6444 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6454 - .asciz "FD2 draw start \n" - .balign 4 - -glabel D_808D6468 - .asciz "../z_boss_fd2.c" - .balign 4 - -glabel D_808D6478 - .word 0xC4548000 -glabel D_808D647C - .word 0x410E6666 -glabel D_808D6480 - .word 0x410E6666 -glabel D_808D6484 - .word 0x40490FDB -glabel D_808D6488 - .word 0x40C90FDB -glabel jtbl_808D648C -.word L808D4124 -.word L808D41FC -.word L808D43D4 -.word L808D4420 -.word L808D4594 -.word L808D4728 -glabel D_808D64A4 - .word 0x3DCCCCCD -glabel D_808D64A8 - .word 0x3CA3D70A -glabel D_808D64AC - .word 0x40490FDB -glabel D_808D64B0 - .word 0x3E4CCCCD -glabel D_808D64B4 - .word 0x3CA3D70A -glabel D_808D64B8 - .word 0x3CA3D70A -glabel D_808D64BC - .word 0x3E99999A -glabel D_808D64C0 - .word 0x45BB8000 -glabel D_808D64C4 - .word 0x44A28000 -glabel D_808D64C8 - .word 0x3DCCCCCD -glabel D_808D64CC - .word 0xC4638000 -glabel D_808D64D0 - .word 0x3FC90FDB -glabel D_808D64D4 - .word 0x3A6BEDFA -glabel D_808D64D8 - .word 0x3C23D70A -glabel D_808D64DC - .word 0x45ABC000 -glabel D_808D64E0 - .word 0x45AEE000 -glabel D_808D64E4 - .word 0x3E99999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_boss_ganon2.rodata.s b/data/overlays/actors/z_boss_ganon2.rodata.s deleted file mode 100644 index 9d0e92d753..0000000000 --- a/data/overlays/actors/z_boss_ganon2.rodata.s +++ /dev/null @@ -1,507 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8090D6C0 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D6D4 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D6E8 - .asciz "this->no_hit_time %d\n" - .balign 4 - -glabel D_8090D700 - .asciz "this->look_on %d\n" - .balign 4 - -glabel D_8090D714 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D728 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D73C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D750 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D764 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D778 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D78C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D7A0 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D7B4 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D7C8 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D7DC - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D7F0 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D804 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D818 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D82C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D840 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D854 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D868 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D87C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D890 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D8A4 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D8B8 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D8CC - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D8E0 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D8F4 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D908 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D91C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D930 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D944 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D958 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D96C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D980 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D994 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D9A8 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D9BC - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D9D0 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D9E4 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090D9F8 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA0C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA20 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA34 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA48 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA5C - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA70 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA84 - .asciz "../z_boss_ganon2.c" - .balign 4 - -glabel D_8090DA98 - .word 0x46EC7A00 -glabel D_8090DA9C - .word 0x46ECC600 -glabel D_8090DAA0 - .word 0x46ECE600 -glabel D_8090DAA4 - .word 0x40C90FDB -glabel D_8090DAA8 - .word 0x40C90FDB -glabel D_8090DAAC - .word 0x40C90FDB -glabel D_8090DAB0 - .word 0xC53B8000 -glabel jtbl_8090DAB4 -.word L808FD644 -.word L808FD80C -.word L808FD940 -.word L808FDB64 -.word L808FDC48 -.word L808FDD74 -.word L808FF810 -.word L808FF810 -.word L808FF810 -.word L808FF810 -.word L808FDDE8 -.word L808FDF70 -.word L808FE1C0 -.word L808FE1C0 -.word L808FE2E0 -.word L808FE4C0 -.word L808FE63C -.word L808FE8E4 -.word L808FEA08 -.word L808FEAC8 -.word L808FEB70 -.word L808FECE8 -.word L808FED50 -.word L808FEF74 -.word L808FF150 -.word L808FF1F4 -.word L808FF330 -.word L808FF404 -.word L808FF51C -.word L808FF678 -glabel D_8090DB2C - .word 0x44728000 -glabel D_8090DB30 - .word 0x4487C000 -glabel D_8090DB34 - .word 0x44728000 -glabel D_8090DB38 - .word 0x4487C000 -glabel D_8090DB3C - .word 0x44728000 -glabel D_8090DB40 - .word 0x4487C000 -glabel D_8090DB44 - .word 0x44BB8000 -glabel D_8090DB48 - .word 0x4487C000 -glabel D_8090DB4C - .word 0x44728000 -glabel D_8090DB50 - .word 0x4487C000 -glabel D_8090DB54 - .word 0x44738000 -glabel D_8090DB58 - .word 0x4487C000 -glabel D_8090DB5C - .word 0x44688000 -glabel D_8090DB60 - .word 0x448D2000 -glabel D_8090DB64 - .word 0x44A14000 -glabel D_8090DB68 - .word 0x4487C000 -glabel D_8090DB6C - .word 0x4487C000 -glabel D_8090DB70 - .word 0x4487C000 -glabel D_8090DB74 - .word 0x4487C000 -glabel D_8090DB78 - .word 0x448C2000 -glabel D_8090DB7C - .word 0x447C4000 -glabel D_8090DB80 - .word 0x45DAC000 -glabel D_8090DB84 - .word 0x448A4000 -glabel D_8090DB88 - .word 0x4487C000 -glabel D_8090DB8C - .word 0x44EBC000 -glabel D_8090DB90 - .word 0x4487C000 -glabel D_8090DB94 - .word 0x44896000 -glabel D_8090DB98 - .word 0x3F4CCCCD -glabel D_8090DB9C - .word 0x44896000 -glabel D_8090DBA0 - .word 0x4487C000 -glabel D_8090DBA4 - .word 0x461C4000 -glabel D_8090DBA8 - .word 0x40490FDB -glabel D_8090DBAC - .word 0x471C4000 -glabel D_8090DBB0 - .word 0x459C4000 -glabel D_8090DBB4 - .word 0x453B8000 -glabel D_8090DBB8 - .word 0x3BA3D70A -glabel jtbl_8090DBBC -.word L80900904 -.word L809009A8 -.word L80900AFC -.word L80900E4C -.word L80900E4C -.word L80900E4C -.word L80900E4C -.word L80900E4C -.word L80900E4C -.word L80900E4C -.word L80900C88 -.word L80900CE4 -glabel D_8090DBEC - .word 0x40490FDB -glabel D_8090DBF0 - .word 0x3E99999A -glabel jtbl_8090DBF4 -.word L8090129C -.word L80901344 -.word L80901560 -.word L80901648 -.word L80901700 -.word L809017B4 -.word L80901968 -.word L80901AB0 -.word L80901E00 -.word L80901F88 -.word L80902014 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902290 -.word L80902240 -glabel D_8090DC48 - .word 0x448FC000 -glabel D_8090DC4C - .word 0x448FC000 -glabel D_8090DC50 - .word 0x43868000 -glabel D_8090DC54 - .word 0x448BA000 -glabel D_8090DC58 - .word 0xBF4CCCCD -glabel D_8090DC5C - .word 0x448F4000 -glabel D_8090DC60 - .word 0x448FC000 -glabel D_8090DC64 - .word 0x3E99999A -glabel D_8090DC68 - .word 0x465AC000 -glabel D_8090DC6C - .word 0x463B8000 -glabel D_8090DC70 - .word 0x3E4CCCCD -glabel D_8090DC74 - .word 0x3FF33333 -glabel D_8090DC78 - .word 0x461C4000 -glabel jtbl_8090DC7C -.word L80903360 -.word L8090304C -.word L80903360 -.word L80903360 -.word L80903070 -.word L809030C0 -.word L80903110 -.word L809031D8 -.word L80903264 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L80903360 -.word L809032A4 -.word L809032C8 -.word L809032F0 -.word L80903318 -.word L80903340 -glabel D_8090DCE4 - .word 0x3E19999A -glabel D_8090DCE8 - .word 0x3E19999A -glabel D_8090DCEC - .word 0x3E19999A -glabel D_8090DCF0 - .word 0x3E19999A -glabel D_8090DCF4 - .word 0x40C90FDB -glabel D_8090DCF8 - .word 0x3DCCCCCD -glabel D_8090DCFC - .word 0x3E99999A -glabel D_8090DD00 - .word 0x3E4CCCCD -glabel D_8090DD04 - .word 0x3E19999A -glabel D_8090DD08 - .word 0x3DA9FBE7 -glabel D_8090DD0C - .word 0x3DA9FBE7 -glabel D_8090DD10 - .word 0x4487C000 -glabel D_8090DD14 - .word 0x3DC8B43A -glabel D_8090DD18 - .word 0x3DCCCCCD -glabel D_8090DD1C - .word 0x40490FDB -glabel D_8090DD20 - .word 0x459C4000 -glabel D_8090DD24 - .word 0x3FA0D97C -glabel D_8090DD28 - .word 0x45959000 -glabel D_8090DD2C - .word 0x3C23D70A -glabel D_8090DD30 - .word 0x40490FDB -glabel D_8090DD34 - .word 0xBE4CCCCD -glabel D_8090DD38 - .word 0x3F19999A -glabel D_8090DD3C - .word 0x4684D000 -glabel D_8090DD40 - .word 0x453B8000 -glabel D_8090DD44 - .word 0x40490FDB -glabel D_8090DD48 - .word 0x3E6EEEED -glabel D_8090DD4C - .word 0x40C90FDB -glabel D_8090DD50 - .word 0xBF490FDB -glabel D_8090DD54 - .word 0x3D23D70B -glabel D_8090DD58 - .word 0x3FC90FDB -glabel D_8090DD5C - .word 0x44944000 -glabel D_8090DD60 - .word 0x44894000 -glabel D_8090DD64 - .word 0x3FA0D97C -glabel D_8090DD68 - .word 0x3FC90FDB -glabel D_8090DD6C - .word 0x4487C000 -glabel D_8090DD70 - .word 0x441C4000 -glabel D_8090DD74 - .word 0x3DCCCCCD -glabel D_8090DD78 - .word 0x3ECCCCCD -glabel D_8090DD7C - .word 0xBE4CCCCD -glabel D_8090DD80 - .word 0x3CF5C28F -glabel D_8090DD84 - .word 0x3F20D97C -glabel D_8090DD88 - .word 0x3FC90FDB -glabel D_8090DD8C - .word 0x44894000 -glabel D_8090DD90 - .word 0x4487C000 -glabel D_8090DD94 - .word 0x3E4CCCCD -glabel D_8090DD98 - .word 0x3FD33333, 0x00000000 - diff --git a/data/overlays/actors/z_boss_ganondrof.rodata.s b/data/overlays/actors/z_boss_ganondrof.rodata.s index 2845cbeb1d..106b7422bf 100644 --- a/data/overlays/actors/z_boss_ganondrof.rodata.s +++ b/data/overlays/actors/z_boss_ganondrof.rodata.s @@ -16,13 +16,21 @@ glabel D_80915150 .balign 4 glabel D_80915188 - .word 0x52554E20, 0x310A0000 + .asciz "RUN 1\n" + .balign 4 + glabel D_80915190 - .word 0x52554E20, 0x320A0000 + .asciz "RUN 2\n" + .balign 4 + glabel D_80915198 - .word 0x52554E20, 0x330A0000 + .asciz "RUN 3\n" + .balign 4 + glabel D_809151A0 - .word 0x52554E20, 0x340A0000 + .asciz "RUN 4\n" + .balign 4 + glabel D_809151A8 .asciz "this->fwork[GND_END_FRAME] = %d\n" .balign 4 @@ -72,11 +80,15 @@ glabel D_80915324 .balign 4 glabel D_8091534C - .word 0x4D4F5645, 0x20454E44, 0x0A000000 + .asciz "MOVE END\n" + .balign 4 + glabel D_80915358 .word 0x4620310A, 0x00000000 glabel D_80915360 - .word 0x46203135, 0x0A000000 + .asciz "F 15\n" + .balign 4 + glabel D_80915368 .word 0x4620320A, 0x00000000 glabel D_80915370 @@ -84,37 +96,51 @@ glabel D_80915370 .balign 4 glabel D_80915388 - .word 0x4D4F5645, 0x2050203D, 0x2025780A, 0x00000000 + .asciz "MOVE P = %x\n" + .balign 4 + glabel D_80915398 .asciz "STOP TIMER = %d ==============\n" .balign 4 glabel D_809153B8 - .word 0x59502025, 0x660A0000 + .asciz "YP %f\n" + .balign 4 + glabel D_809153C0 - .word 0x44524157, 0x2031310A, 0x00000000 + .asciz "DRAW 11\n" + .balign 4 + glabel D_809153CC .asciz "EYE_COL %d\n" .balign 4 glabel D_809153D8 - .word 0x44524157, 0x2032320A, 0x00000000 + .asciz "DRAW 22\n" + .balign 4 + glabel D_809153E4 .asciz "../z_boss_ganondrof.c" .balign 4 glabel D_809153FC - .word 0x44524157, 0x20454E44, 0x2025640A, 0x00000000 + .asciz "DRAW END %d\n" + .balign 4 + glabel D_8091540C .word 0xC54F3000 glabel D_80915410 .word 0xC54F3000 glabel D_80915414 - .word 0x3CF5C28F + .float 0.03 + .balign 4 + glabel D_80915418 .word 0x3F933333 glabel D_8091541C - .word 0x3F4CCCCD + .float 0.8 + .balign 4 + glabel D_80915420 .word 0xC54F3000 glabel D_80915424 @@ -128,9 +154,13 @@ glabel D_80915430 glabel D_80915434 .word 0xBDA3D70A glabel D_80915438 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8091543C - .word 0x3FFEB852 + .float 1.99000000954 + .balign 4 + glabel D_80915440 .word 0xBE4CCCCD glabel D_80915444 @@ -138,13 +168,21 @@ glabel D_80915444 glabel D_80915448 .word 0x4622F983 glabel D_8091544C - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_80915450 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80915454 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80915458 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel jtbl_8091545C .word L80912E00 .word L80912FB4 @@ -153,15 +191,25 @@ glabel jtbl_8091545C .word L809134B4 .word L8091352C glabel D_80915474 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80915478 - .word 0x3CA3D70A + .float 0.02 + .balign 4 + glabel D_8091547C - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80915480 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80915484 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80915488 .word 0xC54F3000 glabel D_8091548C @@ -183,15 +231,23 @@ glabel D_809154A8 glabel D_809154AC .word 0xBE4CCCCD glabel D_809154B0 - .word 0x3B03126F + .float 0.002 + .balign 4 + glabel D_809154B4 .word 0xC54F3000 glabel D_809154B8 - .word 0x3B03126F + .float 0.002 + .balign 4 + glabel D_809154BC - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_809154C0 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_809154C4 .word func_809145BC .word func_809145BC diff --git a/data/overlays/actors/z_boss_goma.rodata.s b/data/overlays/actors/z_boss_goma.rodata.s deleted file mode 100644 index 30d5c3c6bd..0000000000 --- a/data/overlays/actors/z_boss_goma.rodata.s +++ /dev/null @@ -1,148 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8091B430 - .asciz "MAKE CAMERA !!! 1 !!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8091B464 - .asciz "../z_boss_goma.c" - .balign 4 - -glabel D_8091B478 - .asciz "../z_boss_goma.c" - .balign 4 - -glabel D_8091B48C - .asciz "../z_boss_goma.c" - .balign 4 - -glabel D_8091B4A0 - .asciz "../z_boss_goma.c" - .balign 4 - -glabel D_8091B4B4 - .asciz "../z_boss_goma.c" - .balign 4 - -glabel D_8091B4C8 - .asciz "../z_boss_goma.c" - .balign 4 - -glabel jtbl_8091B4DC -.word L80916D30 -.word L80916E18 -.word L80916F0C -.word L809171FC -.word L80917318 -.word L80917520 -.word L80917D68 -.word L80917D68 -.word L80917D68 -.word L80917738 -glabel D_8091B504 - .word 0x4324B852 -glabel D_8091B508 - .word 0x43C6D70B -glabel D_8091B50C - .word 0x4324B852 -glabel D_8091B510 - .word 0x43C6D70B -glabel D_8091B514 - .word 0x3FE66666 -glabel D_8091B518 - .word 0x40490E56 -glabel D_8091B51C - .word 0x3F333333 -glabel D_8091B520 - .word 0x3DCCCCCD -glabel D_8091B524 - .word 0x3DCCCCCD -glabel D_8091B528 - .word 0x3DCCCCCD -glabel D_8091B52C - .word 0x461C4000 -glabel D_8091B530 - .word 0x461C4000 -glabel D_8091B534 - .word 0x3CB43958 -glabel D_8091B538 - .word 0x3DCCCCCD -glabel D_8091B53C - .word 0x3DCCCCCD -glabel D_8091B540 - .word 0x3DCCCCCD -glabel D_8091B544 - .word 0x3DCCCCCD -glabel D_8091B548 - .word 0x3DCCCCCD -glabel D_8091B54C - .word 0x3DCCCCCD -glabel D_8091B550 - .word 0x3DCCCCCD -glabel D_8091B554 - .word 0x3DCCCCCD -glabel D_8091B558 - .word 0x3DCCCCCD -glabel D_8091B55C - .word 0x3DCCCCCD -glabel D_8091B560 - .word 0x3DCCCCCD -glabel D_8091B564 - .word 0x3DCCCCCD -glabel D_8091B568 - .word 0x3A83126F -glabel D_8091B56C - .word 0x419AAAAB -glabel D_8091B570 - .word 0x3E99999A -glabel D_8091B574 - .word 0x3DCCCCCD -glabel D_8091B578 - .word 0x3E4CCCCD -glabel jtbl_8091B57C -.word L8091A660 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A8F4 -.word L8091A8F4 -.word L8091A8F4 -.word L8091A8F4 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A774 -.word L8091A9B8 -.word L8091A9B8 -.word L8091A78C -.word L8091A9B8 -.word L8091A9B8 -.word L8091A7A4 -.word L8091A7CC -glabel D_8091B608 - .word 0x461C4000, 0x00000000 - - diff --git a/data/overlays/actors/z_boss_mo.rodata.s b/data/overlays/actors/z_boss_mo.rodata.s deleted file mode 100644 index de48e3a4c6..0000000000 --- a/data/overlays/actors/z_boss_mo.rodata.s +++ /dev/null @@ -1,516 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80926940 - .word 0x1B5B3333, 0x6D000000 -glabel D_80926948 - .asciz "Core_Damage_check START\n" - .balign 4 - -glabel D_80926964 - .asciz "Core_Damage_check 当り！！\n" - .balign 4 - -glabel D_80926980 - .asciz "Core_Damage_check 当り 2 ！！\n" - .balign 4 - -glabel D_809269A0 - .asciz "Core_Damage_check 剣 当り！！\n" - .balign 4 - -glabel D_809269C0 - .asciz "Core_Damage_check 終わり ！！\n" - .balign 4 - -glabel D_809269E0 - .word 0x1B5B6D00 -glabel D_809269E4 - .asciz "CORE mode = <%d>\n" - .balign 4 - -glabel D_809269F8 - .asciz "MO : Move mode = <%d>\n" - .balign 4 - -glabel D_80926A10 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A20 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A30 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A40 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A50 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A60 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A70 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A80 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926A90 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926AA0 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926AB0 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926AC0 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926AD0 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926AE0 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926AF0 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B00 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B10 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B20 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B30 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B40 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B50 - .asciz "../z_boss_mo.c" - .balign 4 - -glabel D_80926B60 - .word 0x46EC7A00 -glabel D_80926B64 - .word 0x46ECC600 -glabel D_80926B68 - .word 0x46ECE600 -glabel D_80926B6C - .word 0x3B23D70A -glabel D_80926B70 - .word 0x3D4CCCCD -glabel D_80926B74 - .word 0x3DCCCCCD -glabel D_80926B78 - .word 0x451C4000 -glabel D_80926B7C - .word 0x453B8000 -glabel D_80926B80 - .word 0x44BB8000 -glabel D_80926B84 - .word 0x451C4000 -glabel D_80926B88 - .word 0x453B8000 -glabel D_80926B8C - .word 0x44BB8000 -glabel D_80926B90 - .word 0x451C4000 -glabel D_80926B94 - .word 0x453B8000 -glabel D_80926B98 - .word 0x44BB8000 -glabel D_80926B9C - .word 0x451C4000 -glabel D_80926BA0 - .word 0x44A28000 -glabel D_80926BA4 - .word 0x45DAC000 -glabel D_80926BA8 - .word 0x459C4000 -glabel D_80926BAC - .word 0x451C4000 -glabel D_80926BB0 - .word 0x459C4000 -glabel D_80926BB4 - .word 0x44BB8000 -glabel D_80926BB8 - .word 0x451C4000 -glabel D_80926BBC - .word 0x44A28000 -glabel D_80926BC0 - .word 0x45DAC000 -glabel D_80926BC4 - .word 0x459C4000 -glabel D_80926BC8 - .word 0x450FC000 -glabel jtbl_80926BCC -.word L8091E614 -.word L8091E83C -.word L8091EA54 -.word L8091E624 -.word L8091F118 -.word L8091ED18 -.word L8091F118 -glabel jtbl_80926BE8 -.word L8091CD0C -.word L8091CD0C -.word L8091D0B0 -.word L8091D430 -.word L8091D430 -.word L8091D918 -.word L8091F118 -.word L8091F118 -.word L8091F118 -.word L8091F118 -.word L8091CAD8 -.word L8091CB1C -glabel D_80926C18 - .word 0x3C23D70A -glabel D_80926C1C - .word 0x3CCCCCCD -glabel D_80926C20 - .word 0x3F333333 -glabel D_80926C24 - .word 0x3C23D70A -glabel D_80926C28 - .word 0x3A83126F -glabel D_80926C2C - .word 0x3A83126F -glabel D_80926C30 - .word 0x3A83126F -glabel D_80926C34 - .word 0x3A83126F -glabel D_80926C38 - .word 0x3CCCCCCD -glabel D_80926C3C - .word 0x3C23D70A -glabel D_80926C40 - .word 0x3E99999A -glabel D_80926C44 - .word 0x3CF5C28F -glabel D_80926C48 - .word 0x3C23D70A -glabel D_80926C4C - .word 0x3E4CCCCD -glabel D_80926C50 - .word 0x3DCCCCCD -glabel D_80926C54 - .word 0x3BA3D70A -glabel D_80926C58 - .word 0x45DAC000 -glabel D_80926C5C - .word 0x459C4000 -glabel D_80926C60 - .word 0x3CCCCCCD -glabel D_80926C64 - .word 0x3C23D70A -glabel D_80926C68 - .word 0x40490FDB -glabel D_80926C6C - .word 0x41A73333 -glabel D_80926C70 - .word 0x3A83126F -glabel D_80926C74 - .word 0x3CCCCCCD -glabel D_80926C78 - .word 0x3D4CCCCD -glabel D_80926C7C - .word 0x44228000 -glabel D_80926C80 - .word 0x3CCCCCCD -glabel D_80926C84 - .word 0x3D4CCCCD -glabel D_80926C88 - .word 0x44228000 -glabel D_80926C8C - .word 0x3CCCCCCD -glabel D_80926C90 - .word 0x3DCCCCCD -glabel D_80926C94 - .word 0x3D4CCCCD -glabel D_80926C98 - .word 0x3A83126F -glabel D_80926C9C - .word 0x3D4CCCCD -glabel D_80926CA0 - .word 0x3D4CCCCD -glabel D_80926CA4 - .word 0x3E99999A -glabel D_80926CA8 - .word 0x44228000 -glabel D_80926CAC - .word 0x3E4CCCCD -glabel D_80926CB0 - .word 0x3A03126F -glabel D_80926CB4 - .word 0x3B03126F -glabel D_80926CB8 - .word 0x3E6B851F -glabel D_80926CBC - .word 0x3CF5C28F -glabel D_80926CC0 - .word 0x3AC49BA6 -glabel D_80926CC4 - .word 0x3E051EB8 -glabel D_80926CC8 - .word 0x3F4CCCCD -glabel D_80926CCC - .word 0x3A83126F -glabel D_80926CD0 - .word 0x3DCCCCCD -glabel D_80926CD4 - .word 0x3DCCCCCD -glabel D_80926CD8 - .word 0x3CA3D70A -glabel D_80926CDC - .word 0x3D4CCCCD -glabel D_80926CE0 - .word 0x3E4CCCCD -glabel D_80926CE4 - .word 0x3E051EB8 -glabel D_80926CE8 - .word 0x3DA3D70A -glabel jtbl_80926CEC -.word L8091F61C -.word L8091F7D0 -.word L8091F8F8 -.word L8091FF00 -.word L80920280 -glabel D_80926D00 - .word 0x3D4CCCCD -glabel D_80926D04 - .word 0x3E051EB8 -glabel D_80926D08 - .word 0x4622F983 -glabel D_80926D0C - .word 0x4622F983 -glabel D_80926D10 - .word 0x3D4CCCCD -glabel D_80926D14 - .word 0x3E051EB8 -glabel D_80926D18 - .word 0x3DCCCCCD -glabel D_80926D1C - .word 0x3ECCCCCD -glabel D_80926D20 - .word 0x3E99999A -glabel D_80926D24 - .word 0x451C4000 -glabel D_80926D28 - .word 0x451C4000 -glabel D_80926D2C - .word 0x3DCCCCCD -glabel D_80926D30 - .word 0x3C23D70A -glabel D_80926D34 - .word 0x3A83126F -glabel D_80926D38 - .word 0x3DCCCCCD -glabel D_80926D3C - .word 0x3DCCCCCD -glabel D_80926D40 - .word 0x3CF5C28F -glabel D_80926D44 - .word 0x3CF5C28F -glabel D_80926D48 - .word 0x3C23D70A -glabel D_80926D4C - .word 0x3CF5C28F -glabel jtbl_80926D50 -.word L80920734 -.word L80920CB0 -.word L80920D48 -.word L80920D8C -.word L80920DFC -.word L8092107C -glabel D_80926D68 - .word 0x3BA3D70A -glabel D_80926D6C - .word 0x3C75C28F -glabel D_80926D70 - .word 0x3C75C28F -glabel D_80926D74 - .word 0x3BA3D70A -glabel D_80926D78 - .word 0x3B03126F -glabel D_80926D7C - .word 0x3DA3D70A -glabel D_80926D80 - .word 0x3E051EB8 -glabel D_80926D84 - .word 0x3D4CCCCD -glabel D_80926D88 - .word 0x3CA3D70A -glabel D_80926D8C - .word 0x3E4CCCCD -glabel D_80926D90 - .word 0x453B8000 -glabel D_80926D94 - .word 0x451C4000 -glabel D_80926D98 - .word 0x3D4CCCCD -glabel D_80926D9C - .word 0x406CCCCE -glabel D_80926DA0 - .word 0x3CA3D70A -glabel D_80926DA4 - .word 0x3DA3D70A -glabel D_80926DA8 - .word 0x3E051EB8 -glabel D_80926DAC - .word 0x3BA3D70A -glabel D_80926DB0 - .word 0x3C75C28F -glabel D_80926DB4 - .word 0x3C75C28F -glabel D_80926DB8 - .word 0x3BA3D70A -glabel D_80926DBC - .word 0x3C03126F -glabel jtbl_80926DC0 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921B08 -.word L80921928 -.word L809219DC -.word L80921A60 -.word L80921B08 -.word L80921B08 -.word L80921AA0 -glabel D_80926E04 - .word 0x3CA3D70A -glabel D_80926E08 - .word 0x3D4CCCCD -glabel D_80926E0C - .word 0xBC23D70A -glabel D_80926E10 - .word 0x3DA3D70A -glabel D_80926E14 - .word 0x3E051EB8 -glabel D_80926E18 - .word 0x3ECCCCCD -glabel D_80926E1C - .word 0x40490FDB -glabel D_80926E20 - .word 0x45418000 -glabel D_80926E24 - .word 0x452EC000 -glabel D_80926E28 - .word 0x4622F983 -glabel D_80926E2C - .word 0x4622F983 -glabel D_80926E30 - .word 0x3E4CCCCD -glabel D_80926E34 - .word 0x4048F5C3 -glabel D_80926E38 - .word 0x3F19999A -glabel D_80926E3C - .word 0x3FCCCCCD -glabel D_80926E40 - .word 0x3E99999A -glabel D_80926E44 - .word 0x3D99999A -glabel D_80926E48 - .word 0x3E19999A -glabel D_80926E4C - .word 0x3DCCCCCD -glabel D_80926E50 - .word 0x3D4CCCCD -glabel D_80926E54 - .word 0x3DCCCCCD -glabel D_80926E58 - .word 0x463B8000 -glabel D_80926E5C - .word 0x469C4000 -glabel D_80926E60 - .word 0x3F2AA64C -glabel D_80926E64 - .word 0x40C90FDB -glabel D_80926E68 - .word 0x3D4CCCCD -glabel D_80926E6C - .word 0x3E4CCCCD -glabel D_80926E70 - .word 0x40490FDB -glabel D_80926E74 - .word 0x40490FDB -glabel D_80926E78 - .word 0x40490FDB -glabel D_80926E7C - .word 0x40490FDB -glabel D_80926E80 - .word 0x3FC90FDB -glabel D_80926E84 - .word 0x3DCCCCCD -glabel D_80926E88 - .word 0x3E3851EC -glabel D_80926E8C - .word 0x3DA3D70A -glabel D_80926E90 - .word 0x3DA3D70A -glabel D_80926E94 - .word 0xBFDBE958 -glabel D_80926E98 - .word 0x3F4CCCCD -glabel D_80926E9C - .word 0x3E6B851F -glabel D_80926EA0 - .word 0x3C23D70A -glabel D_80926EA4 - .word 0x3DCCCCCD -glabel D_80926EA8 - .word 0x3F533333 -glabel D_80926EAC - .word 0x3F966666 -glabel D_80926EB0 - .word 0x3DCCCCCD -glabel D_80926EB4 - .word 0x3FC90FDB -glabel D_80926EB8 - .word 0x3D4CCCCD -glabel D_80926EBC - .word 0x3E19999A - diff --git a/data/overlays/actors/z_boss_sst.rodata.s b/data/overlays/actors/z_boss_sst.rodata.s deleted file mode 100644 index add48edbc8..0000000000 --- a/data/overlays/actors/z_boss_sst.rodata.s +++ /dev/null @@ -1,168 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809378F0 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937900 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937910 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937920 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937930 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937940 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937950 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937960 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937970 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937980 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937990 - .word 0xC4228000 -glabel D_80937994 - .word 0xC4228000 -glabel D_80937998 - .word 0x459C4000 -glabel D_8093799C - .word 0x409D70A4 -glabel D_809379A0 - .word 0x3F4CCCCC -glabel D_809379A4 - .word 0x40666666 -glabel D_809379A8 - .word 0xC4228000 -glabel D_809379AC - .word 0x3E4CCCCD -glabel D_809379B0 - .word 0x44228000 -glabel D_809379B4 - .word 0x3E923A14 -glabel D_809379B8 - .word 0x3E923A14 -glabel D_809379BC - .word 0x3F20D97C -glabel D_809379C0 - .word 0xC4228000 -glabel D_809379C4 - .word 0x3CAAAAAB -glabel D_809379C8 - .word 0x3C4CCCCD -glabel D_809379CC - .word 0x3C4CCCCD -glabel D_809379D0 - .word 0x3C4CCCCD -glabel D_809379D4 - .word 0x3C888889 -glabel D_809379D8 - .word 0x389D4952 -glabel D_809379DC - .word 0x3983126F -glabel D_809379E0 - .word 0x4633B000 -glabel D_809379E4 - .word 0x3CCCCCCD -glabel D_809379E8 - .word 0x3F99999A -glabel D_809379EC - .word 0x40490FDB -glabel D_809379F0 - .word 0x3D567750 -glabel D_809379F4 - .word 0x3FA147AE -glabel D_809379F8 - .word 0x3F20D97C -glabel D_809379FC - .word 0x3F490FDB -glabel D_80937A00 - .word 0x37D1B717 -glabel D_80937A04 - .word 0x3983126F -glabel D_80937A08 - .word 0x3F4CCCCD -glabel D_80937A0C - .word 0x3ECCCCCD -glabel D_80937A10 - .word 0x3F555555 -glabel D_80937A14 - .word 0x3C23D70A -glabel D_80937A18 - .word 0x3CA3D70A -glabel D_80937A1C - .word 0x3F20D97C -glabel D_80937A20 - .word 0x3F20D97C -glabel D_80937A24 - .word 0x3F20D97C -glabel D_80937A28 - .word 0x3F20D97C -glabel D_80937A2C - .word 0x3F20D97C -glabel D_80937A30 - .word 0x3F20D97C -glabel D_80937A34 - .word 0x3F20D97C -glabel D_80937A38 - .word 0x3F20D97C -glabel D_80937A3C - .word 0x3F20D97C -glabel D_80937A40 - .word 0x3E060A92 -glabel D_80937A44 - .word 0x3E060A92 -glabel D_80937A48 - .word 0x3E060A92 -glabel D_80937A4C - .word 0x40C90FDB -glabel D_80937A50 - .word 0x40C90FDB -glabel D_80937A54 - .word 0x39C49BA6 -glabel D_80937A58 - .word 0x3A449BA6 -glabel D_80937A5C - .word 0x3D75C28F -glabel D_80937A60 - .word 0x3DF5C28F -glabel D_80937A64 - .word 0x3D75C28F -glabel D_80937A68 - .word 0x3DF5C28F -glabel D_80937A6C - .word 0x3A83126F -glabel D_80937A70 - .word 0x3BA3D70A -glabel D_80937A74 - .word 0x3A83126F -glabel D_80937A78 - .word 0x3A83126F, 0x00000000 - diff --git a/data/overlays/actors/z_boss_tw.rodata.s b/data/overlays/actors/z_boss_tw.rodata.s deleted file mode 100644 index bfdb9acae6..0000000000 --- a/data/overlays/actors/z_boss_tw.rodata.s +++ /dev/null @@ -1,644 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8094AA60 - .asciz "OooooooooooooooooooooooooooooooooCC\n" - .balign 4 - -glabel D_8094AA88 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AA98 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AAA8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AAB8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AAC8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AAD8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AAE8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AAF8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB08 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB18 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB28 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB38 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB48 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB58 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB68 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB78 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB88 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AB98 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ABA8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ABB8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ABC8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ABD8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ABE8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ABF8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC08 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC18 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC28 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC38 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC48 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC58 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC68 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC78 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC88 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AC98 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ACA8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ACB8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ACC8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ACD8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ACE8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ACF8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD08 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD18 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD28 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD38 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD48 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD58 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD68 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD78 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD88 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AD98 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ADA8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ADB8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ADC8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ADD8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ADE8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094ADF8 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE08 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE18 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE28 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE38 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE48 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE58 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE68 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE78 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE88 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AE98 - .asciz "../z_boss_tw.c" - .balign 4 - -glabel D_8094AEA8 - .word 0x3B23D70A -glabel D_8094AEAC - .word 0x40490FDB -glabel D_8094AEB0 - .word 0x40C90FDB -glabel D_8094AEB4 - .word 0x3FC90FDB -glabel D_8094AEB8 - .word 0x3F490FDB -glabel D_8094AEBC - .word 0x3FC90FDB -glabel D_8094AEC0 - .word 0x3F490FDB -glabel D_8094AEC4 - .word 0x3FFEB852 -glabel D_8094AEC8 - .word 0x407F5C29 -glabel D_8094AECC - .word 0x4622F983 -glabel D_8094AED0 - .word 0x4622F983 -glabel D_8094AED4 - .word 0x3C23D70A -glabel D_8094AED8 - .word 0x3E4CCCCD -glabel D_8094AEDC - .word 0x3BA3D70A -glabel D_8094AEE0 - .word 0x3BA3D70A -glabel D_8094AEE4 - .word 0x40490FDB -glabel D_8094AEE8 - .word 0x3F8CCCCD -glabel D_8094AEEC - .word 0x448E8000 -glabel D_8094AEF0 - .word 0x3F490FDB -glabel D_8094AEF4 - .word 0xBE99999A -glabel D_8094AEF8 - .word 0x3B23D70A -glabel D_8094AEFC - .word 0x3B23D70A -glabel D_8094AF00 - .word 0x461C4000 -glabel D_8094AF04 - .word 0x461C4000 -glabel D_8094AF08 - .word 0x40490FDB -glabel D_8094AF0C - .word 0x3DCCCCCD -glabel D_8094AF10 - .word 0x40490FDB -glabel D_8094AF14 - .word 0x40490FDB -glabel D_8094AF18 - .word 0x40490FDB -glabel D_8094AF1C - .word 0x453B8000 -glabel D_8094AF20 - .word 0x453B8000 -glabel D_8094AF24 - .word 0x3FFEB852 -glabel D_8094AF28 - .word 0x3BA71DE7 -glabel jtbl_8094AF2C -.word L8093D670 -.word L8093D7EC -.word L8093D988 -.word L8093DAB8 -.word L8093DC4C -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093E130 -.word L8093E258 -.word L8093E3E8 -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093ECEC -.word L8093E854 -glabel D_8094AF80 - .word 0x46AFC800 -glabel D_8094AF84 - .word 0x44048000 -glabel D_8094AF88 - .word 0x3D4CCCCD -glabel D_8094AF8C - .word 0x3D4CCCCD -glabel D_8094AF90 - .word 0x3E4CCCCD -glabel D_8094AF94 - .word 0x44048000 -glabel D_8094AF98 - .word 0x43848000 -glabel D_8094AF9C - .word 0x3DCCCCCD -glabel D_8094AFA0 - .word 0x3D4CCCCD -glabel D_8094AFA4 - .word 0x461C4000 -glabel D_8094AFA8 - .word 0x3CCCCCCC -glabel D_8094AFAC - .word 0x3E4CCCCD -glabel D_8094AFB0 - .word 0xC4048000 -glabel D_8094AFB4 - .word 0x43848000 -glabel D_8094AFB8 - .word 0x3DCCCCCD -glabel D_8094AFBC - .word 0x3D4CCCCD -glabel D_8094AFC0 - .word 0x461C4000 -glabel D_8094AFC4 - .word 0x3CCCCCCC -glabel D_8094AFC8 - .word 0xBFC90FDB -glabel D_8094AFCC - .word 0x40490FDB -glabel D_8094AFD0 - .word 0x43CE8000 -glabel D_8094AFD4 - .word 0x43838000 -glabel D_8094AFD8 - .word 0x4622F983 -glabel D_8094AFDC - .word 0x4622F983 -glabel D_8094AFE0 - .word 0x3D4CCCCD -glabel D_8094AFE4 - .word 0x3ECCCCCD -glabel D_8094AFE8 - .word 0x3D4CCCCD -glabel D_8094AFEC - .word 0x3ECCCCCD -glabel D_8094AFF0 - .word 0x43838000 -glabel D_8094AFF4 - .word 0x43838000 -glabel D_8094AFF8 - .word 0x3FFEB852 -glabel jtbl_8094AFFC -.word L8093FDC0 -.word L8093FE58 -.word L809400CC -.word L809402FC -.word L80940690 -glabel D_8094B010 - .word 0x43838000 -glabel D_8094B014 - .word 0x3E99999A -glabel D_8094B018 - .word 0x3ECCCCCD -glabel D_8094B01C - .word 0x3ECCCCCD -glabel D_8094B020 - .word 0x3E99999A -glabel D_8094B024 - .word 0x3ECCCCCD -glabel jtbl_8094B028 -.word L80941618 -.word L80941470 -.word L80941494 -.word L809414CC -.word L80941534 -.word L80941574 -.word L809415E4 -glabel D_8094B044 - .word 0x3CF5C28F -glabel D_8094B048 - .word 0x3D4CCCCD -glabel D_8094B04C - .word 0x3F733333 -glabel D_8094B050 - .word 0x3F333333 -glabel D_8094B054 - .word 0x3ECCCCCD -glabel D_8094B058 - .word 0x40490FDB -glabel D_8094B05C - .word 0x3C23D70A -glabel D_8094B060 - .word 0x469C4000 -glabel D_8094B064 - .word 0x3C23D70A -glabel D_8094B068 - .word 0x469C4000 -glabel D_8094B06C - .word 0x458FC000 -glabel jtbl_8094B070 -.word L80943CA8 -.word L80943C20 -.word L80943B0C -.word L80943B94 -.word L80943CFC -.word L80943D1C -.word L809439B8 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943CA8 -.word L80943C20 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943D38 -.word L80943B0C -.word L80943B94 -glabel jtbl_8094B0E0 -.word L80943E54 -.word L80943E54 -.word L80943E54 -.word L80943E54 -.word L80943EDC -.word L80943EDC -.word L80943E24 -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943E54 -.word L80943E54 -.word L80943EDC -.word L80943DEC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943EDC -.word L80943E08 -.word L80943E54 -.word L80943E54 -glabel D_8094B150 - .word 0x3FC90FDB -glabel D_8094B154 - .word 0x3FA66666 -glabel D_8094B158 - .word 0x3FC90FDB -glabel D_8094B15C - .word 0x3FC90FDB -glabel D_8094B160 - .word 0x3FC90FDB -glabel D_8094B164 - .word 0x443B8000 -glabel D_8094B168 - .word 0x3EB33333 -glabel D_8094B16C - .word 0x3E99999A -glabel D_8094B170 - .word 0x4622F983 -glabel D_8094B174 - .word 0x4622F983 -glabel D_8094B178 - .word 0x46FF4C00 -glabel D_8094B17C - .word 0x40490FDB -glabel D_8094B180 - .word 0x40490FDB -glabel D_8094B184 - .word 0x41EF3333 -glabel D_8094B188 - .word 0x3ECCCCCD -glabel D_8094B18C - .word 0x458E3000 -glabel D_8094B190 - .word 0x3CF5C28F -glabel D_8094B194 - .word 0x4622F983 -glabel D_8094B198 - .word 0x4622F983 -glabel D_8094B19C - .word 0x40490FDB -glabel D_8094B1A0 - .word 0x46FF4C00 -glabel D_8094B1A4 - .word 0x46FF4C00 -glabel D_8094B1A8 - .word 0x41EF3333 -glabel D_8094B1AC - .word 0x3ECCCCCD -glabel D_8094B1B0 - .word 0x3E051EB8 -glabel D_8094B1B4 - .word 0x411E6666 -glabel D_8094B1B8 - .word 0x40490FDB -glabel D_8094B1BC - .word 0x3E051EB8 -glabel D_8094B1C0 - .word 0x3E4CCCCD -glabel D_8094B1C4 - .word 0x3DB851EC -glabel D_8094B1C8 - .word 0x3DB851EC -glabel D_8094B1CC - .word 0x3DB851EC -glabel D_8094B1D0 - .word 0x3DB851EC -glabel D_8094B1D4 - .word 0x40490FDB -glabel D_8094B1D8 - .word 0xBE4CCCCD -glabel D_8094B1DC - .word 0x40490FDB -glabel D_8094B1E0 - .word 0xBE4CCCCD -glabel D_8094B1E4 - .word 0x3A03126F -glabel D_8094B1E8 - .word 0x3F4CCCCD -glabel D_8094B1EC - .word 0x3F4CCCCD -glabel D_8094B1F0 - .word 0x3ECCCCCD -glabel D_8094B1F4 - .word 0x418F3333 -glabel D_8094B1F8 - .word 0x3DCCCCCD -glabel D_8094B1FC - .word 0x46EC7A00 -glabel D_8094B200 - .word 0x46ECC600 -glabel D_8094B204 - .word 0x46ECE600 -glabel D_8094B208 - .word 0x3FC90FDB -glabel D_8094B20C - .word 0x40490FDB -glabel D_8094B210 - .word 0x3FFEB852 -glabel D_8094B214 - .word 0x3DCCCCCD -glabel D_8094B218 - .word 0x47AFC800 -glabel D_8094B21C - .word 0x403F5C29 -glabel D_8094B220 - .word 0x4622F983 -glabel D_8094B224 - .word 0x4622F983 -glabel D_8094B228 - .word 0x4622F983, 0x00000000 - diff --git a/data/overlays/actors/z_boss_va.rodata.s b/data/overlays/actors/z_boss_va.rodata.s deleted file mode 100644 index fd6da9e442..0000000000 --- a/data/overlays/actors/z_boss_va.rodata.s +++ /dev/null @@ -1,495 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8095C3B0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C3C0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C3D0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C3E0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C3F0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C400 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C410 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C420 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C430 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C440 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C450 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C460 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C470 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C480 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C490 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C4A0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C4B0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C4C0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C4D0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C4E0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C4F0 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C500 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C510 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C520 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C530 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C540 - .asciz "../z_boss_va.c" - .balign 4 - -glabel D_8095C550 - .asciz "../z_boss_va.c" - .balign 4 - -glabel jtbl_8095C560 -.word L8094F350 -.word L8094F350 -.word L8094F350 -.word L8094F39C -.word L8094F39C -.word L8094F39C -glabel D_8095C578 - .word 0x46CB2000 -glabel D_8095C57C - .word 0x46CB2000 -glabel D_8095C580 - .word 0x3F19999A -glabel D_8095C584 - .word 0x3F19999A -glabel D_8095C588 - .word 0x3F333333 -glabel jtbl_8095C58C -.word L8094FEC4 -.word L8094FF00 -.word L8094FF00 -.word L8094FF00 -.word L8094FF30 -.word L8094FF30 -.word L8094FF30 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF90 -.word L8094FF60 -.word L8094FF60 -.word L8094FF60 -.word L8094FFD8 -glabel jtbl_8095C5E0 -.word L80950024 -.word L809504C4 -.word L809504C4 -.word L809504C4 -.word L80950538 -.word L80950538 -.word L80950538 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L809505C4 -.word L8095059C -.word L8095059C -.word L8095059C -.word L809505B0 -glabel D_8095C634 - .word 0x3DCCCCCD -glabel D_8095C638 - .word 0x3D4CCCCD -glabel jtbl_8095C63C -.word L80950830 -.word L80950858 -.word L809508B0 -.word L80950A10 -.word L80950A4C -.word L80950A9C -.word L80950AC0 -.word L80951578 -.word L80950CDC -.word L80950DC8 -.word L80950E78 -.word L80950F2C -.word L80951578 -.word L80950FF8 -.word L809510AC -.word L809513F0 -.word L80951460 -.word L809514D0 -.word L8095156C -glabel D_8095C688 - .word 0x3DCCCCCD -glabel D_8095C68C - .word 0x3F333333 -glabel D_8095C690 - .word 0x411CCCCD -glabel D_8095C694 - .word 0x3DCCCCCD -glabel D_8095C698 - .word 0x3FCCCCCD -glabel D_8095C69C - .word 0x3D99999A -glabel D_8095C6A0 - .word 0x3D99999A -glabel D_8095C6A4 - .word 0x3D99999A -glabel D_8095C6A8 - .word 0x3D99999A -glabel D_8095C6AC - .word 0x3D99999A -glabel D_8095C6B0 - .word 0x3D99999A -glabel D_8095C6B4 - .word 0x3DCCCCCD -glabel D_8095C6B8 - .word 0x3D4CCCCD -glabel D_8095C6BC - .word 0x3DCCCCCD -glabel D_8095C6C0 - .word 0x3DCCCCCD -glabel D_8095C6C4 - .word 0x3DCCCCCD -glabel D_8095C6C8 - .word 0x3D4CCCCD -glabel D_8095C6CC - .word 0x3983126F -glabel D_8095C6D0 - .word 0x463B8000 -glabel D_8095C6D4 - .word 0x3DCCCCCD -glabel D_8095C6D8 - .word 0x3D4CCCCD -glabel D_8095C6DC - .word 0x3DCCCCCD -glabel D_8095C6E0 - .word 0x3983126F -glabel D_8095C6E4 - .word 0x463B8000 -glabel D_8095C6E8 - .word 0x3DCCCCCD -glabel D_8095C6EC - .word 0x3DCCCCCD -glabel D_8095C6F0 - .word 0x3D4CCCCD -glabel D_8095C6F4 - .word 0x45AAA000 -glabel D_8095C6F8 - .word 0x3983126F -glabel jtbl_8095C6FC -.word L80953460 -.word L8095361C -.word L80953CD8 -.word L80953CD8 -.word L80953CD8 -.word L80953CD8 -.word L80953CD8 -.word L80953868 -.word L80953940 -.word L80953A84 -.word L80953CBC -glabel D_8095C728 - .word 0x3F19999A -glabel D_8095C72C - .word 0x3DF5C28F -glabel D_8095C730 - .word 0x3D99999A -glabel D_8095C734 - .word 0x3C75C28F -glabel D_8095C738 - .word 0x3E19999A -glabel D_8095C73C - .word 0x3E19999A -glabel D_8095C740 - .word 0x3E19999A -glabel D_8095C744 - .word 0x3E19999A -glabel D_8095C748 - .word 0x3E19999A -glabel D_8095C74C - .word 0x3E19999A -glabel D_8095C750 - .word 0x3DCCCCCD -glabel D_8095C754 - .word 0x3D4CCCCD -glabel D_8095C758 - .word 0x3DCCCCCD -glabel D_8095C75C - .word 0x3DCCCCCD -glabel D_8095C760 - .word 0x3E99999A -glabel D_8095C764 - .word 0x3DF5C28F -glabel D_8095C768 - .word 0x3BA3D70A -glabel D_8095C76C - .word 0x3DCCCCCD -glabel D_8095C770 - .word 0x3F19999A -glabel D_8095C774 - .word 0x3DCCCCCD -glabel jtbl_8095C778 -.word L80956998 -.word L80956A1C -.word L80956A1C -.word L80956A1C -.word L80956A1C -.word L80956CC0 -.word L80956AFC -.word L80956AFC -.word L80956D88 -.word L80956D88 -.word L80956D88 -.word L80956D68 -glabel D_8095C7A8 - .word 0x3E19999A -glabel D_8095C7AC - .word 0x3E19999A -glabel D_8095C7B0 - .word 0x3E19999A -glabel D_8095C7B4 - .word 0x3DCCCCCD -glabel D_8095C7B8 - .word 0x3DCCCCCD -glabel D_8095C7BC - .word 0x3DCCCCCD -glabel jtbl_8095C7C0 -.word L80957DA8 -.word L80957F50 -.word L80957F50 -.word L80957F50 -.word L80957F50 -.word L80957F50 -.word L80957F50 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957E74 -.word L80957F50 -glabel D_8095C814 - .word 0x3E75C28F -glabel D_8095C818 - .word 0x3F428F5C -glabel D_8095C81C - .word 0x3E4CCCCD -glabel D_8095C820 - .word 0xBFC90FDB -glabel D_8095C824 - .word 0x44048000 -glabel D_8095C828 - .word 0x44048000 -glabel D_8095C82C - .word 0x38C90FDB -glabel D_8095C830 - .word 0x38C90FDB -glabel D_8095C834 - .word 0x38C90FDB -glabel D_8095C838 - .word 0x38C90FDB -glabel D_8095C83C - .word 0x38C90FDB -glabel jtbl_8095C840 -.word L80959318 -.word L809594D0 -.word L809594D0 -.word L809594D0 -.word L80959510 -.word L80959510 -.word L80959510 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959578 -.word L80959550 -.word L80959550 -.word L80959550 -.word L8095978C -glabel D_8095C894 - .word 0x3BA3D70A -glabel D_8095C898 - .word 0x469C4000 -glabel D_8095C89C - .word 0x461C4000 -glabel D_8095C8A0 - .word 0x418F3333 -glabel D_8095C8A4 - .word 0x469C4000 -glabel D_8095C8A8 - .word 0x461C4000 -glabel D_8095C8AC - .word 0x3AAA64C3 -glabel D_8095C8B0 - .word 0x458CA000 -glabel D_8095C8B4 - .word 0x3F99999A -glabel D_8095C8B8 - .word 0x458CA000 -glabel D_8095C8BC - .word 0x3F99999A -glabel D_8095C8C0 - .word 0x40490FF9 -glabel D_8095C8C4 - .word 0x3C978D50 -glabel D_8095C8C8 - .word 0x40490FF9 -glabel D_8095C8CC - .word 0x3FC90FDB -glabel D_8095C8D0 - .word 0x3DEB851F -glabel D_8095C8D4 - .word 0x3E051EB8 -glabel D_8095C8D8 - .word 0x3DCCCCCD -glabel D_8095C8DC - .word 0x3DCCCCCD -glabel D_8095C8E0 - .word 0x3E051EB8 -glabel D_8095C8E4 - .word 0x3DEB851F -glabel D_8095C8E8 - .word 0x40490FF9 -glabel D_8095C8EC - .word 0x3CA3D70A -glabel D_8095C8F0 - .word 0x40490FF9 -glabel D_8095C8F4 - .word 0x40490FF9 -glabel jtbl_8095C8F8 -.word L8095B15C -.word L8095B1D0 -.word L8095B1E4 -.word L8095B154 -.word L8095B1C8 -.word L8095B228 -glabel D_8095C910 - .word 0x418F3333 -glabel D_8095C914 - .word 0x3C23D70A -glabel D_8095C918 - .word 0x3C23D70A -glabel D_8095C91C - .word 0x3E99999A -glabel D_8095C920 - .word 0x3C23D70A -glabel D_8095C924 - .word 0x3E99999A -glabel D_8095C928 - .word 0x3C23D70A -glabel D_8095C92C - .word 0x3C23D70A -glabel D_8095C930 - .word 0x3E99999A -glabel D_8095C934 - .word 0x3C23D70A -glabel D_8095C938 - .word 0x3F666666 -glabel D_8095C93C - .word 0x3C23D70A -glabel D_8095C940 - .word 0x40490FDB -glabel D_8095C944 - .word 0x3DCCCCCD -glabel D_8095C948 - .word 0x3C23D70A -glabel D_8095C94C - .word 0x3DCCCCCD -glabel D_8095C950 - .word 0x3F490FDB, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_6k.rodata.s b/data/overlays/actors/z_demo_6k.rodata.s deleted file mode 100644 index 869d62eff7..0000000000 --- a/data/overlays/actors/z_demo_6k.rodata.s +++ /dev/null @@ -1,200 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809693E0 - .word 0x6E6F203D, 0x2025640A, 0x00000000 -glabel D_809693EC - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_809693FC - .word 0x30000000 -glabel D_80969400 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969410 - .word 0x30000000 -glabel D_80969414 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969424 - .asciz " NA_SE_EN_GANON_FIRE_DEMO\n" - .balign 4 - -glabel D_80969448 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969458 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969468 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969478 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969488 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969498 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_809694A8 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_809694B8 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_809694C8 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_809694D8 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_809694E8 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_809694F8 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969508 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969518 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969528 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969538 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969548 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969558 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969568 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel D_80969578 - .asciz "../z_demo_6k.c" - .balign 4 - -glabel jtbl_80969588 -.word L80966A38 -.word L80966AA4 -.word L80966AD4 -.word L80966B1C -.word L80966B1C -.word L80966B1C -.word L80966B1C -.word L80966B1C -.word L80966B1C -.word L80966B54 -.word L80966B54 -.word L80966B80 -.word L80966BCC -.word L80966C14 -.word L80966C48 -.word L80966C48 -.word L80966C48 -.word L80966C48 -.word L80966C48 -.word L80966C48 -glabel D_809695D8 - .word 0x3C449BA6 -glabel D_809695DC - .word 0x3C088889 -glabel D_809695E0 - .word 0x3DCCCCCD -glabel D_809695E4 - .word 0x3ADED289 -glabel D_809695E8 - .word 0x3DD4FDF3 -glabel D_809695EC - .word 0x3DCCCCCD -glabel D_809695F0 - .word 0x477FFF00 -glabel D_809695F4 - .word 0x477FFF00 -glabel D_809695F8 - .word 0x3D4CCCCD -glabel D_809695FC - .word 0x3BA3D70A -glabel D_80969600 - .word 0x3D54FDF3 -glabel D_80969604 - .word 0xC4C96000 -glabel D_80969608 - .word 0x44C9A000 -glabel D_8096960C - .word 0x3DCCCCCD -glabel D_80969610 - .word 0x3E4CCCCD -glabel D_80969614 - .word 0x3DF5C28F -glabel D_80969618 - .word 0x3E4CCCCD -glabel D_8096961C - .word 0x3AC49BA6 -glabel D_80969620 - .word 0x3D072B02 -glabel D_80969624 - .word 0x3CF5C28F -glabel D_80969628 - .word 0x3CA3D70A -glabel D_8096962C - .word 0x3C23D70A -glabel D_80969630 - .word 0x3CF5C28F -glabel D_80969634 - .word 0x3A449BA6 -glabel D_80969638 - .word 0x3D4CCCCD -glabel D_8096963C - .word 0xBFC90FDB -glabel D_80969640 - .word 0x3F860A92 -glabel D_80969644 - .word 0xBFC90FDB -glabel D_80969648 - .word 0x3C8EFA35 -glabel D_8096964C - .word 0x3C8EFA35 -glabel D_80969650 - .word 0x38C90FDB -glabel D_80969654 - .word 0x3FC90FDB -glabel D_80969658 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_du.rodata.s b/data/overlays/actors/z_demo_du.rodata.s deleted file mode 100644 index d1fe2754e4..0000000000 --- a/data/overlays/actors/z_demo_du.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8096CFD0 - .asciz "../z_demo_du_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_8096CFF4 - .asciz "../z_demo_du_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_8096D018 - .asciz "Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_8096D054 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8096D090 - .asciz "../z_demo_du.c" - .balign 4 - -glabel D_8096D0A0 - .asciz "../z_demo_du.c" - .balign 4 - -glabel D_8096D0B0 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8096D0E8 - .word 0xC61C4000 -glabel D_8096D0EC - .word 0x42A6AAAB - - diff --git a/data/overlays/actors/z_demo_ec.rodata.s b/data/overlays/actors/z_demo_ec.rodata.s deleted file mode 100644 index 31c5e34574..0000000000 --- a/data/overlays/actors/z_demo_ec.rodata.s +++ /dev/null @@ -1,65 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80970630 - .asciz "Demo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097066C - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_8097067C - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_8097068C - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_8097069C - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_809706AC - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_809706BC - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_809706CC - .asciz "かつらが無い!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_809706F4 - .asciz "かつらが無い!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097071C - .asciz " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" - .balign 4 - -glabel D_8097075C - .asciz "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" - .balign 4 - -glabel D_80970798 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_809707D4 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 8 - - - diff --git a/data/overlays/actors/z_demo_effect.rodata.s b/data/overlays/actors/z_demo_effect.rodata.s deleted file mode 100644 index 2887f9d343..0000000000 --- a/data/overlays/actors/z_demo_effect.rodata.s +++ /dev/null @@ -1,324 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80976880 - .word 0x1B5B3336, 0x6D206E6F, 0x203D2025, 0x640A1B5B, 0x6D000000 -glabel D_80976894 - .asciz " bank_ID = %d\n" - .balign 4 - -glabel D_809768AC - .word 0x30000000 -glabel D_809768B0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809768C4 - .word 0x30000000 -glabel D_809768C8 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809768DC - .asciz " 転送終了 move_wait " - .balign 4 - -glabel D_809768FC - .word 0x30000000 -glabel D_80976900 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976914 - .asciz " 縮むバージョン \n" - .balign 4 - -glabel D_80976930 - .asciz " 通常 バージョン \n" - .balign 4 - -glabel D_8097694C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976960 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976974 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976988 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_8097699C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769B0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769C4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769D8 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769EC - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A00 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A14 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A28 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A3C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A50 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A64 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A78 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A8C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AA0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AB4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AC8 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976ADC - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AF0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B04 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B18 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B2C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B40 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B54 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B68 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B7C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B90 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BA4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BB8 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BCC - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BE0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BF4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976C08 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976C1C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976C30 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976C44 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel jtbl_80976C58 -.word L809711AC -.word L809711C8 -.word L809711F8 -.word L809713A8 -.word L809713CC -.word L80971424 -.word L809714B8 -.word L80971544 -.word L809715E0 -.word L809716D8 -.word L809716EC -.word L80971700 -.word L80971714 -.word L80971728 -.word L8097173C -.word L80971774 -.word L809715B0 -.word L80971578 -.word L8097125C -.word L809717B0 -.word L809717E8 -.word L80971820 -.word L8097189C -.word L80971750 -.word L80971764 -.word L80971764 -glabel jtbl_80976CC0 -.word L809712AC -.word L809712CC -.word L809712EC -.word L8097130C -.word L8097132C -.word L8097134C -.word L80971370 -glabel D_80976CDC - .word 0xBDCCCCCD -glabel D_80976CE0 - .word 0x3DCCCCCD -glabel D_80976CE4 - .word 0x3FD9999A -glabel D_80976CE8 - .word 0x3AAEC33E -glabel D_80976CEC - .word 0x3C23D70A -glabel D_80976CF0 - .word 0x3E0F5C29 -glabel D_80976CF4 - .word 0x3F19999A -glabel D_80976CF8 - .word 0xBCF5C28F -glabel D_80976CFC - .word 0x3F666666 -glabel D_80976D00 - .word 0x3C23D70A -glabel D_80976D04 - .word 0x3C23D70A -glabel D_80976D08 - .word 0x3E6B851F -glabel D_80976D0C - .word 0x3A83126F -glabel D_80976D10 - .word 0x4001EB85 -glabel D_80976D14 - .word 0x3D4CCCCD -glabel D_80976D18 - .word 0x3DCCCCCD -glabel D_80976D1C - .word 0x3BA3D70A -glabel D_80976D20 - .word 0x3F866666 -glabel D_80976D24 - .word 0x3E6B851F -glabel D_80976D28 - .word 0x3E19999A -glabel D_80976D2C - .word 0x3C8EFA35 -glabel D_80976D30 - .word 0x38C90FDB -glabel D_80976D34 - .word 0x38C90FDB -glabel D_80976D38 - .word 0x4622F983 -glabel D_80976D3C - .word 0xBDCCCCCD -glabel D_80976D40 - .word 0x3E4CCCCD -glabel D_80976D44 - .word 0x3E449809 -glabel D_80976D48 - .word 0x40060A92 -glabel D_80976D4C - .word 0x3E449809 -glabel D_80976D50 - .word 0x40860A92 -glabel D_80976D54 - .word 0x3E449809 -glabel D_80976D58 - .word 0x3C8EFA35 -glabel D_80976D5C - .word 0x3FC90FDB -glabel D_80976D60 - .word 0x3CF5C28F -glabel D_80976D64 - .word 0x3D4CCCCD -glabel D_80976D68 - .word 0x3C8EFA35 -glabel D_80976D6C - .word 0x3C8EFA35 -glabel D_80976D70 - .word 0x38C90FDB -glabel D_80976D74 - .word 0x4019999A -glabel D_80976D78 - .word 0x38C90FDB -glabel D_80976D7C - .word 0x38C90FDB -glabel D_80976D80 - .word 0x4622F983 -glabel D_80976D84 - .word 0x4622F983, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_ext.rodata.s b/data/overlays/actors/z_demo_ext.rodata.s deleted file mode 100644 index 821fa36311..0000000000 --- a/data/overlays/actors/z_demo_ext.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80977CB0 - .asciz "Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80977CE4 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80977D20 - .asciz "../z_demo_ext.c" - .balign 4 - -glabel D_80977D30 - .asciz "../z_demo_ext.c" - .balign 4 - -glabel D_80977D40 - .asciz "../z_demo_ext.c" - .balign 4 - -glabel D_80977D50 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 16 - - - diff --git a/data/overlays/actors/z_demo_gj.rodata.s b/data/overlays/actors/z_demo_gj.rodata.s deleted file mode 100644 index df450a9a53..0000000000 --- a/data/overlays/actors/z_demo_gj.rodata.s +++ /dev/null @@ -1,147 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8097BF90 - .asciz "Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n" - .balign 4 - -glabel D_8097BFC0 - .asciz "Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n" - .balign 4 - -glabel D_8097BFF0 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C000 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C010 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C020 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C030 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C040 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C050 - .asciz "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" - .balign 4 - -glabel D_8097C098 - .asciz "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" - .balign 4 - -glabel D_8097C0E4 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097C120 - .asciz "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097C164 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097C19C - .word 0x3E4CCCCD -glabel D_8097C1A0 - .word 0x3F19999A -glabel D_8097C1A4 - .word 0x3DCCCCCD -glabel D_8097C1A8 - .word 0x3F333333 -glabel jtbl_8097C1AC -.word L80979288 -.word L80979320 -.word L809793B8 -.word L80979450 -.word L809794E8 -.word L80979580 -.word L80979618 -glabel D_8097C1C8 - .word 0x3C23D70A -glabel D_8097C1CC - .word 0x3C23D70A -glabel D_8097C1D0 - .word 0x3C23D70A -glabel D_8097C1D4 - .word 0x3C23D70A -glabel D_8097C1D8 - .word 0x3C23D70A -glabel D_8097C1DC - .word 0x3C23D70A -glabel D_8097C1E0 - .word 0x3C23D70A -glabel D_8097C1E4 - .word 0x4487C000 -glabel jtbl_8097C1E8 -.word L809798D0 -.word L809799A8 -.word L80979A80 -.word L80979B58 -.word L80979C30 -.word L80979D08 -.word L80979DE0 -glabel D_8097C204 - .word 0x3C23D70A -glabel D_8097C208 - .word 0x3C23D70A -glabel D_8097C20C - .word 0x3C23D70A -glabel D_8097C210 - .word 0x3C23D70A -glabel D_8097C214 - .word 0x3C23D70A -glabel D_8097C218 - .word 0x3C23D70A -glabel D_8097C21C - .word 0x3C23D70A -glabel D_8097C220 - .word 0x4622F983 -glabel D_8097C224 - .word 0x4622F983 -glabel D_8097C228 - .word 0x3F4CCCCD -glabel D_8097C22C - .word 0x3F4CCCCD -glabel D_8097C230 - .word 0x3F4CCCCD -glabel jtbl_8097C234 -.word L8097BC98 -.word L8097BD48 -.word L8097BD48 -.word L8097BD48 -.word L8097BCA8 -.word L8097BCB8 -.word L8097BCC8 -.word L8097BCD8 -.word L8097BCE8 -.word L8097BCF8 -.word L8097BD08 -.word L8097BD48 -.word L8097BD18 -.word L8097BD28 -.word L8097BD48 -.word L8097BD48 -.word L8097BD48 -.word L8097BD48 -.word L8097BD38 - - diff --git a/data/overlays/actors/z_demo_gt.rodata.s b/data/overlays/actors/z_demo_gt.rodata.s deleted file mode 100644 index f1366bfa2c..0000000000 --- a/data/overlays/actors/z_demo_gt.rodata.s +++ /dev/null @@ -1,260 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80982780 - .asciz "../z_demo_gt_part1.c" - .balign 4 - -glabel D_80982798 - .asciz "../z_demo_gt_part1.c" - .balign 4 - -glabel D_809827B0 - .asciz "../z_demo_gt_part1.c" - .balign 4 - -glabel D_809827C8 - .asciz "../z_demo_gt_part2.c" - .balign 4 - -glabel D_809827E0 - .asciz "../z_demo_gt_part2.c" - .balign 4 - -glabel D_809827F8 - .asciz "../z_demo_gt_part2.c" - .balign 4 - -glabel D_80982810 - .asciz "../z_demo_gt_part3.c" - .balign 4 - -glabel D_80982828 - .asciz "../z_demo_gt_part3.c" - .balign 4 - -glabel D_80982840 - .asciz "../z_demo_gt_part3.c" - .balign 4 - -glabel D_80982858 - .asciz "../z_demo_gt_part4_1.c" - .balign 4 - -glabel D_80982870 - .asciz "../z_demo_gt_part4_1.c" - .balign 4 - -glabel D_80982888 - .asciz "../z_demo_gt_part4_1.c" - .balign 4 - -glabel D_809828A0 - .asciz "../z_demo_gt_part4_2.c" - .balign 4 - -glabel D_809828B8 - .asciz "../z_demo_gt_part4_2.c" - .balign 4 - -glabel D_809828D0 - .asciz "../z_demo_gt_part4_2.c" - .balign 4 - -glabel D_809828E8 - .asciz "../z_demo_gt_part4_3.c" - .balign 4 - -glabel D_80982900 - .asciz "../z_demo_gt_part4_3.c" - .balign 4 - -glabel D_80982918 - .asciz "../z_demo_gt_part4_3.c" - .balign 4 - -glabel D_80982930 - .asciz "../z_demo_gt_part5.c" - .balign 4 - -glabel D_80982948 - .asciz "../z_demo_gt_part5.c" - .balign 4 - -glabel D_80982960 - .asciz "../z_demo_gt_part5.c" - .balign 4 - -glabel D_80982978 - .asciz "../z_demo_gt_part6.c" - .balign 4 - -glabel D_80982990 - .asciz "../z_demo_gt_part6.c" - .balign 4 - -glabel D_809829A8 - .asciz "../z_demo_gt_part6.c" - .balign 4 - -glabel D_809829C0 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_809829FC - .asciz "Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80982A3C - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80982A74 - .word 0x3E4CCCCD -glabel D_80982A78 - .word 0x3DCCCCCD -glabel D_80982A7C - .word 0x3F333333 -glabel D_80982A80 - .word 0x3DCCCCCD -glabel D_80982A84 - .word 0x3F333333 -glabel D_80982A88 - .word 0x3F19999A -glabel D_80982A8C - .word 0x3DCCCCCD -glabel D_80982A90 - .word 0x3F333333 -glabel D_80982A94 - .word 0x3DCCCCCD -glabel D_80982A98 - .word 0x3F333333 -glabel D_80982A9C - .word 0x3D4CCCCD -glabel D_80982AA0 - .word 0x3DCCCCCD -glabel D_80982AA4 - .word 0x3DCCCCCD -glabel D_80982AA8 - .word 0x3DCCCCCD -glabel D_80982AAC - .word 0x3DCCCCCD -glabel D_80982AB0 - .word 0x3DCCCCCD -glabel D_80982AB4 - .word 0x3DCCCCCD -glabel D_80982AB8 - .word 0x3DCCCCCD -glabel D_80982ABC - .word 0x3DCCCCCD -glabel D_80982AC0 - .word 0x4429C000 -glabel D_80982AC4 - .word 0x44D48000 -glabel D_80982AC8 - .word 0x4429C000 -glabel D_80982ACC - .word 0x44D48000 -glabel D_80982AD0 - .word 0x3A83126F -glabel D_80982AD4 - .word 0x3D449BA6 -glabel D_80982AD8 - .word 0x38C90FDB -glabel D_80982ADC - .word 0x43BC8000 -glabel D_80982AE0 - .word 0x43BC8000 -glabel D_80982AE4 - .word 0x449D8000 -glabel D_80982AE8 - .word 0x43A18000 -glabel D_80982AEC - .word 0x444F8000 -glabel D_80982AF0 - .word 0x44098000 -glabel D_80982AF4 - .word 0x444A8000 -glabel D_80982AF8 - .word 0x44A8C000 -glabel D_80982AFC - .word 0x438F8000 -glabel D_80982B00 - .word 0x44458000 -glabel D_80982B04 - .word 0x44458000 -glabel D_80982B08 - .word 0x44458000 -glabel D_80982B0C - .word 0x45034000 -glabel D_80982B10 - .word 0x3A83126F -glabel D_80982B14 - .word 0x3D449BA6 -glabel D_80982B18 - .word 0x38C90FDB -glabel D_80982B1C - .word 0x44924000 -glabel D_80982B20 - .word 0xC4898000 -glabel D_80982B24 - .word 0x3A83126F -glabel D_80982B28 - .word 0x3D449BA6 -glabel D_80982B2C - .word 0x38C90FDB -glabel D_80982B30 - .word 0x3A83126F -glabel D_80982B34 - .word 0x3BA3D70A -glabel D_80982B38 - .word 0x38C90FDB -glabel D_80982B3C - .word 0x3A83126F -glabel D_80982B40 - .word 0x3D449BA6 -glabel D_80982B44 - .word 0x38C90FDB -glabel D_80982B48 - .word 0x3A83126F -glabel D_80982B4C - .word 0x3D449BA6 -glabel D_80982B50 - .word 0x38C90FDB -glabel jtbl_80982B54 -.word L809824A4 -.word L809824B4 -.word L809824C4 -.word L80982524 -.word L80982524 -.word L809824D4 -.word L809824E4 -.word L809824F4 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982504 -.word L80982514 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_ik.rodata.s b/data/overlays/actors/z_demo_ik.rodata.s deleted file mode 100644 index 2b6d765059..0000000000 --- a/data/overlays/actors/z_demo_ik.rodata.s +++ /dev/null @@ -1,95 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809847B0 - .asciz "Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_809847E4 - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_809847FC - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_80984814 - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_8098482C - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_80984844 - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_8098485C - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_80984874 - .asciz "Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_809848AC - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_809848C4 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_809848DC - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_809848F4 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_8098490C - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_80984924 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_8098493C - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_80984954 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_8098496C - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_809849A8 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel jtbl_809849E0 -.word L80983A3C -.word L80983A4C -.word L80983A60 -.word L80983A70 -.word L80983A88 -.word L80983A88 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_im.rodata.s b/data/overlays/actors/z_demo_im.rodata.s deleted file mode 100644 index 8e67165c0d..0000000000 --- a/data/overlays/actors/z_demo_im.rodata.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80988810 - .asciz "../z_demo_im_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80988834 - .asciz "../z_demo_im_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80988858 - .asciz "Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80988894 - .asciz "Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_809888D0 - .asciz "Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80988908 - .asciz "Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80988944 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80988980 - .asciz "../z_demo_im.c" - .balign 4 - -glabel D_80988990 - .asciz "../z_demo_im.c" - .balign 4 - -glabel D_809889A0 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_809889D8 - .word 0xC61C4000 -glabel D_809889DC - .word 0x42A6AAAB -glabel jtbl_809889E0 -.word L80986340 -.word L80986350 -.word L80986394 -.word L80986394 -.word L80986394 -.word L80986394 -.word L80986364 -.word L80986374 -.word L80986384 -glabel jtbl_80988A04 -.word L80987470 -.word L80987484 -.word L80987498 -.word L809874AC -.word L809874C0 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_kankyo.rodata.s b/data/overlays/actors/z_demo_kankyo.rodata.s deleted file mode 100644 index 6a5c53c4f2..0000000000 --- a/data/overlays/actors/z_demo_kankyo.rodata.s +++ /dev/null @@ -1,193 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8098C870 - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_8098C880 - .word 0x30000000 -glabel D_8098C884 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C898 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8AC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8C0 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8D4 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8E8 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8FC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C910 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C924 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C938 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C94C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C960 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C974 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C988 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C99C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9B0 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9C4 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9D8 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9EC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA00 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA14 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA28 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA3C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel jtbl_8098CA50 -.word L80988F2C -.word L80988F2C -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L8098906C -.word L80989244 -.word L80989244 -.word L80989244 -.word L80989244 -.word L80989244 -.word L809890DC -.word L8098916C -.word L80989190 -.word L80989190 -.word L8098921C -glabel D_8098CA98 - .word 0x477FFF00 -glabel jtbl_8098CA9C -.word L809896CC -.word L809896CC -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L80989300 -.word L809896CC -.word L809896CC -.word L809896CC -.word L809896CC -.word L809896CC -.word L80989318 -.word L809896CC -.word L80989348 -.word L8098964C -.word L809896CC -glabel jtbl_8098CAE4 -.word L809899F8 -.word L809899F8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989ABC -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989AD0 -.word L80989AE4 -.word L80989AF8 -.word L80989AF8 -.word L80989B0C -glabel D_8098CB2C - .word 0x44BB8000 -glabel D_8098CB30 - .word 0x40490FDB -glabel D_8098CB34 - .word 0x3A83126F -glabel D_8098CB38 - .word 0x3C8EFA35 -glabel D_8098CB3C - .word 0x3C8EFA35 -glabel D_8098CB40 - .word 0x3C8EFA35 -glabel D_8098CB44 - .word 0x3E4CCCCD -glabel D_8098CB48 - .word 0x3E4CCCCD -glabel D_8098CB4C - .word 0x3C9374BC -glabel D_8098CB50 - .word 0x3C8EFA35 -glabel D_8098CB54 - .word 0x3E4CCCCD -glabel D_8098CB58 - .word 0x3CA3D70A -glabel D_8098CB5C - .word 0x3C8EFA35 - diff --git a/data/overlays/actors/z_demo_kekkai.rodata.s b/data/overlays/actors/z_demo_kekkai.rodata.s deleted file mode 100644 index 0fa67314c0..0000000000 --- a/data/overlays/actors/z_demo_kekkai.rodata.s +++ /dev/null @@ -1,75 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8098E1D0 - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E1E4 - .asciz "\"当ったよ\" = %s\n" - .balign 4 - -.balign 4 - -glabel D_8098E1F8 - .word 0xC5F6A4C3, 0xA4BFA4E8, 0x00000000 -glabel D_8098E204 - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E218 - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E22C - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E240 - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E254 - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E268 - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel D_8098E27C - .asciz "../z_demo_kekkai.c" - .balign 4 - -glabel jtbl_8098E290 -.word L8098D0F0 -.word L8098D148 -.word L8098D148 -.word L8098D148 -.word L8098D148 -.word L8098D148 -.word L8098D148 -glabel D_8098E2AC - .word 0x45BEA000 -glabel D_8098E2B0 - .word 0x459C4000 -glabel D_8098E2B4 - .word 0x477FFF00 -glabel D_8098E2B8 - .word 0x3E4CCCCD -glabel D_8098E2BC - .word 0x3B449BA6 -glabel D_8098E2C0 - .word 0x3F7D70A4 -glabel D_8098E2C4 - .word 0x3D4CCCCD -glabel D_8098E2C8 - .word 0x3A23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_sa.rodata.s b/data/overlays/actors/z_demo_sa.rodata.s deleted file mode 100644 index ce4c10206f..0000000000 --- a/data/overlays/actors/z_demo_sa.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80990DE0 - .asciz "../z_demo_sa_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80990E04 - .asciz "../z_demo_sa_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80990E28 - .asciz "Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80990E64 - .asciz "Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80990EA0 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80990EDC - .asciz "../z_demo_sa.c" - .balign 4 - -glabel D_80990EEC - .asciz "../z_demo_sa.c" - .balign 4 - -glabel D_80990EFC - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80990F34 - .word 0xC61C4000 -glabel D_80990F38 - .word 0x42A6AAAB, 0x00000000 - - diff --git a/data/overlays/actors/z_demo_shd.rodata.s b/data/overlays/actors/z_demo_shd.rodata.s deleted file mode 100644 index 78c1f2594a..0000000000 --- a/data/overlays/actors/z_demo_shd.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80993600 - .asciz "../z_demo_shd.c" - .balign 4 - -glabel D_80993610 - .asciz "../z_demo_shd.c" - .balign 4 - -glabel D_80993620 - .asciz "../z_demo_shd.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_door_gerudo.rodata.s b/data/overlays/actors/z_door_gerudo.rodata.s deleted file mode 100644 index 0f9815e841..0000000000 --- a/data/overlays/actors/z_door_gerudo.rodata.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80994B80 - - .asciz "../z_door_gerudo.c" - .balign 4 - -glabel D_80994B94 - - .asciz "../z_door_gerudo.c" - .balign 4 - -glabel D_80994BA8 - - .asciz "../z_door_gerudo.c" - .balign 4 - -glabel D_80994BBC - .word 0x7F7FFFFF -glabel D_80994BC0 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_door_killer.rodata.s b/data/overlays/actors/z_door_killer.rodata.s deleted file mode 100644 index ef914c539e..0000000000 --- a/data/overlays/actors/z_door_killer.rodata.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80996060 - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_80996070 - .word 0x73746174, 0x7573203D, 0x2025640A, 0x00000000 -glabel D_80996080 - .asciz "../z_door_killer.c" - .balign 4 - -glabel D_80996094 - .asciz "../z_door_killer.c" - .balign 4 - -glabel jtbl_809960A8 -.word L80994D4C -.word L80994E88 -.word L80994E88 -.word L80994E88 -.word L80994E88 -glabel D_809960BC - .word 0xBF19999A -glabel D_809960C0 - .word 0x40FC28F6 -glabel D_809960C4 - .word 0x421F3333 -glabel D_809960C8 - .word 0x417DC28F -glabel D_809960CC - .word 0x4277EB85 -glabel D_809960D0 - .word 0x406E147B -glabel D_809960D4 - .word 0x42AA3333 -glabel D_809960D8 - .word 0x3F7AE148 -glabel D_809960DC - .word 0x3DCCCCCD -glabel D_809960E0 - .word 0x3E4CCCCD -glabel jtbl_809960E4 -.word L80995DD8 -.word L80995DF4 -.word L80995DF4 -.word L80995DF4 -.word L80995DF4 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_door_shutter.rodata.s b/data/overlays/actors/z_door_shutter.rodata.s deleted file mode 100644 index 70f8df82e8..0000000000 --- a/data/overlays/actors/z_door_shutter.rodata.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809982F0 - .asciz "FHG SAKU START !!\n" - .balign 4 - -glabel D_80998304 - .asciz "FHG SAKU END !!\n" - .balign 4 - -glabel D_80998318 - .asciz "../z_door_shutter.c" - .balign 4 - -glabel D_8099832C - .asciz "../z_door_shutter.c" - .balign 4 - -glabel D_80998340 - .asciz "../z_door_shutter.c" - .balign 4 - -glabel D_80998354 - .asciz "../z_door_shutter.c" - .balign 4 - -glabel D_80998368 - .asciz "../z_door_shutter.c" - .balign 4 - -glabel D_8099837C - .asciz "../z_door_shutter.c" - .balign 4 - -glabel D_80998390 - .word 0x7F7FFFFF -glabel D_80998394 - .word 0x3C23D70A -glabel D_80998398 - .word 0x44542148 -glabel D_8099839C - .word 0x3F490FDB -glabel D_809983A0 - .word 0x44777C29 -glabel D_809983A4 - .word 0x3C23D70A -glabel D_809983A8 - .word 0x40490FDB -glabel D_809983AC - .word 0x40490FDB -glabel D_809983B0 - .word 0x3C23D70A -glabel D_809983B4 - .word 0x3C23D70A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_door_warp1.rodata.s b/data/overlays/actors/z_door_warp1.rodata.s index 2d2836dea1..c7ed8694cd 100644 --- a/data/overlays/actors/z_door_warp1.rodata.s +++ b/data/overlays/actors/z_door_warp1.rodata.s @@ -68,11 +68,17 @@ glabel jtbl_8099C6D0 glabel D_8099C6EC .word 0x3E6B851F glabel D_8099C6F0 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_8099C6F4 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_8099C6F8 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel jtbl_8099C6FC .word L80998B6C .word L80998B6C @@ -85,11 +91,17 @@ glabel jtbl_8099C6FC .word L80998B6C .word L80998B6C glabel D_8099C724 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_8099C728 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_8099C72C - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_8099C730 .word 0x3D4C63F1 glabel D_8099C734 @@ -97,19 +109,29 @@ glabel D_8099C734 glabel D_8099C738 .word 0x3DB851EC glabel D_8099C73C - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C740 .word 0xBDCCCCCD glabel D_8099C744 .word 0xBDCCCCCD glabel D_8099C748 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_8099C74C - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_8099C750 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_8099C754 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel jtbl_8099C758 .word L80999558 .word L80999548 @@ -129,51 +151,95 @@ glabel D_8099C78C glabel D_8099C790 .word 0xC549C000 glabel D_8099C794 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C798 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C79C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7A0 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7A4 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7A8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7AC - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7B0 - .word 0x3CA3D70A + .float 0.02 + .balign 4 + glabel D_8099C7B4 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7B8 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7BC - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7C0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7C4 .word 0x3C656041 glabel D_8099C7C8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7CC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7D0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7D4 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7D8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7DC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7E0 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099C7E4 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7E8 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_8099C7EC - .word 0x3FD9999A + .float 1.7 + .balign 4 + glabel jtbl_8099C7F0 .word L8099C550 .word L8099C520 diff --git a/data/overlays/actors/z_efc_erupc.rodata.s b/data/overlays/actors/z_efc_erupc.rodata.s deleted file mode 100644 index bc5ee49c6f..0000000000 --- a/data/overlays/actors/z_efc_erupc.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8099D790 - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D7A4 - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D7B8 - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D7CC - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D7E0 - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D7F4 - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D808 - .asciz "../z_efc_erupc.c" - .balign 4 - -glabel D_8099D81C - .word 0x3DCCCCCD -glabel D_8099D820 - .word 0x3F4CCCCD -glabel D_8099D824 - .word 0x4059999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_eff_dust.rodata.s b/data/overlays/actors/z_eff_dust.rodata.s deleted file mode 100644 index 73083b2baf..0000000000 --- a/data/overlays/actors/z_eff_dust.rodata.s +++ /dev/null @@ -1,73 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8099EB70 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel D_8099EB80 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel D_8099EB90 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel D_8099EBA0 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel D_8099EBB0 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel D_8099EBC0 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel D_8099EBD0 - .asciz "../z_eff_dust.c" - .balign 4 - -glabel jtbl_8099EBE0 -.word L8099D998 -.word L8099D9E4 -.word L8099DA30 -.word L8099DA6C -.word L8099DAA8 -glabel D_8099EBF4 - .word 0x3F4CCCCD -glabel D_8099EBF8 - .word 0x3DCCCCCD -glabel D_8099EBFC - .word 0x3F4CCCCD -glabel D_8099EC00 - .word 0x3D4CCCCD -glabel D_8099EC04 - .word 0x3CF5C28F -glabel D_8099EC08 - .word 0x3E4CCCCD -glabel D_8099EC0C - .word 0x3DCCCCCD -glabel D_8099EC10 - .word 0x453B8000 -glabel D_8099EC14 - .word 0x458CA000 -glabel D_8099EC18 - .word 0x451C4000 -glabel D_8099EC1C - .word 0x4604D000 -glabel D_8099EC20 - .word 0x44D48000 -glabel D_8099EC24 - .word 0x459C4000 -glabel D_8099EC28 - .word 0x3F59999A, 0x00000000 - - diff --git a/data/overlays/actors/z_elf_msg.rodata.s b/data/overlays/actors/z_elf_msg.rodata.s deleted file mode 100644 index b724c16ed5..0000000000 --- a/data/overlays/actors/z_elf_msg.rodata.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809AD500 - .asciz "../z_elf_msg.c" - .balign 4 - -glabel D_809AD510 - .asciz "\"共倒れ\" = %s\n" - .balign 4 - -glabel D_809AD520 - .word 0xB6A6C5DD, 0xA4EC0000 -glabel D_809AD528 - .asciz "../z_elf_msg.c" - .balign 4 - -glabel D_809AD538 - .asciz "\"共倒れ\" = %s\n" - .balign 4 - -glabel D_809AD548 - .word 0xB6A6C5DD, 0xA4EC0000 -glabel D_809AD550 - .asciz "\nエルフ タグ 消える条件 %d\n" - .balign 4 - -glabel D_809AD574 - .asciz "\nthisx->shape.angle.sy = %d\n" - .balign 4 - -glabel D_809AD59C - .asciz "\nエルフ タグ 出現条件 %d\n" - .balign 4 - -glabel D_809AD5C0 - .asciz "../z_elf_msg.c" - .balign 4 - -glabel D_809AD5D0 - .asciz "../z_elf_msg.c" - .balign 4 - -glabel D_809AD5E0 - .asciz "../z_elf_msg.c" - .balign 4 - -glabel D_809AD5F0 - .word 0x3ECCCCCD -glabel D_809AD5F4 - .word 0x3D23D70A -glabel D_809AD5F8 - .word 0x3ECCCCCD -glabel D_809AD5FC - .word 0x3D23D70A - - diff --git a/data/overlays/actors/z_elf_msg2.rodata.s b/data/overlays/actors/z_elf_msg2.rodata.s deleted file mode 100644 index b678631c65..0000000000 --- a/data/overlays/actors/z_elf_msg2.rodata.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809ADD40 - .asciz "../z_elf_msg2.c" - .balign 4 - -glabel D_809ADD50 - .asciz "\"共倒れ\" = %s\n" - .balign 4 - -glabel D_809ADD60 - .word 0xB6A6C5DD, 0xA4EC0000 -glabel D_809ADD68 - .asciz "../z_elf_msg2.c" - .balign 4 - -glabel D_809ADD78 - .asciz "\"共倒れ２\" = %s\n" - .balign 4 - -.balign 4 - -glabel D_809ADD8C - .word 0xB6A6C5DD, 0xA4ECA3B2, 0x00000000 -glabel D_809ADD98 - .asciz "../z_elf_msg2.c" - .balign 4 - -glabel D_809ADDA8 - .asciz "\"共倒れ\" = %s\n" - .balign 4 - -glabel D_809ADDB8 - .word 0xB6A6C5DD, 0xA4EC0000 -glabel D_809ADDC0 - .asciz " Elf_Msg2_Actor_ct %04x\n\n" - .balign 4 - -glabel D_809ADDE4 - .asciz "../z_elf_msg2.c" - .balign 4 - -glabel D_809ADDF4 - .asciz "../z_elf_msg2.c" - .balign 4 - -glabel D_809ADE04 - .word 0x2E2E2F7A, 0x5F656C66, 0x5F6D7367, 0x322E6300, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_am.rodata.s b/data/overlays/actors/z_en_am.rodata.s deleted file mode 100644 index 5b3cfc3d3d..0000000000 --- a/data/overlays/actors/z_en_am.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809B0160 - .asciz "../z_en_am.c" - .balign 4 - -glabel D_809B0170 - .asciz "../z_en_am.c" - .balign 4 - -glabel D_809B0180 - .word 0x458CA000 -glabel D_809B0184 - .word 0x3FB33333, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_anubice.rodata.s b/data/overlays/actors/z_en_anubice.rodata.s deleted file mode 100644 index 82aff3f46d..0000000000 --- a/data/overlays/actors/z_en_anubice.rodata.s +++ /dev/null @@ -1,59 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809B2340 - .word 0x0A0A0000 -glabel D_809B2344 - .asciz "☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809B2374 - .asciz "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809B23A4 - .asciz "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_809B23D4 - .asciz "../z_en_anubice.c" - .balign 4 - -glabel D_809B23E8 - .asciz "../z_en_anubice.c" - .balign 4 - -glabel D_809B23FC - .asciz "../z_en_anubice.c" - .balign 4 - -glabel D_809B2410 - .word 0x44BB8000 -glabel D_809B2414 - .word 0x4622F983 -glabel D_809B2418 - .word 0x4622F983 -glabel D_809B241C - .word 0xC5843000 -glabel D_809B2420 - .word 0xC583E000 -glabel D_809B2424 - .word 0xC5843000 -glabel D_809B2428 - .word 0xC62BE000 -glabel D_809B242C - .word 0xC53B8000 -glabel D_809B2430 - .word 0x40490FDB -glabel D_809B2434 - .word 0x40490FDB -glabel D_809B2438 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_anubice_fire.rodata.s b/data/overlays/actors/z_en_anubice_fire.rodata.s deleted file mode 100644 index 376c2dc84e..0000000000 --- a/data/overlays/actors/z_en_anubice_fire.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809B3290 - .asciz "../z_en_anubice_fire.c" - .balign 4 - -glabel D_809B32A8 - .asciz "../z_en_anubice_fire.c" - .balign 4 - -glabel D_809B32C0 - .asciz "../z_en_anubice_fire.c" - .balign 4 - -glabel D_809B32D8 - .word 0x40490FDB -glabel D_809B32DC - .word 0x40490FDB -glabel D_809B32E0 - .word 0x3DCCCCCD -glabel D_809B32E4 - .word 0x3ECCCCCD -glabel D_809B32E8 - .word 0x3F19999A -glabel D_809B32EC - .word 0x3E4CCCCD -glabel D_809B32F0 - .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_arrow.rodata.s b/data/overlays/actors/z_en_arrow.rodata.s deleted file mode 100644 index 8097775e60..0000000000 --- a/data/overlays/actors/z_en_arrow.rodata.s +++ /dev/null @@ -1,56 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809B4EB0 - .asciz "../z_en_arrow.c" - .balign 4 - -glabel D_809B4EC0 - .asciz "this->at_info.cl_elem.at_btl_info.at_type = %x\n" - .balign 4 - -glabel D_809B4EF0 - .asciz "../z_en_arrow.c" - .balign 4 - -glabel D_809B4F00 - .asciz "../z_en_arrow.c" - .balign 4 - -glabel D_809B4F10 - .asciz "../z_en_arrow.c" - .balign 4 - -glabel jtbl_809B4F20 -.word L809B3C50 -.word L809B3C50 -.word L809B3C50 -.word L809B3C64 -.word L809B3C64 -.word L809B3C64 -.word L809B3C70 -.word L809B3C70 -.word L809B3C70 -.word L809B3C3C -glabel D_809B4F48 - .word 0x3ECCCCCD -glabel D_809B4F4C - .word 0x3D23D70A -glabel D_809B4F50 - .word 0x3E99999A -glabel D_809B4F54 - .word 0x40E66667 -glabel D_809B4F58 - .word 0xBECCCCCD -glabel D_809B4F5C - .word 0x38C90FDB -glabel D_809B4F60 - .word 0x38C90FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_attack_niw.rodata.s b/data/overlays/actors/z_en_attack_niw.rodata.s deleted file mode 100644 index c181aeb9e1..0000000000 --- a/data/overlays/actors/z_en_attack_niw.rodata.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809B6190 - .word 0x476A6000 -glabel D_809B6194 - .word 0xC61C4000 -glabel jtbl_809B6198 -.word L809B5348 -.word L809B5354 -.word L809B5388 -.word L809B53E8 -.word L809B541C -.word L809B5430 -glabel D_809B61B0 - .word 0x45DAC000 -glabel D_809B61B4 - .word 0x45DAC000 -glabel D_809B61B8 - .word 0x46C35000 -glabel D_809B61BC - .word 0x45BB8000 -glabel D_809B61C0 - .word 0xC61C4000 -glabel D_809B61C4 - .word 0xC61C4000 -glabel D_809B61C8 - .word 0x461C4000 -glabel D_809B61CC - .word 0x453B8000 -glabel D_809B61D0 - .word 0x465AC000 -glabel D_809B61D4 - .word 0x461C4000 -glabel D_809B61D8 - .word 0x453B8000 -glabel D_809B61DC - .word 0xBE4CCCCD -glabel D_809B61E0 - .word 0xBE4CCCCD -glabel D_809B61E4 - .word 0xC61C4000 -glabel D_809B61E8 - .word 0xC53B8000 -glabel D_809B61EC - .word 0x465AC000 -glabel D_809B61F0 - .word 0x459C4000 -glabel D_809B61F4 - .word 0x459C4000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ba.rodata.s b/data/overlays/actors/z_en_ba.rodata.s deleted file mode 100644 index 81c56cdbe2..0000000000 --- a/data/overlays/actors/z_en_ba.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809B8130 - .asciz "../z_en_ba.c" - .balign 4 - -glabel D_809B8140 - .asciz "../z_en_ba.c" - .balign 4 - -glabel D_809B8150 - .asciz "../z_en_ba.c" - .balign 4 - -glabel D_809B8160 - .asciz "../z_en_ba.c" - .balign 4 - -glabel D_809B8170 - .asciz "../z_en_ba.c" - .balign 4 - -glabel D_809B8180 - .word 0x477FFF00 -glabel D_809B8184 - .word 0x3A03126F -glabel D_809B8188 - .word 0x3A83126F, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bb.rodata.s b/data/overlays/actors/z_en_bb.rodata.s deleted file mode 100644 index 0b65052195..0000000000 --- a/data/overlays/actors/z_en_bb.rodata.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809BBC30 - .asciz "../z_en_bb.c" - .balign 4 - -glabel D_809BBC40 - .asciz "../z_en_bb.c" - .balign 4 - -glabel D_809BBC50 - .asciz "../z_en_bb.c" - .balign 4 - -glabel D_809BBC60 - .word 0x3DC08312 -glabel D_809BBC64 - .word 0x3D99999A -glabel D_809BBC68 - .word 0x3F4CCCCD -glabel jtbl_809BBC6C -.word L809B882C -.word L809B8858 -.word L809B8764 -.word L809B872C -.word L809B86E4 -glabel D_809BBC80 - .word 0x3DCCCCCD -glabel D_809BBC84 - .word 0x3DCCCCCD -glabel D_809BBC88 - .word 0x44BB8000 -glabel D_809BBC8C - .word 0x3E4CCCCD -glabel D_809BBC90 - .word 0x477FFF00 -glabel D_809BBC94 - .word 0x3DCCCCCD -glabel D_809BBC98 - .word 0xBF333333 -glabel D_809BBC9C - .word 0xBF87AE14 -glabel D_809BBCA0 - .word 0x477FFF00 -glabel D_809BBCA4 - .word 0x3D4CCCCD -glabel D_809BBCA8 - .word 0x3C23D70A -glabel D_809BBCAC - .word 0x3DCCCCCD -glabel D_809BBCB0 - .word 0x3D4CCCCD -glabel D_809BBCB4 - .word 0x3C23D70A -glabel D_809BBCB8 - .word 0x3B03126F -glabel D_809BBCBC - .word 0x3D4CCCCD -glabel D_809BBCC0 - .word 0x3DCCCCCD -glabel D_809BBCC4 - .word 0x3DCCCCCD -glabel D_809BBCC8 - .word 0x44BB8000 -glabel D_809BBCCC - .word 0xBECCCCCD -glabel jtbl_809BBCD0 -.word L809BB034 -.word L809BB044 -.word L809BB024 -.word L809BB058 -.word L809BB058 -.word L809BB080 -.word L809BB080 -.word L809BB080 -.word L809BB268 -.word L809BB080 -.word L809BB058 -glabel D_809BBCFC - .word 0x3F4CCCCD -glabel D_809BBD00 - .word 0x38C90FDB -glabel D_809BBD04 - .word 0x3C23D70A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bdfire.rodata.s b/data/overlays/actors/z_en_bdfire.rodata.s deleted file mode 100644 index e9a379d418..0000000000 --- a/data/overlays/actors/z_en_bdfire.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809BCB30 - .word 0x504F5745, 0x520A0000 -glabel D_809BCB38 - .asciz "../z_en_bdfire.c" - .balign 4 - -glabel D_809BCB4C - .asciz "../z_en_bdfire.c" - .balign 4 - -glabel D_809BCB60 - .asciz "../z_en_bdfire.c" - .balign 4 - -glabel D_809BCB74 - .word 0x40333333 -glabel D_809BCB78 - .word 0x3F4CCCCD -glabel D_809BCB7C - .word 0x3F666667 -glabel D_809BCB80 - .word 0x3F19999A -glabel D_809BCB84 - .word 0x40866667 -glabel D_809BCB88 - .word 0xC4ADC000 -glabel D_809BCB8C - .word 0xC52F4000 -glabel D_809BCB90 - .word 0xC56DC000 -glabel D_809BCB94 - .word 0x40866667, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bigokuta.rodata.s b/data/overlays/actors/z_en_bigokuta.rodata.s deleted file mode 100644 index 004ae01c13..0000000000 --- a/data/overlays/actors/z_en_bigokuta.rodata.s +++ /dev/null @@ -1,89 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809BF4B0 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF4C4 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF4D8 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF4EC - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF500 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF514 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF528 - .word 0xC4802000 -glabel D_809BF52C - .word 0x43838000 -glabel D_809BF530 - .word 0x43838000 -glabel D_809BF534 - .word 0xC4802000 -glabel D_809BF538 - .word 0x43838000 -glabel D_809BF53C - .word 0x43838000 -glabel D_809BF540 - .word 0x3DE5C8FA -glabel D_809BF544 - .word 0x3E65C8FA -glabel D_809BF548 - .word 0x3EA0D97C -glabel D_809BF54C - .word 0x3F088889 -glabel D_809BF550 - .word 0x43838000 -glabel D_809BF554 - .word 0x3F8CCCCD -glabel D_809BF558 - .word 0x3F19999A -glabel D_809BF55C - .word 0x3E490FDB -glabel D_809BF560 - .word 0x3E490FDB -glabel D_809BF564 - .word 0x3EC90FDB -glabel D_809BF568 - .word 0x3E490FDB -glabel D_809BF56C - .word 0x3F490FDB -glabel D_809BF570 - .word 0x3EC90FDB -glabel D_809BF574 - .word 0x40D6BCA2 -glabel D_809BF578 - .word 0x3E4CCCCD -glabel D_809BF57C - .word 0x3DAAAAAB -glabel D_809BF580 - .word 0x40C90FDB -glabel D_809BF584 - .word 0x40C90FDB -glabel D_809BF588 - .word 0x3F4A3D70 -glabel D_809BF58C - .word 0x3FA66666 -glabel D_809BF590 - .word 0x45F17A2F, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bili.rodata.s b/data/overlays/actors/z_en_bili.rodata.s deleted file mode 100644 index 285e9c4d40..0000000000 --- a/data/overlays/actors/z_en_bili.rodata.s +++ /dev/null @@ -1,121 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C1710 - .asciz "../z_en_bili.c" - .balign 4 - -glabel D_809C1720 - .asciz "../z_en_bili.c" - .balign 4 - -glabel D_809C1730 - .word 0x3F333333 -glabel D_809C1734 - .word 0xBE99999A -glabel D_809C1738 - .word 0x3F99999A -glabel D_809C173C - .word 0x3F666666 -glabel D_809C1740 - .word 0x3F333333 -glabel D_809C1744 - .word 0x3E4CCCCD -glabel D_809C1748 - .word 0x3E490FDB -glabel D_809C174C - .word 0x44E38000 -glabel D_809C1750 - .word 0x3F333333 -glabel D_809C1754 - .word 0x3F060B41 -glabel D_809C1758 - .word 0x3E851EB8 -glabel D_809C175C - .word 0x3EC90FDB -glabel D_809C1760 - .word 0x3E19999A -glabel D_809C1764 - .word 0x3F59999A -glabel D_809C1768 - .word 0x3EA0D97C -glabel D_809C176C - .word 0x3E99999A -glabel D_809C1770 - .word 0x3E4CCCCD -glabel D_809C1774 - .word 0x3F4CCCCD -glabel D_809C1778 - .word 0x3D920D28 -glabel D_809C177C - .word 0x3E9EB852 -glabel D_809C1780 - .word 0x3ECCCCCD -glabel D_809C1784 - .word 0x3EA0D97C -glabel D_809C1788 - .word 0x3DA3D70A -glabel D_809C178C - .word 0x3EC90FDB -glabel D_809C1790 - .word 0x3E051EB8 -glabel D_809C1794 - .word 0x3F5EB852 -glabel D_809C1798 - .word 0x3F060B41 -glabel D_809C179C - .word 0x3E4CCCCD -glabel D_809C17A0 - .word 0x3EC90FDB -glabel D_809C17A4 - .word 0x3EA0D97C -glabel D_809C17A8 - .word 0x3E8CCCCD -glabel D_809C17AC - .word 0x3F79999A -glabel D_809C17B0 - .word 0x3D920D28 -glabel D_809C17B4 - .word 0x3E99999A -glabel D_809C17B8 - .word 0x3EF5C28F -glabel D_809C17BC - .word 0x3EA0D97C -glabel D_809C17C0 - .word 0x3DA3D70A -glabel D_809C17C4 - .word 0x3EC90FDB -glabel D_809C17C8 - .word 0x3F8CCCCD -glabel D_809C17CC - .word 0x3DCCCCCD -glabel D_809C17D0 - .word 0x3EC90FDB -glabel D_809C17D4 - .word 0x3E99999A -glabel D_809C17D8 - .word 0x3F333333 -glabel D_809C17DC - .word 0x3EA0D97C -glabel D_809C17E0 - .word 0x3EA66666 -glabel D_809C17E4 - .word 0x3F6CCCCD -glabel D_809C17E8 - .word 0x3F733333 -glabel D_809C17EC - .word 0x3F0CCCCD -glabel D_809C17F0 - .word 0x3D920D28 -glabel D_809C17F4 - .word 0x3ECCCCCD -glabel D_809C17F8 - .word 0x3F051EB8, 0x00000000 - - diff --git a/data/overlays/actors/z_en_blkobj.rodata.s b/data/overlays/actors/z_en_blkobj.rodata.s deleted file mode 100644 index 0e0362f009..0000000000 --- a/data/overlays/actors/z_en_blkobj.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C25B0 - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C25C4 - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C25D8 - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C25EC - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C2600 - .word 0x2E2E2F7A, 0x5F656E5F, 0x626C6B6F, 0x626A2E63, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bom.rodata.s b/data/overlays/actors/z_en_bom.rodata.s deleted file mode 100644 index e859ba52c3..0000000000 --- a/data/overlays/actors/z_en_bom.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C34D0 - .asciz "../z_en_bom.c" - .balign 4 - -glabel D_809C34E0 - .asciz "../z_en_bom.c" - .balign 4 - -glabel D_809C34F0 - .asciz "../z_en_bom.c" - .balign 4 - -glabel D_809C3500 - .asciz "../z_en_bom.c" - .balign 4 - -glabel D_809C3510 - .word 0x3F333333 -glabel D_809C3514 - .word 0xBE99999A -glabel D_809C3518 - .word 0xBF99999A -glabel D_809C351C - .word 0x3E4CCCCD -glabel D_809C3520 - .word 0x3E4CCCCD -glabel D_809C3524 - .word 0x3B03126F -glabel D_809C3528 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bom_bowl_man.rodata.s b/data/overlays/actors/z_en_bom_bowl_man.rodata.s deleted file mode 100644 index 3f4683d1d3..0000000000 --- a/data/overlays/actors/z_en_bom_bowl_man.rodata.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C4AC0 - .asciz "☆ もー 肩こっちゃうよねぇ〜 ☆ \n" - .balign 4 - -glabel D_809C4AF0 - .asciz "☆ もっとラクしてもうかるバイトないかしら？ ☆ %d\n" - .balign 4 - -glabel D_809C4B2C - .asciz "☆ game_play->bomchu_game_flag ☆ %d\n" - .balign 4 - -glabel D_809C4B5C - .asciz "☆ 壁１の状態どう？ ☆ %d\n" - .balign 4 - -glabel D_809C4B80 - .asciz "☆ 壁２の状態どう？ ☆ %d\n" - .balign 4 - -glabel D_809C4BA4 - .asciz "☆ 穴情報 ☆ %d\n" - .balign 4 - -glabel D_809C4BC4 - .word 0x0A0A0000 -glabel D_809C4BC8 - .asciz "☆☆☆☆☆ 中央ＨＩＴ！！！！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809C4BFC - .asciz "☆☆☆☆☆ ボムチュウ消化 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809C4C2C - .asciz "☆ わー ☆ %d\n" - .balign 4 - -glabel D_809C4C44 - .asciz "../z_en_bom_bowl_man.c" - .balign 4 - -glabel D_809C4C5C - .asciz "../z_en_bom_bowl_man.c" - .balign 4 - -glabel D_809C4C74 - .word 0x409FAE14 -glabel jtbl_809C4C78 -.word L809C4468 -.word L809C448C -.word L809C4498 -.word L809C44A4 -.word L809C44C8 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_bom_bowl_pit.rodata.s b/data/overlays/actors/z_en_bom_bowl_pit.rodata.s deleted file mode 100644 index ec8ce6d546..0000000000 --- a/data/overlays/actors/z_en_bom_bowl_pit.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C5720 - .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809C574C - .asciz "☆☆☆☆☆ あぁ回復！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809C5778 - .word 0x3DCCCCCD -glabel D_809C577C - .word 0x3CA3D70A -glabel D_809C5780 - .word 0xC3F28000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bom_chu.rodata.s b/data/overlays/actors/z_en_bom_chu.rodata.s deleted file mode 100644 index 7e6cab6e36..0000000000 --- a/data/overlays/actors/z_en_bom_chu.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C6DA0 - .asciz "../z_en_bom_chu.c" - .balign 4 - -glabel D_809C6DB4 - .asciz "../z_en_bom_chu.c" - .balign 4 - -glabel D_809C6DC8 - .asciz "../z_en_bom_chu.c" - .balign 4 - -glabel D_809C6DDC - .word 0x38000100 -glabel D_809C6DE0 - .word 0x3A83126F -glabel D_809C6DE4 - .word 0x3A83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bombf.rodata.s b/data/overlays/actors/z_en_bombf.rodata.s deleted file mode 100644 index a8fba71647..0000000000 --- a/data/overlays/actors/z_en_bombf.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809C8300 - .asciz "../z_en_bombf.c" - .balign 4 - -glabel D_809C8310 - .asciz "../z_en_bombf.c" - .balign 4 - -glabel D_809C8320 - .asciz "../z_en_bombf.c" - .balign 4 - -glabel D_809C8330 - .asciz "../z_en_bombf.c" - .balign 4 - -glabel D_809C8340 - .asciz "../z_en_bombf.c" - .balign 4 - -glabel D_809C8350 - .word 0x461C4000 -glabel D_809C8354 - .word 0x46F23000 -glabel D_809C8358 - .word 0x3D4CCCCD -glabel D_809C835C - .word 0x3F333333 -glabel D_809C8360 - .word 0x3E4CCCCD -glabel D_809C8364 - .word 0x3B03126F -glabel D_809C8368 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_box.rodata.s b/data/overlays/actors/z_en_box.rodata.s deleted file mode 100644 index 5430b30396..0000000000 --- a/data/overlays/actors/z_en_box.rodata.s +++ /dev/null @@ -1,73 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809CA830 - .asciz "Actor_Environment_Tbox_On() %d\n" - .balign 4 - -glabel D_809CA850 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA860 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA870 - .asciz "gfxp != NULL" - .balign 4 - -glabel D_809CA880 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA890 - .asciz "gfxp != NULL" - .balign 4 - -glabel D_809CA8A0 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA8B0 - .asciz "gfxp != NULL" - .balign 4 - -glabel D_809CA8C0 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA8D0 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA8E0 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA8F0 - .word 0x3F0CCCCD -glabel D_809CA8F4 - .word 0x3F266666 -glabel D_809CA8F8 - .word 0x46AFC800 -glabel D_809CA8FC - .word 0x387BA882 -glabel D_809CA900 - .word 0x3E99999A -glabel D_809CA904 - .word 0x3F4CCCCD -glabel D_809CA908 - .word 0x3FE66666 -glabel D_809CA90C - .word 0x3FCCCCCD -glabel D_809CA910 - .word 0x3FE66666, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_brob.rodata.s b/data/overlays/actors/z_en_brob.rodata.s deleted file mode 100644 index 6f4b5ddaa6..0000000000 --- a/data/overlays/actors/z_en_brob.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809CBAC0 - .word 0x3D088889 -glabel D_809CBAC4 - .word 0x3D888889 -glabel D_809CBAC8 - .word 0x463B8000 -glabel D_809CBACC - .word 0x449C4000 -glabel D_809CBAD0 - .word 0x45ABE000 -glabel D_809CBAD4 - .word 0x45ABE000 -glabel D_809CBAD8 - .word 0x466A6000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bubble.rodata.s b/data/overlays/actors/z_en_bubble.rodata.s deleted file mode 100644 index 79e4d3a2ba..0000000000 --- a/data/overlays/actors/z_en_bubble.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809CCEB0 - .asciz "../z_en_bubble.c" - .balign 4 - -glabel D_809CCEC4 - .asciz "../z_en_bubble.c" - .balign 4 - -glabel D_809CCED8 - .asciz "../z_en_bubble.c" - .balign 4 - -glabel D_809CCEEC - .word 0x3DA3D70A -glabel D_809CCEF0 - .word 0x3DCCCCCD -glabel D_809CCEF4 - .word 0x3DAAAAAB -glabel D_809CCEF8 - .word 0x3DCCCCCD -glabel D_809CCEFC - .word 0x38000100 -glabel D_809CCF00 - .word 0x40666667 -glabel D_809CCF04 - .word 0x3EF5C28F -glabel D_809CCF08 - .word 0x40666667 -glabel D_809CCF0C - .word 0x3EF5C28F -glabel D_809CCF10 - .word 0x3EF5C28F -glabel D_809CCF14 - .word 0x3C8EFA35 -glabel D_809CCF18 - .word 0x3C8EFA35 -glabel D_809CCF1C - .word 0x3E4CCCCD - - diff --git a/data/overlays/actors/z_en_butte.rodata.s b/data/overlays/actors/z_en_butte.rodata.s deleted file mode 100644 index 5151b1e395..0000000000 --- a/data/overlays/actors/z_en_butte.rodata.s +++ /dev/null @@ -1,69 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809CE420 - .asciz "../z_en_choo.c" - .balign 4 - -glabel D_809CE430 - .asciz "../z_en_choo.c" - .balign 4 - -glabel D_809CE440 - .asciz "../z_en_choo.c" - .balign 4 - -glabel D_809CE450 - .asciz "(field keep 蝶)(%x)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_809CE478 - .word 0x3F19999A -glabel D_809CE47C - .word 0x3B449BA6 -glabel D_809CE480 - .word 0x38C90FDB -glabel D_809CE484 - .word 0x38C90FDB -glabel D_809CE488 - .word 0x38C90FDB -glabel D_809CE48C - .word 0x477FFF00 -glabel D_809CE490 - .word 0x477FFF00 -glabel D_809CE494 - .word 0x477FFF00 -glabel D_809CE498 - .word 0x461C4000 -glabel D_809CE49C - .word 0x44992000 -glabel D_809CE4A0 - .word 0x3E99999A -glabel D_809CE4A4 - .word 0x3ECCCCCD -glabel D_809CE4A8 - .word 0x3E4CCCCD -glabel D_809CE4AC - .word 0x3E19999A -glabel D_809CE4B0 - .word 0x3E99999A -glabel D_809CE4B4 - .word 0x3E99999A -glabel D_809CE4B8 - .word 0x3E4CCCCD -glabel D_809CE4BC - .word 0x3E19999A -glabel D_809CE4C0 - .word 0x3E99999A -glabel D_809CE4C4 - .word 0x3FE66666 -glabel D_809CE4C8 - .word 0x459C4000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bw.rodata.s b/data/overlays/actors/z_en_bw.rodata.s deleted file mode 100644 index ca98ca9b6b..0000000000 --- a/data/overlays/actors/z_en_bw.rodata.s +++ /dev/null @@ -1,182 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809D1560 - .asciz "../z_en_bw.c" - .balign 4 - -glabel D_809D1570 - .asciz "../z_en_bw.c" - .balign 4 - -glabel D_809D1580 - .asciz "../z_en_bw.c" - .balign 4 - -glabel D_809D1590 - .asciz "../z_en_bw.c" - .balign 4 - -glabel D_809D15A0 - .word 0x3F19999A -glabel D_809D15A4 - .word 0x3A83126F -glabel D_809D15A8 - .word 0x3BE56041 -glabel D_809D15AC - .word 0x3C54FDF4 -glabel D_809D15B0 - .word 0x3A83126F -glabel D_809D15B4 - .word 0x3C54FDF4 -glabel D_809D15B8 - .word 0x3BE56041 -glabel D_809D15BC - .word 0x3A83126F -glabel D_809D15C0 - .word 0x3BE56041 -glabel D_809D15C4 - .word 0x3C54FDF4 -glabel D_809D15C8 - .word 0x3DCCCCCD -glabel D_809D15CC - .word 0x3F4CCCCD -glabel D_809D15D0 - .word 0x3DCCCCCD -glabel D_809D15D4 - .word 0x3B83126F -glabel D_809D15D8 - .word 0x3C54FDF4 -glabel D_809D15DC - .word 0x3B83126F -glabel D_809D15E0 - .word 0x3C54FDF4 -glabel D_809D15E4 - .word 0x3B83126F -glabel D_809D15E8 - .word 0x3C54FDF4 -glabel D_809D15EC - .word 0x4622F983 -glabel jtbl_809D15F0 -.word L809CEEB0 -.word L809CEEC0 -.word L809CEF60 -.word L809CEF70 -.word L809CEF7C -.word L809CEF8C -.word L809CEF9C -.word L809CEF98 -glabel D_809D1610 - .word 0x4622F983 -glabel D_809D1614 - .word 0x3F19999A -glabel D_809D1618 - .word 0x3A83126F -glabel D_809D161C - .word 0x3C54FDF4 -glabel D_809D1620 - .word 0x3B656041 -glabel D_809D1624 - .word 0x3A83126F -glabel D_809D1628 - .word 0x3CC8B439 -glabel D_809D162C - .word 0x3C54FDF4 -glabel D_809D1630 - .word 0x3A83126F -glabel D_809D1634 - .word 0x3C54FDF4 -glabel D_809D1638 - .word 0x3B656041 -glabel D_809D163C - .word 0x3A83126F -glabel D_809D1640 - .word 0x3C54FDF4 -glabel D_809D1644 - .word 0x3B656041 -glabel D_809D1648 - .word 0x3A83126F -glabel D_809D164C - .word 0x3CC8B439 -glabel D_809D1650 - .word 0x3C54FDF4 -glabel D_809D1654 - .word 0x3A83126F -glabel D_809D1658 - .word 0x3C54FDF4 -glabel D_809D165C - .word 0x3B656041 -glabel D_809D1660 - .word 0x3F333333 -glabel D_809D1664 - .word 0x3A83126F -glabel D_809D1668 - .word 0x3BE56041 -glabel D_809D166C - .word 0x3C54FDF4 -glabel D_809D1670 - .word 0x3A83126F -glabel D_809D1674 - .word 0x3C54FDF4 -glabel D_809D1678 - .word 0x3BE56041 -glabel D_809D167C - .word 0x3A83126F -glabel D_809D1680 - .word 0x3BE56041 -glabel D_809D1684 - .word 0x3C54FDF4 -glabel D_809D1688 - .word 0x3951B717 -glabel D_809D168C - .word 0x3F333333 -glabel D_809D1690 - .word 0x3F333333 -glabel D_809D1694 - .word 0x3C1374BC -glabel D_809D1698 - .word 0x3C1374BC -glabel D_809D169C - .word 0x3C1374BC -glabel D_809D16A0 - .word 0xBD99999A -glabel D_809D16A4 - .word 0x3ECCCCCD -glabel D_809D16A8 - .word 0xBDCCCCCD -glabel D_809D16AC - .word 0xBDCCCCCD -glabel D_809D16B0 - .word 0x3ECCCCCD -glabel D_809D16B4 - .word 0x3DEB851F -glabel D_809D16B8 - .word 0x3E051EB8 -glabel D_809D16BC - .word 0x3DCCCCCD -glabel D_809D16C0 - .word 0x3DCCCCCD -glabel D_809D16C4 - .word 0x3E051EB8 -glabel D_809D16C8 - .word 0x3DEB851F -glabel D_809D16CC - .word 0x48B71B00 -glabel D_809D16D0 - .word 0x48127C00 -glabel D_809D16D4 - .word 0x49064700 -glabel D_809D16D8 - .word 0x3C54FDF4 -glabel D_809D16DC - .word 0x3C23D70A -glabel D_809D16E0 - .word 0x3FA66666, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_bx.rodata.s b/data/overlays/actors/z_en_bx.rodata.s deleted file mode 100644 index 6ef8342fb9..0000000000 --- a/data/overlays/actors/z_en_bx.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809D2570 - .asciz "../z_en_bx.c" - .balign 4 - -glabel D_809D2580 - .asciz "../z_en_bx.c" - .balign 4 - -glabel D_809D2590 - .asciz "../z_en_bx.c" - .balign 4 - -glabel D_809D25A0 - .asciz "../z_en_bx.c" - .balign 4 - -glabel D_809D25B0 - .word 0x3C23D70A -glabel D_809D25B4 - .word 0x3CF5C28F -glabel D_809D25B8 - .word 0x3BF5C28F -glabel D_809D25BC - .word 0x3C75C28F - - diff --git a/data/overlays/actors/z_en_changer.rodata.s b/data/overlays/actors/z_en_changer.rodata.s deleted file mode 100644 index 77d279f5d2..0000000000 --- a/data/overlays/actors/z_en_changer.rodata.s +++ /dev/null @@ -1,85 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809D3180 - .word 0x0A0A0000 -glabel D_809D3184 - .asciz "☆☆☆☆☆ 宝発生(部屋はどれ？) %d\n" - .balign 4 - -glabel D_809D31B0 - .asciz "☆☆☆☆☆ ビットは？ %x\n" - .balign 4 - -glabel D_809D31D8 - .asciz "☆☆☆☆☆ セーブＢＩＴは？ %x\n" - .balign 4 - -glabel D_809D3204 - .asciz "☆☆☆☆☆ もう、ゾンビ？ %d\n" - .balign 4 - -glabel D_809D3230 - .word 0x0A0A0000 -glabel D_809D3234 - .asciz "☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_809D3270 - .asciz "☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_809D32B4 - .asciz "☆☆☆☆☆ 部屋番号は？ %x\n" - .balign 4 - -glabel D_809D32DC - .asciz "☆☆☆☆☆ ビットはなぁに？ %x\n" - .balign 4 - -glabel D_809D3308 - .asciz "☆☆☆☆☆ すけすけ君？ %x\n" - .balign 4 - -glabel D_809D332C - .word 0x0A0A0000 -glabel D_809D3330 - .asciz "☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_809D3374 - .asciz "☆☆☆☆☆ 部屋番号は？ %d\n" - .balign 4 - -glabel D_809D339C - .asciz "☆☆☆☆☆ ビットはなぁに？ %x\n" - .balign 4 - -glabel D_809D33C8 - .asciz "☆☆☆☆☆ すけすけ君？ %x\n" - .balign 4 - -glabel D_809D33EC - .word 0x0A0A0000 -glabel D_809D33F0 - .asciz "☆☆☆☆☆ 右宝開く ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809D341C - .asciz "☆☆☆☆☆ 左宝開く ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809D3448 - .word 0xC51C4000 -glabel D_809D344C - .word 0xC51C4000 -glabel D_809D3450 - .word 0x3FFEB852, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_clear_tag.rodata.s b/data/overlays/actors/z_en_clear_tag.rodata.s deleted file mode 100644 index 3f6dda880d..0000000000 --- a/data/overlays/actors/z_en_clear_tag.rodata.s +++ /dev/null @@ -1,120 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809DBFA0 - .asciz "DEMO_MODE %d\n" - .balign 4 - -glabel D_809DBFB0 - .asciz "CAMERA_NO %d\n" - .balign 4 - -glabel D_809DBFC0 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DBFD4 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DBFE8 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DBFFC - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC010 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC024 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC038 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC04C - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC060 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC074 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC088 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC09C - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC0B0 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC0C4 - .asciz "../z_en_clear_tag.c" - .balign 4 - -glabel D_809DC0D8 - .word 0x40C90FDB -glabel D_809DC0DC - .word 0x40C90FDB -glabel D_809DC0E0 - .word 0x3E19999A -glabel D_809DC0E4 - .word 0x3ECCCCCD -glabel D_809DC0E8 - .word 0x38000100 -glabel D_809DC0EC - .word 0x40C90FDB -glabel D_809DC0F0 - .word 0x4622F983 -glabel D_809DC0F4 - .word 0x4622F983 -glabel D_809DC0F8 - .word 0x3E4CCCCD -glabel D_809DC0FC - .word 0x3FD33333 -glabel D_809DC100 - .word 0x3E99999A -glabel D_809DC104 - .word 0x3E99999A -glabel D_809DC108 - .word 0x3E19999A -glabel D_809DC10C - .word 0x3D99999A -glabel D_809DC110 - .word 0x3D4CCCCD -glabel D_809DC114 - .word 0x3FA66666 -glabel D_809DC118 - .word 0x3F933333 -glabel D_809DC11C - .word 0x3EB33333 -glabel D_809DC120 - .word 0x40490FDB -glabel D_809DC124 - .word 0x40490FDB -glabel D_809DC128 - .word 0x40490FDB -glabel D_809DC12C - .word 0x3D4CCCCD -glabel D_809DC130 - .word 0x3EB33333, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_cow.rodata.s b/data/overlays/actors/z_en_cow.rodata.s deleted file mode 100644 index c678d0f51f..0000000000 --- a/data/overlays/actors/z_en_cow.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809E0120 - .word 0x3C23D70A -glabel D_809E0124 - .word 0x3C23D70A -glabel D_809E0128 - .word 0x3C23D70A -glabel D_809E012C - .word 0x3C23D70A -glabel D_809E0130 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_crow.rodata.s b/data/overlays/actors/z_en_crow.rodata.s deleted file mode 100644 index 8492135c32..0000000000 --- a/data/overlays/actors/z_en_crow.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809E16F0 - .word 0x3F59999A -glabel D_809E16F4 - .word 0x3E19999A -glabel D_809E16F8 - .word 0x3CF5C28F -glabel D_809E16FC - .word 0x3DCCCCCD -glabel D_809E1700 - .word 0x3DCCCCCD -glabel D_809E1704 - .word 0x461C4000 -glabel D_809E1708 - .word 0x3BC49BA6 -glabel D_809E170C - .word 0x3B03126F -glabel D_809E1710 - .word 0x3CF5C28F -glabel D_809E1714 - .word 0x3C23D70A -glabel D_809E1718 - .word 0x3DCCCCCD -glabel D_809E171C - .word 0x3F490FDB -glabel D_809E1720 - .word 0x3F490FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_cs.rodata.s b/data/overlays/actors/z_en_cs.rodata.s deleted file mode 100644 index 3d1da35ca3..0000000000 --- a/data/overlays/actors/z_en_cs.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809E2980 - .asciz "../z_en_cs.c" - .balign 4 - -glabel D_809E2990 - .asciz "../z_en_cs.c" - .balign 4 - -glabel D_809E29A0 - .asciz "../z_en_cs.c" - .balign 4 - -glabel jtbl_809E29B0 -.word L809E1CA4 -.word L809E1CA4 -.word L809E1CA4 -.word L809E1CA4 -.word L809E1BD4 -.word L809E1CA4 -.word L809E1C3C -glabel D_809E29CC - .word 0x4622F983 -glabel D_809E29D0 - .word 0x41270A3D -glabel D_809E29D4 - .word 0x3FDF66F3, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_daiku.rodata.s b/data/overlays/actors/z_en_daiku.rodata.s deleted file mode 100644 index e993a2cfed..0000000000 --- a/data/overlays/actors/z_en_daiku.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809E4170 - .asciz "../z_en_daiku.c" - .balign 4 - -glabel D_809E4180 - .asciz "../z_en_daiku.c" - .balign 4 - -glabel D_809E4190 - .asciz "../z_en_daiku.c" - .balign 4 - -glabel D_809E41A0 - .asciz "../z_en_daiku.c" - .balign 4 - -glabel D_809E41B0 - .word 0x4622F983 -glabel D_809E41B4 - .word 0x38C90FDB -glabel D_809E41B8 - .word 0x38C90FDB -glabel D_809E41BC - .word 0x4622F983 -glabel D_809E41C0 - .word 0x4622F983 -glabel D_809E41C4 - .word 0x41A70A3D, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_daiku_kakariko.rodata.s b/data/overlays/actors/z_en_daiku_kakariko.rodata.s deleted file mode 100644 index f034ef0c10..0000000000 --- a/data/overlays/actors/z_en_daiku_kakariko.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809E55A0 - .word 0x3C25643E, 0x0A000000 -glabel D_809E55A8 - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -glabel D_809E55C4 - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -glabel D_809E55E0 - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -glabel D_809E55FC - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -glabel D_809E5618 - .word 0x4622F983 -glabel D_809E561C - .word 0x38C90FDB -glabel D_809E5620 - .word 0x38C90FDB -glabel D_809E5624 - .word 0x38C90FDB -glabel D_809E5628 - .word 0x38C90FDB -glabel D_809E562C - .word 0x38C90FDB -glabel D_809E5630 - .word 0x38C90FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dekubaba.rodata.s b/data/overlays/actors/z_en_dekubaba.rodata.s deleted file mode 100644 index 2cc167e984..0000000000 --- a/data/overlays/actors/z_en_dekubaba.rodata.s +++ /dev/null @@ -1,121 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809E9040 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9054 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9068 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E907C - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9090 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E90A4 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E90B8 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E90CC - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E90E0 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E90F4 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9108 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E911C - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9130 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9144 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9158 - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E916C - .asciz "../z_en_dekubaba.c" - .balign 4 - -glabel D_809E9180 - .word 0x3C23D70A -glabel D_809E9184 - .word 0x3D888889 -glabel D_809E9188 - .word 0x3C23D70A -glabel D_809E918C - .word 0xBF4CCCCD -glabel D_809E9190 - .word 0x3C23D70A -glabel D_809E9194 - .word 0x3F333333 -glabel D_809E9198 - .word 0x3D888889 -glabel D_809E919C - .word 0x40490FDB -glabel D_809E91A0 - .word 0x3C23D70A -glabel D_809E91A4 - .word 0x3D088889 -glabel D_809E91A8 - .word 0x3F333333 -glabel D_809E91AC - .word 0x3D072B02 -glabel D_809E91B0 - .word 0x40490FDB -glabel D_809E91B4 - .word 0x3F4CCCCD -glabel D_809E91B8 - .word 0x3DCCCCCD -glabel D_809E91BC - .word 0x3BA3D70A -glabel D_809E91C0 - .word 0x3DCCCCCD -glabel D_809E91C4 - .word 0x3C23D70A -glabel D_809E91C8 - .word 0x3C23D70A -glabel D_809E91CC - .word 0x3C23D70A -glabel D_809E91D0 - .word 0x3E19999A -glabel D_809E91D4 - .word 0x3C23D70A -glabel D_809E91D8 - .word 0x38C90FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dekunuts.rodata.s b/data/overlays/actors/z_en_dekunuts.rodata.s deleted file mode 100644 index 12f0290b0f..0000000000 --- a/data/overlays/actors/z_en_dekunuts.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809EABC0 - .word 0x3DAA9931 -glabel D_809EABC4 - .word 0x3DEF0069 -glabel D_809EABC8 - .word 0x3FD9999A -glabel D_809EABCC - .word 0x3F333333 -glabel D_809EABD0 - .word 0x3E2AB368, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dh.rodata.s b/data/overlays/actors/z_en_dh.rodata.s deleted file mode 100644 index 90bec8a626..0000000000 --- a/data/overlays/actors/z_en_dh.rodata.s +++ /dev/null @@ -1,50 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809EC680 - .asciz "../z_en_dh.c" - .balign 4 - -glabel D_809EC690 - .asciz "../z_en_dh.c" - .balign 4 - -glabel D_809EC6A0 - .asciz "../z_en_dh.c" - .balign 4 - -glabel D_809EC6B0 - .word 0x40C8F5C3 -glabel D_809EC6B4 - .word 0xC66A6000 -glabel D_809EC6B8 - .word 0x40033333 -glabel D_809EC6BC - .word 0x3F99999A -glabel jtbl_809EC6C0 -.word L809EB730 -.word L809EB708 -.word L809EB750 -.word L809EB81C -.word L809EB918 -.word L809EB910 -glabel D_809EC6D8 - .word 0x40033333 -glabel D_809EC6DC - .word 0x3F99999A -glabel D_809EC6E0 - .word 0x3F19999A -glabel D_809EC6E4 - .word 0x3E19999A -glabel D_809EC6E8 - .word 0x389D4952 -glabel D_809EC6EC - .word 0x3C23D70A - - diff --git a/data/overlays/actors/z_en_dha.rodata.s b/data/overlays/actors/z_en_dha.rodata.s deleted file mode 100644 index d6fa768d85..0000000000 --- a/data/overlays/actors/z_en_dha.rodata.s +++ /dev/null @@ -1,17 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809ED780 - .word 0x44E38000 -glabel D_809ED784 - .word 0xC63B8000 -glabel D_809ED788 - .word 0x461C4000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_diving_game.rodata.s b/data/overlays/actors/z_en_diving_game.rodata.s deleted file mode 100644 index 3cd7615c2f..0000000000 --- a/data/overlays/actors/z_en_diving_game.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809EF0F0 - .asciz "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_809EF120 - .asciz "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_809EF150 - .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_809EF17C - .asciz "../z_en_diving_game.c" - .balign 4 - -glabel D_809EF194 - .asciz "../z_en_diving_game.c" - .balign 4 - -glabel D_809EF1AC - .word 0x3C23D70A -glabel D_809EF1B0 - .word 0x3C54FDF3 -glabel D_809EF1B4 - .word 0x3C656041 -glabel D_809EF1B8 - .word 0x455AC000 -glabel D_809EF1BC - .word 0x3DCCCCCD -glabel D_809EF1C0 - .word 0x3D23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dns.rodata.s b/data/overlays/actors/z_en_dns.rodata.s deleted file mode 100644 index 24599159c5..0000000000 --- a/data/overlays/actors/z_en_dns.rodata.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809F0560 - .word 0xA5C7A5AF, 0xA4CEBCC2, 0xC7E4A4EA, 0x20202020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F057C - .word 0xA5C7A5AF, 0xA4CECBC0, 0xC7E4A4EA, 0x20202020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F0598 - .word 0xA5CFA1BC, 0xA5C8A4CE, 0xB7E7CAD2, 0xC7E4A4EA, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F05B4 - .word 0xA5C7A5AF, 0xA4CEBCEF, 0xC7E4A4EA, 0x20202020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F05D0 - .word 0xA5C7A5AF, 0xA4CEBDE2, 0xC7E4A4EA, 0x20202020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F05EC - .word 0xA5D0A5AF, 0xA5C0A5F3, 0xC7E4A4EA, 0x20202020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F0608 - .word 0xCCF0C7E4, 0xA4EA2020, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F0624 - .word 0xC0D6A4CE, 0xA4AFA4B9, 0xA4EAC7E4, 0xA4EA2020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F0640 - .word 0xCED0A4CE, 0xA4AFA4B9, 0xA4EAC7E4, 0xA4EA2020, 0x20202020, 0x20202020, 0x00000000 -glabel D_809F065C - .word 0xA5C7A5AF, 0xA4CECBC0, 0xBBFDA4C6, 0xA4EBBFF4, 0xA4F2C1FD, 0xA4E4A4B9, 0x00000000 -glabel D_809F0678 - .word 0xA5C7A5AF, 0xA4CEBCC2, 0xBBFDA4C6, 0xA4EBBFF4, 0xA4F2C1FD, 0xA4E4A4B9, 0x00000000 -glabel D_809F0694 - .asciz "引数エラー（売りナッツ）[ arg_data = %d ]\n" - .balign 4 - -glabel D_809F06C8 - .asciz "◆◆◆ 売りナッツ『%s』 ◆◆◆\n" - .balign 4 - -glabel jtbl_809F06F0 -.word L809EFD38 -.word L809EFD54 -.word L809EFD8C -.word L809EFD70 -.word L809EFD8C -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dnt_demo.rodata.s b/data/overlays/actors/z_en_dnt_demo.rodata.s deleted file mode 100644 index 00a4792e04..0000000000 --- a/data/overlays/actors/z_en_dnt_demo.rodata.s +++ /dev/null @@ -1,96 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809F16B0 - .word 0x0A0A0000 -glabel D_809F16B4 - .asciz "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_809F16F0 - .asciz "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_809F171C - .asciz "☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n" - .balign 4 - -.balign 4 - -glabel D_809F1758 - .asciz "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_809F1784 - .asciz "☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F17AC - .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F17DC - .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F180C - .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F183C - .asciz "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F186C - .word 0x0A0A0000 -glabel D_809F1870 - .asciz "☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809F18A4 - .asciz "☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809F18D8 - .asciz "☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809F190C - .word 0x0A000000 -glabel D_809F1910 - .asciz "☆☆☆☆☆ どういう評価？ ☆☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809F1944 - .asciz "☆☆☆☆☆ どういうアクション？ ☆☆☆ %d\n" - .balign 4 - -glabel D_809F1978 - .word 0x0A0A0000 -glabel D_809F197C - .word 0x457D2000 -glabel jtbl_809F1980 -.word L809F0E1C -.word L809F0D50 -.word L809F0E1C -.word L809F0E1C -.word L809F0E1C -.word L809F0E1C -.word L809F0E1C -.word L809F0D80 -glabel D_809F19A0 - .word 0x410FD70A -glabel D_809F19A4 - .word 0x40FFAE14, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dnt_jiji.rodata.s b/data/overlays/actors/z_en_dnt_jiji.rodata.s deleted file mode 100644 index 3d56d834bb..0000000000 --- a/data/overlays/actors/z_en_dnt_jiji.rodata.s +++ /dev/null @@ -1,65 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809F2FE0 - .word 0x0A0A0000 -glabel D_809F2FE4 - .asciz "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_809F3020 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3028 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3030 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3038 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3040 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3048 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3050 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3058 - .word 0xBCC2200A, 0x00000000 -glabel D_809F3060 - .word 0xCBC0200A, 0x00000000 -glabel D_809F3068 - .word 0xCBC0200A, 0x00000000 -glabel D_809F3070 - .word 0xCBC0200A, 0x00000000 -glabel D_809F3078 - .word 0xCBC0200A, 0x00000000 -glabel D_809F3080 - .word 0xCBC0200A, 0x00000000 -glabel D_809F3088 - .word 0xCBC0200A, 0x00000000 -glabel D_809F3090 - .asciz "☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809F30B8 - .asciz "../z_en_dnt_jiji.c" - .balign 4 - -glabel D_809F30CC - .asciz "../z_en_dnt_jiji.c" - .balign 4 - -glabel D_809F30E0 - .asciz "../z_en_dnt_jiji.c" - .balign 4 - -glabel D_809F30F4 - .word 0x4622F983 -glabel D_809F30F8 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dnt_nomal.rodata.s b/data/overlays/actors/z_en_dnt_nomal.rodata.s deleted file mode 100644 index b86df253cb..0000000000 --- a/data/overlays/actors/z_en_dnt_nomal.rodata.s +++ /dev/null @@ -1,107 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809F5EB0 - .word 0x0A0A0000 -glabel D_809F5EB4 - .asciz "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F5EE8 - .word 0x0A0A0000 -glabel D_809F5EEC - .asciz "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_809F5F28 - .asciz " なにみの？ %d\n\n" - .balign 4 - -glabel D_809F5F44 - .asciz " バンクおかしいしぞ！%d\n\n" - .balign 4 - -glabel D_809F5F68 - .asciz "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809F5F94 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FA8 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FBC - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FD0 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FE4 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FF8 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F600C - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F6020 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F6034 - .word 0x44A78000 -glabel D_809F6038 - .word 0x44A78000 -glabel D_809F603C - .word 0x44A7E000 -glabel D_809F6040 - .word 0x4622F983 -glabel D_809F6044 - .word 0x4622F983 -glabel D_809F6048 - .word 0x4622F983 -glabel D_809F604C - .word 0x4622F983 -glabel D_809F6050 - .word 0x4622F983 -glabel D_809F6054 - .word 0x3FFEB852 -glabel D_809F6058 - .word 0x407F5C29 -glabel D_809F605C - .word 0x4622F983 -glabel D_809F6060 - .word 0x40490FDB -glabel D_809F6064 - .word 0x40490FDB -glabel D_809F6068 - .word 0x4622F983 -glabel jtbl_809F606C -.word L809F57B0 -.word L809F56EC -.word L809F5714 -.word L809F576C -.word L809F5784 -.word L809F5794 -.word L809F57A4 -glabel D_809F6088 - .word 0x3C23D70A -glabel D_809F608C - .word 0x3C23D70A - - diff --git a/data/overlays/actors/z_en_dodojr.rodata.s b/data/overlays/actors/z_en_dodojr.rodata.s deleted file mode 100644 index 3a150bc7f6..0000000000 --- a/data/overlays/actors/z_en_dodojr.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809F7F70 - .word 0x40266666 -glabel D_809F7F74 - .word 0xBF4CCCCD -glabel D_809F7F78 - .word 0xBF4CCCCD -glabel D_809F7F7C - .word 0xBF4CCCCD -glabel D_809F7F80 - .word 0xBF4CCCCD -glabel D_809F7F84 - .word 0xBF4CCCCD -glabel D_809F7F88 - .word 0xBF4CCCCD -glabel D_809F7F8C - .word 0x40266666 -glabel D_809F7F90 - .word 0x3F99999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dodongo.rodata.s b/data/overlays/actors/z_en_dodongo.rodata.s deleted file mode 100644 index 6335fd6cd7..0000000000 --- a/data/overlays/actors/z_en_dodongo.rodata.s +++ /dev/null @@ -1,103 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809FAB60 - .word 0x3CA3D70A -glabel D_809FAB64 - .word 0x3DCCCCCD -glabel D_809FAB68 - .word 0x3E19999A -glabel D_809FAB6C - .word 0x3DCCCCCD -glabel D_809FAB70 - .word 0x3E19999A -glabel D_809FAB74 - .word 0x3CA3D70A -glabel D_809FAB78 - .word 0x3DCCCCCD -glabel D_809FAB7C - .word 0x3E19999A -glabel D_809FAB80 - .word 0x3DCCCCCD -glabel D_809FAB84 - .word 0x3E19999A -glabel D_809FAB88 - .word 0x3CA3D70A -glabel D_809FAB8C - .word 0x3DCCCCCD -glabel D_809FAB90 - .word 0x3E19999A -glabel D_809FAB94 - .word 0x3DCCCCCD -glabel D_809FAB98 - .word 0x3E19999A -glabel D_809FAB9C - .word 0xBDCCCCCD -glabel D_809FABA0 - .word 0x3F333333 -glabel D_809FABA4 - .word 0x3DA3D70A -glabel D_809FABA8 - .word 0x45ABE000 -glabel jtbl_809FABAC -.word L809FA2E4 -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA338 -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA40C -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA494 -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4BC -.word L809FA4AC -glabel jtbl_809FAC18 -.word L809FA4F0 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA504 -.word L809FA50C -.word L809FA514 -.word L809FA51C -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA534 -.word L809FA524 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA540 -.word L809FA53C -.word L809FA52C -glabel D_809FAC74 - .word 0x3FE66666, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_door.rodata.s b/data/overlays/actors/z_en_door.rodata.s deleted file mode 100644 index 2c9de38e3c..0000000000 --- a/data/overlays/actors/z_en_door.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809FCF10 - .asciz "../z_en_door.c" - .balign 4 - -glabel D_809FCF20 - .asciz "../z_en_door.c" - .balign 4 - -glabel D_809FCF30 - .word 0x3E19999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_du.rodata.s b/data/overlays/actors/z_en_du.rodata.s deleted file mode 100644 index 3a81196e64..0000000000 --- a/data/overlays/actors/z_en_du.rodata.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809FF440 - .asciz "../z_en_du.c" - .balign 4 - -glabel D_809FF450 - .asciz "../z_en_du.c" - .balign 4 - -glabel jtbl_809FF460 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDD14 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDD88 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDDA0 -glabel D_809FF488 - .word 0x40490FDB -glabel D_809FF48C - .word 0x40490FDB -glabel D_809FF490 - .word 0x40490FDB -glabel D_809FF494 - .word 0x40490FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dy_extra.rodata.s b/data/overlays/actors/z_en_dy_extra.rodata.s deleted file mode 100644 index 3c6eb916d1..0000000000 --- a/data/overlays/actors/z_en_dy_extra.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809FFC70 - .word 0x0A0A0000 -glabel D_809FFC74 - .asciz "☆☆☆☆☆ 大妖精効果 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_809FFCA4 - .asciz "../z_en_dy_extra.c" - .balign 4 - -glabel D_809FFCB8 - .asciz "../z_en_dy_extra.c" - .balign 4 - -glabel D_809FFCCC - .asciz "../z_en_dy_extra.c" - .balign 4 - -glabel D_809FFCE0 - .word 0x3CCCCCCD -glabel D_809FFCE4 - .word 0x3D1FBE77 -glabel D_809FFCE8 - .word 0xBE4CCCCD -glabel D_809FFCEC - .word 0x3CA3D70A - - diff --git a/data/overlays/actors/z_en_eiyer.rodata.s b/data/overlays/actors/z_en_eiyer.rodata.s deleted file mode 100644 index a04a96fabc..0000000000 --- a/data/overlays/actors/z_en_eiyer.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A019D0 - .asciz "../z_en_eiyer.c" - .balign 4 - -glabel D_80A019E0 - .asciz "../z_en_eiyer.c" - .balign 4 - -glabel D_80A019F0 - .word 0xBEC90FDB -glabel D_80A019F4 - .word 0x3F7D70A4 -glabel D_80A019F8 - .word 0x3E858150 -glabel D_80A019FC - .word 0x3F4CCCCD -glabel D_80A01A00 - .word 0x3DA0D97C -glabel D_80A01A04 - .word 0x3D4CCCCD -glabel D_80A01A08 - .word 0x3F8CCCCD -glabel D_80A01A0C - .word 0x3F20D97C -glabel D_80A01A10 - .word 0x451C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_elf.rodata.s b/data/overlays/actors/z_en_elf.rodata.s index d2c42f03bb..250361b841 100644 --- a/data/overlays/actors/z_en_elf.rodata.s +++ b/data/overlays/actors/z_en_elf.rodata.s @@ -8,13 +8,15 @@ .section .rodata glabel D_80A060B0 - .word 0x30000000 + .float 4.656612873077393e-10 + glabel D_80A060B4 .asciz "../z_en_elf.c" .balign 4 glabel D_80A060C4 - .word 0x30000000 + .float 4.656612873077393e-10 + glabel D_80A060C8 .asciz "../z_en_elf.c" .balign 4 @@ -50,19 +52,29 @@ glabel jtbl_80A06144 .word func_80A01F48 .word func_80A01CAC glabel D_80A06178 - .word 0x46FFFE00 + .float 32767.0 + glabel D_80A0617C - .word 0x46FFFE00 + .float 32767.0 + glabel D_80A06180 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A06184 - .word 0x3F733333 + .float 0.949999988079071 + glabel D_80A06188 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80A0618C - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A06190 - .word 0x46FFFE00 + .float 32767.0 + glabel jtbl_80A06194 .word L80A025C0 .word L80A02630 @@ -73,74 +85,134 @@ glabel jtbl_80A06194 .word L80A0270C .word L80A026E8 glabel D_80A061B4 - .word 0x46FFFE00 + .float 32767.0 + glabel D_80A061B8 - .word 0x413FD70A + .float 11.989999771118164 + glabel D_80A061BC - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A061C0 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80A061C4 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_80A061C8 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80A061CC - .word 0x3C03126F + .float 0.008 + .balign 4 + glabel D_80A061D0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A061D4 - .word 0x44BB8000 + .float 1500.0 + .balign 4 + glabel D_80A061D8 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A061DC - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A061E0 - .word 0x3C03126F + .float 0.008 + .balign 4 + glabel D_80A061E4 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80A061E8 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A061EC - .word 0x3F333333 + .float 0.7 + .balign 4 + glabel D_80A061F0 - .word 0x3EB33333 + .float 0.3499999940395355 + glabel D_80A061F4 - .word 0x3C4A4588 + .float 0.012345679104328156 + glabel D_80A061F8 - .word 0x3C03126F + .float 0.008 + .balign 4 + glabel D_80A061FC - .word 0x3D088889 + .float 0.03333333507180214 + glabel D_80A06200 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80A06204 - .word 0x3C03126F + .float 0.008 + .balign 4 + glabel D_80A06208 - .word 0x3C03126F + .float 0.008 + .balign 4 + glabel D_80A0620C - .word 0x44BB8000 + .float 1500.0 + .balign 4 + glabel D_80A06210 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A06214 - .word 0x44BB8000 + .float 1500.0 + .balign 4 + glabel D_80A06218 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A0621C - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A06220 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A06224 - .word 0x38A7C5AD + .float 8.000000525498763e-05 + glabel D_80A06228 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A0622C - .word 0x38A7C5AD + .float 8.000000525498763e-05 + glabel D_80A06230 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A06234 - .word 0x3C449BA6 + .float 0.012000000104308128 + glabel D_80A06238 - .word 0x42F9FFFF + .float 124.99999237060547 + glabel D_80A0623C - .word 0x3A98EAD6 + .float 0.0011666666250675917 + diff --git a/data/overlays/actors/z_en_encount1.rodata.s b/data/overlays/actors/z_en_encount1.rodata.s deleted file mode 100644 index b925552ed3..0000000000 --- a/data/overlays/actors/z_en_encount1.rodata.s +++ /dev/null @@ -1,101 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A07490 - .word 0x0A0A0000 -glabel D_80A07494 - .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A074C8 - .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A074FC - .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A07530 - .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A07564 - .asciz "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A07598 - .word 0x0A0A0000 -glabel D_80A0759C - .word 0x0A0A0000 -glabel D_80A075A0 - .asciz "☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80A075D8 - .asciz "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A07604 - .asciz "☆☆☆☆☆ 最大同時発生数 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A0763C - .asciz "☆☆☆☆☆ 最大発生数 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A07670 - .asciz "☆☆☆☆☆ 発生チェック範囲 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A076A8 - .word 0x0A0A0000 -glabel D_80A076AC - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A076DC - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A0770C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A0773C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A0776C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A0779C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A077CC - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A077FC - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A0782C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A0785C - .word 0x44A28000 -glabel D_80A07860 - .word 0x407F5C29 -glabel D_80A07864 - .word 0x403F5C29, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_encount2.rodata.s b/data/overlays/actors/z_en_encount2.rodata.s deleted file mode 100644 index b4ead47fc5..0000000000 --- a/data/overlays/actors/z_en_encount2.rodata.s +++ /dev/null @@ -1,81 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A08B70 - .word 0x0A0A0000 -glabel D_80A08B74 - .asciz "☆☆☆☆☆ デスマウンテンエンカウント２セットされました ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A08BC4 - .word 0x0A0A0000 -glabel D_80A08BC8 - .asciz "☆☆☆☆☆ ガノンタワー脱出エンカウント２セットされました ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A08C1C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A08C4C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A08C7C - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A08CAC - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" - .balign 4 - -glabel D_80A08CDC - .asciz "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n" - .balign 4 - -glabel D_80A08D10 - .asciz "../z_en_encount2.c" - .balign 4 - -glabel D_80A08D24 - .asciz "../z_en_encount2.c" - .balign 4 - -glabel D_80A08D38 - .asciz "../z_en_encount2.c" - .balign 4 - -glabel D_80A08D4C - .word 0x44BB8000 -glabel D_80A08D50 - .word 0xC4A14000 -glabel D_80A08D54 - .word 0x44BB8000 -glabel D_80A08D58 - .word 0xC4A14000 -glabel D_80A08D5C - .word 0xC5714000 -glabel D_80A08D60 - .word 0x3BA3D70A -glabel D_80A08D64 - .word 0x3BE56042 -glabel D_80A08D68 - .word 0x3FFEB852 -glabel D_80A08D6C - .word 0x407F5C29 -glabel D_80A08D70 - .word 0x3F4CCCCD -glabel D_80A08D74 - .word 0x3E99999A -glabel D_80A08D78 - .word 0x44BB8000 -glabel D_80A08D7C - .word 0x3C8EFA35 - - diff --git a/data/overlays/actors/z_en_ex_item.rodata.s b/data/overlays/actors/z_en_ex_item.rodata.s deleted file mode 100644 index e0799b0daf..0000000000 --- a/data/overlays/actors/z_en_ex_item.rodata.s +++ /dev/null @@ -1,148 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A09E10 - .word 0x0A0A0000 -glabel D_80A09E14 - .asciz "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A09E48 - .asciz "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A09E7C - .asciz "なにみの？ %d\n" - .balign 4 - -glabel D_80A09E8C - .asciz " バンクおかしいしぞ！%d\n\n" - .balign 4 - -glabel D_80A09EB0 - .asciz "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A09EDC - .asciz "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A09F08 - .asciz "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A09F34 - .asciz "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A09F60 - .asciz "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\n" - .balign 4 - -glabel D_80A09F8C - .asciz " ☆☆☆☆☆ 母親ー？ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80A09FBC - .asciz " ☆☆☆☆☆ 動いてねー？ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80A09FEC - .asciz " ☆☆☆☆☆ さぁきえるぞ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A0A01C - .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_80A0A048 - .asciz "../z_en_ex_item.c" - .balign 4 - -glabel D_80A0A05C - .asciz "../z_en_ex_item.c" - .balign 4 - -glabel D_80A0A070 - .asciz "../z_en_ex_item.c" - .balign 4 - -glabel jtbl_80A0A084 -.word L80A08F58 -.word L80A08F64 -.word L80A08F70 -.word L80A08F7C -.word L80A08F88 -.word L80A08F58 -.word L80A08F64 -.word L80A08F70 -.word L80A08F7C -.word L80A08F88 -.word L80A08F88 -.word L80A08F88 -.word L80A08F88 -.word L80A08F88 -.word L80A08F88 -.word L80A08F94 -.word L80A08FC4 -.word L80A08FC4 -.word L80A08FC4 -.word L80A08FD0 -glabel D_80A0A0D4 - .word 0x3D4CCCCD -glabel jtbl_80A0A0D8 -.word L80A0912C -.word L80A09190 -.word L80A091FC -.word L80A09250 -.word L80A092B8 -.word L80A09128 -.word L80A0918C -.word L80A091F8 -.word L80A09250 -.word L80A092B8 -.word L80A0932C -.word L80A0932C -.word L80A0932C -.word L80A0932C -.word L80A0932C -.word L80A09424 -.word L80A093CC -.word L80A093CC -.word L80A093CC -.word L80A093E8 -glabel D_80A0A128 - .word 0x3EB33333 -glabel D_80A0A12C - .word 0x3DCCCCCD -glabel jtbl_80A0A130 -.word L80A09B04 -.word L80A09B14 -.word L80A09B04 -.word L80A09B04 -.word L80A09B24 -.word L80A09B04 -.word L80A09B14 -.word L80A09B04 -.word L80A09B04 -.word L80A09B24 -.word L80A09B24 -.word L80A09B24 -.word L80A09B24 -.word L80A09B24 -.word L80A09B24 -.word L80A09B34 -.word L80A09B48 -.word L80A09B48 -.word L80A09B48 -.word L80A09B04 - - diff --git a/data/overlays/actors/z_en_ex_ruppy.rodata.s b/data/overlays/actors/z_en_ex_ruppy.rodata.s deleted file mode 100644 index cc5b6058e5..0000000000 --- a/data/overlays/actors/z_en_ex_ruppy.rodata.s +++ /dev/null @@ -1,71 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A0B3D0 - .asciz "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80A0B400 - .asciz "☆☆☆☆☆ わーなーコイン ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A0B430 - .asciz "☆☆☆☆☆ ノーマルルピー ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A0B460 - .asciz "☆☆☆☆☆ そ、そんなばかな！エラー！！！！！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A0B4A4 - .asciz "☆☆☆☆☆ バカめ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A0B4D0 - .asciz "../z_en_ex_ruppy.c" - .balign 4 - -glabel D_80A0B4E4 - .asciz "../z_en_ex_ruppy.c" - .balign 4 - -glabel D_80A0B4F8 - .asciz "../z_en_ex_ruppy.c" - .balign 4 - -glabel jtbl_80A0B50C -.word L80A0A478 -.word L80A0A634 -.word L80A0A634 -.word L80A0A6E0 -.word L80A0A7AC -glabel D_80A0B520 - .word 0x3C23D70A -glabel D_80A0B524 - .word 0x4348FD71 -glabel D_80A0B528 - .word 0x3CA3D70A -glabel D_80A0B52C - .word 0x3CA3D70A -glabel D_80A0B530 - .word 0x407F5C29 -glabel D_80A0B534 - .word 0x3CA3D70A -glabel D_80A0B538 - .word 0x41F7EB85 -glabel D_80A0B53C - .word 0x3C23D70A -glabel D_80A0B540 - .word 0xBE4CCCCD -glabel D_80A0B544 - .word 0x3CF5C28F -glabel D_80A0B548 - .word 0x3D8F5C29, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fd.rodata.s b/data/overlays/actors/z_en_fd.rodata.s deleted file mode 100644 index 3e1f467c8d..0000000000 --- a/data/overlays/actors/z_en_fd.rodata.s +++ /dev/null @@ -1,77 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A0E120 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E130 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E140 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E150 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E160 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E170 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E180 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E190 - .asciz "../z_en_fd.c" - .balign 4 - -glabel D_80A0E1A0 - .word 0x43360B61 -glabel D_80A0E1A4 - .word 0x3E4CCCCD -glabel D_80A0E1A8 - .word 0x3E99999A -glabel D_80A0E1AC - .word 0x3F19999A -glabel D_80A0E1B0 - .word 0x3E4CCCCD -glabel D_80A0E1B4 - .word 0x3F666666 -glabel D_80A0E1B8 - .word 0x3C23D70A -glabel D_80A0E1BC - .word 0x3C23D70A -glabel D_80A0E1C0 - .word 0x4622F983 -glabel D_80A0E1C4 - .word 0x4622F983 -glabel D_80A0E1C8 - .word 0x3F19999A -glabel D_80A0E1CC - .word 0x3E4CCCCD -glabel D_80A0E1D0 - .word 0x3ECCCCCD -glabel D_80A0E1D4 - .word 0x3BC49BA6 -glabel D_80A0E1D8 - .word 0x3F666666 -glabel D_80A0E1DC - .word 0x3E4CCCCD -glabel D_80A0E1E0 - .word 0x3ECCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fd_fire.rodata.s b/data/overlays/actors/z_en_fd_fire.rodata.s deleted file mode 100644 index 6101b09050..0000000000 --- a/data/overlays/actors/z_en_fd_fire.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A0F0F0 - .asciz "../z_en_fd_fire.c" - .balign 4 - -glabel D_80A0F104 - .asciz "../z_en_fd_fire.c" - .balign 4 - -glabel D_80A0F118 - .asciz "../z_en_fd_fire.c" - .balign 4 - -glabel D_80A0F12C - .word 0xBF19999A -glabel D_80A0F130 - .word 0x3DCCCCCD -glabel D_80A0F134 - .word 0x3C23D70A -glabel D_80A0F138 - .word 0x38C90FDB -glabel D_80A0F13C - .word 0x3C8EFA35 -glabel D_80A0F140 - .word 0x3A83126F -glabel D_80A0F144 - .word 0x3DCCCCCD -glabel D_80A0F148 - .word 0xBE199999, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fhg.rodata.s b/data/overlays/actors/z_en_fhg.rodata.s deleted file mode 100644 index 97f85da95f..0000000000 --- a/data/overlays/actors/z_en_fhg.rodata.s +++ /dev/null @@ -1,162 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B65210 - .word 0x46204454, 0x310A0000 -glabel D_80B65218 - .word 0x46204454, 0x320A0000 -glabel D_80B65220 - .asciz "TIME %d-------------------------------------------------\n" - .balign 4 - -glabel D_80B6525C - .asciz "KABE NO 1 = %d\n" - .balign 4 - -glabel D_80B6526C - .asciz "KABE NO 2 = %d\n" - .balign 4 - -glabel D_80B6527C - .asciz "XP1 = %f\n" - .balign 4 - -glabel D_80B65288 - .asciz "ZP1 = %f\n" - .balign 4 - -glabel D_80B65294 - .asciz "STANDBY !!\n" - .balign 4 - -glabel D_80B652A0 - .asciz "XP2 = %f\n" - .balign 4 - -glabel D_80B652AC - .asciz "ZP2 = %f\n" - .balign 4 - -glabel D_80B652B8 - .asciz "arg_data ------------------------------------>%d\n" - .balign 4 - -glabel D_80B652EC - .word 0x4B414245, 0x204F5554, 0x2021210A, 0x00000000 -glabel D_80B652FC - .word 0x53504420, 0x58202566, 0x0A000000 -glabel D_80B65308 - .word 0x53504420, 0x5A202566, 0x0A000000 -glabel D_80B65314 - .word 0x583D2566, 0x0A000000 -glabel D_80B6531C - .word 0x5A3D2566, 0x0A000000 -glabel D_80B65324 - .asciz "REVISE !!\n" - .balign 4 - -glabel D_80B65330 - .asciz "KABE IN !!\n" - .balign 4 - -glabel D_80B6533C - .asciz "ac1 = %x `````````````````````````````````````````````````\n" - .balign 4 - -glabel D_80B65378 - .asciz "../z_en_fhg.c" - .balign 4 - -glabel D_80B65388 - .asciz "../z_en_fhg.c" - .balign 4 - -glabel D_80B65398 - .word 0xC54F3000 -glabel jtbl_80B6539C -.word L80B62BD0 -.word L80B62CA4 -.word L80B62E10 -.word L80B62EFC -.word L80B630A4 -.word L80B6320C -.word L80B632DC -.word L80B63670 -.word L80B63988 -.word L80B63C0C -.word L80B63D54 -.word L80B63D54 -.word L80B63D54 -.word L80B63D54 -.word L80B63D54 -.word L80B62C2C -glabel D_80B653DC - .word 0xC54F3000 -glabel D_80B653E0 - .word 0xC53B8000 -glabel D_80B653E4 - .word 0xC53BF000 -glabel D_80B653E8 - .word 0x40BFAE14 -glabel D_80B653EC - .word 0xC5458000 -glabel D_80B653F0 - .word 0xC5449000 -glabel D_80B653F4 - .word 0xC53B8000 -glabel D_80B653F8 - .word 0xC53BF000 -glabel D_80B653FC - .word 0xC5485000 -glabel D_80B65400 - .word 0xC558E000 -glabel D_80B65404 - .word 0xC54DA000 -glabel D_80B65408 - .word 0xC5534000 -glabel D_80B6540C - .word 0xC5467000 -glabel D_80B65410 - .word 0xC5467000 -glabel D_80B65414 - .word 0xC548F000 -glabel D_80B65418 - .word 0xC5363800 -glabel D_80B6541C - .word 0xC5363800 -glabel D_80B65420 - .word 0xC5363800 -glabel D_80B65424 - .word 0xC548F000 -glabel D_80B65428 - .word 0x3FA66666 -glabel D_80B6542C - .word 0x454FD000 -glabel D_80B65430 - .word 0x3C23D70A -glabel D_80B65434 - .word 0x3FA66666 -glabel D_80B65438 - .word 0x454FD000 -glabel D_80B6543C - .word 0x3B03126F -glabel D_80B65440 - .word 0x3A83126F -glabel D_80B65444 - .word 0x3FA66666 -glabel D_80B65448 - .word 0x454FD000 -glabel D_80B6544C - .word 0x3A83126F -glabel D_80B65450 - .word 0x40BFAE14 -glabel D_80B65454 - .word 0x44BB8000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fhg_fire.rodata.s b/data/overlays/actors/z_en_fhg_fire.rodata.s deleted file mode 100644 index a953fb5dc3..0000000000 --- a/data/overlays/actors/z_en_fhg_fire.rodata.s +++ /dev/null @@ -1,131 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A11840 - .asciz "yari hikari ct 1\n" - .balign 4 - -glabel D_80A11854 - .asciz "yari hikari ct 2\n" - .balign 4 - -glabel D_80A11868 - .asciz "FF MOVE 1\n" - .balign 4 - -glabel D_80A11874 - .asciz "FF MOVE 2\n" - .balign 4 - -glabel D_80A11880 - .asciz "yari hikari 1\n" - .balign 4 - -glabel D_80A11890 - .asciz "yari hikari 2\n" - .balign 4 - -glabel D_80A118A0 - .word 0x464C4153, 0x48202121, 0x0A000000 -glabel D_80A118AC - .asciz "F_FIRE_MODE %d\n" - .balign 4 - -glabel D_80A118BC - .asciz "fly_mode %d\n" - .balign 4 - -glabel D_80A118CC - .asciz "BEFORE setAC %d\n" - .balign 4 - -glabel D_80A118E0 - .asciz "AFTER setAC\n" - .balign 4 - -glabel D_80A118F0 - .asciz "なぜだああああああああ %d\n" - .balign 4 - -glabel D_80A11910 - .word 0x45464320, 0x310A0000 -glabel D_80A11918 - .word 0x45464320, 0x320A0000 -glabel D_80A11920 - .asciz "../z_en_fhg_fire.c" - .balign 4 - -glabel D_80A11934 - .asciz "../z_en_fhg_fire.c" - .balign 4 - -glabel D_80A11948 - .asciz "yari hikari draw 1\n" - .balign 4 - -glabel D_80A1195C - .asciz "../z_en_fhg_fire.c" - .balign 4 - -glabel D_80A11970 - .asciz "../z_en_fhg_fire.c" - .balign 4 - -glabel D_80A11984 - .asciz "FF DRAW 1\n" - .balign 4 - -glabel D_80A11990 - .asciz "../z_en_fhg_fire.c" - .balign 4 - -glabel D_80A119A4 - .asciz "FF DRAW 2\n" - .balign 4 - -glabel D_80A119B0 - .asciz "../z_en_fhg_fire.c" - .balign 4 - -glabel D_80A119C4 - .word 0x3E051EB8 -glabel D_80A119C8 - .word 0x4622F983 -glabel D_80A119CC - .word 0x4622F983 -glabel D_80A119D0 - .word 0xBE4CCCCD -glabel D_80A119D4 - .word 0x469C4000 -glabel D_80A119D8 - .word 0xBDA3D70A -glabel D_80A119DC - .word 0x469C4000 -glabel D_80A119E0 - .word 0xBDA3D70A -glabel D_80A119E4 - .word 0x4622F983 -glabel D_80A119E8 - .word 0x4622F983 -glabel D_80A119EC - .word 0x4622F983 -glabel D_80A119F0 - .word 0x4622F983 -glabel D_80A119F4 - .word 0x4622F983 -glabel D_80A119F8 - .word 0x4622F983 -glabel D_80A119FC - .word 0x4622F983 -glabel D_80A11A00 - .word 0xBDCCCCCD -glabel D_80A11A04 - .word 0x40490FF9, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fire_rock.rodata.s b/data/overlays/actors/z_en_fire_rock.rodata.s deleted file mode 100644 index be3f06cee4..0000000000 --- a/data/overlays/actors/z_en_fire_rock.rodata.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A12D00 - .asciz "☆☆☆☆☆ 天井待ち岩 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A12D2C - .asciz "☆☆☆☆☆ 床岩 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A12D54 - .asciz "☆☆☆☆☆ そんな岩はねぇ！ERR!!!!!! ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A12D90 - .word 0x0A0A0000 -glabel D_80A12D94 - .asciz "☆☆☆☆☆ 発生数回復 ☆☆☆☆☆%d\n" - .balign 4 - -glabel D_80A12DC0 - .word 0x0A0A0000 -glabel D_80A12DC4 - .asciz "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A12DF4 - .asciz "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A12E24 - .asciz "☆☆☆☆☆ シールド防御 Lv１ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A12E58 - .asciz "../z_en_fire_rock.c" - .balign 4 - -glabel D_80A12E6C - .asciz "../z_en_fire_rock.c" - .balign 4 - -glabel D_80A12E80 - .asciz "../z_en_fire_rock.c" - .balign 4 - -glabel jtbl_80A12E94 -.word L80A11D9C -.word L80A11E70 -.word L80A11F50 -.word L80A11DD8 -.word L80A12008 -.word L80A11CF4 -.word L80A11D14 -glabel D_80A12EB0 - .word 0x3CA3D70A -glabel D_80A12EB4 - .word 0x477FFF00 -glabel D_80A12EB8 - .word 0x3CA3D70A -glabel D_80A12EBC - .word 0x477FFF00 -glabel D_80A12EC0 - .word 0x3C23D70A -glabel D_80A12EC4 - .word 0xBF99999A -glabel D_80A12EC8 - .word 0x477FFF00 -glabel D_80A12ECC - .word 0xC61C4000 -glabel D_80A12ED0 - .word 0xC4A14000 -glabel D_80A12ED4 - .word 0xC5728000 -glabel D_80A12ED8 - .word 0x3C23D70A -glabel D_80A12EDC - .word 0xBE99999A -glabel D_80A12EE0 - .word 0x3C8EFA35 -glabel D_80A12EE4 - .word 0x3C8EFA35 -glabel D_80A12EE8 - .word 0x3C8EFA35, 0x00000000 - - diff --git a/data/overlays/actors/z_en_firefly.rodata.s b/data/overlays/actors/z_en_firefly.rodata.s deleted file mode 100644 index f5c47d3a2e..0000000000 --- a/data/overlays/actors/z_en_firefly.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A14FE0 - .asciz "../z_en_firefly.c" - .balign 4 - -glabel D_80A14FF4 - .asciz "../z_en_firefly.c" - .balign 4 - -glabel D_80A15008 - .asciz "../z_en_firefly.c" - .balign 4 - -glabel D_80A1501C - .asciz "../z_en_firefly.c" - .balign 4 - -glabel D_80A15030 - .word 0x3F59999A -glabel D_80A15034 - .word 0x3E19999A -glabel D_80A15038 - .word 0x3D4CCCCD -glabel D_80A1503C - .word 0x4708B800 -glabel D_80A15040 - .word 0x3F4CCCCD -glabel D_80A15044 - .word 0x3EB33333 -glabel D_80A15048 - .word 0x3CA3D70A -glabel D_80A1504C - .word 0x450FC000 - - diff --git a/data/overlays/actors/z_en_fish.rodata.s b/data/overlays/actors/z_en_fish.rodata.s deleted file mode 100644 index 3cdf43bc43..0000000000 --- a/data/overlays/actors/z_en_fish.rodata.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A170A0 - .word 0x1B5B3433, 0x3B33306D, 0x00000000 -glabel D_80A170AC - .asciz "BG 抜け？ Actor_delete します(%s %d)\n" - .balign 4 - -glabel D_80A170D4 - .asciz "../z_en_sakana.c" - .balign 4 - -glabel D_80A170E8 - .word 0x1B5B6D00 -glabel D_80A170EC - .asciz "Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A17138 - .asciz "../z_en_sakana.c" - .balign 4 - -glabel D_80A1714C - .word 0xA5C7A5E2, 0xB5FBBEC3, 0xCCC70A00 -glabel D_80A17158 - .asciz "不正なデモ動作(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A17180 - .asciz "../z_en_sakana.c" - .balign 4 - -glabel D_80A17194 - .word 0x477FFF80 -glabel D_80A17198 - .word 0x477FFF80 -glabel D_80A1719C - .word 0x3FB33333 -glabel D_80A171A0 - .word 0x3F4CCCCD -glabel D_80A171A4 - .word 0x3F4CCCCD -glabel D_80A171A8 - .word 0x3F4CCCCD -glabel D_80A171AC - .word 0x3F4CCCCD -glabel D_80A171B0 - .word 0x3DCCCCCD -glabel D_80A171B4 - .word 0xC6F9EC00 -glabel D_80A171B8 - .word 0x3DCCCCCD -glabel D_80A171BC - .word 0x3E4CCCCD -glabel D_80A171C0 - .word 0x3F99999A -glabel D_80A171C4 - .word 0x3E4CCCCD -glabel D_80A171C8 - .word 0x3E4CCCCD -glabel D_80A171CC - .word 0x3DCCCCCD -glabel D_80A171D0 - .word 0x3E4CCCCD -glabel D_80A171D4 - .word 0x3E99999A -glabel D_80A171D8 - .word 0x3F7B645A -glabel D_80A171DC - .word 0x3F99999A -glabel D_80A171E0 - .word 0x3E4CCCCD -glabel D_80A171E4 - .word 0x3DCCCCCD -glabel D_80A171E8 - .word 0x3ECCCCCD -glabel D_80A171EC - .word 0x3C23D70A -glabel D_80A171F0 - .word 0x3C23D70A -glabel D_80A171F4 - .word 0x3C23D70A -glabel D_80A171F8 - .word 0x3A83126F, 0x00000000 - - diff --git a/data/overlays/actors/z_en_floormas.rodata.s b/data/overlays/actors/z_en_floormas.rodata.s deleted file mode 100644 index d11445d7fa..0000000000 --- a/data/overlays/actors/z_en_floormas.rodata.s +++ /dev/null @@ -1,79 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A1A500 - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A514 - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A528 - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A53C - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A550 - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A564 - .word 0x3B83126F -glabel D_80A1A568 - .word 0x3D888889 -glabel D_80A1A56C - .word 0x3E088889 -glabel D_80A1A570 - .word 0xBE19999A -glabel D_80A1A574 - .word 0x3F19999A -glabel D_80A1A578 - .word 0x3DCCCCCD -glabel D_80A1A57C - .word 0x3B83126F -glabel D_80A1A580 - .word 0x3B83126F -glabel D_80A1A584 - .word 0x3B83126F -glabel D_80A1A588 - .word 0x3B83126F -glabel D_80A1A58C - .word 0x4528C000 -glabel D_80A1A590 - .word 0x4528C000 -glabel D_80A1A594 - .word 0x3EAAAAAB -glabel D_80A1A598 - .word 0x3B83126F -glabel D_80A1A59C - .word 0x3DCCCCCD -glabel D_80A1A5A0 - .word 0x3BE56042 -glabel D_80A1A5A4 - .word 0x3B83126F -glabel D_80A1A5A8 - .word 0x3C23D70A -glabel D_80A1A5AC - .word 0x3B83126F -glabel D_80A1A5B0 - .word 0x3C23D70A -glabel D_80A1A5B4 - .word 0x453B8000 -glabel D_80A1A5B8 - .word 0x451C4000 -glabel D_80A1A5BC - .word 0x3F860A92 -glabel D_80A1A5C0 - .word 0x3E860A92, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fr.rodata.s b/data/overlays/actors/z_en_fr.rodata.s deleted file mode 100644 index 34cf06bbcd..0000000000 --- a/data/overlays/actors/z_en_fr.rodata.s +++ /dev/null @@ -1,134 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A1D110 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A1D11C - .asciz "%s[%d] : 引数が間違っている！！(%d)\n" - .balign 4 - -glabel D_80A1D144 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D154 - .word 0x1B5B6D00 -glabel D_80A1D158 - .word 0x30000000 -glabel D_80A1D15C - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D16C - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A1D178 - .asciz "%s[%d] : バンクが無いよ！！\n" - .balign 4 - -glabel D_80A1D198 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D1A8 - .word 0x1B5B6D00 -glabel D_80A1D1AC - .word 0x30000000 -glabel D_80A1D1B0 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D1C0 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A1D1CC - .asciz "%s[%d]カエルがいない！？\n" - .balign 4 - -glabel D_80A1D1E8 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D1F8 - .word 0x1B5B6D00 -glabel D_80A1D1FC - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A1D208 - .asciz "%s[%d]カエルがいない！？\n" - .balign 4 - -glabel D_80A1D224 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D234 - .word 0x1B5B6D00 -glabel D_80A1D238 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D248 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D258 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D268 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D278 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D288 - .word 0x4622F983 -glabel D_80A1D28C - .word 0x38D1B717 -glabel D_80A1D290 - .word 0xC61C3C00 -glabel D_80A1D294 - .word 0x40490FDB -glabel D_80A1D298 - .word 0x4622F983 -glabel D_80A1D29C - .word 0x38D1B717 -glabel jtbl_80A1D2A0 -.word L80A1BFAC -.word L80A1C02C -.word L80A1C02C -.word L80A1BF9C -.word L80A1BF6C -.word L80A1BF60 -.word L80A1BF58 -.word L80A1BF78 -.word L80A1BF84 -.word L80A1BF90 -glabel jtbl_80A1D2C8 -.word L80A1BFD0 -.word L80A1BFE4 -.word L80A1BFF8 -.word L80A1C00C -.word L80A1C020 -glabel jtbl_80A1D2DC -.word L80A1C274 -.word L80A1C280 -.word L80A1C288 -.word L80A1C294 -.word L80A1C2A0 -glabel jtbl_80A1D2F0 -.word L80A1C680 -.word L80A1C694 -.word L80A1C6A8 -.word L80A1C6BC -.word L80A1C6D0 -glabel D_80A1D304 - .word 0x3C75C28F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fu.rodata.s b/data/overlays/actors/z_en_fu.rodata.s deleted file mode 100644 index dd1d77ddcf..0000000000 --- a/data/overlays/actors/z_en_fu.rodata.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A1E470 - .asciz "../z_en_fu.c" - .balign 4 - -glabel D_80A1E480 - .asciz "../z_en_fu.c" - .balign 4 - - diff --git a/data/overlays/actors/z_en_fw.rodata.s b/data/overlays/actors/z_en_fw.rodata.s deleted file mode 100644 index 67e07fe1bb..0000000000 --- a/data/overlays/actors/z_en_fw.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A1FC40 - .asciz "../z_en_fw.c" - .balign 4 - -glabel D_80A1FC50 - .asciz "../z_en_fw.c" - .balign 4 - -glabel D_80A1FC60 - .asciz "../z_en_fw.c" - .balign 4 - -glabel D_80A1FC70 - .word 0x3F666666 -glabel D_80A1FC74 - .word 0x45AAA000 -glabel D_80A1FC78 - .word 0x4622F983 -glabel D_80A1FC7C - .word 0x3E4CCCCD -glabel D_80A1FC80 - .word 0x3E99999A -glabel D_80A1FC84 - .word 0x3E4CCCCD -glabel D_80A1FC88 - .word 0x3ECCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_en_fz.rodata.s b/data/overlays/actors/z_en_fz.rodata.s deleted file mode 100644 index d45cb870a4..0000000000 --- a/data/overlays/actors/z_en_fz.rodata.s +++ /dev/null @@ -1,59 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A21C60 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21C70 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21C80 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21C90 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21CA0 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21CB0 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21CC0 - .word 0x3F19999A -glabel D_80A21CC4 - .word 0x3E99999A -glabel D_80A21CC8 - .word 0x3DCCCCCD -glabel D_80A21CCC - .word 0x3DCCCCCD -glabel D_80A21CD0 - .word 0x3F19999A -glabel D_80A21CD4 - .word 0x40490FDB -glabel D_80A21CD8 - .word 0x3BC49BA6 -glabel D_80A21CDC - .word 0x39D1B717 -glabel D_80A21CE0 - .word 0x3B83126F -glabel D_80A21CE4 - .word 0x3F19999A -glabel D_80A21CE8 - .word 0x40490FDB -glabel D_80A21CEC - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_en_g_switch.rodata.s b/data/overlays/actors/z_en_g_switch.rodata.s deleted file mode 100644 index ce75469e07..0000000000 --- a/data/overlays/actors/z_en_g_switch.rodata.s +++ /dev/null @@ -1,139 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A23780 - .asciz "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80A237B0 - .asciz "☆☆☆☆☆ セーブ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80A237E0 - .word 0x0A0A0000 -glabel D_80A237E4 - .asciz "☆☆☆☆☆ 親スイッチ発生 ☆☆☆☆☆ %x\n" - .balign 4 - -.balign 4 - -glabel D_80A23818 - .asciz "☆☆☆☆☆ 最大チェック数 ☆☆☆☆☆ %d\n" - .balign 4 - -.balign 4 - -glabel D_80A2384C - .word 0x0A0A0000 -glabel D_80A23850 - .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A23890 - .word 0x0A0A0000 -glabel D_80A23894 - .asciz "☆☆☆☆☆ 子スイッチ発生 ☆☆☆☆☆ %x\n" - .balign 4 - -.balign 4 - -glabel D_80A238C8 - .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A23908 - .word 0x0A0A0000 -glabel D_80A2390C - .asciz "☆☆☆☆☆ やぶさめぶち抜き壷 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A23940 - .asciz " なにみの？ %d\n\n" - .balign 4 - -.balign 4 - -glabel D_80A2395C - .asciz " バンクおかしいしぞ！%d\n\n" - .balign 4 - -glabel D_80A23980 - .asciz "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A239A8 - .asciz "☆☆☆☆☆ 時はまさに世紀末〜 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A239E0 - .asciz "☆☆☆☆☆ らすとぉ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A23A14 - .asciz "☆☆☆☆☆ いぇぇーす！ＨＩＴ！！ ☆☆☆☆☆ %d\n" - .balign 4 - -.balign 4 - -glabel D_80A23A50 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23A64 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23A78 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23A8C - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23AA0 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23AB4 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23AC8 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23ADC - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23AF0 - .asciz "../z_en_g_switch.c" - .balign 4 - -glabel D_80A23B04 - .word 0x403F5C29 -glabel D_80A23B08 - .word 0x3EE66666 -glabel D_80A23B0C - .word 0x3E99999A -glabel D_80A23B10 - .word 0x3E4CCCCD -glabel D_80A23B14 - .word 0x3F19999A -glabel D_80A23B18 - .word 0x464B2000 -glabel D_80A23B1C - .word 0x477FFF00 -glabel D_80A23B20 - .word 0x3E99999A -glabel D_80A23B24 - .word 0x461C4000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ganon_mant.rodata.s b/data/overlays/actors/z_en_ganon_mant.rodata.s deleted file mode 100644 index d0dfc36b46..0000000000 --- a/data/overlays/actors/z_en_ganon_mant.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A27E80 - .asciz "../z_en_ganon_mant.c" - .balign 4 - -glabel D_80A27E98 - .asciz "../z_en_ganon_mant.c" - .balign 4 - -glabel D_80A27EB0 - .asciz "../z_en_ganon_mant.c" - .balign 4 - -glabel D_80A27EC8 - .word 0x40C90FDB -glabel D_80A27ECC - .word 0x407F5C29 -glabel D_80A27ED0 - .word 0x413E6666 -glabel D_80A27ED4 - .word 0x40490FDB -glabel D_80A27ED8 - .word 0x40C90FDB -glabel D_80A27EDC - .word 0x40066666 -glabel D_80A27EE0 - .word 0x40490FDB -glabel D_80A27EE4 - .word 0x3FC90FDB -glabel D_80A27EE8 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_gb.rodata.s b/data/overlays/actors/z_en_gb.rodata.s index 121b1d840a..8204907cc6 100644 --- a/data/overlays/actors/z_en_gb.rodata.s +++ b/data/overlays/actors/z_en_gb.rodata.s @@ -28,13 +28,21 @@ glabel D_80A307E0 .balign 4 glabel D_80A307F0 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A307F4 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A307F8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80A307FC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80A30800 .word 0x3BE56042, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/actors/z_en_ge1.rodata.s b/data/overlays/actors/z_en_ge1.rodata.s deleted file mode 100644 index 7ac5764fee..0000000000 --- a/data/overlays/actors/z_en_ge1.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A327C0 - .asciz "谷底 ゲルド 撤退 \n" - .balign 4 - -glabel D_80A327DC - .asciz "やぶさめ ゲルド EVENT_INF(0) = %x\n" - .balign 4 - -glabel D_80A32808 - .asciz "../z_en_ge1.c" - .balign 4 - -glabel D_80A32818 - .asciz "z_common_data.yabusame_total = %d\n" - .balign 4 - -glabel D_80A3283C - .asciz "../z_en_ge1.c" - .balign 4 - -glabel D_80A3284C - .asciz "z_common_data.memory.information.room_inf[127][ 0 ] = %d\n" - .balign 4 - -glabel D_80A32888 - .asciz "../z_en_ge1.c" - .balign 4 - -glabel D_80A32898 - .asciz "../z_en_ge1.c" - .balign 4 - -glabel D_80A328A8 - .asciz "../z_en_ge1.c" - .balign 4 - -glabel D_80A328B8 - .word 0x2E2E2F7A, 0x5F656E5F, 0x6765312E, 0x63000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ge2.rodata.s b/data/overlays/actors/z_en_ge2.rodata.s deleted file mode 100644 index 11f9b6dc06..0000000000 --- a/data/overlays/actors/z_en_ge2.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A343D0 - .word 0x30000000 -glabel D_80A343D4 - .asciz "../z_en_ge2.c" - .balign 4 - -glabel D_80A343E4 - .asciz "発見!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80A34400 - .asciz "発見!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80A3441C - .asciz "../z_en_ge2.c" - .balign 4 - -glabel D_80A3442C - .word 0x2E2E2F7A, 0x5F656E5F, 0x6765322E, 0x63000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ge3.rodata.s b/data/overlays/actors/z_en_ge3.rodata.s deleted file mode 100644 index 51653c6688..0000000000 --- a/data/overlays/actors/z_en_ge3.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A351E0 - .asciz "../z_en_ge3.c" - .balign 4 - -glabel D_80A351F0 - .asciz "../z_en_ge3.c" - .balign 4 - -glabel D_80A35200 - .asciz "../z_en_ge3.c" - .balign 4 - -glabel D_80A35210 - .asciz "../z_en_ge3.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_en_geldb.rodata.s b/data/overlays/actors/z_en_geldb.rodata.s deleted file mode 100644 index 290b652bfb..0000000000 --- a/data/overlays/actors/z_en_geldb.rodata.s +++ /dev/null @@ -1,95 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A3A1E0 - .asciz "../z_en_geldB.c" - .balign 4 - -glabel D_80A3A1F0 - .asciz "../z_en_geldB.c" - .balign 4 - -glabel D_80A3A200 - .asciz "../z_en_geldB.c" - .balign 4 - -glabel D_80A3A210 - .asciz "../z_en_geldB.c" - .balign 4 - -glabel D_80A3A220 - .word 0x3E99999A -glabel D_80A3A224 - .word 0x3E99999A -glabel D_80A3A228 - .word 0x3F333333 -glabel D_80A3A22C - .word 0x3CF5C28F -glabel D_80A3A230 - .word 0x3F4CCCCD -glabel D_80A3A234 - .word 0xBF4CCCCD -glabel D_80A3A238 - .word 0xBF4CCCCD -glabel D_80A3A23C - .word 0xBF59999A -glabel D_80A3A240 - .word 0xBF4CCCCD -glabel D_80A3A244 - .word 0x3F333333 -glabel D_80A3A248 - .word 0x3F333333 -glabel D_80A3A24C - .word 0x3F333333 -glabel D_80A3A250 - .word 0x3F333333 -glabel D_80A3A254 - .word 0x3E4CCCCD -glabel D_80A3A258 - .word 0x3D4CCCCD -glabel D_80A3A25C - .word 0x3D4CCCCD -glabel D_80A3A260 - .word 0x3F333333 -glabel D_80A3A264 - .word 0xBF4CCCCD -glabel D_80A3A268 - .word 0xBF4CCCCD -glabel D_80A3A26C - .word 0x460B6000 -glabel D_80A3A270 - .word 0x3DCCCCCD -glabel jtbl_80A3A274 -.word L80A39A08 -.word L80A399E0 -.word L80A39A24 -.word L80A39A24 -.word L80A39A24 -.word L80A39A00 -.word L80A39A24 -.word L80A39A24 -.word L80A39A24 -.word L80A399F0 -.word L80A399F8 -.word L80A39A24 -.word L80A39A24 -.word L80A39A24 -.word L80A399E8 -.word L80A39A24 -.word L80A39A24 -.word L80A39A18 -.word L80A39A24 -.word L80A39A24 -.word L80A39A20 -.word L80A39A10 -.word 0x00000000 -glabel D_80A3A2D0 - .word 0x4082C000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_girla.rodata.s b/data/overlays/actors/z_en_girla.rodata.s deleted file mode 100644 index f32ec96b0c..0000000000 --- a/data/overlays/actors/z_en_girla.rodata.s +++ /dev/null @@ -1,200 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A3CCD0 - .word 0xA5C7A5AF, 0xA4CEBCC2, 0xA1DF3520, 0x20200000 -glabel D_80A3CCE0 - .word 0xCCF0A1DF, 0x33302020, 0x20202020, 0x20200000 -glabel D_80A3CCF0 - .word 0xCCF0A1DF, 0x35302020, 0x20202020, 0x20200000 -glabel D_80A3CD00 - .word 0xC7FAC3C6, 0xA1DF3520, 0x20202020, 0x20200000 -glabel D_80A3CD10 - .word 0xA5C7A5AF, 0xA4CEBCC2, 0xA1DF3130, 0x20200000 -glabel D_80A3CD20 - .word 0xA5C7A5AF, 0xA4CECBC0, 0x20202020, 0x20200000 -glabel D_80A3CD30 - .word 0xC7FAC3C6, 0xA1DF3130, 0x20202020, 0x20200000 -glabel D_80A3CD40 - .word 0xA4B5A4AB, 0xA4CA2020, 0x20202020, 0x20200000 -glabel D_80A3CD50 - .word 0xC0D6A5AF, 0xA5B9A5EA, 0x20202020, 0x20200000 -glabel D_80A3CD60 - .word 0xCED0A5AF, 0xA5B9A5EA, 0x20202020, 0x20200000 -glabel D_80A3CD70 - .word 0xC0C4A5AF, 0xA5B9A5EA, 0x20202020, 0x20200000 -glabel D_80A3CD80 - .word 0xB5F0BFCD, 0xA4CEA5CA, 0xA5A4A5D5, 0x20200000 -glabel D_80A3CD90 - .word 0xA5CFA5A4, 0xA5EAA5A2, 0xA4CEBDE2, 0x20200000 -glabel D_80A3CDA0 - .word 0xA5C7A5AF, 0xA4CEBDE2, 0x20202020, 0x20200000 -glabel D_80A3CDB0 - .word 0xA5B4A5ED, 0xA5F3A4CE, 0xC9FE2020, 0x20200000 -glabel D_80A3CDC0 - .word 0xA5BEA8A1, 0xA5E9A4CE, 0xC9FE2020, 0x20200000 -glabel D_80A3CDD0 - .word 0xB2F3C9FC, 0xA4CEA5CF, 0xA1BCA5C8, 0x20200000 -glabel D_80A3CDE0 - .word 0xA5EDA5F3, 0xA5EDA5F3, 0xB5EDC6FD, 0x20200000 -glabel D_80A3CDF0 - .word 0xB7DCA4CE, 0xCDF12020, 0x20202020, 0x20200000 -glabel D_80A3CE00 - .word 0xA5A4A5F3, 0xA5B4A1BC, 0xB5EDC6FD, 0x20200000 -glabel D_80A3CE10 - .word 0xA5A4A5F3, 0xA5B4A1BC, 0xCDF12020, 0x20200000 -glabel D_80A3CE20 - .word 0xA4E2A4C0, 0xA4A8C0D0, 0x20202020, 0x20200000 -glabel D_80A3CE30 - .word 0xC2E7BFCD, 0xA4CEBAE2, 0xC9DB2020, 0x20200000 -glabel D_80A3CE40 - .word 0xA5CFA1BC, 0xA5C8A4CE, 0xB7E7CAD2, 0x20200000 -glabel D_80A3CE50 - .word 0xA5DCA5E0, 0xA5C1A5E5, 0xA5A62020, 0x20200000 -glabel D_80A3CE60 - .word 0xA5DCA5E0, 0xA5C1A5E5, 0xA5A62020, 0x20200000 -glabel D_80A3CE70 - .word 0xA5DCA5E0, 0xA5C1A5E5, 0xA5A62020, 0x20200000 -glabel D_80A3CE80 - .word 0xA5DCA5E0, 0xA5C1A5E5, 0xA5A62020, 0x20200000 -glabel D_80A3CE90 - .word 0xA5DCA5E0, 0xA5C1A5E5, 0xA5A62020, 0x20200000 -glabel D_80A3CEA0 - .word 0xA5C7A5AF, 0xA4CEA5BF, 0xA5CD2020, 0x20200000 -glabel D_80A3CEB0 - .word 0xA5ADA1BC, 0xA5BFA5F3, 0xA4CEA4AA, 0xCCCC0000 -glabel D_80A3CEC0 - .word 0xA4B3A4EF, 0xA4BDA4CA, 0xA4AACCCC, 0x20200000 -glabel D_80A3CED0 - .word 0xA5C9A5AF, 0xA5EDA4CE, 0xA4AACCCC, 0x20200000 -glabel D_80A3CEE0 - .word 0xA5A6A5B5, 0xA5AEA4BA, 0xA4ADA4F3, 0x20200000 -glabel D_80A3CEF0 - .word 0xA4DEA4B3, 0xA4C8A4CE, 0xB2BECCCC, 0x20200000 -glabel D_80A3CF00 - .word 0xA5BEA1BC, 0xA5E9A4CE, 0xA4AACCCC, 0x20200000 -glabel D_80A3CF10 - .word 0xA5B4A5ED, 0xA5F3A4CE, 0xA4AACCCC, 0x20200000 -glabel D_80A3CF20 - .word 0xA5B2A5EB, 0xA5C9A4CE, 0xA4AACCCC, 0x20200000 -glabel D_80A3CF30 - .word 0xA3D3A3CF, 0xA3CCA3C4, 0xA3CFA3D5, 0xA3D40000 -glabel D_80A3CF40 - .word 0xB1EA2020, 0x20202020, 0x20202020, 0x20200000 -glabel D_80A3CF50 - .word 0xC3EE2020, 0x20202020, 0x20202020, 0x20200000 -glabel D_80A3CF60 - .word 0xA5C1A5E7, 0xA5A6A5C1, 0xA5E72020, 0x20200000 -glabel D_80A3CF70 - .word 0xA5DDA5A6, 0x20202020, 0x20202020, 0x20200000 -glabel D_80A3CF80 - .word 0xCDC5C0BA, 0xA4CEBAB2, 0x20202020, 0x20200000 -glabel D_80A3CF90 - .word 0xCCF0A1DF, 0x31302020, 0x20202020, 0x20200000 -glabel D_80A3CFA0 - .word 0xC7FAC3C6, 0xA1DF3230, 0x20202020, 0x20200000 -glabel D_80A3CFB0 - .word 0xC7FAC3C6, 0xA1DF3330, 0x20202020, 0x20200000 -glabel D_80A3CFC0 - .word 0xC7FAC3C6, 0xA1DF3520, 0x20202020, 0x20200000 -glabel D_80A3CFD0 - .word 0xC0D6A5AF, 0xA5B9A5EA, 0x20202020, 0x20200000 -glabel D_80A3CFE0 - .word 0xC0D6A5AF, 0xA5B9A5EA, 0x20202020, 0x20200000 -glabel D_80A3CFF0 - .asciz "%s(%2d)初期設定\n" - .balign 4 - -.balign 4 - -glabel D_80A3D004 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A3D010 - .asciz "引数がおかしいよ(arg_data=%d)！！\n" - .balign 4 - -glabel D_80A3D034 - .word 0x1B5B6D00 -glabel D_80A3D038 - .word 0x30000000 -glabel D_80A3D03C - .asciz "../z_en_girlA.c" - .balign 4 - -glabel D_80A3D04C - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A3D058 - .asciz "バンクが無いよ！！(%s)\n" - .balign 4 - -glabel D_80A3D070 - .word 0x1B5B6D00 -glabel D_80A3D074 - .word 0x30000000 -glabel D_80A3D078 - .asciz "../z_en_girlA.c" - .balign 4 - -glabel D_80A3D088 - .asciz "%s(%2d)初期設定\n" - .balign 4 - -.balign 4 - -glabel D_80A3D09C - .word 0x25732825, 0x3264290A, 0x00000000 -glabel jtbl_80A3D0A8 -.word L80A3A780 -.word L80A3A8C4 -.word L80A3A8C4 -.word L80A3A8C4 -.word func_80A3A858 -.word func_80A3A87C -.word func_80A3A8A0 -.word func_80A3A7A4 -.word func_80A3A7C8 -.word func_80A3A7EC -.word func_80A3A810 -.word func_80A3A834 -glabel jtbl_80A3D0D8 -.word L80A3BAFC -.word L80A3BB0C -.word L80A3BB1C -.word L80A3BB2C -.word L80A3BB3C -glabel D_80A3D0EC - .word 0x40FCCCCD -glabel jtbl_80A3D0F0 -.word L80A3BD18 -.word L80A3BD30 -.word L80A3BD48 -.word L80A3BCA0 -.word L80A3BCB8 -.word L80A3BCD0 -.word L80A3BCE8 -.word L80A3BD00 -glabel jtbl_80A3D110 -.word L80A3BDE0 -.word L80A3BDFC -.word L80A3BE18 -.word L80A3BE34 -.word L80A3BE50 -glabel jtbl_80A3D124 -.word L80A3C05C -.word L80A3C0AC -.word L80A3C0FC -.word L80A3C14C -.word L80A3C19C -.word L80A3C1F4 -.word L80A3C218 -.word L80A3C23C -glabel D_80A3D144 - .word 0x3C8EFA35, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_gm.rodata.s b/data/overlays/actors/z_en_gm.rodata.s deleted file mode 100644 index 90a7d3fb13..0000000000 --- a/data/overlays/actors/z_en_gm.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A3E390 - .asciz "%s[%d] : 中ゴロン[%d]\n" - .balign 4 - -glabel D_80A3E3B0 - .asciz "../z_en_gm.c" - .balign 4 - -glabel D_80A3E3C0 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A3E3CC - .word 0xA5E2A5C7, 0xA5EB20A5, 0xD0A5F3A5, 0xAFA4ACCC, 0xB5A4A4A4, 0xE8A1AAA1, 0xAAA1CAC3, 0xE6A5B4A5, 0xEDA5F3A1, 0xCB0A0000 -glabel D_80A3E3F4 - .word 0x1B5B6D00 -glabel D_80A3E3F8 - .word 0x30000000 -glabel D_80A3E3FC - .asciz "../z_en_gm.c" - .balign 4 - -glabel D_80A3E40C - .asciz "../z_en_gm.c" - .balign 4 - -glabel D_80A3E41C - .asciz "../z_en_gm.c" - .balign 4 - -glabel D_80A3E42C - .word 0x461C4000 -glabel D_80A3E430 - .word 0x461C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_go.rodata.s b/data/overlays/actors/z_en_go.rodata.s index c6adb67f86..026eeababb 100644 --- a/data/overlays/actors/z_en_go.rodata.s +++ b/data/overlays/actors/z_en_go.rodata.s @@ -321,15 +321,21 @@ glabel D_80A41F84 glabel D_80A420C8 .word 0x462AA000 glabel D_80A420CC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80A420D0 - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_80A420D4 .word 0x4099999A glabel D_80A420D8 .word 0x4622F983 glabel D_80A420DC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80A420E0 .word 0x4099999A glabel jtbl_80A420E4 @@ -449,27 +455,47 @@ glabel jtbl_80A420E4 glabel D_80A422A8 .word 0x49AFC800 glabel D_80A422AC - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A422B0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A422B4 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A422B8 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A422BC .word 0xBDCCCCCD glabel D_80A422C0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80A422C4 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A422C8 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A422CC - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A422D0 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A422D4 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A422D8 .word 0x3ECCCCCD, 0x00000000 diff --git a/data/overlays/actors/z_en_go2.rodata.s b/data/overlays/actors/z_en_go2.rodata.s index 3927e9240a..e8a1010df7 100644 --- a/data/overlays/actors/z_en_go2.rodata.s +++ b/data/overlays/actors/z_en_go2.rodata.s @@ -52,9 +52,13 @@ glabel D_80A4863C .balign 4 glabel D_80A4864C - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80A48650 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel jtbl_80A48654 .word L80A43550 .word L80A43530 @@ -143,19 +147,33 @@ glabel jtbl_80A48758 .word L80A46940 .word L80A466BC glabel D_80A48790 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_80A48794 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_80A48798 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_80A4879C - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_80A487A0 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_80A487A4 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_80A487A8 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel jtbl_80A487AC .word L80A475D4 .word L80A4788C @@ -163,13 +181,21 @@ glabel jtbl_80A487AC .word L80A477EC .word L80A47860 glabel D_80A487C0 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_80A487C4 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A487C8 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A487CC - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A487D0 .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/actors/z_en_goma.rodata.s b/data/overlays/actors/z_en_goma.rodata.s deleted file mode 100644 index 68df228497..0000000000 --- a/data/overlays/actors/z_en_goma.rodata.s +++ /dev/null @@ -1,115 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A4B880 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B890 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B8A0 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B8B0 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B8C0 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B8D0 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B8E0 - .asciz "../z_en_goma.c" - .balign 4 - -glabel D_80A4B8F0 - .word 0xBFA66666 -glabel D_80A4B8F4 - .word 0x40133333 -glabel D_80A4B8F8 - .word 0x3BA3D70A -glabel D_80A4B8FC - .word 0x3C23D70A -glabel D_80A4B900 - .word 0x3BA3D70A -glabel D_80A4B904 - .word 0x3C23D70A -glabel D_80A4B908 - .word 0x3BA3D70A -glabel D_80A4B90C - .word 0x3C23D70A -glabel D_80A4B910 - .word 0xC4BB8000 -glabel D_80A4B914 - .word 0x44BB8000 -glabel D_80A4B918 - .word 0xBFA66666 -glabel D_80A4B91C - .word 0x3CF5C28F -glabel D_80A4B920 - .word 0x3DCCCCCD -glabel D_80A4B924 - .word 0x3CF5C28F -glabel D_80A4B928 - .word 0x3727C5AC -glabel D_80A4B92C - .word 0x3A83126F -glabel D_80A4B930 - .word 0x40490FDB -glabel D_80A4B934 - .word 0x38000100 -glabel D_80A4B938 - .word 0x4622F983 -glabel D_80A4B93C - .word 0x4622F983 -glabel D_80A4B940 - .word 0x358637BD -glabel D_80A4B944 - .word 0x358637BD -glabel D_80A4B948 - .word 0x358637BD -glabel D_80A4B94C - .word 0x40490FDB -glabel D_80A4B950 - .word 0x40490FDB -glabel D_80A4B954 - .word 0x40490FDB -glabel D_80A4B958 - .word 0x40490FDB -glabel D_80A4B95C - .word 0x40490FDB -glabel D_80A4B960 - .word 0x40490E56 -glabel D_80A4B964 - .word 0x41FF3333 -glabel D_80A4B968 - .word 0x3E19999A -glabel D_80A4B96C - .word 0x3DCCCCCD -glabel D_80A4B970 - .word 0x3F733333 -glabel D_80A4B974 - .word 0x3F866666 -glabel D_80A4B978 - .word 0x3DCCCCCD -glabel D_80A4B97C - .word 0x3E19999A -glabel D_80A4B980 - .word 0x477FFFFD -glabel D_80A4B984 - .word 0x3A83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_goroiwa.rodata.s b/data/overlays/actors/z_en_goroiwa.rodata.s deleted file mode 100644 index 3a8a455d93..0000000000 --- a/data/overlays/actors/z_en_goroiwa.rodata.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A4DF30 - .asciz "Error : レールデータ不正(点が重なっている)" - .balign 4 - -glabel D_80A4DF5C - .asciz "(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A4DF78 - .asciz "../z_en_gr.c" - .balign 4 - -glabel D_80A4DF88 - .asciz "Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A4DFC0 - .asciz "../z_en_gr.c" - .balign 4 - -glabel D_80A4DFD0 - .asciz "Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n" - .balign 4 - -glabel D_80A4DFFC - .asciz "../z_en_gr.c" - .balign 4 - -glabel D_80A4E00C - .asciz "(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n" - .balign 4 - -glabel D_80A4E044 - .word 0x1B5B3336, 0x6D000000 -glabel D_80A4E04C - .asciz "Player ぶっ飛ばし\n" - .balign 4 - -glabel D_80A4E060 - .word 0x1B5B6D00 -glabel D_80A4E064 - .word 0x3A83126F -glabel D_80A4E068 - .word 0x3C23D70A -glabel D_80A4E06C - .word 0x3C23D70A -glabel D_80A4E070 - .word 0x3C23D70A -glabel D_80A4E074 - .word 0xBE99999A -glabel D_80A4E078 - .word 0x3E99999A -glabel D_80A4E07C - .word 0x3E4CCCCD -glabel D_80A4E080 - .word 0x3C89AE41 -glabel D_80A4E084 - .word 0x38C90FDB -glabel D_80A4E088 - .word 0x38C90FDB -glabel D_80A4E08C - .word 0x38C90FDB -glabel D_80A4E090 - .word 0x477FFF00 -glabel D_80A4E094 - .word 0x3E4CCCCD -glabel D_80A4E098 - .word 0xBF5C28F6 -glabel D_80A4E09C - .word 0x3E19999A -glabel D_80A4E0A0 - .word 0x3DCCCCCD -glabel D_80A4E0A4 - .word 0x3E99999A -glabel D_80A4E0A8 - .word 0xBE99999A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_gs.rodata.s b/data/overlays/actors/z_en_gs.rodata.s deleted file mode 100644 index 38b09d519b..0000000000 --- a/data/overlays/actors/z_en_gs.rodata.s +++ /dev/null @@ -1,123 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A4FE50 - .asciz "../z_en_gs.c" - .balign 4 - -glabel D_80A4FE60 - .asciz "../z_en_gs.c" - .balign 4 - -glabel D_80A4FE70 - .asciz "../z_en_gs.c" - .balign 4 - -glabel D_80A4FE80 - .asciz "../z_en_gs.c" - .balign 4 - -glabel D_80A4FE90 - .word 0x3C8EFA35 -glabel D_80A4FE94 - .word 0x3C8EFA35 -glabel D_80A4FE98 - .word 0x3F4CCCCD -glabel D_80A4FE9C - .word 0x3BE56042 -glabel D_80A4FEA0 - .word 0x3A83126F -glabel D_80A4FEA4 - .word 0x3E99999A -glabel D_80A4FEA8 - .word 0x43360B61 -glabel D_80A4FEAC - .word 0x3F4CCCCD -glabel D_80A4FEB0 - .word 0x3BA3D70A -glabel D_80A4FEB4 - .word 0x3A83126F -glabel D_80A4FEB8 - .word 0xBF4CCCCD -glabel D_80A4FEBC - .word 0x3A83126F -glabel D_80A4FEC0 - .word 0x3A83126F -glabel D_80A4FEC4 - .word 0x3CF5C28F -glabel D_80A4FEC8 - .word 0x3A83126F -glabel D_80A4FECC - .word 0x463B8000 -glabel D_80A4FED0 - .word 0x3E99999A -glabel D_80A4FED4 - .word 0xC63B8000 -glabel D_80A4FED8 - .word 0x3DCCCCCD -glabel D_80A4FEDC - .word 0x3A83126F -glabel D_80A4FEE0 - .word 0x3A83126F -glabel D_80A4FEE4 - .word 0x43360B61 -glabel D_80A4FEE8 - .word 0x43360B61 -glabel D_80A4FEEC - .word 0xBE99999A -glabel D_80A4FEF0 - .word 0x3A83126F -glabel D_80A4FEF4 - .word 0x3A83126F -glabel D_80A4FEF8 - .word 0x3F32B8C2 -glabel D_80A4FEFC - .word 0x3EB2B8C2 -glabel D_80A4FF00 - .word 0x45638000 -glabel D_80A4FF04 - .word 0x3A83126F -glabel D_80A4FF08 - .word 0x3A83126F -glabel D_80A4FF0C - .word 0x3A83126F -glabel D_80A4FF10 - .word 0x3A83126F -glabel D_80A4FF14 - .word 0x3DCCCCCD -glabel D_80A4FF18 - .word 0x3C8EFA35 -glabel D_80A4FF1C - .word 0x3DCCCCCD -glabel D_80A4FF20 - .word 0x3C8EFA35 -glabel jtbl_80A4FF24 -.word L80A4F8F8 -.word L80A4F8D4 -.word L80A4F8B0 -.word L80A4F88C -.word L80A4F868 -glabel D_80A4FF38 - .word 0x38C90FDB -glabel D_80A4FF3C - .word 0x38C90FDB -glabel D_80A4FF40 - .word 0x38C90FDB -glabel D_80A4FF44 - .word 0x38C90FDB -glabel D_80A4FF48 - .word 0x38C90FDB -glabel D_80A4FF4C - .word 0x38C90FDB -glabel D_80A4FF50 - .word 0x3D4CCCCD -glabel D_80A4FF54 - .word 0xBD4CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_guest.rodata.s b/data/overlays/actors/z_en_guest.rodata.s deleted file mode 100644 index d6ebb70d0c..0000000000 --- a/data/overlays/actors/z_en_guest.rodata.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A50BB0 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80A50BBC - .asciz "%s[%d] : バンクが無いよ！！\n" - .balign 4 - -glabel D_80A50BDC - .asciz "../z_en_guest.c" - .balign 4 - -glabel D_80A50BEC - .word 0x1B5B6D00 -glabel D_80A50BF0 - .word 0x30000000 -glabel D_80A50BF4 - .asciz "../z_en_guest.c" - .balign 4 - -glabel D_80A50C04 - .asciz "../z_en_guest.c" - .balign 4 - -glabel D_80A50C14 - .asciz "../z_en_guest.c" - .balign 4 - -glabel D_80A50C24 - .asciz "../z_en_guest.c" - .balign 4 - -glabel D_80A50C34 - .asciz "../z_en_guest.c" - .balign 4 - -glabel D_80A50C44 - .word 0x40490FDB -glabel D_80A50C48 - .word 0x40490FDB -glabel D_80A50C4C - .word 0x40490FDB -glabel D_80A50C50 - .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_hata.rodata.s b/data/overlays/actors/z_en_hata.rodata.s deleted file mode 100644 index 61905acdf7..0000000000 --- a/data/overlays/actors/z_en_hata.rodata.s +++ /dev/null @@ -1,19 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A51260 - .word 0x44098000 -glabel D_80A51264 - .word 0x45098000 -glabel D_80A51268 - .word 0x477FFF00 -glabel D_80A5126C - .word 0x3F8CCCCD - - diff --git a/data/overlays/actors/z_en_heishi1.rodata.s b/data/overlays/actors/z_en_heishi1.rodata.s deleted file mode 100644 index 64e089c738..0000000000 --- a/data/overlays/actors/z_en_heishi1.rodata.s +++ /dev/null @@ -1,123 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A52930 - .asciz " 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A5295C - .asciz " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A52988 - .asciz " anime_frame_speed ☆☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A529B4 - .asciz " 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A529E0 - .asciz " point間の移動スピード目標値 ☆ %f\n" - .balign 4 - -glabel D_80A52A0C - .asciz " point間の移動スピード最大 ☆☆ %f\n" - .balign 4 - -glabel D_80A52A38 - .asciz " (体)反転アングルスピード目標値 %f\n" - .balign 4 - -glabel D_80A52A64 - .asciz " (体)反転アングルスピード最大☆ %f\n" - .balign 4 - -glabel D_80A52A90 - .asciz " (頭)反転アングルスピード加算値 %f\n" - .balign 4 - -glabel D_80A52ABC - .asciz " (頭)反転アングルスピード最大☆ %f\n" - .balign 4 - -glabel D_80A52AE8 - .asciz " 今時間 %d\n" - .balign 4 - -glabel D_80A52AFC - .asciz " チェック時間 %d\n" - .balign 4 - -glabel D_80A52B18 - .word 0x0A0A0000 -glabel D_80A52B1C - .asciz " 種類 %d\n" - .balign 4 - -glabel D_80A52B30 - .asciz " ぱす %d\n" - .balign 4 - -glabel D_80A52B44 - .asciz " 反転 %d\n" - .balign 4 - -glabel D_80A52B58 - .asciz " 時間 %d\n" - .balign 4 - -glabel D_80A52B6C - .asciz " 点座 %d\n" - .balign 4 - -glabel D_80A52B80 - .word 0x0A0A0000 -glabel D_80A52B84 - .asciz " 種類 %d\n" - .balign 4 - -glabel D_80A52B98 - .asciz " ぱす %d\n" - .balign 4 - -glabel D_80A52BAC - .asciz " 反転 %d\n" - .balign 4 - -glabel D_80A52BC0 - .asciz " 時間 %d\n" - .balign 4 - -glabel D_80A52BD4 - .word 0x0A0A0000 -glabel D_80A52BD8 - .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A52C00 - .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A52C28 - .word 0x3FFEB852 -glabel D_80A52C2C - .word 0x4622F983 -glabel D_80A52C30 - .word 0x3FFEB852 -glabel D_80A52C34 - .word 0x3FFEB852 -glabel D_80A52C38 - .word 0x44098000 -glabel D_80A52C3C - .word 0x40490FDB -glabel D_80A52C40 - .word 0xC079999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_heishi2.rodata.s b/data/overlays/actors/z_en_heishi2.rodata.s deleted file mode 100644 index a46c453089..0000000000 --- a/data/overlays/actors/z_en_heishi2.rodata.s +++ /dev/null @@ -1,127 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A54F40 - .word 0x0A0A0000 -glabel D_80A54F44 - .asciz " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A54F7C - .word 0x0A0A0000 -glabel D_80A54F80 - .asciz " ☆☆☆☆☆ 覗き穴奥兵士ふぃ〜 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A54FB4 - .word 0x0A0A0000 -glabel D_80A54FB8 - .asciz " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A54FF0 - .asciz " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A55028 - .asciz " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" - .balign 4 - -glabel D_80A55060 - .asciz " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55094 - .asciz " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A550C8 - .asciz " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A550F8 - .asciz " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A5512C - .asciz " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55160 - .asciz " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55194 - .asciz "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" - .balign 4 - -glabel D_80A551C0 - .asciz " ☆☆☆☆☆ とおしゃしねぇちゅーの ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A551F8 - .asciz "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" - .balign 4 - -glabel D_80A55224 - .asciz " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55258 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A5526C - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A55280 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A55294 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A552A8 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A552BC - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A552D0 - .word 0x446CC000 -glabel D_80A552D4 - .word 0x44956000 -glabel D_80A552D8 - .word 0x4527A000 -glabel D_80A552DC - .word 0x44918000 -glabel D_80A552E0 - .word 0x448F2000 -glabel D_80A552E4 - .word 0x453C6000 -glabel D_80A552E8 - .word 0x440EC000 -glabel D_80A552EC - .word 0xC4B9E000 -glabel D_80A552F0 - .word 0x43D08000 -glabel D_80A552F4 - .word 0xC486E000 -glabel D_80A552F8 - .word 0x45DAC000 -glabel D_80A552FC - .word 0xC40E8000 -glabel D_80A55300 - .word 0x3F9C61AA, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_heishi3.rodata.s b/data/overlays/actors/z_en_heishi3.rodata.s deleted file mode 100644 index 84bba529d2..0000000000 --- a/data/overlays/actors/z_en_heishi3.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A55F90 - .asciz "☆☆☆☆☆ 城門兵パワーアップ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55FC4 - .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55FEC - .word 0x1B5B3332, 0x6DA1F9A1, 0xF9A1F9A1, 0xF9A1F920, 0xC8AFB8AB, 0xA1AA20A1, 0xF9A1F9A1, 0xF9A1F9A1, 0xF9200A1B, 0x5B6D0000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_heishi4.rodata.s b/data/overlays/actors/z_en_heishi4.rodata.s deleted file mode 100644 index f240e0aa3e..0000000000 --- a/data/overlays/actors/z_en_heishi4.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A56F30 - .word 0x0A0A0000 -glabel D_80A56F34 - .asciz " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A56F6C - .asciz " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A56FA0 - .asciz " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" - .balign 4 - -glabel D_80A56FD8 - .word 0x0A0A0000 -glabel D_80A56FDC - .asciz " ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A57010 - .asciz " ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A57048 - .asciz " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A57074 - .asciz " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" - .balign 4 - - - diff --git a/data/overlays/actors/z_en_hintnuts.rodata.s b/data/overlays/actors/z_en_hintnuts.rodata.s deleted file mode 100644 index 33a8e6a296..0000000000 --- a/data/overlays/actors/z_en_hintnuts.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A58A50 - .word 0x3DAA9931 -glabel D_80A58A54 - .word 0x3DEF0069 -glabel D_80A58A58 - .word 0x3FD9999A -glabel D_80A58A5C - .word 0x3F333333 -glabel D_80A58A60 - .word 0x3E2AB368, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_holl.rodata.s b/data/overlays/actors/z_en_holl.rodata.s deleted file mode 100644 index 119ad78197..0000000000 --- a/data/overlays/actors/z_en_holl.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A59AF0 - .asciz "../z_en_holl.c" - .balign 4 - -glabel D_80A59B00 - .asciz "../z_en_holl.c" - .balign 4 - -glabel D_80A59B10 - .asciz "../z_en_holl.c" - .balign 4 - -glabel D_80A59B20 - .word 0x44174000 -glabel D_80A59B24 - .word 0x3FD9999A -glabel D_80A59B28 - .word 0x40BCCCCD -glabel D_80A59B2C - .word 0x40490FDB - - diff --git a/data/overlays/actors/z_en_honotrap.rodata.s b/data/overlays/actors/z_en_honotrap.rodata.s deleted file mode 100644 index 2aaca64dd0..0000000000 --- a/data/overlays/actors/z_en_honotrap.rodata.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A5B070 - .asciz "Warning : vector size zero (%s %d)\n" - .balign 4 - -glabel D_80A5B094 - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B0A8 - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B0BC - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B0D0 - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B0E4 - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B0F8 - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B10C - .asciz "../z_en_honotrap.c" - .balign 4 - -glabel D_80A5B120 - .word 0x3A83126F -glabel D_80A5B124 - .word 0x43FF8000 -glabel D_80A5B128 - .word 0x443B8000 -glabel D_80A5B12C - .word 0x3B83126F -glabel D_80A5B130 - .word 0x3B9D4952 -glabel D_80A5B134 - .word 0x3DA3D70A -glabel D_80A5B138 - .word 0xBDA3D70A -glabel D_80A5B13C - .word 0x3F733333 -glabel D_80A5B140 - .word 0x3DCCCCCD -glabel D_80A5B144 - .word 0x38C90FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_horse.rodata.s b/data/overlays/actors/z_en_horse.rodata.s deleted file mode 100644 index 42ef57d3fb..0000000000 --- a/data/overlays/actors/z_en_horse.rodata.s +++ /dev/null @@ -1,219 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A66800 - .asciz "this->race.rider != NULL" - .balign 4 - -glabel D_80A6681C - .asciz "../z_en_horse.c" - .balign 4 - -glabel D_80A6682C - .asciz "../z_en_horse.c" - .balign 4 - -glabel D_80A6683C - .asciz "../z_en_horse.c" - .balign 4 - -glabel D_80A6684C - .word 0x414CCCCD -glabel D_80A66850 - .word 0x414CCCCD -glabel D_80A66854 - .word 0x47AFC800 -glabel D_80A66858 - .word 0x3F4CCCCD -glabel D_80A6685C - .word 0x3EF0A3D7 -glabel D_80A66860 - .word 0x3EF0A3D7 -glabel D_80A66864 - .word 0x3ECCCCCD -glabel D_80A66868 - .word 0x3ECCCCCD -glabel D_80A6686C - .word 0x3F707379 -glabel D_80A66870 - .word 0x3F333333 -glabel D_80A66874 - .word 0x3C03126F -glabel D_80A66878 - .word 0x7E967699 -glabel D_80A6687C - .word 0x41411EB8 -glabel D_80A66880 - .word 0x3D75C28F -glabel D_80A66884 - .word 0x3C97B426 -glabel D_80A66888 - .word 0x3C23D70A -glabel D_80A6688C - .word 0x38021CC8 -glabel D_80A66890 - .word 0x400CCCCD, 0x00000000 -glabel D_80A66898 - .word 0x3FE6A090, 0x2DE00D1B -glabel D_80A668A0 - .word 0x3FE6A090, 0x2DE00D1B -glabel D_80A668A8 - .word 0x3FE6A090, 0x2DE00D1B -glabel D_80A668B0 - .word 0x3FE6A090, 0x2DE00D1B -glabel D_80A668B8 - .word 0x3D75C28F -glabel D_80A668BC - .word 0x3D75C28F -glabel D_80A668C0 - .word 0x3C23D70A -glabel D_80A668C4 - .word 0x3D75C28F -glabel D_80A668C8 - .word 0x3E99999A -glabel D_80A668CC - .word 0x3F19999A -glabel D_80A668D0 - .word 0x3C23D70A -glabel D_80A668D4 - .word 0x3C23D70A -glabel D_80A668D8 - .word 0x3C23D70A -glabel D_80A668DC - .word 0x3C23D70A -glabel D_80A668E0 - .word 0x46FFFE00 -glabel D_80A668E4 - .word 0x46FFFE00 -glabel D_80A668E8 - .word 0xC6FFFE00 -glabel D_80A668EC - .word 0x46FFFE00 -glabel D_80A668F0 - .word 0x3E99999A -glabel D_80A668F4 - .word 0x3E4CCCCD -glabel D_80A668F8 - .word 0x3E4CCCCD -glabel D_80A668FC - .word 0x3E99999A -glabel D_80A66900 - .word 0x3E99999A -glabel D_80A66904 - .word 0x3E99999A -glabel D_80A66908 - .word 0x3C23D70A -glabel D_80A6690C - .word 0x3C23D70A -glabel D_80A66910 - .word 0x3C23D70A -glabel D_80A66914 - .word 0x3E99999A -glabel D_80A66918 - .word 0x3E99999A -glabel D_80A6691C - .word 0x3E99999A -glabel D_80A66920 - .word 0x3ECCCCCD -glabel D_80A66924 - .word 0x3ECCCCCD -glabel D_80A66928 - .word 0x3E4CCCCD -glabel D_80A6692C - .word 0x3E4CCCCD -glabel D_80A66930 - .word 0x3ECCCCCD -glabel D_80A66934 - .word 0x3EF0A3D7 -glabel D_80A66938 - .word 0x3ECCCCCD -glabel D_80A6693C - .word 0x3EF0A3D7 -glabel D_80A66940 - .word 0x3E99999A -glabel D_80A66944 - .word 0x3DCCCCCD -glabel D_80A66948 - .word 0x3C23D70A -glabel D_80A6694C - .word 0x4242CCCD -glabel D_80A66950 - .word 0xBECCCCCD -glabel D_80A66954 - .word 0x38000100 -glabel D_80A66958 - .word 0x3F51B3F3 -glabel D_80A6695C - .word 0x4622F983 -glabel D_80A66960 - .word 0x38000100 -glabel D_80A66964 - .word 0x3F51B3F3 -glabel D_80A66968 - .word 0x45FFF800 -glabel D_80A6696C - .word 0x4622F983 -glabel D_80A66970 - .word 0x38000100 -glabel D_80A66974 - .word 0x4622F983 -glabel D_80A66978 - .word 0x3F350481 -glabel D_80A6697C - .word 0xBE99999A -glabel D_80A66980 - .word 0x414CCCCD -glabel D_80A66984 - .word 0x4622F983 -glabel D_80A66988 - .word 0x38000100 -glabel D_80A6698C - .word 0x38000100 -glabel D_80A66990 - .word 0x38000100 -glabel D_80A66994 - .word 0x3F51B3F3 -glabel D_80A66998 - .word 0x38000100 -glabel D_80A6699C - .word 0x3F51B3F3 -glabel D_80A669A0 - .word 0x415CCCCD -glabel D_80A669A4 - .word 0x415CCCCD -glabel D_80A669A8 - .word 0x3DCCCCCD -glabel D_80A669AC - .word 0x3F5DB3D7 -glabel D_80A669B0 - .word 0xBF5DB3D7 -glabel D_80A669B4 - .word 0x43F00001 -glabel D_80A669B8 - .word 0x44E38000 -glabel D_80A669BC - .word 0x3CCCCCCD -glabel D_80A669C0 - .word 0x3E31D0D4 -glabel D_80A669C4 - .word 0x3F19999A -glabel D_80A669C8 - .word 0x3F333333 -glabel D_80A669CC - .word 0x3F333333 -glabel D_80A669D0 - .word 0x3F333333 -glabel D_80A669D4 - .word 0x3F333333 -glabel D_80A669D8 - .word 0x3D70F0F1 -glabel D_80A669DC - .word 0x3D23D70A - - diff --git a/data/overlays/actors/z_en_horse_game_check.rodata.s b/data/overlays/actors/z_en_horse_game_check.rodata.s deleted file mode 100644 index 4d706e228d..0000000000 --- a/data/overlays/actors/z_en_horse_game_check.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A68530 - .asciz "../z_en_horse_game_check.c" - .balign 4 - -glabel D_80A6854C - .asciz "En_HGC_Spot20_Ta_end():対応せず\n" - .balign 4 - -glabel D_80A68570 - .word 0xC4CE4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_horse_ganon.rodata.s b/data/overlays/actors/z_en_horse_ganon.rodata.s deleted file mode 100644 index 9894c713d6..0000000000 --- a/data/overlays/actors/z_en_horse_ganon.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A692D0 - .word 0x4622F983, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_horse_link_child.rodata.s b/data/overlays/actors/z_en_horse_link_child.rodata.s deleted file mode 100644 index ca2a3793d8..0000000000 --- a/data/overlays/actors/z_en_horse_link_child.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A6AFB0 - .asciz "../z_en_horse_link_child.c" - .balign 4 - -glabel D_80A6AFCC - .asciz "../z_en_horse_link_child.c" - .balign 4 - -glabel D_80A6AFE8 - .word 0x3EAAAAAB -glabel D_80A6AFEC - .word 0x3E4CCCCD -glabel D_80A6AFF0 - .word 0x3F350481 -glabel D_80A6AFF4 - .word 0x3CCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_horse_normal.rodata.s b/data/overlays/actors/z_en_horse_normal.rodata.s deleted file mode 100644 index b703a2976f..0000000000 --- a/data/overlays/actors/z_en_horse_normal.rodata.s +++ /dev/null @@ -1,67 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A6D560 - .asciz "../z_en_horse_normal.c" - .balign 4 - -glabel D_80A6D578 - .asciz "../z_en_horse_normal.c" - .balign 4 - -glabel D_80A6D590 - .asciz "../z_en_horse_normal.c" - .balign 4 - -glabel D_80A6D5A8 - .word 0x3EAAAAAB -glabel D_80A6D5AC - .word 0x3E4CCCCD -glabel D_80A6D5B0 - .word 0xC4368000 -glabel D_80A6D5B4 - .word 0xC4898000 -glabel D_80A6D5B8 - .word 0xC4924000 -glabel D_80A6D5BC - .word 0x4567B000 -glabel D_80A6D5C0 - .word 0x44B0A000 -glabel D_80A6D5C4 - .word 0xC4264000 -glabel D_80A6D5C8 - .word 0x4622F983 -glabel D_80A6D5CC - .word 0x3DCCCCCD -glabel D_80A6D5D0 - .word 0x3DCCCCCD -glabel D_80A6D5D4 - .word 0x3ECCCCCD -glabel D_80A6D5D8 - .word 0x3F4CCCCD -glabel D_80A6D5DC - .word 0x3ECCCCCD -glabel D_80A6D5E0 - .word 0x3F4CCCCD -glabel D_80A6D5E4 - .word 0x4622F983 -glabel D_80A6D5E8 - .word 0x43B18000 -glabel D_80A6D5EC - .word 0xC4368000 -glabel D_80A6D5F0 - .word 0xC4898000 -glabel D_80A6D5F4 - .word 0xC4924000 -glabel D_80A6D5F8 - .word 0x3C23D70A -glabel D_80A6D5FC - .word 0x38C90FDB - - diff --git a/data/overlays/actors/z_en_horse_zelda.rodata.s b/data/overlays/actors/z_en_horse_zelda.rodata.s deleted file mode 100644 index 4c47a2818e..0000000000 --- a/data/overlays/actors/z_en_horse_zelda.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A6E2C0 - .word 0x4622F983, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_hs.rodata.s b/data/overlays/actors/z_en_hs.rodata.s deleted file mode 100644 index 09d95463c5..0000000000 --- a/data/overlays/actors/z_en_hs.rodata.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A6EE10 - .asciz " ヒヨコの店(大人の時) \n" - .balign 4 - -glabel D_80A6EE30 - .asciz " ヒヨコ屋閉店 \n" - .balign 4 - -glabel D_80A6EE48 - .asciz " ヒヨコの店(子人の時) \n" - .balign 4 - -glabel jtbl_80A6EE68 -.word L80A6EC84 -.word L80A6ECB0 -.word func_80A6ECBC -.word func_80A6ECC8 -.word func_80A6ECE8 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_hs2.rodata.s b/data/overlays/actors/z_en_hs2.rodata.s deleted file mode 100644 index cb0302f80f..0000000000 --- a/data/overlays/actors/z_en_hs2.rodata.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A6F4E0 - .asciz " ヒヨコの店(子人の時) \n" - .balign 4 - -glabel D_80A6F500 - .word func_80A6F390 -.word L80A6F3BC -.word func_80A6F3C8 -.word L80A6F384 -.word L80A6F384 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_hy.rodata.s b/data/overlays/actors/z_en_hy.rodata.s deleted file mode 100644 index d4eaeddd9c..0000000000 --- a/data/overlays/actors/z_en_hy.rodata.s +++ /dev/null @@ -1,210 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A72810 - .asciz "../z_en_hy.c" - .balign 4 - -glabel D_80A72820 - .asciz "../z_en_hy.c" - .balign 4 - -glabel D_80A72830 - .asciz "../z_en_hy.c" - .balign 4 - -glabel D_80A72840 - .asciz "../z_en_hy.c" - .balign 4 - -glabel D_80A72850 - .asciz "../z_en_hy.c" - .balign 4 - -glabel D_80A72860 - .asciz "../z_en_hy.c" - .balign 4 - -glabel jtbl_80A72870 -.word L80A6F8A0 -.word L80A6F994 -.word L80A6F9FC -.word L80A6FAB0 -.word L80A6FAFC -.word L80A6FB48 -.word L80A6FB58 -.word L80A6FBA4 -.word L80A6FC1C -.word L80A6FC84 -.word L80A6FD50 -.word L80A6FE1C -.word L80A6FE68 -.word L80A6FED0 -.word L80A6FED8 -.word L80A6FEE0 -.word L80A6FEE8 -.word L80A6FEF0 -.word L80A6FF9C -.word L80A70038 -.word L80A70040 -glabel jtbl_80A728C4 -.word L80A700D0 -.word L80A700D0 -.word L80A701B0 -.word L80A700D8 -.word L80A700D0 -.word L80A7056C -.word L80A700D0 -.word L80A700D0 -.word L80A700D0 -.word L80A700D0 -glabel jtbl_80A728EC -.word L80A70380 -.word L80A70564 -.word L80A70564 -.word L80A70564 -.word L80A70564 -.word L80A702CC -.word L80A702CC -.word L80A702CC -.word L80A702CC -glabel jtbl_80A72910 -.word L80A70318 -.word L80A70564 -.word L80A70440 -.word L80A70564 -.word L80A70564 -.word L80A7034C -.word L80A70564 -.word L80A703F0 -.word L80A70564 -.word L80A70424 -.word L80A70564 -.word L80A703B8 -.word L80A70564 -.word L80A7039C -.word L80A70564 -.word L80A70564 -.word L80A70564 -.word L80A703D4 -glabel jtbl_80A72958 -.word L80A70474 -.word L80A70564 -.word L80A70490 -.word L80A70564 -.word L80A704AC -.word L80A70564 -.word L80A704C8 -.word L80A70564 -.word L80A70564 -.word L80A704E4 -glabel jtbl_80A72980 -.word L80A709E4 -.word L80A70A00 -.word L80A709DC -.word L80A709B8 -.word L80A70A00 -.word L80A70A00 -.word L80A70A00 -.word L80A709B8 -.word L80A70A00 -.word L80A709B8 -.word L80A709B8 -.word L80A70A00 -.word L80A709D4 -.word L80A70A00 -.word L80A70A00 -.word L80A70A00 -.word L80A70A00 -.word L80A709DC -.word L80A709E4 -glabel D_80A729CC - .word func_80A70CD8 -.word func_80A70CD8 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word func_80A70C44 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word L80A70D40 -.word func_80A70C08 -.word L80A70D40 -.word func_80A70BAC -glabel jtbl_80A72A34 -.word L80A71098 -.word L80A710BC -.word L80A710BC -.word L80A7105C -.word L80A710BC -.word L80A710CC -.word L80A710BC -.word L80A71084 -.word L80A710BC -.word L80A710CC -.word L80A710CC -.word L80A710CC -.word L80A710CC -.word L80A710BC -.word L80A710BC -.word L80A710BC -.word L80A710BC -.word L80A710BC -.word L80A710BC -.word L80A710BC -.word L80A710BC -glabel D_80A72A88 - .word 0x3ECCCCCD -glabel D_80A72A8C - .word 0x3ECCCCCD -glabel D_80A72A90 - .word 0x40490FDB -glabel D_80A72A94 - .word 0x40490FDB -glabel D_80A72A98 - .word 0x40490FDB -glabel D_80A72A9C - .word 0x40490FDB -glabel jtbl_80A72AA0 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71E38 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71D08 -.word L80A71E38 -.word L80A71D08 -.word L80A71D08 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_ice_hono.rodata.s b/data/overlays/actors/z_en_ice_hono.rodata.s deleted file mode 100644 index 3163c9d48a..0000000000 --- a/data/overlays/actors/z_en_ice_hono.rodata.s +++ /dev/null @@ -1,81 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A740A0 - .asciz "(ice 炎)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A740BC - .asciz "ありえない値(ratio = %f)\n" - .balign 4 - -glabel D_80A740D8 - .asciz "../z_en_ice_hono.c" - .balign 4 - -glabel D_80A740EC - .asciz "../z_en_ice_hono.c" - .balign 4 - -glabel D_80A74100 - .asciz "../z_en_ice_hono.c" - .balign 4 - -glabel D_80A74114 - .word 0x37A7C5AC -glabel D_80A74118 - .word 0xBE99999A -glabel D_80A7411C - .word 0x457A0666 -glabel D_80A74120 - .word 0x45FA019A -glabel D_80A74124 - .word 0x3A51B717 -glabel D_80A74128 - .word 0xBE99999A -glabel D_80A7412C - .word 0x477FFF80 -glabel D_80A74130 - .word 0x477FFF80 -glabel D_80A74134 - .word 0x3ADED289 -glabel D_80A74138 - .word 0x455AC000 -glabel D_80A7413C - .word 0x38D1B717 -glabel D_80A74140 - .word 0x455AC000 -glabel D_80A74144 - .word 0x45BB8000 -glabel D_80A74148 - .word 0x3BA3D70A -glabel D_80A7414C - .word 0x3B83126F -glabel D_80A74150 - .word 0x3FCCCCCD -glabel D_80A74154 - .word 0x3BA3D70A -glabel D_80A74158 - .word 0x3B449BA6 -glabel D_80A7415C - .word 0x3F2AC083 -glabel D_80A74160 - .word 0x3DCCCCCD -glabel D_80A74164 - .word 0x3D4CCCCD -glabel D_80A74168 - .word 0x3ED9999A -glabel D_80A7416C - .word 0x3F333333 -glabel D_80A74170 - .word 0x3E4CCCCD -glabel D_80A74174 - .word 0x38C90FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ik.rodata.s b/data/overlays/actors/z_en_ik.rodata.s deleted file mode 100644 index 89646edefe..0000000000 --- a/data/overlays/actors/z_en_ik.rodata.s +++ /dev/null @@ -1,178 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A78650 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A78668 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A78680 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A78698 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A786B0 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A786C8 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A786E0 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A786F8 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A78710 - .asciz "../z_en_ik_inFight.c" - .balign 4 - -glabel D_80A78728 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A78740 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A78758 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A78770 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A78788 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A787A0 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A787B8 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A787D0 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A787E8 - .asciz "../z_en_ik_inAwake.c" - .balign 4 - -glabel D_80A78800 - .asciz "En_Ik_inConfrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80A78840 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80A7887C - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A78898 - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A788B4 - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A788D0 - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A788EC - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A78908 - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A78924 - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A78940 - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A7895C - .asciz "../z_en_ik_inConfrontion.c" - .balign 4 - -glabel D_80A78978 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80A789B0 - .asciz "En_Ik_inConfrontion_Init : %d !!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80A789E0 - .word 0x3F666666 -glabel jtbl_80A789E4 -.word L80A775FC -.word L80A77818 -.word L80A77818 -.word L80A77818 -.word L80A77818 -.word L80A77818 -.word L80A77818 -.word L80A77818 -.word L80A77818 -.word L80A77674 -.word L80A77818 -.word L80A776D0 -.word L80A77818 -.word L80A7772C -.word L80A777A4 -glabel jtbl_80A78A20 -.word L80A77A44 -.word L80A77A54 -.word L80A77A68 -.word L80A77A78 -.word L80A77A8C -.word L80A77AA0 -.word L80A77AB4 -glabel jtbl_80A78A3C -.word L80A77CDC -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77EA4 -.word L80A77D38 -.word L80A77EA4 -.word L80A77D94 -.word L80A77EA4 -.word L80A77DF0 -.word L80A77E4C -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_in.rodata.s b/data/overlays/actors/z_en_in.rodata.s deleted file mode 100644 index 75b49c4bef..0000000000 --- a/data/overlays/actors/z_en_in.rodata.s +++ /dev/null @@ -1,96 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A7B9D0 - .asciz "message_check->(%d[%x])\n" - .balign 4 - -glabel D_80A7B9EC - .asciz "../z_en_in.c" - .balign 4 - -glabel D_80A7B9FC - .asciz "../z_en_in.c" - .balign 4 - -glabel D_80A7BA0C - .asciz "../z_en_in.c" - .balign 4 - -glabel D_80A7BA1C - .asciz "../z_en_in.c" - .balign 4 - -glabel jtbl_80A7BA2C -.word L80A790B0 -.word L80A7913C -.word L80A79100 -.word L80A79124 -.word L80A7912C -.word L80A7912C -.word L80A79134 -glabel jtbl_80A7BA48 -.word L80A792A8 -.word L80A792A8 -.word L80A79488 -.word L80A79488 -.word L80A79318 -.word L80A79488 -.word L80A7936C -.word L80A7936C -.word L80A793A8 -glabel jtbl_80A7BA6C -.word L80A795B4 -.word L80A795B4 -.word L80A79564 -.word L80A795B4 -.word L80A79578 -.word L80A79598 -.word L80A795B4 -.word L80A795B4 -.word L80A795B4 -.word L80A795B4 -glabel D_80A7BA94 - .word 0x448A6000 -glabel D_80A7BA98 - .word 0xC569C000 -glabel jtbl_80A7BA9C -.word L80A7A1A4 -.word L80A7A1BC -.word L80A7A1A4 -.word L80A7A1A4 -.word L80A7A1A4 -.word L80A7A1D0 -.word L80A7A1D0 -.word L80A7A1A4 -glabel jtbl_80A7BABC -.word L80A7A21C -.word L80A7A244 -.word L80A7A21C -.word L80A7A270 -.word L80A7A28C -.word L80A7A2B0 -.word L80A7A2B0 -.word L80A7A2D8 -glabel D_80A7BADC - .word 0x3E99999A -glabel D_80A7BAE0 - .word 0x44BB8000 -glabel D_80A7BAE4 - .word 0x40490FDB -glabel D_80A7BAE8 - .word 0x40490FDB -glabel D_80A7BAEC - .word 0xC4BB8000 -glabel D_80A7BAF0 - .word 0x40490FDB -glabel D_80A7BAF4 - .word 0x40490FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_insect.rodata.s b/data/overlays/actors/z_en_insect.rodata.s deleted file mode 100644 index 2b6e8b7600..0000000000 --- a/data/overlays/actors/z_en_insect.rodata.s +++ /dev/null @@ -1,149 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A7DF40 - .word 0x1B5B3433, 0x3B33306D, 0x00000000 -glabel D_80A7DF4C - .asciz "warning:目標 Actor が NULL (%s %d)\n" - .balign 4 - -glabel D_80A7DF70 - .asciz "../z_en_mushi.c" - .balign 4 - -glabel D_80A7DF80 - .word 0x1B5B6D00 -glabel D_80A7DF84 - .word 0x1B5B3433, 0x3B33306D, 0x00000000 -glabel D_80A7DF90 - .asciz "BG 抜け？ Actor_delete します(%s %d)\n" - .balign 4 - -glabel D_80A7DFB8 - .asciz "../z_en_mushi.c" - .balign 4 - -glabel D_80A7DFC8 - .word 0x1B5B6D00 -glabel D_80A7DFCC - .word 0x3DCCCCCD -glabel D_80A7DFD0 - .word 0xBE4CCCCD -glabel D_80A7DFD4 - .word 0x3E99999A -glabel D_80A7DFD8 - .word 0x3ECCCCCD -glabel D_80A7DFDC - .word 0x3F99999A -glabel D_80A7DFE0 - .word 0x3F4CCCCD -glabel D_80A7DFE4 - .word 0x3FF33333 -glabel D_80A7DFE8 - .word 0x3F333333 -glabel D_80A7DFEC - .word 0x3FB33333 -glabel D_80A7DFF0 - .word 0x3FF33333 -glabel D_80A7DFF4 - .word 0x3F4CCCCD -glabel D_80A7DFF8 - .word 0x3FCCCCCD -glabel D_80A7DFFC - .word 0x3FF33333 -glabel D_80A7E000 - .word 0x3E99999A -glabel D_80A7E004 - .word 0x3C23D70A -glabel D_80A7E008 - .word 0x3C23D70A -glabel D_80A7E00C - .word 0x3A83126F -glabel D_80A7E010 - .word 0x3FF33333 -glabel D_80A7E014 - .word 0x3A83126F -glabel D_80A7E018 - .word 0x3951B717 -glabel D_80A7E01C - .word 0x3F4CCCCD -glabel D_80A7E020 - .word 0x3DCCCCCD -glabel D_80A7E024 - .word 0xBF19999A -glabel D_80A7E028 - .word 0x3F19999A -glabel D_80A7E02C - .word 0xBF19999A -glabel D_80A7E030 - .word 0x3DCCCCCD -glabel D_80A7E034 - .word 0x3C9374BC -glabel D_80A7E038 - .word 0x3FF33333 -glabel D_80A7E03C - .word 0x3CF5C28F -glabel D_80A7E040 - .word 0xBF4CCCCD -glabel D_80A7E044 - .word 0xBD23D70A -glabel D_80A7E048 - .word 0x3A83126F -glabel D_80A7E04C - .word 0x3851B717 -glabel D_80A7E050 - .word 0x3E99999A -glabel D_80A7E054 - .word 0x3D23D70A -glabel D_80A7E058 - .word 0x3CA3D70A -glabel D_80A7E05C - .word 0x477FFF80 -glabel D_80A7E060 - .word 0x44BB8000 -glabel D_80A7E064 - .word 0x477FFF80 -glabel D_80A7E068 - .word 0x3B5A740D -glabel D_80A7E06C - .word 0x3F7FBE77 -glabel D_80A7E070 - .word 0x3F8CCCCD -glabel D_80A7E074 - .word 0x3D8F5C29 -glabel D_80A7E078 - .word 0x3F7FBE77 -glabel D_80A7E07C - .word 0x3F19999A -glabel D_80A7E080 - .word 0x3D8F5C29 -glabel D_80A7E084 - .word 0x3DCCCCCD -glabel D_80A7E088 - .word 0x3F4CCCCD -glabel D_80A7E08C - .word 0x3FA66666 -glabel D_80A7E090 - .word 0x477FFF00 -glabel D_80A7E094 - .word 0x3C23D70A -glabel D_80A7E098 - .word 0x3A51B717 -glabel D_80A7E09C - .word 0x3E0F5C29 -glabel D_80A7E0A0 - .word 0x3DF5C28F -glabel D_80A7E0A4 - .word 0x3FA66666 -glabel D_80A7E0A8 - .word 0x3FF33333 -glabel D_80A7E0AC - .word 0xC6F9EC00 - - diff --git a/data/overlays/actors/z_en_ishi.rodata.s b/data/overlays/actors/z_en_ishi.rodata.s deleted file mode 100644 index a876f1cbbc..0000000000 --- a/data/overlays/actors/z_en_ishi.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A873F0 - .word 0x1B5B3433, 0x3B33306D, 0x00000000 -glabel D_80A873FC - .asciz "地面に付着失敗(%s %d)\n" - .balign 4 - -glabel D_80A87414 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87424 - .word 0x1B5B6D00 -glabel D_80A87428 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87438 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87448 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87458 - .word 0xBF4CCCCD -glabel D_80A8745C - .word 0x3F4CCCCD -glabel D_80A87460 - .word 0xBF666666 -glabel D_80A87464 - .word 0x3F666666 -glabel D_80A87468 - .word 0xBF4CCCCD -glabel D_80A8746C - .word 0x3F4CCCCD -glabel D_80A87470 - .word 0x3F333333 -glabel D_80A87474 - .word 0x3E4CCCCD -glabel D_80A87478 - .word 0x3DCCCCCD -glabel D_80A8747C - .word 0x477FFF00 - - diff --git a/data/overlays/actors/z_en_jj.rodata.s b/data/overlays/actors/z_en_jj.rodata.s deleted file mode 100644 index f60439c582..0000000000 --- a/data/overlays/actors/z_en_jj.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A88D10 - .asciz "../z_en_jj.c" - .balign 4 - -glabel D_80A88D20 - .asciz "../z_en_jj.c" - .balign 4 - -glabel D_80A88D30 - .word 0xC4898000 -glabel D_80A88D34 - .word 0x3D9CED28, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_jsjutan.rodata.s b/data/overlays/actors/z_en_jsjutan.rodata.s deleted file mode 100644 index ecc288f527..0000000000 --- a/data/overlays/actors/z_en_jsjutan.rodata.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A8E430 - .asciz "../z_en_jsjutan.c" - .balign 4 - -glabel D_80A8E444 - .asciz "../z_en_jsjutan.c" - .balign 4 - -glabel D_80A8E458 - .asciz "../z_en_jsjutan.c" - .balign 4 - -glabel D_80A8E46C - .asciz "../z_en_jsjutan.c" - .balign 4 - -glabel D_80A8E480 - .word 0x3CA3D70A -glabel D_80A8E484 - .word 0x45ABE000 -glabel D_80A8E488 - .word 0x453B8000 -glabel D_80A8E48C - .word 0x453B8000, 0x453B8000 -glabel D_80A8E494 - .word 0x451C4000 -glabel D_80A8E498 - .word 0x44BB8000 -glabel D_80A8E49C - .word 0x3C23D70A -glabel D_80A8E4A0 - .word 0x453B8000 -glabel D_80A8E4A4 - .word 0x44BB8000 -glabel D_80A8E4A8 - .word 0x3C23D70A -glabel D_80A8E4AC - .word 0x3B343958 - diff --git a/data/overlays/actors/z_en_kakasi.rodata.s b/data/overlays/actors/z_en_kakasi.rodata.s deleted file mode 100644 index 34bbcf36cb..0000000000 --- a/data/overlays/actors/z_en_kakasi.rodata.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A8FE30 - .word 0x0A0A0000 -glabel D_80A8FE34 - .asciz "☆☆☆☆☆ Ｌｅｔ’ｓ ＤＡＮＣＥ！ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A8FE70 - .asciz "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A8FE98 - .asciz "game_play->message.msg_mode=%d\n" - .balign 4 - -glabel D_80A8FEB8 - .word 0x0A0A0000 -glabel D_80A8FEBC - .asciz "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A8FEE8 - .word 0x412FD70A -glabel D_80A8FEEC - .word 0x409FAE14 -glabel D_80A8FEF0 - .word 0x403F5C29 -glabel jtbl_80A8FEF4 -.word L80A8F3D8 -.word L80A8F408 -.word L80A8F424 -.word L80A8F444 -.word L80A8F464 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_kakasi2.rodata.s b/data/overlays/actors/z_en_kakasi2.rodata.s deleted file mode 100644 index 4bc3475bec..0000000000 --- a/data/overlays/actors/z_en_kakasi2.rodata.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A909F0 - .word 0x0A0A0000 -glabel D_80A909F4 - .asciz "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A90A24 - .asciz "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A90A54 - .asciz "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" - .balign 4 - -glabel D_80A90A84 - .asciz "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A90AB4 - .asciz "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A90AE4 - .asciz "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A90B14 - .asciz "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A90B44 - .word 0x0A0A0000 -glabel D_80A90B48 - .asciz "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A90B74 - .asciz "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A90BA0 - .asciz "☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A90BE0 - .asciz "☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A90C10 - .word 0x0A0A0000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_kakasi3.rodata.s b/data/overlays/actors/z_en_kakasi3.rodata.s deleted file mode 100644 index caeda29059..0000000000 --- a/data/overlays/actors/z_en_kakasi3.rodata.s +++ /dev/null @@ -1,46 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A91D60 - .word 0x0A0A0000 -glabel D_80A91D64 - .asciz "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A91D94 - .asciz "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A91DC0 - .word 0x0A0A0000 -glabel D_80A91DC4 - .asciz "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A91E04 - .word 0x0A0A0000 -glabel D_80A91E08 - .asciz "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A91E34 - .word 0x412FD70A -glabel D_80A91E38 - .word 0x409FAE14 -glabel D_80A91E3C - .word 0x403F5C29 -glabel jtbl_80A91E40 -.word L80A90F68 -.word L80A90F98 -.word L80A90FB4 -.word L80A90FD4 -.word L80A90FF4 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_kanban.rodata.s b/data/overlays/actors/z_en_kanban.rodata.s deleted file mode 100644 index 865d5ba059..0000000000 --- a/data/overlays/actors/z_en_kanban.rodata.s +++ /dev/null @@ -1,94 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A94FE0 - .word 0x4B414E42, 0x414E2041, 0x52472020, 0x20202578, 0x0A000000 -glabel D_80A94FF4 - .word 0x1B5B6D00 -glabel D_80A94FF8 - .word 0x20574154, 0x20205920, 0x203D2025, 0x660A0000 -glabel D_80A95008 - .word 0x20504F53, 0x20205920, 0x203D2025, 0x660A0000 -glabel D_80A95018 - .word 0x2047524F, 0x554E4420, 0x5920203D, 0x2025660A, 0x00000000 -glabel D_80A9502C - .word 0x1B5B3332, 0x6D000000 -glabel D_80A95034 - .word 0x4F434152, 0x494E415F, 0x4D4F4445, 0x2025640A, 0x00000000 -glabel D_80A95048 - .word 0x1B5B6D00 -glabel D_80A9504C - .word 0x2E2E2F7A, 0x5F656E5F, 0x6B616E62, 0x616E2E63, 0x00000000 -glabel D_80A95060 - .word 0x2E2E2F7A, 0x5F656E5F, 0x6B616E62, 0x616E2E63, 0x00000000 -glabel D_80A95074 - .word 0x2E2E2F7A, 0x5F656E5F, 0x6B616E62, 0x616E2E63, 0x00000000 -glabel D_80A95088 - .word 0x2E2E2F7A, 0x5F656E5F, 0x6B616E62, 0x616E2E63, 0x00000000 -glabel D_80A9509C - .word 0x2E2E2F7A, 0x5F656E5F, 0x6B616E62, 0x616E2E63, 0x00000000 -glabel D_80A950B0 - .word 0x2E2E2F7A, 0x5F656E5F, 0x6B616E62, 0x616E2E63, 0x00000000 -glabel D_80A950C4 - .word 0x38000100 -glabel jtbl_80A950C8 -.word L80A922CC -.word L80A92A24 -.word L80A92A24 -.word L80A930DC -.word L80A930DC -.word L80A93920 -glabel D_80A950E0 - .word 0x40490FDB -glabel D_80A950E4 - .word 0xBE99999A -glabel D_80A950E8 - .word 0x3F333333 -glabel D_80A950EC - .word 0x3DCCCCCD -glabel D_80A950F0 - .word 0x451C4000 -glabel D_80A950F4 - .word 0x461C4000 -glabel D_80A950F8 - .word 0x3D4CCCCD -glabel D_80A950FC - .word 0x3D4CCCCD -glabel D_80A95100 - .word 0x4622F983 -glabel D_80A95104 - .word 0x40490FDB -glabel D_80A95108 - .word 0x40490FDB -glabel D_80A9510C - .word 0x40490FDB -glabel D_80A95110 - .word 0x40490FDB -glabel D_80A95114 - .word 0x40490FDB -glabel D_80A95118 - .word 0x45898000 -glabel D_80A9511C - .word 0xC53B8000 -glabel D_80A95120 - .word 0x3B343958 -glabel D_80A95124 - .word 0x3C23D70A -glabel D_80A95128 - .word 0xBF20D97C -glabel D_80A9512C - .word 0x40490FDB -glabel D_80A95130 - .word 0x40490FDB -glabel D_80A95134 - .word 0x40490FDB -glabel D_80A95138 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_karebaba.rodata.s b/data/overlays/actors/z_en_karebaba.rodata.s deleted file mode 100644 index c9d781e4fd..0000000000 --- a/data/overlays/actors/z_en_karebaba.rodata.s +++ /dev/null @@ -1,71 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A96A90 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96AA4 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96AB8 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96ACC - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96AE0 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96AF4 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96B08 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96B1C - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96B30 - .asciz "../z_en_karebaba.c" - .balign 4 - -glabel D_80A96B44 - .word 0xBF4CCCCD -glabel D_80A96B48 - .word 0x3D4CCCCD -glabel D_80A96B4C - .word 0x3BA3D70A -glabel D_80A96B50 - .word 0x3BA3D70A -glabel D_80A96B54 - .word 0x3D4CCCCD -glabel D_80A96B58 - .word 0x3BA3D70A -glabel D_80A96B5C - .word 0x3C23D70A -glabel D_80A96B60 - .word 0x3E19999A -glabel D_80A96B64 - .word 0x3A03126F -glabel D_80A96B68 - .word 0x3C23D70A -glabel D_80A96B6C - .word 0x3C23D70A -glabel D_80A96B70 - .word 0x38C90FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ko.rodata.s b/data/overlays/actors/z_en_ko.rodata.s index ea3bc158a4..d1cf7d13d9 100644 --- a/data/overlays/actors/z_en_ko.rodata.s +++ b/data/overlays/actors/z_en_ko.rodata.s @@ -160,13 +160,21 @@ glabel jtbl_80A9A9AC .word L80A98F6C .word L80A98F7C glabel D_80A9A9C0 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_80A9A9C4 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A9A9C8 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A9A9CC - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80A9A9D0 .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/actors/z_en_kusa.rodata.s b/data/overlays/actors/z_en_kusa.rodata.s deleted file mode 100644 index fae762202c..0000000000 --- a/data/overlays/actors/z_en_kusa.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A9C2A0 - .word 0x1B5B3433, 0x3B33306D, 0x00000000 -glabel D_80A9C2AC - .asciz "地面に付着失敗(%s %d)\n" - .balign 4 - -glabel D_80A9C2C4 - .asciz "../z_en_kusa.c" - .balign 4 - -glabel D_80A9C2D4 - .word 0x1B5B6D00 -glabel D_80A9C2D8 - .asciz "Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_80A9C308 - .asciz "../z_en_kusa.c" - .balign 4 - -glabel D_80A9C318 - .word 0x3E4CCCCD -glabel D_80A9C31C - .word 0x3DCCCCCD -glabel D_80A9C320 - .word 0x3DF5C290 -glabel D_80A9C324 - .word 0x3E23D70B -glabel D_80A9C328 - .word 0x42DE3333 -glabel D_80A9C32C - .word 0x477FFF00 -glabel D_80A9C330 - .word 0xBDCCCCCD -glabel D_80A9C334 - .word 0xC04CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_kz.rodata.s b/data/overlays/actors/z_en_kz.rodata.s deleted file mode 100644 index 45b69a1e45..0000000000 --- a/data/overlays/actors/z_en_kz.rodata.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A9D970 - .asciz "../z_en_kz.c" - .balign 4 - -glabel D_80A9D980 - .asciz "../z_en_kz.c" - .balign 4 - -glabel jtbl_80A9D990 -.word L80A9C8D0 -.word L80A9C8D0 -.word L80A9C8D0 -.word L80A9C794 -.word L80A9C844 -.word L80A9C8B8 -.word L80A9C710 -.word L80A9C8D0 -.word L80A9C8D0 -.word L80A9C8D0 -glabel D_80A9D9B8 - .word 0x44CCC000 -glabel D_80A9D9BC - .word 0x43848000 -glabel D_80A9D9C0 - .word 0x4622F983 -glabel D_80A9D9C4 - .word 0x3DCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_light.rodata.s b/data/overlays/actors/z_en_light.rodata.s deleted file mode 100644 index 1c1d903150..0000000000 --- a/data/overlays/actors/z_en_light.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80A9E8C0 - .asciz "../z_en_light.c" - .balign 4 - -glabel D_80A9E8D0 - .asciz "../z_en_light.c" - .balign 4 - -glabel D_80A9E8E0 - .asciz "../z_en_light.c" - .balign 4 - -glabel D_80A9E8F0 - .word 0x38D1B717, 0x00000000 -glabel D_80A9E8F8 - .word 0x3F1A36E2, 0xEB1C432D -glabel D_80A9E900 - .word 0x3DCCCCCD -glabel D_80A9E904 - .word 0x3DCCCCCD -glabel D_80A9E908 - .word 0x3F1A36E2, 0xEB1C432D -glabel D_80A9E910 - .word 0x38C90FDB -glabel D_80A9E914 - .word 0x40490FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_m_thunder.rodata.s b/data/overlays/actors/z_en_m_thunder.rodata.s deleted file mode 100644 index be95f202dc..0000000000 --- a/data/overlays/actors/z_en_m_thunder.rodata.s +++ /dev/null @@ -1,67 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AA0490 - .asciz "../z_en_m_thunder.c" - .balign 4 - -glabel D_80AA04A4 - .asciz "../z_en_m_thunder.c" - .balign 4 - -glabel D_80AA04B8 - .asciz "../z_en_m_thunder.c" - .balign 4 - -glabel D_80AA04CC - .asciz "../z_en_m_thunder.c" - .balign 4 - -glabel D_80AA04E0 - .word 0x3DCCCCCD -glabel D_80AA04E4 - .word 0x3DCCCCCD -glabel D_80AA04E8 - .word 0x3E19999A -glabel D_80AA04EC - .word 0x3DCCCCCD -glabel D_80AA04F0 - .word 0x3F59999A -glabel D_80AA04F4 - .word 0x3E19999A -glabel D_80AA04F8 - .word 0x3E19999A -glabel D_80AA04FC - .word 0x3DCCCCCD -glabel D_80AA0500 - .word 0x3F59999A -glabel D_80AA0504 - .word 0x3DCCCCCD -glabel D_80AA0508 - .word 0x3DCCCCCD -glabel D_80AA050C - .word 0x3F19999A -glabel D_80AA0510 - .word 0x3FD55555 -glabel D_80AA0514 - .word 0x3CA3D70A -glabel D_80AA0518 - .word 0xBF333333 -glabel D_80AA051C - .word 0xBF19999A -glabel D_80AA0520 - .word 0xBF99999A -glabel D_80AA0524 - .word 0xBFE66666 -glabel D_80AA0528 - .word 0xBFB33333 -glabel D_80AA052C - .word 0x3F59999A - - diff --git a/data/overlays/actors/z_en_ma1.rodata.s b/data/overlays/actors/z_en_ma1.rodata.s deleted file mode 100644 index 313130e3a3..0000000000 --- a/data/overlays/actors/z_en_ma1.rodata.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AA16E0 - .asciz "../z_en_ma1.c" - .balign 4 - -glabel D_80AA16F0 - .asciz "../z_en_ma1.c" - .balign 4 - -glabel jtbl_80AA1700 -.word L80AA08B0 -.word L80AA08B0 -.word L80AA07C4 -.word L80AA08B0 -.word L80AA087C -.word L80AA087C -.word L80AA0898 -.word L80AA08B0 -.word L80AA08B0 -.word L80AA08B0 -glabel jtbl_80AA1728 -.word L80AA07F0 -.word L80AA0874 -.word L80AA08B0 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0818 -.word L80AA0834 -.word L80AA0850 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA0874 -.word L80AA086C -glabel D_80AA17AC - .word 0x40490FDB -glabel D_80AA17B0 - .word 0x40490FDB -glabel D_80AA17B4 - .word 0x40490FDB -glabel D_80AA17B8 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ma2.rodata.s b/data/overlays/actors/z_en_ma2.rodata.s deleted file mode 100644 index 2350e9704f..0000000000 --- a/data/overlays/actors/z_en_ma2.rodata.s +++ /dev/null @@ -1,46 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AA28D0 - .asciz "../z_en_ma2.c" - .balign 4 - -glabel D_80AA28E0 - .asciz "../z_en_ma2.c" - .balign 4 - -glabel D_80AA28F0 - .asciz "../z_en_ma2.c" - .balign 4 - -glabel D_80AA2900 - .asciz "../z_en_ma2.c" - .balign 4 - -glabel jtbl_80AA2910 -.word L80AA1AD0 -.word L80AA1AD0 -.word L80AA1A78 -.word L80AA1AD0 -.word L80AA1AD0 -.word L80AA1AD0 -.word L80AA1AD0 -.word L80AA1AD0 -.word L80AA1AD0 -.word L80AA1AD0 -glabel D_80AA2938 - .word 0x40490FDB -glabel D_80AA293C - .word 0x40490FDB -glabel D_80AA2940 - .word 0x40490FDB -glabel D_80AA2944 - .word 0x40490FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ma3.rodata.s b/data/overlays/actors/z_en_ma3.rodata.s deleted file mode 100644 index db9c0c5919..0000000000 --- a/data/overlays/actors/z_en_ma3.rodata.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AA38C0 - .asciz "../z_en_ma3.c" - .balign 4 - -glabel D_80AA38D0 - .asciz "../z_en_ma3.c" - .balign 4 - -glabel D_80AA38E0 - .asciz "../z_en_ma3.c" - .balign 4 - -glabel D_80AA38F0 - .asciz "../z_en_ma3.c" - .balign 4 - -glabel jtbl_80AA3900 -.word L80AA2E40 -.word L80AA2E40 -.word L80AA2D20 -.word L80AA2E40 -.word L80AA2C8C -.word L80AA2C20 -.word L80AA2E40 -.word L80AA2E40 -.word L80AA2E40 -.word L80AA2E40 -glabel jtbl_80AA3928 -.word L80AA2D80 -.word L80AA2E3C -.word L80AA2E08 -.word L80AA2E1C -.word L80AA2DB0 -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2E3C -.word L80AA2DB0 -glabel D_80AA3974 - .word 0x40490FDB -glabel D_80AA3978 - .word 0x40490FDB -glabel D_80AA397C - .word 0x40490FDB -glabel D_80AA3980 - .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_mag.rodata.s b/data/overlays/actors/z_en_mag.rodata.s deleted file mode 100644 index 139a1740eb..0000000000 --- a/data/overlays/actors/z_en_mag.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AA5F10 - .asciz "../z_en_mag.c" - .balign 4 - -glabel D_80AA5F20 - .asciz "../z_en_mag.c" - .balign 4 - -glabel D_80AA5F30 - .word 0x3F4CCCCD -glabel D_80AA5F34 - .word 0x4019999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_mb.rodata.s b/data/overlays/actors/z_en_mb.rodata.s deleted file mode 100644 index fc1684d817..0000000000 --- a/data/overlays/actors/z_en_mb.rodata.s +++ /dev/null @@ -1,59 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AA9E70 - .word 0x44DAC000 -glabel D_80AA9E74 - .word 0x44318000 -glabel D_80AA9E78 - .word 0x44DAC000 -glabel D_80AA9E7C - .word 0x3F199999 -glabel D_80AA9E80 - .word 0x3F199999 -glabel D_80AA9E84 - .word 0x44228000 -glabel D_80AA9E88 - .word 0x3D23D70A -glabel D_80AA9E8C - .word 0x3F333333 -glabel D_80AA9E90 - .word 0x3DCCCCCD -glabel D_80AA9E94 - .word 0x458CA000 -glabel D_80AA9E98 - .word 0xC5898000 -glabel D_80AA9E9C - .word 0xC5898000 -glabel jtbl_80AA9EA0 -.word L80AA996C -.word L80AA9944 -.word L80AA9990 -.word L80AA995C -.word L80AA9990 -.word L80AA9990 -.word L80AA994C -.word L80AA9990 -.word L80AA9964 -.word L80AA9990 -.word L80AA9990 -.word L80AA9954 -.word L80AA9990 -.word L80AA9990 -.word L80AA9974 -.word L80AA9990 -.word L80AA9984 -.word L80AA9990 -.word L80AA9990 -.word L80AA997C -.word L80AA9990 -.word L80AA998C -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_md.rodata.s b/data/overlays/actors/z_en_md.rodata.s deleted file mode 100644 index f137289253..0000000000 --- a/data/overlays/actors/z_en_md.rodata.s +++ /dev/null @@ -1,79 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AAC4B0 - .asciz "../z_en_md.c" - .balign 4 - -glabel D_80AAC4C0 - .asciz "../z_en_md.c" - .balign 4 - -glabel jtbl_80AAC4D0 -.word L80AAA96C -.word L80AAA97C -.word L80AAA98C -.word L80AAA99C -.word L80AAA9AC -.word L80AAA9BC -.word L80AAA9CC -.word L80AAA9DC -.word L80AAA9EC -.word L80AAA9FC -.word L80AAAA0C -glabel jtbl_80AAC4FC -.word L80AAAA68 -.word L80AAABCC -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAB18 -.word L80AAABCC -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAABCC -.word L80AAABFC -glabel jtbl_80AAC55C -.word L80AAAF40 -.word L80AAAF40 -.word L80AAAF48 -.word L80AAAF40 -.word L80AAAF40 -.word L80AAB010 -.word L80AAAF40 -.word L80AAAF40 -.word L80AAAF40 -.word L80AAAF40 -glabel D_80AAC584 - .word 0x4622F983 -glabel D_80AAC588 - .word 0x3A83126F -glabel D_80AAC58C - .word 0x40490FDB -glabel D_80AAC590 - .word 0x40490FDB -glabel D_80AAC594 - .word 0x40490FDB -glabel D_80AAC598 - .word 0x40490FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_mk.rodata.s b/data/overlays/actors/z_en_mk.rodata.s deleted file mode 100644 index f47b63df93..0000000000 --- a/data/overlays/actors/z_en_mk.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AAD660 - .word 0x3CCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_mm.rodata.s b/data/overlays/actors/z_en_mm.rodata.s deleted file mode 100644 index a74ca9ffd5..0000000000 --- a/data/overlays/actors/z_en_mm.rodata.s +++ /dev/null @@ -1,59 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AAEC00 - .asciz "../z_en_mm.c" - .balign 4 - -glabel D_80AAEC10 - .asciz "../z_en_mm.c" - .balign 4 - -glabel D_80AAEC20 - .asciz "../z_en_mm.c" - .balign 4 - -glabel D_80AAEC30 - .asciz "../z_en_mm.c" - .balign 4 - -glabel D_80AAEC40 - .asciz "../z_en_mm.c" - .balign 4 - -glabel jtbl_80AAEC50 -.word L80AADC20 -.word L80AADC20 -.word L80AADC20 -.word L80AADC20 -.word L80AADAF0 -.word L80AADB78 -.word L80AADBD0 -glabel D_80AAEC6C - .word 0x4622F983 -glabel D_80AAEC70 - .word 0x41270A3D -glabel D_80AAEC74 - .word 0x4622F983 -glabel D_80AAEC78 - .word 0x41270A3D -glabel D_80AAEC7C - .word 0x38000100 -glabel D_80AAEC80 - .word 0x3F7C1BDA -glabel D_80AAEC84 - .word 0xBF7C1BDA -glabel D_80AAEC88 - .word 0xC4966000 -glabel D_80AAEC8C - .word 0xC4966000 -glabel D_80AAEC90 - .word 0x4020D97C, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_mm2.rodata.s b/data/overlays/actors/z_en_mm2.rodata.s deleted file mode 100644 index 42d7765ea9..0000000000 --- a/data/overlays/actors/z_en_mm2.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AAFB80 - .asciz " マラソン 開始されていない \n\n" - .balign 4 - -glabel D_80AAFBA8 - .asciz "../z_en_mm2.c" - .balign 4 - -glabel D_80AAFBB8 - .asciz "((z_common_data.event_inf[1]) & (0x0001)) = %x\n" - .balign 4 - -glabel D_80AAFBE8 - .asciz "../z_en_mm2.c" - .balign 4 - -glabel D_80AAFBF8 - .word 0x2E2E2F7A, 0x5F656E5F, 0x6D6D322E, 0x63000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_mu.rodata.s b/data/overlays/actors/z_en_mu.rodata.s deleted file mode 100644 index 00f3f39639..0000000000 --- a/data/overlays/actors/z_en_mu.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AB0C70 - .asciz "../z_en_mu.c" - .balign 4 - -glabel D_80AB0C80 - .asciz "../z_en_mu.c" - .balign 4 - -glabel jtbl_80AB0C90 -.word L80AB05FC -.word L80AB05FC -.word L80AB0604 -.word L80AB05FC -.word L80AB05FC -.word L80AB05FC -.word L80AB05FC -.word L80AB05FC -.word L80AB05FC -.word L80AB05FC -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_nb.rodata.s b/data/overlays/actors/z_en_nb.rodata.s deleted file mode 100644 index 9e6655e224..0000000000 --- a/data/overlays/actors/z_en_nb.rodata.s +++ /dev/null @@ -1,99 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AB4F90 - .asciz "En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AB4FD4 - .asciz "En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AB5010 - .asciz "../z_en_nb_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AB5030 - .asciz "../z_en_nb_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AB5050 - .asciz "En_Nb_Kidnap_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80AB5088 - .asciz "En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80AB50C4 - .asciz "../z_en_nb_inConfrontion.c" - .balign 4 - -glabel D_80AB50E0 - .asciz "../z_en_nb_inConfrontion.c" - .balign 4 - -glabel D_80AB50FC - .asciz "../z_en_nb_inConfrontion.c" - .balign 4 - -glabel D_80AB5118 - .asciz "../z_en_nb_inConfrontion.c" - .balign 4 - -glabel D_80AB5134 - .asciz "En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80AB516C - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AB51A8 - .asciz "../z_en_nb.c" - .balign 4 - -glabel D_80AB51B8 - .asciz "../z_en_nb.c" - .balign 4 - -glabel D_80AB51C8 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AB5200 - .word 0x4622F983 -glabel D_80AB5204 - .word 0xC61C4000 -glabel D_80AB5208 - .word 0x42A6AAAB -glabel jtbl_80AB520C -.word L80AB2B5C -.word L80AB2BD0 -.word L80AB2BD0 -.word L80AB2BD0 -.word L80AB2BD0 -.word L80AB2BD0 -.word L80AB2BD0 -.word L80AB2BD0 -.word L80AB2BC0 -.word L80AB2B6C -.word L80AB2B80 -.word L80AB2B90 -.word L80AB2BA0 -.word L80AB2BB0 -glabel jtbl_80AB5244 -.word L80AB3F64 -.word L80AB3F78 -.word L80AB3F8C -.word L80AB3FA0 -.word L80AB3FB4 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_niw.rodata.s b/data/overlays/actors/z_en_niw.rodata.s index 147ed4fdbb..43114ed212 100644 --- a/data/overlays/actors/z_en_niw.rodata.s +++ b/data/overlays/actors/z_en_niw.rodata.s @@ -28,9 +28,13 @@ glabel D_80AB87A4 .balign 4 glabel D_80AB87D4 - .word 0x0A0A0000 + .asciz "\n\n" + .balign 4 + glabel D_80AB87D8 - .word 0x0A0A0000 + .asciz "\n\n" + .balign 4 + glabel D_80AB87DC .asciz " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" .balign 4 @@ -98,9 +102,13 @@ glabel D_80AB89B8 .balign 4 glabel D_80AB89E8 - .word 0x0A0A0000 + .asciz "\n\n" + .balign 4 + glabel D_80AB89EC - .word 0x0A0A0000 + .asciz "\n\n" + .balign 4 + glabel D_80AB89F0 .asciz "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" .balign 4 @@ -108,7 +116,9 @@ glabel D_80AB89F0 .balign 4 glabel D_80AB8A1C - .word 0x0A0A0000 + .asciz "\n\n" + .balign 4 + glabel D_80AB8A20 .asciz "../z_en_niw.c" .balign 4 @@ -150,27 +160,41 @@ glabel jtbl_80AB8A94 .word L80AB5DD8 .word L80AB5DE4 glabel D_80AB8AAC - .word 0x45DAC000 + .float 7000.0 + .balign 4 + glabel D_80AB8AB0 .word 0x46C35000 glabel D_80AB8AB4 - .word 0x45BB8000 + .float 6000.0 + .balign 4 + glabel D_80AB8AB8 .word 0xC61C4000 glabel D_80AB8ABC .word 0xC61C4000 glabel D_80AB8AC0 - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_80AB8AC4 - .word 0x453B8000 + .float 3000.0 + .balign 4 + glabel D_80AB8AC8 .word 0x465AC000 glabel D_80AB8ACC - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_80AB8AD0 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_80AB8AD4 - .word 0x3FFEB852 + .float 1.99000000954 + .balign 4 + glabel D_80AB8AD8 .word 0x407F5C29 glabel D_80AB8ADC @@ -180,19 +204,31 @@ glabel D_80AB8AE0 glabel D_80AB8AE4 .word 0x4622F983 glabel D_80AB8AE8 - .word 0x459C4000 + .float 5000.0 + .balign 4 + glabel D_80AB8AEC - .word 0x459C4000 + .float 5000.0 + .balign 4 + glabel D_80AB8AF0 - .word 0x459C4000 + .float 5000.0 + .balign 4 + glabel D_80AB8AF4 .word 0x465AC000 glabel D_80AB8AF8 - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_80AB8AFC - .word 0x3FFEB852 + .float 1.99000000954 + .balign 4 + glabel D_80AB8B00 - .word 0x3FFEB852 + .float 1.99000000954 + .balign 4 + glabel D_80AB8B04 .word 0x4622F983 glabel D_80AB8B08 @@ -200,9 +236,13 @@ glabel D_80AB8B08 glabel D_80AB8B0C .word 0xBE19999A glabel D_80AB8B10 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80AB8B14 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80AB8B18 .word 0x3D4CCCCD, 0x00000000 diff --git a/data/overlays/actors/z_en_niw_girl.rodata.s b/data/overlays/actors/z_en_niw_girl.rodata.s deleted file mode 100644 index 22e22a10d1..0000000000 --- a/data/overlays/actors/z_en_niw_girl.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AB99F0 - .asciz "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AB9A34 - .asciz "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AB9A70 - .word 0x0A0A0000 -glabel D_80AB9A74 - .word 0x0A0A0000 -glabel D_80AB9A78 - .asciz "☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AB9AB8 - .asciz "☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AB9AE8 - .word 0x0A0A0000 -glabel D_80AB9AEC - .asciz "../z_en_niw_girl.c" - .balign 4 - -glabel D_80AB9B00 - .asciz "../z_en_niw_girl.c" - .balign 4 - -glabel D_80AB9B14 - .word 0x40490FDB -glabel D_80AB9B18 - .word 0x4622F983 -glabel jtbl_80AB9B1C -.word L80AB947C -.word L80AB94A0 -.word L80AB9488 -.word L80AB9494 -.word L80AB94A0 -.word L80AB9494 -.word L80AB9494 -.word L80AB94A0 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_niw_lady.rodata.s b/data/overlays/actors/z_en_niw_lady.rodata.s deleted file mode 100644 index 19efdc6aeb..0000000000 --- a/data/overlays/actors/z_en_niw_lady.rodata.s +++ /dev/null @@ -1,122 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80ABB420 - .asciz "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB458 - .word 0x0A0A0000 -glabel D_80ABB45C - .asciz "☆ 鶏柵内ＧＥＴ！☆ %x\n" - .balign 4 - -glabel D_80ABB47C - .word 0x0A0A0000 -glabel D_80ABB480 - .asciz "☆☆☆☆☆ ねぇちゃん選択 ☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB4B0 - .asciz "☆☆☆☆☆ ねぇちゃんハート ☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB4E8 - .asciz "☆☆☆☆☆ ねぇちゃん保存 ☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB520 - .asciz "☆☆☆☆☆ ねぇちゃん今 ☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB550 - .asciz "☆☆☆☆☆ this->actor.talk_message ☆☆ %x\n" - .balign 4 - -glabel D_80ABB588 - .asciz "☆☆☆☆☆ this->message_end_code ☆☆ %d\n" - .balign 4 - -glabel D_80ABB5C0 - .word 0x0A0A0000 -glabel D_80ABB5C4 - .asciz "☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n" - .balign 4 - -glabel D_80ABB5F0 - .asciz "☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n" - .balign 4 - -glabel D_80ABB61C - .word 0x0A0A0000 -glabel D_80ABB620 - .asciz "☆☆☆☆☆ ハート ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB64C - .asciz "☆☆☆☆☆ 爆弾 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80ABB678 - .word 0x0A0A0000 -glabel D_80ABB67C - .asciz "☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80ABB6B8 - .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80ABB6E4 - .asciz "☆☆☆☆☆ 通常メッセージチェック ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80ABB71C - .asciz "../z_en_niw_lady.c" - .balign 4 - -glabel D_80ABB730 - .asciz "../z_en_niw_lady.c" - .balign 4 - -glabel jtbl_80ABB744 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E80 -.word L80AB9E34 -.word L80AB9DE8 -.word L80AB9DE4 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9E80 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E80 -.word L80AB9E34 -.word L80AB9E80 -.word L80AB9E80 -.word L80AB9E80 -.word L80AB9E80 -.word L80AB9E34 -glabel D_80ABB7BC - .word 0x44C94000 - - diff --git a/data/overlays/actors/z_en_nwc.rodata.s b/data/overlays/actors/z_en_nwc.rodata.s deleted file mode 100644 index 15a44c8786..0000000000 --- a/data/overlays/actors/z_en_nwc.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80ABCAC0 - .asciz "../z_en_nwc.c" - .balign 4 - -glabel D_80ABCAD0 - .asciz "../z_en_nwc.c" - .balign 4 - -glabel D_80ABCAE0 - .asciz "../z_en_nwc.c" - .balign 4 - -glabel D_80ABCAF0 - .asciz "../z_en_nwc.c" - .balign 4 - -glabel D_80ABCB00 - .word 0x3DCCCCCD -glabel D_80ABCB04 - .word 0x47C34FF3 -glabel D_80ABCB08 - .word 0x3C23D70A -glabel D_80ABCB0C - .word 0x38C90FDB - - diff --git a/data/overlays/actors/z_en_ny.rodata.s b/data/overlays/actors/z_en_ny.rodata.s deleted file mode 100644 index 8f91ed6c47..0000000000 --- a/data/overlays/actors/z_en_ny.rodata.s +++ /dev/null @@ -1,79 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80ABE3E0 - .asciz "ニュウ イニシャル[ %d ] ！！\n" - .balign 4 - -glabel D_80ABE400 - .asciz "ダミーニュウ イニシャル[ %d ] ！！\n" - .balign 4 - -glabel D_80ABE424 - .asciz "En_Ny_actor_move2[ %x ] ！！\n" - .balign 4 - -glabel D_80ABE444 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE454 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE464 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE474 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE484 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE494 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE4A4 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE4B4 - .word 0xBECCCCCD -glabel D_80ABE4B8 - .word 0x3F333333 -glabel D_80ABE4BC - .word 0x40333333 -glabel D_80ABE4C0 - .word 0xBECCCCCD -glabel D_80ABE4C4 - .word 0xBECCCCCD -glabel D_80ABE4C8 - .word 0x3ECCCCCD -glabel D_80ABE4CC - .word 0x3ECCCCCD -glabel D_80ABE4D0 - .word 0x3FAA3D71 -glabel D_80ABE4D4 - .word 0x3ECCCCCD -glabel D_80ABE4D8 - .word 0x3DCCCCCD -glabel D_80ABE4DC - .word 0x3F19999A -glabel D_80ABE4E0 - .word 0x3E19999A -glabel D_80ABE4E4 - .word 0x3D23D70A -glabel D_80ABE4E8 - .word 0x3ECCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_en_okarina_tag.rodata.s b/data/overlays/actors/z_en_okarina_tag.rodata.s deleted file mode 100644 index 6d67140a7d..0000000000 --- a/data/overlays/actors/z_en_okarina_tag.rodata.s +++ /dev/null @@ -1,65 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AC0300 - .word 0x0A0A0000 -glabel D_80AC0304 - .asciz "☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80AC0338 - .asciz "☆☆☆☆☆ セーブ情報 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AC0368 - .asciz "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AC039C - .asciz "☆☆☆☆☆ 正解情報 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AC03C8 - .asciz "☆☆☆☆☆ 範囲情報 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AC03F4 - .asciz "☆☆☆☆☆ 処理範囲情報 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80AC0424 - .asciz "☆☆☆☆☆ 当り？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AC0450 - .word 0x0A0A0000 -glabel D_80AC0454 - .asciz "☆☆☆☆☆ 北！！！！！ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80AC0484 - .asciz "☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80AC04D0 - .asciz "☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel jtbl_80AC0508 -.word L80ABEEE8 -.word L80ABEEC8 -.word L80ABEF10 -.word L80ABEEE8 -.word L80ABEEF8 -.word L80ABEEE8 -.word L80ABEEB8 -glabel D_80AC0524 - .word 0x3F983809, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_okuta.rodata.s b/data/overlays/actors/z_en_okuta.rodata.s deleted file mode 100644 index dd5609c051..0000000000 --- a/data/overlays/actors/z_en_okuta.rodata.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AC28D0 - .asciz "../z_en_okuta.c" - .balign 4 - -glabel D_80AC28E0 - .asciz "../z_en_okuta.c" - .balign 4 - -glabel D_80AC28F0 - .asciz "../z_en_okuta.c" - .balign 4 - -glabel D_80AC2900 - .word 0x3C23D70A -glabel D_80AC2904 - .word 0x3C23D70A -glabel D_80AC2908 - .word 0x3E860932 -glabel D_80AC290C - .word 0x3C23D70A -glabel D_80AC2910 - .word 0x3E6EE632 -glabel D_80AC2914 - .word 0x3C23D70A -glabel D_80AC2918 - .word 0x3D23D70A -glabel D_80AC291C - .word 0x3F4CCCCD -glabel D_80AC2920 - .word 0x3C23D70A -glabel D_80AC2924 - .word 0x3E4CCCCD -glabel D_80AC2928 - .word 0x3FF33333 -glabel D_80AC292C - .word 0x3DCCCCCD -glabel D_80AC2930 - .word 0x3ECCCCCD -glabel D_80AC2934 - .word 0x3D99999A -glabel D_80AC2938 - .word 0x3FE66666 -glabel D_80AC293C - .word 0x3F4CCCCD -glabel D_80AC2940 - .word 0x3FA66666 -glabel D_80AC2944 - .word 0x3D4CCCCD -glabel D_80AC2948 - .word 0x3D086595 -glabel D_80AC294C - .word 0x3EAA7EFA -glabel D_80AC2950 - .word 0x3EB33333 -glabel D_80AC2954 - .word 0x3F4CCCCD -glabel D_80AC2958 - .word 0x3D4CCCCD -glabel D_80AC295C - .word 0x3F4CCCCD -glabel D_80AC2960 - .word 0x3FA66666 -glabel D_80AC2964 - .word 0x3DCCCCCD -glabel D_80AC2968 - .word 0x3D886595 -glabel D_80AC296C - .word 0x3E490FDB -glabel D_80AC2970 - .word 0x3E4CCCCD -glabel D_80AC2974 - .word 0x3E490FDB -glabel D_80AC2978 - .word 0x3ECCCCCD -glabel D_80AC297C - .word 0x3D9D7DBF -glabel D_80AC2980 - .word 0x3EAA7EFA -glabel D_80AC2984 - .word 0x3E4CCCCD -glabel D_80AC2988 - .word 0x38C90FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ossan.rodata.s b/data/overlays/actors/z_en_ossan.rodata.s deleted file mode 100644 index 67397ff056..0000000000 --- a/data/overlays/actors/z_en_ossan.rodata.s +++ /dev/null @@ -1,363 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AC8EF0 - .word 0xA5B3A5AD, 0xA5EAA4CE, 0xC5B92020, 0x00000000 -glabel D_80AC8F00 - .word 0xCCF4B2B0, 0x20202020, 0x20202020, 0x00000000 -glabel D_80AC8F10 - .word 0xCCEBA4CE, 0xC5B92020, 0x20202020, 0x00000000 -glabel D_80AC8F20 - .word 0xCFA9C3CF, 0xCEA2A4CE, 0xC5B92020, 0x00000000 -glabel D_80AC8F30 - .word 0xBDE2A4CE, 0xC5B92020, 0x20202020, 0x00000000 -glabel D_80AC8F40 - .word 0xC2E7BFCD, 0xA4CEC5B9, 0x20202020, 0x00000000 -glabel D_80AC8F50 - .word 0xA5BFA5ED, 0xA5F3A4CE, 0xC5B92020, 0x00000000 -glabel D_80AC8F60 - .word 0xA5BEA1BC, 0xA5E9A4CE, 0xC5B92020, 0x00000000 -glabel D_80AC8F70 - .word 0xA5B4A5ED, 0xA5F3CCEB, 0xA4CEC5B9, 0x00000000 -glabel D_80AC8F80 - .word 0xA5A4A5F3, 0xA5B4A1BC, 0xA4CEC5B9, 0x00000000 -glabel D_80AC8F90 - .word 0xA4AACCCC, 0xB2B02020, 0x20202020, 0x00000000 -glabel D_80AC8FA0 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80AC8FAC - .asciz "引数がおかしいよ(arg_data=%d)！！\n" - .balign 4 - -glabel D_80AC8FD0 - .word 0x1B5B6D00 -glabel D_80AC8FD4 - .word 0x30000000 -glabel D_80AC8FD8 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC8FE8 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80AC8FF4 - .asciz "バンクが無いよ！！(%s)\n" - .balign 4 - -glabel D_80AC900C - .word 0x1B5B6D00 -glabel D_80AC9010 - .word 0x30000000 -glabel D_80AC9014 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9024 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80AC9030 - .asciz "予備バンクが無いよ！！(%s)\n" - .balign 4 - -glabel D_80AC904C - .word 0x1B5B6D00 -glabel D_80AC9050 - .word 0x30000000 -glabel D_80AC9054 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9064 - .asciz "%s[%d]:★★★ 会話終了！！ ★★★\n" - .balign 4 - -glabel D_80AC9090 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC90A0 - .asciz "★★★ 会話開始！！ ★★★\n" - .balign 4 - -glabel D_80AC90C4 - .word 0xA1D6A5B9, 0xA5C6A5A3, 0xA5C3A5AF, 0xBAB8B1A6, 0xA4C7C9CA, 0xCAAAA4DF, 0xA4C6A4AF, 0xA4ECA1AA, 0xA1D70A00 -glabel D_80AC90E8 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9108 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9118 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9138 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9148 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9168 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9178 - .asciz "\n初めて手にいれた！！\n\n" - .balign 4 - -glabel D_80AC9198 - .asciz "持ち上げ開始！！\n\n" - .balign 4 - -glabel D_80AC91B4 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC91D4 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC91E4 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9204 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9214 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9234 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9244 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9264 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9274 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC9294 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC92A4 - .asciz "店主の依頼 ( %d )\n" - .balign 4 - -glabel D_80AC92B8 - .asciz "%s[%d]:ズーム中！！\n" - .balign 4 - -glabel D_80AC92D8 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC92E8 - .asciz "★★★ 続けるよ！！ ★★★\n" - .balign 4 - -glabel D_80AC930C - .asciz "★★★ やめるよ！！ ★★★\n" - .balign 4 - -glabel D_80AC9330 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80AC933C - .word 0xA1FAA1FA, 0xA1FA20B7, 0xD9B9F0A1, 0xAAA1AA20, 0xC3AAA4AC, 0xA4CAA4A4, 0xA4E8A1AA, 0xA1AA20A1, 0xFAA1FAA1, 0xFA0A0000 -glabel D_80AC9364 - .word 0x1B5B6D00 -glabel D_80AC9368 - .asciz "◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇\n" - .balign 4 - -glabel D_80AC939C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93AC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93BC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93CC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93DC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93EC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93FC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC940C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC941C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC942C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC943C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC944C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC945C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC946C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC947C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC948C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC949C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94AC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94BC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94CC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94DC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94EC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel jtbl_80AC94FC -.word L80AC4198 -.word L80AC4198 -.word L80AC4198 -.word L80AC4198 -.word L80AC4184 -.word L80AC41AC -.word L80AC4168 -glabel jtbl_80AC9518 -.word L80AC4918 -.word L80AC4934 -.word L80AC4934 -.word L80AC4918 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC48C4 -.word L80AC48E0 -.word L80AC48FC -.word L80AC48FC -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4918 -.word L80AC4918 -.word L80AC4918 -glabel jtbl_80AC95CC -.word L80AC5070 -.word L80AC50DC -.word L80AC512C -.word L80AC514C -.word L80AC516C -.word L80AC518C -glabel jtbl_80AC95E4 -.word L80AC5B5C -.word L80AC5B74 -.word L80AC5B8C -.word L80AC5BA4 -.word L80AC5BB8 -.word L80AC5BB8 -.word L80AC5BB8 -.word L80AC5BB8 -glabel D_80AC9604 - .word 0x3F59999A -glabel D_80AC9608 - .word 0x3E19999A -glabel D_80AC960C - .word 0x3D4CCCCD -glabel D_80AC9610 - .word 0x3D4CCCCD -glabel D_80AC9614 - .word 0x3D4CCCCD -glabel D_80AC9618 - .word 0x3D4CCCCD -glabel D_80AC961C - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_en_owl.rodata.s b/data/overlays/actors/z_en_owl.rodata.s deleted file mode 100644 index 86fceb075f..0000000000 --- a/data/overlays/actors/z_en_owl.rodata.s +++ /dev/null @@ -1,111 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80ACD650 - .asciz " 会話フクロウ %4x no = %d, sv = %d\n" - .balign 4 - -glabel D_80ACD67C - .asciz "savebitでフクロウ退避\n" - .balign 4 - -glabel D_80ACD694 - .word 0xA5D5A5AF, 0xA5EDA5A6, 0xC2E0C8F2, 0x0A000000 -glabel D_80ACD6A4 - .word 0xA5D5A5AF, 0xA5EDA5A6, 0xC2E0C8F2, 0x0A000000 -glabel D_80ACD6B4 - .word 0xA5D5A5AF, 0xA5EDA5A6, 0xC2E0C8F2, 0x0A000000 -glabel D_80ACD6C4 - .word 0xA5D5A5AF, 0xA5EDA5A6, 0xC2E0C8F2, 0x0A000000 -glabel D_80ACD6D4 - .word 0xA5D5A5AF, 0xA5EDA5A6, 0xC2E0C8F2, 0x0A000000 -glabel D_80ACD6E4 - .word 0x1B5B3336, 0x6D000000 -glabel D_80ACD6EC - .asciz "no = %d \n" - .balign 4 - -glabel D_80ACD6F8 - .word 0xCCA4B4B0, 0xC0AEA4CE, 0xA5D5A5AF, 0xA5EDA5A6, 0xCCA4B4B0, 0xC0AEA4CE, 0xA5D5A5AF, 0xA5EDA5A6, 0xCCA4B4B0, 0xC0AEA4CE, 0xA5D5A5AF, 0xA5EDA5A6, 0x0A000000 -glabel D_80ACD72C - .word 0x1B5B6D00 -glabel D_80ACD730 - .asciz " Actor_Environment_sw = %d\n" - .balign 4 - -glabel D_80ACD754 - .word 0x1B5B3336, 0x6D000000 -glabel D_80ACD75C - .asciz "%dのフクロウ\n" - .balign 4 - -glabel D_80ACD76C - .word 0x1B5B6D00 -glabel D_80ACD770 - .word 0x1B5B3336, 0x6D000000 -glabel D_80ACD778 - .asciz "SPOT 06 の デモがはしった\n" - .balign 4 - -glabel D_80ACD794 - .word 0x1B5B6D00 -glabel D_80ACD798 - .word 0x30000000 -glabel D_80ACD79C - .asciz "../z_en_owl.c" - .balign 4 - -glabel D_80ACD7AC - .word 0xA5D5A5AF, 0xA5EDA5A6, 0xBEC3CCC7, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21210A00 -glabel D_80ACD7DC - .asciz "../z_en_owl.c" - .balign 4 - -glabel D_80ACD7EC - .asciz "../z_en_owl.c" - .balign 4 - -glabel jtbl_80ACD7FC -.word L80ACA110 -.word L80ACA12C -.word L80ACA13C -.word L80ACA160 -.word L80ACA1A0 -.word L80ACA1E0 -.word L80ACA1F0 -.word L80ACA244 -.word L80ACA264 -.word L80ACA274 -.word L80ACA284 -.word L80ACA294 -.word L80ACA2DC -glabel jtbl_80ACD830 -.word L80ACBAFC -.word L80ACBB38 -.word L80ACBB80 -.word L80ACBBC8 -.word L80ACBBE4 -glabel D_80ACD844 - .word 0x45BB8000 -glabel D_80ACD848 - .word 0x3ECCCCCD -glabel D_80ACD84C - .word 0x3E4CCCCD -glabel D_80ACD850 - .word 0x3E4CCCCD -glabel D_80ACD854 - .word 0x3E99999A -glabel D_80ACD858 - .word 0x459C4000 -glabel D_80ACD85C - .word 0x459C4000 -glabel D_80ACD860 - .word 0x459C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_part.rodata.s b/data/overlays/actors/z_en_part.rodata.s deleted file mode 100644 index c6d1ada028..0000000000 --- a/data/overlays/actors/z_en_part.rodata.s +++ /dev/null @@ -1,82 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80ACF210 - .asciz "../z_en_part.c" - .balign 4 - -glabel D_80ACF220 - .asciz "../z_en_part.c" - .balign 4 - -glabel D_80ACF230 - .asciz "../z_en_part.c" - .balign 4 - -glabel D_80ACF240 - .word 0x469C4000 -glabel jtbl_80ACF244 -.word L80ACDE58 -.word L80ACDF68 -.word L80ACDF98 -.word L80ACE010 -.word L80ACDF68 -.word L80ACE0AC -.word L80ACE0AC -.word L80ACE0AC -.word L80ACE0AC -.word L80ACDF68 -.word L80ACDF68 -.word L80ACDFEC -.word L80ACDEBC -.word L80ACDEB4 -.word L80ACDF44 -glabel D_80ACF280 - .word 0xBE99999A -glabel D_80ACF284 - .word 0x3E99999A -glabel D_80ACF288 - .word 0xBF19999A -glabel D_80ACF28C - .word 0x3E19999A -glabel D_80ACF290 - .word 0xBF19999A -glabel D_80ACF294 - .word 0x3E19999A -glabel D_80ACF298 - .word 0xBF19999A -glabel D_80ACF29C - .word 0x3E99999A -glabel D_80ACF2A0 - .word 0x3E19999A -glabel D_80ACF2A4 - .word 0xBF99999A -glabel D_80ACF2A8 - .word 0x3E19999A -glabel jtbl_80ACF2AC -.word L80ACE2AC -.word L80ACE56C -.word L80ACE348 -.word L80ACE3E4 -.word L80ACE4A4 -.word L80ACE4A4 -.word L80ACE4A4 -.word L80ACE4A4 -.word L80ACE2AC -.word L80ACE2AC -.word L80ACE348 -.word L80ACE56C -.word L80ACE56C -.word L80ACE2AC -glabel D_80ACF2E4 - .word 0x44228000 -glabel D_80ACF2E8 - .word 0x3D23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_peehat.rodata.s b/data/overlays/actors/z_en_peehat.rodata.s deleted file mode 100644 index 74e2621d5e..0000000000 --- a/data/overlays/actors/z_en_peehat.rodata.s +++ /dev/null @@ -1,97 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AD2890 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28A4 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28B8 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28CC - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28E0 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28F4 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD2908 - .word 0x45834000 -glabel D_80AD290C - .word 0x3BC49BA6 -glabel D_80AD2910 - .word 0x3B449BA6 -glabel D_80AD2914 - .word 0x40C8F5C3 -glabel D_80AD2918 - .word 0x477FFF00 -glabel D_80AD291C - .word 0x477FFF00 -glabel D_80AD2920 - .word 0x3F866666 -glabel D_80AD2924 - .word 0x3F866666 -glabel D_80AD2928 - .word 0x40A9999A -glabel D_80AD292C - .word 0x3A03126F -glabel D_80AD2930 - .word 0x3F866666 -glabel D_80AD2934 - .word 0x3F866666 -glabel D_80AD2938 - .word 0x3FB33333 -glabel D_80AD293C - .word 0x3E3851EC -glabel D_80AD2940 - .word 0x3D8F5C29 -glabel D_80AD2944 - .word 0x3FB33333 -glabel D_80AD2948 - .word 0x3E3851EC -glabel D_80AD294C - .word 0x3D8F5C29 -glabel D_80AD2950 - .word 0x3AC49BA6 -glabel D_80AD2954 - .word 0x3F866666 -glabel D_80AD2958 - .word 0x3F866666 -glabel D_80AD295C - .word 0x3DEB851F -glabel D_80AD2960 - .word 0x3E051EB8 -glabel D_80AD2964 - .word 0x3DCCCCCD -glabel D_80AD2968 - .word 0x3DCCCCCD -glabel D_80AD296C - .word 0x3E051EB8 -glabel D_80AD2970 - .word 0x3DEB851F -glabel D_80AD2974 - .word 0x3EB33333 -glabel D_80AD2978 - .word 0x404CCCCD -glabel D_80AD297C - .word 0x3E4CCCCD -glabel D_80AD2980 - .word 0x3E99999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_po_desert.rodata.s b/data/overlays/actors/z_en_po_desert.rodata.s deleted file mode 100644 index 1d9a31cd0d..0000000000 --- a/data/overlays/actors/z_en_po_desert.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AD39F0 - .asciz "../z_en_po_desert.c" - .balign 4 - -glabel D_80AD3A04 - .asciz "../z_en_po_desert.c" - .balign 4 - -glabel D_80AD3A18 - .asciz "../z_en_po_desert.c" - .balign 4 - -glabel D_80AD3A2C - .word 0x3E20D97C -glabel D_80AD3A30 - .word 0x3DC90FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_po_field.rodata.s b/data/overlays/actors/z_en_po_field.rodata.s deleted file mode 100644 index cf60d0077a..0000000000 --- a/data/overlays/actors/z_en_po_field.rodata.s +++ /dev/null @@ -1,110 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AD7160 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7174 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7188 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD719C - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD71B0 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD71C4 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD71D8 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD71EC - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7200 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7214 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7228 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD723C - .word 0x3C656042 -glabel D_80AD7240 - .word 0x3C23D70A -glabel D_80AD7244 - .word 0x44BB8000 -glabel D_80AD7248 - .word 0x3ECCCCCD -glabel D_80AD724C - .word 0x3D4CCCCD -glabel D_80AD7250 - .word 0x3DCCCCCD -glabel D_80AD7254 - .word 0x453B8000 -glabel D_80AD7258 - .word 0x3E4CCCCD -glabel D_80AD725C - .word 0x44BB8000 -glabel D_80AD7260 - .word 0x3A83126F -glabel D_80AD7264 - .word 0x3BE56042 -glabel D_80AD7268 - .word 0x3B808081 -glabel D_80AD726C - .word 0x3BB78035 -glabel D_80AD7270 - .word 0x3AB78035 -glabel D_80AD7274 - .word 0x37E64689 -glabel D_80AD7278 - .word 0x3D70F0F1 -glabel D_80AD727C - .word 0x3F48C8C9 -glabel D_80AD7280 - .word 0x3F48C8C9 -glabel D_80AD7284 - .word 0x47A60400 -glabel D_80AD7288 - .word 0x38C90FDB -glabel D_80AD728C - .word 0x3B449BA6 -glabel D_80AD7290 - .word 0x3F333333 -glabel D_80AD7294 - .word 0x3A6BEDFB -glabel D_80AD7298 - .word 0x418547AE -glabel D_80AD729C - .word 0x41855555 -glabel D_80AD72A0 - .word 0x3C23D70A -glabel D_80AD72A4 - .word 0x3F48C8C9 -glabel D_80AD72A8 - .word 0x38C90FDB, 0x00000000 - diff --git a/data/overlays/actors/z_en_po_relay.rodata.s b/data/overlays/actors/z_en_po_relay.rodata.s deleted file mode 100644 index 7833e86e8e..0000000000 --- a/data/overlays/actors/z_en_po_relay.rodata.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AD8D60 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8D74 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8D88 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8D9C - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8DB0 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8DC4 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8DD8 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8DEC - .word 0x3CF5C28F -glabel D_80AD8DF0 - .word 0x44D98000 -glabel D_80AD8DF4 - .word 0x44C58000 -glabel D_80AD8DF8 - .word 0x4502A000 -glabel D_80AD8DFC - .word 0x3FB33333 -glabel D_80AD8E00 - .word 0x3F99999A -glabel D_80AD8E04 - .word 0x3F99999A -glabel D_80AD8E08 - .word 0x3F4CCCCD -glabel D_80AD8E0C - .word 0x3CA3D70A - - diff --git a/data/overlays/actors/z_en_po_sisters.rodata.s b/data/overlays/actors/z_en_po_sisters.rodata.s deleted file mode 100644 index cf3357c48e..0000000000 --- a/data/overlays/actors/z_en_po_sisters.rodata.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80ADD810 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD828 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD840 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD858 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD870 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD888 - .word 0x3DCCCCCD -glabel D_80ADD88C - .word 0xC5BB8000 -glabel D_80ADD890 - .word 0x453B8000 -glabel D_80ADD894 - .word 0x453B8000 -glabel D_80ADD898 - .word 0x3DCCCCCD -glabel D_80ADD89C - .word 0x3E4CCCCD -glabel D_80ADD8A0 - .word 0x3E99999A -glabel D_80ADD8A4 - .word 0x3F333333 -glabel D_80ADD8A8 - .word 0x3BB78035 -glabel D_80ADD8AC - .word 0x3B30F27C -glabel D_80ADD8B0 - .word 0x3B30F27C -glabel D_80ADD8B4 - .word 0x3B656042 -glabel D_80ADD8B8 - .word 0x3B30F27C -glabel D_80ADD8BC - .word 0x3F4CCCCD -glabel D_80ADD8C0 - .word 0x3CCCCCCD -glabel D_80ADD8C4 - .word 0x3BE56042, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_poh.rodata.s b/data/overlays/actors/z_en_poh.rodata.s deleted file mode 100644 index 1f9c122e28..0000000000 --- a/data/overlays/actors/z_en_poh.rodata.s +++ /dev/null @@ -1,89 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AE1B80 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1B90 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BA0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BB0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BC0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BD0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BE0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BF0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C00 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C10 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C20 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C30 - .word 0x44BB8000 -glabel D_80AE1C34 - .word 0x3DCCCCCD -glabel D_80AE1C38 - .word 0x3D4CCCCD -glabel D_80AE1C3C - .word 0x3A83126F -glabel D_80AE1C40 - .word 0x3BE56042 -glabel D_80AE1C44 - .word 0x3B808081 -glabel D_80AE1C48 - .word 0x3BB78035 -glabel D_80AE1C4C - .word 0x3AB78035 -glabel D_80AE1C50 - .word 0x37E64689 -glabel D_80AE1C54 - .word 0x3D70F0F1 -glabel D_80AE1C58 - .word 0x3F48C8C9 -glabel D_80AE1C5C - .word 0x3F48C8C9 -glabel D_80AE1C60 - .word 0x418547AE -glabel D_80AE1C64 - .word 0x41855555 -glabel D_80AE1C68 - .word 0x3C23D70A -glabel D_80AE1C6C - .word 0x3F48C8C9 -glabel D_80AE1C70 - .word 0x38C90FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_rd.rodata.s b/data/overlays/actors/z_en_rd.rodata.s deleted file mode 100644 index b83aaaa0a4..0000000000 --- a/data/overlays/actors/z_en_rd.rodata.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AE4970 - .asciz "../z_en_rd.c" - .balign 4 - -glabel D_80AE4980 - .asciz "../z_en_rd.c" - .balign 4 - -glabel D_80AE4990 - .word 0x3E99999A -glabel D_80AE4994 - .word 0x3E99999A -glabel D_80AE4998 - .word 0x3E99999A -glabel D_80AE499C - .word 0x3ECCCCCD -glabel D_80AE49A0 - .word 0x3ECCCCCD -glabel jtbl_80AE49A4 -.word L80AE3508 -.word L80AE34B4 -.word L80AE3538 -.word L80AE3724 -.word L80AE3754 -glabel D_80AE49B8 - .word 0x3E19999A -glabel D_80AE49BC - .word 0x389D4952 -glabel jtbl_80AE49C0 -.word L80AE45B4 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45E4 -.word L80AE45F8 -.word L80AE45F4 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45DC -.word L80AE45F8 -.word L80AE45EC -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45CC -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45C4 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45BC -.word L80AE45F8 -.word L80AE45AC -.word L80AE45D4 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_reeba.rodata.s b/data/overlays/actors/z_en_reeba.rodata.s deleted file mode 100644 index 17d8bf3b5c..0000000000 --- a/data/overlays/actors/z_en_reeba.rodata.s +++ /dev/null @@ -1,67 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AE65F0 - .asciz "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80AE6624 - .word 0x0A0A0000 -glabel D_80AE6628 - .asciz "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" - .balign 4 - -glabel D_80AE6658 - .word 0x0A0A0000 -glabel D_80AE665C - .asciz "../z_en_reeba.c" - .balign 4 - -glabel D_80AE666C - .asciz "../z_en_reeba.c" - .balign 4 - -glabel D_80AE667C - .word 0x3D23D70A -glabel D_80AE6680 - .word 0xC6D6D800 -glabel jtbl_80AE6684 -.word L80AE5170 -.word L80AE517C -.word L80AE51A8 -.word L80AE51A8 -.word L80AE51E8 -glabel D_80AE6698 - .word 0x3E19999A -glabel D_80AE669C - .word 0x3FE66666 -glabel D_80AE66A0 - .word 0x3C23D70A -glabel D_80AE66A4 - .word 0x453B8000 -glabel D_80AE66A8 - .word 0x453B8000 -glabel jtbl_80AE66AC -.word L80AE60CC -.word L80AE6104 -.word L80AE608C -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE5F5C -.word L80AE5F5C -.word L80AE5FB4 -.word L80AE600C -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_river_sound.rodata.s b/data/overlays/actors/z_en_river_sound.rodata.s deleted file mode 100644 index defbd5c9dc..0000000000 --- a/data/overlays/actors/z_en_river_sound.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AE7230 - .word 0x461C4000 -glabel D_80AE7234 - .word 0x461C4000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_rl.rodata.s b/data/overlays/actors/z_en_rl.rodata.s deleted file mode 100644 index aae719635b..0000000000 --- a/data/overlays/actors/z_en_rl.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AE8200 - .asciz "../z_en_rl_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AE8220 - .asciz "../z_en_rl_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AE8240 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AE827C - .asciz "../z_en_rl.c" - .balign 4 - -glabel D_80AE828C - .asciz "../z_en_rl.c" - .balign 4 - -glabel D_80AE829C - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 16 - - - diff --git a/data/overlays/actors/z_en_rr.rodata.s b/data/overlays/actors/z_en_rr.rodata.s deleted file mode 100644 index c3bad02321..0000000000 --- a/data/overlays/actors/z_en_rr.rodata.s +++ /dev/null @@ -1,142 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AEA720 - .word 0xA5BFA5A4, 0xA5D7A3B7, 0x20200000 -glabel D_80AEA72C - .word 0xCBE2CBA1, 0xA4CEC4DB, 0xBEAE0000 -glabel D_80AEA738 - .word 0xCCF02020, 0x20202020, 0x20200000 -glabel D_80AEA744 - .word 0xCDC5C0BA, 0x20202020, 0x20200000 -glabel D_80AEA750 - .word 0x3230A5EB, 0xA5D4A1BC, 0x20200000 -glabel D_80AEA75C - .word 0x3530A5EB, 0xA5D4A1BC, 0x20200000 -glabel D_80AEA768 - .asciz "%s[%d] : Rr_Catch_Cancel\n" - .balign 4 - -glabel D_80AEA78C - .asciz "../z_en_rr.c" - .balign 4 - -glabel D_80AEA79C - .asciz "カキン(%d)！！\n" - .balign 4 - -glabel D_80AEA7B4 - .asciz "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！\n" - .balign 4 - -glabel D_80AEA7EC - .asciz "キャッチ(%d)！！\n" - .balign 4 - -glabel D_80AEA808 - .asciz "「%s」が出た！！\n" - .balign 4 - -glabel D_80AEA824 - .word 0x30000000 -glabel D_80AEA828 - .asciz "../z_en_rr.c" - .balign 4 - -glabel D_80AEA838 - .asciz "../z_en_rr.c" - .balign 4 - -glabel D_80AEA848 - .asciz "../z_en_rr.c" - .balign 4 - -glabel D_80AEA858 - .asciz "../z_en_rr.c" - .balign 4 - -glabel D_80AEA868 - .asciz "../z_en_rr.c" - .balign 4 - -glabel D_80AEA878 - .word 0x3C656042 -glabel D_80AEA87C - .word 0x3C54FDF4 -glabel D_80AEA880 - .word 0xBECCCCCD -glabel D_80AEA884 - .word 0x451C4000 -glabel D_80AEA888 - .word 0x3F4CCCCD -glabel D_80AEA88C - .word 0x45BB8000 -glabel D_80AEA890 - .word 0x451C4000 -glabel D_80AEA894 - .word 0x3E19999A -glabel D_80AEA898 - .word 0x459C4000 -glabel D_80AEA89C - .word 0x451C4000 -glabel D_80AEA8A0 - .word 0x451C4000 -glabel D_80AEA8A4 - .word 0x3E19999A -glabel D_80AEA8A8 - .word 0x451C4000 -glabel D_80AEA8AC - .word 0x451C4000 -glabel D_80AEA8B0 - .word 0x3E19999A -glabel jtbl_80AEA8B4 -.word L80AE9170 -.word L80AE9094 -.word L80AE90DC -.word L80AE912C -.word L80AE91A8 -.word L80AE91A8 -.word L80AE91A8 -.word L80AE91A8 -.word L80AE91A8 -.word L80AE91A8 -.word L80AE8FD4 -.word L80AE8FD8 -.word L80AE8FE0 -.word L80AE8FE8 -.word L80AE8FF0 -glabel D_80AEA8F0 - .word 0x451C4000 -glabel D_80AEA8F4 - .word 0x3E19999A -glabel jtbl_80AEA8F8 -.word L80AE96CC -.word L80AE96E4 -.word L80AE9710 -.word L80AE9738 -.word L80AE9764 -glabel D_80AEA90C - .word 0x3F4CCCCD -glabel D_80AEA910 - .word 0x459C4000 -glabel D_80AEA914 - .word 0xC59C4000 -glabel D_80AEA918 - .word 0x3B449BA6 -glabel jtbl_80AEA91C -.word L80AE9B4C -.word L80AE9AD4 -.word L80AE9AEC -.word L80AE9B04 -.word L80AE9B1C -.word L80AE9B34 -glabel D_80AEA934 - .word 0x3E4CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ru1.rodata.s b/data/overlays/actors/z_en_ru1.rodata.s deleted file mode 100644 index c43cf976ac..0000000000 --- a/data/overlays/actors/z_en_ru1.rodata.s +++ /dev/null @@ -1,136 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AF1A30 - .asciz "お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF1A64 - .word 0xA5B9A5A4, 0xA5C3A5C1, 0xA5EBA5C8, 0xA5BBA5C3, 0xA5C82121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x0A000000 -glabel D_80AF1A90 - .word 0xA5B9A5A4, 0xA5C3A5C1, 0xA5EBA5C8, 0xA5BBA5C3, 0xA5C8A4B7, 0xA4CAA4A4, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21210A00 -glabel D_80AF1AC0 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF1AFC - .asciz "該当 arge_data = %d 無し\n" - .balign 4 - -glabel D_80AF1B18 - .asciz "首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF1B54 - .asciz "../z_en_ru1.c" - .balign 4 - -glabel D_80AF1B64 - .asciz "../z_en_ru1.c" - .balign 4 - -glabel D_80AF1B74 - .asciz "../z_en_ru1.c" - .balign 4 - -glabel D_80AF1B84 - .asciz "../z_en_ru1.c" - .balign 4 - -glabel D_80AF1B94 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF1BCC - .word 0x3C23D70A -glabel D_80AF1BD0 - .word 0x402CCCCD -glabel D_80AF1BD4 - .word 0x3C23D70A -glabel D_80AF1BD8 - .word 0x402CCCCD -glabel D_80AF1BDC - .word 0x3C23D70A -glabel D_80AF1BE0 - .word 0x3C23D70A -glabel D_80AF1BE4 - .word 0x43848000 -glabel D_80AF1BE8 - .word 0xC61C4000 -glabel D_80AF1BEC - .word 0x42A6AAAB -glabel D_80AF1BF0 - .word 0x4622F983 -glabel D_80AF1BF4 - .word 0x3C23D70A -glabel D_80AF1BF8 - .word 0x3C23D70A -glabel D_80AF1BFC - .word 0x3F4CCCCD -glabel D_80AF1C00 - .word 0x3F19999A -glabel D_80AF1C04 - .word 0x3F19999A, 0x3C23D70A -glabel D_80AF1C0C - .word 0x3C23D70A -glabel D_80AF1C10 - .word 0x3F4CCCCD -glabel D_80AF1C14 - .word 0x3F19999A -glabel D_80AF1C18 - .word 0x3C23D70A -glabel D_80AF1C1C - .word 0x3F19999A -glabel D_80AF1C20 - .word 0x3F8CCCCD -glabel D_80AF1C24 - .word 0x3C23D70A -glabel D_80AF1C28 - .word 0x3F7AE148 -glabel D_80AF1C2C - .word 0x3E4CCCCD -glabel D_80AF1C30 - .word 0xBDCCCCCD -glabel D_80AF1C34 - .word 0x3DCCCCCD -glabel D_80AF1C38 - .word 0x3F733333 -glabel D_80AF1C3C - .word 0x3C23D70A -glabel D_80AF1C40 - .word 0x40D9999A -glabel D_80AF1C44 - .word 0x3FA66666 -glabel D_80AF1C48 - .word 0x3C23D70A -glabel D_80AF1C4C - .word 0x40D9999A -glabel D_80AF1C50 - .word 0x3FA66666 -glabel D_80AF1C54 - .word 0xBDCCCCCD -glabel D_80AF1C58 - .word 0x3DCCCCCD -glabel D_80AF1C5C - .word 0x3F333333 -glabel jtbl_80AF1C60 -.word L80AF01A4 -.word L80AF01B8 -.word L80AF01CC -.word L80AF01E0 -.word L80AF01F4 -.word L80AF0208 -.word L80AF021C -.word L80AF0244 -.word L80AF0244 -.word L80AF0244 -.word L80AF0230 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_sa.rodata.s b/data/overlays/actors/z_en_sa.rodata.s deleted file mode 100644 index c4590227d2..0000000000 --- a/data/overlays/actors/z_en_sa.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AF7490 - .asciz "../z_en_sa.c" - .balign 4 - -glabel D_80AF74A0 - .asciz "../z_en_sa.c" - .balign 4 - -glabel jtbl_80AF74B0 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF573C -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -glabel jtbl_80AF74D8 -.word L80AF5D14 -.word L80AF5D24 -.word L80AF5D34 -.word L80AF5D44 -.word L80AF5D54 -.word L80AF5D64 -.word L80AF5D74 -glabel jtbl_80AF74F4 -.word L80AF637C -.word L80AF62B4 -.word L80AF627C -.word L80AF6350 -.word L80AF62DC -.word L80AF6298 -glabel D_80AF750C - .word 0xC50AC000 -glabel D_80AF7510 - .word 0x40490FDB -glabel D_80AF7514 - .word 0x40490FDB -glabel D_80AF7518 - .word 0x40490FDB -glabel D_80AF751C - .word 0x40490FDB - - diff --git a/data/overlays/actors/z_en_sb.rodata.s b/data/overlays/actors/z_en_sb.rodata.s deleted file mode 100644 index 7863e8d4de..0000000000 --- a/data/overlays/actors/z_en_sb.rodata.s +++ /dev/null @@ -1,52 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AF8A60 - .word 0xA5A2A5BF, 0xA5A1A1C1, 0xA5C3A5AF, 0xA1AAA1AA, 0x0A000000 -glabel D_80AF8A74 - .asciz "攻撃終了！！\n" - .balign 4 - -glabel D_80AF8A8C - .word 0xBEB33333 -glabel D_80AF8A90 - .word 0x40066666 -glabel D_80AF8A94 - .word 0x3FB33333 -glabel D_80AF8A98 - .word 0xBEB33333 -glabel D_80AF8A9C - .word 0xBDCCCCCD -glabel D_80AF8AA0 - .word 0xBEB33333 -glabel jtbl_80AF8AA4 -.word L80AF82B0 -.word func_80AF82F0 -.word func_80AF832C -.word func_80AF8368 -.word func_80AF8388 -glabel jtbl_80AF8AB8 -.word L80AF8538 -.word L80AF8504 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF85F4 -.word L80AF8538 -.word L80AF8450 -.word L80AF8458 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_sda.rodata.s b/data/overlays/actors/z_en_sda.rodata.s deleted file mode 100644 index 1b1a731203..0000000000 --- a/data/overlays/actors/z_en_sda.rodata.s +++ /dev/null @@ -1,70 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AFA430 - .word 0x53444120, 0x4D4F5645, 0x0A000000 -glabel D_80AFA43C - .asciz "SDA MOVE END\n" - .balign 4 - -glabel D_80AFA44C - .asciz "SDA DRAW \n" - .balign 4 - -glabel D_80AFA458 - .asciz "SDA DRAW END\n" - .balign 4 - -glabel D_80AFA468 - .asciz "SDA CONT \n" - .balign 4 - -glabel D_80AFA474 - .asciz "SDA CONT 2\n" - .balign 4 - -glabel D_80AFA480 - .asciz "SDA CONT 3\n" - .balign 4 - -glabel D_80AFA48C - .asciz "SDA CONT 4\n" - .balign 4 - -glabel D_80AFA498 - .asciz "../z_en_sda.c" - .balign 4 - -glabel D_80AFA4A8 - .word 0x53444120, 0x4420310A, 0x00000000 -glabel D_80AFA4B4 - .asciz "../z_en_sda.c" - .balign 4 - -glabel D_80AFA4C4 - .asciz "../z_en_sda.c" - .balign 4 - -glabel D_80AFA4D4 - .word 0x53444120, 0x4420320A, 0x00000000 -glabel D_80AFA4E0 - .asciz "../z_en_sda.c" - .balign 4 - -glabel D_80AFA4F0 - .word 0x3F99999A -glabel D_80AFA4F4 - .word 0xBF99999A -glabel D_80AFA4F8 - .word 0x40490FDB -glabel D_80AFA4FC - .word 0x40490FDB -glabel D_80AFA500 - .word 0x3F19999A, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_shopnuts.rodata.s b/data/overlays/actors/z_en_shopnuts.rodata.s deleted file mode 100644 index fbe5b16e2a..0000000000 --- a/data/overlays/actors/z_en_shopnuts.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AFB520 - .asciz "../z_en_shopnuts.c" - .balign 4 - -glabel D_80AFB534 - .asciz "../z_en_shopnuts.c" - .balign 4 - -glabel D_80AFB548 - .asciz "../z_en_shopnuts.c" - .balign 4 - -glabel D_80AFB55C - .word 0x3DAA9931 -glabel D_80AFB560 - .word 0x3DEF0069 -glabel D_80AFB564 - .word 0x3FD9999A -glabel D_80AFB568 - .word 0x3F333333 -glabel D_80AFB56C - .word 0x3E2AB368 - - diff --git a/data/overlays/actors/z_en_siofuki.rodata.s b/data/overlays/actors/z_en_siofuki.rodata.s deleted file mode 100644 index 0d79f51884..0000000000 --- a/data/overlays/actors/z_en_siofuki.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AFC820 - .asciz "../z_en_siofuki.c" - .balign 4 - -glabel D_80AFC834 - .asciz "../z_en_siofuki.c" - .balign 4 - -glabel D_80AFC848 - .asciz "../z_en_siofuki.c" - .balign 4 - -glabel D_80AFC85C - .word 0xC5BD5000 -glabel D_80AFC860 - .word 0x3DCCCCCD -glabel D_80AFC864 - .word 0x3F13FA15 -glabel D_80AFC868 - .word 0x40490FDB -glabel D_80AFC86C - .word 0xC5BD5000 -glabel D_80AFC870 - .word 0x4622F983 -glabel D_80AFC874 - .word 0x3E99999A -glabel D_80AFC878 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_skb.rodata.s b/data/overlays/actors/z_en_skb.rodata.s deleted file mode 100644 index 610bb245b7..0000000000 --- a/data/overlays/actors/z_en_skb.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80AFE0E0 - .asciz "../z_en_skb.c" - .balign 4 - -glabel D_80AFE0F0 - .asciz "../z_en_skb.c" - .balign 4 - -glabel D_80AFE100 - .word 0x40C8F5C3 -glabel D_80AFE104 - .word 0x3F4CCCCD -glabel D_80AFE108 - .word 0x3DCCCCCD -glabel D_80AFE10C - .word 0x3C23D70A -glabel D_80AFE110 - .word 0x47435000 -glabel D_80AFE114 - .word 0x3D4CCCCD -glabel D_80AFE118 - .word 0x3D4CCCCD -glabel D_80AFE11C - .word 0x3C23D70A -glabel D_80AFE120 - .word 0x3C75C28F -glabel D_80AFE124 - .word 0x45EA6000 -glabel D_80AFE128 - .word 0x453B8000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_skj.rodata.s b/data/overlays/actors/z_en_skj.rodata.s index 09f4640de2..02691c6258 100644 --- a/data/overlays/actors/z_en_skj.rodata.s +++ b/data/overlays/actors/z_en_skj.rodata.s @@ -82,13 +82,19 @@ glabel jtbl_80B01880 .word L80AFE378 .word L80AFE378 glabel D_80B018F4 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80B018F8 .word 0x4499C000 glabel D_80B018FC - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80B01900 - .word 0x40490FDB + .float 3.14159274101 + .balign 4 + glabel D_80B01904 .word 0x4499C000, 0x00000000, 0x00000000 diff --git a/data/overlays/actors/z_en_skjneedle.rodata.s b/data/overlays/actors/z_en_skjneedle.rodata.s deleted file mode 100644 index aff783dfc3..0000000000 --- a/data/overlays/actors/z_en_skjneedle.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B021C0 - .asciz "../z_en_skj_needle.c" - .balign 4 - -glabel D_80B021D8 - .asciz "../z_en_skj_needle.c" - .balign 4 - -glabel D_80B021F0 - .word 0x2E2E2F7A, 0x5F656E5F, 0x736B6A5F, 0x6E656564, 0x6C652E63, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ssh.rodata.s b/data/overlays/actors/z_en_ssh.rodata.s deleted file mode 100644 index 82d7fc4e73..0000000000 --- a/data/overlays/actors/z_en_ssh.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B045D0 - .asciz "../z_en_ssh.c" - .balign 4 - -glabel D_80B045E0 - .asciz "../z_en_ssh.c" - .balign 4 - -glabel D_80B045F0 - .word 0x3D23D70A -glabel D_80B045F4 - .word 0x461C4000 -glabel D_80B045F8 - .word 0x3E2AAAAB -glabel D_80B045FC - .word 0x43360B61 -glabel D_80B04600 - .word 0x38C90FDB -glabel D_80B04604 - .word 0x40490FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_st.rodata.s b/data/overlays/actors/z_en_st.rodata.s deleted file mode 100644 index 870adcfb97..0000000000 --- a/data/overlays/actors/z_en_st.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B07200 - .asciz "../z_en_st.c" - .balign 4 - -glabel D_80B07210 - .asciz "../z_en_st.c" - .balign 4 - -glabel D_80B07220 - .word 0x40490FDB -glabel D_80B07224 - .word 0x3FB33333 -glabel D_80B07228 - .word 0x3D23D70A -glabel D_80B0722C - .word 0x3F19999A -glabel D_80B07230 - .word 0x3EEEEEEF -glabel D_80B07234 - .word 0x43360B61 -glabel D_80B07238 - .word 0x38C90FDB, 0x00000000 - - diff --git a/data/overlays/actors/z_en_sth.rodata.s b/data/overlays/actors/z_en_sth.rodata.s deleted file mode 100644 index 4e5d949421..0000000000 --- a/data/overlays/actors/z_en_sth.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B0B4C0 - .asciz "金スタル屋 no = %d\n" - .balign 4 - -glabel D_80B0B4DC - .word 0xB6E2A5B9, 0xA5BFA5EB, 0xB2B020A4, 0xDEA4C020, 0xBFCDB4D6, 0xA4CBCCE1, 0xA4ECA4CA, 0xA4A4200A, 0x00000000 -glabel D_80B0B500 - .asciz "金スタル屋 まだ 人間に戻れない \n" - .balign 4 - -glabel D_80B0B52C - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_80B0B53C - .word 0x30000000 -glabel D_80B0B540 - .asciz "../z_en_sth.c" - .balign 4 - -glabel D_80B0B550 - .asciz "../z_en_sth.c" - .balign 4 - -glabel D_80B0B560 - .asciz "../z_en_sth.c" - .balign 4 - -glabel D_80B0B570 - .asciz "../z_en_sth.c" - .balign 4 - -glabel D_80B0B580 - .asciz "../z_en_sth.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_en_stream.rodata.s b/data/overlays/actors/z_en_stream.rodata.s deleted file mode 100644 index 35ca02a570..0000000000 --- a/data/overlays/actors/z_en_stream.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B0BCD0 - .asciz "../z_en_stream.c" - .balign 4 - -glabel D_80B0BCE4 - .asciz "../z_en_stream.c" - .balign 4 - -glabel D_80B0BCF8 - .asciz "../z_en_stream.c" - .balign 4 - -glabel D_80B0BD0C - .word 0x3C23D70A -glabel D_80B0BD10 - .word 0x4622F983, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_sw.rodata.s b/data/overlays/actors/z_en_sw.rodata.s deleted file mode 100644 index 2038d412a3..0000000000 --- a/data/overlays/actors/z_en_sw.rodata.s +++ /dev/null @@ -1,106 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B0F1A0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1B0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1C0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1D0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1E0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1F0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F200 - .word 0x38000100 -glabel D_80B0F204 - .word 0x3A83126F -glabel D_80B0F208 - .word 0x3CA3D70A -glabel D_80B0F20C - .word 0x481C4000 -glabel D_80B0F210 - .word 0x3DCCCCCD -glabel D_80B0F214 - .word 0xBDCCCCCD -glabel D_80B0F218 - .word 0x38000100 -glabel D_80B0F21C - .word 0x3A83126F -glabel D_80B0F220 - .word 0x3C656041 -glabel D_80B0F224 - .word 0x3CA3D70A -glabel D_80B0F228 - .word 0x3C656041 -glabel D_80B0F22C - .word 0x3CA3D70A -glabel D_80B0F230 - .word 0x3DCCCCCD -glabel D_80B0F234 - .word 0xBDCCCCCD -glabel D_80B0F238 - .word 0x4622F983 -glabel D_80B0F23C - .word 0x3DCCCCCD -glabel D_80B0F240 - .word 0x3C23D70A -glabel D_80B0F244 - .word 0x3C23D70A -glabel D_80B0F248 - .word 0x469C4000 -glabel jtbl_80B0F24C -.word L80B0ECAC -.word L80B0EC9C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC2C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC4C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC3C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC7C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC6C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC1C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC5C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC8C -glabel D_80B0F2B4 - .word 0x4633B000 -glabel D_80B0F2B8 - .word 0x4633B000 -glabel D_80B0F2BC - .word 0xBFB2B8C2 - - diff --git a/data/overlays/actors/z_en_syateki_itm.rodata.s b/data/overlays/actors/z_en_syateki_itm.rodata.s deleted file mode 100644 index 523a569b78..0000000000 --- a/data/overlays/actors/z_en_syateki_itm.rodata.s +++ /dev/null @@ -1,73 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B103E0 - .asciz "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10408 - .asciz "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10438 - .asciz "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10468 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B1049C - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B104D0 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10504 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10538 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B1056C - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B105A0 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B105D4 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10608 - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B1063C - .asciz "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" - .balign 4 - -glabel D_80B10670 - .word 0x40BFAE14 -glabel jtbl_80B10674 -.word L80B0FBDC -.word L80B0FC10 -.word L80B0FC64 -.word L80B0FC98 -.word L80B0FCEC -.word L80B0FD40 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_syateki_man.rodata.s b/data/overlays/actors/z_en_syateki_man.rodata.s deleted file mode 100644 index 586215d0c2..0000000000 --- a/data/overlays/actors/z_en_syateki_man.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B116A0 - .word 0x0A0A0000 -glabel D_80B116A4 - .asciz "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B116E8 - .asciz "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B1171C - .asciz "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B11748 - .asciz "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B11774 - .word 0x1B5B3334, 0x6DBAC6C4, 0xA9C0EFA4, 0xC0A4BCA1, 0xAAA5D9A5, 0xA4A5D3A1, 0xBCA1AA1B, 0x5B6D0A00, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_syateki_niw.rodata.s b/data/overlays/actors/z_en_syateki_niw.rodata.s deleted file mode 100644 index c845ad0431..0000000000 --- a/data/overlays/actors/z_en_syateki_niw.rodata.s +++ /dev/null @@ -1,114 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B136E0 - .word 0x0A0A0000 -glabel D_80B136E4 - .asciz "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B13710 - .word 0x0A0A0000 -glabel D_80B13714 - .asciz "☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B13740 - .asciz "../z_en_syateki_niw.c" - .balign 4 - -glabel D_80B13758 - .asciz "../z_en_syateki_niw.c" - .balign 4 - -glabel D_80B13770 - .asciz "../z_en_syateki_niw.c" - .balign 4 - -glabel D_80B13788 - .word 0xC61C4000 -glabel jtbl_80B1378C -.word L80B11B74 -.word L80B11B80 -.word L80B11BB4 -.word L80B11C14 -.word L80B11C48 -.word L80B11C5C -glabel D_80B137A4 - .word 0x45DAC000 -glabel D_80B137A8 - .word 0x45DAC000 -glabel D_80B137AC - .word 0x46C35000 -glabel D_80B137B0 - .word 0x45BB8000 -glabel D_80B137B4 - .word 0xC61C4000 -glabel D_80B137B8 - .word 0xC61C4000 -glabel D_80B137BC - .word 0x461C4000 -glabel D_80B137C0 - .word 0x453B8000 -glabel D_80B137C4 - .word 0x465AC000 -glabel D_80B137C8 - .word 0x461C4000 -glabel D_80B137CC - .word 0x407F5C29 -glabel D_80B137D0 - .word 0x4622F983 -glabel D_80B137D4 - .word 0x3E4CCCCD -glabel D_80B137D8 - .word 0xC61C4000 -glabel D_80B137DC - .word 0x45BB8000 -glabel D_80B137E0 - .word 0x461C4000 -glabel jtbl_80B137E4 -.word L80B124AC -.word L80B124C4 -.word L80B1257C -.word L80B12620 -.word L80B12670 -.word L80B126E8 -.word L80B12798 -glabel D_80B13800 - .word 0x459C4000 -glabel D_80B13804 - .word 0xC59C4000 -glabel D_80B13808 - .word 0xBE99999A -glabel D_80B1380C - .word 0x461C4000 -glabel D_80B13810 - .word 0x465AC000 -glabel D_80B13814 - .word 0x459C4000 -glabel D_80B13818 - .word 0x4622F983 -glabel D_80B1381C - .word 0x3FFEB852 -glabel D_80B13820 - .word 0xC61C4000 -glabel D_80B13824 - .word 0x459C4000 -glabel D_80B13828 - .word 0xC59C4000 -glabel D_80B1382C - .word 0xBE19999A -glabel D_80B13830 - .word 0x40490FDB -glabel D_80B13834 - .word 0x3D4CCCCD -glabel D_80B13838 - .word 0x3E4CCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ta.rodata.s b/data/overlays/actors/z_en_ta.rodata.s deleted file mode 100644 index 91e19d700c..0000000000 --- a/data/overlays/actors/z_en_ta.rodata.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B16EA0 - .asciz " 追放タロン \n" - .balign 4 - -glabel D_80B16EB8 - .asciz " 出戻りタロン \n" - .balign 4 - -glabel D_80B16ED0 - .asciz " 夜はいない \n" - .balign 4 - -glabel D_80B16EE8 - .asciz " その他のタロン \n" - .balign 4 - -glabel D_80B16F04 - .asciz " ロンロン牧場の倉庫 の タロン\n" - .balign 4 - -glabel D_80B16F2C - .asciz "../z_en_ta.c" - .balign 4 - -glabel D_80B16F3C - .asciz "../z_en_ta.c" - .balign 4 - -glabel D_80B16F4C - .word 0x3F4CCCCD -glabel D_80B16F50 - .word 0x3ECCCCCD -glabel D_80B16F54 - .word 0x4483A000 -glabel D_80B16F58 - .word 0x3DCCCCCD -glabel D_80B16F5C - .word 0x3CF5C28F -glabel D_80B16F60 - .word 0x3CF5C28F, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_takara_man.rodata.s b/data/overlays/actors/z_en_takara_man.rodata.s deleted file mode 100644 index ce263ad243..0000000000 --- a/data/overlays/actors/z_en_takara_man.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B17DE0 - .asciz "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B17E10 - .word 0x0A0A0000 -glabel D_80B17E14 - .asciz "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B17E40 - .asciz "../z_en_takara_man.c" - .balign 4 - -glabel D_80B17E58 - .asciz "../z_en_takara_man.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_en_test.rodata.s b/data/overlays/actors/z_en_test.rodata.s deleted file mode 100644 index ec4a372127..0000000000 --- a/data/overlays/actors/z_en_test.rodata.s +++ /dev/null @@ -1,157 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80864700 - - .asciz "../z_en_test.c" - .balign 4 - -glabel D_80864710 - - .asciz "../z_en_test.c" - .balign 4 - -glabel jtbl_80864720 -.word L8085FA00 -.word L8085FA00 -.word L8085FA98 -.word L8085FA84 -.word L8085FA84 -.word L8085FA00 -.word L8085FA00 -.word L8085FA84 -.word L8085FA74 -.word L8085FA98 -.word L8085FA98 -glabel jtbl_8086474C -.word L8085FBBC -.word L8085FBCC -.word L8085FBE0 -.word L8085FBBC -.word L8085FBE0 -.word L8085FBCC -.word L8085FBCC -.word L8085FBBC -.word L8085FBCC -.word L8085FBE0 -glabel D_80864774 - .word 0x3E4CCCCD -glabel D_80864778 - .word 0x3F333333 -glabel D_8086477C - .word 0x3E99999A -glabel D_80864780 - .word 0x3E99999A -glabel D_80864784 - .word 0x3F333333 -glabel D_80864788 - .word 0x3E19999A -glabel D_8086478C - .word 0x3CA3D70A -glabel D_80864790 - .word 0x3F333333 -glabel D_80864794 - .word 0x3DCCCCCD -glabel D_80864798 - .word 0x3ECCCCCD -glabel D_8086479C - .word 0x3E4CCCCD -glabel D_808647A0 - .word 0x3DCCCCCD -glabel D_808647A4 - .word 0x3CA3D70A -glabel D_808647A8 - .word 0x3CA3D70A -glabel D_808647AC - .word 0x3F4CCCCD -glabel D_808647B0 - .word 0x3F333333 -glabel D_808647B4 - .word 0xBF4CCCCD -glabel D_808647B8 - .word 0xBF4CCCCD -glabel D_808647BC - .word 0x3F333333 -glabel D_808647C0 - .word 0x3F333333 -glabel D_808647C4 - .word 0x3F333333 -glabel D_808647C8 - .word 0x3F333333 -glabel D_808647CC - .word 0x3F333333 -glabel D_808647D0 - .word 0xBF4CCCCD -glabel D_808647D4 - .word 0xBF4CCCCD -glabel D_808647D8 - .word 0x3F333333 -glabel D_808647DC - .word 0x3C75C28F -glabel D_808647E0 - .word 0x3B03126F -glabel jtbl_808647E4 -.word L808638F4 -.word L808637D4 -.word L80863848 -.word L80863870 -.word L80863884 -glabel jtbl_808647F8 -.word L80863F68 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863F70 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863F88 -.word L80863FCC -.word L80863FA0 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863F7C -.word L80863FCC -.word L80863FCC -.word L80863F94 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FB8 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FC4 -.word L80863FCC -.word L80863FCC -.word L80863FAC - - diff --git a/data/overlays/actors/z_en_tg.rodata.s b/data/overlays/actors/z_en_tg.rodata.s deleted file mode 100644 index bb8951d66f..0000000000 --- a/data/overlays/actors/z_en_tg.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B18980 - .asciz "../z_en_tg.c" - .balign 4 - -glabel D_80B18990 - .asciz "../z_en_tg.c" - .balign 4 - -glabel jtbl_80B189A0 -.word L80B18430 -.word L80B18430 -.word L80B18438 -.word L80B18430 -.word L80B18430 -.word L80B18430 -.word L80B18430 -.word L80B18430 -.word L80B18430 -.word L80B18430 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_tite.rodata.s b/data/overlays/actors/z_en_tite.rodata.s deleted file mode 100644 index 156c9cbd39..0000000000 --- a/data/overlays/actors/z_en_tite.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B1B6F0 - .word 0x0A0A0000 -glabel D_80B1B6F4 - .asciz "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" - .balign 4 - -glabel D_80B1B720 - .word 0x0A0A0000 -glabel D_80B1B724 - .asciz "../z_en_tite.c" - .balign 4 - -glabel D_80B1B734 - .asciz "../z_en_tite.c" - .balign 4 - -glabel D_80B1B744 - .word 0x3C23D70A -glabel D_80B1B748 - .word 0x3C23D70A, 0x00000000 - - diff --git a/data/overlays/actors/z_en_torch2.rodata.s b/data/overlays/actors/z_en_torch2.rodata.s deleted file mode 100644 index f7e9cbd77b..0000000000 --- a/data/overlays/actors/z_en_torch2.rodata.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B1FA30 - .asciz "../z_en_torch2.c" - .balign 4 - -glabel D_80B1FA44 - .asciz "../z_en_torch2.c" - .balign 4 - -glabel D_80B1FA58 - .word 0x3E99999A -glabel D_80B1FA5C - .word 0x44188000 -glabel D_80B1FA60 - .word 0x3F99999A -glabel D_80B1FA64 - .word 0x3F19999A -glabel D_80B1FA68 - .word 0x3F99999A -glabel D_80B1FA6C - .word 0x3F19999A -glabel D_80B1FA70 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_toryo.rodata.s b/data/overlays/actors/z_en_toryo.rodata.s deleted file mode 100644 index 97f3d51857..0000000000 --- a/data/overlays/actors/z_en_toryo.rodata.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel jtbl_80B20C80 -.word L80B205B8 -.word L80B205B8 -.word L80B205B8 -.word L80B205B8 -.word L80B2042C -.word L80B205B8 -.word L80B204AC -glabel jtbl_80B20C9C -.word L80B20570 -.word L80B205A0 -.word L80B205A0 -.word L80B205A0 -.word L80B205A0 -.word L80B20540 -glabel jtbl_80B20CB4 -.word L80B20620 -.word L80B20620 -.word L80B20620 -.word L80B20620 -.word L80B20620 -.word L80B20620 -.word L80B2060C -glabel D_80B20CD0 - .word 0x46638C00 -glabel D_80B20CD4 - .word 0xC6638C00, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_tp.rodata.s b/data/overlays/actors/z_en_tp.rodata.s deleted file mode 100644 index 959d64bfdb..0000000000 --- a/data/overlays/actors/z_en_tp.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B22B40 - .asciz "../z_en_tp.c" - .balign 4 - -glabel D_80B22B50 - .asciz "../z_en_tp.c" - .balign 4 - -glabel D_80B22B60 - .asciz "../z_en_tp.c" - .balign 4 - -glabel D_80B22B70 - .asciz "../z_en_tp.c" - .balign 4 - -glabel D_80B22B80 - .word 0x3E99999A -glabel D_80B22B84 - .word 0x3E4CCCCD -glabel D_80B22B88 - .word 0x3E4CCCCD -glabel D_80B22B8C - .word 0x3E99999A -glabel D_80B22B90 - .word 0x3E99999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_tr.rodata.s b/data/overlays/actors/z_en_tr.rodata.s deleted file mode 100644 index 89e62b32e9..0000000000 --- a/data/overlays/actors/z_en_tr.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B24400 - .word 0x30000000 -glabel D_80B24404 - .asciz "../z_en_tr.c" - .balign 4 - -glabel D_80B24414 - .asciz "../z_en_tr.c" - .balign 4 - -glabel D_80B24424 - .asciz "../z_en_tr.c" - .balign 4 - -glabel D_80B24434 - .word 0x3F666666 -glabel D_80B24438 - .word 0x3E4CCCCD -glabel D_80B2443C - .word 0x3E4CCCCD -glabel D_80B24440 - .word 0x3F666666 -glabel D_80B24444 - .word 0x3F4CCCCD -glabel D_80B24448 - .word 0x3B03126F -glabel D_80B2444C - .word 0x3DCCCCCD -glabel D_80B24450 - .word 0x3DCCCCCD -glabel D_80B24454 - .word 0x3DCCCCCD -glabel D_80B24458 - .word 0x3DCCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_en_trap.rodata.s b/data/overlays/actors/z_en_trap.rodata.s deleted file mode 100644 index 4a20f42a61..0000000000 --- a/data/overlays/actors/z_en_trap.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B25860 - .word 0x3FE66666 -glabel D_80B25864 - .word 0x3FE66666 -glabel D_80B25868 - .word 0x3FE66666 -glabel D_80B2586C - .word 0x477FFF00 -glabel D_80B25870 - .word 0x477FFF00 -glabel D_80B25874 - .word 0x477FFF00 -glabel D_80B25878 - .word 0x477FFF00 -glabel D_80B2587C - .word 0x477FFF00 - - diff --git a/data/overlays/actors/z_en_vali.rodata.s b/data/overlays/actors/z_en_vali.rodata.s deleted file mode 100644 index 13df9430e2..0000000000 --- a/data/overlays/actors/z_en_vali.rodata.s +++ /dev/null @@ -1,129 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B289C0 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B289D0 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B289E0 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B289F0 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B28A00 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B28A10 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B28A20 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B28A30 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B28A40 - .asciz "../z_en_vali.c" - .balign 4 - -glabel D_80B28A50 - .word 0x40490FDB -glabel D_80B28A54 - .word 0x3C4CCCCD -glabel D_80B28A58 - .word 0x3ECCCCCD -glabel D_80B28A5C - .word 0x43360B61 -glabel D_80B28A60 - .word 0x3F333333 -glabel D_80B28A64 - .word 0x3E4CCCCD -glabel D_80B28A68 - .word 0x3FA66666 -glabel D_80B28A6C - .word 0x3DCCCCCD -glabel D_80B28A70 - .word 0x3C23D70A -glabel D_80B28A74 - .word 0x3EA0D97C -glabel D_80B28A78 - .word 0x3E4CCCCD -glabel D_80B28A7C - .word 0x3EA0D97C -glabel D_80B28A80 - .word 0x3E75C28F -glabel D_80B28A84 - .word 0x3E051EB8 -glabel D_80B28A88 - .word 0x3D80ADFD -glabel D_80B28A8C - .word 0x3E75C28F -glabel D_80B28A90 - .word 0x3E051EB8 -glabel D_80B28A94 - .word 0x3EA0D97C -glabel D_80B28A98 - .word 0x3DA3D70A -glabel D_80B28A9C - .word 0x3DA0D97C -glabel D_80B28AA0 - .word 0x3E4CCCCD -glabel D_80B28AA4 - .word 0x3EA0D97C -glabel D_80B28AA8 - .word 0x3E051EB8 -glabel D_80B28AAC - .word 0x3EA0D97C -glabel D_80B28AB0 - .word 0x3E3851EC -glabel D_80B28AB4 - .word 0x3DCCCCCD -glabel D_80B28AB8 - .word 0x3D80ADFD -glabel D_80B28ABC - .word 0x3E3851EC -glabel D_80B28AC0 - .word 0x3DCCCCCD -glabel D_80B28AC4 - .word 0x3EA0D97C -glabel D_80B28AC8 - .word 0x3DA3D70A -glabel D_80B28ACC - .word 0x3DA0D97C -glabel D_80B28AD0 - .word 0x3E051EB8 -glabel D_80B28AD4 - .word 0x3D4CCCCD -glabel D_80B28AD8 - .word 0x3D4CCCCD -glabel D_80B28ADC - .word 0x3EA0D97C -glabel D_80B28AE0 - .word 0x3EB33333 -glabel D_80B28AE4 - .word 0x3D80ADFD -glabel D_80B28AE8 - .word 0x3EB33333 -glabel D_80B28AEC - .word 0x38C90FDB -glabel D_80B28AF0 - .word 0x448B4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_vb_ball.rodata.s b/data/overlays/actors/z_en_vb_ball.rodata.s deleted file mode 100644 index 4e4d7e635e..0000000000 --- a/data/overlays/actors/z_en_vb_ball.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B2A090 - .asciz "../z_en_vb_ball.c" - .balign 4 - -glabel D_80B2A0A4 - .asciz "../z_en_vb_ball.c" - .balign 4 - -glabel D_80B2A0B8 - .asciz "../z_en_vb_ball.c" - .balign 4 - -glabel D_80B2A0CC - .asciz "../z_en_vb_ball.c" - .balign 4 - -glabel D_80B2A0E0 - .word 0xBF4CCCCD -glabel D_80B2A0E4 - .word 0x461C4000 -glabel D_80B2A0E8 - .word 0x453B8000 -glabel D_80B2A0EC - .word 0x459C4000 -glabel D_80B2A0F0 - .word 0xC51C4000 -glabel D_80B2A0F4 - .word 0x3E99999A -glabel D_80B2A0F8 - .word 0x44D48000 -glabel D_80B2A0FC - .word 0x43CCCCCD -glabel D_80B2A100 - .word 0x4622F983, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_viewer.rodata.s b/data/overlays/actors/z_en_viewer.rodata.s deleted file mode 100644 index 8b9377a5a2..0000000000 --- a/data/overlays/actors/z_en_viewer.rodata.s +++ /dev/null @@ -1,119 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B2CFF0 - .asciz "bank_ID >= 0" - .balign 4 - -glabel D_80B2D000 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D014 - .asciz "this->anime_bank_ID >= 0" - .balign 4 - -glabel D_80B2D030 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D044 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D058 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D06C - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D080 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D094 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D0A8 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D0BC - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D0D0 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D0E4 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D0F8 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D10C - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D120 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D134 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D148 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D15C - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D170 - .asciz "../z_en_viewer.c" - .balign 4 - -glabel D_80B2D184 - .word 0x461C4000 -glabel D_80B2D188 - .word 0x44994000 -glabel jtbl_80B2D18C -.word L80B2AC10 -.word L80B2AC38 -.word L80B2AC60 -.word L80B2AC8C -.word L80B2ACB4 -.word L80B2ACE0 -.word L80B2AD0C -.word L80B2AD44 -glabel D_80B2D1AC - .word 0x45228000 -glabel D_80B2D1B0 - .word 0x44FE6000 -glabel D_80B2D1B4 - .word 0x3A83126F -glabel D_80B2D1B8 - .word 0x3A83126F -glabel D_80B2D1BC - .word 0x3DCCCCCD -glabel D_80B2D1C0 - .word 0x3C23D70A -glabel D_80B2D1C4 - .word 0xC61C4000 -glabel D_80B2D1C8 - .word 0x40490FDB, 0x00000000 - diff --git a/data/overlays/actors/z_en_vm.rodata.s b/data/overlays/actors/z_en_vm.rodata.s deleted file mode 100644 index 203c6bd8a4..0000000000 --- a/data/overlays/actors/z_en_vm.rodata.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B2EBB0 - .asciz "hp down %d\n" - .balign 4 - -glabel D_80B2EBBC - .asciz "../z_en_vm.c" - .balign 4 - -glabel D_80B2EBCC - .asciz "../z_en_vm.c" - .balign 4 - -glabel D_80B2EBDC - .asciz "../z_en_vm.c" - .balign 4 - -glabel D_80B2EBEC - .asciz "../z_en_vm.c" - .balign 4 - -glabel D_80B2EBFC - .asciz "../z_en_vm.c" - .balign 4 - -glabel D_80B2EC0C - .word 0x3F19999A -glabel D_80B2EC10 - .word 0x3DCCCCCD -glabel D_80B2EC14 - .word 0x3DCCCCCD -glabel D_80B2EC18 - .word 0xC59C4000 -glabel D_80B2EC1C - .word 0x459C4000 -glabel D_80B2EC20 - .word 0x477FFF00 -glabel D_80B2EC24 - .word 0x45CB2000 -glabel D_80B2EC28 - .word 0x461C4000 -glabel D_80B2EC2C - .word 0x3C23D70A -glabel D_80B2EC30 - .word 0x3F4CCCCD -glabel D_80B2EC34 - .word 0x46FFFE00 -glabel D_80B2EC38 - .word 0x3DCCCCCD -glabel D_80B2EC3C - .word 0x3AC49BA6 - - diff --git a/data/overlays/actors/z_en_wall_tubo.rodata.s b/data/overlays/actors/z_en_wall_tubo.rodata.s deleted file mode 100644 index cae035a972..0000000000 --- a/data/overlays/actors/z_en_wall_tubo.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B2F370 - .word 0x0A0A0000 -glabel D_80B2F374 - .asciz "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_80B2F3A0 - .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_80B2F3CC - .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_80B2F3F8 - .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_80B2F424 - .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" - .balign 4 - -.balign 4 - -glabel D_80B2F450 - .asciz "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" - .balign 4 - -.balign 16 - - - diff --git a/data/overlays/actors/z_en_weather_tag.rodata.s b/data/overlays/actors/z_en_weather_tag.rodata.s deleted file mode 100644 index da6abaafe7..0000000000 --- a/data/overlays/actors/z_en_weather_tag.rodata.s +++ /dev/null @@ -1,69 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B31E40 - .word 0x0A0A0000 -glabel D_80B31E44 - .asciz "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B31E78 - .word 0x0A0A0000 -glabel D_80B31E7C - .asciz "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B31EB8 - .word 0x0A0A0000 -glabel D_80B31EBC - .asciz "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B31F00 - .word 0x0A0A0000 -glabel D_80B31F04 - .asciz "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B31F4C - .word 0x0A0A0000 -glabel D_80B31F50 - .asciz "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B31F8C - .word 0x0A0A0000 -glabel D_80B31F90 - .asciz "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B31FD0 - .word 0x0A0A0000 -glabel D_80B31FD4 - .asciz "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B32008 - .word 0x0A0A0000 -glabel D_80B3200C - .asciz "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" - .balign 4 - -glabel jtbl_80B32054 -.word L80B31080 -.word L80B310B0 -.word L80B310F8 -.word L80B31148 -.word L80B31198 -.word L80B311E8 -.word L80B3125C -.word L80B3128C -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_weiyer.rodata.s b/data/overlays/actors/z_en_weiyer.rodata.s deleted file mode 100644 index 905a000cc4..0000000000 --- a/data/overlays/actors/z_en_weiyer.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B33AF0 - .asciz "../z_en_weiyer.c" - .balign 4 - -glabel D_80B33B04 - .asciz "../z_en_weiyer.c" - .balign 4 - -glabel D_80B33B18 - .word 0xBEC90FDB -glabel D_80B33B1C - .word 0x3DA0D97C -glabel D_80B33B20 - .word 0x3EAAA64C -glabel D_80B33B24 - .word 0x3DCCCCCD -glabel D_80B33B28 - .word 0x3DA0D97C -glabel D_80B33B2C - .word 0x3F20D97C - - diff --git a/data/overlays/actors/z_en_wf.rodata.s b/data/overlays/actors/z_en_wf.rodata.s deleted file mode 100644 index 78a4032811..0000000000 --- a/data/overlays/actors/z_en_wf.rodata.s +++ /dev/null @@ -1,110 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B37B20 - .word 0x0A0A0000 -glabel D_80B37B24 - .asciz "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" - .balign 4 - -glabel D_80B37B50 - .word 0x0A0A0000 -glabel D_80B37B54 - .asciz "../z_en_wf.c" - .balign 4 - -glabel D_80B37B64 - .asciz "../z_en_wf.c" - .balign 4 - -glabel D_80B37B74 - .word 0x3E4CCCCD -glabel D_80B37B78 - .word 0x3E99999A -glabel D_80B37B7C - .word 0x3E333333 -glabel D_80B37B80 - .word 0x3F333333 -glabel D_80B37B84 - .word 0x3CF5C28F -glabel D_80B37B88 - .word 0x3F4CCCCD -glabel D_80B37B8C - .word 0x3E333333 -glabel D_80B37B90 - .word 0x3E333333 -glabel D_80B37B94 - .word 0x3E333333 -glabel D_80B37B98 - .word 0xBF59999A -glabel D_80B37B9C - .word 0x3ECCCCCD -glabel D_80B37BA0 - .word 0x454CC000 -glabel D_80B37BA4 - .word 0x3F333333 -glabel D_80B37BA8 - .word 0x3F333333 -glabel D_80B37BAC - .word 0x3F333333 -glabel D_80B37BB0 - .word 0x3F333333 -glabel D_80B37BB4 - .word 0x3E4CCCCD -glabel D_80B37BB8 - .word 0x3D4CCCCD -glabel D_80B37BBC - .word 0x3D4CCCCD -glabel D_80B37BC0 - .word 0x3E333333 -glabel D_80B37BC4 - .word 0x3E333333 -glabel D_80B37BC8 - .word 0x3E333333 -glabel D_80B37BCC - .word 0x460B6000 -glabel D_80B37BD0 - .word 0x3E4CCCCD -glabel jtbl_80B37BD4 -.word L80B375C0 -.word L80B375A0 -.word L80B37598 -.word L80B375C4 -.word L80B375A8 -.word L80B375B8 -.word L80B375C4 -.word L80B37590 -.word L80B375C4 -.word L80B37580 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B37578 -.word L80B375C4 -.word L80B37588 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375C4 -.word L80B375B0 -.word 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_wonder_item.rodata.s b/data/overlays/actors/z_en_wonder_item.rodata.s deleted file mode 100644 index 5d0799e59e..0000000000 --- a/data/overlays/actors/z_en_wonder_item.rodata.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B38E10 - .word 0x0A0A0000 -glabel D_80B38E14 - .asciz "☆☆☆☆☆ 不思議不思議まか不思議 ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B38E54 - .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B38E94 - .asciz "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" - .balign 4 - -glabel jtbl_80B38ECC -.word L80B382D8 -.word L80B38338 -.word L80B38388 -.word L80B383A4 -.word L80B3855C -.word L80B38410 -.word L80B38470 -.word L80B384C0 -.word L80B384D0 -.word L80B38538 -.word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_wonder_talk.rodata.s b/data/overlays/actors/z_en_wonder_talk.rodata.s deleted file mode 100644 index 04f214ca34..0000000000 --- a/data/overlays/actors/z_en_wonder_talk.rodata.s +++ /dev/null @@ -1,104 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B39970 - .word 0x0A0A0000 -glabel D_80B39974 - .asciz "☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B399A4 - .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B399E4 - .asciz " ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B39A10 - .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B39A44 - .asciz " ☆☆☆☆☆ こども ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B39A6C - .asciz " ☆☆☆☆☆ おとな ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B39A94 - .asciz "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B39AD4 - .asciz " ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B39B08 - .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B39B3C - .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B39B70 - .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B39BA4 - .asciz "☆☆☆☆☆ 注目座標 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B39BD8 - .asciz "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B39C18 - .word 0x0A0A0000 -glabel D_80B39C1C - .asciz "☆☆☆☆☆ セーブ情報 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B39C4C - .asciz "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B39C80 - .asciz "☆☆☆☆☆ 実質メッセージ種類 %x\n" - .balign 4 - -glabel D_80B39CB0 - .asciz "☆☆☆☆☆ 指定範囲 %d\n" - .balign 4 - -glabel D_80B39CE0 - .word 0x0A0A0000 -glabel D_80B39CE4 - .asciz " ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B39D18 - .asciz " ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80B39D4C - .asciz " ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel jtbl_80B39D78 -.word L80B39228 -.word L80B392C0 -.word L80B39314 -.word L80B39358 -.word L80B393B8 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_wonder_talk2.rodata.s b/data/overlays/actors/z_en_wonder_talk2.rodata.s deleted file mode 100644 index 4b27c37651..0000000000 --- a/data/overlays/actors/z_en_wonder_talk2.rodata.s +++ /dev/null @@ -1,139 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B3A8F0 - .word 0x0A0A0000 -glabel D_80B3A8F4 - .asciz "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B3A928 - .word 0x0A0A0000 -glabel D_80B3A92C - .asciz "☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B3A95C - .asciz "☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B3A98C - .asciz "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B3A9BC - .word 0x0A0A0000 -glabel D_80B3A9C0 - .word 0x0A0A0000 -glabel D_80B3A9C4 - .word 0x0A0A0000 -glabel D_80B3A9C8 - .asciz "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B3AA08 - .asciz "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" - .balign 4 - -glabel D_80B3AA3C - .word 0x0A0A0000 -glabel D_80B3AA40 - .asciz "☆☆☆☆☆ 透明メッセージ君せっと %x\n" - .balign 4 - -glabel D_80B3AA70 - .asciz "☆☆☆☆☆ セーブ情報 %x\n" - .balign 4 - -glabel D_80B3AAA0 - .asciz "☆☆☆☆☆ 指定メッセージ種類 %x\n" - .balign 4 - -glabel D_80B3AAD0 - .asciz "☆☆☆☆☆ 実質メッセージ種類 %x\n" - .balign 4 - -glabel D_80B3AB00 - .asciz "☆☆☆☆☆ 指定範囲 %d\n" - .balign 4 - -glabel D_80B3AB30 - .asciz "☆☆☆☆☆ 処理範囲 %f\n" - .balign 4 - -glabel D_80B3AB60 - .asciz " ☆☆ 通常 ☆☆ \n" - .balign 4 - -glabel D_80B3AB7C - .asciz " ☆☆ チェックのみ ☆☆ \n" - .balign 4 - -glabel D_80B3ABA0 - .asciz " ☆☆ ロックのみ ☆☆ \n" - .balign 4 - -glabel D_80B3ABC0 - .asciz "☆☆☆☆☆ わー %d\n" - .balign 4 - -glabel D_80B3ABDC - .asciz "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" - .balign 4 - -glabel D_80B3AC18 - .asciz "☆☆☆☆☆ きょり %f\n" - .balign 4 - -glabel D_80B3AC38 - .word 0x0A0A0000 -glabel D_80B3AC3C - .asciz "☆☆☆☆☆ 透明メッセージ君せっと %x\n" - .balign 4 - -glabel D_80B3AC6C - .asciz "☆☆☆☆☆ セーブ情報 %x\n" - .balign 4 - -glabel D_80B3AC9C - .asciz "☆☆☆☆☆ 指定メッセージ種類 %x\n" - .balign 4 - -glabel D_80B3ACCC - .asciz "☆☆☆☆☆ 実質メッセージ種類 %x\n" - .balign 4 - -glabel D_80B3ACFC - .asciz "☆☆☆☆☆ 指定範囲 %d\n" - .balign 4 - -glabel D_80B3AD2C - .asciz "☆☆☆☆☆ 処理範囲 %f\n" - .balign 4 - -glabel D_80B3AD5C - .asciz "☆☆☆☆☆ レンジは？ %d\n" - .balign 4 - -glabel D_80B3AD84 - .word 0x0A0A0000 -glabel D_80B3AD88 - .word 0x0A0A0000 -glabel D_80B3AD8C - .asciz " ☆☆ 強制 ☆☆ \n" - .balign 4 - -glabel D_80B3ADA8 - .asciz " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" - .balign 4 - -glabel D_80B3ADDC - .word 0x0A0A0000 - - diff --git a/data/overlays/actors/z_en_wood02.rodata.s b/data/overlays/actors/z_en_wood02.rodata.s deleted file mode 100644 index 1b14731ec3..0000000000 --- a/data/overlays/actors/z_en_wood02.rodata.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B3BFA0 - .asciz "../z_en_wood02.c" - .balign 4 - -glabel D_80B3BFB4 - .asciz "../z_en_wood02.c" - .balign 4 - -glabel D_80B3BFC8 - .asciz "../z_en_wood02.c" - .balign 4 - -glabel D_80B3BFDC - .asciz "../z_en_wood02.c" - .balign 4 - -glabel jtbl_80B3BFF0 -.word L80B3B3C4 -.word L80B3B40C -.word L80B3B438 -.word L80B3B3FC -.word L80B3B400 -.word L80B3B40C -.word L80B3B3FC -.word L80B3B400 -.word L80B3B3FC -.word L80B3B400 -.word L80B3B40C -.word L80B3B40C -.word L80B3B3C4 -.word L80B3B3FC -.word L80B3B400 -.word L80B3B3B4 -.word L80B3B3B8 -.word L80B3B40C -.word L80B3B3C4 -.word L80B3B3FC -.word L80B3B400 -.word L80B3B3B4 -.word L80B3B3B8 -.word L80B3B470 -.word L80B3B470 -glabel D_80B3C054 - .word 0x3F19999A -glabel D_80B3C058 - .word 0x3CA3D70A -glabel D_80B3C05C - .word 0xC0466666 -glabel D_80B3C060 - .word 0x477FFF00, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_xc.rodata.s b/data/overlays/actors/z_en_xc.rodata.s deleted file mode 100644 index 26134b22e0..0000000000 --- a/data/overlays/actors/z_en_xc.rodata.s +++ /dev/null @@ -1,183 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B41F50 - .word 0xBFE5A4CE, 0xA5BBA5EC, 0xA5CAA1BC, 0xA5C720A5, 0xB7A1BCA5, 0xAFC3C2C0, 0xB8212121, 0x21212121, 0x21212121, 0x21212121, 0x2121210A, 0x00000000 -glabel D_80B41F80 - .word 0xBFE5A4CE, 0xA5BBA5EC, 0xA5CAA1BC, 0xA5C720A5, 0xB7A1BCA5, 0xAFBEC3CC, 0xC7212121, 0x21212121, 0x21212121, 0x21212121, 0x2121210A, 0x00000000 -glabel D_80B41FB0 - .word 0xA5D6A1BC, 0xA5C4A4F2, 0xBCE8A4C3, 0xA4BF2121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x0A000000 -glabel D_80B41FD4 - .word 0xA4CFA4E4, 0xA4AFA5D6, 0xA1BCA5C4, 0xA4F2BCE8, 0xA4EBA4D9, 0xA4B72121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x0A000000 -glabel D_80B42000 - - .asciz "MAX speed = %f\n" - .balign 4 - -glabel D_80B42010 - - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -glabel D_80B42028 - - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -glabel D_80B42040 - - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -glabel D_80B42058 - - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -glabel D_80B42070 - - .asciz "../z_en_oA2_inMetamol.c" - .balign 4 - -glabel D_80B42088 - - .asciz "../z_en_oA2_inMetamol.c" - .balign 4 - -glabel D_80B420A0 - - .asciz "../z_en_oA2_inMetamol.c" - .balign 4 - -glabel D_80B420B8 - - .asciz "En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80B420F0 - - .asciz "../z_en_oA2_inStalker.c" - .balign 4 - -glabel D_80B42108 - - .asciz "../z_en_oA2_inStalker.c" - .balign 4 - -glabel D_80B42120 - - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B4215C - - .asciz " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B421A0 - - .asciz "../z_en_oA2.c" - .balign 4 - -glabel D_80B421B0 - - .asciz "../z_en_oA2.c" - .balign 4 - -glabel D_80B421C0 - - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B421F8 - .word 0xC50B1000 -glabel D_80B421FC - .word 0x43DF8000 -glabel D_80B42200 - .word 0x4421C000 -glabel D_80B42204 - .word 0x40E1E2B0 -glabel D_80B42208 - .word 0x3ECCCCCD -glabel D_80B4220C - .word 0x3F19999A -glabel D_80B42210 - .word 0x3C23D70A -glabel D_80B42214 - .word 0x3F99999A -glabel D_80B42218 - .word 0x3C23D70A -glabel D_80B4221C - .word 0x3F99999A -glabel D_80B42220 - .word 0x3C23D70A -glabel D_80B42224 - .word 0x3F99999A -glabel D_80B42228 - .word 0x3C23D70A -glabel D_80B4222C - .word 0x3C23D70A -glabel D_80B42230 - .word 0x3F99999A -glabel D_80B42234 - .word 0x3C23D70A -glabel D_80B42238 - .word 0x3F99999A -glabel D_80B4223C - .word 0x3C23D70A -glabel D_80B42240 - .word 0x3F99999A -glabel D_80B42244 - .word 0xC49B6000 -glabel D_80B42248 - .word 0x45E91000 -glabel D_80B4224C - .word 0x3DCCCCCD -glabel D_80B42250 - .word 0x3DCCCCCD -glabel D_80B42254 - .word 0x3DCCCCCD -glabel D_80B42258 - .word 0x458B6000 -glabel D_80B4225C - .word 0x4494C000 -glabel jtbl_80B42260 -.word L80B40F10 -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40F20 -.word L80B40FCC -.word L80B40FCC -.word L80B40FBC -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40F58 -.word L80B40F80 -.word L80B40F94 -.word L80B40FA8 -.word L80B40F44 -.word L80B40F6C -.word L80B40F34 -glabel jtbl_80B422B0 -.word L80B41A48 -.word L80B41994 -.word L80B419A8 -.word L80B419BC -.word L80B419D0 -.word L80B419E4 -.word L80B419F8 -.word L80B41A0C -.word L80B41A20 -.word L80B41A34 -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_yabusame_mark.rodata.s b/data/overlays/actors/z_en_yabusame_mark.rodata.s deleted file mode 100644 index bbe9e2bcd4..0000000000 --- a/data/overlays/actors/z_en_yabusame_mark.rodata.s +++ /dev/null @@ -1,69 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B43680 - .word 0x0A0A0000 -glabel D_80B43684 - .asciz "☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n" - .balign 4 - -glabel D_80B436B4 - .asciz "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B436EC - .asciz "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B4371C - .asciz "☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B4374C - .word 0x0A0A0000 -glabel D_80B43750 - .asciz "☆☆☆☆☆ posＸ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B43778 - .asciz "☆☆☆☆☆ posＹ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B437A0 - .asciz "☆☆☆☆☆ posＺ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B437C8 - .asciz "☆☆☆☆☆ hitＸ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B437F0 - .asciz "☆☆☆☆☆ hitＹ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B43818 - .asciz "☆☆☆☆☆ hitＺ ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B43840 - .asciz "☆☆☆☆☆ 小 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B43868 - .asciz "☆☆☆☆☆ 大 ☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80B43890 - .asciz "☆☆☆☆☆ point ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80B438B8 - .word 0x0A0A0000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_yukabyun.rodata.s b/data/overlays/actors/z_en_yukabyun.rodata.s deleted file mode 100644 index f532e759e2..0000000000 --- a/data/overlays/actors/z_en_yukabyun.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B43F70 - .asciz "../z_en_yukabyun.c" - .balign 4 - -glabel D_80B43F84 - .asciz "../z_en_yukabyun.c" - .balign 4 - -glabel D_80B43F98 - .asciz "../z_en_yukabyun.c" - .balign 4 - -glabel D_80B43FAC - .word 0x459C4000 - - diff --git a/data/overlays/actors/z_en_zf.rodata.s b/data/overlays/actors/z_en_zf.rodata.s deleted file mode 100644 index ad7a1e4f4f..0000000000 --- a/data/overlays/actors/z_en_zf.rodata.s +++ /dev/null @@ -1,119 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B4A310 - .asciz "../z_en_zf.c" - .balign 4 - -glabel D_80B4A320 - .asciz "../z_en_zf.c" - .balign 4 - -glabel D_80B4A330 - .word 0x461C4000 -glabel D_80B4A334 - .word 0x44124000 -glabel D_80B4A338 - .word 0x47C34F00 -glabel D_80B4A33C - .word 0x47C34F80 -glabel D_80B4A340 - .word 0x47C34F00 -glabel D_80B4A344 - .word 0x47C34F80 -glabel D_80B4A348 - .word 0x3E99999A -glabel D_80B4A34C - .word 0x3E99999A -glabel D_80B4A350 - .word 0x3F99999A -glabel D_80B4A354 - .word 0x3F333333 -glabel D_80B4A358 - .word 0x3D4CCCCD -glabel D_80B4A35C - .word 0x3DCCCCCD -glabel D_80B4A360 - .word 0x3DCCCCCD -glabel D_80B4A364 - .word 0x3F4CCCCD -glabel D_80B4A368 - .word 0xBF4CCCCD -glabel D_80B4A36C - .word 0xBF4CCCCD -glabel D_80B4A370 - .word 0xBF59999A -glabel D_80B4A374 - .word 0x3F333333 -glabel D_80B4A378 - .word 0x3F333333 -glabel D_80B4A37C - .word 0x3F333333 -glabel D_80B4A380 - .word 0x3E4CCCCD -glabel D_80B4A384 - .word 0x3D4CCCCD -glabel D_80B4A388 - .word 0x44098000 -glabel D_80B4A38C - .word 0x3F99999A -glabel D_80B4A390 - .word 0x3F99999A -glabel D_80B4A394 - .word 0x3D4CCCCD -glabel D_80B4A398 - .word 0xBF4CCCCD -glabel D_80B4A39C - .word 0xBF4CCCCD -glabel D_80B4A3A0 - .word 0x462AA000 -glabel jtbl_80B4A3A4 -.word L80B4985C -.word L80B49864 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B4988C -.word L80B498A0 -.word L80B49874 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B4987C -.word L80B498A0 -.word L80B4986C -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B49894 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B4989C -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B498A0 -.word L80B49884 -glabel D_80B4A444 - .word 0x3FB33333, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_zl1.rodata.s b/data/overlays/actors/z_en_zl1.rodata.s deleted file mode 100644 index df853c3600..0000000000 --- a/data/overlays/actors/z_en_zl1.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B4E720 - .asciz "../z_en_girlB.c" - .balign 4 - -glabel D_80B4E730 - .asciz "../z_en_girlB.c" - .balign 4 - -glabel jtbl_80B4E740 -.word L80B4B308 -.word L80B4B3B8 -.word L80B4B44C -.word L80B4B4C4 -.word L80B4B524 -.word L80B4B59C -.word L80B4B5E0 -.word L80B4B640 -.word L80B4B684 -.word L80B4B6FC -glabel jtbl_80B4E768 -.word L80B4BF6C -.word L80B4BFE0 -.word L80B4C070 -.word L80B4C0E8 -.word L80B4C130 -.word L80B4C17C -.word L80B4C1A0 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_zl2.rodata.s b/data/overlays/actors/z_en_zl2.rodata.s deleted file mode 100644 index 91be5e4e63..0000000000 --- a/data/overlays/actors/z_en_zl2.rodata.s +++ /dev/null @@ -1,152 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B52900 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52910 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52920 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52930 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52940 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52950 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52960 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52970 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52980 - .asciz "En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80B529B8 - .asciz "En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80B529F4 - .asciz "En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80B52A30 - .asciz " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B52A74 - .asciz "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B52ABC - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B52AF8 - .asciz "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B52B38 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B48 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B58 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B68 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B78 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B52BB0 - .word 0x455AC000 -glabel D_80B52BB4 - .word 0xC47EC000 -glabel D_80B52BB8 - .word 0x43E98000 -glabel D_80B52BBC - .word 0x43848000 -glabel D_80B52BC0 - .word 0xC3D58000 -glabel D_80B52BC4 - .word 0x43E98000 -glabel D_80B52BC8 - .word 0x43848000 -glabel D_80B52BCC - .word 0xC3D58000 -glabel D_80B52BD0 - .word 0x4474C000 -glabel D_80B52BD4 - .word 0x3F99999A -glabel D_80B52BD8 - .word 0x4622F983 -glabel jtbl_80B52BDC -.word L80B50A6C -.word L80B50A80 -.word L80B50A94 -.word L80B50AA8 -.word L80B50ABC -.word L80B50AD0 -.word L80B50AE4 -.word L80B50AF8 -.word L80B50B0C -.word L80B50B20 -.word L80B50B34 -.word L80B50B48 -.word L80B50B5C -.word L80B50B70 -.word L80B50B84 -glabel jtbl_80B52C18 -.word L80B519AC -.word L80B519BC -.word L80B51A34 -.word L80B51A00 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B519D0 -.word L80B519E0 -.word L80B519F0 -.word L80B51A34 -.word L80B51A10 -.word L80B51A20 -.word 0x00000000 - - diff --git a/data/overlays/actors/z_en_zl3.rodata.s b/data/overlays/actors/z_en_zl3.rodata.s deleted file mode 100644 index 23a1129f07..0000000000 --- a/data/overlays/actors/z_en_zl3.rodata.s +++ /dev/null @@ -1,231 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B5A5A0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5B0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5C0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5D0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5E0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5F0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A600 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A610 - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A654 - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A69C - .asciz "En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80B5A6D4 - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A71C - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A764 - .asciz "En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -glabel D_80B5A7A0 - .asciz "En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A7E4 - .asciz "En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A824 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A83C - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A854 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A86C - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A884 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A89C - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A8B4 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A8CC - .asciz " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A910 - .asciz "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A958 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A994 - .asciz "ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A9D0 - .asciz "ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5AA0C - .asciz "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5AA4C - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5AA5C - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5AA6C - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5AA7C - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5AA8C - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5AAC4 - .word 0x45803000 -glabel D_80B5AAC8 - .word 0xC3B98000 -glabel D_80B5AACC - .word 0xC62BE000 -glabel D_80B5AAD0 - .word 0x45C1C000 -glabel D_80B5AAD4 - .word 0xC5A28000 -glabel D_80B5AAD8 - .word 0x45834000 -glabel D_80B5AADC - .word 0xC5ED8000 -glabel D_80B5AAE0 - .word 0x46A41000 -glabel D_80B5AAE4 - .word 0xC5DAC000 -glabel D_80B5AAE8 - .word 0xC5DAC000 -glabel D_80B5AAEC - .word 0xC47EC000 -glabel D_80B5AAF0 - .word 0x43E98000 -glabel D_80B5AAF4 - .word 0x43848000 -glabel D_80B5AAF8 - .word 0xC3D58000 -glabel D_80B5AAFC - .word 0x43E98000 -glabel D_80B5AB00 - .word 0x43848000 -glabel D_80B5AB04 - .word 0xC3D58000 -glabel jtbl_80B5AB08 -.word L80B55490 -.word L80B554A0 -.word L80B55510 -.word L80B554BC -.word L80B554CC -.word L80B554DC -.word L80B554EC -.word L80B554FC -.word L80B55520 -glabel D_80B5AB2C - .word 0x404A5E38 -glabel D_80B5AB30 - .word 0xBFCDBF48 -glabel D_80B5AB34 - .word 0x404A5E38 -glabel D_80B5AB38 - .word 0xBFCDBF48 -glabel D_80B5AB3C - .word 0xBC47E000 -glabel D_80B5AB40 - .word 0x3DFCD6EA -glabel D_80B5AB44 - .word 0x3DFCD6EA -glabel jtbl_80B5AB48 -.word L80B56544 -.word L80B56554 -.word L80B56564 -.word L80B56574 -.word L80B56584 -.word L80B56594 -.word L80B565A4 -.word L80B565B4 -.word L80B565C4 -.word L80B565D4 -.word L80B565E4 -.word L80B565F4 -.word L80B56604 -.word L80B56614 -.word L80B56624 -glabel D_80B5AB84 - .word 0x4622F983 -glabel D_80B5AB88 - .word 0x4622F983 -glabel D_80B5AB8C - .word 0x4622F983 -glabel D_80B5AB90 - .word 0x4622F983 -glabel D_80B5AB94 - .word 0xC39E8000 -glabel D_80B5AB98 - .word 0xC47EC000 -glabel D_80B5AB9C - .word 0x455D8000 - - diff --git a/data/overlays/actors/z_en_zl4.rodata.s b/data/overlays/actors/z_en_zl4.rodata.s deleted file mode 100644 index bf58fa649a..0000000000 --- a/data/overlays/actors/z_en_zl4.rodata.s +++ /dev/null @@ -1,124 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B5FB80 - .asciz "../z_en_zl4.c" - .balign 4 - -glabel D_80B5FB90 - .asciz "../z_en_zl4.c" - .balign 4 - -glabel jtbl_80B5FBA0 -.word L80B5BA48 -.word L80B5BA68 -.word L80B5BA7C -.word L80B5BA94 -.word L80B5BAAC -.word L80B5BAC0 -.word L80B5BAD4 -glabel jtbl_80B5FBBC -.word L80B5C19C -.word L80B5C200 -.word L80B5C254 -.word L80B5C2F0 -.word L80B5C330 -.word L80B5C384 -.word L80B5C3C4 -glabel jtbl_80B5FBD8 -.word L80B5C494 -.word L80B5C4B4 -.word L80B5C508 -.word L80B5C550 -.word L80B5C628 -.word L80B5C670 -.word L80B5C6D4 -.word L80B5C7F0 -.word L80B5C838 -.word L80B5C8A4 -.word L80B5C8F4 -.word L80B5C958 -.word L80B5C704 -.word L80B5C71C -glabel jtbl_80B5FC10 -.word L80B5C9C0 -.word L80B5C9E4 -.word L80B5CA68 -.word L80B5CA88 -.word L80B5CAE0 -.word L80B5CB10 -.word L80B5CB70 -.word L80B5CBAC -.word L80B5CC08 -.word L80B5CC28 -.word L80B5CC64 -.word L80B5CD18 -.word L80B5CD84 -.word L80B5CDCC -.word L80B5CE30 -.word L80B5CE5C -.word L80B5CE98 -.word L80B5CED4 -glabel jtbl_80B5FC58 -.word L80B5CFBC -.word L80B5CFFC -.word L80B5D04C -.word L80B5D09C -.word L80B5D0CC -.word L80B5D178 -.word L80B5D198 -.word L80B5D1F4 -.word L80B5D238 -.word L80B5D278 -.word L80B5D2D0 -.word L80B5D2F0 -.word L80B5D364 -glabel jtbl_80B5FC8C -.word L80B5D650 -.word L80B5D704 -.word L80B5D734 -.word L80B5D788 -.word L80B5D7C8 -.word L80B5D83C -.word L80B5D870 -.word L80B5D8B4 -.word L80B5D980 -.word L80B5D9C8 -.word L80B5DA20 -.word L80B5DA50 -.word L80B5DA70 -glabel jtbl_80B5FCC0 -.word L80B5DB14 -.word L80B5DB54 -.word L80B5DB94 -.word L80B5DC08 -.word L80B5DC28 -.word L80B5DC94 -.word L80B5DCB4 -.word L80B5DD7C -glabel jtbl_80B5FCE0 -.word L80B5DE5C -.word L80B5DE84 -.word L80B5DEE0 -.word L80B5DF08 -.word L80B5DF30 -.word L80B5DF58 -.word L80B5DF80 -.word L80B5DFA8 -.word L80B5DFD0 -glabel D_80B5FD04 - .word 0x40490FDB -glabel D_80B5FD08 - .word 0x40490FDB -glabel D_80B5FD0C - .word 0x40490FDB -glabel D_80B5FD10 - .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_zo.rodata.s b/data/overlays/actors/z_en_zo.rodata.s deleted file mode 100644 index 04e979a5d6..0000000000 --- a/data/overlays/actors/z_en_zo.rodata.s +++ /dev/null @@ -1,108 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B625C0 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B625D4 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B625E8 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B625FC - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B62610 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B62624 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B62638 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B6264C - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B62660 - .asciz "../z_en_zo_eff.c" - .balign 4 - -glabel D_80B62674 - .asciz "../z_en_zo.c" - .balign 4 - -glabel D_80B62684 - .asciz "../z_en_zo.c" - .balign 4 - -glabel D_80B62694 - .word 0x3CA3D70A -glabel D_80B62698 - .word 0x3DF5C28F -glabel D_80B6269C - .word 0x3F4CCCCD -glabel D_80B626A0 - .word 0x3E4CCCCD -glabel D_80B626A4 - .word 0x3DF5C28F -glabel D_80B626A8 - .word 0x3D75C28F -glabel D_80B626AC - .word 0x3DF5C28F -glabel D_80B626B0 - .word 0x3D75C28F -glabel D_80B626B4 - .word 0x40C8F5C3 -glabel jtbl_80B626B8 -.word L80B610A4 -.word L80B610E4 -.word L80B61144 -.word L80B611B4 -.word L80B611F4 -.word L80B61244 -.word L80B61094 -.word L80B6109C -.word L80B61074 -glabel jtbl_80B626DC -.word L80B612DC -.word L80B612DC -.word L80B612E4 -.word L80B612DC -.word L80B6135C -.word L80B613C4 -.word L80B612DC -.word L80B612DC -.word L80B612DC -.word L80B612DC -glabel D_80B62704 - .word 0xBF19999A -glabel D_80B62708 - .word 0x3F19999A -glabel D_80B6270C - .word 0x3E4CCCCD -glabel D_80B62710 - .word 0x40490FDB -glabel D_80B62714 - .word 0x40490FDB -glabel D_80B62718 - .word 0x40490FDB -glabel D_80B6271C - .word 0x40490FDB - - diff --git a/data/overlays/actors/z_end_title.rodata.s b/data/overlays/actors/z_end_title.rodata.s deleted file mode 100644 index 83c6ade78e..0000000000 --- a/data/overlays/actors/z_end_title.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B69850 - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B69864 - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B69878 - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B6988C - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B698A0 - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B698B4 - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B698C8 - .asciz "../z_end_title.c" - .balign 4 - -glabel D_80B698DC - .word 0x3E051EB8 -glabel D_80B698E0 - .word 0x3E93431D, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_fishing.rodata.s b/data/overlays/actors/z_fishing.rodata.s deleted file mode 100644 index 758a709318..0000000000 --- a/data/overlays/actors/z_fishing.rodata.s +++ /dev/null @@ -1,847 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B7B000 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B010 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B020 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B030 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B040 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B050 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B060 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B070 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B080 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B090 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B0A0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B0B0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B0C0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B0D0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B0E0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B0F0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B100 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B110 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B120 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B130 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B140 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B150 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B160 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B170 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B180 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B190 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B1A0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B1B0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B1C0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B1D0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B1E0 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B1F0 - .asciz "HIT FISH %dcm\n" - .balign 4 - -glabel D_80B7B200 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B210 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B220 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B230 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B240 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B250 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B260 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B270 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B280 - .word 0x2E2E2F7A, 0x5F666973, 0x68696E67, 0x2E630000, 0x1B5B3332, 0x6D000000, 0x1B5B3333, 0x6D000000, 0x706C6179, 0x73202578, 0x0A000000, 0x79732025, 0x780A0000, 0x1B5B6D00 -glabel D_80B7B2B8 - .word 0x1B5B3332, 0x6D000000 -glabel D_80B7B2C0 - .asciz "zelda_time %x\n" - .balign 4 - -glabel D_80B7B2D0 - .word 0x1B5B6D00 -glabel D_80B7B2D4 - .asciz "HI_SCORE = %x\n" - .balign 4 - -glabel D_80B7B2E4 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B2F4 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B304 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B314 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B324 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B334 - .asciz "../z_fishing.c" - .balign 4 - -glabel D_80B7B344 - .word 0x3FCCCCCD -glabel D_80B7B348 - .word 0x46EC7A00 -glabel D_80B7B34C - .word 0x46ECC600 -glabel D_80B7B350 - .word 0x46ECE600 -glabel D_80B7B354 - .word 0x3B23D70A -glabel D_80B7B358 - .word 0x3D4CCCCD -glabel D_80B7B35C - .word 0x3DCCCCCD -glabel D_80B7B360 - .word 0x3E99999A -glabel D_80B7B364 - .word 0x3F19999A -glabel D_80B7B368 - .word 0x40C90FDB -glabel D_80B7B36C - .word 0x3DA3D70A -glabel D_80B7B370 - .word 0x3DCCCCCD -glabel D_80B7B374 - .word 0x3F333333 -glabel D_80B7B378 - .word 0x40133333 -glabel D_80B7B37C - .word 0x40933333 -glabel D_80B7B380 - .word 0x44758000 -glabel D_80B7B384 - .word 0x409FFFEB -glabel D_80B7B388 - .word 0x3D4CCCCD -glabel D_80B7B38C - .word 0x40FFFFEB -glabel D_80B7B390 - .word 0x3F3AE148 -glabel D_80B7B394 - .word 0x3A83126F -glabel D_80B7B398 - .word 0x3DCCCCCD -glabel D_80B7B39C - .word 0x3E99999A -glabel D_80B7B3A0 - .word 0x494EA400 -glabel D_80B7B3A4 - .word 0x3DE147AE -glabel D_80B7B3A8 - .word 0x3C23D70B -glabel D_80B7B3AC - .word 0x3E16872B -glabel D_80B7B3B0 - .word 0x3B03126F -glabel D_80B7B3B4 - .word 0x40490FDB -glabel D_80B7B3B8 - .word 0x40490FDB -glabel D_80B7B3BC - .word 0x40490FDB -glabel D_80B7B3C0 - .word 0x40490FDB -glabel D_80B7B3C4 - .word 0xC49C4000 -glabel D_80B7B3C8 - .word 0x3FC90FDB -glabel D_80B7B3CC - .word 0x44278000 -glabel D_80B7B3D0 - .word 0x3CA3D70A -glabel D_80B7B3D4 - .word 0x3F7851EC -glabel D_80B7B3D8 - .word 0x3A83126F -glabel D_80B7B3DC - .word 0x3E999999 -glabel D_80B7B3E0 - .word 0x494EA400 -glabel D_80B7B3E4 - .word 0x3DE147AE -glabel D_80B7B3E8 - .word 0x3E16872B -glabel D_80B7B3EC - .word 0x3D4CCCCD -glabel D_80B7B3F0 - .word 0x3CA3D70A -glabel D_80B7B3F4 - .word 0x3E4CCCCD -glabel D_80B7B3F8 - .word 0x3B83126E -glabel D_80B7B3FC - .word 0x40490FDB -glabel D_80B7B400 - .word 0x3FC90FDB -glabel D_80B7B404 - .word 0xC49C4000 -glabel D_80B7B408 - .word 0x3FC90FDB -glabel D_80B7B40C - .word 0x3F59999A -glabel D_80B7B410 - .word 0x38C90FDB -glabel D_80B7B414 - .word 0x3DCCCCCD -glabel D_80B7B418 - .word 0x3D23D70A -glabel D_80B7B41C - .word 0x3D23D70A -glabel D_80B7B420 - .word 0x38C90FDB -glabel D_80B7B424 - .word 0x40490FDB -glabel D_80B7B428 - .word 0x3B83126E -glabel D_80B7B42C - .word 0x3FC90FDB -glabel D_80B7B430 - .word 0x3FC90FDB -glabel D_80B7B434 - .word 0xC4548000 -glabel D_80B7B438 - .word 0x45034000 -glabel D_80B7B43C - .word 0x3A83126F -glabel D_80B7B440 - .word 0x3A83126F -glabel D_80B7B444 - .word 0x44BB8000 -glabel D_80B7B448 - .word 0x3CA3D70A -glabel D_80B7B44C - .word 0x3CA3D70A -glabel D_80B7B450 - .word 0xBC23D70A -glabel D_80B7B454 - .word 0x3C23D70A -glabel D_80B7B458 - .word 0x3CCCCCCD -glabel D_80B7B45C - .word 0xBCF5C28F -glabel D_80B7B460 - .word 0x3FE1307A -glabel D_80B7B464 - .word 0x3FA4DEEC -glabel D_80B7B468 - .word 0xBF20D97B -glabel D_80B7B46C - .word 0x3EF1463A -glabel D_80B7B470 - .word 0x3C23D70A -glabel D_80B7B474 - .word 0x40490FDB -glabel D_80B7B478 - .word 0x3F333334 -glabel D_80B7B47C - .word 0x407FEF9E -glabel jtbl_80B7B480 -.word L80B6EE24 -.word L80B6F0C4 -.word L80B6F94C -.word L80B6FA3C -.word L80B70890 -.word L80B709D0 -glabel D_80B7B498 - .word 0x40490FDB -glabel D_80B7B49C - .word 0x3FF33333 -glabel D_80B7B4A0 - .word 0x3F666666 -glabel D_80B7B4A4 - .word 0x40490FDB -glabel D_80B7B4A8 - .word 0x40490FDB -glabel D_80B7B4AC - .word 0x3A83126F -glabel D_80B7B4B0 - .word 0x494EA400 -glabel D_80B7B4B4 - .word 0x44A8C000 -glabel D_80B7B4B8 - .word 0x44898000 -glabel D_80B7B4BC - .word 0x3DE147AE -glabel D_80B7B4C0 - .word 0x3E4CCCCD -glabel D_80B7B4C4 - .word 0x40C8F5C3 -glabel D_80B7B4C8 - .word 0x3CA3D70A -glabel D_80B7B4CC - .word 0x3CCCCCCD -glabel D_80B7B4D0 - .word 0x48742400 -glabel D_80B7B4D4 - .word 0xBF060A92 -glabel D_80B7B4D8 - .word 0x494EA400 -glabel D_80B7B4DC - .word 0x3C888889 -glabel D_80B7B4E0 - .word 0x3C888889 -glabel D_80B7B4E4 - .word 0x3E99999A -glabel D_80B7B4E8 - .word 0x3E99999A -glabel D_80B7B4EC - .word 0x3E4CCCCD -glabel D_80B7B4F0 - .word 0x3F4CCCCD -glabel D_80B7B4F4 - .word 0x3DCCCCCD -glabel D_80B7B4F8 - .word 0x3FFFDF3B -glabel D_80B7B4FC - .word 0x40490FDB -glabel D_80B7B500 - .word 0x3E4CCCCD -glabel D_80B7B504 - .word 0x40490FDB -glabel D_80B7B508 - .word 0x40490FDB -glabel D_80B7B50C - .word 0x3DE147AE -glabel D_80B7B510 - .word 0x40490FDB -glabel D_80B7B514 - .word 0x40490FDB -glabel D_80B7B518 - .word 0x40490FDB -glabel D_80B7B51C - .word 0x40490FDB -glabel D_80B7B520 - .word 0x40490FDB -glabel D_80B7B524 - .word 0x3E4CCCCD -glabel D_80B7B528 - .word 0x494EA400 -glabel D_80B7B52C - .word 0x3DCCCCCD -glabel D_80B7B530 - .word 0x3A031270 -glabel D_80B7B534 - .word 0x3F99999A -glabel D_80B7B538 - .word 0x40C8F5C3 -glabel D_80B7B53C - .word 0x3CA3D70A -glabel D_80B7B540 - .word 0x3CCCCCCD -glabel D_80B7B544 - .word 0x3E99999A -glabel D_80B7B548 - .word 0x40C8F5C3 -glabel D_80B7B54C - .word 0x3CA3D70A -glabel D_80B7B550 - .word 0x3CCCCCCD -glabel D_80B7B554 - .word 0x40490FDB -glabel D_80B7B558 - .word 0x471C4000 -glabel D_80B7B55C - .word 0x45992000 -glabel D_80B7B560 - .word 0x461C4000 -glabel D_80B7B564 - .word 0x3E19999A -glabel D_80B7B568 - .word 0x3E99999A -glabel D_80B7B56C - .word 0x448FC000 -glabel D_80B7B570 - .word 0x3DCCCCCD -glabel D_80B7B574 - .word 0x3727C5AC -glabel D_80B7B578 - .word 0xBF99999A -glabel D_80B7B57C - .word 0x3FCCCCCD -glabel D_80B7B580 - .word 0x358637BD -glabel D_80B7B584 - .word 0x3F8CCCCD -glabel D_80B7B588 - .word 0x3F4CCCCD -glabel D_80B7B58C - .word 0x40066666 -glabel D_80B7B590 - .word 0x3ECCCCCD -glabel D_80B7B594 - .word 0x3F19999A -glabel jtbl_80B7B598 -.word L80B72860 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B75278 -.word L80B73684 -.word L80B7260C -.word L80B723E8 -.word L80B72144 -.word L80B72260 -.word L80B72928 -.word L80B73004 -.word L80B7320C -.word L80B738A0 -.word L80B748A0 -.word L80B74FF0 -.word L80B75278 -.word L80B75278 -.word L80B71ED8 -.word L80B71FA8 -glabel D_80B7B62C - .word 0x44A28000 -glabel D_80B7B630 - .word 0x3CA3D70A -glabel D_80B7B634 - .word 0x3CF5C28F -glabel D_80B7B638 - .word 0x451C4000 -glabel D_80B7B63C - .word 0x44BB8000 -glabel D_80B7B640 - .word 0x3E99999A -glabel D_80B7B644 - .word 0x43A6AAAB -glabel D_80B7B648 - .word 0x3ECCCCCD -glabel D_80B7B64C - .word 0x3F99999A -glabel D_80B7B650 - .word 0x3F4CCCCD -glabel D_80B7B654 - .word 0x44BB8000 -glabel D_80B7B658 - .word 0x3ECCCCCD -glabel D_80B7B65C - .word 0x3F19999A -glabel D_80B7B660 - .word 0x3F333333 -glabel D_80B7B664 - .word 0x3DCCCCCD -glabel D_80B7B668 - .word 0x3BA3D70A -glabel D_80B7B66C - .word 0x3C23D70A -glabel D_80B7B670 - .word 0x3D4CCCCD -glabel D_80B7B674 - .word 0x3C03126F -glabel D_80B7B678 - .word 0x453B8000 -glabel D_80B7B67C - .word 0x3E99999A -glabel D_80B7B680 - .word 0x3F19999A -glabel D_80B7B684 - .word 0x3CF5C28F -glabel D_80B7B688 - .word 0x3F99999A -glabel D_80B7B68C - .word 0x459C4000 -glabel D_80B7B690 - .word 0x453B8000 -glabel D_80B7B694 - .word 0x3F4CCCCD -glabel D_80B7B698 - .word 0x3F99999A -glabel D_80B7B69C - .word 0x459C4000 -glabel D_80B7B6A0 - .word 0x3F99999A -glabel D_80B7B6A4 - .word 0x459C4000 -glabel D_80B7B6A8 - .word 0x3F99999A -glabel D_80B7B6AC - .word 0x459C4000 -glabel D_80B7B6B0 - .word 0x3FAAAAA8 -glabel D_80B7B6B4 - .word 0x3FD9999A -glabel D_80B7B6B8 - .word 0x45DAC000 -glabel D_80B7B6BC - .word 0x4016CBE4 -glabel D_80B7B6C0 - .word 0x40490FDB -glabel D_80B7B6C4 - .word 0x49095440 -glabel D_80B7B6C8 - .word 0x3DCCCCCD -glabel D_80B7B6CC - .word 0x3FCCCCCD -glabel D_80B7B6D0 - .word 0x45BB8000 -glabel D_80B7B6D4 - .word 0x3FB33333 -glabel D_80B7B6D8 - .word 0x459C4000 -glabel D_80B7B6DC - .word 0x3C134ACB -glabel D_80B7B6E0 - .word 0x3C134ACB -glabel D_80B7B6E4 - .word 0x3FB33333 -glabel D_80B7B6E8 - .word 0x458CA000 -glabel D_80B7B6EC - .word 0x3C134ACB -glabel D_80B7B6F0 - .word 0x3FA66666 -glabel D_80B7B6F4 - .word 0x3C134ACB -glabel D_80B7B6F8 - .word 0x3FB33333 -glabel D_80B7B6FC - .word 0x3FA66666 -glabel D_80B7B700 - .word 0xBF4CCCCD -glabel D_80B7B704 - .word 0xBF666666 -glabel D_80B7B708 - .word 0xBF59999A -glabel D_80B7B70C - .word 0x3DCCCCCD -glabel D_80B7B710 - .word 0x3D4CCCCD -glabel D_80B7B714 - .word 0x453B8000 -glabel D_80B7B718 - .word 0x459C4000 -glabel D_80B7B71C - .word 0x40490FDB -glabel D_80B7B720 - .word 0x3FFEB852 -glabel D_80B7B724 - .word 0x459C4000 -glabel D_80B7B728 - .word 0x459C4000 -glabel D_80B7B72C - .word 0x459C4000 -glabel D_80B7B730 - .word 0x404CCCCD -glabel D_80B7B734 - .word 0x3DCCCCCD -glabel D_80B7B738 - .word 0xBB449BA6 -glabel D_80B7B73C - .word 0x459C4000 -glabel D_80B7B740 - .word 0x459C4000 -glabel D_80B7B744 - .word 0x3BA3D70A -glabel D_80B7B748 - .word 0x3E19999A -glabel D_80B7B74C - .word 0x3D99999A -glabel D_80B7B750 - .word 0x3D0F5C29 -glabel D_80B7B754 - .word 0x3D23D70A -glabel D_80B7B758 - .word 0x40490FDB -glabel D_80B7B75C - .word 0x40490FDB -glabel D_80B7B760 - .word 0x40490FDB -glabel D_80B7B764 - .word 0x38C90FDB -glabel D_80B7B768 - .word 0x3FC90FDB -glabel D_80B7B76C - .word 0x3C23D70A -glabel D_80B7B770 - .word 0x38C90FDB -glabel D_80B7B774 - .word 0xBFC90FDB -glabel D_80B7B778 - .word 0x3E4CCCCD -glabel D_80B7B77C - .word 0x3CF5C28F -glabel D_80B7B780 - .word 0x3D4CCCCD -glabel D_80B7B784 - .word 0x38C90FDB -glabel D_80B7B788 - .word 0x451C4000 -glabel D_80B7B78C - .word 0x3E99999A -glabel D_80B7B790 - .word 0x3D4CCCCD -glabel D_80B7B794 - .word 0x451C4000 -glabel D_80B7B798 - .word 0x3E99999A -glabel D_80B7B79C - .word 0x3D4CCCCD -glabel D_80B7B7A0 - .word 0x451C4000 -glabel D_80B7B7A4 - .word 0x3E99999A -glabel D_80B7B7A8 - .word 0x3D4CCCCD -glabel D_80B7B7AC - .word 0x3F4CCCCD -glabel D_80B7B7B0 - .word 0xB8D1B717 -glabel D_80B7B7B4 - .word 0x3B59E83E -glabel D_80B7B7B8 - .word 0x3B9BA5E3 -glabel D_80B7B7BC - .word 0x40490FDB -glabel jtbl_80B7B7C0 -.word L80B7743C -.word L80B77558 -.word L80B77644 -.word L80B7768C -.word L80B776E0 -.word L80B777F0 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B77890 -.word L80B77C74 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78248 -.word L80B78068 -.word L80B780A0 -.word L80B7814C -.word L80B7819C -.word L80B781EC -glabel D_80B7B824 - .word 0x407FEF9E -glabel D_80B7B828 - .word 0x407FEF9E -glabel D_80B7B82C - .word 0x494EA400 -glabel D_80B7B830 - .word 0x3E99999A -glabel D_80B7B834 - .word 0x3AC49BA6 -glabel jtbl_80B7B838 -.word L80B7955C -.word L80B78890 -.word L80B78930 -.word L80B78DE8 -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B78EBC -.word L80B78F8C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B7955C -.word L80B79084 -.word L80B79158 -.word L80B791B0 -glabel D_80B7B894 - .word 0x3E4CCCCD -glabel D_80B7B898 - .word 0x3DCCCCCD -glabel D_80B7B89C - .word 0x3A83126F -glabel D_80B7B8A0 - .word 0x3E99999A -glabel D_80B7B8A4 - .word 0x3DCCCCCD -glabel D_80B7B8A8 - .word 0x3ECCCCCD -glabel D_80B7B8AC - .word 0x3ECCCCCD -glabel D_80B7B8B0 - .word 0x3A031270 -glabel D_80B7B8B4 - .word 0x40490FDB -glabel D_80B7B8B8 - .word 0x40C8F5C3 -glabel D_80B7B8BC - .word 0x3C23D70A -glabel D_80B7B8C0 - .word 0x3CA3D70B -glabel D_80B7B8C4 - .word 0x3F99999A -glabel D_80B7B8C8 - .word 0x3CF5C28F -glabel D_80B7B8CC - .word 0x3F4CCCCD -glabel D_80B7B8D0 - .word 0x4316199A -glabel D_80B7B8D4 - .word 0x44BB8000 -glabel D_80B7B8D8 - .word 0x3FD5DCA8 -glabel D_80B7B8DC - .word 0xB8C90FDB -glabel D_80B7B8E0 - .word 0x3B6BEDFA -glabel D_80B7B8E4 - .word 0x44BB8000 -glabel D_80B7B8E8 - .word 0x3DA3D70A -glabel D_80B7B8EC - .word 0x3DF5C28F - diff --git a/data/overlays/actors/z_item_b_heart.rodata.s b/data/overlays/actors/z_item_b_heart.rodata.s deleted file mode 100644 index a3c738013a..0000000000 --- a/data/overlays/actors/z_item_b_heart.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B85540 - - .asciz "../z_item_b_heart.c" - .balign 4 - -glabel D_80B85554 - - .asciz "../z_item_b_heart.c" - .balign 4 - -glabel D_80B85568 - - .asciz "../z_item_b_heart.c" - .balign 4 - -glabel D_80B8557C - - .asciz "../z_item_b_heart.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_item_etcetera.rodata.s b/data/overlays/actors/z_item_etcetera.rodata.s deleted file mode 100644 index 5dcbd34077..0000000000 --- a/data/overlays/actors/z_item_etcetera.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B85DA0 - .word 0x6E6F203D, 0x2025640A, 0x00000000 -glabel D_80B85DAC - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_80B85DBC - .word 0x30000000 -glabel D_80B85DC0 - .asciz "../z_item_etcetera.c" - .balign 4 - -glabel D_80B85DD8 - .asciz "../z_item_etcetera.c" - .balign 4 - -glabel D_80B85DF0 - .asciz "(game_play->demo_play.npcdemopnt[0]->dousa) = %d\n" - .balign 4 - -glabel jtbl_80B85E24 -.word L80B85710 -.word L80B857B0 -.word L80B857B0 -.word L80B857B0 -.word L80B857B0 -.word L80B857B0 -.word L80B8574C -.word L80B85778 -.word L80B85778 -.word L80B85778 -.word L80B85778 -.word L80B85778 -.word L80B85778 -glabel D_80B85E58 - .word 0x3E051EB8 -glabel D_80B85E5C - .word 0xBD4CCCCD -glabel D_80B85E60 - .word 0xBCCCCCCD -glabel D_80B85E64 - .word 0xBDCCCCCD -glabel D_80B85E68 - .word 0xBDCCCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_item_ocarina.rodata.s b/data/overlays/actors/z_item_ocarina.rodata.s deleted file mode 100644 index 5b4a53fbdc..0000000000 --- a/data/overlays/actors/z_item_ocarina.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B86810 - .asciz "../z_item_ocarina.c" - .balign 4 - -glabel D_80B86824 - .word 0x6E6F203D, 0x2025640A, 0x00000000 -glabel D_80B86830 - .word 0x44866000 -glabel D_80B86834 - .word 0xBDCCCCCD -glabel D_80B86838 - .word 0x4462C000 -glabel D_80B8683C - .word 0xBE99999A -glabel D_80B86840 - .word 0x44D2C000 -glabel D_80B86844 - .word 0xBE19999A -glabel D_80B86848 - .word 0xBE99999A -glabel D_80B8684C - .word 0x3E051EB8 - - diff --git a/data/overlays/actors/z_item_shield.rodata.s b/data/overlays/actors/z_item_shield.rodata.s deleted file mode 100644 index 89d8d0f75d..0000000000 --- a/data/overlays/actors/z_item_shield.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B87280 - .asciz "Item_Shild %d \n" - .balign 4 - -glabel D_80B87298 - .asciz "../z_item_shield.c" - .balign 4 - -glabel D_80B872AC - .asciz "../z_item_shield.c" - .balign 4 - -glabel D_80B872C0 - .asciz "../z_item_shield.c" - .balign 4 - -glabel D_80B872D4 - .word 0xBF4CCCCD -glabel D_80B872D8 - .word 0x44BB8000 -glabel D_80B872DC - .word 0x3C23D70A -glabel D_80B872E0 - .word 0x3E4CCCCD -glabel D_80B872E4 - .word 0x3A23D70A -glabel D_80B872E8 - .word 0xBF4CCCCD, 0x00000000 - - diff --git a/data/overlays/actors/z_kaleido_scope.rodata.s b/data/overlays/actors/z_kaleido_scope.rodata.s index 97413a5813..5acec788a3 100644 --- a/data/overlays/actors/z_kaleido_scope.rodata.s +++ b/data/overlays/actors/z_kaleido_scope.rodata.s @@ -340,7 +340,9 @@ glabel D_8082FC98 .balign 4 glabel D_8082FCC4 - .word 0x1B5B6D00 + .asciz "\x1b[m" + .balign 4 + glabel D_8082FCC8 .asciz "../z_kaleido_scope_PAL.c" .balign 4 @@ -546,7 +548,9 @@ glabel D_808301FC .balign 4 glabel D_80830210 - .word 0x1B5B6D00 + .asciz "\x1b[m" + .balign 4 + glabel D_80830214 .asciz "" .balign 4 @@ -556,7 +560,9 @@ glabel D_8083021C .balign 4 glabel D_80830238 - .word 0x1B5B6D00 + .asciz "\x1b[m" + .balign 4 + glabel D_8083023C .word 0x3F47AE14 glabel D_80830240 diff --git a/data/overlays/actors/z_magic_dark.rodata.s b/data/overlays/actors/z_magic_dark.rodata.s deleted file mode 100644 index 2286945988..0000000000 --- a/data/overlays/actors/z_magic_dark.rodata.s +++ /dev/null @@ -1,85 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B88B20 - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88B34 - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88B48 - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88B5C - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88B70 - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88B84 - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88B98 - .asciz "../z_magic_dark.c" - .balign 4 - -glabel D_80B88BAC - .word 0x3ECCCCCD -glabel D_80B88BB0 - .word 0x3F19999A -glabel D_80B88BB4 - .word 0x3FCCCCCD -glabel D_80B88BB8 - .word 0x3F4CCCCD -glabel D_80B88BBC - .word 0x3CF5C28F -glabel D_80B88BC0 - .word 0x3FCCCCCD -glabel D_80B88BC4 - .word 0x3C23D70A -glabel D_80B88BC8 - .word 0x3F4CCCCD -glabel D_80B88BCC - .word 0x3FA66666 -glabel D_80B88BD0 - .word 0x3E4CCCCD -glabel D_80B88BD4 - .word 0x44548000 -glabel D_80B88BD8 - .word 0x3CB60B61 -glabel D_80B88BDC - .word 0x3DAAAAAA -glabel D_80B88BE0 - .word 0x38D1B717 -glabel D_80B88BE4 - .word 0x3F666666 -glabel D_80B88BE8 - .word 0x3E4CCCCD -glabel D_80B88BEC - .word 0x3FCCCCCD -glabel D_80B88BF0 - .word 0x3F4CCCCD -glabel D_80B88BF4 - .word 0x38C90FDB -glabel D_80B88BF8 - .word 0x3F19999A -glabel D_80B88BFC - .word 0x3FB33333 -glabel D_80B88C00 - .word 0x3DC90FDB -glabel D_80B88C04 - .word 0x3DC90FDB, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_magic_fire.rodata.s b/data/overlays/actors/z_magic_fire.rodata.s deleted file mode 100644 index 6d0b931508..0000000000 --- a/data/overlays/actors/z_magic_fire.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B8AFC0 - .asciz "../z_magic_fire.c" - .balign 4 - -glabel D_80B8AFD4 - .asciz "../z_magic_fire.c" - .balign 4 - -glabel D_80B8AFE8 - .asciz "../z_magic_fire.c" - .balign 4 - -glabel D_80B8AFFC - .word 0x43A28000 -glabel D_80B8B000 - .word 0x3DA3D70A -glabel D_80B8B004 - .word 0x3A83126F -glabel D_80B8B008 - .word 0x3D4CCCCD -glabel D_80B8B00C - .word 0x3D89AE40 -glabel D_80B8B010 - .word 0x3E19999A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_magic_wind.rodata.s b/data/overlays/actors/z_magic_wind.rodata.s deleted file mode 100644 index 2746b2f52d..0000000000 --- a/data/overlays/actors/z_magic_wind.rodata.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B8CDB0 - .asciz "Magic_Wind_Actor_ct():コンストラクト失敗\n" - .balign 4 - -glabel D_80B8CDDC - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CDF0 - .asciz "\"表示開始\" = %s\n" - .balign 4 - -glabel D_80B8CE04 - .word 0xC9BDBCA8, 0xB3ABBBCF, 0x00000000 -glabel D_80B8CE10 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE24 - .word 0x22BEC3CC, 0xC722203D, 0x2025730A, 0x00000000 -glabel D_80B8CE34 - .word 0xBEC3CCC7, 0x00000000 -glabel D_80B8CE3C - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE50 - .asciz "\"表示開始\" = %s\n" - .balign 4 - -glabel D_80B8CE64 - .word 0xC9BDBCA8, 0xB3ABBBCF, 0x00000000 -glabel D_80B8CE70 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE84 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE98 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CEAC - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CEC0 - .word 0x3D088889, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_mir_ray.rodata.s b/data/overlays/actors/z_mir_ray.rodata.s deleted file mode 100644 index e365ec935d..0000000000 --- a/data/overlays/actors/z_mir_ray.rodata.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B8E850 - .word 0xC8BFBCCD, 0xCDD120B8, 0xF7A4CEC8, 0xAFC0B821, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x21212121, 0x210A0000 -glabel D_80B8E880 - .asciz "../z_mir_ray.c" - .balign 4 - -glabel D_80B8E890 - .asciz "this->actor.arg_data = %d\n" - .balign 4 - -glabel D_80B8E8AC - .asciz "../z_mir_ray.c" - .balign 4 - -glabel D_80B8E8BC - .asciz "\"反射光 発生失敗\" = %s\n" - .balign 4 - -glabel D_80B8E8D4 - .word 0xC8BFBCCD, 0xB8F720C8, 0xAFC0B8BC, 0xBAC7D400 -glabel D_80B8E8E4 - .asciz "../z_mir_ray.c" - .balign 4 - -glabel D_80B8E8F4 - .asciz "../z_mir_ray.c" - .balign 4 - -glabel D_80B8E904 - .asciz "../z_mir_ray.c" - .balign 4 - -glabel D_80B8E914 - .asciz "../z_mir_ray.c" - .balign 4 - -glabel D_80B8E924 - .word 0x443D8000 -glabel D_80B8E928 - .word 0xC46AC000 -glabel D_80B8E92C - .word 0xC4D34000 -glabel D_80B8E930 - .word 0x446A8000 -glabel D_80B8E934 - .word 0x44664000 -glabel D_80B8E938 - .word 0x38000100 -glabel D_80B8E93C - .word 0x3C23D70A - - diff --git a/data/overlays/actors/z_obj_bean.rodata.s b/data/overlays/actors/z_obj_bean.rodata.s deleted file mode 100644 index 303b2ccf53..0000000000 --- a/data/overlays/actors/z_obj_bean.rodata.s +++ /dev/null @@ -1,121 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B90EC0 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B90F00 - .asciz "../z_obj_bean.c" - .balign 4 - -glabel D_80B90F10 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80B90F1C - .asciz "パスデータが無い？(%s %d)(arg_data %xH)\n" - .balign 4 - -glabel D_80B90F48 - .asciz "../z_obj_bean.c" - .balign 4 - -glabel D_80B90F58 - .word 0x1B5B6D00 -glabel D_80B90F5C - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80B90F68 - .asciz "パスデータ数が不正(%s %d)(arg_data %xH)\n" - .balign 4 - -glabel D_80B90F94 - .asciz "../z_obj_bean.c" - .balign 4 - -glabel D_80B90FA4 - .word 0x1B5B6D00 -glabel D_80B90FA8 - .asciz "(魔法の豆の木リフト)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B90FD0 - .word 0x1B5B3336, 0x6D000000 -glabel D_80B90FD8 - .word 0xC7CFA4C8, 0xC6A6A4CE, 0xCCDAA5EA, 0xA5D5A5C8, 0xBED7C6CD, 0xA1AAA1AA, 0xA1AA0A00 -glabel D_80B90FF4 - .word 0x1B5B6D00 -glabel D_80B90FF8 - .word 0x41EFFFFF -glabel D_80B90FFC - .word 0x3C23D70A -glabel D_80B91000 - .word 0x3D75C28F -glabel D_80B91004 - .word 0x3F88F5C3 -glabel D_80B91008 - .word 0x3DCCCCCD -glabel D_80B9100C - .word 0x3E4CCCCD -glabel D_80B91010 - .word 0x3DCCCCCD -glabel D_80B91014 - .word 0x45034000 -glabel D_80B91018 - .word 0x3E2DC750 -glabel D_80B9101C - .word 0x3DDB22D2 -glabel D_80B91020 - .word 0x461C4000 -glabel D_80B91024 - .word 0x3DCCCCCD -glabel D_80B91028 - .word 0x45C72000 -glabel D_80B9102C - .word 0x3E328769 -glabel D_80B91030 - .word 0x3DFA03BF -glabel D_80B91034 - .word 0x3DCCCCCD -glabel D_80B91038 - .word 0x3E328769 -glabel D_80B9103C - .word 0x3DFA03BF -glabel D_80B91040 - .word 0x3E328769 -glabel D_80B91044 - .word 0x3DFA03BF -glabel D_80B91048 - .word 0x3E328769 -glabel D_80B9104C - .word 0x3DFA03BF -glabel D_80B91050 - .word 0x45C72000 -glabel D_80B91054 - .word 0x3E328769 -glabel D_80B91058 - .word 0x3DFA03BF -glabel D_80B9105C - .word 0x3A83126F -glabel D_80B91060 - .word 0x492AE600 -glabel D_80B91064 - .word 0x3DCCCCCD -glabel D_80B91068 - .word 0x3A83126F -glabel D_80B9106C - .word 0x492AE600 -glabel D_80B91070 - .word 0x38C90FDB -glabel D_80B91074 - .word 0x3DCCCCCD -glabel D_80B91078 - .word 0x38C90FDB -glabel D_80B9107C - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_obj_dekujr.rodata.s b/data/overlays/actors/z_obj_dekujr.rodata.s deleted file mode 100644 index b355d7c9f7..0000000000 --- a/data/overlays/actors/z_obj_dekujr.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B92A40 - .asciz "../z_obj_dekujr.c" - .balign 4 - -glabel D_80B92A54 - .asciz "../z_obj_dekujr.c" - .balign 4 - -glabel D_80B92A68 - .asciz "../z_obj_dekujr.c" - .balign 4 - -glabel D_80B92A7C - .asciz "../z_obj_dekujr.c" - .balign 4 - - - diff --git a/data/overlays/actors/z_obj_hamishi.rodata.s b/data/overlays/actors/z_obj_hamishi.rodata.s deleted file mode 100644 index ef3302aa68..0000000000 --- a/data/overlays/actors/z_obj_hamishi.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B937B0 - .asciz "../z_obj_hamishi.c" - .balign 4 - -glabel D_80B937C4 - .asciz "../z_obj_hamishi.c" - .balign 4 - -glabel D_80B937D8 - .asciz "../z_obj_hamishi.c" - .balign 4 - -.balign 16 - diff --git a/data/overlays/actors/z_obj_hsblock.rodata.s b/data/overlays/actors/z_obj_hsblock.rodata.s deleted file mode 100644 index 2341e48c8c..0000000000 --- a/data/overlays/actors/z_obj_hsblock.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B94100 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B94140 - .asciz "../z_obj_hsblock.c" - .balign 4 - -glabel D_80B94154 - .asciz "../z_obj_hsblock.c" - .balign 4 - -glabel D_80B94168 - .asciz "../z_obj_hsblock.c" - .balign 4 - -glabel D_80B9417C - .asciz "../z_obj_hsblock.c" - .balign 4 - -glabel D_80B94190 - .word 0x3E99999A -glabel D_80B94194 - .word 0x3A83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_ice_poly.rodata.s b/data/overlays/actors/z_obj_ice_poly.rodata.s deleted file mode 100644 index 2dbd8ffd52..0000000000 --- a/data/overlays/actors/z_obj_ice_poly.rodata.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B94BB0 - .asciz "../z_obj_ice_poly.c" - .balign 4 - -glabel D_80B94BC4 - .asciz "../z_obj_ice_poly.c" - .balign 4 - -glabel D_80B94BD8 - .asciz "../z_obj_ice_poly.c" - .balign 4 - -glabel D_80B94BEC - .word 0x3C4CCCCD - - diff --git a/data/overlays/actors/z_obj_kibako.rodata.s b/data/overlays/actors/z_obj_kibako.rodata.s deleted file mode 100644 index 88c4eaa4c9..0000000000 --- a/data/overlays/actors/z_obj_kibako.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B958A0 - .asciz "(dungeon keep 木箱)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B958C8 - .word 0xBF99999A -glabel D_80B958CC - .word 0x3E4CCCCD -glabel D_80B958D0 - .word 0x3DCCCCCD -glabel D_80B958D4 - .word 0x3F333333 -glabel D_80B958D8 - .word 0x3E3851EC -glabel D_80B958DC - .word 0x3E4CCCCD -glabel D_80B958E0 - .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_kibako2.rodata.s b/data/overlays/actors/z_obj_kibako2.rodata.s deleted file mode 100644 index 2823bc397e..0000000000 --- a/data/overlays/actors/z_obj_kibako2.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B96010 - .asciz "木箱(据置)(arg %04xH)(item %04xH %d)\n" - .balign 4 - -glabel D_80B96038 - .word 0x3E4CCCCD -glabel D_80B9603C - .word 0x3E4CCCCD -glabel D_80B96040 - .word 0x3D4CCCCD -glabel D_80B96044 - .word 0x3F333333, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_lift.rodata.s b/data/overlays/actors/z_obj_lift.rodata.s deleted file mode 100644 index 464b17e46c..0000000000 --- a/data/overlays/actors/z_obj_lift.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B96A20 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B96A60 - .asciz "../z_obj_lift.c" - .balign 4 - -glabel D_80B96A70 - .asciz "(Dungeon Lift)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B96A94 - .word 0x3F4CCCCD -glabel D_80B96A98 - .word 0x477FFF80 -glabel D_80B96A9C - .word 0x477FFF80 -glabel D_80B96AA0 - .word 0x477FFF80 -glabel D_80B96AA4 - .word 0x3A83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_lightswitch.rodata.s b/data/overlays/actors/z_obj_lightswitch.rodata.s deleted file mode 100644 index 00fbc847e0..0000000000 --- a/data/overlays/actors/z_obj_lightswitch.rodata.s +++ /dev/null @@ -1,69 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B97F90 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80B97F9C - .asciz "押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B97FCC - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B97FE4 - .word 0x1B5B6D00 -glabel D_80B97FE8 - .asciz "(光スイッチ)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B98008 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98020 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98038 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98050 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98068 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98080 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98098 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980B0 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980C8 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980E0 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980F8 - .word 0x38808081, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_makeoshihiki.rodata.s b/data/overlays/actors/z_obj_makeoshihiki.rodata.s deleted file mode 100644 index 4506fc16ce..0000000000 --- a/data/overlays/actors/z_obj_makeoshihiki.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B98970 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80B9897C - .asciz "Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n" - .balign 4 - -glabel D_80B989AC - .asciz "../z_obj_makeoshihiki.c" - .balign 4 - -glabel D_80B989C4 - .word 0x1B5B6D00 -glabel D_80B989C8 - .asciz "(%s)(arg_data %04xF)(angleZ %d)\n" - .balign 4 - -glabel D_80B989EC - .asciz "../z_obj_makeoshihiki.c" - .balign 4 - -glabel D_80B98A04 - .word 0x3A83126F, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_mure.rodata.s b/data/overlays/actors/z_obj_mure.rodata.s deleted file mode 100644 index 3ba65395af..0000000000 --- a/data/overlays/actors/z_obj_mure.rodata.s +++ /dev/null @@ -1,109 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B99AB0 - .asciz "Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B99AF4 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99B04 - .asciz "Error 群れな敵 (%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B99B30 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99B40 - .asciz "Error 群れな敵 (%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B99B6C - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99B7C - .asciz "群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n" - .balign 4 - -glabel D_80B99BC0 - .asciz "Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B99C00 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99C10 - .asciz "おかしなの (%s %d)\n" - .balign 4 - -glabel D_80B99C24 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99C34 - .asciz "Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B99C64 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99C74 - .asciz "warning 発生失敗 (%s %d)\n" - .balign 4 - -glabel D_80B99C90 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99CA0 - .asciz "warning 発生失敗 (%s %d)\n" - .balign 4 - -glabel D_80B99CBC - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99CCC - .asciz "Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B99CFC - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99D0C - .asciz "warning 発生失敗 (%s %d)\n" - .balign 4 - -glabel D_80B99D28 - .asciz "../z_obj_mure.c" - .balign 4 - -glabel D_80B99D38 - .word 0x3DCCCCCD -glabel D_80B99D3C - .word 0x3E4CCCCD -glabel D_80B99D40 - .word 0x3F4CCCCD -glabel D_80B99D44 - .word 0x3E4CCCCD -glabel D_80B99D48 - .word 0x3F19999A -glabel D_80B99D4C - .word 0x3E4CCCCD -glabel D_80B99D50 - .word 0x3F333333, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_mure2.rodata.s b/data/overlays/actors/z_obj_mure2.rodata.s deleted file mode 100644 index e9b4eee4aa..0000000000 --- a/data/overlays/actors/z_obj_mure2.rodata.s +++ /dev/null @@ -1,17 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B9A880 - .asciz "Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B9A8B4 - .word 0x2E2E2F7A, 0x5F6F626A, 0x5F6D7572, 0x65322E63, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_mure3.rodata.s b/data/overlays/actors/z_obj_mure3.rodata.s deleted file mode 100644 index 2bc758a036..0000000000 --- a/data/overlays/actors/z_obj_mure3.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B9B0E0 - .word 0x49A17020 -glabel D_80B9B0E4 - .word 0x4A005390, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_oshihiki.rodata.s b/data/overlays/actors/z_obj_oshihiki.rodata.s index 8e71012d06..fb42ea143b 100644 --- a/data/overlays/actors/z_obj_oshihiki.rodata.s +++ b/data/overlays/actors/z_obj_oshihiki.rodata.s @@ -67,7 +67,9 @@ glabel jtbl_80B9CC98 .word L80B9B2B4 .word L80B9B2BC glabel D_80B9CCB8 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel jtbl_80B9CCBC .word L80B9B5B8 .word L80B9B5B8 @@ -97,11 +99,17 @@ glabel D_80B9CD08 glabel D_80B9CD0C .word 0xBA83126F glabel D_80B9CD10 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_80B9CD14 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_80B9CD18 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel jtbl_80B9CD1C .word L80B9C8B8 .word L80B9C8B8 diff --git a/data/overlays/actors/z_obj_switch.rodata.s b/data/overlays/actors/z_obj_switch.rodata.s deleted file mode 100644 index 2b034d4f1a..0000000000 --- a/data/overlays/actors/z_obj_switch.rodata.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B9EE00 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B9EE40 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EE54 - .word 0x1B5B3331, 0x6D000000 -glabel D_80B9EE5C - .asciz "Error : 氷発生失敗 (%s %d)\n" - .balign 4 - -glabel D_80B9EE78 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EE8C - .word 0x1B5B6D00 -glabel D_80B9EE90 - .asciz "(Dungeon switch)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B9EEB4 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EEC8 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EEDC - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EEF0 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EF04 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EF18 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EF2C - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EF40 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EF54 - .asciz "../z_obj_switch.c" - .balign 4 - -glabel D_80B9EF68 - .word 0x3E28F5C3 -glabel D_80B9EF6C - .word 0x3D4AC083 -glabel D_80B9EF70 - .word 0x3C872B02 -glabel D_80B9EF74 - .word 0x3C872B02 -glabel D_80B9EF78 - .word 0x3D4AC083 -glabel D_80B9EF7C - .word 0x3E28F5C3 -glabel jtbl_80B9EF80 -.word L80B9E684 -.word L80B9E684 -.word L80B9E690 -.word L80B9E6C0 -.word L80B9E6C0 -.word 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_syokudai.rodata.s b/data/overlays/actors/z_obj_syokudai.rodata.s deleted file mode 100644 index 1483a1193f..0000000000 --- a/data/overlays/actors/z_obj_syokudai.rodata.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B9FE90 - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FEA4 - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FEB8 - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FECC - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FEE0 - .word 0x3B30F27C -glabel D_80B9FEE4 - .word 0x38C90FDB, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_timeblock.rodata.s b/data/overlays/actors/z_obj_timeblock.rodata.s deleted file mode 100644 index a1c469847e..0000000000 --- a/data/overlays/actors/z_obj_timeblock.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BA0B50 - .asciz "時のブロック ( %04xH save:%d color:%d range:%d move:%d)\n" - .balign 4 - -glabel D_80BA0B98 - .asciz "◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n" - .balign 4 - -glabel D_80BA0BCC - .asciz "◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n" - .balign 4 - -glabel D_80BA0C00 - .asciz "../z_obj_timeblock.c" - .balign 4 - -glabel D_80BA0C18 - .asciz "../z_obj_timeblock.c" - .balign 4 - -glabel D_80BA0C30 - .word 0x2E2E2F7A, 0x5F6F626A, 0x5F74696D, 0x65626C6F, 0x636B2E63, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_tsubo.rodata.s b/data/overlays/actors/z_obj_tsubo.rodata.s deleted file mode 100644 index 3e2c561a2f..0000000000 --- a/data/overlays/actors/z_obj_tsubo.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BA1BE0 - .word 0xC3CFCCCC, 0xA4CBC9D5, 0xC3E5BCBA, 0xC7D40A00 -glabel D_80BA1BF0 - .asciz "Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_80BA1C20 - .asciz "../z_obj_tsubo.c" - .balign 4 - -glabel D_80BA1C34 - .asciz "(dungeon keep 壷)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80BA1C58 - .word 0x3E6B851F -glabel D_80BA1C5C - .word 0x3E4CCCCD -glabel D_80BA1C60 - .word 0x3F19999A -glabel D_80BA1C64 - .word 0x3E4CCCCD -glabel D_80BA1C68 - .word 0x3E4CCCCD -glabel D_80BA1C6C - .word 0x3F333333 - - diff --git a/data/overlays/actors/z_obj_warp2block.rodata.s b/data/overlays/actors/z_obj_warp2block.rodata.s deleted file mode 100644 index 9f06b856d4..0000000000 --- a/data/overlays/actors/z_obj_warp2block.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BA28A0 - .asciz "時のブロック(ワープ２) ( %04xH color:%d range:%d)\n" - .balign 4 - -glabel D_80BA28E0 - .word 0x1B5B3431, 0x3B33376D, 0x00000000 -glabel D_80BA28EC - .asciz "Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n" - .balign 4 - -glabel D_80BA2930 - .asciz "../z_obj_warp2block.c" - .balign 4 - -glabel D_80BA2948 - .word 0x1B5B6D00 -glabel D_80BA294C - .asciz "../z_obj_warp2block.c" - .balign 4 - -glabel D_80BA2964 - .asciz "../z_obj_warp2block.c" - .balign 4 - -glabel D_80BA297C - .asciz "../z_obj_warp2block.c" - .balign 4 - -glabel D_80BA2994 - .word 0x3C23D70A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_object_kankyo.rodata.s b/data/overlays/actors/z_object_kankyo.rodata.s index a72a098b7e..d76810a954 100644 --- a/data/overlays/actors/z_object_kankyo.rodata.s +++ b/data/overlays/actors/z_object_kankyo.rodata.s @@ -89,59 +89,105 @@ glabel jtbl_80BA5BE0 glabel D_80BA5BF8 .word 0x3DCCCCCD, 0x3DCCCCCD, 0x3DCCCCCD, 0x3DCCCCCD, 0x3DCCCCCD, 0x3DCCCCCD glabel D_80BA5C10 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80BA5C14 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_80BA5C18 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_80BA5C1C - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80BA5C20 - .word 0x3FCCCCCD + .float 1.6 + .balign 4 + glabel D_80BA5C24 .word 0x477FFF00 glabel D_80BA5C28 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80BA5C2C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80BA5C30 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_80BA5C34 - .word 0x3727C5AC + .float 9.99999974738e-06 + .balign 4 + glabel D_80BA5C38 - .word 0x3CA3D70A + .float 0.02 + .balign 4 + glabel D_80BA5C3C - .word 0x3C03126F + .float 0.008 + .balign 4 + glabel D_80BA5C40 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80BA5C44 .word 0x3C75C28F glabel D_80BA5C48 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80BA5C4C - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80BA5C50 - .word 0x3BA3D70A + .float 0.005 + .balign 4 + glabel D_80BA5C54 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80BA5C58 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_80BA5C5C .word 0x3B83126F glabel D_80BA5C60 .word 0x3F847AE1, 0x47AE147B glabel D_80BA5C68 - .word 0x3DA3D70A + .float 0.08 + .balign 4 + glabel D_80BA5C6C - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80BA5C70 - .word 0x3FCCCCCD + .float 1.6 + .balign 4 + glabel D_80BA5C74 - .word 0x3727C5AC + .float 9.99999974738e-06 + .balign 4 + glabel D_80BA5C78 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80BA5C7C - .word 0x3727C5AC + .float 9.99999974738e-06 + .balign 4 + glabel D_80BA5C80 .word 0x3951B717 glabel jtbl_80BA5C84 @@ -156,29 +202,45 @@ glabel D_80BA5C9C glabel D_80BA5CA4 .word 0x3D4CCCCC glabel D_80BA5CA8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80BA5CAC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80BA5CB0 - .word 0x3D4CCCCD + .float 0.05 + .balign 4 + glabel D_80BA5CB4 .word 0x3EB2B8C2 glabel D_80BA5CB8 .word 0x3EB2B8C2 glabel D_80BA5CBC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_80BA5CC0 .word 0x3E124925 glabel D_80BA5CC4 .word 0x3E124925 glabel D_80BA5CC8 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80BA5CCC - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80BA5CD0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80BA5CD4 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_80BA5CD8 .word 0x3C8EFA35, 0x00000000 diff --git a/data/overlays/actors/z_oceff_spot.rodata.s b/data/overlays/actors/z_oceff_spot.rodata.s deleted file mode 100644 index 3529938a34..0000000000 --- a/data/overlays/actors/z_oceff_spot.rodata.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BA6F40 - .word 0x1B5B3333, 0x6D000000 -glabel D_80BA6F48 - .asciz "z_oceff_spot 太陽の歌フラグ\n" - .balign 4 - -glabel D_80BA6F68 - .word 0x1B5B6D00 -glabel D_80BA6F6C - .word 0x1B5B3333, 0x6D000000 -glabel D_80BA6F74 - .asciz "z_oceff_spot オカリナ終了\n" - .balign 4 - -glabel D_80BA6F90 - .word 0x1B5B6D00 -glabel D_80BA6F94 - .asciz "../z_oceff_spot.c" - .balign 4 - -glabel D_80BA6FA8 - .asciz "../z_oceff_spot.c" - .balign 4 - -glabel D_80BA6FBC - .asciz "../z_oceff_spot.c" - .balign 4 - -glabel D_80BA6FD0 - .word 0x4019999A -glabel D_80BA6FD4 - .word 0x3E99999A -glabel D_80BA6FD8 - .word 0x3D4CCCCD -glabel D_80BA6FDC - .word 0x3D4CCCCD -glabel D_80BA6FE0 - .word 0x40490FDB -glabel D_80BA6FE4 - .word 0x3ED70A3D -glabel D_80BA6FE8 - .word 0x3F666666, 0x00000000 - - diff --git a/data/overlays/actors/z_oceff_storm.rodata.s b/data/overlays/actors/z_oceff_storm.rodata.s deleted file mode 100644 index 5360ba6ed2..0000000000 --- a/data/overlays/actors/z_oceff_storm.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BA8C20 - .asciz "../z_oceff_storm.c" - .balign 4 - -glabel D_80BA8C34 - .asciz "../z_oceff_storm.c" - .balign 4 - -glabel D_80BA8C48 - .asciz "../z_oceff_storm.c" - .balign 4 - -glabel D_80BA8C5C - .asciz "../z_oceff_storm.c" - .balign 4 - -glabel D_80BA8C70 - .asciz "../z_oceff_storm.c" - .balign 4 - -glabel D_80BA8C84 - .word 0x3ECCCCCD -glabel D_80BA8C88 - .word 0x3E99999A -glabel D_80BA8C8C - .word 0x3ECCCCCD -glabel D_80BA8C90 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_oceff_wipe.rodata.s b/data/overlays/actors/z_oceff_wipe.rodata.s deleted file mode 100644 index 5f83046bf6..0000000000 --- a/data/overlays/actors/z_oceff_wipe.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BA9AC0 - .asciz " WIPE arg_data = %d\n" - .balign 4 - -glabel D_80BA9AE0 - .asciz "../z_oceff_wipe.c" - .balign 4 - -glabel D_80BA9AF4 - .asciz "../z_oceff_wipe.c" - .balign 4 - -glabel D_80BA9B08 - .asciz "../z_oceff_wipe.c" - .balign 4 - -glabel D_80BA9B1C - .word 0x3DCCCCCD - - diff --git a/data/overlays/actors/z_oceff_wipe2.rodata.s b/data/overlays/actors/z_oceff_wipe2.rodata.s deleted file mode 100644 index b8e92fbcd8..0000000000 --- a/data/overlays/actors/z_oceff_wipe2.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BAB2A0 - .asciz " WIPE2 arg_data = %d\n" - .balign 4 - -glabel D_80BAB2C0 - .asciz "../z_oceff_wipe2.c" - .balign 4 - -glabel D_80BAB2D4 - .asciz "../z_oceff_wipe2.c" - .balign 4 - -glabel D_80BAB2E8 - .asciz "../z_oceff_wipe2.c" - .balign 4 - -glabel D_80BAB2FC - .word 0x44A64000 -glabel D_80BAB300 - .word 0x44A64000 -glabel D_80BAB304 - .word 0x3DCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_oceff_wipe3.rodata.s b/data/overlays/actors/z_oceff_wipe3.rodata.s deleted file mode 100644 index 3195e2b34f..0000000000 --- a/data/overlays/actors/z_oceff_wipe3.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BACAC0 - .asciz " WIPE2 arg_data = %d\n" - .balign 4 - -glabel D_80BACAE0 - .asciz "../z_oceff_wipe3.c" - .balign 4 - -glabel D_80BACAF4 - .asciz "../z_oceff_wipe3.c" - .balign 4 - -glabel D_80BACB08 - .asciz "../z_oceff_wipe3.c" - .balign 4 - -glabel D_80BACB1C - .word 0x44A64000 -glabel D_80BACB20 - .word 0x44A64000 -glabel D_80BACB24 - .word 0x3DCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_oceff_wipe4.rodata.s b/data/overlays/actors/z_oceff_wipe4.rodata.s deleted file mode 100644 index 450315a57a..0000000000 --- a/data/overlays/actors/z_oceff_wipe4.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BADB60 - .asciz " WIPE4 arg_data = %d\n" - .balign 4 - -glabel D_80BADB80 - .asciz "../z_oceff_wipe4.c" - .balign 4 - -glabel D_80BADB94 - .asciz "../z_oceff_wipe4.c" - .balign 4 - -glabel D_80BADBA8 - .asciz "../z_oceff_wipe4.c" - .balign 4 - -glabel D_80BADBBC - .word 0x44A64000 -glabel D_80BADBC0 - .word 0x44A64000 -glabel D_80BADBC4 - .word 0x3DCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_player.rodata.s b/data/overlays/actors/z_player.rodata.s deleted file mode 100644 index ba9f4c907e..0000000000 --- a/data/overlays/actors/z_player.rodata.s +++ /dev/null @@ -1,332 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80855240 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855250 - .asciz "size = %x\n" - .balign 4 - -glabel D_8085525C - .asciz "size <= 1024 * 8" - .balign 4 - -glabel D_80855270 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855280 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855290 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552A0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552B0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552C0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552D0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552E0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552F0 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855300 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855310 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855320 - .asciz "DEBUG MODE" - .balign 4 - -glabel D_8085532C - .asciz "TOOL MODE=%d\n" - .balign 4 - -glabel D_8085533C - .asciz "DEMO MODE=%d\n" - .balign 4 - -glabel D_8085534C - .word 0x362A9004 -glabel D_80855350 - .word 0x3F23D70A -glabel D_80855354 - .word 0x3F2AAAAB -glabel D_80855358 - .word 0x3F2AAAAB -glabel D_8085535C - .word 0x3F99999A -glabel D_80855360 - .word 0xBF99999A -glabel D_80855364 - .word 0x3F4CCCCD -glabel D_80855368 - .word 0x3F19999A -glabel D_8085536C - .word 0x3C03126F -glabel D_80855370 - .word 0x3E0F5C29 -glabel D_80855374 - .word 0x38000100 -glabel D_80855378 - .word 0x3DA3D70A -glabel D_8085537C - .word 0x3DCCCCCD -glabel D_80855380 - .word 0x3DCCCCCD -glabel D_80855384 - .word 0x38000100 -glabel D_80855388 - .word 0x38000100 -glabel D_8085538C - .word 0x40B9999A -glabel D_80855390 - .word 0x44A28000 -glabel D_80855394 - .word 0x3DCCCCCD -glabel D_80855398 - .word 0x44A28000 -glabel D_8085539C - .word 0x3E99999A -glabel D_808553A0 - .word 0x469C4000 -glabel D_808553A4 - .word 0x3CA3D70A -glabel D_808553A8 - .word 0x3B83126F -glabel D_808553AC - .word 0x3E4CCCCD -glabel D_808553B0 - .word 0x3E051EB8 -glabel D_808553B4 - .word 0x3DCCCCCD -glabel D_808553B8 - .word 0x38000100 -glabel D_808553BC - .word 0x3F99999A -glabel D_808553C0 - .word 0x3C75C28F -glabel D_808553C4 - .word 0x41EB7972 -glabel D_808553C8 - .word 0x41EB7972 -glabel D_808553CC - .word 0x3F8CCCCD -glabel D_808553D0 - .word 0x38000100 -glabel D_808553D4 - .word 0x38000100 -glabel D_808553D8 - .word 0x402E0000, 0x07800000 -glabel D_808553E0 - .word 0x402E0000, 0x07800000 -glabel D_808553E8 - .word 0x38000100 -glabel D_808553EC - .word 0x38000100 -glabel D_808553F0 - .word 0x38000100 -glabel D_808553F4 - .word 0xBECCCCCD -glabel D_808553F8 - .word 0x40D9999A -glabel D_808553FC - .word 0x3E99999A -glabel D_80855400 - .word 0x3E99999A -glabel D_80855404 - .word 0x3DCCCCCD -glabel D_80855408 - .word 0x409CCCCD -glabel D_8085540C - .word 0x3F2AAAAB -glabel D_80855410 - .word 0x409CCCCD -glabel D_80855414 - .word 0x3ECCCCCD -glabel D_80855418 - .word 0x3DCCCCCD -glabel D_8085541C - .word 0x3F99999A -glabel D_80855420 - .word 0x3F0D3DCB -glabel D_80855424 - .word 0x409CCCCD -glabel D_80855428 - .word 0x3DCCCCCD -glabel D_8085542C - .word 0x3F0D3DCB -glabel D_80855430 - .word 0x40666666 -glabel D_80855434 - .word 0x3F666666 -glabel D_80855438 - .word 0x3DCCCCCD -glabel D_8085543C - .word 0x462AA800 -glabel D_80855440 - .word 0x3A1D4952 -glabel D_80855444 - .word 0x3F99999A -glabel D_80855448 - .word 0x3F308D3E -glabel D_8085544C - .word 0x3DCCCCCD -glabel D_80855450 - .word 0xBF99999A -glabel D_80855454 - .word 0xBF99999A -glabel D_80855458 - .word 0x3F59999A -glabel D_8085545C - .word 0x3DCCCCCD -glabel D_80855460 - .word 0x3F39611A -glabel D_80855464 - .word 0x3E4CCCCD -glabel D_80855468 - .word 0x3DCCCCCD -glabel D_8085546C - .word 0x3AC49BA6 -glabel D_80855470 - .word 0x3F39611A -glabel D_80855474 - .word 0x3E4CCCCD -glabel D_80855478 - .word 0x3DCCCCCD -glabel D_8085547C - .word 0x3DAE147B -glabel D_80855480 - .word 0x3D9374BC -glabel D_80855484 - .word 0x3DCCCCCD -glabel D_80855488 - .word 0x38A7C5AC -glabel D_8085548C - .word 0x3DCCCCCD -glabel D_80855490 - .word 0x38000100 -glabel D_80855494 - .word 0x43C7FAE2 -glabel D_80855498 - .word 0x43C7FAE2 -glabel D_8085549C - .word 0x38000100 -glabel D_808554A0 - .word 0x38000100 -glabel D_808554A4 - .word 0x38000100 -glabel D_808554A8 - .word 0x418F3333 -glabel D_808554AC - .word 0x3ECCCCCD -glabel D_808554B0 - .word 0x3E4CCCCD -glabel D_808554B4 - .word 0x3E4CCCCC -glabel D_808554B8 - .word 0x3C23D70A -glabel D_808554BC - .word 0x3CA3D70A -glabel D_808554C0 - .word 0x3C23D70A -glabel D_808554C4 - .word 0x48435000 -glabel D_808554C8 - .word 0x4A742400 -glabel D_808554CC - .word 0x3DCCCCCD -glabel D_808554D0 - .word 0x7F7FFFFF -glabel D_808554D4 - .word 0x7F7FFFFF -glabel D_808554D8 - .word 0x3F4CCCCD -glabel D_808554DC - .word 0xC4966000 -glabel D_808554E0 - .word 0xC4966000 -glabel D_808554E4 - .word 0x3DE38E39 -glabel D_808554E8 - .word 0x40490FDB -glabel D_808554EC - .word 0x3F8CCCCD -glabel D_808554F0 - .word 0x3F733333 -glabel D_808554F4 - .word 0x44BB8000 -glabel D_808554F8 - .word 0xC4BB8000 -glabel D_808554FC - .word 0x3F4CCCCD -glabel D_80855500 - .word 0x3CA3D70A -glabel D_80855504 - .word 0x3D4CCCCD -glabel D_80855508 - .word 0xBDCCCCCD -glabel D_8085550C - .word 0xBE4CCCCD -glabel D_80855510 - .word 0xBE99999A -glabel D_80855514 - .word 0x3DCCCCCD -glabel D_80855518 - .word 0xBF4CCCCD -glabel D_8085551C - .word 0x3F4CCCCD -glabel D_80855520 - .word 0x3D051EB8 -glabel D_80855524 - .word 0x3D4CCCCD -glabel D_80855528 - .word 0x40566666 -glabel D_8085552C - .word 0x3CF5C28F -glabel D_80855530 - .word 0x3DCCCCCD -glabel D_80855534 - .word 0x3E4CCCCD -glabel D_80855538 - .word 0x3C9374BC -glabel D_8085553C - .word 0x3C75C28F -glabel D_80855540 - .word 0x3C23D70A -glabel D_80855544 - .word 0x3E99999A -glabel D_80855548 - .word 0x3727C5AC -glabel D_8085554C - .word 0x3DCCCCCD - diff --git a/data/overlays/actors/z_shot_sun.rodata.s b/data/overlays/actors/z_shot_sun.rodata.s deleted file mode 100644 index 1fef978f4e..0000000000 --- a/data/overlays/actors/z_shot_sun.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80BAE320 - - .asciz "%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80BAE34C - - .asciz "SHOT_SUN HIT!!!!!!!\n" - .balign 4 - -glabel D_80BAE36C - .word 0x46AFC800 -glabel D_80BAE370 - .word 0x45E2E800 -glabel D_80BAE374 - .word 0x45E2E800 -glabel D_80BAE378 - .word 0x3E2AAAAB, 0x00000000 - - diff --git a/data/overlays/effects/z_effect_ss_blast.rodata.s b/data/overlays/effects/z_effect_ss_blast.rodata.s index 0de0b72530..1092f656ba 100644 --- a/data/overlays/effects/z_effect_ss_blast.rodata.s +++ b/data/overlays/effects/z_effect_ss_blast.rodata.s @@ -20,6 +20,8 @@ glabel D_8099F148 .balign 4 glabel D_8099F15C - .word 0x3B23D70A + .float 0.0025 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_bomb.rodata.s b/data/overlays/effects/z_effect_ss_bomb.rodata.s index 3ee44900bd..39d39c12ed 100644 --- a/data/overlays/effects/z_effect_ss_bomb.rodata.s +++ b/data/overlays/effects/z_effect_ss_bomb.rodata.s @@ -16,11 +16,17 @@ glabel D_8099F5B4 .balign 4 glabel D_8099F5C8 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_8099F5CC - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_8099F5D0 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_8099F5D4 .word 0x3E4CCCCD, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_bomb2.rodata.s b/data/overlays/effects/z_effect_ss_bomb2.rodata.s index d0f3cfdba0..324d53a947 100644 --- a/data/overlays/effects/z_effect_ss_bomb2.rodata.s +++ b/data/overlays/effects/z_effect_ss_bomb2.rodata.s @@ -28,13 +28,19 @@ glabel D_8099FF70 .balign 4 glabel D_8099FF84 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099FF88 .word 0x3F6CCCCD glabel D_8099FF8C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_8099FF90 - .word 0x3CA3D70A + .float 0.02 + .balign 4 + glabel D_8099FF94 .word 0x3E19999A, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_bubble.rodata.s b/data/overlays/effects/z_effect_ss_bubble.rodata.s index 57cf6980b5..3671510328 100644 --- a/data/overlays/effects/z_effect_ss_bubble.rodata.s +++ b/data/overlays/effects/z_effect_ss_bubble.rodata.s @@ -20,8 +20,12 @@ glabel D_809A04D0 .balign 4 glabel D_809A04E8 - .word 0x3E99999A + .float 0.3 + .balign 4 + glabel D_809A04EC - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_dead_dd.rodata.s b/data/overlays/effects/z_effect_ss_dead_dd.rodata.s index b155e8fd70..827fa6328c 100644 --- a/data/overlays/effects/z_effect_ss_dead_dd.rodata.s +++ b/data/overlays/effects/z_effect_ss_dead_dd.rodata.s @@ -20,6 +20,8 @@ glabel D_809A1594 .balign 4 glabel D_809A15AC - .word 0x3C23D70A + .float 0.01 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_dead_ds.rodata.s b/data/overlays/effects/z_effect_ss_dead_ds.rodata.s index 1bd078a233..012c10d779 100644 --- a/data/overlays/effects/z_effect_ss_dead_ds.rodata.s +++ b/data/overlays/effects/z_effect_ss_dead_ds.rodata.s @@ -20,7 +20,9 @@ glabel D_809A1AB0 .balign 4 glabel D_809A1AC8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A1ACC .word 0x3FC8F5C3 diff --git a/data/overlays/effects/z_effect_ss_dust.rodata.s b/data/overlays/effects/z_effect_ss_dust.rodata.s index fae337ce3c..50032f5b19 100644 --- a/data/overlays/effects/z_effect_ss_dust.rodata.s +++ b/data/overlays/effects/z_effect_ss_dust.rodata.s @@ -16,21 +16,37 @@ glabel D_809A2A84 .balign 4 glabel D_809A2A98 - .word 0x3B23D70A + .float 0.0025 + .balign 4 + glabel D_809A2A9C - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_809A2AA0 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809A2AA4 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_809A2AA8 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809A2AAC - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_809A2AB0 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809A2AB4 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_809A2AB8 .word 0x3E4CCCCD, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_en_fire.rodata.s b/data/overlays/effects/z_effect_ss_en_fire.rodata.s index 79d0cfafc5..2180876e15 100644 --- a/data/overlays/effects/z_effect_ss_en_fire.rodata.s +++ b/data/overlays/effects/z_effect_ss_en_fire.rodata.s @@ -20,14 +20,20 @@ glabel D_809A3288 .balign 4 glabel D_809A329C - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A32A0 .word 0x3851B717 glabel D_809A32A4 .word 0x414B3333 glabel D_809A32A8 - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A32AC - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_en_ice.rodata.s b/data/overlays/effects/z_effect_ss_en_ice.rodata.s index 85dc4049ac..0eae2d7dec 100644 --- a/data/overlays/effects/z_effect_ss_en_ice.rodata.s +++ b/data/overlays/effects/z_effect_ss_en_ice.rodata.s @@ -24,11 +24,17 @@ glabel D_809A3BFC .balign 4 glabel D_809A3C10 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A3C14 - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A3C18 - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A3C1C .word 0x42B3999A glabel D_809A3C20 diff --git a/data/overlays/effects/z_effect_ss_fcircle.rodata.s b/data/overlays/effects/z_effect_ss_fcircle.rodata.s index eda66bb980..639c42d811 100644 --- a/data/overlays/effects/z_effect_ss_fcircle.rodata.s +++ b/data/overlays/effects/z_effect_ss_fcircle.rodata.s @@ -20,11 +20,17 @@ glabel D_809A45C8 .balign 4 glabel D_809A45DC - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_809A45E0 - .word 0x3CCCCCCD + .float 0.025 + .balign 4 + glabel D_809A45E4 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A45E8 .word 0x38C90FDB, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_fire_tail.rodata.s b/data/overlays/effects/z_effect_ss_fire_tail.rodata.s index 688a4a7ee4..4f7701af31 100644 --- a/data/overlays/effects/z_effect_ss_fire_tail.rodata.s +++ b/data/overlays/effects/z_effect_ss_fire_tail.rodata.s @@ -20,17 +20,25 @@ glabel D_809A5E10 .balign 4 glabel D_809A5E28 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_809A5E2C - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A5E30 .word 0x3C8EFA35 glabel D_809A5E34 .word 0x3727C5AD glabel D_809A5E38 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_809A5E3C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A5E40 .word 0x3F666666, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_g_magma2.rodata.s b/data/overlays/effects/z_effect_ss_g_magma2.rodata.s index 4fd80484a0..eff7e85a5b 100644 --- a/data/overlays/effects/z_effect_ss_g_magma2.rodata.s +++ b/data/overlays/effects/z_effect_ss_g_magma2.rodata.s @@ -16,6 +16,8 @@ glabel D_809A68C8 .balign 4 glabel D_809A68E0 - .word 0x2E2E2F7A, 0x5F656666, 0x5F73735F, 0x675F6D61, 0x676D6132, 0x2E630000, 0x00000000, 0x00000000 + .asciz "../z_eff_ss_g_magma2.c" + .balign 4 +.align 4 diff --git a/data/overlays/effects/z_effect_ss_hahen.rodata.s b/data/overlays/effects/z_effect_ss_hahen.rodata.s index 582680a2c3..c77962e8e4 100644 --- a/data/overlays/effects/z_effect_ss_hahen.rodata.s +++ b/data/overlays/effects/z_effect_ss_hahen.rodata.s @@ -32,16 +32,28 @@ glabel D_809A8084 .balign 4 glabel D_809A8098 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_809A809C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A80A0 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A80A4 - .word 0x3A83126F + .float 0.001 + .balign 4 + glabel D_809A80A8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A80AC - .word 0x3C23D70A + .float 0.01 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_ice_piece.rodata.s b/data/overlays/effects/z_effect_ss_ice_piece.rodata.s index 6347c619ff..d65789ebd8 100644 --- a/data/overlays/effects/z_effect_ss_ice_piece.rodata.s +++ b/data/overlays/effects/z_effect_ss_ice_piece.rodata.s @@ -20,11 +20,17 @@ glabel D_809A8B50 .balign 4 glabel D_809A8B68 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809A8B6C - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A8B70 - .word 0x38C90FDB + .float 9.58738019108e-05 + .balign 4 + glabel D_809A8B74 .word 0x3F59999A, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_k_fire.rodata.s b/data/overlays/effects/z_effect_ss_k_fire.rodata.s index 4179145acc..7f226336ac 100644 --- a/data/overlays/effects/z_effect_ss_k_fire.rodata.s +++ b/data/overlays/effects/z_effect_ss_k_fire.rodata.s @@ -20,7 +20,9 @@ glabel D_809A95F8 .balign 4 glabel D_809A960C - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_809A9610 .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_kakera.rodata.s b/data/overlays/effects/z_effect_ss_kakera.rodata.s index 2f2f383e98..44b033629e 100644 --- a/data/overlays/effects/z_effect_ss_kakera.rodata.s +++ b/data/overlays/effects/z_effect_ss_kakera.rodata.s @@ -40,20 +40,36 @@ glabel D_809AA668 glabel D_809AA66C .word 0x46FFFE00 glabel D_809AA670 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809AA674 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809AA678 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809AA67C - .word 0x3F666666 + .float 0.9 + .balign 4 + glabel D_809AA680 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809AA684 - .word 0xBF4CCCCD + .float -0.8 + .balign 4 + glabel D_809AA688 - .word 0x3F666666 + .float 0.9 + .balign 4 + glabel D_809AA68C - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_kirakira.rodata.s b/data/overlays/effects/z_effect_ss_kirakira.rodata.s index 415bc5bf1b..b3a74fbd3c 100644 --- a/data/overlays/effects/z_effect_ss_kirakira.rodata.s +++ b/data/overlays/effects/z_effect_ss_kirakira.rodata.s @@ -16,20 +16,34 @@ glabel D_809AAE28 .balign 4 glabel D_809AAE40 - .word 0x461C4000 + .float 10000.0 + .balign 4 + glabel D_809AAE44 - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_809AAE48 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809AAE4C - .word 0x3ECCCCCD + .float 0.4 + .balign 4 + glabel D_809AAE50 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809AAE54 .word 0x3F733333 glabel D_809AAE58 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_809AAE5C - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + diff --git a/data/overlays/effects/z_effect_ss_lightning.rodata.s b/data/overlays/effects/z_effect_ss_lightning.rodata.s index 8411f17aa4..13dbb795a8 100644 --- a/data/overlays/effects/z_effect_ss_lightning.rodata.s +++ b/data/overlays/effects/z_effect_ss_lightning.rodata.s @@ -16,13 +16,19 @@ glabel D_809AB578 .balign 4 glabel D_809AB590 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809AB594 - .word 0x3F19999A + .float 0.6 + .balign 4 + glabel D_809AB598 .word 0x45638000 glabel D_809AB59C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809AB5A0 .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_sibuki.rodata.s b/data/overlays/effects/z_effect_ss_sibuki.rodata.s index 06611454da..f485094909 100644 --- a/data/overlays/effects/z_effect_ss_sibuki.rodata.s +++ b/data/overlays/effects/z_effect_ss_sibuki.rodata.s @@ -20,13 +20,21 @@ glabel D_809ABCC0 .balign 4 glabel D_809ABCD8 - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809ABCDC - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809ABCE0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_809ABCE4 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_809ABCE8 .word 0x3DCCCCCD, 0x00000000 diff --git a/data/overlays/effects/z_effect_ss_sibuki2.rodata.s b/data/overlays/effects/z_effect_ss_sibuki2.rodata.s index 9b4eca3ac7..bc2e88007e 100644 --- a/data/overlays/effects/z_effect_ss_sibuki2.rodata.s +++ b/data/overlays/effects/z_effect_ss_sibuki2.rodata.s @@ -16,6 +16,8 @@ glabel D_809AC0A8 .balign 4 glabel D_809AC0C0 - .word 0x2E2E2F7A, 0x5F656666, 0x5F73735F, 0x73696275, 0x6B69322E, 0x63000000, 0x00000000, 0x00000000 + .asciz "../z_eff_ss_sibuki2.c" + .balign 4 +.align 4 diff --git a/data/overlays/effects/z_effect_ss_stick.rodata.s b/data/overlays/effects/z_effect_ss_stick.rodata.s index 540d183b6a..17a0806425 100644 --- a/data/overlays/effects/z_effect_ss_stick.rodata.s +++ b/data/overlays/effects/z_effect_ss_stick.rodata.s @@ -20,9 +20,13 @@ glabel D_809AC668 .balign 4 glabel D_809AC67C - .word 0x3C23D70A + .float 0.01 + .balign 4 + glabel D_809AC680 - .word 0x3B23D70A + .float 0.0025 + .balign 4 + glabel D_809AC684 .word 0x3C23D70A, 0x00000000, 0x00000000 diff --git a/data/overlays/gamestates/z_file_choose.rodata.s b/data/overlays/gamestates/z_file_choose.rodata.s index de74301eaf..168c55dff4 100644 --- a/data/overlays/gamestates/z_file_choose.rodata.s +++ b/data/overlays/gamestates/z_file_choose.rodata.s @@ -84,7 +84,9 @@ glabel D_80812C40 .balign 4 glabel D_80812C5C - .word 0x1B5B6D00 + .asciz "\x1b[m" + .balign 4 + glabel D_80812C60 .word 0xBDAACEBB, 0x0A000000 glabel D_80812C68 @@ -108,11 +110,19 @@ glabel D_80812CC8 .balign 4 glabel D_80812CE0 - .word 0x3DCCCCCD + .float 0.1 + .balign 4 + glabel D_80812CE4 - .word 0x3E4CCCCD + .float 0.2 + .balign 4 + glabel D_80812CE8 - .word 0x3ECCCCCD, 0x00000000 + .float 0.4 + .balign 4 + +.align 4 + glabel D_80812CF0 .word 0xA3D3A3F2, 0xA3E1A3ED, 0x20A3D3A3, 0xF4A3E1A3, 0xF2A3F4A8, 0xA1A3CCA3, 0xEFA3E1A3, 0xE42020A1, 0xD5A1D5A1, 0xD5A1D5A1, 0xD5202000 glabel D_80812D1C @@ -190,7 +200,9 @@ glabel D_80812EBC .balign 4 glabel D_80812EE0 - .word 0x1B5B6D00 + .asciz "\x1b[m" + .balign 4 + glabel D_80812EE4 .asciz "../z_file_choose.c" .balign 4 diff --git a/data/overlays/gamestates/z_select.rodata.s b/data/overlays/gamestates/z_select.rodata.s index 367ad4741d..b2c7169e8c 100644 --- a/data/overlays/gamestates/z_select.rodata.s +++ b/data/overlays/gamestates/z_select.rodata.s @@ -16,7 +16,9 @@ glabel D_808025E8 .balign 4 glabel D_80802604 - .word 0x1B5B6D00 + .asciz "\x1b[m" + .balign 4 + glabel D_80802608 .asciz " 1:SPOT00" .balign 4 diff --git a/include/z64actor.h b/include/z64actor.h index a1f08721de..0245eb3c32 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -32,7 +32,6 @@ typedef void (*ActorFunc)(struct Actor*, struct GlobalContext*); typedef struct { /* 0x00 */ s16 id; /* 0x02 */ u8 type; // Classifies actor and determines when actor will execute - /* 0x03 */ u8 room; // Room instance was spawned in. If value set to FF in rom, instance does not despawn when swapping rooms /* 0x04 */ u32 flags; /* 0x08 */ s16 objectId; /* 0x0C */ u32 instanceSize; diff --git a/spec b/spec index 2de0c9fd28..2114d1c1bb 100644 --- a/spec +++ b/spec @@ -641,7 +641,6 @@ beginseg name "ovl_player_actor" include "build/src/overlays/actors/ovl_player_actor/z_player.o" include "build/data/overlays/actors/z_player.data.o" - include "build/data/overlays/actors/z_player.rodata.o" include "build/data/overlays/actors/z_player.bss.o" include "build/data/overlays/actors/z_player.reloc.o" endseg @@ -655,7 +654,6 @@ beginseg name "ovl_En_Test" include "build/src/overlays/actors/ovl_En_Test/z_en_test.o" include "build/data/overlays/actors/z_en_test.data.o" - include "build/data/overlays/actors/z_en_test.rodata.o" include "build/data/overlays/actors/z_en_test.reloc.o" endseg @@ -663,7 +661,6 @@ beginseg name "ovl_Arms_Hook" include "build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o" include "build/data/overlays/actors/z_arms_hook.data.o" - include "build/data/overlays/actors/z_arms_hook.rodata.o" include "build/data/overlays/actors/z_arms_hook.reloc.o" endseg @@ -707,7 +704,6 @@ beginseg name "ovl_Bg_Bombwall" include "build/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.o" include "build/data/overlays/actors/z_bg_bombwall.data.o" - include "build/data/overlays/actors/z_bg_bombwall.rodata.o" include "build/data/overlays/actors/z_bg_bombwall.reloc.o" endseg @@ -715,7 +711,6 @@ beginseg name "ovl_Bg_Bowl_Wall" include "build/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.o" include "build/data/overlays/actors/z_bg_bowl_wall.data.o" - include "build/data/overlays/actors/z_bg_bowl_wall.rodata.o" include "build/data/overlays/actors/z_bg_bowl_wall.reloc.o" endseg @@ -723,7 +718,6 @@ beginseg name "ovl_Bg_Breakwall" include "build/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.o" include "build/data/overlays/actors/z_bg_breakwall.data.o" - include "build/data/overlays/actors/z_bg_breakwall.rodata.o" include "build/data/overlays/actors/z_bg_breakwall.reloc.o" endseg @@ -738,7 +732,6 @@ beginseg name "ovl_Bg_Ddan_Kd" include "build/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.o" include "build/data/overlays/actors/z_bg_ddan_kd.data.o" - include "build/data/overlays/actors/z_bg_ddan_kd.rodata.o" include "build/data/overlays/actors/z_bg_ddan_kd.reloc.o" endseg @@ -746,7 +739,6 @@ beginseg name "ovl_Bg_Dodoago" include "build/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.o" include "build/data/overlays/actors/z_bg_dodoago.data.o" - include "build/data/overlays/actors/z_bg_dodoago.rodata.o" include "build/data/overlays/actors/z_bg_dodoago.bss.o" include "build/data/overlays/actors/z_bg_dodoago.reloc.o" endseg @@ -755,7 +747,6 @@ beginseg name "ovl_Bg_Dy_Yoseizo" include "build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o" include "build/data/overlays/actors/z_bg_dy_yoseizo.data.o" - include "build/data/overlays/actors/z_bg_dy_yoseizo.rodata.o" include "build/data/overlays/actors/z_bg_dy_yoseizo.reloc.o" endseg @@ -763,7 +754,6 @@ beginseg name "ovl_Bg_Ganon_Otyuka" include "build/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.o" include "build/data/overlays/actors/z_bg_ganon_otyuka.data.o" - include "build/data/overlays/actors/z_bg_ganon_otyuka.rodata.o" include "build/data/overlays/actors/z_bg_ganon_otyuka.reloc.o" endseg @@ -783,7 +773,6 @@ beginseg name "ovl_Bg_Gnd_Darkmeiro" include "build/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.o" include "build/data/overlays/actors/z_bg_gnd_darkmeiro.data.o" - include "build/data/overlays/actors/z_bg_gnd_darkmeiro.rodata.o" include "build/data/overlays/actors/z_bg_gnd_darkmeiro.reloc.o" endseg @@ -791,7 +780,6 @@ beginseg name "ovl_Bg_Gnd_Firemeiro" include "build/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.o" include "build/data/overlays/actors/z_bg_gnd_firemeiro.data.o" - include "build/data/overlays/actors/z_bg_gnd_firemeiro.rodata.o" include "build/data/overlays/actors/z_bg_gnd_firemeiro.reloc.o" endseg @@ -814,7 +802,6 @@ beginseg name "ovl_Bg_Gnd_Soulmeiro" include "build/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.o" include "build/data/overlays/actors/z_bg_gnd_soulmeiro.data.o" - include "build/data/overlays/actors/z_bg_gnd_soulmeiro.rodata.o" include "build/data/overlays/actors/z_bg_gnd_soulmeiro.reloc.o" endseg @@ -822,7 +809,6 @@ beginseg name "ovl_Bg_Haka" include "build/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.o" include "build/data/overlays/actors/z_bg_haka.data.o" - include "build/data/overlays/actors/z_bg_haka.rodata.o" include "build/data/overlays/actors/z_bg_haka.reloc.o" endseg @@ -830,7 +816,6 @@ beginseg name "ovl_Bg_Haka_Gate" include "build/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.o" include "build/data/overlays/actors/z_bg_haka_gate.data.o" - include "build/data/overlays/actors/z_bg_haka_gate.rodata.o" include "build/data/overlays/actors/z_bg_haka_gate.bss.o" include "build/data/overlays/actors/z_bg_haka_gate.reloc.o" endseg @@ -839,7 +824,6 @@ beginseg name "ovl_Bg_Haka_Huta" include "build/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.o" include "build/data/overlays/actors/z_bg_haka_huta.data.o" - include "build/data/overlays/actors/z_bg_haka_huta.rodata.o" include "build/data/overlays/actors/z_bg_haka_huta.reloc.o" endseg @@ -853,7 +837,6 @@ beginseg name "ovl_Bg_Haka_MeganeBG" include "build/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.o" include "build/data/overlays/actors/z_bg_haka_meganebg.data.o" - include "build/data/overlays/actors/z_bg_haka_meganebg.rodata.o" include "build/data/overlays/actors/z_bg_haka_meganebg.reloc.o" endseg @@ -861,7 +844,6 @@ beginseg name "ovl_Bg_Haka_Sgami" include "build/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.o" include "build/data/overlays/actors/z_bg_haka_sgami.data.o" - include "build/data/overlays/actors/z_bg_haka_sgami.rodata.o" include "build/data/overlays/actors/z_bg_haka_sgami.reloc.o" endseg @@ -869,7 +851,6 @@ beginseg name "ovl_Bg_Haka_Ship" include "build/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.o" include "build/data/overlays/actors/z_bg_haka_ship.data.o" - include "build/data/overlays/actors/z_bg_haka_ship.rodata.o" include "build/data/overlays/actors/z_bg_haka_ship.reloc.o" endseg @@ -877,7 +858,6 @@ beginseg name "ovl_Bg_Haka_Trap" include "build/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.o" include "build/data/overlays/actors/z_bg_haka_trap.data.o" - include "build/data/overlays/actors/z_bg_haka_trap.rodata.o" include "build/data/overlays/actors/z_bg_haka_trap.reloc.o" endseg @@ -885,7 +865,6 @@ beginseg name "ovl_Bg_Haka_Tubo" include "build/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.o" include "build/data/overlays/actors/z_bg_haka_tubo.data.o" - include "build/data/overlays/actors/z_bg_haka_tubo.rodata.o" include "build/data/overlays/actors/z_bg_haka_tubo.reloc.o" endseg @@ -893,7 +872,6 @@ beginseg name "ovl_Bg_Haka_Water" include "build/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.o" include "build/data/overlays/actors/z_bg_haka_water.data.o" - include "build/data/overlays/actors/z_bg_haka_water.rodata.o" include "build/data/overlays/actors/z_bg_haka_water.reloc.o" endseg @@ -901,7 +879,6 @@ beginseg name "ovl_Bg_Haka_Zou" include "build/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.o" include "build/data/overlays/actors/z_bg_haka_zou.data.o" - include "build/data/overlays/actors/z_bg_haka_zou.rodata.o" include "build/data/overlays/actors/z_bg_haka_zou.reloc.o" endseg @@ -909,7 +886,6 @@ beginseg name "ovl_Bg_Heavy_Block" include "build/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.o" include "build/data/overlays/actors/z_bg_heavy_block.data.o" - include "build/data/overlays/actors/z_bg_heavy_block.rodata.o" include "build/data/overlays/actors/z_bg_heavy_block.reloc.o" endseg @@ -917,7 +893,6 @@ beginseg name "ovl_Bg_Hidan_Curtain" include "build/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.o" include "build/data/overlays/actors/z_bg_hidan_curtain.data.o" - include "build/data/overlays/actors/z_bg_hidan_curtain.rodata.o" include "build/data/overlays/actors/z_bg_hidan_curtain.reloc.o" endseg @@ -944,7 +919,6 @@ beginseg name "ovl_Bg_Hidan_Fwbig" include "build/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.o" include "build/data/overlays/actors/z_bg_hidan_fwbig.data.o" - include "build/data/overlays/actors/z_bg_hidan_fwbig.rodata.o" include "build/data/overlays/actors/z_bg_hidan_fwbig.reloc.o" endseg @@ -952,7 +926,6 @@ beginseg name "ovl_Bg_Hidan_Hamstep" include "build/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.o" include "build/data/overlays/actors/z_bg_hidan_hamstep.data.o" - include "build/data/overlays/actors/z_bg_hidan_hamstep.rodata.o" include "build/data/overlays/actors/z_bg_hidan_hamstep.reloc.o" endseg @@ -960,7 +933,6 @@ beginseg name "ovl_Bg_Hidan_Hrock" include "build/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.o" include "build/data/overlays/actors/z_bg_hidan_hrock.data.o" - include "build/data/overlays/actors/z_bg_hidan_hrock.rodata.o" include "build/data/overlays/actors/z_bg_hidan_hrock.reloc.o" endseg @@ -968,7 +940,6 @@ beginseg name "ovl_Bg_Hidan_Kousi" include "build/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.o" include "build/data/overlays/actors/z_bg_hidan_kousi.data.o" - include "build/data/overlays/actors/z_bg_hidan_kousi.rodata.o" include "build/data/overlays/actors/z_bg_hidan_kousi.reloc.o" endseg @@ -976,7 +947,6 @@ beginseg name "ovl_Bg_Hidan_Kowarerukabe" include "build/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.o" include "build/data/overlays/actors/z_bg_hidan_kowarerukabe.data.o" - include "build/data/overlays/actors/z_bg_hidan_kowarerukabe.rodata.o" include "build/data/overlays/actors/z_bg_hidan_kowarerukabe.reloc.o" endseg @@ -984,7 +954,6 @@ beginseg name "ovl_Bg_Hidan_Rock" include "build/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.o" include "build/data/overlays/actors/z_bg_hidan_rock.data.o" - include "build/data/overlays/actors/z_bg_hidan_rock.rodata.o" include "build/data/overlays/actors/z_bg_hidan_rock.reloc.o" endseg @@ -992,7 +961,6 @@ beginseg name "ovl_Bg_Hidan_Rsekizou" include "build/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.o" include "build/data/overlays/actors/z_bg_hidan_rsekizou.data.o" - include "build/data/overlays/actors/z_bg_hidan_rsekizou.rodata.o" include "build/data/overlays/actors/z_bg_hidan_rsekizou.reloc.o" endseg @@ -1000,7 +968,6 @@ beginseg name "ovl_Bg_Hidan_Sekizou" include "build/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.o" include "build/data/overlays/actors/z_bg_hidan_sekizou.data.o" - include "build/data/overlays/actors/z_bg_hidan_sekizou.rodata.o" include "build/data/overlays/actors/z_bg_hidan_sekizou.reloc.o" endseg @@ -1008,7 +975,6 @@ beginseg name "ovl_Bg_Hidan_Sima" include "build/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.o" include "build/data/overlays/actors/z_bg_hidan_sima.data.o" - include "build/data/overlays/actors/z_bg_hidan_sima.rodata.o" include "build/data/overlays/actors/z_bg_hidan_sima.reloc.o" endseg @@ -1022,7 +988,6 @@ beginseg name "ovl_Bg_Ice_Objects" include "build/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.o" include "build/data/overlays/actors/z_bg_ice_objects.data.o" - include "build/data/overlays/actors/z_bg_ice_objects.rodata.o" include "build/data/overlays/actors/z_bg_ice_objects.reloc.o" endseg @@ -1030,7 +995,6 @@ beginseg name "ovl_Bg_Ice_Shelter" include "build/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.o" include "build/data/overlays/actors/z_bg_ice_shelter.data.o" - include "build/data/overlays/actors/z_bg_ice_shelter.rodata.o" include "build/data/overlays/actors/z_bg_ice_shelter.reloc.o" endseg @@ -1045,7 +1009,6 @@ beginseg name "ovl_Bg_Ice_Turara" include "build/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.o" include "build/data/overlays/actors/z_bg_ice_turara.data.o" - include "build/data/overlays/actors/z_bg_ice_turara.rodata.o" include "build/data/overlays/actors/z_bg_ice_turara.reloc.o" endseg @@ -1053,7 +1016,6 @@ beginseg name "ovl_Bg_Ingate" include "build/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o" include "build/data/overlays/actors/z_bg_ingate.data.o" - include "build/data/overlays/actors/z_bg_ingate.rodata.o" include "build/data/overlays/actors/z_bg_ingate.reloc.o" endseg @@ -1061,7 +1023,6 @@ beginseg name "ovl_Bg_Jya_1flift" include "build/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.o" include "build/data/overlays/actors/z_bg_jya_1flift.data.o" - include "build/data/overlays/actors/z_bg_jya_1flift.rodata.o" include "build/data/overlays/actors/z_bg_jya_1flift.reloc.o" endseg @@ -1075,7 +1036,6 @@ beginseg name "ovl_Bg_Jya_Bigmirror" include "build/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.o" include "build/data/overlays/actors/z_bg_jya_bigmirror.data.o" - include "build/data/overlays/actors/z_bg_jya_bigmirror.rodata.o" include "build/data/overlays/actors/z_bg_jya_bigmirror.reloc.o" endseg @@ -1083,7 +1043,6 @@ beginseg name "ovl_Bg_Jya_Block" include "build/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.o" include "build/data/overlays/actors/z_bg_jya_block.data.o" - include "build/data/overlays/actors/z_bg_jya_block.rodata.o" include "build/data/overlays/actors/z_bg_jya_block.reloc.o" endseg @@ -1091,7 +1050,6 @@ beginseg name "ovl_Bg_Jya_Bombchuiwa" include "build/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.o" include "build/data/overlays/actors/z_bg_jya_bombchuiwa.data.o" - include "build/data/overlays/actors/z_bg_jya_bombchuiwa.rodata.o" include "build/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.o" endseg @@ -1099,7 +1057,6 @@ beginseg name "ovl_Bg_Jya_Bombiwa" include "build/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.o" include "build/data/overlays/actors/z_bg_jya_bombiwa.data.o" - include "build/data/overlays/actors/z_bg_jya_bombiwa.rodata.o" include "build/data/overlays/actors/z_bg_jya_bombiwa.reloc.o" endseg @@ -1107,7 +1064,6 @@ beginseg name "ovl_Bg_Jya_Cobra" include "build/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.o" include "build/data/overlays/actors/z_bg_jya_cobra.data.o" - include "build/data/overlays/actors/z_bg_jya_cobra.rodata.o" include "build/data/overlays/actors/z_bg_jya_cobra.reloc.o" endseg @@ -1115,7 +1071,6 @@ beginseg name "ovl_Bg_Jya_Goroiwa" include "build/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.o" include "build/data/overlays/actors/z_bg_jya_goroiwa.data.o" - include "build/data/overlays/actors/z_bg_jya_goroiwa.rodata.o" include "build/data/overlays/actors/z_bg_jya_goroiwa.reloc.o" endseg @@ -1123,7 +1078,6 @@ beginseg name "ovl_Bg_Jya_Haheniron" include "build/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.o" include "build/data/overlays/actors/z_bg_jya_haheniron.data.o" - include "build/data/overlays/actors/z_bg_jya_haheniron.rodata.o" include "build/data/overlays/actors/z_bg_jya_haheniron.reloc.o" endseg @@ -1131,7 +1085,6 @@ beginseg name "ovl_Bg_Jya_Ironobj" include "build/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.o" include "build/data/overlays/actors/z_bg_jya_ironobj.data.o" - include "build/data/overlays/actors/z_bg_jya_ironobj.rodata.o" include "build/data/overlays/actors/z_bg_jya_ironobj.reloc.o" endseg @@ -1145,7 +1098,6 @@ beginseg name "ovl_Bg_Jya_Lift" include "build/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.o" include "build/data/overlays/actors/z_bg_jya_lift.data.o" - include "build/data/overlays/actors/z_bg_jya_lift.rodata.o" include "build/data/overlays/actors/z_bg_jya_lift.reloc.o" endseg @@ -1153,7 +1105,6 @@ beginseg name "ovl_Bg_Jya_Megami" include "build/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.o" include "build/data/overlays/actors/z_bg_jya_megami.data.o" - include "build/data/overlays/actors/z_bg_jya_megami.rodata.o" include "build/data/overlays/actors/z_bg_jya_megami.reloc.o" endseg @@ -1161,7 +1112,6 @@ beginseg name "ovl_Bg_Jya_Zurerukabe" include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.o" include "build/data/overlays/actors/z_bg_jya_zurerukabe.data.o" - include "build/data/overlays/actors/z_bg_jya_zurerukabe.rodata.o" include "build/data/overlays/actors/z_bg_jya_zurerukabe.reloc.o" endseg @@ -1169,7 +1119,6 @@ beginseg name "ovl_Bg_Menkuri_Eye" include "build/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.o" include "build/data/overlays/actors/z_bg_menkuri_eye.data.o" - include "build/data/overlays/actors/z_bg_menkuri_eye.rodata.o" include "build/data/overlays/actors/z_bg_menkuri_eye.bss.o" include "build/data/overlays/actors/z_bg_menkuri_eye.reloc.o" endseg @@ -1190,7 +1139,6 @@ beginseg name "ovl_Bg_Mizu_Bwall" include "build/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.o" include "build/data/overlays/actors/z_bg_mizu_bwall.data.o" - include "build/data/overlays/actors/z_bg_mizu_bwall.rodata.o" include "build/data/overlays/actors/z_bg_mizu_bwall.reloc.o" endseg @@ -1198,7 +1146,6 @@ beginseg name "ovl_Bg_Mizu_Movebg" include "build/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.o" include "build/data/overlays/actors/z_bg_mizu_movebg.data.o" - include "build/data/overlays/actors/z_bg_mizu_movebg.rodata.o" include "build/data/overlays/actors/z_bg_mizu_movebg.bss.o" include "build/data/overlays/actors/z_bg_mizu_movebg.reloc.o" endseg @@ -1207,7 +1154,6 @@ beginseg name "ovl_Bg_Mizu_Shutter" include "build/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.o" include "build/data/overlays/actors/z_bg_mizu_shutter.data.o" - include "build/data/overlays/actors/z_bg_mizu_shutter.rodata.o" include "build/data/overlays/actors/z_bg_mizu_shutter.reloc.o" endseg @@ -1221,7 +1167,6 @@ beginseg name "ovl_Bg_Mizu_Water" include "build/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.o" include "build/data/overlays/actors/z_bg_mizu_water.data.o" - include "build/data/overlays/actors/z_bg_mizu_water.rodata.o" include "build/data/overlays/actors/z_bg_mizu_water.reloc.o" endseg @@ -1235,7 +1180,6 @@ beginseg name "ovl_Bg_Mori_Bigst" include "build/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.o" include "build/data/overlays/actors/z_bg_mori_bigst.data.o" - include "build/data/overlays/actors/z_bg_mori_bigst.rodata.o" include "build/data/overlays/actors/z_bg_mori_bigst.reloc.o" endseg @@ -1243,7 +1187,6 @@ beginseg name "ovl_Bg_Mori_Elevator" include "build/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.o" include "build/data/overlays/actors/z_bg_mori_elevator.data.o" - include "build/data/overlays/actors/z_bg_mori_elevator.rodata.o" include "build/data/overlays/actors/z_bg_mori_elevator.reloc.o" endseg @@ -1251,7 +1194,6 @@ beginseg name "ovl_Bg_Mori_Hashigo" include "build/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.o" include "build/data/overlays/actors/z_bg_mori_hashigo.data.o" - include "build/data/overlays/actors/z_bg_mori_hashigo.rodata.o" include "build/data/overlays/actors/z_bg_mori_hashigo.reloc.o" endseg @@ -1259,7 +1201,6 @@ beginseg name "ovl_Bg_Mori_Hashira4" include "build/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.o" include "build/data/overlays/actors/z_bg_mori_hashira4.data.o" - include "build/data/overlays/actors/z_bg_mori_hashira4.rodata.o" include "build/data/overlays/actors/z_bg_mori_hashira4.bss.o" include "build/data/overlays/actors/z_bg_mori_hashira4.reloc.o" endseg @@ -1268,7 +1209,6 @@ beginseg name "ovl_Bg_Mori_Hineri" include "build/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.o" include "build/data/overlays/actors/z_bg_mori_hineri.data.o" - include "build/data/overlays/actors/z_bg_mori_hineri.rodata.o" include "build/data/overlays/actors/z_bg_mori_hineri.reloc.o" endseg @@ -1276,7 +1216,6 @@ beginseg name "ovl_Bg_Mori_Idomizu" include "build/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.o" include "build/data/overlays/actors/z_bg_mori_idomizu.data.o" - include "build/data/overlays/actors/z_bg_mori_idomizu.rodata.o" include "build/data/overlays/actors/z_bg_mori_idomizu.reloc.o" endseg @@ -1284,7 +1223,6 @@ beginseg name "ovl_Bg_Mori_Kaitenkabe" include "build/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.o" include "build/data/overlays/actors/z_bg_mori_kaitenkabe.data.o" - include "build/data/overlays/actors/z_bg_mori_kaitenkabe.rodata.o" include "build/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.o" endseg @@ -1292,7 +1230,6 @@ beginseg name "ovl_Bg_Mori_Rakkatenjo" include "build/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.o" include "build/data/overlays/actors/z_bg_mori_rakkatenjo.data.o" - include "build/data/overlays/actors/z_bg_mori_rakkatenjo.rodata.o" include "build/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.o" endseg @@ -1300,7 +1237,6 @@ beginseg name "ovl_Bg_Po_Event" include "build/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.o" include "build/data/overlays/actors/z_bg_po_event.data.o" - include "build/data/overlays/actors/z_bg_po_event.rodata.o" include "build/data/overlays/actors/z_bg_po_event.bss.o" include "build/data/overlays/actors/z_bg_po_event.reloc.o" endseg @@ -1309,7 +1245,6 @@ beginseg name "ovl_Bg_Po_Syokudai" include "build/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.o" include "build/data/overlays/actors/z_bg_po_syokudai.data.o" - include "build/data/overlays/actors/z_bg_po_syokudai.rodata.o" include "build/data/overlays/actors/z_bg_po_syokudai.reloc.o" endseg @@ -1323,7 +1258,6 @@ beginseg name "ovl_Bg_Relay_Objects" include "build/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.o" include "build/data/overlays/actors/z_bg_relay_objects.data.o" - include "build/data/overlays/actors/z_bg_relay_objects.rodata.o" include "build/data/overlays/actors/z_bg_relay_objects.reloc.o" endseg @@ -1337,7 +1271,6 @@ beginseg name "ovl_Bg_Spot00_Hanebasi" include "build/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.o" include "build/data/overlays/actors/z_bg_spot00_hanebasi.data.o" - include "build/data/overlays/actors/z_bg_spot00_hanebasi.rodata.o" include "build/data/overlays/actors/z_bg_spot00_hanebasi.reloc.o" endseg @@ -1351,7 +1284,6 @@ beginseg name "ovl_Bg_Spot01_Idohashira" include "build/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.o" include "build/data/overlays/actors/z_bg_spot01_idohashira.data.o" - include "build/data/overlays/actors/z_bg_spot01_idohashira.rodata.o" include "build/data/overlays/actors/z_bg_spot01_idohashira.reloc.o" endseg @@ -1359,7 +1291,6 @@ beginseg name "ovl_Bg_Spot01_Idomizu" include "build/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.o" include "build/data/overlays/actors/z_bg_spot01_idomizu.data.o" - include "build/data/overlays/actors/z_bg_spot01_idomizu.rodata.o" include "build/data/overlays/actors/z_bg_spot01_idomizu.reloc.o" endseg @@ -1373,7 +1304,6 @@ beginseg name "ovl_Bg_Spot01_Objects2" include "build/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.o" include "build/data/overlays/actors/z_bg_spot01_objects2.data.o" - include "build/data/overlays/actors/z_bg_spot01_objects2.rodata.o" include "build/data/overlays/actors/z_bg_spot01_objects2.reloc.o" endseg @@ -1381,7 +1311,6 @@ beginseg name "ovl_Bg_Spot02_Objects" include "build/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.o" include "build/data/overlays/actors/z_bg_spot02_objects.data.o" - include "build/data/overlays/actors/z_bg_spot02_objects.rodata.o" include "build/data/overlays/actors/z_bg_spot02_objects.reloc.o" endseg @@ -1389,7 +1318,6 @@ beginseg name "ovl_Bg_Spot03_Taki" include "build/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.o" include "build/data/overlays/actors/z_bg_spot03_taki.data.o" - include "build/data/overlays/actors/z_bg_spot03_taki.rodata.o" include "build/data/overlays/actors/z_bg_spot03_taki.reloc.o" endseg @@ -1403,7 +1331,6 @@ beginseg name "ovl_Bg_Spot06_Objects" include "build/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.o" include "build/data/overlays/actors/z_bg_spot06_objects.data.o" - include "build/data/overlays/actors/z_bg_spot06_objects.rodata.o" include "build/data/overlays/actors/z_bg_spot06_objects.reloc.o" endseg @@ -1411,7 +1338,6 @@ beginseg name "ovl_Bg_Spot07_Taki" include "build/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.o" include "build/data/overlays/actors/z_bg_spot07_taki.data.o" - include "build/data/overlays/actors/z_bg_spot07_taki.rodata.o" include "build/data/overlays/actors/z_bg_spot07_taki.reloc.o" endseg @@ -1419,7 +1345,6 @@ beginseg name "ovl_Bg_Spot08_Bakudankabe" include "build/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.o" include "build/data/overlays/actors/z_bg_spot08_bakudankabe.data.o" - include "build/data/overlays/actors/z_bg_spot08_bakudankabe.rodata.o" include "build/data/overlays/actors/z_bg_spot08_bakudankabe.reloc.o" endseg @@ -1441,7 +1366,6 @@ beginseg name "ovl_Bg_Spot11_Bakudankabe" include "build/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.o" include "build/data/overlays/actors/z_bg_spot11_bakudankabe.data.o" - include "build/data/overlays/actors/z_bg_spot11_bakudankabe.rodata.o" include "build/data/overlays/actors/z_bg_spot11_bakudankabe.reloc.o" endseg @@ -1449,7 +1373,6 @@ beginseg name "ovl_Bg_Spot11_Oasis" include "build/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.o" include "build/data/overlays/actors/z_bg_spot11_oasis.data.o" - include "build/data/overlays/actors/z_bg_spot11_oasis.rodata.o" include "build/data/overlays/actors/z_bg_spot11_oasis.reloc.o" endseg @@ -1469,7 +1392,6 @@ beginseg name "ovl_Bg_Spot15_Rrbox" include "build/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.o" include "build/data/overlays/actors/z_bg_spot15_rrbox.data.o" - include "build/data/overlays/actors/z_bg_spot15_rrbox.rodata.o" include "build/data/overlays/actors/z_bg_spot15_rrbox.reloc.o" endseg @@ -1483,7 +1405,6 @@ beginseg name "ovl_Bg_Spot16_Bombstone" include "build/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.o" include "build/data/overlays/actors/z_bg_spot16_bombstone.data.o" - include "build/data/overlays/actors/z_bg_spot16_bombstone.rodata.o" include "build/data/overlays/actors/z_bg_spot16_bombstone.reloc.o" endseg @@ -1491,7 +1412,6 @@ beginseg name "ovl_Bg_Spot16_Doughnut" include "build/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.o" include "build/data/overlays/actors/z_bg_spot16_doughnut.data.o" - include "build/data/overlays/actors/z_bg_spot16_doughnut.rodata.o" include "build/data/overlays/actors/z_bg_spot16_doughnut.reloc.o" endseg @@ -1499,7 +1419,6 @@ beginseg name "ovl_Bg_Spot17_Bakudankabe" include "build/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.o" include "build/data/overlays/actors/z_bg_spot17_bakudankabe.data.o" - include "build/data/overlays/actors/z_bg_spot17_bakudankabe.rodata.o" include "build/data/overlays/actors/z_bg_spot17_bakudankabe.reloc.o" endseg @@ -1513,7 +1432,6 @@ beginseg name "ovl_Bg_Spot18_Basket" include "build/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.o" include "build/data/overlays/actors/z_bg_spot18_basket.data.o" - include "build/data/overlays/actors/z_bg_spot18_basket.rodata.o" include "build/data/overlays/actors/z_bg_spot18_basket.reloc.o" endseg @@ -1527,7 +1445,6 @@ beginseg name "ovl_Bg_Spot18_Obj" include "build/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.o" include "build/data/overlays/actors/z_bg_spot18_obj.data.o" - include "build/data/overlays/actors/z_bg_spot18_obj.rodata.o" include "build/data/overlays/actors/z_bg_spot18_obj.reloc.o" endseg @@ -1542,7 +1459,6 @@ beginseg name "ovl_Bg_Sst_Floor" include "build/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.o" include "build/data/overlays/actors/z_bg_sst_floor.data.o" - include "build/data/overlays/actors/z_bg_sst_floor.rodata.o" include "build/data/overlays/actors/z_bg_sst_floor.reloc.o" endseg @@ -1550,7 +1466,6 @@ beginseg name "ovl_Bg_Toki_Hikari" include "build/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.o" include "build/data/overlays/actors/z_bg_toki_hikari.data.o" - include "build/data/overlays/actors/z_bg_toki_hikari.rodata.o" include "build/data/overlays/actors/z_bg_toki_hikari.reloc.o" endseg @@ -1564,7 +1479,6 @@ beginseg name "ovl_Bg_Treemouth" include "build/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.o" include "build/data/overlays/actors/z_bg_treemouth.data.o" - include "build/data/overlays/actors/z_bg_treemouth.rodata.o" include "build/data/overlays/actors/z_bg_treemouth.reloc.o" endseg @@ -1578,7 +1492,6 @@ beginseg name "ovl_Bg_Vb_Sima" include "build/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.o" include "build/data/overlays/actors/z_bg_vb_sima.data.o" - include "build/data/overlays/actors/z_bg_vb_sima.rodata.o" include "build/data/overlays/actors/z_bg_vb_sima.reloc.o" endseg @@ -1586,7 +1499,6 @@ beginseg name "ovl_Bg_Ydan_Hasi" include "build/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.o" include "build/data/overlays/actors/z_bg_ydan_hasi.data.o" - include "build/data/overlays/actors/z_bg_ydan_hasi.rodata.o" include "build/data/overlays/actors/z_bg_ydan_hasi.reloc.o" endseg @@ -1601,7 +1513,6 @@ beginseg name "ovl_Bg_Ydan_Sp" include "build/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.o" include "build/data/overlays/actors/z_bg_ydan_sp.data.o" - include "build/data/overlays/actors/z_bg_ydan_sp.rodata.o" include "build/data/overlays/actors/z_bg_ydan_sp.reloc.o" endseg @@ -1615,7 +1526,6 @@ beginseg name "ovl_Boss_Dodongo" include "build/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.o" include "build/data/overlays/actors/z_boss_dodongo.data.o" - include "build/data/overlays/actors/z_boss_dodongo.rodata.o" include "build/data/overlays/actors/z_boss_dodongo.reloc.o" endseg @@ -1623,7 +1533,6 @@ beginseg name "ovl_Boss_Fd" include "build/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.o" include "build/data/overlays/actors/z_boss_fd.data.o" - include "build/data/overlays/actors/z_boss_fd.rodata.o" include "build/data/overlays/actors/z_boss_fd.reloc.o" endseg @@ -1631,7 +1540,6 @@ beginseg name "ovl_Boss_Fd2" include "build/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.o" include "build/data/overlays/actors/z_boss_fd2.data.o" - include "build/data/overlays/actors/z_boss_fd2.rodata.o" include "build/data/overlays/actors/z_boss_fd2.reloc.o" endseg @@ -1648,7 +1556,6 @@ beginseg name "ovl_Boss_Ganon2" include "build/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.o" include "build/data/overlays/actors/z_boss_ganon2.data.o" - include "build/data/overlays/actors/z_boss_ganon2.rodata.o" include "build/data/overlays/actors/z_boss_ganon2.bss.o" include "build/data/overlays/actors/z_boss_ganon2.reloc.o" endseg @@ -1665,7 +1572,6 @@ beginseg name "ovl_Boss_Goma" include "build/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.o" include "build/data/overlays/actors/z_boss_goma.data.o" - include "build/data/overlays/actors/z_boss_goma.rodata.o" include "build/data/overlays/actors/z_boss_goma.reloc.o" endseg @@ -1673,7 +1579,6 @@ beginseg name "ovl_Boss_Mo" include "build/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.o" include "build/data/overlays/actors/z_boss_mo.data.o" - include "build/data/overlays/actors/z_boss_mo.rodata.o" include "build/data/overlays/actors/z_boss_mo.bss.o" include "build/data/overlays/actors/z_boss_mo.reloc.o" endseg @@ -1682,7 +1587,6 @@ beginseg name "ovl_Boss_Sst" include "build/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.o" include "build/data/overlays/actors/z_boss_sst.data.o" - include "build/data/overlays/actors/z_boss_sst.rodata.o" include "build/data/overlays/actors/z_boss_sst.bss.o" include "build/data/overlays/actors/z_boss_sst.reloc.o" endseg @@ -1691,7 +1595,6 @@ beginseg name "ovl_Boss_Tw" include "build/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.o" include "build/data/overlays/actors/z_boss_tw.data.o" - include "build/data/overlays/actors/z_boss_tw.rodata.o" include "build/data/overlays/actors/z_boss_tw.bss.o" include "build/data/overlays/actors/z_boss_tw.reloc.o" endseg @@ -1700,7 +1603,6 @@ beginseg name "ovl_Boss_Va" include "build/src/overlays/actors/ovl_Boss_Va/z_boss_va.o" include "build/data/overlays/actors/z_boss_va.data.o" - include "build/data/overlays/actors/z_boss_va.rodata.o" include "build/data/overlays/actors/z_boss_va.bss.o" include "build/data/overlays/actors/z_boss_va.reloc.o" endseg @@ -1709,7 +1611,6 @@ beginseg name "ovl_Demo_6K" include "build/src/overlays/actors/ovl_Demo_6K/z_demo_6k.o" include "build/data/overlays/actors/z_demo_6k.data.o" - include "build/data/overlays/actors/z_demo_6k.rodata.o" include "build/data/overlays/actors/z_demo_6k.reloc.o" endseg @@ -1717,7 +1618,6 @@ beginseg name "ovl_Demo_Du" include "build/src/overlays/actors/ovl_Demo_Du/z_demo_du.o" include "build/data/overlays/actors/z_demo_du.data.o" - include "build/data/overlays/actors/z_demo_du.rodata.o" include "build/data/overlays/actors/z_demo_du.reloc.o" endseg @@ -1725,7 +1625,6 @@ beginseg name "ovl_Demo_Ec" include "build/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.o" include "build/data/overlays/actors/z_demo_ec.data.o" - include "build/data/overlays/actors/z_demo_ec.rodata.o" include "build/data/overlays/actors/z_demo_ec.reloc.o" endseg @@ -1733,7 +1632,6 @@ beginseg name "ovl_Demo_Effect" include "build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o" include "build/data/overlays/actors/z_demo_effect.data.o" - include "build/data/overlays/actors/z_demo_effect.rodata.o" include "build/data/overlays/actors/z_demo_effect.reloc.o" endseg @@ -1741,7 +1639,6 @@ beginseg name "ovl_Demo_Ext" include "build/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.o" include "build/data/overlays/actors/z_demo_ext.data.o" - include "build/data/overlays/actors/z_demo_ext.rodata.o" include "build/data/overlays/actors/z_demo_ext.reloc.o" endseg @@ -1755,7 +1652,6 @@ beginseg name "ovl_Demo_Gj" include "build/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.o" include "build/data/overlays/actors/z_demo_gj.data.o" - include "build/data/overlays/actors/z_demo_gj.rodata.o" include "build/data/overlays/actors/z_demo_gj.reloc.o" endseg @@ -1769,7 +1665,6 @@ beginseg name "ovl_Demo_Gt" include "build/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.o" include "build/data/overlays/actors/z_demo_gt.data.o" - include "build/data/overlays/actors/z_demo_gt.rodata.o" include "build/data/overlays/actors/z_demo_gt.reloc.o" endseg @@ -1777,7 +1672,6 @@ beginseg name "ovl_Demo_Ik" include "build/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.o" include "build/data/overlays/actors/z_demo_ik.data.o" - include "build/data/overlays/actors/z_demo_ik.rodata.o" include "build/data/overlays/actors/z_demo_ik.reloc.o" endseg @@ -1785,7 +1679,6 @@ beginseg name "ovl_Demo_Im" include "build/src/overlays/actors/ovl_Demo_Im/z_demo_im.o" include "build/data/overlays/actors/z_demo_im.data.o" - include "build/data/overlays/actors/z_demo_im.rodata.o" include "build/data/overlays/actors/z_demo_im.reloc.o" endseg @@ -1793,7 +1686,6 @@ beginseg name "ovl_Demo_Kankyo" include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o" include "build/data/overlays/actors/z_demo_kankyo.data.o" - include "build/data/overlays/actors/z_demo_kankyo.rodata.o" include "build/data/overlays/actors/z_demo_kankyo.bss.o" include "build/data/overlays/actors/z_demo_kankyo.reloc.o" endseg @@ -1802,7 +1694,6 @@ beginseg name "ovl_Demo_Kekkai" include "build/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.o" include "build/data/overlays/actors/z_demo_kekkai.data.o" - include "build/data/overlays/actors/z_demo_kekkai.rodata.o" include "build/data/overlays/actors/z_demo_kekkai.reloc.o" endseg @@ -1810,7 +1701,6 @@ beginseg name "ovl_Demo_Sa" include "build/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.o" include "build/data/overlays/actors/z_demo_sa.data.o" - include "build/data/overlays/actors/z_demo_sa.rodata.o" include "build/data/overlays/actors/z_demo_sa.reloc.o" endseg @@ -1818,14 +1708,13 @@ beginseg name "ovl_Demo_Shd" include "build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o" include "build/data/overlays/actors/z_demo_shd.data.o" - include "build/data/overlays/actors/z_demo_shd.rodata.o" include "build/data/overlays/actors/z_demo_shd.reloc.o" endseg beginseg name "ovl_Demo_Tre_Lgt" include "build/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o" - include "build/data/overlays/actors/z_demo_tre_lgt.data.o" + include "build/data/overlays/actors/z_demo_tre_lgt.data.o" include "build/data/overlays/actors/z_demo_tre_lgt.rodata.o" include "build/data/overlays/actors/z_demo_tre_lgt.reloc.o" endseg @@ -1840,7 +1729,6 @@ beginseg name "ovl_Door_Gerudo" include "build/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.o" include "build/data/overlays/actors/z_door_gerudo.data.o" - include "build/data/overlays/actors/z_door_gerudo.rodata.o" include "build/data/overlays/actors/z_door_gerudo.reloc.o" endseg @@ -1848,7 +1736,6 @@ beginseg name "ovl_Door_Killer" include "build/src/overlays/actors/ovl_Door_Killer/z_door_killer.o" include "build/data/overlays/actors/z_door_killer.data.o" - include "build/data/overlays/actors/z_door_killer.rodata.o" include "build/data/overlays/actors/z_door_killer.reloc.o" endseg @@ -1856,7 +1743,6 @@ beginseg name "ovl_Door_Shutter" include "build/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.o" include "build/data/overlays/actors/z_door_shutter.data.o" - include "build/data/overlays/actors/z_door_shutter.rodata.o" include "build/data/overlays/actors/z_door_shutter.reloc.o" endseg @@ -1879,7 +1765,6 @@ beginseg name "ovl_Efc_Erupc" include "build/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.o" include "build/data/overlays/actors/z_efc_erupc.data.o" - include "build/data/overlays/actors/z_efc_erupc.rodata.o" include "build/data/overlays/actors/z_efc_erupc.reloc.o" endseg @@ -1887,7 +1772,6 @@ beginseg name "ovl_Eff_Dust" include "build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o" include "build/data/overlays/actors/z_eff_dust.data.o" - include "build/data/overlays/actors/z_eff_dust.rodata.o" include "build/data/overlays/actors/z_eff_dust.reloc.o" endseg @@ -2180,7 +2064,6 @@ beginseg name "ovl_Elf_Msg" include "build/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.o" include "build/data/overlays/actors/z_elf_msg.data.o" - include "build/data/overlays/actors/z_elf_msg.rodata.o" include "build/data/overlays/actors/z_elf_msg.reloc.o" endseg @@ -2188,7 +2071,6 @@ beginseg name "ovl_Elf_Msg2" include "build/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.o" include "build/data/overlays/actors/z_elf_msg2.data.o" - include "build/data/overlays/actors/z_elf_msg2.rodata.o" include "build/data/overlays/actors/z_elf_msg2.reloc.o" endseg @@ -2196,7 +2078,6 @@ beginseg name "ovl_En_Am" include "build/src/overlays/actors/ovl_En_Am/z_en_am.o" include "build/data/overlays/actors/z_en_am.data.o" - include "build/data/overlays/actors/z_en_am.rodata.o" include "build/data/overlays/actors/z_en_am.reloc.o" endseg @@ -2210,7 +2091,6 @@ beginseg name "ovl_En_Anubice" include "build/src/overlays/actors/ovl_En_Anubice/z_en_anubice.o" include "build/data/overlays/actors/z_en_anubice.data.o" - include "build/data/overlays/actors/z_en_anubice.rodata.o" include "build/data/overlays/actors/z_en_anubice.reloc.o" endseg @@ -2218,7 +2098,6 @@ beginseg name "ovl_En_Anubice_Fire" include "build/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.o" include "build/data/overlays/actors/z_en_anubice_fire.data.o" - include "build/data/overlays/actors/z_en_anubice_fire.rodata.o" include "build/data/overlays/actors/z_en_anubice_fire.reloc.o" endseg @@ -2238,7 +2117,6 @@ beginseg name "ovl_En_Arrow" include "build/src/overlays/actors/ovl_En_Arrow/z_en_arrow.o" include "build/data/overlays/actors/z_en_arrow.data.o" - include "build/data/overlays/actors/z_en_arrow.rodata.o" include "build/data/overlays/actors/z_en_arrow.reloc.o" endseg @@ -2246,7 +2124,6 @@ beginseg name "ovl_En_Attack_Niw" include "build/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.o" include "build/data/overlays/actors/z_en_attack_niw.data.o" - include "build/data/overlays/actors/z_en_attack_niw.rodata.o" include "build/data/overlays/actors/z_en_attack_niw.reloc.o" endseg @@ -2254,7 +2131,6 @@ beginseg name "ovl_En_Ba" include "build/src/overlays/actors/ovl_En_Ba/z_en_ba.o" include "build/data/overlays/actors/z_en_ba.data.o" - include "build/data/overlays/actors/z_en_ba.rodata.o" include "build/data/overlays/actors/z_en_ba.reloc.o" endseg @@ -2262,7 +2138,6 @@ beginseg name "ovl_En_Bb" include "build/src/overlays/actors/ovl_En_Bb/z_en_bb.o" include "build/data/overlays/actors/z_en_bb.data.o" - include "build/data/overlays/actors/z_en_bb.rodata.o" include "build/data/overlays/actors/z_en_bb.reloc.o" endseg @@ -2270,7 +2145,6 @@ beginseg name "ovl_En_Bdfire" include "build/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.o" include "build/data/overlays/actors/z_en_bdfire.data.o" - include "build/data/overlays/actors/z_en_bdfire.rodata.o" include "build/data/overlays/actors/z_en_bdfire.reloc.o" endseg @@ -2278,7 +2152,6 @@ beginseg name "ovl_En_Bigokuta" include "build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o" include "build/data/overlays/actors/z_en_bigokuta.data.o" - include "build/data/overlays/actors/z_en_bigokuta.rodata.o" include "build/data/overlays/actors/z_en_bigokuta.reloc.o" endseg @@ -2286,7 +2159,6 @@ beginseg name "ovl_En_Bili" include "build/src/overlays/actors/ovl_En_Bili/z_en_bili.o" include "build/data/overlays/actors/z_en_bili.data.o" - include "build/data/overlays/actors/z_en_bili.rodata.o" include "build/data/overlays/actors/z_en_bili.reloc.o" endseg @@ -2300,7 +2172,6 @@ beginseg name "ovl_En_Blkobj" include "build/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.o" include "build/data/overlays/actors/z_en_blkobj.data.o" - include "build/data/overlays/actors/z_en_blkobj.rodata.o" include "build/data/overlays/actors/z_en_blkobj.reloc.o" endseg @@ -2308,7 +2179,6 @@ beginseg name "ovl_En_Bom" include "build/src/overlays/actors/ovl_En_Bom/z_en_bom.o" include "build/data/overlays/actors/z_en_bom.data.o" - include "build/data/overlays/actors/z_en_bom.rodata.o" include "build/data/overlays/actors/z_en_bom.reloc.o" endseg @@ -2316,7 +2186,6 @@ beginseg name "ovl_En_Bom_Bowl_Man" include "build/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o" include "build/data/overlays/actors/z_en_bom_bowl_man.data.o" - include "build/data/overlays/actors/z_en_bom_bowl_man.rodata.o" include "build/data/overlays/actors/z_en_bom_bowl_man.reloc.o" endseg @@ -2324,7 +2193,6 @@ beginseg name "ovl_En_Bom_Bowl_Pit" include "build/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.o" include "build/data/overlays/actors/z_en_bom_bowl_pit.data.o" - include "build/data/overlays/actors/z_en_bom_bowl_pit.rodata.o" include "build/data/overlays/actors/z_en_bom_bowl_pit.reloc.o" endseg @@ -2332,7 +2200,6 @@ beginseg name "ovl_En_Bom_Chu" include "build/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.o" include "build/data/overlays/actors/z_en_bom_chu.data.o" - include "build/data/overlays/actors/z_en_bom_chu.rodata.o" include "build/data/overlays/actors/z_en_bom_chu.reloc.o" endseg @@ -2340,7 +2207,6 @@ beginseg name "ovl_En_Bombf" include "build/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o" include "build/data/overlays/actors/z_en_bombf.data.o" - include "build/data/overlays/actors/z_en_bombf.rodata.o" include "build/data/overlays/actors/z_en_bombf.reloc.o" endseg @@ -2355,7 +2221,6 @@ beginseg increment 0x10 include "build/src/overlays/actors/ovl_En_Box/z_en_box.o" include "build/data/overlays/actors/z_en_box.data.o" - include "build/data/overlays/actors/z_en_box.rodata.o" include "build/data/overlays/actors/z_en_box.reloc.o" endseg @@ -2363,7 +2228,6 @@ beginseg name "ovl_En_Brob" include "build/src/overlays/actors/ovl_En_Brob/z_en_brob.o" include "build/data/overlays/actors/z_en_brob.data.o" - include "build/data/overlays/actors/z_en_brob.rodata.o" include "build/data/overlays/actors/z_en_brob.reloc.o" endseg @@ -2371,7 +2235,6 @@ beginseg name "ovl_En_Bubble" include "build/src/overlays/actors/ovl_En_Bubble/z_en_bubble.o" include "build/data/overlays/actors/z_en_bubble.data.o" - include "build/data/overlays/actors/z_en_bubble.rodata.o" include "build/data/overlays/actors/z_en_bubble.reloc.o" endseg @@ -2379,7 +2242,6 @@ beginseg name "ovl_En_Butte" include "build/src/overlays/actors/ovl_En_Butte/z_en_butte.o" include "build/data/overlays/actors/z_en_butte.data.o" - include "build/data/overlays/actors/z_en_butte.rodata.o" include "build/data/overlays/actors/z_en_butte.reloc.o" endseg @@ -2387,7 +2249,6 @@ beginseg name "ovl_En_Bw" include "build/src/overlays/actors/ovl_En_Bw/z_en_bw.o" include "build/data/overlays/actors/z_en_bw.data.o" - include "build/data/overlays/actors/z_en_bw.rodata.o" include "build/data/overlays/actors/z_en_bw.reloc.o" endseg @@ -2395,7 +2256,6 @@ beginseg name "ovl_En_Bx" include "build/src/overlays/actors/ovl_En_Bx/z_en_bx.o" include "build/data/overlays/actors/z_en_bx.data.o" - include "build/data/overlays/actors/z_en_bx.rodata.o" include "build/data/overlays/actors/z_en_bx.reloc.o" endseg @@ -2403,7 +2263,6 @@ beginseg name "ovl_En_Changer" include "build/src/overlays/actors/ovl_En_Changer/z_en_changer.o" include "build/data/overlays/actors/z_en_changer.data.o" - include "build/data/overlays/actors/z_en_changer.rodata.o" include "build/data/overlays/actors/z_en_changer.reloc.o" endseg @@ -2411,7 +2270,6 @@ beginseg name "ovl_En_Clear_Tag" include "build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o" include "build/data/overlays/actors/z_en_clear_tag.data.o" - include "build/data/overlays/actors/z_en_clear_tag.rodata.o" include "build/data/overlays/actors/z_en_clear_tag.bss.o" include "build/data/overlays/actors/z_en_clear_tag.reloc.o" endseg @@ -2420,7 +2278,6 @@ beginseg name "ovl_En_Cow" include "build/src/overlays/actors/ovl_En_Cow/z_en_cow.o" include "build/data/overlays/actors/z_en_cow.data.o" - include "build/data/overlays/actors/z_en_cow.rodata.o" include "build/data/overlays/actors/z_en_cow.reloc.o" endseg @@ -2428,7 +2285,6 @@ beginseg name "ovl_En_Crow" include "build/src/overlays/actors/ovl_En_Crow/z_en_crow.o" include "build/data/overlays/actors/z_en_crow.data.o" - include "build/data/overlays/actors/z_en_crow.rodata.o" include "build/data/overlays/actors/z_en_crow.reloc.o" endseg @@ -2436,7 +2292,6 @@ beginseg name "ovl_En_Cs" include "build/src/overlays/actors/ovl_En_Cs/z_en_cs.o" include "build/data/overlays/actors/z_en_cs.data.o" - include "build/data/overlays/actors/z_en_cs.rodata.o" include "build/data/overlays/actors/z_en_cs.reloc.o" endseg @@ -2444,7 +2299,6 @@ beginseg name "ovl_En_Daiku" include "build/src/overlays/actors/ovl_En_Daiku/z_en_daiku.o" include "build/data/overlays/actors/z_en_daiku.data.o" - include "build/data/overlays/actors/z_en_daiku.rodata.o" include "build/data/overlays/actors/z_en_daiku.reloc.o" endseg @@ -2452,7 +2306,6 @@ beginseg name "ovl_En_Daiku_Kakariko" include "build/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.o" include "build/data/overlays/actors/z_en_daiku_kakariko.data.o" - include "build/data/overlays/actors/z_en_daiku_kakariko.rodata.o" include "build/data/overlays/actors/z_en_daiku_kakariko.reloc.o" endseg @@ -2460,7 +2313,6 @@ beginseg name "ovl_En_Dekubaba" include "build/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.o" include "build/data/overlays/actors/z_en_dekubaba.data.o" - include "build/data/overlays/actors/z_en_dekubaba.rodata.o" include "build/data/overlays/actors/z_en_dekubaba.reloc.o" endseg @@ -2468,7 +2320,6 @@ beginseg name "ovl_En_Dekunuts" include "build/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.o" include "build/data/overlays/actors/z_en_dekunuts.data.o" - include "build/data/overlays/actors/z_en_dekunuts.rodata.o" include "build/data/overlays/actors/z_en_dekunuts.reloc.o" endseg @@ -2476,7 +2327,6 @@ beginseg name "ovl_En_Dh" include "build/src/overlays/actors/ovl_En_Dh/z_en_dh.o" include "build/data/overlays/actors/z_en_dh.data.o" - include "build/data/overlays/actors/z_en_dh.rodata.o" include "build/data/overlays/actors/z_en_dh.reloc.o" endseg @@ -2484,7 +2334,6 @@ beginseg name "ovl_En_Dha" include "build/src/overlays/actors/ovl_En_Dha/z_en_dha.o" include "build/data/overlays/actors/z_en_dha.data.o" - include "build/data/overlays/actors/z_en_dha.rodata.o" include "build/data/overlays/actors/z_en_dha.reloc.o" endseg @@ -2492,7 +2341,6 @@ beginseg name "ovl_En_Diving_Game" include "build/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.o" include "build/data/overlays/actors/z_en_diving_game.data.o" - include "build/data/overlays/actors/z_en_diving_game.rodata.o" include "build/data/overlays/actors/z_en_diving_game.reloc.o" endseg @@ -2500,7 +2348,6 @@ beginseg name "ovl_En_Dns" include "build/src/overlays/actors/ovl_En_Dns/z_en_dns.o" include "build/data/overlays/actors/z_en_dns.data.o" - include "build/data/overlays/actors/z_en_dns.rodata.o" include "build/data/overlays/actors/z_en_dns.reloc.o" endseg @@ -2508,7 +2355,6 @@ beginseg name "ovl_En_Dnt_Demo" include "build/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.o" include "build/data/overlays/actors/z_en_dnt_demo.data.o" - include "build/data/overlays/actors/z_en_dnt_demo.rodata.o" include "build/data/overlays/actors/z_en_dnt_demo.reloc.o" endseg @@ -2516,7 +2362,6 @@ beginseg name "ovl_En_Dnt_Jiji" include "build/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.o" include "build/data/overlays/actors/z_en_dnt_jiji.data.o" - include "build/data/overlays/actors/z_en_dnt_jiji.rodata.o" include "build/data/overlays/actors/z_en_dnt_jiji.reloc.o" endseg @@ -2524,7 +2369,6 @@ beginseg name "ovl_En_Dnt_Nomal" include "build/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.o" include "build/data/overlays/actors/z_en_dnt_nomal.data.o" - include "build/data/overlays/actors/z_en_dnt_nomal.rodata.o" include "build/data/overlays/actors/z_en_dnt_nomal.reloc.o" endseg @@ -2532,7 +2376,6 @@ beginseg name "ovl_En_Dodojr" include "build/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.o" include "build/data/overlays/actors/z_en_dodojr.data.o" - include "build/data/overlays/actors/z_en_dodojr.rodata.o" include "build/data/overlays/actors/z_en_dodojr.reloc.o" endseg @@ -2540,7 +2383,6 @@ beginseg name "ovl_En_Dodongo" include "build/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.o" include "build/data/overlays/actors/z_en_dodongo.data.o" - include "build/data/overlays/actors/z_en_dodongo.rodata.o" include "build/data/overlays/actors/z_en_dodongo.reloc.o" endseg @@ -2554,7 +2396,6 @@ beginseg name "ovl_En_Door" include "build/src/overlays/actors/ovl_En_Door/z_en_door.o" include "build/data/overlays/actors/z_en_door.data.o" - include "build/data/overlays/actors/z_en_door.rodata.o" include "build/data/overlays/actors/z_en_door.reloc.o" endseg @@ -2568,7 +2409,6 @@ beginseg name "ovl_En_Du" include "build/src/overlays/actors/ovl_En_Du/z_en_du.o" include "build/data/overlays/actors/z_en_du.data.o" - include "build/data/overlays/actors/z_en_du.rodata.o" include "build/data/overlays/actors/z_en_du.reloc.o" endseg @@ -2576,7 +2416,6 @@ beginseg name "ovl_En_Dy_Extra" include "build/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.o" include "build/data/overlays/actors/z_en_dy_extra.data.o" - include "build/data/overlays/actors/z_en_dy_extra.rodata.o" include "build/data/overlays/actors/z_en_dy_extra.reloc.o" endseg @@ -2590,7 +2429,6 @@ beginseg name "ovl_En_Eiyer" include "build/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.o" include "build/data/overlays/actors/z_en_eiyer.data.o" - include "build/data/overlays/actors/z_en_eiyer.rodata.o" include "build/data/overlays/actors/z_en_eiyer.reloc.o" endseg @@ -2606,7 +2444,6 @@ beginseg name "ovl_En_Encount1" include "build/src/overlays/actors/ovl_En_Encount1/z_en_encount1.o" include "build/data/overlays/actors/z_en_encount1.data.o" - include "build/data/overlays/actors/z_en_encount1.rodata.o" include "build/data/overlays/actors/z_en_encount1.reloc.o" endseg @@ -2614,7 +2451,6 @@ beginseg name "ovl_En_Encount2" include "build/src/overlays/actors/ovl_En_Encount2/z_en_encount2.o" include "build/data/overlays/actors/z_en_encount2.data.o" - include "build/data/overlays/actors/z_en_encount2.rodata.o" include "build/data/overlays/actors/z_en_encount2.reloc.o" endseg @@ -2622,7 +2458,6 @@ beginseg name "ovl_En_Ex_Item" include "build/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.o" include "build/data/overlays/actors/z_en_ex_item.data.o" - include "build/data/overlays/actors/z_en_ex_item.rodata.o" include "build/data/overlays/actors/z_en_ex_item.reloc.o" endseg @@ -2630,7 +2465,6 @@ beginseg name "ovl_En_Ex_Ruppy" include "build/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.o" include "build/data/overlays/actors/z_en_ex_ruppy.data.o" - include "build/data/overlays/actors/z_en_ex_ruppy.rodata.o" include "build/data/overlays/actors/z_en_ex_ruppy.reloc.o" endseg @@ -2638,7 +2472,6 @@ beginseg name "ovl_En_Fd" include "build/src/overlays/actors/ovl_En_Fd/z_en_fd.o" include "build/data/overlays/actors/z_en_fd.data.o" - include "build/data/overlays/actors/z_en_fd.rodata.o" include "build/data/overlays/actors/z_en_fd.reloc.o" endseg @@ -2646,7 +2479,6 @@ beginseg name "ovl_En_Fd_Fire" include "build/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.o" include "build/data/overlays/actors/z_en_fd_fire.data.o" - include "build/data/overlays/actors/z_en_fd_fire.rodata.o" include "build/data/overlays/actors/z_en_fd_fire.reloc.o" endseg @@ -2654,7 +2486,6 @@ beginseg name "ovl_En_Fhg_Fire" include "build/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.o" include "build/data/overlays/actors/z_en_fhg_fire.data.o" - include "build/data/overlays/actors/z_en_fhg_fire.rodata.o" include "build/data/overlays/actors/z_en_fhg_fire.reloc.o" endseg @@ -2662,7 +2493,6 @@ beginseg name "ovl_En_Fire_Rock" include "build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o" include "build/data/overlays/actors/z_en_fire_rock.data.o" - include "build/data/overlays/actors/z_en_fire_rock.rodata.o" include "build/data/overlays/actors/z_en_fire_rock.reloc.o" endseg @@ -2670,7 +2500,6 @@ beginseg name "ovl_En_Firefly" include "build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o" include "build/data/overlays/actors/z_en_firefly.data.o" - include "build/data/overlays/actors/z_en_firefly.rodata.o" include "build/data/overlays/actors/z_en_firefly.reloc.o" endseg @@ -2678,7 +2507,6 @@ beginseg name "ovl_En_Fish" include "build/src/overlays/actors/ovl_En_Fish/z_en_fish.o" include "build/data/overlays/actors/z_en_fish.data.o" - include "build/data/overlays/actors/z_en_fish.rodata.o" include "build/data/overlays/actors/z_en_fish.reloc.o" endseg @@ -2686,7 +2514,6 @@ beginseg name "ovl_En_Floormas" include "build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o" include "build/data/overlays/actors/z_en_floormas.data.o" - include "build/data/overlays/actors/z_en_floormas.rodata.o" include "build/data/overlays/actors/z_en_floormas.reloc.o" endseg @@ -2694,7 +2521,6 @@ beginseg name "ovl_En_Fr" include "build/src/overlays/actors/ovl_En_Fr/z_en_fr.o" include "build/data/overlays/actors/z_en_fr.data.o" - include "build/data/overlays/actors/z_en_fr.rodata.o" include "build/data/overlays/actors/z_en_fr.reloc.o" endseg @@ -2702,7 +2528,6 @@ beginseg name "ovl_En_Fu" include "build/src/overlays/actors/ovl_En_Fu/z_en_fu.o" include "build/data/overlays/actors/z_en_fu.data.o" - include "build/data/overlays/actors/z_en_fu.rodata.o" include "build/data/overlays/actors/z_en_fu.bss.o" include "build/data/overlays/actors/z_en_fu.reloc.o" endseg @@ -2711,7 +2536,6 @@ beginseg name "ovl_En_Fw" include "build/src/overlays/actors/ovl_En_Fw/z_en_fw.o" include "build/data/overlays/actors/z_en_fw.data.o" - include "build/data/overlays/actors/z_en_fw.rodata.o" include "build/data/overlays/actors/z_en_fw.reloc.o" endseg @@ -2719,7 +2543,6 @@ beginseg name "ovl_En_Fz" include "build/src/overlays/actors/ovl_En_Fz/z_en_fz.o" include "build/data/overlays/actors/z_en_fz.data.o" - include "build/data/overlays/actors/z_en_fz.rodata.o" include "build/data/overlays/actors/z_en_fz.reloc.o" endseg @@ -2727,7 +2550,6 @@ beginseg name "ovl_En_G_Switch" include "build/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.o" include "build/data/overlays/actors/z_en_g_switch.data.o" - include "build/data/overlays/actors/z_en_g_switch.rodata.o" include "build/data/overlays/actors/z_en_g_switch.reloc.o" endseg @@ -2735,7 +2557,6 @@ beginseg name "ovl_En_Ganon_Mant" include "build/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.o" include "build/data/overlays/actors/z_en_ganon_mant.data.o" - include "build/data/overlays/actors/z_en_ganon_mant.rodata.o" include "build/data/overlays/actors/z_en_ganon_mant.reloc.o" endseg @@ -2758,7 +2579,6 @@ beginseg name "ovl_En_Ge1" include "build/src/overlays/actors/ovl_En_Ge1/z_en_ge1.o" include "build/data/overlays/actors/z_en_ge1.data.o" - include "build/data/overlays/actors/z_en_ge1.rodata.o" include "build/data/overlays/actors/z_en_ge1.reloc.o" endseg @@ -2766,7 +2586,6 @@ beginseg name "ovl_En_Ge2" include "build/src/overlays/actors/ovl_En_Ge2/z_en_ge2.o" include "build/data/overlays/actors/z_en_ge2.data.o" - include "build/data/overlays/actors/z_en_ge2.rodata.o" include "build/data/overlays/actors/z_en_ge2.reloc.o" endseg @@ -2774,7 +2593,6 @@ beginseg name "ovl_En_Ge3" include "build/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o" include "build/data/overlays/actors/z_en_ge3.data.o" - include "build/data/overlays/actors/z_en_ge3.rodata.o" include "build/data/overlays/actors/z_en_ge3.reloc.o" endseg @@ -2782,7 +2600,6 @@ beginseg name "ovl_En_GeldB" include "build/src/overlays/actors/ovl_En_GeldB/z_en_geldb.o" include "build/data/overlays/actors/z_en_geldb.data.o" - include "build/data/overlays/actors/z_en_geldb.rodata.o" include "build/data/overlays/actors/z_en_geldb.reloc.o" endseg @@ -2790,7 +2607,6 @@ beginseg name "ovl_En_GirlA" include "build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o" include "build/data/overlays/actors/z_en_girla.data.o" - include "build/data/overlays/actors/z_en_girla.rodata.o" include "build/data/overlays/actors/z_en_girla.reloc.o" endseg @@ -2798,7 +2614,6 @@ beginseg name "ovl_En_Gm" include "build/src/overlays/actors/ovl_En_Gm/z_en_gm.o" include "build/data/overlays/actors/z_en_gm.data.o" - include "build/data/overlays/actors/z_en_gm.rodata.o" include "build/data/overlays/actors/z_en_gm.reloc.o" endseg @@ -2822,7 +2637,6 @@ beginseg name "ovl_En_Goma" include "build/src/overlays/actors/ovl_En_Goma/z_en_goma.o" include "build/data/overlays/actors/z_en_goma.data.o" - include "build/data/overlays/actors/z_en_goma.rodata.o" include "build/data/overlays/actors/z_en_goma.reloc.o" endseg @@ -2830,7 +2644,6 @@ beginseg name "ovl_En_Goroiwa" include "build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o" include "build/data/overlays/actors/z_en_goroiwa.data.o" - include "build/data/overlays/actors/z_en_goroiwa.rodata.o" include "build/data/overlays/actors/z_en_goroiwa.reloc.o" endseg @@ -2838,7 +2651,6 @@ beginseg name "ovl_En_Gs" include "build/src/overlays/actors/ovl_En_Gs/z_en_gs.o" include "build/data/overlays/actors/z_en_gs.data.o" - include "build/data/overlays/actors/z_en_gs.rodata.o" include "build/data/overlays/actors/z_en_gs.reloc.o" endseg @@ -2846,7 +2658,6 @@ beginseg name "ovl_En_Guest" include "build/src/overlays/actors/ovl_En_Guest/z_en_guest.o" include "build/data/overlays/actors/z_en_guest.data.o" - include "build/data/overlays/actors/z_en_guest.rodata.o" include "build/data/overlays/actors/z_en_guest.reloc.o" endseg @@ -2854,7 +2665,6 @@ beginseg name "ovl_En_Hata" include "build/src/overlays/actors/ovl_En_Hata/z_en_hata.o" include "build/data/overlays/actors/z_en_hata.data.o" - include "build/data/overlays/actors/z_en_hata.rodata.o" include "build/data/overlays/actors/z_en_hata.reloc.o" endseg @@ -2862,7 +2672,6 @@ beginseg name "ovl_En_Heishi1" include "build/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.o" include "build/data/overlays/actors/z_en_heishi1.data.o" - include "build/data/overlays/actors/z_en_heishi1.rodata.o" include "build/data/overlays/actors/z_en_heishi1.reloc.o" endseg @@ -2870,7 +2679,6 @@ beginseg name "ovl_En_Heishi2" include "build/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.o" include "build/data/overlays/actors/z_en_heishi2.data.o" - include "build/data/overlays/actors/z_en_heishi2.rodata.o" include "build/data/overlays/actors/z_en_heishi2.reloc.o" endseg @@ -2878,7 +2686,6 @@ beginseg name "ovl_En_Heishi3" include "build/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.o" include "build/data/overlays/actors/z_en_heishi3.data.o" - include "build/data/overlays/actors/z_en_heishi3.rodata.o" include "build/data/overlays/actors/z_en_heishi3.reloc.o" endseg @@ -2886,7 +2693,6 @@ beginseg name "ovl_En_Heishi4" include "build/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.o" include "build/data/overlays/actors/z_en_heishi4.data.o" - include "build/data/overlays/actors/z_en_heishi4.rodata.o" include "build/data/overlays/actors/z_en_heishi4.reloc.o" endseg @@ -2894,7 +2700,6 @@ beginseg name "ovl_En_Hintnuts" include "build/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.o" include "build/data/overlays/actors/z_en_hintnuts.data.o" - include "build/data/overlays/actors/z_en_hintnuts.rodata.o" include "build/data/overlays/actors/z_en_hintnuts.reloc.o" endseg @@ -2902,7 +2707,6 @@ beginseg name "ovl_En_Holl" include "build/src/overlays/actors/ovl_En_Holl/z_en_holl.o" include "build/data/overlays/actors/z_en_holl.data.o" - include "build/data/overlays/actors/z_en_holl.rodata.o" include "build/data/overlays/actors/z_en_holl.reloc.o" endseg @@ -2910,7 +2714,6 @@ beginseg name "ovl_En_Honotrap" include "build/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o" include "build/data/overlays/actors/z_en_honotrap.data.o" - include "build/data/overlays/actors/z_en_honotrap.rodata.o" include "build/data/overlays/actors/z_en_honotrap.reloc.o" endseg @@ -2918,7 +2721,6 @@ beginseg name "ovl_En_Horse" include "build/src/overlays/actors/ovl_En_Horse/z_en_horse.o" include "build/data/overlays/actors/z_en_horse.data.o" - include "build/data/overlays/actors/z_en_horse.rodata.o" include "build/data/overlays/actors/z_en_horse.reloc.o" endseg @@ -2926,7 +2728,6 @@ beginseg name "ovl_En_Horse_Game_Check" include "build/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.o" include "build/data/overlays/actors/z_en_horse_game_check.data.o" - include "build/data/overlays/actors/z_en_horse_game_check.rodata.o" include "build/data/overlays/actors/z_en_horse_game_check.reloc.o" endseg @@ -2934,7 +2735,6 @@ beginseg name "ovl_En_Horse_Ganon" include "build/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.o" include "build/data/overlays/actors/z_en_horse_ganon.data.o" - include "build/data/overlays/actors/z_en_horse_ganon.rodata.o" include "build/data/overlays/actors/z_en_horse_ganon.reloc.o" endseg @@ -2942,7 +2742,6 @@ beginseg name "ovl_En_Horse_Link_Child" include "build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o" include "build/data/overlays/actors/z_en_horse_link_child.data.o" - include "build/data/overlays/actors/z_en_horse_link_child.rodata.o" include "build/data/overlays/actors/z_en_horse_link_child.reloc.o" endseg @@ -2950,7 +2749,6 @@ beginseg name "ovl_En_Horse_Normal" include "build/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.o" include "build/data/overlays/actors/z_en_horse_normal.data.o" - include "build/data/overlays/actors/z_en_horse_normal.rodata.o" include "build/data/overlays/actors/z_en_horse_normal.reloc.o" endseg @@ -2958,7 +2756,6 @@ beginseg name "ovl_En_Horse_Zelda" include "build/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.o" include "build/data/overlays/actors/z_en_horse_zelda.data.o" - include "build/data/overlays/actors/z_en_horse_zelda.rodata.o" include "build/data/overlays/actors/z_en_horse_zelda.reloc.o" endseg @@ -2966,7 +2763,6 @@ beginseg name "ovl_En_Hs" include "build/src/overlays/actors/ovl_En_Hs/z_en_hs.o" include "build/data/overlays/actors/z_en_hs.data.o" - include "build/data/overlays/actors/z_en_hs.rodata.o" include "build/data/overlays/actors/z_en_hs.reloc.o" endseg @@ -2974,7 +2770,6 @@ beginseg name "ovl_En_Hs2" include "build/src/overlays/actors/ovl_En_Hs2/z_en_hs2.o" include "build/data/overlays/actors/z_en_hs2.data.o" - include "build/data/overlays/actors/z_en_hs2.rodata.o" include "build/data/overlays/actors/z_en_hs2.reloc.o" endseg @@ -2982,7 +2777,6 @@ beginseg name "ovl_En_Hy" include "build/src/overlays/actors/ovl_En_Hy/z_en_hy.o" include "build/data/overlays/actors/z_en_hy.data.o" - include "build/data/overlays/actors/z_en_hy.rodata.o" include "build/data/overlays/actors/z_en_hy.reloc.o" endseg @@ -2990,7 +2784,6 @@ beginseg name "ovl_En_Ice_Hono" include "build/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.o" include "build/data/overlays/actors/z_en_ice_hono.data.o" - include "build/data/overlays/actors/z_en_ice_hono.rodata.o" include "build/data/overlays/actors/z_en_ice_hono.reloc.o" endseg @@ -2998,7 +2791,6 @@ beginseg name "ovl_En_Ik" include "build/src/overlays/actors/ovl_En_Ik/z_en_ik.o" include "build/data/overlays/actors/z_en_ik.data.o" - include "build/data/overlays/actors/z_en_ik.rodata.o" include "build/data/overlays/actors/z_en_ik.bss.o" include "build/data/overlays/actors/z_en_ik.reloc.o" endseg @@ -3007,7 +2799,6 @@ beginseg name "ovl_En_In" include "build/src/overlays/actors/ovl_En_In/z_en_in.o" include "build/data/overlays/actors/z_en_in.data.o" - include "build/data/overlays/actors/z_en_in.rodata.o" include "build/data/overlays/actors/z_en_in.reloc.o" endseg @@ -3015,7 +2806,6 @@ beginseg name "ovl_En_Insect" include "build/src/overlays/actors/ovl_En_Insect/z_en_insect.o" include "build/data/overlays/actors/z_en_insect.data.o" - include "build/data/overlays/actors/z_en_insect.rodata.o" include "build/data/overlays/actors/z_en_insect.reloc.o" endseg @@ -3023,7 +2813,6 @@ beginseg name "ovl_En_Ishi" include "build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o" include "build/data/overlays/actors/z_en_ishi.data.o" - include "build/data/overlays/actors/z_en_ishi.rodata.o" include "build/data/overlays/actors/z_en_ishi.reloc.o" endseg @@ -3037,7 +2826,6 @@ beginseg name "ovl_En_Jj" include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o" include "build/data/overlays/actors/z_en_jj.data.o" - include "build/data/overlays/actors/z_en_jj.rodata.o" include "build/data/overlays/actors/z_en_jj.reloc.o" endseg @@ -3052,7 +2840,6 @@ beginseg name "ovl_En_Jsjutan" include "build/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.o" include "build/data/overlays/actors/z_en_jsjutan.data.o" - include "build/data/overlays/actors/z_en_jsjutan.rodata.o" include "build/data/overlays/actors/z_en_jsjutan.bss.o" include "build/data/overlays/actors/z_en_jsjutan.reloc.o" endseg @@ -3061,7 +2848,6 @@ beginseg name "ovl_En_Kakasi" include "build/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o" include "build/data/overlays/actors/z_en_kakasi.data.o" - include "build/data/overlays/actors/z_en_kakasi.rodata.o" include "build/data/overlays/actors/z_en_kakasi.reloc.o" endseg @@ -3069,7 +2855,6 @@ beginseg name "ovl_En_Kakasi2" include "build/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.o" include "build/data/overlays/actors/z_en_kakasi2.data.o" - include "build/data/overlays/actors/z_en_kakasi2.rodata.o" include "build/data/overlays/actors/z_en_kakasi2.reloc.o" endseg @@ -3077,7 +2862,6 @@ beginseg name "ovl_En_Kakasi3" include "build/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.o" include "build/data/overlays/actors/z_en_kakasi3.data.o" - include "build/data/overlays/actors/z_en_kakasi3.rodata.o" include "build/data/overlays/actors/z_en_kakasi3.reloc.o" endseg @@ -3085,7 +2869,6 @@ beginseg name "ovl_En_Kanban" include "build/src/overlays/actors/ovl_En_Kanban/z_en_kanban.o" include "build/data/overlays/actors/z_en_kanban.data.o" - include "build/data/overlays/actors/z_en_kanban.rodata.o" include "build/data/overlays/actors/z_en_kanban.reloc.o" endseg @@ -3093,7 +2876,6 @@ beginseg name "ovl_En_Karebaba" include "build/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o" include "build/data/overlays/actors/z_en_karebaba.data.o" - include "build/data/overlays/actors/z_en_karebaba.rodata.o" include "build/data/overlays/actors/z_en_karebaba.reloc.o" endseg @@ -3109,7 +2891,6 @@ beginseg name "ovl_En_Kusa" include "build/src/overlays/actors/ovl_En_Kusa/z_en_kusa.o" include "build/data/overlays/actors/z_en_kusa.data.o" - include "build/data/overlays/actors/z_en_kusa.rodata.o" include "build/data/overlays/actors/z_en_kusa.reloc.o" endseg @@ -3117,7 +2898,6 @@ beginseg name "ovl_En_Kz" include "build/src/overlays/actors/ovl_En_Kz/z_en_kz.o" include "build/data/overlays/actors/z_en_kz.data.o" - include "build/data/overlays/actors/z_en_kz.rodata.o" include "build/data/overlays/actors/z_en_kz.reloc.o" endseg @@ -3125,7 +2905,6 @@ beginseg name "ovl_En_Light" include "build/src/overlays/actors/ovl_En_Light/z_en_light.o" include "build/data/overlays/actors/z_en_light.data.o" - include "build/data/overlays/actors/z_en_light.rodata.o" include "build/data/overlays/actors/z_en_light.reloc.o" endseg @@ -3145,7 +2924,6 @@ beginseg name "ovl_En_M_Thunder" include "build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o" include "build/data/overlays/actors/z_en_m_thunder.data.o" - include "build/data/overlays/actors/z_en_m_thunder.rodata.o" include "build/data/overlays/actors/z_en_m_thunder.reloc.o" endseg @@ -3153,7 +2931,6 @@ beginseg name "ovl_En_Ma1" include "build/src/overlays/actors/ovl_En_Ma1/z_en_ma1.o" include "build/data/overlays/actors/z_en_ma1.data.o" - include "build/data/overlays/actors/z_en_ma1.rodata.o" include "build/data/overlays/actors/z_en_ma1.reloc.o" endseg @@ -3161,7 +2938,6 @@ beginseg name "ovl_En_Ma2" include "build/src/overlays/actors/ovl_En_Ma2/z_en_ma2.o" include "build/data/overlays/actors/z_en_ma2.data.o" - include "build/data/overlays/actors/z_en_ma2.rodata.o" include "build/data/overlays/actors/z_en_ma2.reloc.o" endseg @@ -3169,7 +2945,6 @@ beginseg name "ovl_En_Ma3" include "build/src/overlays/actors/ovl_En_Ma3/z_en_ma3.o" include "build/data/overlays/actors/z_en_ma3.data.o" - include "build/data/overlays/actors/z_en_ma3.rodata.o" include "build/data/overlays/actors/z_en_ma3.reloc.o" endseg @@ -3177,7 +2952,6 @@ beginseg name "ovl_En_Mag" include "build/src/overlays/actors/ovl_En_Mag/z_en_mag.o" include "build/data/overlays/actors/z_en_mag.data.o" - include "build/data/overlays/actors/z_en_mag.rodata.o" include "build/data/overlays/actors/z_en_mag.reloc.o" endseg @@ -3185,7 +2959,6 @@ beginseg name "ovl_En_Mb" include "build/src/overlays/actors/ovl_En_Mb/z_en_mb.o" include "build/data/overlays/actors/z_en_mb.data.o" - include "build/data/overlays/actors/z_en_mb.rodata.o" include "build/data/overlays/actors/z_en_mb.reloc.o" endseg @@ -3193,7 +2966,6 @@ beginseg name "ovl_En_Md" include "build/src/overlays/actors/ovl_En_Md/z_en_md.o" include "build/data/overlays/actors/z_en_md.data.o" - include "build/data/overlays/actors/z_en_md.rodata.o" include "build/data/overlays/actors/z_en_md.reloc.o" endseg @@ -3201,7 +2973,6 @@ beginseg name "ovl_En_Mk" include "build/src/overlays/actors/ovl_En_Mk/z_en_mk.o" include "build/data/overlays/actors/z_en_mk.data.o" - include "build/data/overlays/actors/z_en_mk.rodata.o" include "build/data/overlays/actors/z_en_mk.reloc.o" endseg @@ -3209,7 +2980,6 @@ beginseg name "ovl_En_Mm" include "build/src/overlays/actors/ovl_En_Mm/z_en_mm.o" include "build/data/overlays/actors/z_en_mm.data.o" - include "build/data/overlays/actors/z_en_mm.rodata.o" include "build/data/overlays/actors/z_en_mm.reloc.o" endseg @@ -3217,7 +2987,6 @@ beginseg name "ovl_En_Mm2" include "build/src/overlays/actors/ovl_En_Mm2/z_en_mm2.o" include "build/data/overlays/actors/z_en_mm2.data.o" - include "build/data/overlays/actors/z_en_mm2.rodata.o" include "build/data/overlays/actors/z_en_mm2.reloc.o" endseg @@ -3231,7 +3000,6 @@ beginseg name "ovl_En_Mu" include "build/src/overlays/actors/ovl_En_Mu/z_en_mu.o" include "build/data/overlays/actors/z_en_mu.data.o" - include "build/data/overlays/actors/z_en_mu.rodata.o" include "build/data/overlays/actors/z_en_mu.reloc.o" endseg @@ -3239,7 +3007,6 @@ beginseg name "ovl_En_Nb" include "build/src/overlays/actors/ovl_En_Nb/z_en_nb.o" include "build/data/overlays/actors/z_en_nb.data.o" - include "build/data/overlays/actors/z_en_nb.rodata.o" include "build/data/overlays/actors/z_en_nb.reloc.o" endseg @@ -3255,7 +3022,6 @@ beginseg name "ovl_En_Niw_Girl" include "build/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.o" include "build/data/overlays/actors/z_en_niw_girl.data.o" - include "build/data/overlays/actors/z_en_niw_girl.rodata.o" include "build/data/overlays/actors/z_en_niw_girl.reloc.o" endseg @@ -3263,7 +3029,6 @@ beginseg name "ovl_En_Niw_Lady" include "build/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.o" include "build/data/overlays/actors/z_en_niw_lady.data.o" - include "build/data/overlays/actors/z_en_niw_lady.rodata.o" include "build/data/overlays/actors/z_en_niw_lady.reloc.o" endseg @@ -3277,7 +3042,6 @@ beginseg name "ovl_En_Nwc" include "build/src/overlays/actors/ovl_En_Nwc/z_en_nwc.o" include "build/data/overlays/actors/z_en_nwc.data.o" - include "build/data/overlays/actors/z_en_nwc.rodata.o" include "build/data/overlays/actors/z_en_nwc.reloc.o" endseg @@ -3285,7 +3049,6 @@ beginseg name "ovl_En_Ny" include "build/src/overlays/actors/ovl_En_Ny/z_en_ny.o" include "build/data/overlays/actors/z_en_ny.data.o" - include "build/data/overlays/actors/z_en_ny.rodata.o" include "build/data/overlays/actors/z_en_ny.reloc.o" endseg @@ -3305,7 +3068,6 @@ beginseg name "ovl_En_Okarina_Tag" include "build/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o" include "build/data/overlays/actors/z_en_okarina_tag.data.o" - include "build/data/overlays/actors/z_en_okarina_tag.rodata.o" include "build/data/overlays/actors/z_en_okarina_tag.reloc.o" endseg @@ -3313,7 +3075,6 @@ beginseg name "ovl_En_Okuta" include "build/src/overlays/actors/ovl_En_Okuta/z_en_okuta.o" include "build/data/overlays/actors/z_en_okuta.data.o" - include "build/data/overlays/actors/z_en_okuta.rodata.o" include "build/data/overlays/actors/z_en_okuta.reloc.o" endseg @@ -3321,7 +3082,6 @@ beginseg name "ovl_En_Ossan" include "build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o" include "build/data/overlays/actors/z_en_ossan.data.o" - include "build/data/overlays/actors/z_en_ossan.rodata.o" include "build/data/overlays/actors/z_en_ossan.reloc.o" endseg @@ -3329,7 +3089,6 @@ beginseg name "ovl_En_Owl" include "build/src/overlays/actors/ovl_En_Owl/z_en_owl.o" include "build/data/overlays/actors/z_en_owl.data.o" - include "build/data/overlays/actors/z_en_owl.rodata.o" include "build/data/overlays/actors/z_en_owl.reloc.o" endseg @@ -3337,7 +3096,6 @@ beginseg name "ovl_En_Part" include "build/src/overlays/actors/ovl_En_Part/z_en_part.o" include "build/data/overlays/actors/z_en_part.data.o" - include "build/data/overlays/actors/z_en_part.rodata.o" include "build/data/overlays/actors/z_en_part.reloc.o" endseg @@ -3345,7 +3103,6 @@ beginseg name "ovl_En_Peehat" include "build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o" include "build/data/overlays/actors/z_en_peehat.data.o" - include "build/data/overlays/actors/z_en_peehat.rodata.o" include "build/data/overlays/actors/z_en_peehat.reloc.o" endseg @@ -3353,7 +3110,6 @@ beginseg name "ovl_En_Po_Desert" include "build/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.o" include "build/data/overlays/actors/z_en_po_desert.data.o" - include "build/data/overlays/actors/z_en_po_desert.rodata.o" include "build/data/overlays/actors/z_en_po_desert.reloc.o" endseg @@ -3361,7 +3117,6 @@ beginseg name "ovl_En_Po_Field" include "build/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.o" include "build/data/overlays/actors/z_en_po_field.data.o" - include "build/data/overlays/actors/z_en_po_field.rodata.o" include "build/data/overlays/actors/z_en_po_field.bss.o" include "build/data/overlays/actors/z_en_po_field.reloc.o" endseg @@ -3370,7 +3125,6 @@ beginseg name "ovl_En_Po_Relay" include "build/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.o" include "build/data/overlays/actors/z_en_po_relay.data.o" - include "build/data/overlays/actors/z_en_po_relay.rodata.o" include "build/data/overlays/actors/z_en_po_relay.reloc.o" endseg @@ -3378,7 +3132,6 @@ beginseg name "ovl_En_Po_Sisters" include "build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o" include "build/data/overlays/actors/z_en_po_sisters.data.o" - include "build/data/overlays/actors/z_en_po_sisters.rodata.o" include "build/data/overlays/actors/z_en_po_sisters.reloc.o" endseg @@ -3386,7 +3139,6 @@ beginseg name "ovl_En_Poh" include "build/src/overlays/actors/ovl_En_Poh/z_en_poh.o" include "build/data/overlays/actors/z_en_poh.data.o" - include "build/data/overlays/actors/z_en_poh.rodata.o" include "build/data/overlays/actors/z_en_poh.reloc.o" endseg @@ -3400,7 +3152,6 @@ beginseg name "ovl_En_Rd" include "build/src/overlays/actors/ovl_En_Rd/z_en_rd.o" include "build/data/overlays/actors/z_en_rd.data.o" - include "build/data/overlays/actors/z_en_rd.rodata.o" include "build/data/overlays/actors/z_en_rd.reloc.o" endseg @@ -3408,7 +3159,6 @@ beginseg name "ovl_En_Reeba" include "build/src/overlays/actors/ovl_En_Reeba/z_en_reeba.o" include "build/data/overlays/actors/z_en_reeba.data.o" - include "build/data/overlays/actors/z_en_reeba.rodata.o" include "build/data/overlays/actors/z_en_reeba.reloc.o" endseg @@ -3416,7 +3166,6 @@ beginseg name "ovl_En_River_Sound" include "build/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o" include "build/data/overlays/actors/z_en_river_sound.data.o" - include "build/data/overlays/actors/z_en_river_sound.rodata.o" include "build/data/overlays/actors/z_en_river_sound.reloc.o" endseg @@ -3424,7 +3173,6 @@ beginseg name "ovl_En_Rl" include "build/src/overlays/actors/ovl_En_Rl/z_en_rl.o" include "build/data/overlays/actors/z_en_rl.data.o" - include "build/data/overlays/actors/z_en_rl.rodata.o" include "build/data/overlays/actors/z_en_rl.reloc.o" endseg @@ -3432,7 +3180,6 @@ beginseg name "ovl_En_Rr" include "build/src/overlays/actors/ovl_En_Rr/z_en_rr.o" include "build/data/overlays/actors/z_en_rr.data.o" - include "build/data/overlays/actors/z_en_rr.rodata.o" include "build/data/overlays/actors/z_en_rr.reloc.o" endseg @@ -3440,7 +3187,6 @@ beginseg name "ovl_En_Ru1" include "build/src/overlays/actors/ovl_En_Ru1/z_en_ru1.o" include "build/data/overlays/actors/z_en_ru1.data.o" - include "build/data/overlays/actors/z_en_ru1.rodata.o" include "build/data/overlays/actors/z_en_ru1.reloc.o" endseg @@ -3454,7 +3200,6 @@ beginseg name "ovl_En_Sa" include "build/src/overlays/actors/ovl_En_Sa/z_en_sa.o" include "build/data/overlays/actors/z_en_sa.data.o" - include "build/data/overlays/actors/z_en_sa.rodata.o" include "build/data/overlays/actors/z_en_sa.reloc.o" endseg @@ -3462,7 +3207,6 @@ beginseg name "ovl_En_Sb" include "build/src/overlays/actors/ovl_En_Sb/z_en_sb.o" include "build/data/overlays/actors/z_en_sb.data.o" - include "build/data/overlays/actors/z_en_sb.rodata.o" include "build/data/overlays/actors/z_en_sb.reloc.o" endseg @@ -3476,7 +3220,6 @@ beginseg name "ovl_En_Sda" include "build/src/overlays/actors/ovl_En_Sda/z_en_sda.o" include "build/data/overlays/actors/z_en_sda.data.o" - include "build/data/overlays/actors/z_en_sda.rodata.o" include "build/data/overlays/actors/z_en_sda.bss.o" include "build/data/overlays/actors/z_en_sda.reloc.o" endseg @@ -3485,7 +3228,6 @@ beginseg name "ovl_En_Shopnuts" include "build/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.o" include "build/data/overlays/actors/z_en_shopnuts.data.o" - include "build/data/overlays/actors/z_en_shopnuts.rodata.o" include "build/data/overlays/actors/z_en_shopnuts.reloc.o" endseg @@ -3500,7 +3242,6 @@ beginseg name "ovl_En_Siofuki" include "build/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.o" include "build/data/overlays/actors/z_en_siofuki.data.o" - include "build/data/overlays/actors/z_en_siofuki.rodata.o" include "build/data/overlays/actors/z_en_siofuki.reloc.o" endseg @@ -3508,7 +3249,6 @@ beginseg name "ovl_En_Skb" include "build/src/overlays/actors/ovl_En_Skb/z_en_skb.o" include "build/data/overlays/actors/z_en_skb.data.o" - include "build/data/overlays/actors/z_en_skb.rodata.o" include "build/data/overlays/actors/z_en_skb.reloc.o" endseg @@ -3525,7 +3265,6 @@ beginseg name "ovl_En_Skjneedle" include "build/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.o" include "build/data/overlays/actors/z_en_skjneedle.data.o" - include "build/data/overlays/actors/z_en_skjneedle.rodata.o" include "build/data/overlays/actors/z_en_skjneedle.reloc.o" endseg @@ -3533,7 +3272,6 @@ beginseg name "ovl_En_Ssh" include "build/src/overlays/actors/ovl_En_Ssh/z_en_ssh.o" include "build/data/overlays/actors/z_en_ssh.data.o" - include "build/data/overlays/actors/z_en_ssh.rodata.o" include "build/data/overlays/actors/z_en_ssh.reloc.o" endseg @@ -3541,7 +3279,6 @@ beginseg name "ovl_En_St" include "build/src/overlays/actors/ovl_En_St/z_en_st.o" include "build/data/overlays/actors/z_en_st.data.o" - include "build/data/overlays/actors/z_en_st.rodata.o" include "build/data/overlays/actors/z_en_st.reloc.o" endseg @@ -3549,7 +3286,6 @@ beginseg name "ovl_En_Sth" include "build/src/overlays/actors/ovl_En_Sth/z_en_sth.o" include "build/data/overlays/actors/z_en_sth.data.o" - include "build/data/overlays/actors/z_en_sth.rodata.o" include "build/data/overlays/actors/z_en_sth.reloc.o" endseg @@ -3557,7 +3293,6 @@ beginseg name "ovl_En_Stream" include "build/src/overlays/actors/ovl_En_Stream/z_en_stream.o" include "build/data/overlays/actors/z_en_stream.data.o" - include "build/data/overlays/actors/z_en_stream.rodata.o" include "build/data/overlays/actors/z_en_stream.reloc.o" endseg @@ -3566,7 +3301,6 @@ beginseg increment 0x80 include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o" include "build/data/overlays/actors/z_en_sw.data.o" - include "build/data/overlays/actors/z_en_sw.rodata.o" include "build/data/overlays/actors/z_en_sw.reloc.o" endseg @@ -3574,7 +3308,6 @@ beginseg name "ovl_En_Syateki_Itm" include "build/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.o" include "build/data/overlays/actors/z_en_syateki_itm.data.o" - include "build/data/overlays/actors/z_en_syateki_itm.rodata.o" include "build/data/overlays/actors/z_en_syateki_itm.reloc.o" endseg @@ -3582,7 +3315,6 @@ beginseg name "ovl_En_Syateki_Man" include "build/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.o" include "build/data/overlays/actors/z_en_syateki_man.data.o" - include "build/data/overlays/actors/z_en_syateki_man.rodata.o" include "build/data/overlays/actors/z_en_syateki_man.reloc.o" endseg @@ -3590,7 +3322,6 @@ beginseg name "ovl_En_Syateki_Niw" include "build/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.o" include "build/data/overlays/actors/z_en_syateki_niw.data.o" - include "build/data/overlays/actors/z_en_syateki_niw.rodata.o" include "build/data/overlays/actors/z_en_syateki_niw.reloc.o" endseg @@ -3598,7 +3329,6 @@ beginseg name "ovl_En_Ta" include "build/src/overlays/actors/ovl_En_Ta/z_en_ta.o" include "build/data/overlays/actors/z_en_ta.data.o" - include "build/data/overlays/actors/z_en_ta.rodata.o" include "build/data/overlays/actors/z_en_ta.reloc.o" endseg @@ -3606,7 +3336,6 @@ beginseg name "ovl_En_Takara_Man" include "build/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.o" include "build/data/overlays/actors/z_en_takara_man.data.o" - include "build/data/overlays/actors/z_en_takara_man.rodata.o" include "build/data/overlays/actors/z_en_takara_man.reloc.o" endseg @@ -3620,7 +3349,6 @@ beginseg name "ovl_En_Tg" include "build/src/overlays/actors/ovl_En_Tg/z_en_tg.o" include "build/data/overlays/actors/z_en_tg.data.o" - include "build/data/overlays/actors/z_en_tg.rodata.o" include "build/data/overlays/actors/z_en_tg.reloc.o" endseg @@ -3628,7 +3356,6 @@ beginseg name "ovl_En_Tite" include "build/src/overlays/actors/ovl_En_Tite/z_en_tite.o" include "build/data/overlays/actors/z_en_tite.data.o" - include "build/data/overlays/actors/z_en_tite.rodata.o" include "build/data/overlays/actors/z_en_tite.reloc.o" endseg @@ -3648,7 +3375,6 @@ beginseg name "ovl_En_Torch2" include "build/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o" include "build/data/overlays/actors/z_en_torch2.data.o" - include "build/data/overlays/actors/z_en_torch2.rodata.o" include "build/data/overlays/actors/z_en_torch2.bss.o" include "build/data/overlays/actors/z_en_torch2.reloc.o" endseg @@ -3657,7 +3383,6 @@ beginseg name "ovl_En_Toryo" include "build/src/overlays/actors/ovl_En_Toryo/z_en_toryo.o" include "build/data/overlays/actors/z_en_toryo.data.o" - include "build/data/overlays/actors/z_en_toryo.rodata.o" include "build/data/overlays/actors/z_en_toryo.reloc.o" endseg @@ -3665,7 +3390,6 @@ beginseg name "ovl_En_Tp" include "build/src/overlays/actors/ovl_En_Tp/z_en_tp.o" include "build/data/overlays/actors/z_en_tp.data.o" - include "build/data/overlays/actors/z_en_tp.rodata.o" include "build/data/overlays/actors/z_en_tp.reloc.o" endseg @@ -3673,7 +3397,6 @@ beginseg name "ovl_En_Tr" include "build/src/overlays/actors/ovl_En_Tr/z_en_tr.o" include "build/data/overlays/actors/z_en_tr.data.o" - include "build/data/overlays/actors/z_en_tr.rodata.o" include "build/data/overlays/actors/z_en_tr.reloc.o" endseg @@ -3681,7 +3404,6 @@ beginseg name "ovl_En_Trap" include "build/src/overlays/actors/ovl_En_Trap/z_en_trap.o" include "build/data/overlays/actors/z_en_trap.data.o" - include "build/data/overlays/actors/z_en_trap.rodata.o" include "build/data/overlays/actors/z_en_trap.reloc.o" endseg @@ -3695,7 +3417,6 @@ beginseg name "ovl_En_Vali" include "build/src/overlays/actors/ovl_En_Vali/z_en_vali.o" include "build/data/overlays/actors/z_en_vali.data.o" - include "build/data/overlays/actors/z_en_vali.rodata.o" include "build/data/overlays/actors/z_en_vali.reloc.o" endseg @@ -3709,7 +3430,6 @@ beginseg name "ovl_En_Vb_Ball" include "build/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.o" include "build/data/overlays/actors/z_en_vb_ball.data.o" - include "build/data/overlays/actors/z_en_vb_ball.rodata.o" include "build/data/overlays/actors/z_en_vb_ball.reloc.o" endseg @@ -3717,7 +3437,6 @@ beginseg name "ovl_En_Viewer" include "build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o" include "build/data/overlays/actors/z_en_viewer.data.o" - include "build/data/overlays/actors/z_en_viewer.rodata.o" include "build/data/overlays/actors/z_en_viewer.bss.o" include "build/data/overlays/actors/z_en_viewer.reloc.o" endseg @@ -3726,7 +3445,6 @@ beginseg name "ovl_En_Vm" include "build/src/overlays/actors/ovl_En_Vm/z_en_vm.o" include "build/data/overlays/actors/z_en_vm.data.o" - include "build/data/overlays/actors/z_en_vm.rodata.o" include "build/data/overlays/actors/z_en_vm.reloc.o" endseg @@ -3734,7 +3452,6 @@ beginseg name "ovl_En_Wall_Tubo" include "build/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.o" include "build/data/overlays/actors/z_en_wall_tubo.data.o" - include "build/data/overlays/actors/z_en_wall_tubo.rodata.o" include "build/data/overlays/actors/z_en_wall_tubo.reloc.o" endseg @@ -3748,7 +3465,6 @@ beginseg name "ovl_En_Weather_Tag" include "build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o" include "build/data/overlays/actors/z_en_weather_tag.data.o" - include "build/data/overlays/actors/z_en_weather_tag.rodata.o" include "build/data/overlays/actors/z_en_weather_tag.reloc.o" endseg @@ -3756,7 +3472,6 @@ beginseg name "ovl_En_Weiyer" include "build/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.o" include "build/data/overlays/actors/z_en_weiyer.data.o" - include "build/data/overlays/actors/z_en_weiyer.rodata.o" include "build/data/overlays/actors/z_en_weiyer.reloc.o" endseg @@ -3764,7 +3479,6 @@ beginseg name "ovl_En_Wf" include "build/src/overlays/actors/ovl_En_Wf/z_en_wf.o" include "build/data/overlays/actors/z_en_wf.data.o" - include "build/data/overlays/actors/z_en_wf.rodata.o" include "build/data/overlays/actors/z_en_wf.reloc.o" endseg @@ -3772,7 +3486,6 @@ beginseg name "ovl_En_Wonder_Item" include "build/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.o" include "build/data/overlays/actors/z_en_wonder_item.data.o" - include "build/data/overlays/actors/z_en_wonder_item.rodata.o" include "build/data/overlays/actors/z_en_wonder_item.bss.o" include "build/data/overlays/actors/z_en_wonder_item.reloc.o" endseg @@ -3781,7 +3494,6 @@ beginseg name "ovl_En_Wonder_Talk" include "build/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.o" include "build/data/overlays/actors/z_en_wonder_talk.data.o" - include "build/data/overlays/actors/z_en_wonder_talk.rodata.o" include "build/data/overlays/actors/z_en_wonder_talk.reloc.o" endseg @@ -3789,7 +3501,6 @@ beginseg name "ovl_En_Wonder_Talk2" include "build/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.o" include "build/data/overlays/actors/z_en_wonder_talk2.data.o" - include "build/data/overlays/actors/z_en_wonder_talk2.rodata.o" include "build/data/overlays/actors/z_en_wonder_talk2.reloc.o" endseg @@ -3797,7 +3508,6 @@ beginseg name "ovl_En_Wood02" include "build/src/overlays/actors/ovl_En_Wood02/z_en_wood02.o" include "build/data/overlays/actors/z_en_wood02.data.o" - include "build/data/overlays/actors/z_en_wood02.rodata.o" include "build/data/overlays/actors/z_en_wood02.bss.o" include "build/data/overlays/actors/z_en_wood02.reloc.o" endseg @@ -3806,7 +3516,6 @@ beginseg name "ovl_En_Xc" include "build/src/overlays/actors/ovl_En_Xc/z_en_xc.o" include "build/data/overlays/actors/z_en_xc.data.o" - include "build/data/overlays/actors/z_en_xc.rodata.o" include "build/data/overlays/actors/z_en_xc.bss.o" include "build/data/overlays/actors/z_en_xc.reloc.o" endseg @@ -3815,7 +3524,6 @@ beginseg name "ovl_En_Yabusame_Mark" include "build/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.o" include "build/data/overlays/actors/z_en_yabusame_mark.data.o" - include "build/data/overlays/actors/z_en_yabusame_mark.rodata.o" include "build/data/overlays/actors/z_en_yabusame_mark.reloc.o" endseg @@ -3823,7 +3531,6 @@ beginseg name "ovl_En_Yukabyun" include "build/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.o" include "build/data/overlays/actors/z_en_yukabyun.data.o" - include "build/data/overlays/actors/z_en_yukabyun.rodata.o" include "build/data/overlays/actors/z_en_yukabyun.reloc.o" endseg @@ -3831,7 +3538,6 @@ beginseg name "ovl_En_Zf" include "build/src/overlays/actors/ovl_En_Zf/z_en_zf.o" include "build/data/overlays/actors/z_en_zf.data.o" - include "build/data/overlays/actors/z_en_zf.rodata.o" include "build/data/overlays/actors/z_en_zf.bss.o" include "build/data/overlays/actors/z_en_zf.reloc.o" endseg @@ -3840,7 +3546,6 @@ beginseg name "ovl_En_Zl1" include "build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o" include "build/data/overlays/actors/z_en_zl1.data.o" - include "build/data/overlays/actors/z_en_zl1.rodata.o" include "build/data/overlays/actors/z_en_zl1.reloc.o" endseg @@ -3848,7 +3553,6 @@ beginseg name "ovl_En_Zl2" include "build/src/overlays/actors/ovl_En_Zl2/z_en_zl2.o" include "build/data/overlays/actors/z_en_zl2.data.o" - include "build/data/overlays/actors/z_en_zl2.rodata.o" include "build/data/overlays/actors/z_en_zl2.reloc.o" endseg @@ -3856,7 +3560,6 @@ beginseg name "ovl_En_Zl3" include "build/src/overlays/actors/ovl_En_Zl3/z_en_zl3.o" include "build/data/overlays/actors/z_en_zl3.data.o" - include "build/data/overlays/actors/z_en_zl3.rodata.o" include "build/data/overlays/actors/z_en_zl3.reloc.o" endseg @@ -3864,7 +3567,6 @@ beginseg name "ovl_En_Zl4" include "build/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o" include "build/data/overlays/actors/z_en_zl4.data.o" - include "build/data/overlays/actors/z_en_zl4.rodata.o" include "build/data/overlays/actors/z_en_zl4.reloc.o" endseg @@ -3872,7 +3574,6 @@ beginseg name "ovl_En_Zo" include "build/src/overlays/actors/ovl_En_Zo/z_en_zo.o" include "build/data/overlays/actors/z_en_zo.data.o" - include "build/data/overlays/actors/z_en_zo.rodata.o" include "build/data/overlays/actors/z_en_zo.reloc.o" endseg @@ -3880,7 +3581,6 @@ beginseg name "ovl_En_fHG" include "build/src/overlays/actors/ovl_En_fHG/z_en_fhg.o" include "build/data/overlays/actors/z_en_fhg.data.o" - include "build/data/overlays/actors/z_en_fhg.rodata.o" include "build/data/overlays/actors/z_en_fhg.reloc.o" endseg @@ -3888,7 +3588,6 @@ beginseg name "ovl_End_Title" include "build/src/overlays/actors/ovl_End_Title/z_end_title.o" include "build/data/overlays/actors/z_end_title.data.o" - include "build/data/overlays/actors/z_end_title.rodata.o" include "build/data/overlays/actors/z_end_title.reloc.o" endseg @@ -3896,7 +3595,6 @@ beginseg name "ovl_Fishing" include "build/src/overlays/actors/ovl_Fishing/z_fishing.o" include "build/data/overlays/actors/z_fishing.data.o" - include "build/data/overlays/actors/z_fishing.rodata.o" include "build/data/overlays/actors/z_fishing.bss.o" include "build/data/overlays/actors/z_fishing.reloc.o" endseg @@ -3905,7 +3603,6 @@ beginseg name "ovl_Item_B_Heart" include "build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o" include "build/data/overlays/actors/z_item_b_heart.data.o" - include "build/data/overlays/actors/z_item_b_heart.rodata.o" include "build/data/overlays/actors/z_item_b_heart.reloc.o" endseg @@ -3913,7 +3610,6 @@ beginseg name "ovl_Item_Etcetera" include "build/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.o" include "build/data/overlays/actors/z_item_etcetera.data.o" - include "build/data/overlays/actors/z_item_etcetera.rodata.o" include "build/data/overlays/actors/z_item_etcetera.reloc.o" endseg @@ -3927,7 +3623,6 @@ beginseg name "ovl_Item_Ocarina" include "build/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.o" include "build/data/overlays/actors/z_item_ocarina.data.o" - include "build/data/overlays/actors/z_item_ocarina.rodata.o" include "build/data/overlays/actors/z_item_ocarina.reloc.o" endseg @@ -3935,7 +3630,6 @@ beginseg name "ovl_Item_Shield" include "build/src/overlays/actors/ovl_Item_Shield/z_item_shield.o" include "build/data/overlays/actors/z_item_shield.data.o" - include "build/data/overlays/actors/z_item_shield.rodata.o" include "build/data/overlays/actors/z_item_shield.reloc.o" endseg @@ -3943,7 +3637,6 @@ beginseg name "ovl_Magic_Dark" include "build/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.o" include "build/data/overlays/actors/z_magic_dark.data.o" - include "build/data/overlays/actors/z_magic_dark.rodata.o" include "build/data/overlays/actors/z_magic_dark.reloc.o" endseg @@ -3951,7 +3644,6 @@ beginseg name "ovl_Magic_Fire" include "build/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.o" include "build/data/overlays/actors/z_magic_fire.data.o" - include "build/data/overlays/actors/z_magic_fire.rodata.o" include "build/data/overlays/actors/z_magic_fire.reloc.o" endseg @@ -3959,7 +3651,6 @@ beginseg name "ovl_Magic_Wind" include "build/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.o" include "build/data/overlays/actors/z_magic_wind.data.o" - include "build/data/overlays/actors/z_magic_wind.rodata.o" include "build/data/overlays/actors/z_magic_wind.reloc.o" endseg @@ -3967,7 +3658,6 @@ beginseg name "ovl_Mir_Ray" include "build/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o" include "build/data/overlays/actors/z_mir_ray.data.o" - include "build/data/overlays/actors/z_mir_ray.rodata.o" include "build/data/overlays/actors/z_mir_ray.reloc.o" endseg @@ -3975,7 +3665,6 @@ beginseg name "ovl_Obj_Bean" include "build/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o" include "build/data/overlays/actors/z_obj_bean.data.o" - include "build/data/overlays/actors/z_obj_bean.rodata.o" include "build/data/overlays/actors/z_obj_bean.reloc.o" endseg @@ -4001,7 +3690,6 @@ beginseg name "ovl_Obj_Dekujr" include "build/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.o" include "build/data/overlays/actors/z_obj_dekujr.data.o" - include "build/data/overlays/actors/z_obj_dekujr.rodata.o" include "build/data/overlays/actors/z_obj_dekujr.reloc.o" endseg @@ -4015,7 +3703,6 @@ beginseg name "ovl_Obj_Hamishi" include "build/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.o" include "build/data/overlays/actors/z_obj_hamishi.data.o" - include "build/data/overlays/actors/z_obj_hamishi.rodata.o" include "build/data/overlays/actors/z_obj_hamishi.reloc.o" endseg @@ -4030,7 +3717,6 @@ beginseg name "ovl_Obj_Hsblock" include "build/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.o" include "build/data/overlays/actors/z_obj_hsblock.data.o" - include "build/data/overlays/actors/z_obj_hsblock.rodata.o" include "build/data/overlays/actors/z_obj_hsblock.reloc.o" endseg @@ -4038,7 +3724,6 @@ beginseg name "ovl_Obj_Ice_Poly" include "build/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.o" include "build/data/overlays/actors/z_obj_ice_poly.data.o" - include "build/data/overlays/actors/z_obj_ice_poly.rodata.o" include "build/data/overlays/actors/z_obj_ice_poly.reloc.o" endseg @@ -4046,7 +3731,6 @@ beginseg name "ovl_Obj_Kibako" include "build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o" include "build/data/overlays/actors/z_obj_kibako.data.o" - include "build/data/overlays/actors/z_obj_kibako.rodata.o" include "build/data/overlays/actors/z_obj_kibako.reloc.o" endseg @@ -4054,7 +3738,6 @@ beginseg name "ovl_Obj_Kibako2" include "build/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.o" include "build/data/overlays/actors/z_obj_kibako2.data.o" - include "build/data/overlays/actors/z_obj_kibako2.rodata.o" include "build/data/overlays/actors/z_obj_kibako2.reloc.o" endseg @@ -4062,7 +3745,6 @@ beginseg name "ovl_Obj_Lift" include "build/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.o" include "build/data/overlays/actors/z_obj_lift.data.o" - include "build/data/overlays/actors/z_obj_lift.rodata.o" include "build/data/overlays/actors/z_obj_lift.reloc.o" endseg @@ -4070,7 +3752,6 @@ beginseg name "ovl_Obj_Lightswitch" include "build/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o" include "build/data/overlays/actors/z_obj_lightswitch.data.o" - include "build/data/overlays/actors/z_obj_lightswitch.rodata.o" include "build/data/overlays/actors/z_obj_lightswitch.reloc.o" endseg @@ -4084,7 +3765,6 @@ beginseg name "ovl_Obj_Makeoshihiki" include "build/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.o" include "build/data/overlays/actors/z_obj_makeoshihiki.data.o" - include "build/data/overlays/actors/z_obj_makeoshihiki.rodata.o" include "build/data/overlays/actors/z_obj_makeoshihiki.reloc.o" endseg @@ -4092,7 +3772,6 @@ beginseg name "ovl_Obj_Mure" include "build/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.o" include "build/data/overlays/actors/z_obj_mure.data.o" - include "build/data/overlays/actors/z_obj_mure.rodata.o" include "build/data/overlays/actors/z_obj_mure.reloc.o" endseg @@ -4100,7 +3779,6 @@ beginseg name "ovl_Obj_Mure2" include "build/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.o" include "build/data/overlays/actors/z_obj_mure2.data.o" - include "build/data/overlays/actors/z_obj_mure2.rodata.o" include "build/data/overlays/actors/z_obj_mure2.reloc.o" endseg @@ -4108,7 +3786,6 @@ beginseg name "ovl_Obj_Mure3" include "build/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.o" include "build/data/overlays/actors/z_obj_mure3.data.o" - include "build/data/overlays/actors/z_obj_mure3.rodata.o" include "build/data/overlays/actors/z_obj_mure3.reloc.o" endseg @@ -4130,7 +3807,6 @@ beginseg name "ovl_Obj_Switch" include "build/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.o" include "build/data/overlays/actors/z_obj_switch.data.o" - include "build/data/overlays/actors/z_obj_switch.rodata.o" include "build/data/overlays/actors/z_obj_switch.reloc.o" endseg @@ -4138,7 +3814,6 @@ beginseg name "ovl_Obj_Syokudai" include "build/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o" include "build/data/overlays/actors/z_obj_syokudai.data.o" - include "build/data/overlays/actors/z_obj_syokudai.rodata.o" include "build/data/overlays/actors/z_obj_syokudai.bss.o" include "build/data/overlays/actors/z_obj_syokudai.reloc.o" endseg @@ -4147,7 +3822,6 @@ beginseg name "ovl_Obj_Timeblock" include "build/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.o" include "build/data/overlays/actors/z_obj_timeblock.data.o" - include "build/data/overlays/actors/z_obj_timeblock.rodata.o" include "build/data/overlays/actors/z_obj_timeblock.reloc.o" endseg @@ -4155,7 +3829,6 @@ beginseg name "ovl_Obj_Tsubo" include "build/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.o" include "build/data/overlays/actors/z_obj_tsubo.data.o" - include "build/data/overlays/actors/z_obj_tsubo.rodata.o" include "build/data/overlays/actors/z_obj_tsubo.reloc.o" endseg @@ -4163,7 +3836,6 @@ beginseg name "ovl_Obj_Warp2block" include "build/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.o" include "build/data/overlays/actors/z_obj_warp2block.data.o" - include "build/data/overlays/actors/z_obj_warp2block.rodata.o" include "build/data/overlays/actors/z_obj_warp2block.reloc.o" endseg @@ -4179,7 +3851,6 @@ beginseg name "ovl_Oceff_Spot" include "build/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.o" include "build/data/overlays/actors/z_oceff_spot.data.o" - include "build/data/overlays/actors/z_oceff_spot.rodata.o" include "build/data/overlays/actors/z_oceff_spot.reloc.o" endseg @@ -4187,7 +3858,6 @@ beginseg name "ovl_Oceff_Storm" include "build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o" include "build/data/overlays/actors/z_oceff_storm.data.o" - include "build/data/overlays/actors/z_oceff_storm.rodata.o" include "build/data/overlays/actors/z_oceff_storm.reloc.o" endseg @@ -4195,7 +3865,6 @@ beginseg name "ovl_Oceff_Wipe" include "build/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o" include "build/data/overlays/actors/z_oceff_wipe.data.o" - include "build/data/overlays/actors/z_oceff_wipe.rodata.o" include "build/data/overlays/actors/z_oceff_wipe.reloc.o" endseg @@ -4203,7 +3872,6 @@ beginseg name "ovl_Oceff_Wipe2" include "build/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.o" include "build/data/overlays/actors/z_oceff_wipe2.data.o" - include "build/data/overlays/actors/z_oceff_wipe2.rodata.o" include "build/data/overlays/actors/z_oceff_wipe2.reloc.o" endseg @@ -4211,7 +3879,6 @@ beginseg name "ovl_Oceff_Wipe3" include "build/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.o" include "build/data/overlays/actors/z_oceff_wipe3.data.o" - include "build/data/overlays/actors/z_oceff_wipe3.rodata.o" include "build/data/overlays/actors/z_oceff_wipe3.reloc.o" endseg @@ -4219,7 +3886,6 @@ beginseg name "ovl_Oceff_Wipe4" include "build/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o" include "build/data/overlays/actors/z_oceff_wipe4.data.o" - include "build/data/overlays/actors/z_oceff_wipe4.rodata.o" include "build/data/overlays/actors/z_oceff_wipe4.reloc.o" endseg @@ -4227,7 +3893,6 @@ beginseg name "ovl_Shot_Sun" include "build/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o" include "build/data/overlays/actors/z_shot_sun.data.o" - include "build/data/overlays/actors/z_shot_sun.rodata.o" include "build/data/overlays/actors/z_shot_sun.reloc.o" endseg diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index cf525ff24c..6b82381957 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -18,7 +18,6 @@ void PlayerCall_Draw(Player* player, GlobalContext* globalCtx); const ActorInit Player_InitVars = { ACTOR_PLAYER, ACTORTYPE_PLAYER, - 0, 0x6000035, OBJECT_GAMEPLAY_KEEP, sizeof(Player), diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 2c4c6d6d47..87507f5d1e 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -1,18 +1,18 @@ #include "z_arms_hook.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void ArmsHook_Init(ArmsHook* this, GlobalContext* globalCtx); void ArmsHook_Destroy(ArmsHook* this, GlobalContext* globalCtx); void ArmsHook_Update(ArmsHook* this, GlobalContext* globalCtx); void ArmsHook_Draw(ArmsHook* this, GlobalContext* globalCtx); +void ArmsHook_SetupAction(ArmsHook* this, ActorFunc actionFunc); +void func_80864FC4(ArmsHook* this, GlobalContext* globalCtx); /* const ActorInit Arms_Hook_InitVars = { ACTOR_ARMS_HOOK, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_LINK_BOY, sizeof(ArmsHook), @@ -22,7 +22,7 @@ const ActorInit Arms_Hook_InitVars = { (ActorFunc)ArmsHook_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864F00.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s") diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index 9e3a512f45..5c81fe38fc 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xCC]; + /* 0x014C */ char unk_14C[0xC8]; + /* 0x0214 */ ActorFunc actionFunc; } ArmsHook; // size = 0x0218 extern const ActorInit Arms_Hook_InitVars; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 8a0df9e5db..febf8cbc8a 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -7,7 +7,6 @@ #include "z_arrow_fire.h" #include "../ovl_En_Arrow/z_en_arrow.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx); @@ -24,7 +23,6 @@ void ArrowFire_Hit(ArrowFire* this, GlobalContext* globalCtx); const ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ArrowFire), diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index ce37b01a1e..813e880f1a 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -7,7 +7,6 @@ #include "z_arrow_ice.h" #include "../ovl_En_Arrow/z_en_arrow.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx); @@ -24,7 +23,6 @@ void ArrowIce_Hit(ArrowIce* this, GlobalContext* globalCtx); const ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ArrowIce), diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 3f981ff2bf..53178700ca 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -7,7 +7,6 @@ #include "z_arrow_light.h" #include "../ovl_En_Arrow/z_en_arrow.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx); @@ -24,7 +23,6 @@ void ArrowLight_Hit(ArrowLight* this, GlobalContext* globalCtx); const ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ArrowLight), diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index b986a932e5..22d9d30fca 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -1,40 +1,38 @@ /* * File: z_bg_bdan_objects.c * Overlay: ovl_Bg_Bdan_Objects - * Description: + * Description: Lord Jabu-Jabu Objects */ #include "z_bg_bdan_objects.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx); -static void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx); -static void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx); -static void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx); +void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx); +void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx); +void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx); +void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C55C(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C6EC(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C76C(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C868(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C9A8(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086CABC(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086CB10(BgBdanObjects* this, GlobalContext* globalCtx); -static void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C55C(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C6EC(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C76C(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C868(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C9A8(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086CABC(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086CB10(BgBdanObjects* this, GlobalContext* globalCtx); +void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx); const ActorInit Bg_Bdan_Objects_InitVars = { ACTOR_BG_BDAN_OBJECTS, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_BDAN_OBJECTS, sizeof(BgBdanObjects), @@ -80,7 +78,7 @@ s32 BgBdanObjects_GetContactRu1(BgBdanObjects* this, s32 arg1) { } } -static void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { +void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { switch (arg1) { case 1: this->unk_1B8 = 2; @@ -96,7 +94,7 @@ static void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { } } -static void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx) { +void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s16 pad; s32 localC = 0; @@ -154,7 +152,7 @@ static void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx) { this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, this, localC); } -static void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx) { +void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); @@ -163,7 +161,7 @@ static void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx) } } -static void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (BgBdanObjects_GetContactRu1(this, 0)) { @@ -194,7 +192,7 @@ static void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx) { if (Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 500.0f, 0.5f, 7.5f, 1.0f) < 0.1f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); @@ -214,7 +212,7 @@ static void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx) { s32 temp; if (this->unk_16A != 0) { @@ -238,7 +236,7 @@ static void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { Player* player = PLAYER; this->dyna.actor.velocity.y += 0.5f; @@ -271,7 +269,7 @@ static void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C55C(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C55C(BgBdanObjects* this, GlobalContext* globalCtx) { this->unk_16A -= 1; if (this->unk_16A == 0) { @@ -282,7 +280,7 @@ static void func_8086C55C(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } @@ -297,7 +295,7 @@ static void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx) { ActorCollider_Cylinder_Update(&this->dyna.actor, &this->collider); Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &this->collider); if (Flags_GetClear(globalCtx, this->dyna.actor.room)) { @@ -310,7 +308,7 @@ static void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C6EC(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C6EC(BgBdanObjects* this, GlobalContext* globalCtx) { s32 cond = Math_ApproxUpdateScaledS(&this->dyna.actor.shape.rot.y, this->dyna.actor.initPosRot.rot.y, 0x200); if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + -125.0f, 3.0f)) { if (cond) { @@ -319,7 +317,7 @@ static void func_8086C6EC(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C76C(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C76C(BgBdanObjects* this, GlobalContext* globalCtx) { if (func_8004356C(&this->dyna.actor)) { if (this->dyna.actor.xzDistanceFromLink < 120.0f) { this->actionFunc = (ActorFunc)func_8086C7D0; @@ -328,7 +326,7 @@ static void func_8086C76C(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx) { if (Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 965.0f, 0.5f, 15.0f, 0.2f) < 0.01f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); @@ -338,10 +336,10 @@ static void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C868(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C868(BgBdanObjects* this, GlobalContext* globalCtx) { } -static void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } @@ -373,14 +371,14 @@ static void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086C9A8(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C9A8(BgBdanObjects* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->unk_168)) { this->unk_16A = 0x64; this->actionFunc = (ActorFunc)func_8086C9F0; } } -static void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A == 0) { if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 0.5f)) { Flags_UnsetSwitch(globalCtx, this->unk_168); @@ -396,7 +394,7 @@ static void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx) { globalCtx->colCtx.stat.colHeader->waterBoxes[7].unk_02 = this->dyna.actor.posRot.pos.y; } -static void func_8086CABC(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086CABC(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } @@ -406,7 +404,7 @@ static void func_8086CABC(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086CB10(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086CB10(BgBdanObjects* this, GlobalContext* globalCtx) { if (func_8004356C(&this->dyna.actor)) { Flags_SetSwitch(globalCtx, this->unk_168); this->unk_16A = 0x32; @@ -416,7 +414,7 @@ static void func_8086CB10(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx) { +void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } @@ -430,12 +428,12 @@ static void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx) { } } -static void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx) { +void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx) { Actor_SetHeight(&this->dyna.actor, 50.0f); this->actionFunc(this, globalCtx); } -static void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx) { +void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->dyna.actor.params == 0) { if (this->actionFunc == (ActorFunc)func_8086C054) { if (((this->dyna.actor.initPosRot.pos.y + -79.0f) - 5.0f) < this->dyna.actor.posRot.pos.y) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 4c39fe657e..f15f9a2e5c 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -4,98 +4,46 @@ * Description: Switches (Inside Lord Jabu-Jabu) */ -#include -#include +#include "z_bg_bdan_switch.h" -// BgBdanSwitch.actor.params & 0xFF -typedef enum { - /* 0x00 */ BLUE, - /* 0x01 */ YELLOW_HEAVY, - /* 0x02 */ YELLOW, - /* 0x03 */ YELLOW_TALL_1, - /* 0x04 */ YELLOW_TALL_2 -} BgBdanSwitchType; - -typedef struct { - /* 0x00 */ char unk_00[0x2E]; - /* 0x2E */ s16 unk_2E; -} ColliderCustomHelper; - -typedef struct { - /* 0x00 */ Collider base; - /* 0x18 */ char unk_18[0x4]; - /* 0x1C */ ColliderCustomHelper* unk_1C; - /* 0x20 */ s32 unk_20; - /* 0x24 */ char unk_24[0x1C]; - // after this is a guess based on ColliderCylinderMain - /* 0x40 */ s16 radius; - /* 0x42 */ s16 height; - /* 0x44 */ s16 yShift; - /* 0x46 */ Vec3s position; -} ColliderCustomMain; // size = 0x4C - -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ f32 unk_150; - /* 0x0154 */ f32 unk_154; - /* 0x0158 */ u32 unk_158; - /* 0x015C */ u32 unk_15C; - /* 0x0160 */ u8 unk_160; - /* 0x0164 */ ActorFunc updateFunc; - /* 0x0168 */ ColliderCustomMain collider; - /* 0x01B4 */ char unk_1B4[0x14]; - /* 0x01C8 */ f32 unk_1C8; - /* 0x01CC */ s16 unk_1CC; - /* 0x01CE */ char unk_1CE[0x2]; - /* 0x01D0 */ f32 unk_1D0; - /* 0x01D4 */ f32 unk_1D4; - /* 0x01D8 */ s16 unk_1D8; - /* 0x01DA */ s16 unk_1DA; - /* 0x01DC */ u8 unk_1DC; - /* 0x01DD */ char unk_1DD[0x3]; -} BgBdanSwitch; // size = 0x01E0 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx); -static void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx); -static void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx); -static void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx); +void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx); +void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx); +void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx); +void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D5C4(BgBdanSwitch* this); -static void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D67C(BgBdanSwitch* this); -static void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D730(BgBdanSwitch* this); -static void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D7FC(BgBdanSwitch* this); -static void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D86C(BgBdanSwitch* this); -static void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D8BC(BgBdanSwitch* this); -static void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086D9F8(BgBdanSwitch* this); -static void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086DAB4(BgBdanSwitch* this); -static void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086DB24(BgBdanSwitch* this); -static void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086DB4C(BgBdanSwitch* this); -static void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086DC30(BgBdanSwitch* this); -static void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086DCCC(BgBdanSwitch* this); -static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx); -static void func_8086DDA8(BgBdanSwitch* this); -static void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D5C4(BgBdanSwitch* this); +void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D67C(BgBdanSwitch* this); +void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D730(BgBdanSwitch* this); +void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D7FC(BgBdanSwitch* this); +void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D86C(BgBdanSwitch* this); +void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D8BC(BgBdanSwitch* this); +void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086D9F8(BgBdanSwitch* this); +void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086DAB4(BgBdanSwitch* this); +void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086DB24(BgBdanSwitch* this); +void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086DB4C(BgBdanSwitch* this); +void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086DC30(BgBdanSwitch* this); +void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086DCCC(BgBdanSwitch* this); +void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx); +void func_8086DDA8(BgBdanSwitch* this); +void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx); const ActorInit Bg_Bdan_Switch_InitVars = { ACTOR_BG_BDAN_SWITCH, ACTORTYPE_SWITCH, - ROOM, FLAGS, OBJECT_BDAN_OBJECTS, sizeof(BgBdanSwitch), @@ -122,7 +70,7 @@ static InitChainEntry initChain[] = { static u32 D_8086E0E0[] = { 0x00000000, 0x430C0000, 0x00000000, 0x00000000 }; -static void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { +void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; u32 local_c = 0; s16 pad2; @@ -136,13 +84,13 @@ static void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 coll } } -static void func_8086D098(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D098(BgBdanSwitch* this, GlobalContext* globalCtx) { Actor* actor = &this->actor; func_8005BBF8(globalCtx, &this->collider, actor); func_8005C050(globalCtx, &this->collider, actor, &D_8086E0C4, &this->collider.unk_20); } -static void func_8086D0EC(BgBdanSwitch* this) { +void func_8086D0EC(BgBdanSwitch* this) { if (this->unk_1CC > 0) { this->unk_1CC += 0x5DC; } else { @@ -166,7 +114,7 @@ static void func_8086D0EC(BgBdanSwitch* this) { this->actor.shape.unk_08 = 1.2f / this->unk_1D0; } -static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) { +void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) { s32 pad[2]; s16 type; s32 flag; @@ -230,7 +178,7 @@ static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) { osSyncPrintf("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n", this->actor.params); } -static void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) { +void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) { switch (this->actor.params & 0xFF) { case BLUE: case YELLOW_HEAVY: @@ -243,7 +191,7 @@ static void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D4B4(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D4B4(BgBdanSwitch* this, GlobalContext* globalCtx) { s32 pad; s32 type; if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { @@ -257,7 +205,7 @@ static void func_8086D4B4(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D548(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D548(BgBdanSwitch* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { Flags_UnsetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); if ((this->actor.params & 0xFF) == YELLOW_TALL_2) { @@ -266,12 +214,12 @@ static void func_8086D548(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D5C4(BgBdanSwitch* this) { +void func_8086D5C4(BgBdanSwitch* this) { this->updateFunc = &func_8086D5E0; this->unk_1C8 = 1.0f; } -static void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx) { switch (this->actor.params & 0xFF) { case BLUE: if (func_800435B4(&this->actor)) { @@ -287,12 +235,12 @@ static void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D67C(BgBdanSwitch* this) { +void func_8086D67C(BgBdanSwitch* this) { this->updateFunc = &func_8086D694; this->unk_1DA = 0x64; } -static void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) { if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) { this->unk_1C8 -= 0.2f; if (this->unk_1C8 <= 0.1f) { @@ -303,13 +251,13 @@ static void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D730(BgBdanSwitch* this) { +void func_8086D730(BgBdanSwitch* this) { this->unk_1C8 = 0.1f; this->updateFunc = &func_8086D754; this->unk_1D8 = 6; } -static void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx) { switch (this->actor.params & 0xFF) { case BLUE: if (!func_800435B4(&this->actor)) { @@ -328,11 +276,11 @@ static void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D7FC(BgBdanSwitch* this) { +void func_8086D7FC(BgBdanSwitch* this) { this->updateFunc = &func_8086D80C; } -static void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) { this->unk_1C8 += 0.2f; if (this->unk_1C8 >= 1.0f) { func_8086D5C4(this); @@ -340,22 +288,22 @@ static void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D86C(BgBdanSwitch* this) { +void func_8086D86C(BgBdanSwitch* this) { this->updateFunc = &func_8086D888; this->unk_1C8 = 1.0f; } -static void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx) { if (func_8004356C(&this->actor)) { func_8086D8BC(this); } } -static void func_8086D8BC(BgBdanSwitch* this) { +void func_8086D8BC(BgBdanSwitch* this) { this->updateFunc = &func_8086D8CC; } -static void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) { this->unk_1C8 -= 0.2f; if (this->unk_1C8 <= 0.6f) { func_8086D9F8(this); @@ -364,12 +312,12 @@ static void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D944(BgBdanSwitch* this) { +void func_8086D944(BgBdanSwitch* this) { this->updateFunc = &func_8086D95C; this->unk_1DA = 0x64; } -static void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) { if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) { this->unk_1C8 -= 0.2f; if (this->unk_1C8 <= 0.1f) { @@ -380,13 +328,13 @@ static void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086D9F8(BgBdanSwitch* this) { +void func_8086D9F8(BgBdanSwitch* this) { this->unk_1C8 = 0.6f; this->updateFunc = &func_8086DA1C; this->unk_1D8 = 6; } -static void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx) { Actor* heldActor = PLAYER->heldActor; if (func_8004356C(&this->actor)) { @@ -405,11 +353,11 @@ static void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086DAB4(BgBdanSwitch* this) { +void func_8086DAB4(BgBdanSwitch* this) { this->updateFunc = &func_8086DAC4; } -static void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) { this->unk_1C8 += 0.2f; if (this->unk_1C8 >= 1.0f) { func_8086D86C(this); @@ -417,20 +365,20 @@ static void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086DB24(BgBdanSwitch* this) { +void func_8086DB24(BgBdanSwitch* this) { this->unk_1C8 = 0.1f; this->updateFunc = &func_8086DB40; } -static void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx) { } -static void func_8086DB4C(BgBdanSwitch* this) { +void func_8086DB4C(BgBdanSwitch* this) { this->updateFunc = &func_8086DB68; this->unk_1C8 = 2.0f; } -static void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) { switch (this->actor.params & 0xFF) { default: return; @@ -450,12 +398,12 @@ static void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086DC30(BgBdanSwitch* this) { +void func_8086DC30(BgBdanSwitch* this) { this->updateFunc = &func_8086DC48; this->unk_1DA = 0x64; } -static void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx) { if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) { this->unk_1C8 -= 0.3f; if (this->unk_1C8 <= 1.0f) { @@ -465,12 +413,12 @@ static void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086DCCC(BgBdanSwitch* this) { +void func_8086DCCC(BgBdanSwitch* this) { this->updateFunc = &func_8086DCE8; this->unk_1C8 = 1.0f; } -static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) { switch (this->actor.params & 0xFF) { case YELLOW_TALL_1: if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { @@ -486,12 +434,12 @@ static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void func_8086DDA8(BgBdanSwitch* this) { +void func_8086DDA8(BgBdanSwitch* this) { this->updateFunc = &func_8086DDC0; this->unk_1DA = 0x64; } -static void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) { +void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) { if ((((this->actor.params & 0xFF) != YELLOW_TALL_2) || (func_8005B198() == this->actor.type)) || (this->unk_1DA <= 0)) { this->unk_1C8 += 0.3f; @@ -502,7 +450,7 @@ static void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) { } } -static void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) { +void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) { s32 pad; s32 type; s32 pad2; @@ -528,14 +476,14 @@ static void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) { Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); } -static void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE arg2) { +void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE arg2) { func_800D1694(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->unk_1D0), this->actor.posRot.pos.z, &this->actor.shape.rot); Matrix_Scale(this->unk_1D4, this->unk_1D0, this->unk_1D4, MTXMODE_APPLY); Gfx_DrawDListOpa(globalCtx, arg2); } -static void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx) { +void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx) { switch (this->actor.params & 0xFF) { case YELLOW_HEAVY: case YELLOW: diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h new file mode 100644 index 0000000000..a0c34ac889 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h @@ -0,0 +1,58 @@ +#ifndef _Z_BG_BDAN_SWITCH_H_ +#define _Z_BG_BDAN_SWITCH_H_ + +#include +#include + +// BgBdanSwitch.actor.params & 0xFF +typedef enum { + /* 0x00 */ BLUE, + /* 0x01 */ YELLOW_HEAVY, + /* 0x02 */ YELLOW, + /* 0x03 */ YELLOW_TALL_1, + /* 0x04 */ YELLOW_TALL_2 +} BgBdanSwitchType; + +typedef struct { + /* 0x00 */ char unk_00[0x2E]; + /* 0x2E */ s16 unk_2E; +} ColliderCustomHelper; + +typedef struct { + /* 0x00 */ Collider base; + /* 0x18 */ char unk_18[0x4]; + /* 0x1C */ ColliderCustomHelper* unk_1C; + /* 0x20 */ s32 unk_20; + /* 0x24 */ char unk_24[0x1C]; + // after this is a guess based on ColliderCylinderMain + /* 0x40 */ s16 radius; + /* 0x42 */ s16 height; + /* 0x44 */ s16 yShift; + /* 0x46 */ Vec3s position; +} ColliderCustomMain; // size = 0x4C + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ f32 unk_150; + /* 0x0154 */ f32 unk_154; + /* 0x0158 */ u32 unk_158; + /* 0x015C */ u32 unk_15C; + /* 0x0160 */ u8 unk_160; + /* 0x0164 */ ActorFunc updateFunc; + /* 0x0168 */ ColliderCustomMain collider; + /* 0x01B4 */ char unk_1B4[0x14]; + /* 0x01C8 */ f32 unk_1C8; + /* 0x01CC */ s16 unk_1CC; + /* 0x01CE */ char unk_1CE[0x2]; + /* 0x01D0 */ f32 unk_1D0; + /* 0x01D4 */ f32 unk_1D4; + /* 0x01D8 */ s16 unk_1D8; + /* 0x01DA */ s16 unk_1DA; + /* 0x01DC */ u8 unk_1DC; + /* 0x01DD */ char unk_1DD[0x3]; +} BgBdanSwitch; // size = 0x01E0 + +extern const ActorInit Bg_Bdan_Switch_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 6c6a8db38e..dc334ac69c 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -1,26 +1,24 @@ /* * File: z_bg_bom_guard.c * Overlay: Bg_Bom_Guard - * Description: + * Description: Bombchu Bowling Alley Game */ #include "z_bg_bom_guard.h" #include -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx); -static void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx); -static void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx); +void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx); +void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx); +void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx); -static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx); +void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx); const ActorInit Bg_Bom_Guard_InitVars = { ACTOR_BG_BOM_GUARD, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_BOWL, sizeof(BgBomGuard), @@ -32,11 +30,11 @@ const ActorInit Bg_Bom_Guard_InitVars = { extern u32 D_06001C40; -static void BgBomGuard_SetupAction(BgBomGuard* this, ActorFunc actionFunc) { +void BgBomGuard_SetupAction(BgBomGuard* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) { +void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) { s32 pad[2]; Actor* thisx = &this->dyna.actor; s32 local_c = 0; @@ -55,11 +53,11 @@ static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) { BgBomGuard_SetupAction(this, func_8086E638); } -static void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx) { +void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) { +void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) { Actor* it = globalCtx->actorCtx.actorList[ACTORTYPE_NPC].first; Actor* thisx = &this->dyna.actor; @@ -83,6 +81,6 @@ static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) { } } -static void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx) { +void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index f6b861eb02..30088b4b31 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -1,18 +1,30 @@ +/* + * File: z_bg_bombwall.c + * Overlay: ovl_Bg_Bombwall + * Description: 2D Bombable Wall + */ + #include "z_bg_bombwall.h" -#define ROOM 0x00 #define FLAGS 0x00400000 void BgBombwall_Init(BgBombwall* this, GlobalContext* globalCtx); void BgBombwall_Destroy(BgBombwall* this, GlobalContext* globalCtx); void BgBombwall_Update(BgBombwall* this, GlobalContext* globalCtx); void BgBombwall_Draw(BgBombwall* this, GlobalContext* globalCtx); +void func_8086E7D0(BgBombwall* this, GlobalContext* globalCtx); +void func_8086EAC0(BgBombwall* this, GlobalContext* globalCtx); +void func_8086EB5C(BgBombwall* this, GlobalContext* globalCtx); +void func_8086ED50(BgBombwall* this, GlobalContext* globalCtx); +void func_8086ED70(BgBombwall* this, GlobalContext* globalCtx); +void func_8086EDFC(BgBombwall* this, GlobalContext* globalCtx); +void func_8086EE40(BgBombwall* this, GlobalContext* globalCtx); +void func_8086EE94(BgBombwall* this, GlobalContext* globalCtx); /* const ActorInit Bg_Bombwall_InitVars = { ACTOR_BG_BOMBWALL, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(BgBombwall), diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h index a16b9953da..ce0962c77e 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h @@ -5,8 +5,10 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x158]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x134]; + /* 0x0298 */ ActorFunc actionFunc; + /* 0x029C */ char unk_29C[0x8]; } BgBombwall; // size = 0x02A4 extern const ActorInit Bg_Bombwall_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 94caa74c10..6e913211dc 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -1,18 +1,27 @@ +/* + * File: z_bg_bowl_wall.c + * Overlay: Bg_Bowl_Wall + * Description: Bombchu Bowling Alley Wall + */ + #include "z_bg_bowl_wall.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgBowlWall_Init(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_Destroy(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_Update(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_Draw(BgBowlWall* this, GlobalContext* globalCtx); +void func_8086F260(BgBowlWall* this, GlobalContext* globalCtx); +void func_8086F440(BgBowlWall* this, GlobalContext* globalCtx); +void func_8086F464(BgBowlWall* this, GlobalContext* globalCtx); +void func_8086F718(BgBowlWall* this, GlobalContext* globalCtx); +void func_8086F7F8(BgBowlWall* this, GlobalContext* globalCtx); /* const ActorInit Bg_Bowl_Wall_InitVars = { ACTOR_BG_BOWL_WALL, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_BOWL, sizeof(BgBowlWall), diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h index 26f70c5ba6..97a18b24f9 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x3C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x20]; } BgBowlWall; // size = 0x0188 extern const ActorInit Bg_Bowl_Wall_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 9458d03a6a..bdff3d9a1b 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -1,17 +1,26 @@ +/* + * File: z_bg_breakwall.c + * Overlay: Bg_Breakwall + * Description: Bombable Wall + */ + #include "z_bg_breakwall.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgBreakwall_Init(BgBreakwall* this, GlobalContext* globalCtx); void BgBreakwall_Destroy(BgBreakwall* this, GlobalContext* globalCtx); void BgBreakwall_Update(BgBreakwall* this, GlobalContext* globalCtx); +void BgBreakwall_SetupAction(BgBreakwall* this, ActorFunc actionFunc); +void func_80870290(BgBreakwall* this, GlobalContext* globalCtx); +void func_80870394(BgBreakwall* this, GlobalContext* globalCtx); +void func_80870564(BgBreakwall* this, GlobalContext* globalCtx); +void func_808705D8(BgBreakwall* this, GlobalContext* globalCtx); /* const ActorInit Bg_Breakwall_InitVars = { ACTOR_BG_BREAKWALL, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgBreakwall), @@ -21,7 +30,7 @@ const ActorInit Bg_Breakwall_InitVars = { NULL, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FBE0.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s") diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h index 9495d4afc5..7fc2948b85 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA4]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x88]; + /* 0x01EC */ ActorFunc actionFunc; } BgBreakwall; // size = 0x01F0 extern const ActorInit Bg_Breakwall_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index fe107255ea..f8b31013f9 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_ddan_jd.c + * Overlay: ovl_Bg_Ddan_Jd + * Description: Rising stone platform (Dodongo's Cavern) + */ + #include "z_bg_ddan_jd.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgDdanJd_Init(BgDdanJd* this, GlobalContext* globalCtx); void BgDdanJd_Destroy(BgDdanJd* this, GlobalContext* globalCtx); void BgDdanJd_Update(BgDdanJd* this, GlobalContext* globalCtx); void BgDdanJd_Draw(BgDdanJd* this, GlobalContext* globalCtx); +void func_80870B88(BgDdanJd* this, GlobalContext* globalCtx); +void func_80870D2C(BgDdanJd* this, GlobalContext* globalCtx); +void func_80870F00(BgDdanJd* this, GlobalContext* globalCtx); /* const ActorInit Bg_Ddan_Jd_InitVars = { ACTOR_BG_DDAN_JD, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_DDAN_OBJECTS, sizeof(BgDdanJd), diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h index e71bd1bab8..3d02045367 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x8]; } BgDdanJd; // size = 0x0170 extern const ActorInit Bg_Ddan_Jd_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 8d397e6408..a6888dad7b 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -1,18 +1,26 @@ +/* + * File: z_bg_ddan_kd.c + * Overlay: ovl_Bg_Ddan_Kd + * Description: Stone stairs in Dodongo's Cavern + */ + #include "z_bg_ddan_kd.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgDdanKd_Init(BgDdanKd* this, GlobalContext* globalCtx); void BgDdanKd_Destroy(BgDdanKd* this, GlobalContext* globalCtx); void BgDdanKd_Update(BgDdanKd* this, GlobalContext* globalCtx); void BgDdanKd_Draw(BgDdanKd* this, GlobalContext* globalCtx); +void BgDdanKd_SetupAction(BgDdanKd* this, ActorFunc actionFunc); +void func_80871234(BgDdanKd* this, GlobalContext* globalCtx); +void func_80873164(BgDdanKd* this, GlobalContext* globalCtx); +void func_80871838(BgDdanKd* this, GlobalContext* globalCtx); /* const ActorInit Bg_Ddan_Kd_InitVars = { ACTOR_BG_DDAN_KD, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_DDAN_OBJECTS, sizeof(BgDdanKd), @@ -22,7 +30,7 @@ const ActorInit Bg_Ddan_Kd_InitVars = { (ActorFunc)BgDdanKd_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_808710F0.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s") diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h index 920ad7bbb9..214e90a49f 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h @@ -5,8 +5,10 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x7C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ Actor* unk_164; // pointer to bombflower actor + /* 0x0168 */ char unk_168[0x5C]; + /* 0x01C4 */ ActorFunc actionFunc; } BgDdanKd; // size = 0x01C8 extern const ActorInit Bg_Ddan_Kd_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index e5b649f7b4..51353d45d7 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -1,18 +1,28 @@ +/* + * File: z_bg_dodoago.c + * Overlay: ovl_Bg_Dodoago + * Description: Dodongo Head Statue in Dodongo's Cavern + */ + #include "z_bg_dodoago.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgDodoago_Init(BgDodoago* this, GlobalContext* globalCtx); void BgDodoago_Destroy(BgDodoago* this, GlobalContext* globalCtx); void BgDodoago_Update(BgDodoago* this, GlobalContext* globalCtx); void BgDodoago_Draw(BgDodoago* this, GlobalContext* globalCtx); +void BgDodoago_SetupAction(BgDodoago* this, ActorFunc actionFunc); +// void func_80871A08(Vec3f* vec, GlobalContext* globalCtx); // Not 100% sure +void func_80871CF4(BgDodoago* this, GlobalContext* globalCtx); +void func_80871FB8(BgDodoago* this, GlobalContext* globalCtx); +void func_8087227C(BgDodoago* this, GlobalContext* globalCtx); +void func_80872288(BgDodoago* this, GlobalContext* globalCtx); /* const ActorInit Bg_Dodoago_InitVars = { ACTOR_BG_DODOAGO, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_DDAN_OBJECTS, sizeof(BgDodoago), @@ -22,7 +32,7 @@ const ActorInit Bg_Dodoago_InitVars = { (ActorFunc)BgDodoago_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A00.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s") diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h index d9723c5ffa..1853943f81 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x104]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0xE8]; + /* 0x024C */ ActorFunc actionFunc; } BgDodoago; // size = 0x0250 extern const ActorInit Bg_Dodoago_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index e1021f9a5a..a91082e766 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -1,17 +1,43 @@ +/* + * File: z_bg_dy_yoseizo.c + * Overlay: ovl_Bg_Dy_Yoseizo + * Description: Great Fairy + */ + #include "z_bg_dy_yoseizo.h" -#define ROOM 0x00 #define FLAGS 0x02000030 void BgDyYoseizo_Init(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_Destroy(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_Update(BgDyYoseizo* this, GlobalContext* globalCtx); - +void func_80872960(BgDyYoseizo* this, GlobalContext* globalCtx, s16 arg2); +void func_80872C58(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80872D20(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80872DE4(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_8087328C(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873380(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_808734DC(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_8087358C(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_808736A4(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873780(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873868(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873B3C(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873C14(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873D14(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873E04(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873EA4(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80873FD8(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_80874304(BgDyYoseizo* this, GlobalContext* globalCtx); +s32 func_80874B7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, BgDyYoseizo* this); +void func_80874BE0(BgDyYoseizo* this, GlobalContext* globalCtx); +// func_80874D9C +void func_80874EAC(BgDyYoseizo* this, GlobalContext* globalCtx); +void func_808751A0(BgDyYoseizo* this, GlobalContext* globalCtx); /* const ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DY_OBJ, sizeof(BgDyYoseizo), diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index 2ab814b2f7..b0dae2ebdf 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -6,7 +6,9 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x3768]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ SkelAnime skelAnime; + /* 0x0194 */ char unk_194[0x3720]; } BgDyYoseizo; // size = 0x38B4 extern const ActorInit Bg_Dy_Yoseizo_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 6b65fa52c4..ea33ff9853 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_ganon_otyka.c + * Overlay: ovl_Bg_Ganon_Otyka + * Description: Falling Platform (Ganondorf Fight) + */ + #include "z_bg_ganon_otyuka.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgGanonOtyuka_Init(BgGanonOtyuka* this, GlobalContext* globalCtx); void BgGanonOtyuka_Destroy(BgGanonOtyuka* this, GlobalContext* globalCtx); void BgGanonOtyuka_Update(BgGanonOtyuka* this, GlobalContext* globalCtx); void BgGanonOtyuka_Draw(BgGanonOtyuka* this, GlobalContext* globalCtx); +void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx); +void func_80875C88(BgGanonOtyuka* this, GlobalContext* globalCtx); +void func_808760DC(BgGanonOtyuka* this, GlobalContext* globalCtx); /* const ActorInit Bg_Ganon_Otyuka_InitVars = { ACTOR_BG_GANON_OTYUKA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GANON, sizeof(BgGanonOtyuka), @@ -22,6 +29,7 @@ const ActorInit Bg_Ganon_Otyuka_InitVars = { (ActorFunc)BgGanonOtyuka_Draw, }; */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Destroy.s") diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h index 5ff64f5555..d1fcfda74e 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x40]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x24]; } BgGanonOtyuka; // size = 0x018C extern const ActorInit Bg_Ganon_Otyuka_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 5b19fc6db0..34624364e4 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -8,23 +8,21 @@ #include -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx); -static void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx); -static void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx); -static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx); +void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx); +void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx); +void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx); +void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx); -static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx); -static void func_80878300(BgGateShutter* this, GlobalContext* globalCtx); -static void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx); -static void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx); +void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx); +void func_80878300(BgGateShutter* this, GlobalContext* globalCtx); +void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx); +void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx); const ActorInit Bg_Gate_Shutter_InitVars = { ACTOR_BG_GATE_SHUTTER, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_SPOT01_MATOYAB, sizeof(BgGateShutter), @@ -37,7 +35,7 @@ const ActorInit Bg_Gate_Shutter_InitVars = { extern UNK_TYPE D_06001CD0; extern UNK_TYPE D_06001DA8; -static void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) { +void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) { s32 pad[2]; Actor* thisx = &this->dyna.actor; s32 local_c = 0; @@ -62,11 +60,11 @@ static void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) { this->actionFunc = (ActorFunc)func_8087828C; } -static void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx) { +void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { +void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_168 == 1 && !(gSaveContext.inf_table[7] & 0x40)) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_80878300; @@ -79,7 +77,7 @@ static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { } } -static void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { +void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (this->unk_178 == 0) { @@ -94,14 +92,14 @@ static void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { } } -static void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx) { +void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_178 == 0) { this->unk_168 = 0; this->actionFunc = (ActorFunc)func_8087828C; } } -static void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) { +void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (this->unk_178 == 0) { @@ -117,14 +115,14 @@ static void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) { } } -static void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx) { +void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_178 != 0) { this->unk_178 -= 1; } this->actionFunc(this, globalCtx); } -static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) { +void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 282304736e..53c6d0c9a0 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -6,21 +6,19 @@ #include "z_bg_gjyo_bridge.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx); -static void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx); -static void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx); -static void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx); -static void func_808787A4(BgGjyoBridge* this, GlobalContext* globalCtx); -static void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx); -static void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx); +void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx); +void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx); +void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx); +void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx); +void func_808787A4(BgGjyoBridge* this, GlobalContext* globalCtx); +void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx); +void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx); const ActorInit Bg_Gjyo_Bridge_InitVars = { ACTOR_BG_GJYO_BRIDGE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GJYO_OBJECTS, sizeof(BgGjyoBridge), @@ -30,7 +28,7 @@ const ActorInit Bg_Gjyo_Bridge_InitVars = { (ActorFunc)BgGjyoBridge_Draw, }; -InitChainEntry initChain[] = { +static InitChainEntry initChain[] = { ICHAIN_F32(unk_F8, 800, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index e4f20e07e5..e38cf5e99f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -1,17 +1,29 @@ +/* + * File: z_bg_gnd_darkmeiro.c + * Overlay: ovl_Bg_Gnd_Darkmeiro + * Description: Clear block + */ + #include "z_bg_gnd_darkmeiro.h" -#define ROOM 0x00 #define FLAGS 0x00000030 +void func_80878C30(BgGndDarkmeiro* this, GlobalContext* globalCtx); void BgGndDarkmeiro_Init(BgGndDarkmeiro* this, GlobalContext* globalCtx); void BgGndDarkmeiro_Destroy(BgGndDarkmeiro* this, GlobalContext* globalCtx); void BgGndDarkmeiro_Update(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_80878F28(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_80878F34(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_80879128(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_80879134(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_808791BC(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_808791E8(BgGndDarkmeiro* this, GlobalContext* globalCtx); +void func_80879334(BgGndDarkmeiro* this, GlobalContext* globalCtx); /* const ActorInit Bg_Gnd_Darkmeiro_InitVars = { ACTOR_BG_GND_DARKMEIRO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DEMO_KEKKAI, sizeof(BgGndDarkmeiro), diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h index 0137cb5123..0216e2da0f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x8]; + /* 0x016C */ ActorFunc actionFunc; } BgGndDarkmeiro; // size = 0x0170 extern const ActorInit Bg_Gnd_Darkmeiro_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 80cb6139fa..7732ca669e 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_gnd_firemeiro.c + * Overlay: ovl_Bg_Gnd_Firemeiro + * Description: Sinking lava platform (Ganon's Castle) + */ + #include "z_bg_gnd_firemeiro.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgGndFiremeiro_Init(BgGndFiremeiro* this, GlobalContext* globalCtx); void BgGndFiremeiro_Destroy(BgGndFiremeiro* this, GlobalContext* globalCtx); void BgGndFiremeiro_Update(BgGndFiremeiro* this, GlobalContext* globalCtx); void BgGndFiremeiro_Draw(BgGndFiremeiro* this, GlobalContext* globalCtx); +void func_808795AC(BgGndFiremeiro* this, GlobalContext* globalCtx); +void func_80879668(BgGndFiremeiro* this, GlobalContext* globalCtx); +void func_80879808(BgGndFiremeiro* this, GlobalContext* globalCtx); /* const ActorInit Bg_Gnd_Firemeiro_InitVars = { ACTOR_BG_GND_FIREMEIRO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DEMO_KEKKAI, sizeof(BgGndFiremeiro), diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h index b469b6d344..de90e3a20f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h @@ -5,8 +5,10 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ Vec3f unk_164; + /* 0x0170 */ char unk_170[0x4]; + /* 0x0174 */ ActorFunc actionFunc; } BgGndFiremeiro; // size = 0x0178 extern const ActorInit Bg_Gnd_Firemeiro_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index f3411be9c7..cf6eccf41b 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -1,18 +1,26 @@ +/* + * File: z_bg_gnd_iceblock.c + * Overlay: ovl_Bg_Gnd_Iceblock + * Description: Pushable large square ice block (Inside Ganon's Castle) + */ + #include "z_bg_gnd_iceblock.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgGndIceblock_Init(BgGndIceblock* this, GlobalContext* globalCtx); void BgGndIceblock_Destroy(BgGndIceblock* this, GlobalContext* globalCtx); void BgGndIceblock_Update(BgGndIceblock* this, GlobalContext* globalCtx); void BgGndIceblock_Draw(BgGndIceblock* this, GlobalContext* globalCtx); - +void func_8087A0C8(BgGndIceblock* this, GlobalContext* globalCtx); +void func_8087A184(BgGndIceblock* this, GlobalContext* globalCtx); +void func_8087A248(BgGndIceblock* this, GlobalContext* globalCtx); +void func_8087A300(BgGndIceblock* this, GlobalContext* globalCtx); +void func_8087A39C(BgGndIceblock* this, GlobalContext* globalCtx); /* const ActorInit Bg_Gnd_Iceblock_InitVars = { ACTOR_BG_GND_ICEBLOCK, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DEMO_KEKKAI, sizeof(BgGndIceblock), diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h index b7e0af4d9c..1e92013165 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x28]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ Vec3f unk_168; } BgGndIceblock; // size = 0x0174 extern const ActorInit Bg_Gnd_Iceblock_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 4d0fa15d03..f472ffceaa 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -4,46 +4,38 @@ * Description: 2D Stone Wall */ -#include -#include -#include +#include "z_bg_gnd_nisekabe.h" -typedef struct { - /* 0x0000 */ Actor actor; -} ActorGndNisekabe; // size = 0x014C - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void Init(ActorGndNisekabe* this, GlobalContext* globalCtx); -static void Destroy(ActorGndNisekabe* this, GlobalContext* globalCtx); -static void Update(ActorGndNisekabe* this, GlobalContext* globalCtx); -static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx); +void BgGndNisekabe_Init(BgGndNisekabe* this, GlobalContext* globalCtx); +void BgGndNisekabe_Destroy(BgGndNisekabe* this, GlobalContext* globalCtx); +void BgGndNisekabe_Update(BgGndNisekabe* this, GlobalContext* globalCtx); +void BgGndNisekabe_Draw(BgGndNisekabe* this, GlobalContext* globalCtx); const ActorInit Bg_Gnd_Nisekabe_InitVars = { ACTOR_BG_GND_NISEKABE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DEMO_KEKKAI, - sizeof(ActorGndNisekabe), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(BgGndNisekabe), + (ActorFunc)BgGndNisekabe_Init, + (ActorFunc)BgGndNisekabe_Destroy, + (ActorFunc)BgGndNisekabe_Update, + (ActorFunc)BgGndNisekabe_Draw, }; static u32 segmentAddr[] = { 0x06009230, 0x0600A390, 0x0600B4A0 }; -static void Init(ActorGndNisekabe* this, GlobalContext* globalCtx) { +void BgGndNisekabe_Init(BgGndNisekabe* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.1); this->actor.unk_F4 = 3000.0; } -static void Destroy(ActorGndNisekabe* this, GlobalContext* globalCtx) { +void BgGndNisekabe_Destroy(BgGndNisekabe* this, GlobalContext* globalCtx) { } -static void Update(ActorGndNisekabe* this, GlobalContext* globalCtx) { +void BgGndNisekabe_Update(BgGndNisekabe* this, GlobalContext* globalCtx) { if (globalCtx->actorCtx.unk_03 != 0) { this->actor.flags |= 0x80; } else { @@ -51,7 +43,7 @@ static void Update(ActorGndNisekabe* this, GlobalContext* globalCtx) { } } -static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx) { +void BgGndNisekabe_Draw(BgGndNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h new file mode 100644 index 0000000000..2c24257393 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h @@ -0,0 +1,13 @@ +#ifndef _Z_BG_GND_NISEKABE_H_ +#define _Z_BG_GND_NISEKABE_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; +} BgGndNisekabe; // size = 0x014C + +extern const ActorInit Bg_Gnd_Nisekabe_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index c4e6477121..57a60b06a7 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_gnd_soulmeiro.c + * Overlay: ovl_Bg_Gnd_Soulmeiro + * Description: Web-Blocked Ceiling Hole (Inside Ganon's Castle) + */ + #include "z_bg_gnd_soulmeiro.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgGndSoulmeiro_Init(BgGndSoulmeiro* this, GlobalContext* globalCtx); void BgGndSoulmeiro_Destroy(BgGndSoulmeiro* this, GlobalContext* globalCtx); void BgGndSoulmeiro_Update(BgGndSoulmeiro* this, GlobalContext* globalCtx); void BgGndSoulmeiro_Draw(BgGndSoulmeiro* this, GlobalContext* globalCtx); +void func_8087AF38(BgGndSoulmeiro* this, GlobalContext* globalCtx); +void func_8087B284(BgGndSoulmeiro* this, GlobalContext* globalCtx); +void func_8087B350(BgGndSoulmeiro* this, GlobalContext* globalCtx); /* const ActorInit Bg_Gnd_Soulmeiro_InitVars = { ACTOR_BG_GND_SOULMEIRO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DEMO_KEKKAI, sizeof(BgGndSoulmeiro), diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h index 1382a62f06..e215015ec9 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x54]; + /* 0x014C */ char unk_14C[0x50]; + /* 0x019C */ ActorFunc actionFunc; } BgGndSoulmeiro; // size = 0x01A0 extern const ActorInit Bg_Gnd_Soulmeiro_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 056676cb61..5b33fa964e 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -1,18 +1,26 @@ +/* + * File: z_bg_haka.c + * Overlay: ovl_Bg_Haka + * Description: Gravestone + */ + #include "z_bg_haka.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHaka_Init(BgHaka* this, GlobalContext* globalCtx); void BgHaka_Destroy(BgHaka* this, GlobalContext* globalCtx); void BgHaka_Update(BgHaka* this, GlobalContext* globalCtx); void BgHaka_Draw(BgHaka* this, GlobalContext* globalCtx); - +void func_8087B758(BgHaka* this, Player* player); +void func_8087B7E8(BgHaka* this, GlobalContext* globalCtx); +void func_8087B938(BgHaka* this, GlobalContext* globalCtx); +void func_8087BAAC(BgHaka* this, GlobalContext* globalCtx); +void func_8087BAE4(BgHaka* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_InitVars = { ACTOR_BG_HAKA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HAKA, sizeof(BgHaka), diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h index 40142a6d76..fc64c79693 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; } BgHaka; // size = 0x0168 extern const ActorInit Bg_Haka_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index f5f8b7cb78..93af9e2fe1 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -1,18 +1,33 @@ +/* + * File: z_bg_haka_gate.c + * Overlay: ovl_Bg_Haka_Gate + * Description: Truth Spinner Puzzle (Shadow Temple) + */ + #include "z_bg_haka_gate.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHakaGate_Init(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_Destroy(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_Update(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_Draw(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C114(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C120(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C158(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C270(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C454(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C5D0(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C65C(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C6AC(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C73C(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C794(BgHakaGate* this, GlobalContext* globalCtx); +void func_8087C85C(BgHakaGate* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Gate_InitVars = { ACTOR_BG_HAKA_GATE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_HAKA_OBJECTS, sizeof(BgHakaGate), diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h index 17cbd7542f..2b4cd27eaa 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x28]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0xC]; } BgHakaGate; // size = 0x0174 extern const ActorInit Bg_Haka_Gate_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 803382600e..613144d30d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -1,18 +1,22 @@ #include "z_bg_haka_huta.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgHakaHuta_Init(BgHakaHuta* this, GlobalContext* globalCtx); void BgHakaHuta_Destroy(BgHakaHuta* this, GlobalContext* globalCtx); void BgHakaHuta_Update(BgHakaHuta* this, GlobalContext* globalCtx); void BgHakaHuta_Draw(BgHakaHuta* this, GlobalContext* globalCtx); +void func_8087D0AC(BgHakaHuta* this, GlobalContext* globalCtx); +// void func_8087D268(BgHakaHuta* this, GlobalContext* globalCtx, u16 arg2); not sure about this one +// void func_8087D5B8(BgHakaHuta* this, GlobalContext* globalCtx); not sure about this one +void func_8087D66C(BgHakaHuta* this, GlobalContext* globalCtx); +void func_8087D720(BgHakaHuta* this, GlobalContext* globalCtx); +void func_8087D8C0(BgHakaHuta* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Huta_InitVars = { ACTOR_BG_HAKA_HUTA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HAKACH_OBJECTS, sizeof(BgHakaHuta), diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h index 7d23ebe985..d4a578b364 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x4]; } BgHakaHuta; // size = 0x016C extern const ActorInit Bg_Haka_Huta_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index c8b7862c4d..024541f2fe 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -1,27 +1,25 @@ /* * File: z_bg_haka_megane.c * Overlay: ovl_Bg_Haka_Megane - * Description: + * Description: Shadow Temple Fake Walls */ #include "z_bg_haka_megane.h" -#define ROOM 0x00 #define FLAGS 0x000000B0 -static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); -static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); -static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); +void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); +void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); +void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); -static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); -static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); -static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); -static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); const ActorInit Bg_Haka_Megane_InitVars = { ACTOR_BG_HAKA_MEGANE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgHakaMegane), @@ -47,7 +45,7 @@ static UNK_TYPE dlists[] = { extern UNK_TYPE D_06001250; -static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { +void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; Actor_ProcessInitChain(thisx, initChain); @@ -66,11 +64,11 @@ static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { } } -static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) { +void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { +void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { s32 localC; UNK_TYPE collision; @@ -92,7 +90,7 @@ static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { } } -static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { +void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (globalCtx->actorCtx.unk_03 != 0) { thisx->flags |= 0x80; @@ -103,14 +101,14 @@ static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { } } -static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { +void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { } -static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { +void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { +void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if ((thisx->flags & 0x80) == 0x80) { diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index a60362a988..81d94e03ff 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -1,18 +1,20 @@ #include "z_bg_haka_meganebg.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHakaMeganeBG_Init(BgHakaMeganeBG* this, GlobalContext* globalCtx); void BgHakaMeganeBG_Destroy(BgHakaMeganeBG* this, GlobalContext* globalCtx); void BgHakaMeganeBG_Update(BgHakaMeganeBG* this, GlobalContext* globalCtx); void BgHakaMeganeBG_Draw(BgHakaMeganeBG* this, GlobalContext* globalCtx); +void func_8087E258(BgHakaMeganeBG* this, GlobalContext* globalCtx); +void func_8087E288(BgHakaMeganeBG* this, GlobalContext* globalCtx); +void func_8087E2D8(BgHakaMeganeBG* this, GlobalContext* globalCtx); +void func_8087E34C(BgHakaMeganeBG* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_MeganeBG_InitVars = { ACTOR_BG_HAKA_MEGANEBG, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HAKA_OBJECTS, sizeof(BgHakaMeganeBG), diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h index 67bd9e5f3e..bc15dac3aa 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h @@ -5,8 +5,11 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x1]; + /* 0x0169 */ s8 unk_169; // objBankIndex ? + /* 0x016A */ char unk_16A[0x2]; } BgHakaMeganeBG; // size = 0x016C extern const ActorInit Bg_Haka_Meganebg_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index d85c5dbf89..16ca21ec21 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -1,17 +1,24 @@ +/* + * File: z_bg_haka_sgami.c + * Overlay: ovl_Bg_Haka_Sgami + * Description: Shadow Temple Spinning Scythe Trap + */ + #include "z_bg_haka_sgami.h" -#define ROOM 0x00 #define FLAGS 0x00000011 void BgHakaSgami_Init(BgHakaSgami* this, GlobalContext* globalCtx); void BgHakaSgami_Destroy(BgHakaSgami* this, GlobalContext* globalCtx); void BgHakaSgami_Update(BgHakaSgami* this, GlobalContext* globalCtx); +void func_8087E7E4(BgHakaSgami* this, GlobalContext* globalCtx); +void func_8087E858(BgHakaSgami* this, GlobalContext* globalCtx); +void func_8087EDC0(BgHakaSgami* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Sgami_InitVars = { ACTOR_BG_HAKA_SGAMI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgHakaSgami), diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h index 0059304f7c..785fc53a96 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1EC]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ char unk_150[0x1E8]; } BgHakaSgami; // size = 0x0338 extern const ActorInit Bg_Haka_Sgami_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index db2dd668c0..f1866233ab 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -1,18 +1,29 @@ +/* + * File: z_bg_haka_ship.c + * Overlay: ovl_Bg_Haka_Ship + * Description: Shadow Temple Ship + */ + #include "z_bg_haka_ship.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgHakaShip_Init(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_Destroy(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_Update(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_Draw(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F27C(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F2D8(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F364(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F400(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F5C8(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F624(BgHakaShip* this, GlobalContext* globalCtx); +void func_8087F6B4(BgHakaShip* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Ship_InitVars = { ACTOR_BG_HAKA_SHIP, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HAKA_OBJECTS, sizeof(BgHakaShip), diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h index 58645f3a36..adea9036ad 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h @@ -5,8 +5,11 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x2]; + /* 0x016A */ char unk_16A[0x2]; + /* 0x016C */ Vec3f unk_16C; } BgHakaShip; // size = 0x0178 extern const ActorInit Bg_Haka_Ship_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 4961c344b1..070fdb5eb0 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -1,18 +1,34 @@ +/* + * File: z_bg_haka_trap.c + * Overlay: ovl_Bg_Haka_Trap + * Description: Shadow Temple Objects + */ + #include "z_bg_haka_trap.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHakaTrap_Init(BgHakaTrap* this, GlobalContext* globalCtx); void BgHakaTrap_Destroy(BgHakaTrap* this, GlobalContext* globalCtx); void BgHakaTrap_Update(BgHakaTrap* this, GlobalContext* globalCtx); void BgHakaTrap_Draw(BgHakaTrap* this, GlobalContext* globalCtx); +void func_8087FFC0(BgHakaTrap* this, GlobalContext* globalCtx); +void func_808801B8(BgHakaTrap* this, GlobalContext* globalCtx); +void func_808802D8(BgHakaTrap* this, GlobalContext* globalCtx); +void func_80880484(BgHakaTrap* this, GlobalContext* globalCtx); +void func_808805C0(BgHakaTrap* this, GlobalContext* globalCtx); +void func_808806BC(BgHakaTrap* this, GlobalContext* globalCtx); +void func_808808F4(BgHakaTrap* this, GlobalContext* globalCtx); +void func_808809B0(BgHakaTrap* this, GlobalContext* globalCtx); +// void func_808809E4(BgHakaTrap* this, GlobalContext* globalCtx, s16 arg2); most likely correct, but not 100% sure +void func_80880AE8(BgHakaTrap* this, GlobalContext* globalCtx); +void func_80880C0C(BgHakaTrap* this, GlobalContext* globalCtx); +// func_80880D68 /* const ActorInit Bg_Haka_Trap_InitVars = { ACTOR_BG_HAKA_TRAP, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HAKA_OBJECTS, sizeof(BgHakaTrap), @@ -22,6 +38,7 @@ const ActorInit Bg_Haka_Trap_InitVars = { (ActorFunc)BgHakaTrap_Draw, }; */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s") diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h index 5585c68b6e..86616fb6dc 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x150]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x134]; } BgHakaTrap; // size = 0x029C extern const ActorInit Bg_Haka_Trap_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 7d644832ac..6044a682b2 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_haka_tubo.c + * Overlay: ovl_Bg_Haka_Tubo + * Description: Shadow Temple Giant Skull Jar + */ + #include "z_bg_haka_tubo.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgHakaTubo_Init(BgHakaTubo* this, GlobalContext* globalCtx); void BgHakaTubo_Destroy(BgHakaTubo* this, GlobalContext* globalCtx); void BgHakaTubo_Update(BgHakaTubo* this, GlobalContext* globalCtx); void BgHakaTubo_Draw(BgHakaTubo* this, GlobalContext* globalCtx); +void func_808813A0(BgHakaTubo* this, GlobalContext* globalCtx); +void func_80881608(BgHakaTubo* this, GlobalContext* globalCtx); +void func_80881904(BgHakaTubo* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Tubo_InitVars = { ACTOR_BG_HAKA_TUBO, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HAKA_OBJECTS, sizeof(BgHakaTubo), @@ -22,6 +29,7 @@ const ActorInit Bg_Haka_Tubo_InitVars = { (ActorFunc)BgHakaTubo_Draw, }; */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s") diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h index b968c39005..86354c6d86 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xB8]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x9C]; } BgHakaTubo; // size = 0x0204 extern const ActorInit Bg_Haka_Tubo_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 348a262312..4246a3983f 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_haka_water.c + * Overlay: ovl_Bg_Haka_Water + * Description: Bottom of the Well water level changer + */ + #include "z_bg_haka_water.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgHakaWater_Init(BgHakaWater* this, GlobalContext* globalCtx); void BgHakaWater_Destroy(BgHakaWater* this, GlobalContext* globalCtx); void BgHakaWater_Update(BgHakaWater* this, GlobalContext* globalCtx); void BgHakaWater_Draw(BgHakaWater* this, GlobalContext* globalCtx); +// ? func_80881D94(BgHakaWater* this, GlobalContext* globalCtx) // not entirely sure on this one +void func_80881EDC(BgHakaWater* this, GlobalContext* globalCtx); +void func_80881F98(BgHakaWater* this, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Water_InitVars = { ACTOR_BG_HAKA_WATER, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_HAKACH_OBJECTS, sizeof(BgHakaWater), @@ -22,6 +29,7 @@ const ActorInit Bg_Haka_Water_InitVars = { (ActorFunc)BgHakaWater_Draw, }; */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Destroy.s") diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h index a45e557115..12ca27dbc9 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ char unk_150[0x4]; } BgHakaWater; // size = 0x0154 extern const ActorInit Bg_Haka_Water_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index e43e56bc44..f7eee3786a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_haka_zou.c + * Overlay: ovl_Bg_Haka_Zou + * Description: Statue and Wall (Shadow Temple) + */ + #include "z_bg_haka_zou.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgHakaZou_Init(BgHakaZou* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void BgHakaZou_Update(BgHakaZou* this, GlobalContext* globalCtx); const ActorInit Bg_Haka_Zou_InitVars = { ACTOR_BG_HAKA_ZOU, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgHakaZou), diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 10b8ffff04..bc489a25fb 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -1,6 +1,5 @@ #include "z_bg_heavy_block.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHeavyBlock_Init(BgHeavyBlock* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHeavyBlock_Draw(BgHeavyBlock* this, GlobalContext* globalCtx); const ActorInit Bg_Heavy_Block_InitVars = { ACTOR_BG_HEAVY_BLOCK, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HEAVY_OBJECT, sizeof(BgHeavyBlock), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index a23d1c8995..c9fb8a9b07 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_curtain.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgHidanCurtain_Init(BgHidanCurtain* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanCurtain_Draw(BgHidanCurtain* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Curtain_InitVars = { ACTOR_BG_HIDAN_CURTAIN, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgHidanCurtain), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 95dc821835..8c6c467ad6 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_dalm.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanDalm_Init(BgHidanDalm* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanDalm_Draw(BgHidanDalm* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Dalm_InitVars = { ACTOR_BG_HIDAN_DALM, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanDalm), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index be173c006c..124c0c475c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -6,7 +6,6 @@ #include "z_bg_hidan_firewall.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx); @@ -25,7 +24,6 @@ extern Gfx D_0600DA80[]; const ActorInit Bg_Hidan_Firewall_InitVars = { ACTOR_BG_HIDAN_FIREWALL, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanFirewall), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 1178b38e29..397cac5f89 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -6,17 +6,16 @@ #include "z_bg_hidan_fslift.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx); -static void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx); -static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx); -static void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx); +void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx); +void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx); +void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx); +void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx); -static void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx); -static void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx); -static void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx); +void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx); +void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx); +void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx); extern u32 D_0600B630; extern u32 D_0600E1E8; @@ -24,7 +23,6 @@ extern u32 D_0600E1E8; const ActorInit Bg_Hidan_Fslift_InitVars = { ACTOR_BG_HIDAN_FSLIFT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanFslift), @@ -41,7 +39,7 @@ static InitChainEntry initChain[] = { ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP), }; -static void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) { +void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) { s32 pad[2]; s32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -58,7 +56,7 @@ static void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) { this->actionFunc = func_80886FCC; } -static void func_80886F24(BgHidanFslift* this) { +void func_80886F24(BgHidanFslift* this) { Actor* thisx = &this->dyna.actor; if (thisx->attachedB != NULL && thisx->attachedB->update != NULL) { thisx->attachedB->posRot.pos.x = thisx->posRot.pos.x; @@ -69,16 +67,16 @@ static void func_80886F24(BgHidanFslift* this) { thisx->attachedB = NULL; } -static void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx) { +void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_80886FB4(BgHidanFslift* this) { +void func_80886FB4(BgHidanFslift* this) { this->unk_168 = 0x28; this->actionFunc = func_80886FCC; } -static void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) { +void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) { UNK_TYPE somebool; Actor* thisx = &this->dyna.actor; @@ -101,7 +99,7 @@ static void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) { } } -static void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) { +void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y, 4.0f)) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); @@ -112,7 +110,7 @@ static void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) { func_80886F24(this); } -static void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) { +void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (func_80043590(thisx)) { if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 790.0f, 4.0f)) { @@ -127,7 +125,7 @@ static void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) { func_80886F24(this); } -static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) { +void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; this->actionFunc(this, globalCtx); if (func_8004356C(thisx)) { @@ -145,6 +143,6 @@ static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) } } -static void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) { +void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_0600B630); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 81767dc57d..ad9a6ba9cd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_fwbig.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgHidanFwbig_Init(BgHidanFwbig* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanFwbig_Draw(BgHidanFwbig* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Fwbig_InitVars = { ACTOR_BG_HIDAN_FWBIG, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanFwbig), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index b64ae73c99..9584112751 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_hamstep.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanHamstep_Init(BgHidanHamstep* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanHamstep_Draw(BgHidanHamstep* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Hamstep_InitVars = { ACTOR_BG_HIDAN_HAMSTEP, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanHamstep), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index b455d36ca1..9b59620156 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_hidan_hrock.c + * Overlay: ovl_Bg_Hidan_Hrock + * Description: Huge stone spike platform (Fire Temple) + */ + #include "z_bg_hidan_hrock.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanHrock_Init(BgHidanHrock* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgHidanHrock_Draw(BgHidanHrock* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Hrock_InitVars = { ACTOR_BG_HIDAN_HROCK, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanHrock), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 582c3eca43..67c6a3fdad 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_kousi.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgHidanKousi_Init(BgHidanKousi* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanKousi_Draw(BgHidanKousi* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Kousi_InitVars = { ACTOR_BG_HIDAN_KOUSI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanKousi), @@ -22,7 +20,7 @@ const ActorInit Bg_Hidan_Kousi_InitVars = { (ActorFunc)BgHidanKousi_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/func_80889960.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Init.s") diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 0182fe234c..012830c6da 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_kowarerukabe.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanKowarerukabe_Init(BgHidanKowarerukabe* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanKowarerukabe_Draw(BgHidanKowarerukabe* this, GlobalContext* globalCt const ActorInit Bg_Hidan_Kowarerukabe_InitVars = { ACTOR_BG_HIDAN_KOWARERUKABE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanKowarerukabe), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 5a04973c16..74a3fe8ee5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_rock.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanRock_Init(BgHidanRock* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanRock_Draw(BgHidanRock* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Rock_InitVars = { ACTOR_BG_HIDAN_ROCK, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanRock), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 322b096410..ec5eccb32c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_rsekizou.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanRsekizou_Init(BgHidanRsekizou* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanRsekizou_Draw(BgHidanRsekizou* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Rsekizou_InitVars = { ACTOR_BG_HIDAN_RSEKIZOU, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanRsekizou), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index e2db894cd7..ee97d2477e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_sekizou.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanSekizou_Init(BgHidanSekizou* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanSekizou_Draw(BgHidanSekizou* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Sekizou_InitVars = { ACTOR_BG_HIDAN_SEKIZOU, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanSekizou), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index 6e94db4704..7cefee112e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -1,6 +1,5 @@ #include "z_bg_hidan_sima.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanSima_Init(BgHidanSima* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgHidanSima_Draw(BgHidanSima* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Sima_InitVars = { ACTOR_BG_HIDAN_SIMA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, sizeof(BgHidanSima), diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index baca6cd799..fe50a59c66 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -4,44 +4,28 @@ * Description: Stone Elevator in the Fire Temple */ -#include -#include +#include "z_bg_hidan_syoku.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ f32 unk_150; - /* 0x0154 */ f32 unk_154; - /* 0x0158 */ u32 unk_158; - /* 0x015C */ u32 unk_15C; - /* 0x0160 */ u8 unk_160; - /* 0x0164 */ ActorFunc updateFunc; - /* 0x0168 */ s16 unk_168; - /* 0x016A */ s16 unk_16A; -} ActorHidanSyoku; // size = 0x016C - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void Init(ActorHidanSyoku* this, GlobalContext* globalCtx); -static void Destroy(ActorHidanSyoku* this, GlobalContext* globalCtx); -static void func_8088F4B8(ActorHidanSyoku* this, GlobalContext* globalCtx); -static void func_8088F514(ActorHidanSyoku* this, GlobalContext* globalCtx); -static void func_8088F62C(ActorHidanSyoku* this, GlobalContext* globalCtx); -static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx); -static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx); +void BgHidanSyoku_Init(BgHidanSyoku* this, GlobalContext* globalCtx); +void BgHidanSyoku_Destroy(BgHidanSyoku* this, GlobalContext* globalCtx); +void func_8088F4B8(BgHidanSyoku* this, GlobalContext* globalCtx); +void func_8088F514(BgHidanSyoku* this, GlobalContext* globalCtx); +void func_8088F62C(BgHidanSyoku* this, GlobalContext* globalCtx); +void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx); +void BgHidanSyoku_Draw(BgHidanSyoku* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Syoku_InitVars = { ACTOR_BG_HIDAN_SYOKU, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HIDAN_OBJECTS, - sizeof(ActorHidanSyoku), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(BgHidanSyoku), + (ActorFunc)BgHidanSyoku_Init, + (ActorFunc)BgHidanSyoku_Destroy, + (ActorFunc)BgHidanSyoku_Update, + (ActorFunc)BgHidanSyoku_Draw, }; static InitChainEntry initChain[] = { @@ -51,83 +35,83 @@ static InitChainEntry initChain[] = { extern UNK_PTR D_0600A7E0; extern UNK_PTR D_0600E568; -static void Init(ActorHidanSyoku* this, GlobalContext* globalCtx) { +void BgHidanSyoku_Init(BgHidanSyoku* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; - Actor_ProcessInitChain(&this->actor, initChain); - DynaPolyInfo_SetActorMove(&this->actor, 1); + Actor_ProcessInitChain(&this->dyna.actor, initChain); + DynaPolyInfo_SetActorMove(&this->dyna.actor, 1); DynaPolyInfo_Alloc(&D_0600E568, &local_c); - this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); - this->updateFunc = &func_8088F4B8; - this->actor.initPosRot.pos.y += 540.0f; + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c); + this->updateFunc = func_8088F4B8; + this->dyna.actor.initPosRot.pos.y += 540.0f; } -static void Destroy(ActorHidanSyoku* this, GlobalContext* globalCtx) { - DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); +void BgHidanSyoku_Destroy(BgHidanSyoku* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8088F47C(ActorHidanSyoku* this) { - this->unk_16A = 0x3c; - Audio_PlayActorSound2(&this->actor, NA_SE_EV_BLOCK_BOUND); - this->updateFunc = &func_8088F62C; +void func_8088F47C(BgHidanSyoku* this) { + this->unk_16A = 0x3C; + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + this->updateFunc = func_8088F62C; } -static void func_8088F4B8(ActorHidanSyoku* this, GlobalContext* globalCtx) { - if (Flags_GetClear(globalCtx, this->actor.room) && func_8004356C(&this->actor)) { - this->unk_16A = 0x8c; - this->updateFunc = &func_8088F514; +void func_8088F4B8(BgHidanSyoku* this, GlobalContext* globalCtx) { + if (Flags_GetClear(globalCtx, this->dyna.actor.room) && func_8004356C(&this->dyna.actor)) { + this->unk_16A = 0x8C; + this->updateFunc = func_8088F514; } } -static void func_8088F514(ActorHidanSyoku* this, GlobalContext* globalCtx) { +void func_8088F514(BgHidanSyoku* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } - this->actor.posRot.pos.y = (cosf(this->unk_16A * (M_PI / 140)) * 540.0f) + this->actor.initPosRot.pos.y; + this->dyna.actor.posRot.pos.y = (cosf(this->unk_16A * (M_PI / 140)) * 540.0f) + this->dyna.actor.initPosRot.pos.y; if (this->unk_16A == 0) { func_8088F47C(this); } else { - func_8002F974(&this->actor, 0x20b9); + func_8002F974(&this->dyna.actor, 0x20b9); } } -static void func_8088F5A0(ActorHidanSyoku* this, GlobalContext* globalCtx) { +void func_8088F5A0(BgHidanSyoku* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } - this->actor.posRot.pos.y = this->actor.initPosRot.pos.y - (cosf(this->unk_16A * (M_PI / 140)) * 540.0f); + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y - (cosf(this->unk_16A * (M_PI / 140)) * 540.0f); if (this->unk_16A == 0) { func_8088F47C(this); } else { - func_8002F974(&this->actor, 0x20b9); + func_8002F974(&this->dyna.actor, 0x20b9); } } -static void func_8088F62C(ActorHidanSyoku* this, GlobalContext* globalCtx) { +void func_8088F62C(BgHidanSyoku* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; } if (this->unk_16A == 0) { this->unk_16A = 0x8c; - if (this->actor.posRot.pos.y < this->actor.initPosRot.pos.y) { - this->updateFunc = &func_8088F514; + if (this->dyna.actor.posRot.pos.y < this->dyna.actor.initPosRot.pos.y) { + this->updateFunc = func_8088F514; } else { - this->updateFunc = &func_8088F5A0; + this->updateFunc = func_8088F5A0; } } } -static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx) { +void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx) { this->updateFunc(this, globalCtx); - if (func_8004356C(&this->actor)) { + if (func_8004356C(&this->dyna.actor)) { if (this->unk_168 == 0) { this->unk_168 = 3; } func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x30); return; } - if (!func_8004356C(&this->actor)) { + if (!func_8004356C(&this->dyna.actor)) { if (this->unk_168 != 0) { func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 3); } @@ -135,6 +119,6 @@ static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx) { } } -static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx) { +void BgHidanSyoku_Draw(BgHidanSyoku* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_0600A7E0); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h new file mode 100644 index 0000000000..6a4fd8aba9 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h @@ -0,0 +1,16 @@ +#ifndef _Z_BG_HIDAN_SYOKU_H_ +#define _Z_BG_HIDAN_SYOKU_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc updateFunc; + /* 0x0168 */ s16 unk_168; + /* 0x016A */ s16 unk_16A; +} BgHidanSyoku; // size = 0x016C + +extern const ActorInit Bg_Hidan_Syoku_InitVars; + +#endif; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index f41597a140..201b91d6a3 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_ice_objects.c + * Overlay: ovl_Bg_Ice_Objects + * Description: Movable Ice Block. + */ + #include "z_bg_ice_objects.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgIceObjects_Init(BgIceObjects* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgIceObjects_Draw(BgIceObjects* this, GlobalContext* globalCtx); const ActorInit Bg_Ice_Objects_InitVars = { ACTOR_BG_ICE_OBJECTS, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_ICE_OBJECTS, sizeof(BgIceObjects), diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 436f9eafdc..95bdefe0a4 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -1,6 +1,5 @@ #include "z_bg_ice_shelter.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgIceShelter_Init(BgIceShelter* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgIceShelter_Draw(BgIceShelter* this, GlobalContext* globalCtx); const ActorInit Bg_Ice_Shelter_InitVars = { ACTOR_BG_ICE_SHELTER, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_ICE_OBJECTS, sizeof(BgIceShelter), diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 1e295d5842..010011fec0 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_ice_shutter.c + * Overlay: ovl_Bg_Ice_Shutter + * Description: 2D Ice Bars + */ + #include "z_bg_ice_shutter.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgIceShutter_Init(BgIceShutter* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgIceShutter_Draw(BgIceShutter* this, GlobalContext* globalCtx); const ActorInit Bg_Ice_Shutter_InitVars = { ACTOR_BG_ICE_SHUTTER, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_ICE_OBJECTS, sizeof(BgIceShutter), diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h index 08d8caafea..9e093a2bca 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; } BgIceShutter; // size = 0x0168 extern const ActorInit Bg_Ice_Shutter_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 1b269d0fc8..46a8af1f74 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_ice_turara.c + * Overlay: ovl_Bg_Ice_Turara + * Description: Icicles + */ + #include "z_bg_ice_turara.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgIceTurara_Init(BgIceTurara* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgIceTurara_Draw(BgIceTurara* this, GlobalContext* globalCtx); const ActorInit Bg_Ice_Turara_InitVars = { ACTOR_BG_ICE_TURARA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_ICE_OBJECTS, sizeof(BgIceTurara), diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 1e0d352efe..a4d84374b3 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -1,18 +1,25 @@ +/* + * File: z_bg_ingate.c + * Overlay: ovl_Bg_Ingate + * Description: Ingo's Gates (Lon Lon Ranch) + */ + #include "z_bg_ingate.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgIngate_Init(BgIngate* this, GlobalContext* globalCtx); void BgIngate_Destroy(BgIngate* this, GlobalContext* globalCtx); void BgIngate_Update(BgIngate* this, GlobalContext* globalCtx); void BgIngate_Draw(BgIngate* this, GlobalContext* globalCtx); +void BgIngate_SetupAction(BgIngate* this, ActorFunc actionFunc); +void func_80892890(BgIngate* this, GlobalContext* globalCtx); +void func_80892990(BgIngate* this, GlobalContext* globalCtx); /* const ActorInit Bg_Ingate_InitVars = { ACTOR_BG_INGATE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_INGATE, sizeof(BgIngate), @@ -22,7 +29,7 @@ const ActorInit Bg_Ingate_InitVars = { (ActorFunc)BgIngate_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ingate/func_80892740.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s") diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index 0205b7721c..30105cc354 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; } BgIngate; // size = 0x0168 extern const ActorInit Bg_Ingate_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index cc58fdae75..5ee9c4f40f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -1,6 +1,5 @@ #include "z_bg_jya_1flift.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgJya1flift_Init(BgJya1flift* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJya1flift_Draw(BgJya1flift* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_1flift_InitVars = { ACTOR_BG_JYA_1FLIFT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJya1flift), diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 5c625673e3..0624b78234 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -4,37 +4,27 @@ * Description: Circular Metal Grate (Spirit Temple) */ -#include -#include +#include "z_bg_jya_amishutter.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; - /* 0x0164 */ void (*updateFunc)(Actor*); -} BgJyaAmishutter; // size = 0x0168 - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx); -static void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx); -static void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx); -static void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx); +void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx); +void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx); +void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx); +void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx); -static void func_808933BC(BgJyaAmishutter* this); -static void func_808933CC(BgJyaAmishutter* this); -static void func_80893428(BgJyaAmishutter* this); -static void func_80893438(BgJyaAmishutter* this); -static void func_808934B0(BgJyaAmishutter* this); -static void func_808934C0(BgJyaAmishutter* this); -static void func_808934FC(BgJyaAmishutter* this); -static void func_8089350C(BgJyaAmishutter* this); +void func_808933BC(BgJyaAmishutter* this); +void func_808933CC(BgJyaAmishutter* this); +void func_80893428(BgJyaAmishutter* this); +void func_80893438(BgJyaAmishutter* this); +void func_808934B0(BgJyaAmishutter* this); +void func_808934C0(BgJyaAmishutter* this); +void func_808934FC(BgJyaAmishutter* this); +void func_8089350C(BgJyaAmishutter* this); const ActorInit Bg_Jya_Amishutter_InitVars = { ACTOR_BG_JYA_AMISHUTTER, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaAmishutter), @@ -54,7 +44,7 @@ static InitChainEntry initChain[] = { extern UNK_TYPE D_0600C4C8; extern UNK_TYPE D_0600C0A0; -static void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { +void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; u32 local_c = 0; s16 pad2; @@ -68,21 +58,21 @@ static void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 c } } -static void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx) { +void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx) { func_808932C0(this, globalCtx, &D_0600C4C8, 0); Actor_ProcessInitChain(&this->actor, initChain); func_808933BC(this); } -static void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx) { +void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void func_808933BC(BgJyaAmishutter* this) { +void func_808933BC(BgJyaAmishutter* this) { this->updateFunc = func_808933CC; } -static void func_808933CC(BgJyaAmishutter* this) { +void func_808933CC(BgJyaAmishutter* this) { if (this->actor.xzDistanceFromLink < 60.0f) { if (fabsf(this->actor.yDistanceFromLink) < 30.0f) { func_80893428(this); @@ -90,11 +80,11 @@ static void func_808933CC(BgJyaAmishutter* this) { } } -static void func_80893428(BgJyaAmishutter* this) { +void func_80893428(BgJyaAmishutter* this) { this->updateFunc = func_80893438; } -static void func_80893438(BgJyaAmishutter* this) { +void func_80893438(BgJyaAmishutter* this) { if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 100.0f, 3.0f)) { func_808934B0(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); @@ -103,21 +93,21 @@ static void func_80893438(BgJyaAmishutter* this) { } } -static void func_808934B0(BgJyaAmishutter* this) { +void func_808934B0(BgJyaAmishutter* this) { this->updateFunc = func_808934C0; } -static void func_808934C0(BgJyaAmishutter* this) { +void func_808934C0(BgJyaAmishutter* this) { if (this->actor.xzDistanceFromLink > 300.0f) { func_808934FC(this); } } -static void func_808934FC(BgJyaAmishutter* this) { +void func_808934FC(BgJyaAmishutter* this) { this->updateFunc = func_8089350C; } -static void func_8089350C(BgJyaAmishutter* this) { +void func_8089350C(BgJyaAmishutter* this) { if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 3.0f)) { func_808933BC(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); @@ -126,10 +116,10 @@ static void func_8089350C(BgJyaAmishutter* this) { } } -static void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx) { +void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx) { this->updateFunc(this); } -static void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) { +void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_0600C0A0); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h new file mode 100644 index 0000000000..22cc107e7e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h @@ -0,0 +1,16 @@ +#ifndef _Z_BG_JYA_AMISHUTTER_H_ +#define _Z_BG_JYA_AMISHUTTER_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; + /* 0x0164 */ void (*updateFunc)(Actor*); +} BgJyaAmishutter; // size = 0x0168 + +extern const ActorInit Bg_Jya_Amishutter_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index dfd6a817b7..06230fe201 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -1,6 +1,5 @@ #include "z_bg_jya_bigmirror.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgJyaBigmirror_Init(BgJyaBigmirror* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaBigmirror_Draw(BgJyaBigmirror* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Bigmirror_InitVars = { ACTOR_BG_JYA_BIGMIRROR, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaBigmirror), diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index f149e3e018..d80b9d49e1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_jya_block.c + * Overlay: ovl_Bg_Jya_Block + * Description: Silver Block (Child Link) + */ + #include "z_bg_jya_block.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaBlock_Init(BgJyaBlock* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgJyaBlock_Draw(BgJyaBlock* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Block_InitVars = { ACTOR_BG_JYA_BLOCK, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(BgJyaBlock), diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h index c4975cbab3..4be4b40ad9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h @@ -5,8 +5,7 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x18]; + /* 0x0000 */ DynaPolyActor dyna; } BgJyaBlock; // size = 0x0164 extern const ActorInit Bg_Jya_Block_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index c9b3362d85..b7deadc354 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -1,6 +1,5 @@ #include "z_bg_jya_bombchuiwa.h" -#define ROOM 0x00 #define FLAGS 0x00000001 void BgJyaBombchuiwa_Init(BgJyaBombchuiwa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaBombchuiwa_Draw(BgJyaBombchuiwa* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Bombchuiwa_InitVars = { ACTOR_BG_JYA_BOMBCHUIWA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaBombchuiwa), diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 1b13877d1d..25929e7888 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -1,6 +1,5 @@ #include "z_bg_jya_bombiwa.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaBombiwa_Init(BgJyaBombiwa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaBombiwa_Draw(BgJyaBombiwa* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Bombiwa_InitVars = { ACTOR_BG_JYA_BOMBIWA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaBombiwa), diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 15c138c387..c38e5cbebd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -1,6 +1,5 @@ #include "z_bg_jya_cobra.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaCobra_Init(BgJyaCobra* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaCobra_Draw(BgJyaCobra* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Cobra_InitVars = { ACTOR_BG_JYA_COBRA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaCobra), diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 708400e173..05e16263ec 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -1,6 +1,5 @@ #include "z_bg_jya_goroiwa.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaGoroiwa_Init(BgJyaGoroiwa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaGoroiwa_Draw(BgJyaGoroiwa* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Goroiwa_InitVars = { ACTOR_BG_JYA_GOROIWA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GOROIWA, sizeof(BgJyaGoroiwa), diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 49c5e5a9f1..d64ab25c2d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_jya_haheniron + * Overlay: ovl_Bg_Jya_Haheniron + * Description: Chunks of Iron Knucle Chair and Pillar + */ + #include "z_bg_jya_haheniron.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaHaheniron_Init(BgJyaHaheniron* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgJyaHaheniron_Draw(BgJyaHaheniron* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Haheniron_InitVars = { ACTOR_BG_JYA_HAHENIRON, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_JYA_IRON, sizeof(BgJyaHaheniron), diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index ad9934743a..a8d88951df 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -1,6 +1,5 @@ #include "z_bg_jya_ironobj.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaIronobj_Init(BgJyaIronobj* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaIronobj_Draw(BgJyaIronobj* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Ironobj_InitVars = { ACTOR_BG_JYA_IRONOBJ, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_JYA_IRON, sizeof(BgJyaIronobj), diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 7bf4de13eb..3a66aad492 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -4,36 +4,24 @@ * Description: Climbable Metal Grating (Fire Temple) */ -#include -#include +#include "z_bg_jya_kanaami.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x014C */ char unk_150[0x14]; - /* 0x0164 */ ActorFunc updateFunc; - /* 0x0168 */ s16 unk_168; - /* 0x016A */ s16 unk_16A; -} BgJyaKanaami; // size = 0x016C - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx); -static void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx); -static void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx); -static void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx); +void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx); +void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx); +void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx); +void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx); -static void func_80899880(BgJyaKanaami* this); -static void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx); -static void func_8089993C(BgJyaKanaami* this); -static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx); -static void func_80899A08(BgJyaKanaami* this); +void func_80899880(BgJyaKanaami* this); +void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx); +void func_8089993C(BgJyaKanaami* this); +void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx); +void func_80899A08(BgJyaKanaami* this); const ActorInit Bg_Jya_Kanaami_InitVars = { ACTOR_BG_JYA_KANAAMI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaKanaami), @@ -53,7 +41,7 @@ static InitChainEntry initChain[] = { extern u32 D_0600F000; extern u32 D_0600F208; -static void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { +void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s32 pad; s32 local_c = 0; s32 pad2; @@ -67,7 +55,7 @@ static void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 coll } } -static void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) { +void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) { func_80899740(this, globalCtx, &D_0600F208, 0); Actor_ProcessInitChain(&this->actor, initChain); if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F)) { @@ -78,16 +66,16 @@ static void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) { osSyncPrintf("(jya 金網)(arg_data 0x%04x)\n", this->actor.params); } -static void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx) { +void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void func_80899880(BgJyaKanaami* this) { +void func_80899880(BgJyaKanaami* this) { this->updateFunc = func_80899894; this->unk_16A = 0; } -static void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx) { +void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) || this->unk_16A > 0) { if (this->actor.posRot.pos.x > -1000.0f && this->unk_16A == 0) { func_800800F8(globalCtx, 0xD7A, -0x63, &this->actor, 0); @@ -99,12 +87,12 @@ static void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx) { } } -static void func_8089993C(BgJyaKanaami* this) { +void func_8089993C(BgJyaKanaami* this) { this->updateFunc = func_80899950; this->unk_168 = 0; } -static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { +void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { s32 pad[2]; s32 var; this->unk_168 += 0x20; @@ -118,18 +106,18 @@ static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { } } -static void func_80899A08(BgJyaKanaami* this) { +void func_80899A08(BgJyaKanaami* this) { this->updateFunc = 0; this->actor.posRot.rot.x = 0x4000; } -static void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) { +void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) { if (this->updateFunc) { this->updateFunc(this, globalCtx); } this->actor.shape.rot.x = this->actor.posRot.rot.x; } -static void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) { +void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_0600F000); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h new file mode 100644 index 0000000000..881e213d79 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h @@ -0,0 +1,16 @@ +#ifndef _Z_BG_JYA_KANAAMI_H_ +#define _Z_BG_JYA_KANAAMI_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x014C */ char unk_150[0x14]; + /* 0x0164 */ ActorFunc updateFunc; + /* 0x0168 */ s16 unk_168; + /* 0x016A */ s16 unk_16A; +} BgJyaKanaami; // size = 0x016C + +#endif diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index b2fdf1bfab..03d2699dff 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_jya_lift.c + * Overlay: ovl_Bg_Jya_Lift + * Description: Chain Platform (Spirit Temple) + */ + #include "z_bg_jya_lift.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaLift_Init(BgJyaLift* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgJyaLift_Draw(BgJyaLift* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Lift_InitVars = { ACTOR_BG_JYA_LIFT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaLift), diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index 027aca3bfc..9f516a216b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -1,6 +1,5 @@ #include "z_bg_jya_megami.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaMegami_Init(BgJyaMegami* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaMegami_Draw(BgJyaMegami* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Megami_InitVars = { ACTOR_BG_JYA_MEGAMI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaMegami), diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 9ff3088d1a..30c03326e8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -1,6 +1,5 @@ #include "z_bg_jya_zurerukabe.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaZurerukabe_Init(BgJyaZurerukabe* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgJyaZurerukabe_Draw(BgJyaZurerukabe* this, GlobalContext* globalCtx); const ActorInit Bg_Jya_Zurerukabe_InitVars = { ACTOR_BG_JYA_ZURERUKABE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_JYA_OBJ, sizeof(BgJyaZurerukabe), diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index f3dd3407eb..88766063df 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_menkuri_eye.c + * Overlay: ovl_Bg_Menkuri_Eye + * Description: Eye platform eye switches + */ + #include "z_bg_menkuri_eye.h" -#define ROOM 0x00 #define FLAGS 0x00000020 void BgMenkuriEye_Init(BgMenkuriEye* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgMenkuriEye_Draw(BgMenkuriEye* this, GlobalContext* globalCtx); const ActorInit Bg_Menkuri_Eye_InitVars = { ACTOR_BG_MENKURI_EYE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MENKURI_OBJECTS, sizeof(BgMenkuriEye), diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h index 9bbfa6ad00..fed60dee3f 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h @@ -6,7 +6,9 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x64]; + /* 0x014C */ char unk_14C[0x4]; + /* 0x0150 */ Collider collider; + /* 0x0168 */ char unk_168[0x48]; } BgMenkuriEye; // size = 0x01B0 extern const ActorInit Bg_Menkuri_Eye_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 12fe63b800..aa784a5355 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -4,44 +4,35 @@ * Description: Large rotating stone ring used in Gerudo Training Grounds and Forest Temple. */ -#include -#include +#include "z_bg_menkuri_kaiten.h" extern u32 D_060038D0; extern u32 D_060042D8; -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; -} ActorMenkuriKaiten; // size = 0x0164 - -#define ROOM 0x00 #define FLAGS 0x00000030 -static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx); -static void Destroy(ActorMenkuriKaiten* this, GlobalContext* globalCtx); -static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx); -static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx); +void BgMenkuriKaiten_Init(BgMenkuriKaiten* this, GlobalContext* globalCtx); +void BgMenkuriKaiten_Destroy(BgMenkuriKaiten* this, GlobalContext* globalCtx); +void BgMenkuriKaiten_Update(BgMenkuriKaiten* this, GlobalContext* globalCtx); +void BgMenkuriKaiten_Draw(BgMenkuriKaiten* this, GlobalContext* globalCtx); const ActorInit Bg_Menkuri_Kaiten_InitVars = { ACTOR_BG_MENKURI_KAITEN, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MENKURI_OBJECTS, - sizeof(ActorMenkuriKaiten), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(BgMenkuriKaiten), + (ActorFunc)BgMenkuriKaiten_Init, + (ActorFunc)BgMenkuriKaiten_Destroy, + (ActorFunc)BgMenkuriKaiten_Update, + (ActorFunc)BgMenkuriKaiten_Draw, }; static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { +void BgMenkuriKaiten_Init(BgMenkuriKaiten* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; @@ -51,17 +42,17 @@ static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); } -static void Destroy(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { +void BgMenkuriKaiten_Destroy(BgMenkuriKaiten* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { +void BgMenkuriKaiten_Update(BgMenkuriKaiten* this, GlobalContext* globalCtx) { if (!Flags_GetSwitch(globalCtx, this->actor.params) && func_80043590(&this->actor)) { func_8002F974(&this->actor, 0x2024); this->actor.shape.rot.y += 0x80; } } -static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { +void BgMenkuriKaiten_Draw(BgMenkuriKaiten* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_060038D0); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h new file mode 100644 index 0000000000..ab5390a45e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h @@ -0,0 +1,15 @@ +#ifndef _Z_BG_MENKURI_KAITEN_H_ +#define _Z_BG_MENKURI_KAITEN_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; +} BgMenkuriKaiten; // size = 0x0164 + +extern const ActorInit Bg_Menkuri_Kaiten_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index 352621740f..fc3b2b1e45 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -4,44 +4,37 @@ * Description: False Stone Walls (Gerudo Training Grounds) */ -#include -#include +#include "z_bg_menkuri_nisekabe.h" -typedef struct { - /* 0x0000 */ Actor actor; -} BgMenkuriNisekabe; // size = 0x014C - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx); -static void Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx); -static void Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx); -static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx); +void BgMenkuriNisekabe_Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx); +void BgMenkuriNisekabe_Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx); +void BgMenkuriNisekabe_Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx); +void BgMenkuriNisekabe_Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx); const ActorInit Bg_Menkuri_Nisekabe_InitVars = { ACTOR_BG_MENKURI_NISEKABE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_MENKURI_OBJECTS, sizeof(BgMenkuriNisekabe), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + (ActorFunc)BgMenkuriNisekabe_Init, + (ActorFunc)BgMenkuriNisekabe_Destroy, + (ActorFunc)BgMenkuriNisekabe_Update, + (ActorFunc)BgMenkuriNisekabe_Draw, }; static u32 segmentAddr[] = { 0x06002280, 0x06002BC0 }; -static void Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { +void BgMenkuriNisekabe_Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.1f); } -static void Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { +void BgMenkuriNisekabe_Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { } -static void Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { +void BgMenkuriNisekabe_Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { if (globalCtx->actorCtx.unk_03 != 0) { this->actor.flags |= 0x80; } else { @@ -49,7 +42,7 @@ static void Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { } } -static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { +void BgMenkuriNisekabe_Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h new file mode 100644 index 0000000000..697082dec0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h @@ -0,0 +1,11 @@ +#ifndef _Z_BG_MENKURI_NISEKABE_H_ +#define _Z_BG_MENKURI_NISEKABE_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; +} BgMenkuriNisekabe; // size = 0x014C + +#endif diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 924cc04af7..d2cb40f96c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -1,6 +1,5 @@ #include "z_bg_mizu_bwall.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgMizuBwall_Init(BgMizuBwall* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgMizuBwall_Draw(BgMizuBwall* this, GlobalContext* globalCtx); const ActorInit Bg_Mizu_Bwall_InitVars = { ACTOR_BG_MIZU_BWALL, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MIZU_OBJECTS, sizeof(BgMizuBwall), diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 6b0911c0c1..8b8671b13c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -1,6 +1,5 @@ #include "z_bg_mizu_movebg.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgMizuMovebg_Init(BgMizuMovebg* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgMizuMovebg_Draw(BgMizuMovebg* this, GlobalContext* globalCtx); const ActorInit Bg_Mizu_Movebg_InitVars = { ACTOR_BG_MIZU_MOVEBG, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MIZU_OBJECTS, sizeof(BgMizuMovebg), diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index e2db36f0df..294bdee593 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,6 +1,5 @@ #include "z_bg_mizu_shutter.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgMizuShutter_Init(BgMizuShutter* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgMizuShutter_Draw(BgMizuShutter* this, GlobalContext* globalCtx); const ActorInit Bg_Mizu_Shutter_InitVars = { ACTOR_BG_MIZU_SHUTTER, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_MIZU_OBJECTS, sizeof(BgMizuShutter), diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index d4a4bebc28..a658542dd1 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -4,26 +4,18 @@ * Description: Water Noise */ -#include -#include +#include "z_bg_mizu_uzu.h" -typedef struct { - /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ ActorFunc actionFunc; -} BgMizuUzu; // size = 0x0168 - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx); -static void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx); -static void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx); -static void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx); +void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx); +void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx); +void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx); +void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx); const ActorInit Bg_Mizu_Uzu_InitVars = { ACTOR_BG_MIZU_UZU, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_MIZU_OBJECTS, sizeof(BgMizuUzu), @@ -41,9 +33,9 @@ static InitChainEntry initChain[] = { extern u32 D_060074EC; -static void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx); +void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx); -static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) { +void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) { s32 pad[2]; s32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -54,11 +46,11 @@ static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) { this->actionFunc = func_8089F788; } -static void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx) { +void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) { +void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (PLAYER->currentBoots == 1) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); @@ -69,9 +61,9 @@ static void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) { thisx->shape.rot.y += 0x1C0; } -static void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx) { +void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx) { +void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx) { } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h new file mode 100644 index 0000000000..abddc798ba --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h @@ -0,0 +1,14 @@ +#ifndef _Z_BG_MIZU_UZU_H_ +#define _Z_BG_MIZU_UZU_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; +} BgMizuUzu; // size = 0x0168 + +extern const ActorInit Bg_Mizu_Uzu_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 542b4fe817..4920f5f9dc 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -1,6 +1,5 @@ #include "z_bg_mizu_water.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgMizuWater_Init(BgMizuWater* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgMizuWater_Draw(BgMizuWater* this, GlobalContext* globalCtx); const ActorInit Bg_Mizu_Water_InitVars = { ACTOR_BG_MIZU_WATER, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MIZU_OBJECTS, sizeof(BgMizuWater), diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 1d59fcd809..e31cec6d6f 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -6,21 +6,19 @@ #include "z_bg_mjin.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc); -static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx); -static void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx); -static void func_808A0850(BgMjin* this, GlobalContext* globalCtx); -static void func_808A0920(BgMjin* this, GlobalContext* globalCtx); -static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx); -static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx); +void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc); +void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx); +void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx); +void func_808A0850(BgMjin* this, GlobalContext* globalCtx); +void func_808A0920(BgMjin* this, GlobalContext* globalCtx); +void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx); +void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx); const ActorInit Bg_Mjin_InitVars = { ACTOR_BG_MJIN, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgMjin), @@ -45,11 +43,11 @@ static InitChainEntry initChain[] = { static s16 objectTbl[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME, OBJECT_MJIN_ICE, OBJECT_MJIN_SOUL, OBJECT_MJIN_WIND }; -static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc) { +void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) { +void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s8 objBankIndex; @@ -63,11 +61,11 @@ static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) { } } -static void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx) { +void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808A0850(BgMjin* this, GlobalContext* globalCtx) { +void func_808A0850(BgMjin* this, GlobalContext* globalCtx) { u32 local_c; u32 collision; @@ -86,14 +84,14 @@ static void func_808A0850(BgMjin* this, GlobalContext* globalCtx) { } } -static void func_808A0920(BgMjin* this, GlobalContext* globalCtx) { +void func_808A0920(BgMjin* this, GlobalContext* globalCtx) { } -static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx) { +void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) { +void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) { s32 objBankIndex; u32 dlist; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index d6e0e2401e..33282f4419 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -1,6 +1,5 @@ #include "z_bg_mori_bigst.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgMoriBigst_Init(BgMoriBigst* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriBigst_Update(BgMoriBigst* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Bigst_InitVars = { ACTOR_BG_MORI_BIGST, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriBigst), diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 583d621a13..1e56aa0968 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -1,6 +1,5 @@ #include "z_bg_mori_elevator.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgMoriElevator_Init(BgMoriElevator* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriElevator_Update(BgMoriElevator* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Elevator_InitVars = { ACTOR_BG_MORI_ELEVATOR, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriElevator), diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 5bab5345f3..ac4fa17732 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -1,6 +1,5 @@ #include "z_bg_mori_hashigo.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgMoriHashigo_Init(BgMoriHashigo* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriHashigo_Update(BgMoriHashigo* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Hashigo_InitVars = { ACTOR_BG_MORI_HASHIGO, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriHashigo), diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 3c6f144ee0..8be46e9aac 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -1,6 +1,5 @@ #include "z_bg_mori_hashira4.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgMoriHashira4_Init(BgMoriHashira4* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriHashira4_Update(BgMoriHashira4* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Hashira4_InitVars = { ACTOR_BG_MORI_HASHIRA4, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriHashira4), diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index e2e73a086d..5adfe957b0 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -1,6 +1,5 @@ #include "z_bg_mori_hineri.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgMoriHineri_Init(BgMoriHineri* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriHineri_Update(BgMoriHineri* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Hineri_InitVars = { ACTOR_BG_MORI_HINERI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgMoriHineri), diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 4836532199..56751d793b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -1,6 +1,5 @@ #include "z_bg_mori_idomizu.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgMoriIdomizu_Init(BgMoriIdomizu* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriIdomizu_Update(BgMoriIdomizu* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Idomizu_InitVars = { ACTOR_BG_MORI_IDOMIZU, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriIdomizu), diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index a8afb41487..c01deefd3c 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -1,6 +1,5 @@ #include "z_bg_mori_kaitenkabe.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgMoriKaitenkabe_Init(BgMoriKaitenkabe* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriKaitenkabe_Update(BgMoriKaitenkabe* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Kaitenkabe_InitVars = { ACTOR_BG_MORI_KAITENKABE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriKaitenkabe), diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 02b931495c..962049ec6e 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -1,6 +1,5 @@ #include "z_bg_mori_rakkatenjo.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgMoriRakkatenjo_Init(BgMoriRakkatenjo* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void BgMoriRakkatenjo_Update(BgMoriRakkatenjo* this, GlobalContext* globalCtx); const ActorInit Bg_Mori_Rakkatenjo_InitVars = { ACTOR_BG_MORI_RAKKATENJO, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MORI_OBJECTS, sizeof(BgMoriRakkatenjo), diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 7ac4e8e4af..b10bb5d67a 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -1,6 +1,5 @@ #include "z_bg_po_event.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgPoEvent_Init(BgPoEvent* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgPoEvent_Draw(BgPoEvent* this, GlobalContext* globalCtx); const ActorInit Bg_Po_Event_InitVars = { ACTOR_BG_PO_EVENT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_PO_SISTERS, sizeof(BgPoEvent), diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 2fd1e75f16..a468e112c3 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -1,6 +1,5 @@ #include "z_bg_po_syokudai.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgPoSyokudai_Init(BgPoSyokudai* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgPoSyokudai_Draw(BgPoSyokudai* this, GlobalContext* globalCtx); const ActorInit Bg_Po_Syokudai_InitVars = { ACTOR_BG_PO_SYOKUDAI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SYOKUDAI, sizeof(BgPoSyokudai), diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index ad13f0c331..612eca636a 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -6,20 +6,18 @@ #include "z_bg_pushbox.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc); -static void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx); -static void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx); -static void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx); -static void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx); -static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx); +void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc); +void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx); +void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx); +void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx); +void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx); +void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx); const ActorInit Bg_Pushbox_InitVars = { ACTOR_BG_PUSHBOX, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(BgPushbox), @@ -36,11 +34,11 @@ static InitChainEntry initChain[] = { ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_STOP), }; -static void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) { +void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) { +void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -53,11 +51,11 @@ static void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) { func_808A8AE0(this, &func_808A8BAC); } -static void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx) { +void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) { +void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->speedXZ += this->dyna.unk_150 * 0.2f; @@ -68,12 +66,12 @@ static void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) { func_8002E4B4(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D); } -static void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx) { +void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); func_8002DF90(this); } -static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) { +void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 19a950888a..3adf87ff98 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_relay_objects.c + * Overlay: ovl_Bg_Relay_Objects + * Description: Windmill Setpieces + */ + #include "z_bg_relay_objects.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgRelayObjects_Init(BgRelayObjects* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgRelayObjects_Draw(BgRelayObjects* this, GlobalContext* globalCtx); const ActorInit Bg_Relay_Objects_InitVars = { ACTOR_BG_RELAY_OBJECTS, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_RELAY_OBJECTS, sizeof(BgRelayObjects), diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index d23cc9a054..fdf14b45c9 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -4,35 +4,25 @@ * Description: Broken drawbridge in Hyrule Field. */ -#include -#include -#include +#include "z_bg_spot00_break.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; -} ActorSpot00Break; // size = 0x0164 - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorSpot00Break* this, GlobalContext* globalCtx); -static void Destroy(ActorSpot00Break* this, GlobalContext* globalCtx); -static void Update(ActorSpot00Break* this, GlobalContext* globalCtx); -static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx); +void BgSpot00Break_Init(BgSpot00Break* this, GlobalContext* globalCtx); +void BgSpot00Break_Destroy(BgSpot00Break* this, GlobalContext* globalCtx); +void BgSpot00Break_Update(BgSpot00Break* this, GlobalContext* globalCtx); +void BgSpot00Break_Draw(BgSpot00Break* this, GlobalContext* globalCtx); const ActorInit Bg_Spot00_Break_InitVars = { ACTOR_BG_SPOT00_BREAK, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT00_BREAK, - sizeof(ActorSpot00Break), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(BgSpot00Break), + (ActorFunc)BgSpot00Break_Init, + (ActorFunc)BgSpot00Break_Destroy, + (ActorFunc)BgSpot00Break_Update, + (ActorFunc)BgSpot00Break_Draw, }; static InitChainEntry initChain[] = { @@ -47,7 +37,7 @@ extern D_06000908; // segmented address: 0x06000908 extern D_06000980; // segmented address: 0x06000980 extern D_06000440; // segmented address: 0x06000440 -static void Init(ActorSpot00Break* this, GlobalContext* globalCtx) { +void BgSpot00Break_Init(BgSpot00Break* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; @@ -67,14 +57,14 @@ static void Init(ActorSpot00Break* this, GlobalContext* globalCtx) { } } -static void Destroy(ActorSpot00Break* this, GlobalContext* globalCtx) { +void BgSpot00Break_Destroy(BgSpot00Break* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorSpot00Break* this, GlobalContext* globalCtx) { +void BgSpot00Break_Update(BgSpot00Break* this, GlobalContext* globalCtx) { } -static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx) { +void BgSpot00Break_Draw(BgSpot00Break* this, GlobalContext* globalCtx) { if (this->actor.params == 1) { Gfx_DrawDListOpa(globalCtx, &D_06000980); } else { diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h new file mode 100644 index 0000000000..4a06343ce3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h @@ -0,0 +1,14 @@ +#ifndef _Z_BG_SPOT00_BREAK_H +#define _Z_BG_SPOT00_BREAK_H_ + +#include +#include + + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; +} BgSpot00Break; // size = 0x0164 + +#endif diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 69f4180bbb..0c134320a5 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -1,6 +1,5 @@ #include "z_bg_spot00_hanebasi.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot00Hanebasi_Init(BgSpot00Hanebasi* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot00Hanebasi_Draw(BgSpot00Hanebasi* this, GlobalContext* globalCtx); const ActorInit Bg_Spot00_Hanebasi_InitVars = { ACTOR_BG_SPOT00_HANEBASI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT00_OBJECTS, sizeof(BgSpot00Hanebasi), diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h index b0349e7894..6666bbb001 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x34]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x1C]; } BgSpot00Hanebasi; // size = 0x0180 extern const ActorInit Bg_Spot00_Hanebasi_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 39a02d7f9d..2e0783f50c 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -4,32 +4,20 @@ * Description: Windmill Sails */ -#include -#include +#include "z_bg_spot01_fusya.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ ActorFunc actionFunc; - /* 0x0150 */ char unk_150[0x4]; - /* 0x0154 */ f32 unk_154; - /* 0x0158 */ f32 unk_158; - /* 0x015C */ f32 unk_15C; -} BgSpot01Fusya; // size = 0x0160 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx); -static void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx); -static void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx); -static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx); +void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx); +void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx); +void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx); +void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx); -static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx); +void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx); const ActorInit Bg_Spot01_Fusya_InitVars = { ACTOR_BG_SPOT01_FUSYA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT01_OBJECTS, sizeof(BgSpot01Fusya), @@ -48,11 +36,11 @@ static InitChainEntry initChain[] = { extern u32 D_06000100; -static void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, ActorFunc actionFunc) { +void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) { +void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); this->unk_154 = 100.0f; this->unk_158 = 100.0f; @@ -63,10 +51,10 @@ static void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) { BgSpot01Fusya_SetupAction(this, func_808AAA50); } -static void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx) { +void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx) { } -static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) { +void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) { f32 temp; Actor* thisx = &this->actor; if (gSaveContext.event_chk_inf[6] & 0x20) { @@ -78,11 +66,11 @@ static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxF(&this->unk_154, this->unk_158, this->unk_15C, 100.0f); } -static void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx) { +void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) { +void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h new file mode 100644 index 0000000000..3aa0609c1c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h @@ -0,0 +1,18 @@ +#ifndef _Z_BG_SPOT01_FUSYA_H_ +#define _Z_BG_SPOT01_FUSYA_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ char unk_150[0x4]; + /* 0x0154 */ f32 unk_154; + /* 0x0158 */ f32 unk_158; + /* 0x015C */ f32 unk_15C; +} BgSpot01Fusya; // size = 0x0160 + +extern const ActorInit Bg_Spot01_Fusya_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index d1db93f4af..695d55d396 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -1,6 +1,5 @@ #include "z_bg_spot01_idohashira.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot01Idohashira_Init(BgSpot01Idohashira* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot01Idohashira_Draw(BgSpot01Idohashira* this, GlobalContext* globalCtx) const ActorInit Bg_Spot01_Idohashira_InitVars = { ACTOR_BG_SPOT01_IDOHASHIRA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT01_OBJECTS, sizeof(BgSpot01Idohashira), diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 4c20b31221..cafd921ca6 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -1,18 +1,23 @@ +/* + * File: z_bg_spot01_idomizu.c + * Overlay: ovl_Bg_Spot01_Idomizu + * Description: Kakariko Village Well Water + */ + #include "z_bg_spot01_idomizu.h" -#define ROOM 0x00 #define FLAGS 0x00000020 void BgSpot01Idomizu_Init(BgSpot01Idomizu* this, GlobalContext* globalCtx); void BgSpot01Idomizu_Destroy(BgSpot01Idomizu* this, GlobalContext* globalCtx); void BgSpot01Idomizu_Update(BgSpot01Idomizu* this, GlobalContext* globalCtx); void BgSpot01Idomizu_Draw(BgSpot01Idomizu* this, GlobalContext* globalCtx); +void func_808ABB84(BgSpot01Idomizu* this, GlobalContext* globalCtx); /* const ActorInit Bg_Spot01_Idomizu_InitVars = { ACTOR_BG_SPOT01_IDOMIZU, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT01_OBJECTS, sizeof(BgSpot01Idomizu), diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h index e2a45cc9e5..9c6612edb2 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h @@ -6,7 +6,9 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xC]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ f32 unk_150; + /* 0x0154 */ char unk_154[0x4]; } BgSpot01Idomizu; // size = 0x0158 extern const ActorInit Bg_Spot01_Idomizu_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 84ba76bb23..793241224b 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -4,28 +4,20 @@ * Description: Stone blocking entrance to Bottom of the Well */ -#include -#include +#include "z_bg_spot01_idosoko.h" -typedef struct { - /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ ActorFunc actionFunc; -} BgSpot01Idosoko; // size = 0x0168 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx); -static void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx); -static void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx); -static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx); +void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx); +void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx); +void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx); +void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx); -static void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx); +void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx); const ActorInit Bg_Spot01_Idosoko_InitVars = { ACTOR_BG_SPOT01_IDOSOKO, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT01_MATOYA, sizeof(BgSpot01Idosoko), @@ -41,11 +33,11 @@ static InitChainEntry initChain[] = { extern u32 D_06003C64; -static void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, ActorFunc actionFunc) { +void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx) { +void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx) { s32 pad[2]; s32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -60,20 +52,20 @@ static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx } } -static void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx) { +void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx) { +void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx) { } -static void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx) { +void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } extern u32 D_06003B20; -static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx) { +void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h new file mode 100644 index 0000000000..9d93a57bcd --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h @@ -0,0 +1,14 @@ +#ifndef _Z_BG_SPOT01_IDOSOKO_H_ +#define _Z_BG_SPOT01_IDOSOKO_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; +} BgSpot01Idosoko; // size = 0x0168 + +extern const ActorInit Bg_Spot01_Idosoko_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 7ca2db2abb..534f5ea5d7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -1,17 +1,25 @@ +/* + * File: z_bg_spot01_objects2.c + * Overlay: ovl_Bg_Spot01_Objects2 + * Description: Kakariko Village Set Pieces + */ + #include "z_bg_spot01_objects2.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot01Objects2_Init(BgSpot01Objects2* this, GlobalContext* globalCtx); void BgSpot01Objects2_Destroy(BgSpot01Objects2* this, GlobalContext* globalCtx); void BgSpot01Objects2_Update(BgSpot01Objects2* this, GlobalContext* globalCtx); +// func_808AC22C +void func_808AC2BC(BgSpot01Objects2* this, GlobalContext* globalCtx); +void func_808AC474(BgSpot01Objects2* this, GlobalContext* globalCtx); +void func_808AC4A4(BgSpot01Objects2* this, GlobalContext* globalCtx); /* const ActorInit Bg_Spot01_Objects2_InitVars = { ACTOR_BG_SPOT01_OBJECTS2, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(BgSpot01Objects2), diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h index 500a119ecb..97b4e79e7e 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h @@ -6,7 +6,11 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x34]; + /* 0x014C */ char unk_14C[0x18]; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x10]; + /* 0x0178 */ s8 objBankIndex; + /* 0x0179 */ char unk_179[0x7]; } BgSpot01Objects2; // size = 0x0180 extern const ActorInit Bg_Spot01_Objects2_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index adaf6c8a92..8d5b226a7a 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -1,6 +1,5 @@ #include "z_bg_spot02_objects.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot02Objects_Init(BgSpot02Objects* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot02Objects_Draw(BgSpot02Objects* this, GlobalContext* globalCtx); const ActorInit Bg_Spot02_Objects_InitVars = { ACTOR_BG_SPOT02_OBJECTS, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT02_OBJECTS, sizeof(BgSpot02Objects), diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 141ee2299f..3fb3d32bd4 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_spot03_taki.c + * Overlay: ovl_Bg_Spot03_Taki + * Description: Zora's River Waterfall + */ + #include "z_bg_spot03_taki.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot03Taki_Init(BgSpot03Taki* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgSpot03Taki_Draw(BgSpot03Taki* this, GlobalContext* globalCtx); const ActorInit Bg_Spot03_Taki_InitVars = { ACTOR_BG_SPOT03_TAKI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT03_OBJECT, sizeof(BgSpot03Taki), diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 49840b428d..af7d5e0395 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -6,16 +6,15 @@ #include "z_bg_spot05_soko.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx); -static void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx); -static void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx); -static void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx); -static void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx); -static void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx); -static void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx); +void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx); +void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx); +void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx); +void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx); +void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx); +void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx); +void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx); extern Gfx* D_060012C0; extern Gfx* D_06000918; @@ -23,7 +22,6 @@ extern Gfx* D_06000918; const ActorInit Bg_Spot05_Soko_InitVars = { ACTOR_BG_SPOT05_SOKO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT05_OBJECTS, sizeof(BgSpot05Soko), @@ -42,7 +40,7 @@ static Gfx* dListTbl[] = { 0x06001190, }; -static void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx) { +void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; u32 pad1; @@ -73,14 +71,14 @@ static void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx) { this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, sp24); } -static void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx) { +void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx) { +void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx) { } -static void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx) { +void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (Flags_GetSwitch(globalCtx, this->switchFlag)) { Audio_PlaySoundAtPosition(globalCtx, &thisx->posRot.pos, 0x1E, NA_SE_EV_METALDOOR_CLOSE); @@ -91,7 +89,7 @@ static void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx) { } } -static void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx) { +void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->speedXZ *= 1.5f; @@ -100,10 +98,10 @@ static void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx) { } } -static void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx) { +void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx) { +void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, dListTbl[this->dyna.actor.params]); } diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index afad380c5c..031d04be4e 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -1,6 +1,5 @@ #include "z_bg_spot06_objects.h" -#define ROOM 0x00 #define FLAGS 0x00000200 void BgSpot06Objects_Init(BgSpot06Objects* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot06Objects_Draw(BgSpot06Objects* this, GlobalContext* globalCtx); const ActorInit Bg_Spot06_Objects_InitVars = { ACTOR_BG_SPOT06_OBJECTS, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT06_OBJECTS, sizeof(BgSpot06Objects), diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 8e1fdfd645..56b41bb943 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_spot07_taki.c + * Overlay: ovl_Bg_Spot07_Taki + * Description: Zora's Domain Waterfall and Ice + */ + #include "z_bg_spot07_taki.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot07Taki_Init(BgSpot07Taki* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgSpot07Taki_Draw(BgSpot07Taki* this, GlobalContext* globalCtx); const ActorInit Bg_Spot07_Taki_InitVars = { ACTOR_BG_SPOT07_TAKI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT07_OBJECT, sizeof(BgSpot07Taki), diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index c816388be8..d7f33f0661 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_spot08_bakudankabe + * Overlay: ovl_Bg_Spot08_Bakudankabe + * Description: Destructible Wall (Zora's Fountain) + */ + #include "z_bg_spot08_bakudankabe.h" -#define ROOM 0x00 #define FLAGS 0x00400000 void BgSpot08Bakudankabe_Init(BgSpot08Bakudankabe* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgSpot08Bakudankabe_Draw(BgSpot08Bakudankabe* this, GlobalContext* globalCt const ActorInit Bg_Spot08_Bakudankabe_InitVars = { ACTOR_BG_SPOT08_BAKUDANKABE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT08_OBJ, sizeof(BgSpot08Bakudankabe), diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 6bcf1f8ded..5b5d06ff36 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -1,6 +1,5 @@ #include "z_bg_spot08_iceblock.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot08Iceblock_Init(BgSpot08Iceblock* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot08Iceblock_Draw(BgSpot08Iceblock* this, GlobalContext* globalCtx); const ActorInit Bg_Spot08_Iceblock_InitVars = { ACTOR_BG_SPOT08_ICEBLOCK, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT08_OBJ, sizeof(BgSpot08Iceblock), diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 273371e9cf..862ba1d7ab 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -6,22 +6,20 @@ #include "z_bg_spot09_obj.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx); -static void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx); -static void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx); -static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx); +void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx); +void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx); +void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx); +void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx); -static s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx); -static s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx); -static s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx); +s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx); +s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx); +s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx); const ActorInit Bg_Spot09_Obj_InitVars = { ACTOR_BG_SPOT09_OBJ, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT09_OBJ, sizeof(BgSpot09Obj), @@ -55,7 +53,7 @@ static u32 dlists[] = { 0x06000100, 0x06003970, 0x06001120, 0x06007D40, 0x060062 extern UNK_TYPE D_06008010; -static s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) { s32 carpentersRescued; Actor* thisx = &this->dyna.actor; @@ -83,7 +81,7 @@ static s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) { return 0; } -static s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (thisx->params == 3) { Actor_SetScale(thisx, 0.1f); @@ -93,7 +91,7 @@ static s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx) { return 1; } -static s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s32 localC = 0; s32 pad[2]; @@ -106,7 +104,7 @@ static s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx) { return 1; } -static s32 func_808B1C70(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1C70(BgSpot09Obj* this, GlobalContext* globalCtx) { s32 i; for (i = 0; i < ARRAY_COUNT(D_808B1FA4); i++) { if (!D_808B1FA4[i](this, globalCtx)) { @@ -116,17 +114,17 @@ static s32 func_808B1C70(BgSpot09Obj* this, GlobalContext* globalCtx) { return 1; } -static s32 func_808B1CEC(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1CEC(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, &initChain1); return 1; } -static s32 func_808B1D18(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1D18(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, &initChain2); return 1; } -static s32 func_808B1D44(BgSpot09Obj* this, GlobalContext* globalCtx) { +s32 func_808B1D44(BgSpot09Obj* this, GlobalContext* globalCtx) { if (this->dyna.actor.params == 3) { return func_808B1D18(this, globalCtx); } else { @@ -134,7 +132,7 @@ static s32 func_808B1D44(BgSpot09Obj* this, GlobalContext* globalCtx) { } } -static void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx) { +void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; osSyncPrintf("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", thisx->params, @@ -152,7 +150,7 @@ static void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx) { } } -static void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx) { +void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx) { DynaCollisionContext* dynaColCtx = &globalCtx->colCtx.dyna; Actor* thisx = &this->dyna.actor; @@ -161,10 +159,10 @@ static void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx) { } } -static void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx) { +void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx) { } -static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) { +void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; GraphicsContext* gfxCtx; Gfx* dispRefs[3]; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 484621a61a..424580534f 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -1,6 +1,11 @@ +/* + * File: z_bg_spot11_bakudankabe.c + * Overlay: ovl_Bg_Spot11_Bakudankabe + * Description: Destructible Wall (Desert Colossus) + */ + #include "z_bg_spot11_bakudankabe.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot11Bakudankabe_Init(BgSpot11Bakudankabe* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void BgSpot11Bakudankabe_Draw(BgSpot11Bakudankabe* this, GlobalContext* globalCt const ActorInit Bg_Spot11_Bakudankabe_InitVars = { ACTOR_BG_SPOT11_BAKUDANKABE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT11_OBJ, sizeof(BgSpot11Bakudankabe), diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 8c56db0ce1..6cf221ef99 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -1,6 +1,5 @@ #include "z_bg_spot11_oasis.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot11Oasis_Init(BgSpot11Oasis* this, GlobalContext* globalCtx); @@ -10,7 +9,6 @@ void BgSpot11Oasis_Update(BgSpot11Oasis* this, GlobalContext* globalCtx); const ActorInit Bg_Spot11_Oasis_InitVars = { ACTOR_BG_SPOT11_OASIS, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT11_OBJ, sizeof(BgSpot11Oasis), diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 2e4db5f649..4b43755346 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -6,27 +6,25 @@ #include "z_bg_spot12_gate.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx); -static void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx); -static void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx); -static void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx); +void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx); +void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx); +void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx); +void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx); -static void func_808B30C0(BgSpot12Gate* this); -static void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx); -static void func_808B3134(BgSpot12Gate* this); -static void func_808B314C(BgSpot12Gate* this, GlobalContext* globalCtx); -static void func_808B317C(BgSpot12Gate* this); -static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx); -static void func_808B3274(BgSpot12Gate* this); -static void func_808B3298(BgSpot12Gate* this, GlobalContext* globalCtx); +void func_808B30C0(BgSpot12Gate* this); +void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx); +void func_808B3134(BgSpot12Gate* this); +void func_808B314C(BgSpot12Gate* this, GlobalContext* globalCtx); +void func_808B317C(BgSpot12Gate* this); +void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx); +void func_808B3274(BgSpot12Gate* this); +void func_808B3298(BgSpot12Gate* this, GlobalContext* globalCtx); const ActorInit Bg_Spot12_Gate_InitVars = { ACTOR_BG_SPOT12_GATE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT12_OBJ, sizeof(BgSpot12Gate), @@ -46,7 +44,7 @@ static InitChainEntry initChain[] = { extern UNK_TYPE D_06001080; extern UNK_TYPE D_060011EC; -static void func_808B2F90(BgSpot12Gate* this, GlobalContext* globalCtx, UNK_TYPE collision, DynaPolyMoveFlag flags) { +void func_808B2F90(BgSpot12Gate* this, GlobalContext* globalCtx, UNK_TYPE collision, DynaPolyMoveFlag flags) { Actor* thisx = &this->dyna.actor; s32 localC = 0; s32 pad[2]; @@ -60,7 +58,7 @@ static void func_808B2F90(BgSpot12Gate* this, GlobalContext* globalCtx, UNK_TYPE } } -static void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx) { +void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; func_808B2F90(this, globalCtx, &D_060011EC, 0); @@ -73,18 +71,18 @@ static void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx) { } } -static void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx) { +void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808B30C0(BgSpot12Gate* this) { +void func_808B30C0(BgSpot12Gate* this) { Actor* thisx = &this->dyna.actor; this->actionFunc = (ActorFunc)func_808B30D8; thisx->posRot.pos.y = thisx->initPosRot.pos.y; } -static void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx) { +void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { @@ -93,22 +91,22 @@ static void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx) { } } -static void func_808B3134(BgSpot12Gate* this) { +void func_808B3134(BgSpot12Gate* this) { this->actionFunc = (ActorFunc)func_808B314C; this->unk_168 = 0x28; } -static void func_808B314C(BgSpot12Gate* this, GlobalContext* globalCtx) { +void func_808B314C(BgSpot12Gate* this, GlobalContext* globalCtx) { if (this->unk_168 <= 0) { func_808B317C(this); } } -static void func_808B317C(BgSpot12Gate* this) { +void func_808B317C(BgSpot12Gate* this) { this->actionFunc = (ActorFunc)func_808B318C; } -static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { +void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s32 var; @@ -125,23 +123,23 @@ static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { } } -static void func_808B3274(BgSpot12Gate* this) { +void func_808B3274(BgSpot12Gate* this) { Actor* thisx = &this->dyna.actor; this->actionFunc = (ActorFunc)func_808B3298; thisx->posRot.pos.y = thisx->initPosRot.pos.y + 200.0f; } -static void func_808B3298(BgSpot12Gate* this, GlobalContext* globalCtx) { +void func_808B3298(BgSpot12Gate* this, GlobalContext* globalCtx) { } -static void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx) { +void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx) { if (this->unk_168 > 0) { this->unk_168 -= 1; } this->actionFunc(this, globalCtx); } -static void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx) { +void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_06001080); } diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 2764211558..ed35dabb26 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -6,25 +6,23 @@ #include "z_bg_spot12_saku.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx); -static void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx); -static void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx); -static void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx); +void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx); +void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx); +void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx); +void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx); -static void func_808B3550(BgSpot12Saku* this); -static void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx); -static void func_808B35E4(BgSpot12Saku* this); -static void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx); -static void func_808B3714(BgSpot12Saku* this); -static void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx); +void func_808B3550(BgSpot12Saku* this); +void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx); +void func_808B35E4(BgSpot12Saku* this); +void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx); +void func_808B3714(BgSpot12Saku* this); +void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx); const ActorInit Bg_Spot12_Saku_InitVars = { ACTOR_BG_SPOT12_SAKU, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT12_OBJ, sizeof(BgSpot12Saku), @@ -44,7 +42,7 @@ static InitChainEntry initChain[] = { extern Gfx D_06002260[]; extern UNK_TYPE D_0600238C; -static void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, UNK_TYPE collision, DynaPolyMoveFlag flags) { +void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, UNK_TYPE collision, DynaPolyMoveFlag flags) { Actor* thisx = &this->dyna.actor; s32 localC = 0; s32 pad[2]; @@ -58,7 +56,7 @@ static void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, UNK_TYPE } } -static void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx) { +void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; func_808B3420(this, globalCtx, &D_0600238C, 0); @@ -70,11 +68,11 @@ static void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx) { } } -static void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx) { +void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808B3550(BgSpot12Saku* this) { +void func_808B3550(BgSpot12Saku* this) { Actor* thisx = &this->dyna.actor; this->actionFunc = func_808B357C; @@ -83,7 +81,7 @@ static void func_808B3550(BgSpot12Saku* this) { thisx->posRot.pos.z = thisx->initPosRot.pos.z; } -static void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx) { +void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { @@ -93,13 +91,13 @@ static void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx) { } } -static void func_808B35E4(BgSpot12Saku* this) { +void func_808B35E4(BgSpot12Saku* this) { if (this->unk_168 == 0) { this->actionFunc = func_808B3604; } } -static void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx) { +void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx) { f32 temp_ret = Math_SmoothScaleMaxMinF(&this->dyna.actor.scale.x, 0.001f / 0.14f, 0.16f, 0.0022f, 0.001f); f32 temp_f18 = ((0.1f - this->dyna.actor.scale.x) * 840.0f); @@ -115,7 +113,7 @@ static void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx) { } } -static void func_808B3714(BgSpot12Saku* this) { +void func_808B3714(BgSpot12Saku* this) { Actor* thisx = &this->dyna.actor; this->actionFunc = func_808B37AC; @@ -124,16 +122,16 @@ static void func_808B3714(BgSpot12Saku* this) { thisx->posRot.pos.z = thisx->initPosRot.pos.z - (Math_Coss(thisx->shape.rot.y + 0x4000) * 78.0f); } -static void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx) { +void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx) { } -static void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx) { +void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx) { if (this->unk_168 > 0) { this->unk_168 -= 1; } this->actionFunc(this, globalCtx); } -static void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx) { +void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_06002260); } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 8ee4e80acd..f797bfc94c 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -1,6 +1,5 @@ #include "z_bg_spot15_rrbox.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot15Rrbox_Init(BgSpot15Rrbox* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot15Rrbox_Draw(BgSpot15Rrbox* this, GlobalContext* globalCtx); const ActorInit Bg_Spot15_Rrbox_InitVars = { ACTOR_BG_SPOT15_RRBOX, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT15_OBJ, sizeof(BgSpot15Rrbox), diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 89d589bb71..d9b6a6a00e 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -1,12 +1,11 @@ /* * File: z_bg_spot15_saku.c * Overlay: ovl_Bg_Spot15_Saku - * Description: + * Description: Hyrule Castle Gate */ #include "z_bg_spot15_saku.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot15Saku_Init(BgSpot15Saku* this, GlobalContext* globalCtx); @@ -21,7 +20,6 @@ void func_808B4A04(BgSpot15Saku* this, GlobalContext* globalCtx); const ActorInit Bg_Spot15_Saku_InitVars = { ACTOR_BG_SPOT15_SAKU, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_SPOT15_OBJ, sizeof(BgSpot15Saku), diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 9c6b04d41d..7a0504f7a8 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -1,6 +1,5 @@ #include "z_bg_spot16_bombstone.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot16Bombstone_Init(BgSpot16Bombstone* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot16Bombstone_Draw(BgSpot16Bombstone* this, GlobalContext* globalCtx); const ActorInit Bg_Spot16_Bombstone_InitVars = { ACTOR_BG_SPOT16_BOMBSTONE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT16_OBJ, sizeof(BgSpot16Bombstone), diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index cd9616168c..c4a2946dc4 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -1,6 +1,5 @@ #include "z_bg_spot16_doughnut.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot16Doughnut_Init(BgSpot16Doughnut* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot16Doughnut_Draw(BgSpot16Doughnut* this, GlobalContext* globalCtx); const ActorInit Bg_Spot16_Doughnut_InitVars = { ACTOR_BG_SPOT16_DOUGHNUT, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_EFC_DOUGHNUT, sizeof(BgSpot16Doughnut), diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 900c932df5..48961db5da 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -1,6 +1,5 @@ #include "z_bg_spot17_bakudankabe.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot17Bakudankabe_Init(BgSpot17Bakudankabe* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot17Bakudankabe_Draw(BgSpot17Bakudankabe* this, GlobalContext* globalCt const ActorInit Bg_Spot17_Bakudankabe_InitVars = { ACTOR_BG_SPOT17_BAKUDANKABE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT17_OBJ, sizeof(BgSpot17Bakudankabe), diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 8bdfe51e46..dc97d5f425 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -1,17 +1,18 @@ /* - * File: z_bg_spot17_funen.c + * File: z_bg_spot17_funen * Overlay: ovl_Bg_Spot17_Funen - * Description: + * Description: Crater Smoke Cone */ #include "z_bg_spot17_funen.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot17Funen_Init(BgSpot17Funen* this, GlobalContext* globalCtx); void BgSpot17Funen_Destroy(BgSpot17Funen* this, GlobalContext* globalCtx); void BgSpot17Funen_Update(BgSpot17Funen* this, GlobalContext* globalCtx); +void func_808B746C(BgSpot17Funen* this, GlobalContext* globalCtx); +void func_808B7478(BgSpot17Funen* this, GlobalContext* globalCtx); void func_808B7478(BgSpot17Funen* this, GlobalContext* globalCtx); void func_808B746C(BgSpot17Funen* this, GlobalContext* globalCtx); @@ -19,7 +20,6 @@ void func_808B746C(BgSpot17Funen* this, GlobalContext* globalCtx); const ActorInit Bg_Spot17_Funen_InitVars = { ACTOR_BG_SPOT17_FUNEN, ACTORTYPE_SWITCH, - ROOM, FLAGS, OBJECT_SPOT17_OBJ, sizeof(BgSpot17Funen), diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index bb918f85fb..af9b3f359e 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -1,6 +1,5 @@ #include "z_bg_spot18_basket.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot18Basket_Init(BgSpot18Basket* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot18Basket_Draw(BgSpot18Basket* this, GlobalContext* globalCtx); const ActorInit Bg_Spot18_Basket_InitVars = { ACTOR_BG_SPOT18_BASKET, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT18_OBJ, sizeof(BgSpot18Basket), diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index b82daf2d63..e94323fc12 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -4,35 +4,25 @@ * Description: The lid to a goron jar. */ -#include -#include -#include +#include "z_bg_spot18_futa.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ u32 unk_150[0x5]; -} ActorSpot18Futa; // size = 0x0154 - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorSpot18Futa* this, GlobalContext* globalCtx); -static void Destroy(ActorSpot18Futa* this, GlobalContext* globalCtx); -static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx); -static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx); +void BgSpot18Futa_Init(BgSpot18Futa* this, GlobalContext* globalCtx); +void BgSpot18Futa_Destroy(BgSpot18Futa* this, GlobalContext* globalCtx); +void BgSpot18Futa_Update(BgSpot18Futa* this, GlobalContext* globalCtx); +void BgSpot18Futa_Draw(BgSpot18Futa* this, GlobalContext* globalCtx); const ActorInit Bg_Spot18_Futa_InitVars = { ACTOR_BG_SPOT18_FUTA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT18_OBJ, - sizeof(ActorSpot18Futa), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(BgSpot18Futa), + (ActorFunc)BgSpot18Futa_Init, + (ActorFunc)BgSpot18Futa_Destroy, + (ActorFunc)BgSpot18Futa_Update, + (ActorFunc)BgSpot18Futa_Draw, }; static InitChainEntry initChain[] = { @@ -45,7 +35,7 @@ static InitChainEntry initChain[] = { extern u32 DL_SPOT18_FUTA; // 0x6000368 extern u32 DL_SPOT18_FUTA2; // 0x6000150 -static void Init(ActorSpot18Futa* this, GlobalContext* globalCtx) { +void BgSpot18Futa_Init(BgSpot18Futa* this, GlobalContext* globalCtx) { s32 pad[2]; u32 sp1C = 0; @@ -55,11 +45,11 @@ static void Init(ActorSpot18Futa* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); } -static void Destroy(ActorSpot18Futa* this, GlobalContext* globalCtx) { +void BgSpot18Futa_Destroy(BgSpot18Futa* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx) { +void BgSpot18Futa_Update(BgSpot18Futa* this, GlobalContext* globalCtx) { s32 iVar1; if (this->actor.attachedA == NULL) { @@ -74,6 +64,6 @@ static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx) { } } -static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx) { +void BgSpot18Futa_Draw(BgSpot18Futa* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &DL_SPOT18_FUTA2); } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h new file mode 100644 index 0000000000..0c126e5167 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h @@ -0,0 +1,14 @@ +#ifndef _Z_BG_SPOT18_FUTA_H_ +#define _Z_BG_SPOT18_FUTA_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ u32 unk_150[0x5]; +} BgSpot18Futa; // size = 0x0154 + +extern const ActorInit Bg_Spot18_Futa_InitVars; +#endif diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 0b3e5d9c0d..da833de334 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -1,6 +1,5 @@ #include "z_bg_spot18_obj.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot18Obj_Init(BgSpot18Obj* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot18Obj_Draw(BgSpot18Obj* this, GlobalContext* globalCtx); const ActorInit Bg_Spot18_Obj_InitVars = { ACTOR_BG_SPOT18_OBJ, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT18_OBJ, sizeof(BgSpot18Obj), diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 1868bbf983..90bfb21963 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -1,6 +1,5 @@ #include "z_bg_spot18_shutter.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot18Shutter_Init(BgSpot18Shutter* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSpot18Shutter_Draw(BgSpot18Shutter* this, GlobalContext* globalCtx); const ActorInit Bg_Spot18_Shutter_InitVars = { ACTOR_BG_SPOT18_SHUTTER, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SPOT18_OBJ, sizeof(BgSpot18Shutter), diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index e69d3b4064..2f7ca07a1c 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -1,6 +1,5 @@ #include "z_bg_sst_floor.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgSstFloor_Init(BgSstFloor* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgSstFloor_Draw(BgSstFloor* this, GlobalContext* globalCtx); const ActorInit Bg_Sst_Floor_InitVars = { ACTOR_BG_SST_FLOOR, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SST, sizeof(BgSstFloor), diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index 626c95ed1e..47ced4dbd4 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -1,6 +1,5 @@ #include "z_bg_toki_hikari.h" -#define ROOM 0x00 #define FLAGS 0x00000020 void BgTokiHikari_Init(BgTokiHikari* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgTokiHikari_Draw(BgTokiHikari* this, GlobalContext* globalCtx); const ActorInit Bg_Toki_Hikari_InitVars = { ACTOR_BG_TOKI_HIKARI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_TOKI_OBJECTS, sizeof(BgTokiHikari), diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 6c04ed552a..7c98c25523 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -6,17 +6,16 @@ #include "z_bg_toki_swd.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx); -static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx); -static void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx); -static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx); -static void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc); -static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx); -static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx); -static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx); +void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx); +void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx); +void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx); +void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx); +void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc); +void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx); +void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx); +void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx); extern u32 D_06001BD0; @@ -153,7 +152,6 @@ static u32 D_808BBD90[] = { const ActorInit Bg_Toki_Swd_InitVars = { ACTOR_BG_TOKI_SWD, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_TOKI_OBJECTS, sizeof(BgTokiSwd), @@ -179,11 +177,11 @@ static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0x19, ICHAIN_STOP), }; -static void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc) { +void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { +void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { ColliderCylinderMain* collision; Actor* thisx = &this->actor; @@ -205,12 +203,12 @@ static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { func_80061ED4(&thisx->sub_98, 0, &sub98Init); } -static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx) { +void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { +void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { if (((gSaveContext.event_chk_inf[4] & 0x8000) == 0) && (gSaveContext.scene_setup_index < 4) && (func_8002E12C(&this->actor, 800.0f, 0x7530) != 0) && (func_800BFC84(globalCtx) == 0)) { gSaveContext.event_chk_inf[4] |= 0x8000; @@ -245,7 +243,7 @@ static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { } } -static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx) { +void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx) { Player* player; // if attached is set, sword has been pulled/placed from the pedestal @@ -263,18 +261,18 @@ static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx) { } } -static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx) { +void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx) { if ((func_8006C4A4(globalCtx, 1) != 0) && (globalCtx->unk_11D30[0] < 0xFF)) { globalCtx->unk_11D30[0] += 5; } } -static void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx) { +void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx) { this->actionFunc(&this->actor, globalCtx); Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); } -static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { +void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { s32 pad[4]; GameState* state; GraphicsContext* gfxCtx; diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 3ba91b2052..9aa8c720b8 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -1,6 +1,5 @@ #include "z_bg_treemouth.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgTreemouth_Init(BgTreemouth* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgTreemouth_Draw(BgTreemouth* this, GlobalContext* globalCtx); const ActorInit Bg_Treemouth_InitVars = { ACTOR_BG_TREEMOUTH, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SPOT04_OBJECTS, sizeof(BgTreemouth), diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 9e0118502b..a44986e8e1 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -4,35 +4,25 @@ * Description: Hoppable horse fence */ -#include -#include -#include +#include "z_bg_umajump.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; -} ActorBgUmajump; // size = 0x0164 - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorBgUmajump* this, GlobalContext* globalCtx); -static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx); -static void Update(ActorBgUmajump* this, GlobalContext* globalCtx); -static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx); +void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx); +void BgUmaJump_Destroy(BgUmaJump* this, GlobalContext* globalCtx); +void BgUmaJump_Update(BgUmaJump* this, GlobalContext* globalCtx); +void BgUmaJump_Draw(BgUmaJump* this, GlobalContext* globalCtx); const ActorInit Bg_Umajump_InitVars = { ACTOR_BG_UMAJUMP, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_UMAJUMP, - sizeof(ActorBgUmajump), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(BgUmaJump), + (ActorFunc)BgUmaJump_Init, + (ActorFunc)BgUmaJump_Destroy, + (ActorFunc)BgUmaJump_Update, + (ActorFunc)BgUmaJump_Draw, }; extern D_06001438; // segmented address: 0x06001438 @@ -42,7 +32,7 @@ static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) { +void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx) { s32 pad[2]; u32 sp24 = 0; @@ -60,13 +50,13 @@ static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) { } } -static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx) { +void BgUmaJump_Destroy(BgUmaJump* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) { +void BgUmaJump_Update(BgUmaJump* this, GlobalContext* globalCtx) { } -static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) { +void BgUmaJump_Draw(BgUmaJump* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_06001220); } diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h new file mode 100644 index 0000000000..c44a9b4c5f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h @@ -0,0 +1,15 @@ +#ifndef _Z_BG_UMAJUMP_H_ +#define _Z_BG_UMAJUMP_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; +} BgUmaJump; // size = 0x0164 + +extern const ActorInit Bg_Uma_Jump_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 88fae70528..ed2d16dcb4 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -1,6 +1,5 @@ #include "z_bg_vb_sima.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgVbSima_Init(BgVbSima* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgVbSima_Draw(BgVbSima* this, GlobalContext* globalCtx); const ActorInit Bg_Vb_Sima_InitVars = { ACTOR_BG_VB_SIMA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_FD, sizeof(BgVbSima), diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 57e671fbd2..0aa9604c99 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -1,6 +1,5 @@ #include "z_bg_ydan_hasi.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void BgYdanHasi_Init(BgYdanHasi* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgYdanHasi_Draw(BgYdanHasi* this, GlobalContext* globalCtx); const ActorInit Bg_Ydan_Hasi_InitVars = { ACTOR_BG_YDAN_HASI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_YDAN_OBJECTS, sizeof(BgYdanHasi), diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 653e10c887..19599da86a 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -1,6 +1,5 @@ #include "z_bg_ydan_maruta.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgYdanMaruta_Init(BgYdanMaruta* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgYdanMaruta_Draw(BgYdanMaruta* this, GlobalContext* globalCtx); const ActorInit Bg_Ydan_Maruta_InitVars = { ACTOR_BG_YDAN_MARUTA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_YDAN_OBJECTS, sizeof(BgYdanMaruta), diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 5db87323ba..53b2c1acfe 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -1,6 +1,5 @@ #include "z_bg_ydan_sp.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void BgYdanSp_Init(BgYdanSp* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BgYdanSp_Draw(BgYdanSp* this, GlobalContext* globalCtx); const ActorInit Bg_Ydan_Sp_InitVars = { ACTOR_BG_YDAN_SP, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_YDAN_OBJECTS, sizeof(BgYdanSp), diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index d10c9ea57d..c073f2cbd1 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -6,19 +6,18 @@ #include "z_bg_zg.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void BgZg_Init(BgZg* this, GlobalContext* globalCtx); -static void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx); -static void BgZg_Update(BgZg* this, GlobalContext* globalCtx); -static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx); -static void func_808C0C50(BgZg* this); -static s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx); -static s32 func_808C0CC8(BgZg* this); -static void func_808C0CD4(BgZg* this, GlobalContext* globalCtx); -static void func_808C0D08(BgZg* this, GlobalContext* globalCtx); -static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx); +void BgZg_Init(BgZg* this, GlobalContext* globalCtx); +void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx); +void BgZg_Update(BgZg* this, GlobalContext* globalCtx); +void BgZg_Draw(BgZg* this, GlobalContext* globalCtx); +void func_808C0C50(BgZg* this); +s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx); +s32 func_808C0CC8(BgZg* this); +void func_808C0CD4(BgZg* this, GlobalContext* globalCtx); +void func_808C0D08(BgZg* this, GlobalContext* globalCtx); +void func_808C0EEC(BgZg* this, GlobalContext* globalCtx); static const ActorFunc actionFuncs[] = { (ActorFunc)func_808C0CD4, @@ -36,7 +35,6 @@ static const ActorFunc drawFuncs[] = { const ActorInit Bg_Zg_InitVars = { ACTOR_BG_ZG, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZG, sizeof(BgZg), @@ -49,33 +47,33 @@ const ActorInit Bg_Zg_InitVars = { extern u32 D_06001080; extern u32 D_060011D4; -static void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx) { +void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808C0C50(BgZg* this) { +void func_808C0C50(BgZg* this) { Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } -static s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx) { +s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s32 flag = (thisx->params >> 8) & 0xFF; return Flags_GetSwitch(globalCtx, flag); } -static s32 func_808C0CC8(BgZg* this) { +s32 func_808C0CC8(BgZg* this) { s32 flag = this->dyna.actor.params & 0xFF; return flag; } -static void func_808C0CD4(BgZg* this, GlobalContext* globalCtx) { +void func_808C0CD4(BgZg* this, GlobalContext* globalCtx) { if (func_808C0C98(this, globalCtx) != 0) { this->action = 1; func_808C0C50(this); } } -static void func_808C0D08(BgZg* this, GlobalContext* globalCtx) { +void func_808C0D08(BgZg* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->posRot.pos.y += (kREG(16) + 20.0f) * 1.2f; @@ -84,7 +82,7 @@ static void func_808C0D08(BgZg* this, GlobalContext* globalCtx) { } } -static void BgZg_Update(BgZg* this, GlobalContext* globalCtx) { +void BgZg_Update(BgZg* this, GlobalContext* globalCtx) { s32 action = this->action; if (((action < 0) || (1 < action)) || (actionFuncs[action] == NULL)) { @@ -95,7 +93,7 @@ static void BgZg_Update(BgZg* this, GlobalContext* globalCtx) { } } -static void BgZg_Init(BgZg* this, GlobalContext* globalCtx) { +void BgZg_Init(BgZg* this, GlobalContext* globalCtx) { s32 sp20[2]; Actor* thisx = &this->dyna.actor; u32 local_c; @@ -118,7 +116,7 @@ static void BgZg_Init(BgZg* this, GlobalContext* globalCtx) { } } -static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { +void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx; GraphicsContext* tempgfxCtx; // oddly needs this to match @@ -136,7 +134,7 @@ static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, gfxCtx, "../z_bg_zg.c", 320); } -static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) { +void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) { s32 action = this->drawConfig; if (((action < 0) || (action > 0)) || drawFuncs[action] == NULL) { diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 02583c9a6b..4330a2d028 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1,6 +1,5 @@ #include "z_boss_dodongo.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossDodongo_Init(BossDodongo* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossDodongo_Draw(BossDodongo* this, GlobalContext* globalCtx); const ActorInit Boss_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_KINGDODONGO, sizeof(BossDodongo), diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index ac7f21165b..4389651867 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1,6 +1,5 @@ #include "z_boss_fd.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossFd_Init(BossFd* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossFd_Draw(BossFd* this, GlobalContext* globalCtx); const ActorInit Boss_Fd_InitVars = { ACTOR_BOSS_FD, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_FD, sizeof(BossFd), diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 9fb62f18d0..8fdfbf5570 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -1,6 +1,5 @@ #include "z_boss_fd2.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossFd2_Init(BossFd2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossFd2_Draw(BossFd2* this, GlobalContext* globalCtx); const ActorInit Boss_Fd2_InitVars = { ACTOR_BOSS_FD2, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_FD2, sizeof(BossFd2), diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index a9947929c8..951eed9e7c 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -1,6 +1,5 @@ #include "z_boss_ganon.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossGanon_Init(BossGanon* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossGanon_Draw(BossGanon* this, GlobalContext* globalCtx); const ActorInit Boss_Ganon_InitVars = { ACTOR_BOSS_GANON, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GANON, sizeof(BossGanon), diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 2b01583980..b5aa87bcb0 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1,6 +1,5 @@ #include "z_boss_ganon2.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossGanon2_Init(BossGanon2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossGanon2_Draw(BossGanon2* this, GlobalContext* globalCtx); const ActorInit Boss_Ganon2_InitVars = { ACTOR_BOSS_GANON2, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GANON2, sizeof(BossGanon2), diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 9be8ee8a5f..ed14ee00b5 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -1,6 +1,5 @@ #include "z_boss_ganondrof.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossGanondrof_Init(BossGanondrof* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossGanondrof_Draw(BossGanondrof* this, GlobalContext* globalCtx); const ActorInit Boss_Ganondrof_InitVars = { ACTOR_BOSS_GANONDROF, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GND, sizeof(BossGanondrof), diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 5292e63a7e..52f0c31abe 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1,6 +1,5 @@ #include "z_boss_goma.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossGoma_Init(BossGoma* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossGoma_Draw(BossGoma* this, GlobalContext* globalCtx); const ActorInit Boss_Goma_InitVars = { ACTOR_BOSS_GOMA, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GOMA, sizeof(BossGoma), diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 96262d3207..2d0b622396 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1,6 +1,5 @@ #include "z_boss_mo.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossMo_Init(BossMo* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossMo_Draw(BossMo* this, GlobalContext* globalCtx); const ActorInit Boss_Mo_InitVars = { ACTOR_BOSS_MO, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_MO, sizeof(BossMo), diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index de391f92fb..4794f0833b 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -1,6 +1,5 @@ #include "z_boss_sst.h" -#define ROOM 0x00 #define FLAGS 0x00000435 void BossSst_Init(BossSst* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossSst_Draw(BossSst* this, GlobalContext* globalCtx); const ActorInit Boss_Sst_InitVars = { ACTOR_BOSS_SST, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_SST, sizeof(BossSst), diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 2c69d0438b..2e490c9fff 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -1,6 +1,5 @@ #include "z_boss_tw.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossTw_Init(BossTw* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossTw_Draw(BossTw* this, GlobalContext* globalCtx); const ActorInit Boss_Tw_InitVars = { ACTOR_BOSS_TW, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_TW, sizeof(BossTw), diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index e96a00d6c7..cde712e34a 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1,6 +1,5 @@ #include "z_boss_va.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void BossVa_Init(BossVa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void BossVa_Draw(BossVa* this, GlobalContext* globalCtx); const ActorInit Boss_Va_InitVars = { ACTOR_BOSS_VA, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_BV, sizeof(BossVa), diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 3ff8fe0b6f..227edc980b 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -1,6 +1,5 @@ #include "z_demo_6k.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void Demo6K_Init(Demo6K* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void Demo6K_Update(Demo6K* this, GlobalContext* globalCtx); const ActorInit Demo_6K_InitVars = { ACTOR_DEMO_6K, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(Demo6K), diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 7de6e24a55..1f0ae03484 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -1,6 +1,5 @@ #include "z_demo_du.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoDu_Init(DemoDu* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoDu_Draw(DemoDu* this, GlobalContext* globalCtx); const ActorInit Demo_Du_InitVars = { ACTOR_DEMO_DU, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DU, sizeof(DemoDu), diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index a52882a0ed..31f39a2c51 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -1,6 +1,5 @@ #include "z_demo_ec.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoEc_Init(DemoEc* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoEc_Draw(DemoEc* this, GlobalContext* globalCtx); const ActorInit Demo_Ec_InitVars = { ACTOR_DEMO_EC, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_EC, sizeof(DemoEc), diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 4c8e87eb4a..86988bf043 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1,6 +1,5 @@ #include "z_demo_effect.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void DemoEffect_Init(DemoEffect* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void DemoEffect_Update(DemoEffect* this, GlobalContext* globalCtx); const ActorInit Demo_Effect_InitVars = { ACTOR_DEMO_EFFECT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(DemoEffect), diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 5d19fffd48..ce075c567e 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -1,6 +1,5 @@ #include "z_demo_ext.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoExt_Init(DemoExt* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoExt_Draw(DemoExt* this, GlobalContext* globalCtx); const ActorInit Demo_Ext_InitVars = { ACTOR_DEMO_EXT, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_FHG, sizeof(DemoExt), diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index e4f632a9c6..131a70808b 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -8,21 +8,20 @@ #include -#define ROOM 0x00 #define FLAGS 0x00000030 -static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx); -static void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx); -static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx); -static void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx); +void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx); +void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx); +void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx); +void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx); -static void func_80978030(DemoGeff* this, GlobalContext* globalCtx); +void func_80978030(DemoGeff* this, GlobalContext* globalCtx); -static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx); -static void func_80978308(DemoGeff* this, GlobalContext* globalCtx); +void func_809783D4(DemoGeff* this, GlobalContext* globalCtx); +void func_80978308(DemoGeff* this, GlobalContext* globalCtx); -static void func_809784D4(DemoGeff* this, GlobalContext* globalCtx); -static void func_80978344(DemoGeff* this, GlobalContext* globalCtx); +void func_809784D4(DemoGeff* this, GlobalContext* globalCtx); +void func_80978344(DemoGeff* this, GlobalContext* globalCtx); s16 objectIds[] = { OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, @@ -45,7 +44,6 @@ ActorFunc drawFuncs[] = { const ActorInit Demo_Geff_InitVars = { ACTOR_DEMO_GEFF, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GEFF, sizeof(DemoGeff), @@ -57,10 +55,10 @@ const ActorInit Demo_Geff_InitVars = { extern UNK_TYPE D_06000EA0; -static void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx) { +void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx) { } -static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) { +void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) { if (this->actor.params < 0 || this->actor.params >= 9) { osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); Actor_Kill(&this->actor); @@ -70,7 +68,7 @@ static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) { this->drawConfig = 0; } -static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { +void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -85,7 +83,7 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 188); } -static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { +void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { s32 pad[2]; s32 objBankIndex = this->objBankIndex; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; @@ -102,7 +100,7 @@ static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 212); } -static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { +void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { Vec3f* thisScale = &this->actor.scale; this->action = 1; this->drawConfig = 1; @@ -130,7 +128,7 @@ static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { } } -static void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) { +void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) { s32 targetParams = 2; Actor* propIt; @@ -153,7 +151,7 @@ static void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) { } } -static void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) { +void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) { DemoGt* demoGt = this->demoGt; s16 params = this->actor.params; if (demoGt != NULL && (params != 6) && (params != 7) && (params != 8)) { @@ -163,17 +161,17 @@ static void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) { } } -static void func_80978308(DemoGeff* this, GlobalContext* globalCtx) { +void func_80978308(DemoGeff* this, GlobalContext* globalCtx) { func_809781FC(this, globalCtx); func_809782A0(this, globalCtx); func_80978030(this, globalCtx); } -static void func_80978344(DemoGeff* this, GlobalContext* globalCtx) { +void func_80978344(DemoGeff* this, GlobalContext* globalCtx) { func_80977EA8(globalCtx, &D_06000EA0); } -static void func_80978370(DemoGeff* this, GlobalContext* globalCtx) { +void func_80978370(DemoGeff* this, GlobalContext* globalCtx) { s16 params = this->actor.params; ActorFunc actorFunc = scaleFuncs[params]; if (actorFunc == NULL) { @@ -184,7 +182,7 @@ static void func_80978370(DemoGeff* this, GlobalContext* globalCtx) { actorFunc(this, globalCtx); } -static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) { +void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) { ObjectContext* objCtx = &globalCtx->objectCtx; Actor* thisx = &this->actor; s32 params = thisx->params; @@ -203,7 +201,7 @@ static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) { } } -static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) { +void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) { if (this->action < 0 || this->action >= 2 || actionFuncs[this->action] == NULL) { osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; @@ -211,10 +209,10 @@ static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) { actionFuncs[this->action](this, globalCtx); } -static void func_809784D4(DemoGeff* this, GlobalContext* globalCtx) { +void func_809784D4(DemoGeff* this, GlobalContext* globalCtx) { } -static void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx) { +void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx) { s32 drawConfig = this->drawConfig; s16 pad; if (drawConfig < 0 || drawConfig >= 2 || drawFuncs[drawConfig] == NULL) { diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 63b636bd59..5a024c697a 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -1,6 +1,5 @@ #include "z_demo_gj.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void DemoGj_Init(DemoGj* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoGj_Draw(DemoGj* this, GlobalContext* globalCtx); const ActorInit Demo_Gj_InitVars = { ACTOR_DEMO_GJ, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GJ, sizeof(DemoGj), diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index a340b09921..5abdba9e61 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -1,14 +1,13 @@ /* * File: z_demo_go.c * Overlay: Demo_Go - * Description: + * Description: Gorons (Cutscene) */ #include "z_demo_go.h" #include -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx); @@ -41,7 +40,6 @@ ActorFunc D_8097D468[] = { const ActorInit Demo_Go_InitVars = { ACTOR_DEMO_GO, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_OF1D_MAP, sizeof(DemoGo), diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index b09a261ffc..f7c137c259 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1,6 +1,5 @@ #include "z_demo_gt.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void DemoGt_Init(DemoGt* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoGt_Draw(DemoGt* this, GlobalContext* globalCtx); const ActorInit Demo_Gt_InitVars = { ACTOR_DEMO_GT, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GT, sizeof(DemoGt), diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 31c99ae648..73a7a93f05 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -1,6 +1,5 @@ #include "z_demo_ik.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoIk_Init(DemoIk* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoIk_Draw(DemoIk* this, GlobalContext* globalCtx); const ActorInit Demo_Ik_InitVars = { ACTOR_DEMO_IK, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_IK, sizeof(DemoIk), diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index ea42fdb521..4f56ddad2f 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -1,6 +1,5 @@ #include "z_demo_im.h" -#define ROOM 0x00 #define FLAGS 0x00000011 void DemoIm_Init(DemoIm* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoIm_Draw(DemoIm* this, GlobalContext* globalCtx); const ActorInit Demo_Im_InitVars = { ACTOR_DEMO_IM, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_IM, sizeof(DemoIm), diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 35f85bd400..85448b6293 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -1,6 +1,5 @@ #include "z_demo_kankyo.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void DemoKankyo_Init(DemoKankyo* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoKankyo_Draw(DemoKankyo* this, GlobalContext* globalCtx); const ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(DemoKankyo), diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 4df16f7cdf..438b7e0253 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -1,6 +1,5 @@ #include "z_demo_kekkai.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void DemoKekkai_Init(DemoKekkai* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoKekkai_Draw(DemoKekkai* this, GlobalContext* globalCtx); const ActorInit Demo_Kekkai_InitVars = { ACTOR_DEMO_KEKKAI, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_DEMO_KEKKAI, sizeof(DemoKekkai), diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 179dee1e86..7b82457dfe 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -1,6 +1,5 @@ #include "z_demo_sa.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoSa_Init(DemoSa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoSa_Draw(DemoSa* this, GlobalContext* globalCtx); const ActorInit Demo_Sa_InitVars = { ACTOR_DEMO_SA, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SA, sizeof(DemoSa), diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 8c3faa1f5d..8701e98ad0 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -1,18 +1,24 @@ +/* + * File: z_demo_shd.c + * Overlay: Demo_Shd + * Description: Bongo Bongo's Shadow + */ + #include "z_demo_shd.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void DemoShd_Init(DemoShd* this, GlobalContext* globalCtx); void DemoShd_Destroy(DemoShd* this, GlobalContext* globalCtx); void DemoShd_Update(DemoShd* this, GlobalContext* globalCtx); void DemoShd_Draw(DemoShd* this, GlobalContext* globalCtx); +void DemoShd_SetupAction(DemoShd* this, ActorFunc actionFunc); +void func_80991298(DemoShd* this, GlobalContext* globalCtx); /* const ActorInit Demo_Shd_InitVars = { ACTOR_DEMO_SHD, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(DemoShd), @@ -22,7 +28,8 @@ const ActorInit Demo_Shd_InitVars = { (ActorFunc)DemoShd_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991230.s") + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s") diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h index f074cfb9d1..62bbd028f2 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -6,7 +6,9 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8]; + /* 0x014C */ s16 unk_14C; + /* 0x014E */ s16 unk_14E; + /* 0x0150 */ ActorFunc actionFunc; } DemoShd; // size = 0x0154 extern const ActorInit Demo_Shd_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 2f8466814b..c5d1674d39 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -1,6 +1,5 @@ #include "z_demo_tre_lgt.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DemoTreLgt_Init(DemoTreLgt* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DemoTreLgt_Draw(DemoTreLgt* this, GlobalContext* globalCtx); const ActorInit Demo_Tre_Lgt_InitVars = { ACTOR_DEMO_TRE_LGT, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_BOX, sizeof(DemoTreLgt), diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 369943aca9..f8be4dd636 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -6,24 +6,22 @@ #include "z_door_ana.h" -#define ROOM 0x00 #define FLAGS 0x02000000 -static void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx); -static void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx); -static void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx); -static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx); -static void DoorAna_SetupAction(DoorAna* this, ActorFunc func); +void DoorAna_SetupAction(DoorAna* this, ActorFunc func); -static void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx); -static void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx); -static void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx); +void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx); const ActorInit Door_Ana_InitVars = { ACTOR_DOOR_ANA, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(DoorAna), @@ -50,11 +48,11 @@ static s16 entrances[] = { extern Gfx* D_05001390; // sets current actionFunc to be ran on next update call -static void DoorAna_SetupAction(DoorAna* this, ActorFunc func) { +void DoorAna_SetupAction(DoorAna* this, ActorFunc func) { this->actionFunc = func; } -static void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider; this->actor.shape.rot.z = 0; @@ -77,7 +75,7 @@ static void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { this->actor.unk_1F = 0; } -static void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx) { // free collider if it has one if ((this->actor.params & 0x200) != 0) { ActorCollider_FreeCylinder(globalCtx, &this->collider); @@ -85,7 +83,7 @@ static void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx) { } // update routine for grottos that are currently "hidden"/unopened -static void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx) { bool openGrotto = false; if ((this->actor.params & 0x200) == 0) { // opening with song of storms @@ -113,7 +111,7 @@ static void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx) { } // update routine for grottos that are open -static void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx) { Player* player; s32 destinationIdx; @@ -146,7 +144,7 @@ static void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx) { } // update function for after the player has triggered the grotto -static void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx) { Player* player; if (this->actor.yDistanceFromLink <= 0.0f && 15.0f < this->actor.xzDistanceFromLink) { @@ -156,14 +154,14 @@ static void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx) { } } -static void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); // changes the grottos facing angle based on camera angle this->actor.shape.rot.y = func_8005A9F4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]) + 0x8000; } -static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) { +void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx** dList = &D_05001390; // required for stack placement? Gfx* dispRefs[3]; diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 81bfd1e101..94f6184aa0 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -1,6 +1,11 @@ +/* + * File: z_door_gerudo.c + * Overlay: ovl_Door_Gerudo + * Description: Metal grate door + */ + #include "z_door_gerudo.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void DoorGerudo_Init(DoorGerudo* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void DoorGerudo_Draw(DoorGerudo* this, GlobalContext* globalCtx); const ActorInit Door_Gerudo_InitVars = { ACTOR_DOOR_GERUDO, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_DOOR_GERUDO, sizeof(DoorGerudo), diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 65ee03982a..d084171a4b 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -1,6 +1,5 @@ #include "z_door_killer.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DoorKiller_Init(DoorKiller* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void DoorKiller_Update(DoorKiller* this, GlobalContext* globalCtx); const ActorInit Door_Killer_InitVars = { ACTOR_DOOR_KILLER, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_DOOR_KILLER, sizeof(DoorKiller), diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 7301db73e1..ef39d1c716 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -1,6 +1,5 @@ #include "z_door_shutter.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void DoorShutter_Init(DoorShutter* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DoorShutter_Draw(DoorShutter* this, GlobalContext* globalCtx); const ActorInit Door_Shutter_InitVars = { ACTOR_DOOR_SHUTTER, ACTORTYPE_DOOR, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(DoorShutter), diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index 7ad3af1293..0e10b2b015 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -4,26 +4,24 @@ * Description: Manages collision for the Door of Time. */ -#include -#include -#include +#include "z_door_toki.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ u8 unk_150[0x18]; -} ActorDoorToki; // size = 0x0168 - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorDoorToki* this, GlobalContext* globalCtx); -static void Destroy(ActorDoorToki* this, GlobalContext* globalCtx); -static void Update(ActorDoorToki* this, GlobalContext* globalCtx); +void DoorToki_Init(DoorToki* this, GlobalContext* globalCtx); +void DoorToki_Destroy(DoorToki* this, GlobalContext* globalCtx); +void DoorToki_Update(DoorToki* this, GlobalContext* globalCtx); const ActorInit Door_Toki_InitVars = { - ACTOR_DOOR_TOKI, ACTORTYPE_BG, ROOM, FLAGS, OBJECT_TOKI_OBJECTS, sizeof(ActorDoorToki), (ActorFunc)Init, - (ActorFunc)Destroy, (ActorFunc)Update, NULL, + ACTOR_DOOR_TOKI, + ACTORTYPE_BG, + FLAGS, + OBJECT_TOKI_OBJECTS, + sizeof(DoorToki), + (ActorFunc)DoorToki_Init, + (ActorFunc)DoorToki_Destroy, + (ActorFunc)DoorToki_Update, + NULL, }; // This has to be defined in the linker to produce a proper lui addiu pair @@ -33,7 +31,7 @@ static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; -static void Init(ActorDoorToki* this, GlobalContext* globalCtx) { +void DoorToki_Init(DoorToki* this, GlobalContext* globalCtx) { s32 pad[2]; u32 sp1C = 0; @@ -43,11 +41,11 @@ static void Init(ActorDoorToki* this, GlobalContext* globalCtx) { this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, sp1C); } -static void Destroy(ActorDoorToki* this, GlobalContext* globalCtx) { +void DoorToki_Destroy(DoorToki* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorDoorToki* this, GlobalContext* globalCtx) { +void DoorToki_Update(DoorToki* this, GlobalContext* globalCtx) { if (gSaveContext.event_chk_inf[4] & 0x800) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } else { diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h new file mode 100644 index 0000000000..dd9fdf1740 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h @@ -0,0 +1,15 @@ +#ifndef _Z_DOOR_TOKI_H_ +#define _Z_DOOR_TOKI_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ u8 unk_150[0x18]; +} DoorToki; // size = 0x0168 + +extern const ActorInit Door_Toki_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 3f8030c736..8b8a656854 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -1,6 +1,5 @@ #include "z_door_warp1.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void DoorWarp1_Init(DoorWarp1* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void DoorWarp1_Draw(DoorWarp1* this, GlobalContext* globalCtx); const ActorInit Door_Warp1_InitVars = { ACTOR_DOOR_WARP1, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_WARP1, sizeof(DoorWarp1), diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index e7caf77073..b632c69e0f 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -1,6 +1,5 @@ #include "z_efc_erupc.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EfcErupc_Init(EfcErupc* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EfcErupc_Draw(EfcErupc* this, GlobalContext* globalCtx); const ActorInit Efc_Erupc_InitVars = { ACTOR_EFC_ERUPC, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_EFC_ERUPC, sizeof(EfcErupc), diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 18f1856e7e..60741d4da1 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -1,6 +1,5 @@ #include "z_eff_dust.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EffDust_Init(EffDust* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EffDust_Draw(EffDust* this, GlobalContext* globalCtx); const ActorInit Eff_Dust_InitVars = { ACTOR_EFF_DUST, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EffDust), diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 9fa507fef0..86667e8b9c 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -1,6 +1,5 @@ #include "z_elf_msg.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ElfMsg_Init(ElfMsg* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void ElfMsg_Draw(ElfMsg* this, GlobalContext* globalCtx); const ActorInit Elf_Msg_InitVars = { ACTOR_ELF_MSG, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ElfMsg), diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 3ed1c377e8..9ea7fc01e3 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -1,6 +1,5 @@ #include "z_elf_msg2.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ElfMsg2_Init(ElfMsg2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void ElfMsg2_Draw(ElfMsg2* this, GlobalContext* globalCtx); const ActorInit Elf_Msg2_InitVars = { ACTOR_ELF_MSG2, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ElfMsg2), diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 0939cffe21..c40cce8066 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -1,6 +1,11 @@ +/* + * File: z_en_am.c + * Overlay: ovl_En_Am + * Description: Armos Statue + */ + #include "z_en_am.h" -#define ROOM 0x00 #define FLAGS 0x04000015 void EnAm_Init(EnAm* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnAm_Draw(EnAm* this, GlobalContext* globalCtx); const ActorInit En_Am_InitVars = { ACTOR_EN_AM, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_AM, sizeof(EnAm), diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 901f23c067..b722576196 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -6,7 +6,6 @@ #include "z_en_ani.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnAni_SetupAction(EnAni* this, ActorFunc actionFunc); @@ -36,7 +35,6 @@ extern AnimationHeader D_060076EC; const ActorInit En_Ani_InitVars = { ACTOR_EN_ANI, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ANI, sizeof(EnAni), diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index b089c5f80d..bc9c83bc0a 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -1,6 +1,11 @@ +/* + * File: z_en_anubice.c + * Overlay: ovl_En_Anubice + * Description: Anubis Body + */ + #include "z_en_anubice.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnAnubice_Init(EnAnubice* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnAnubice_Draw(EnAnubice* this, GlobalContext* globalCtx); const ActorInit En_Anubice_InitVars = { ACTOR_EN_ANUBICE, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_ANUBICE, sizeof(EnAnubice), diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h index e99538465c..91615e99fa 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h @@ -6,7 +6,13 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C8]; + /* 0x014C */ char unk_14C[0x10E]; + /* 0x025A */ s16 unk_25A; + /* 0x025C */ char unk_25C[0x2]; + /* 0x025E */ s16 unk_25E; + /* 0x0260 */ s16 unk_260; + /* 0x0262 */ s16 unk_262; + /* 0x0264 */ char unk_264[0xB0]; } EnAnubice; // size = 0x0314 extern const ActorInit En_Anubice_InitVars; diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 897bf9d421..1b378a60ae 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -1,6 +1,11 @@ +/* + * File: z_en_anubice_fire.c + * Overlay: ovl_En_Anubice_Fire + * Description: Anubis Fire Attack + */ + #include "z_en_anubice_fire.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnAnubiceFire_Init(EnAnubiceFire* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnAnubiceFire_Draw(EnAnubiceFire* this, GlobalContext* globalCtx); const ActorInit En_Anubice_Fire_InitVars = { ACTOR_EN_ANUBICE_FIRE, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_ANUBICE, sizeof(EnAnubiceFire), diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 9717d199e1..fbb5c54c8b 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -4,44 +4,20 @@ * Description: Spawns and manages the Anubis enemy */ -#include -#include +#include "z_en_anubice_tag.h" -#include - -// temp struct until we can reference other actors outside of their file -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x10E]; - /* 0x025A */ s16 unk_25A; - /* 0x025C */ char unk_25C[0x2]; - /* 0x025E */ s16 unk_25E; - /* 0x0260 */ s16 unk_260; - /* 0x0262 */ s16 unk_262; - /* 0x0264 */ char unk_264[0xB0]; -} EnAnubice; // size = 0x0314 - -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ ActorFunc actionFunc; - /* 0x0150 */ EnAnubice* anubis; - /* 0x0154 */ f32 triggerRange; -} EnAnubiceTag; // size = 0x0158 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx); -static void EnAnubiceTag_Destroy(EnAnubiceTag* this, GlobalContext* globalCtx); -static void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx); -static void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx); -static void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx); -static void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx); +void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx); +void EnAnubiceTag_Destroy(EnAnubiceTag* this, GlobalContext* globalCtx); +void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx); +void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx); +void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx); +void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx); const ActorInit En_Anubice_Tag_InitVars = { ACTOR_EN_ANUBICE_TAG, ACTORTYPE_SWITCH, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnAnubiceTag), @@ -51,7 +27,7 @@ const ActorInit En_Anubice_Tag_InitVars = { (ActorFunc)EnAnubiceTag_Draw, }; -static void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx) { +void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx) { osSyncPrintf("\n\n"); //"Anubis control tag generated" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); @@ -65,10 +41,10 @@ static void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx) { this->actionFunc = &EnAnubiceTag_SpawnAnubis; } -static void EnAnubiceTag_Destroy(EnAnubiceTag* this, GlobalContext* globalCtx) { +void EnAnubiceTag_Destroy(EnAnubiceTag* this, GlobalContext* globalCtx) { } -static void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { +void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { this->anubis = Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ANUBICE, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.rotTowardsLinkY, 0, 0); @@ -78,7 +54,7 @@ static void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCt } } -static void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { +void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { EnAnubice* anubis; Vec3f offset; @@ -116,11 +92,11 @@ static void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalC } } -static void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx) { +void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx) { +void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx) { if (BREG(0) != 0) { DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1.0f, 1.0f, diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h new file mode 100644 index 0000000000..7175999d64 --- /dev/null +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h @@ -0,0 +1,18 @@ +#ifndef _Z_EN_ANUBICE_TAG_H_ +#define _Z_EN_ANUBICE_TAG_H_ + +#include +#include +#include +#include "../ovl_En_Anubice/z_en_anubice.h" + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ EnAnubice* anubis; + /* 0x0154 */ f32 triggerRange; +} EnAnubiceTag; // size = 0x0158 + +extern const ActorInit En_Anubice_Tag_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c index cc1e84bb5a..3694c1d4fd 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c @@ -4,39 +4,37 @@ * Description: An unused trap that reflects arrows. */ -#include -#include -#include +#include "z_en_arow_trap.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 unk_14C; - /* 0x0150 */ u32 attackTimer; -} ActorEnArowTrap; // size = 0x0154 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void Init(ActorEnArowTrap* this, GlobalContext* globalCtx); -static void Destroy(ActorEnArowTrap* this, GlobalContext* globalCtx); -static void Update(ActorEnArowTrap* this, GlobalContext* globalCtx); +void EnArowTrap_Init(EnArowTrap* this, GlobalContext* globalCtx); +void EnArowTrap_Destroy(EnArowTrap* this, GlobalContext* globalCtx); +void EnArowTrap_Update(EnArowTrap* this, GlobalContext* globalCtx); const ActorInit En_Arow_Trap_InitVars = { - ACTOR_EN_AROW_TRAP, ACTORTYPE_PROP, ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorEnArowTrap), (ActorFunc)Init, - (ActorFunc)Destroy, (ActorFunc)Update, NULL, + ACTOR_EN_AROW_TRAP, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GAMEPLAY_KEEP, + sizeof(EnArowTrap), + (ActorFunc)EnArowTrap_Init, + (ActorFunc)EnArowTrap_Destroy, + (ActorFunc)EnArowTrap_Update, + NULL, }; -static void Init(ActorEnArowTrap* this, GlobalContext* globalCtx) { +void EnArowTrap_Init(EnArowTrap* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.01); this->unk_14C = 0; this->attackTimer = 80; this->actor.posRot2.pos = this->actor.posRot.pos; } -static void Destroy(ActorEnArowTrap* this, GlobalContext* globalCtx) { +void EnArowTrap_Destroy(EnArowTrap* this, GlobalContext* globalCtx) { } -static void Update(ActorEnArowTrap* this, GlobalContext* globalCtx) { +void EnArowTrap_Update(EnArowTrap* this, GlobalContext* globalCtx) { if (this->actor.xzDistanceFromLink <= 400) { this->attackTimer--; diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h new file mode 100644 index 0000000000..4df9e2d9bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h @@ -0,0 +1,16 @@ +#ifndef _Z_EN_AROW_TRAP_H_ +#define _Z_EN_AROW_TRAP_H_ + +#include +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 unk_14C; + /* 0x0150 */ u32 attackTimer; +} EnArowTrap; // size = 0x0154 + +extern const ActorInit En_Arow_Trap_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index a4f9ce389b..1380928dec 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -1,6 +1,11 @@ +/* + * File: z_en_arrow.c + * Overlay: ovl_En_Arrow + * Description: Arrows + */ + #include "z_en_arrow.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnArrow_Init(EnArrow* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnArrow_Draw(EnArrow* this, GlobalContext* globalCtx); const ActorInit En_Arrow_InitVars = { ACTOR_EN_ARROW, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnArrow), diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index f7841a75c3..5e3867d531 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -1,6 +1,11 @@ +/* + * File: z_en_attack_niw.c + * Overlay: ovl_En_Attack_Niw + * Description: Attacking Cucco, not solid + */ + #include "z_en_attack_niw.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnAttackNiw_Init(EnAttackNiw* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnAttackNiw_Draw(EnAttackNiw* this, GlobalContext* globalCtx); const ActorInit En_Attack_Niw_InitVars = { ACTOR_EN_ATTACK_NIW, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_NIW, sizeof(EnAttackNiw), diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 1d1df7898e..f5f9c71f88 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -1,6 +1,11 @@ +/* + * File: z_en_ba.c + * Overlay: ovl_En_Ba + * Description: Tentacle from inside Lord Jabu-Jabu + */ + #include "z_en_ba.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnBa_Init(EnBa* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnBa_Draw(EnBa* this, GlobalContext* globalCtx); const ActorInit En_Ba_InitVars = { ACTOR_EN_BA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BXA, sizeof(EnBa), diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 365363811f..7ff3385197 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -1,6 +1,11 @@ +/* + * File: z_en_bb.c + * Overlay: ovl_En_Bb + * Description: Bubble (Flying Skull Enemy) + */ + #include "z_en_bb.h" -#define ROOM 0x00 #define FLAGS 0x01000015 void EnBb_Init(EnBb* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnBb_Draw(EnBb* this, GlobalContext* globalCtx); const ActorInit En_Bb_InitVars = { ACTOR_EN_BB, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BB, sizeof(EnBb), diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 9df5b6ef14..c81f5d07b0 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -1,6 +1,11 @@ +/* + * File: z_en_bdfire.c + * Overlay: ovl_En_Bdfire + * Description: King Dodongo's Fire + */ + #include "z_en_bdfire.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnBdfire_Init(EnBdfire* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnBdfire_Draw(EnBdfire* this, GlobalContext* globalCtx); const ActorInit En_Bdfire_InitVars = { ACTOR_PLAYER, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_KINGDODONGO, sizeof(EnBdfire), diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 35797342d0..6642b0fc70 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -1,6 +1,5 @@ #include "z_en_bigokuta.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void EnBigokuta_Init(EnBigokuta* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBigokuta_Draw(EnBigokuta* this, GlobalContext* globalCtx); const ActorInit En_Bigokuta_InitVars = { ACTOR_EN_BIGOKUTA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BIGOKUTA, sizeof(EnBigokuta), diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 1da26efb71..c5be1e5b0b 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -1,6 +1,5 @@ #include "z_en_bili.h" -#define ROOM 0x00 #define FLAGS 0x00005005 void EnBili_Init(EnBili* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBili_Draw(EnBili* this, GlobalContext* globalCtx); const ActorInit En_Bili_InitVars = { ACTOR_EN_BILI, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BL, sizeof(EnBili), diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index 984bd07a21..a48c8e7c06 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -27,7 +27,6 @@ typedef struct { /* 0x01C2 */ char unk_1C2[0x1A]; } EnBird; // size = 0x01C4 -#define ROOM 0x00 #define FLAGS 0x00000000 void EnBird_Init(EnBird* this, GlobalContext* globalCtx); @@ -43,7 +42,6 @@ void func_809C1CAC(EnBird* this, s16 params); const ActorInit En_Bird_InitVars = { ACTOR_EN_BIRD, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_BIRD, sizeof(EnBird), diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 99af0e2603..defca311ca 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -1,6 +1,11 @@ +/* + * File: z_en_blkobj.c + * Overlay: ovl_En_Blkobj + * Description: Dark Link's Illusion Room + */ + #include "z_en_blkobj.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnBlkobj_Init(EnBlkobj* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnBlkobj_Draw(EnBlkobj* this, GlobalContext* globalCtx); const ActorInit En_Blkobj_InitVars = { ACTOR_EN_BLKOBJ, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_BLKOBJ, sizeof(EnBlkobj), diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index b51142f9c0..556cf84075 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -1,6 +1,5 @@ #include "z_en_bom.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnBom_Init(EnBom* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBom_Draw(EnBom* this, GlobalContext* globalCtx); const ActorInit En_Bom_InitVars = { ACTOR_EN_BOM, ACTORTYPE_EXPLOSIVES, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnBom), diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 9387f303d5..beb18021d7 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -1,6 +1,5 @@ #include "z_en_bom_bowl_man.h" -#define ROOM 0x00 #define FLAGS 0x08000039 void EnBomBowlMan_Init(EnBomBowlMan* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBomBowlMan_Draw(EnBomBowlMan* this, GlobalContext* globalCtx); const ActorInit En_Bom_Bowl_Man_InitVars = { ACTOR_EN_BOM_BOWL_MAN, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_BG, sizeof(EnBomBowlMan), diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index d2ed6e9344..f25183fdc6 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -1,6 +1,5 @@ #include "z_en_bom_bowl_pit.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnBomBowlPit_Init(EnBomBowlPit* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnBomBowlPit_Update(EnBomBowlPit* this, GlobalContext* globalCtx); const ActorInit En_Bom_Bowl_Pit_InitVars = { ACTOR_EN_BOM_BOWL_PIT, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnBomBowlPit), diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 9347f06866..6994811364 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -1,6 +1,5 @@ #include "z_en_bom_chu.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnBomChu_Init(EnBomChu* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBomChu_Draw(EnBomChu* this, GlobalContext* globalCtx); const ActorInit En_Bom_Chu_InitVars = { ACTOR_EN_BOM_CHU, ACTORTYPE_EXPLOSIVES, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnBomChu), diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 9e3e41b1f7..47ad0a2de7 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -1,6 +1,5 @@ #include "z_en_bombf.h" -#define ROOM 0x00 #define FLAGS 0x00000011 void EnBombf_Init(EnBombf* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBombf_Draw(EnBombf* this, GlobalContext* globalCtx); const ActorInit En_Bombf_InitVars = { ACTOR_EN_BOMBF, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_BOMBF, sizeof(EnBombf), diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 0104711d11..ee14811bdc 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -6,20 +6,18 @@ #include "z_en_boom.h" -#define ROOM 0x00 #define FLAGS 0x00000030 -static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc); -static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx); -static void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx); -static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx); -static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx); -static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx); +void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc); +void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx); +void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx); +void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx); +void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx); +void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx); const ActorInit En_Boom_InitVars = { ACTOR_EN_BOOM, ACTORTYPE_MISC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnBoom), @@ -87,11 +85,11 @@ static Vec3f mtxSrc2 = { 960.0f, 0.0f, 0.0f }; extern D_0400C808; -static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc) { +void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc) { this->actionFunc = actionFunc; } -static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) { +void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) { u32 pad; TrailEffect trail; @@ -131,12 +129,12 @@ static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) { EnBoom_SetupAction(this, &EnBoom_Fly); } -static void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) { +void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) { func_8002709C(globalCtx, this->effect); func_8005D060(globalCtx, &this->collider); } -static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { +void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { Actor* target; Player* player; s32 collided; @@ -268,7 +266,7 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { } } -static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) { +void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (!(player->stateFlags1 & 0x20000000)) { this->actionFunc(this, globalCtx); @@ -277,7 +275,7 @@ static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) { } } -static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) { +void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) { s32 pad; Vec3f mtxDest1; Vec3f mtxDest2; diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index f1343a3036..7ca83ef78d 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -1,6 +1,5 @@ #include "z_en_box.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnBox_Init(EnBox* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBox_Draw(EnBox* this, GlobalContext* globalCtx); const ActorInit En_Box_InitVars = { Chest, ACTORTYPE_CHEST, - ROOM, FLAGS, OBJECT_BOX, sizeof(EnBox), diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 4ac1f7190a..5f10e6eed0 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -1,6 +1,11 @@ +/* + * File: z_en_brob.c + * Overlay: ovl_En_Brob + * Description: Flobbery Muscle Block (Jabu-Jabu's Belly) + */ + #include "z_en_brob.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnBrob_Init(EnBrob* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnBrob_Draw(EnBrob* this, GlobalContext* globalCtx); const ActorInit En_Brob_InitVars = { ACTOR_EN_BROB, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BROB, sizeof(EnBrob), diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 8297e46808..461981839e 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -1,6 +1,5 @@ #include "z_en_bubble.h" -#define ROOM 0x00 #define FLAGS 0x00000001 void EnBubble_Init(EnBubble* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBubble_Draw(EnBubble* this, GlobalContext* globalCtx); const ActorInit En_Bubble_InitVars = { ACTOR_EN_BUBBLE, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BUBBLE, sizeof(EnBubble), diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 4d5098aa88..e55d2176a0 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -1,6 +1,5 @@ #include "z_en_butte.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnButte_Init(EnButte* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnButte_Draw(EnButte* this, GlobalContext* globalCtx); const ActorInit En_Butte_InitVars = { ACTOR_EN_BUTTE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(EnButte), diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 11403fabcd..a948803894 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -1,6 +1,5 @@ #include "z_en_bw.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnBw_Init(EnBw* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBw_Draw(EnBw* this, GlobalContext* globalCtx); const ActorInit En_Bw_InitVars = { ACTOR_EN_BW, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BW, sizeof(EnBw), diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index c459e99345..de1b1f4b57 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -1,6 +1,5 @@ #include "z_en_bx.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnBx_Init(EnBx* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnBx_Draw(EnBx* this, GlobalContext* globalCtx); const ActorInit En_Bx_InitVars = { ACTOR_EN_BX, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_BXA, sizeof(EnBx), diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 50ff45aeab..ab578a48ff 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -1,6 +1,5 @@ #include "z_en_changer.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnChanger_Init(EnChanger* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnChanger_Update(EnChanger* this, GlobalContext* globalCtx); const ActorInit En_Changer_InitVars = { ACTOR_EN_CHANGER, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnChanger), diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 65764bcdb3..74224b6df5 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -1,6 +1,5 @@ #include "z_en_clear_tag.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void EnClearTag_Init(EnClearTag* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnClearTag_Draw(EnClearTag* this, GlobalContext* globalCtx); const ActorInit En_Clear_Tag_InitVars = { ACTOR_EN_CLEAR_TAG, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnClearTag), diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index da5c0d47aa..cff3d6f4c8 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -1,6 +1,11 @@ +/* + * File: z_en_cow.c + * Overlay: ovl_En_Cow + * Description: Cow + */ + #include "z_en_cow.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnCow_Init(EnCow* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnCow_Draw(EnCow* this, GlobalContext* globalCtx); const ActorInit En_Cow_InitVars = { ACTOR_EN_COW, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_COW, sizeof(EnCow), diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index c32ad4be85..039196a1cf 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -1,6 +1,5 @@ #include "z_en_crow.h" -#define ROOM 0x00 #define FLAGS 0x00005005 void EnCrow_Init(EnCrow* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnCrow_Draw(EnCrow* this, GlobalContext* globalCtx); const ActorInit En_Crow_InitVars = { ACTOR_EN_CROW, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_CROW, sizeof(EnCrow), diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 6aeabe7b0b..30eb5728c4 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -1,6 +1,5 @@ #include "z_en_cs.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnCs_Init(EnCs* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnCs_Draw(EnCs* this, GlobalContext* globalCtx); const ActorInit En_Cs_InitVars = { ACTOR_EN_CS, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_CS, sizeof(EnCs), diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 2f6bee036b..26e6e476c0 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -1,6 +1,5 @@ #include "z_en_daiku.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnDaiku_Init(EnDaiku* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDaiku_Draw(EnDaiku* this, GlobalContext* globalCtx); const ActorInit En_Daiku_InitVars = { ACTOR_EN_DAIKU, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DAIKU, sizeof(EnDaiku), diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 63c836c316..c5415d3a13 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -1,6 +1,5 @@ #include "z_en_daiku_kakariko.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnDaikuKakariko_Init(EnDaikuKakariko* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDaikuKakariko_Draw(EnDaikuKakariko* this, GlobalContext* globalCtx); const ActorInit En_Daiku_Kakariko_InitVars = { ACTOR_EN_DAIKU_KAKARIKO, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DAIKU, sizeof(EnDaikuKakariko), diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index cf130f8ac3..6e5b43b769 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1,6 +1,5 @@ #include "z_en_dekubaba.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnDekubaba_Init(EnDekubaba* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDekubaba_Draw(EnDekubaba* this, GlobalContext* globalCtx); const ActorInit En_Dekubaba_InitVars = { ACTOR_EN_DEKUBABA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DEKUBABA, sizeof(EnDekubaba), diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 58e2584327..22cf52d3cd 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -1,6 +1,11 @@ +/* + * File: z_en_dekunuts.c + * Overlay: ovl_En_Dekunuts + * Description: Mad Scrub + */ + #include "z_en_dekunuts.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnDekunuts_Init(EnDekunuts* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnDekunuts_Draw(EnDekunuts* this, GlobalContext* globalCtx); const ActorInit En_Dekunuts_InitVars = { ACTOR_EN_DEKUNUTS, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DEKUNUTS, sizeof(EnDekunuts), diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 7a78e56c28..5b5a48a582 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -1,6 +1,5 @@ #include "z_en_dh.h" -#define ROOM 0x00 #define FLAGS 0x00000415 void EnDh_Init(EnDh* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDh_Draw(EnDh* this, GlobalContext* globalCtx); const ActorInit En_Dh_InitVars = { ACTOR_EN_DH, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DH, sizeof(EnDh), diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 4a8e640919..75d8f2ccd9 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -1,6 +1,11 @@ +/* + * File: z_en_dha.c + * Overlay: ovl_En_Dha + * Description: Dead Hand's Hand + */ + #include "z_en_dha.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnDha_Init(EnDha* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnDha_Draw(EnDha* this, GlobalContext* globalCtx); const ActorInit En_Dha_InitVars = { ACTOR_EN_DHA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DH, sizeof(EnDha), diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 5e3dab74c0..f9f9ff5a4b 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -1,6 +1,5 @@ #include "z_en_diving_game.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnDivingGame_Init(EnDivingGame* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDivingGame_Draw(EnDivingGame* this, GlobalContext* globalCtx); const ActorInit En_Diving_Game_InitVars = { ACTOR_EN_DIVING_GAME, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZO, sizeof(EnDivingGame), diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index a9b31e2c84..57ac47fee7 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -1,6 +1,5 @@ #include "z_en_dns.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnDns_Init(EnDns* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDns_Draw(EnDns* this, GlobalContext* globalCtx); const ActorInit En_Dns_InitVars = { ACTOR_EN_DNS, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SHOPNUTS, sizeof(EnDns), diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 1863ff2b27..1067009e36 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -1,6 +1,5 @@ #include "z_en_dnt_demo.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnDntDemo_Init(EnDntDemo* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnDntDemo_Update(EnDntDemo* this, GlobalContext* globalCtx); const ActorInit En_Dnt_Demo_InitVars = { ACTOR_EN_DNT_DEMO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnDntDemo), diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 1dd9a0a295..e15bfa02d5 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -1,6 +1,5 @@ #include "z_en_dnt_jiji.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnDntJiji_Init(EnDntJiji* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDntJiji_Draw(EnDntJiji* this, GlobalContext* globalCtx); const ActorInit En_Dnt_Jiji_InitVars = { ACTOR_EN_DNT_JIJI, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DNS, sizeof(EnDntJiji), diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 9dc2ff08c3..5b8b916f84 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -1,6 +1,5 @@ #include "z_en_dnt_nomal.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnDntNomal_Init(EnDntNomal* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnDntNomal_Update(EnDntNomal* this, GlobalContext* globalCtx); const ActorInit En_Dnt_Nomal_InitVars = { ACTOR_EN_DNT_NOMAL, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnDntNomal), diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 7622173678..c8163b0273 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -1,6 +1,5 @@ #include "z_en_dodojr.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnDodojr_Init(EnDodojr* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDodojr_Draw(EnDodojr* this, GlobalContext* globalCtx); const ActorInit En_Dodojr_InitVars = { ACTOR_EN_DODOJR, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DODOJR, sizeof(EnDodojr), diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 745c490969..f7a89b09a9 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -1,6 +1,5 @@ #include "z_en_dodongo.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnDodongo_Init(EnDodongo* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDodongo_Draw(EnDodongo* this, GlobalContext* globalCtx); const ActorInit En_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DODONGO, sizeof(EnDodongo), diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index cb1a536040..f6f0fcdf7f 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -6,25 +6,23 @@ #include "z_en_dog.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void EnDog_Init(EnDog* this, GlobalContext* globalCtx); -static void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx); -static void EnDog_Update(EnDog* this, GlobalContext* globalCtx); -static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx); +void EnDog_Init(EnDog* this, GlobalContext* globalCtx); +void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx); +void EnDog_Update(EnDog* this, GlobalContext* globalCtx); +void EnDog_Draw(EnDog* this, GlobalContext* globalCtx); -static void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx); -static void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx); -static void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx); -static void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx); -static void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx); -static void EnDog_Wait(EnDog* this, GlobalContext* globalCtx); +void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx); +void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx); +void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx); +void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx); +void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx); +void EnDog_Wait(EnDog* this, GlobalContext* globalCtx); const ActorInit En_Dog_InitVars = { ACTOR_EN_DOG, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DOG, sizeof(EnDog), @@ -80,7 +78,7 @@ extern AnimationHeader D_06001368; extern AnimationHeader D_06000D78; extern AnimationHeader D_06000278; -static void EnDog_PlayWalkSFX(EnDog* this) { +void EnDog_PlayWalkSFX(EnDog* this) { AnimationHeader* walk = &D_06001368; if (this->skelAnime.animCurrentSeg == walk) { if ((this->skelAnime.animCurrentFrame == 1.0f) || (this->skelAnime.animCurrentFrame == 7.0f)) { @@ -89,7 +87,7 @@ static void EnDog_PlayWalkSFX(EnDog* this) { } } -static void EnDog_PlayRunSFX(EnDog* this) { +void EnDog_PlayRunSFX(EnDog* this) { AnimationHeader* run = &D_06000D78; if (this->skelAnime.animCurrentSeg == run) { if ((this->skelAnime.animCurrentFrame == 2.0f) || (this->skelAnime.animCurrentFrame == 4.0f)) { @@ -98,7 +96,7 @@ static void EnDog_PlayRunSFX(EnDog* this) { } } -static void EnDog_PlayBarkSFX(EnDog* this) { +void EnDog_PlayBarkSFX(EnDog* this) { AnimationHeader* bark = &D_06000278; if (this->skelAnime.animCurrentSeg == bark) { if ((this->skelAnime.animCurrentFrame == 13.0f) || (this->skelAnime.animCurrentFrame == 19.0f)) { @@ -107,7 +105,7 @@ static void EnDog_PlayBarkSFX(EnDog* this) { } } -static s32 EnDog_PlayAnimAndSFX(EnDog* this) { +s32 EnDog_PlayAnimAndSFX(EnDog* this) { s32 animation; if (this->behavior != this->nextBehavior) { @@ -216,7 +214,7 @@ static EnDog_UpdateWaypoint(EnDog* this, GlobalContext* globalCtx) { return 1; } -static s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { +s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { s16 targetYaw; f32 waypointDistSq; @@ -230,7 +228,7 @@ static s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { } } -static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { +void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { SkelAnime* skelAnime; s16 followingDog; ColliderCylinderMain* collider; @@ -289,12 +287,12 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { } } -static void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx) { +void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { +void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { s16ArrEntry behaviors[] = { DOG_SIT, DOG_BOW, DOG_BARK }; s16ArrEntry unused[] = { 40, 80, 20 }; f32 speed; @@ -332,7 +330,7 @@ static void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { } } -static void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx) { +void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx) { if (EnDog_CanFollow(this, globalCtx) == 1) { this->actionFunc = EnDog_FollowLink; } @@ -353,7 +351,7 @@ static void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.4f, 1.0f, 0.0f); } -static void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx) { +void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx) { f32 speed; if (gSaveContext.dogParams == 0) { @@ -390,7 +388,7 @@ static void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx) { } } -static void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx) { +void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx) { if (this->actor.xzDistanceFromLink < 200.0f) { Math_SmoothScaleMaxF(&this->actor.speedXZ, 4.0f, 0.6f, 1.0f); Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, (this->actor.rotTowardsLinkY ^ 0x8000), 10, 1000, 1); @@ -400,7 +398,7 @@ static void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx) { this->actor.shape.rot = this->actor.posRot.rot; } -static void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx) { +void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx) { s16 rotTowardLink; s16 prevRotY; f32 absAngleDiff; @@ -430,7 +428,7 @@ static void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx) { this->actor.shape.rot = this->actor.posRot.rot; } -static void EnDog_Wait(EnDog* this, GlobalContext* globalCtx) { +void EnDog_Wait(EnDog* this, GlobalContext* globalCtx) { this->unusedAngle = (this->actor.rotTowardsLinkY - this->actor.shape.rot.y); // If another dog is following Link and he gets within 200 units of waiting dog, run away @@ -440,7 +438,7 @@ static void EnDog_Wait(EnDog* this, GlobalContext* globalCtx) { } } -static void EnDog_Update(EnDog* this, GlobalContext* globalCtx) { +void EnDog_Update(EnDog* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; @@ -458,10 +456,10 @@ static UNK_TYPE EnDog_Callback1(GlobalContext* globalCtx, s32 limbIndex, Gfx** d return 0; } -static void EnDog_Callback2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { +void EnDog_Callback2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { } -static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { +void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { s32 pad; Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } }; GraphicsContext* gfxCtx; diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index e561236de9..828bc3eb8e 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -1,6 +1,11 @@ +/* + * File: z_en_door.c + * Overlay: ovl_En_Door + * Description: Door + */ + #include "z_en_door.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnDoor_Init(EnDoor* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnDoor_Draw(EnDoor* this, GlobalContext* globalCtx); const ActorInit En_Door_InitVars = { ACTOR_EN_DOOR, ACTORTYPE_DOOR, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnDoor), diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 2c843f87eb..f6e95bc41e 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -6,7 +6,6 @@ #include "z_en_ds.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnDs_Init(EnDs* this, GlobalContext* globalCtx); @@ -35,7 +34,6 @@ void func_809FDA7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* const ActorInit En_Ds_InitVars = { ACTOR_EN_DS, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DS, sizeof(EnDs), diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index e2f28f55b3..adb34719ca 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -1,6 +1,5 @@ #include "z_en_du.h" -#define ROOM 0x00 #define FLAGS 0x02000009 void EnDu_Init(EnDu* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDu_Draw(EnDu* this, GlobalContext* globalCtx); const ActorInit En_Du_InitVars = { ACTOR_EN_DU, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DU, sizeof(EnDu), diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 33ff934ec3..04e75c2694 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -1,6 +1,5 @@ #include "z_en_dy_extra.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnDyExtra_Init(EnDyExtra* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnDyExtra_Draw(EnDyExtra* this, GlobalContext* globalCtx); const ActorInit En_Dy_Extra_InitVars = { ACTOR_EN_DY_EXTRA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_DY_OBJ, sizeof(EnDyExtra), diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index b6ef202b44..8bcd6d783d 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -4,25 +4,16 @@ * Description: Zelda's Path in Ganon Castle Escape? */ -#include -#include -#include -#include +#include "z_en_eg.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ s32 funcIndex; -} ActorEg; // size = 0x0154 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void PlayVoidOutSFX(); -static void Init(ActorEg* this, GlobalContext* globalCtx); -static void Destroy(ActorEg* this, GlobalContext* globalCtx); -static void func_809FFDC8(ActorEg* this, GlobalContext* globalCtx); -static void Update(ActorEg* this, GlobalContext* globalCtx); -static void Draw(ActorEg* this, GlobalContext* globalCtx); +void EnEg_PlayVoidOutSFX(); +void EnEg_Init(EnEg* this, GlobalContext* globalCtx); +void EnEg_Destroy(EnEg* this, GlobalContext* globalCtx); +void func_809FFDC8(EnEg* this, GlobalContext* globalCtx); +void EnEg_Update(EnEg* this, GlobalContext* globalCtx); +void EnEg_Draw(EnEg* this, GlobalContext* globalCtx); static bool hasVoidedOut = false; static const ActorFunc funcTbl[] = { @@ -30,24 +21,29 @@ static const ActorFunc funcTbl[] = { }; const ActorInit En_Eg_InitVars = { - ACTOR_EN_EG, ACTORTYPE_ITEMACTION, ROOM, - FLAGS, OBJECT_ZL2, sizeof(ActorEg), - (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, - (ActorFunc)Draw, + ACTOR_EN_EG, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_ZL2, + sizeof(EnEg), + (ActorFunc)EnEg_Init, + (ActorFunc)EnEg_Destroy, + (ActorFunc)EnEg_Update, + (ActorFunc)EnEg_Draw, }; -static void PlayVoidOutSFX() { +void PlayVoidOutSFX() { func_800788CC(NA_SE_OC_ABYSS); } -static void Destroy(ActorEg* this, GlobalContext* globalCtx) { +void EnEg_Destroy(EnEg* this, GlobalContext* globalCtx) { } -static void Init(ActorEg* this, GlobalContext* globalCtx) { +void EnEg_Init(EnEg* this, GlobalContext* globalCtx) { this->funcIndex = 0; } -static void func_809FFDC8(ActorEg* this, GlobalContext* globalCtx) { +void func_809FFDC8(EnEg* this, GlobalContext* globalCtx) { if (!hasVoidedOut && (gSaveContext.timer_2_value < 1) && Flags_GetSwitch(globalCtx, 0x36) && (kREG(0) == 0)) { // Void the player out func_800C0C88(globalCtx); @@ -59,7 +55,7 @@ static void func_809FFDC8(ActorEg* this, GlobalContext* globalCtx) { } } -static void Update(ActorEg* this, GlobalContext* globalCtx) { +void EnEg_Update(EnEg* this, GlobalContext* globalCtx) { s32 funcIndex = this->funcIndex; if (((funcIndex < 0) || (0 < funcIndex)) || (funcTbl[funcIndex] == NULL)) { @@ -70,5 +66,5 @@ static void Update(ActorEg* this, GlobalContext* globalCtx) { } } -static void Draw(ActorEg* this, GlobalContext* globalCtx) { +void EnEg_Draw(EnEg* this, GlobalContext* globalCtx) { } diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.h b/src/overlays/actors/ovl_En_Eg/z_en_eg.h new file mode 100644 index 0000000000..75d127c3e5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.h @@ -0,0 +1,14 @@ +#ifndef _Z_EN_EG_H_ +#define _Z_EN_EG_H_ + +#include +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ s32 funcIndex; +} EnEg; // size = 0x0154 + +extern const ActorInit En_Eg_InitVars; +#endif diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 8c305bed06..e3bac958ad 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -1,6 +1,5 @@ #include "z_en_eiyer.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnEiyer_Init(EnEiyer* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnEiyer_Draw(EnEiyer* this, GlobalContext* globalCtx); const ActorInit En_Eiyer_InitVars = { ACTOR_EN_EIYER, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_EI, sizeof(EnEiyer), diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 30784c6b89..462df8e6f0 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1,6 +1,5 @@ #include "z_en_elf.h" -#define ROOM 0x00 #define FLAGS 0x02000030 void EnElf_Init(EnElf* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnElf_Draw(EnElf* this, GlobalContext* globalCtx); const ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnElf), diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 4a5b99da69..cb06d93f6b 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -1,6 +1,5 @@ #include "z_en_encount1.h" -#define ROOM 0x00 #define FLAGS 0x08000010 void EnEncount1_Init(EnEncount1* this, GlobalContext* globalCtx); @@ -10,7 +9,6 @@ void EnEncount1_Update(EnEncount1* this, GlobalContext* globalCtx); const ActorInit En_Encount1_InitVars = { ACTOR_EN_ENCOUNT1, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnEncount1), diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 606d0814d9..4c4e2e15d0 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -1,6 +1,5 @@ #include "z_en_encount2.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnEncount2_Init(EnEncount2* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnEncount2_Draw(EnEncount2* this, GlobalContext* globalCtx); const ActorInit En_Encount2_InitVars = { ACTOR_EN_ENCOUNT2, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_EFC_STAR_FIELD, sizeof(EnEncount2), diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index e070af7720..4cffa67d2e 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -1,6 +1,5 @@ #include "z_en_ex_item.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnExItem_Init(EnExItem* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnExItem_Draw(EnExItem* this, GlobalContext* globalCtx); const ActorInit En_Ex_Item_InitVars = { ACTOR_EN_EX_ITEM, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnExItem), diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index a361adf2ad..26429f54a7 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -1,6 +1,5 @@ #include "z_en_ex_ruppy.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnExRuppy_Init(EnExRuppy* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnExRuppy_Draw(EnExRuppy* this, GlobalContext* globalCtx); const ActorInit En_Ex_Ruppy_InitVars = { ACTOR_EN_EX_RUPPY, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnExRuppy), diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 4466d986f9..f68aa23aec 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -1,6 +1,5 @@ #include "z_en_fd.h" -#define ROOM 0x00 #define FLAGS 0x00000215 void EnFd_Init(EnFd* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFd_Draw(EnFd* this, GlobalContext* globalCtx); const ActorInit En_Fd_InitVars = { ACTOR_EN_FD, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_FW, sizeof(EnFd), diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 38e5aedc62..8635d37f61 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -1,6 +1,5 @@ #include "z_en_fd_fire.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnFdFire_Init(EnFdFire* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFdFire_Draw(EnFdFire* this, GlobalContext* globalCtx); const ActorInit En_Fd_Fire_InitVars = { ACTOR_EN_FD_FIRE, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(EnFdFire), diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index fd5656ea63..9cc4b9ce78 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -1,6 +1,5 @@ #include "z_en_fhg_fire.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnFhgFire_Init(EnFhgFire* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFhgFire_Draw(EnFhgFire* this, GlobalContext* globalCtx); const ActorInit En_Fhg_Fire_InitVars = { ACTOR_PLAYER, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_FHG, sizeof(EnFhgFire), diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 65f0887180..c97b31d085 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -1,6 +1,5 @@ #include "z_en_fire_rock.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnFireRock_Init(EnFireRock* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFireRock_Draw(EnFireRock* this, GlobalContext* globalCtx); const ActorInit En_Fire_Rock_InitVars = { ACTOR_EN_FIRE_ROCK, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_EFC_STAR_FIELD, sizeof(EnFireRock), diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index b1244235d5..ac3d2042bc 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -1,6 +1,5 @@ #include "z_en_firefly.h" -#define ROOM 0x00 #define FLAGS 0x00005005 void EnFirefly_Init(EnFirefly* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFirefly_Draw(EnFirefly* this, GlobalContext* globalCtx); const ActorInit En_Firefly_InitVars = { ACTOR_EN_FIREFLY, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly), diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 7308fa8ab9..77087df19e 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -1,6 +1,5 @@ #include "z_en_fish.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnFish_Init(EnFish* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFish_Draw(EnFish* this, GlobalContext* globalCtx); const ActorInit En_Fish_InitVars = { ACTOR_EN_FISH, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnFish), diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index adc48b934b..4b47c33f93 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -1,6 +1,5 @@ #include "z_en_floormas.h" -#define ROOM 0x00 #define FLAGS 0x00000405 void EnFloormas_Init(EnFloormas* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFloormas_Draw(EnFloormas* this, GlobalContext* globalCtx); const ActorInit En_Floormas_InitVars = { ACTOR_EN_FLOORMAS, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_WALLMASTER, sizeof(EnFloormas), diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index ff905fec14..a6b2ac9970 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1,6 +1,5 @@ #include "z_en_fr.h" -#define ROOM 0x00 #define FLAGS 0x02000019 void EnFr_Init(EnFr* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnFr_Update(EnFr* this, GlobalContext* globalCtx); const ActorInit En_Fr_InitVars = { ACTOR_EN_FR, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_FR, sizeof(EnFr), diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index afcdcb3a55..1c4c49bc45 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -1,6 +1,11 @@ +/* + * File: z_en_fu.c + * Overlay: ovl_En_Fu + * Description: Windmill Man + */ + #include "z_en_fu.h" -#define ROOM 0x00 #define FLAGS 0x02000019 void EnFu_Init(EnFu* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnFu_Draw(EnFu* this, GlobalContext* globalCtx); const ActorInit En_Fu_InitVars = { ACTOR_EN_FU, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_FU, sizeof(EnFu), diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index be1295087e..9262d6a9a0 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -1,6 +1,5 @@ #include "z_en_fw.h" -#define ROOM 0x00 #define FLAGS 0x00000215 void EnFw_Init(EnFw* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFw_Draw(EnFw* this, GlobalContext* globalCtx); const ActorInit En_Fw_InitVars = { ACTOR_EN_FW, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_FW, sizeof(EnFw), diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 9978639d7f..0e290ee6af 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,6 +1,5 @@ #include "z_en_fz.h" -#define ROOM 0x00 #define FLAGS 0x00000415 void EnFz_Init(EnFz* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnFz_Draw(EnFz* this, GlobalContext* globalCtx); const ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_FZ, sizeof(EnFz), diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index f871217f70..f688671ab9 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -1,6 +1,5 @@ #include "z_en_g_switch.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnGSwitch_Init(EnGSwitch* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnGSwitch_Update(EnGSwitch* this, GlobalContext* globalCtx); const ActorInit En_G_Switch_InitVars = { ACTOR_EN_G_SWITCH, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnGSwitch), diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 171cd39082..79bcd78274 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -1,6 +1,5 @@ #include "z_en_ganon_mant.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnGanonMant_Init(EnGanonMant* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGanonMant_Draw(EnGanonMant* this, GlobalContext* globalCtx); const ActorInit En_Ganon_Mant_InitVars = { ACTOR_EN_GANON_MANT, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnGanonMant), diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index b901238dae..a4ff6c08b7 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -12,7 +12,6 @@ typedef struct { /* 0x014C */ char unk_14C[0x4]; } EnGanonOrgan; // size = 0x0150 -#define ROOM 0x00 #define FLAGS 0x00000030 void EnGanonOrgan_Init(EnGanonOrgan* this, GlobalContext* globalCtx); @@ -23,7 +22,6 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx); const ActorInit En_Ganon_Organ_InitVars = { ACTOR_EN_GANON_ORGAN, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GANON, sizeof(EnGanonOrgan), diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 69ef58ef7d..4cf5a332b9 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -1,6 +1,5 @@ #include "z_en_gb.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnGb_Init(EnGb* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGb_Draw(EnGb* this, GlobalContext* globalCtx); const ActorInit En_Gb_InitVars = { ACTOR_EN_GB, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_PS, sizeof(EnGb), diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 9eb5b93903..fe0b6d725d 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -1,6 +1,5 @@ #include "z_en_ge1.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnGe1_Init(EnGe1* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGe1_Draw(EnGe1* this, GlobalContext* globalCtx); const ActorInit En_Ge1_InitVars = { ACTOR_EN_GE1, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GE1, sizeof(EnGe1), diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 4a9c2e08c6..231bc34b21 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -1,6 +1,5 @@ #include "z_en_ge2.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnGe2_Init(EnGe2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGe2_Draw(EnGe2* this, GlobalContext* globalCtx); const ActorInit En_Ge2_InitVars = { ACTOR_EN_GE2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GLA, sizeof(EnGe2), diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 739372634b..0162ddfe04 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -1,6 +1,11 @@ +/* + * File: z_en_ge3.c + * Overlay: ovl_En_Ge3 + * Description: Gerudo giving you membership card + */ + #include "z_en_ge3.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnGe3_Init(EnGe3* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnGe3_Draw(EnGe3* this, GlobalContext* globalCtx); const ActorInit En_Ge3_InitVars = { ACTOR_EN_GE3, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GELDB, sizeof(EnGe3), diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index adcd4d177f..8f5ebf377d 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1,6 +1,5 @@ #include "z_en_geldb.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnGeldB_Init(EnGeldB* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGeldB_Draw(EnGeldB* this, GlobalContext* globalCtx); const ActorInit En_GeldB_InitVars = { ACTOR_EN_GELDB, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_GELDB, sizeof(EnGeldB), diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 6ada4bc893..030e11d35d 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -1,6 +1,5 @@ #include "z_en_girla.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnGirlA_Init(EnGirlA* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnGirlA_Update(EnGirlA* this, GlobalContext* globalCtx); const ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnGirlA), diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index c6bc1c6a98..9c38ccdd7f 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -1,6 +1,5 @@ #include "z_en_gm.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnGm_Init(EnGm* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnGm_Update(EnGm* this, GlobalContext* globalCtx); const ActorInit En_Gm_InitVars = { ACTOR_EN_GM, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGm), diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index da3f031231..52e9339d91 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1,6 +1,5 @@ #include "z_en_go.h" -#define ROOM 0x00 #define FLAGS 0x00000039 void EnGo_Init(EnGo* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGo_Draw(EnGo* this, GlobalContext* globalCtx); const ActorInit En_Go_InitVars = { ACTOR_EN_GO, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGo), diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 3023d35640..31f9ce74eb 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1,6 +1,5 @@ #include "z_en_go2.h" -#define ROOM 0x00 #define FLAGS 0x00000039 void EnGo2_Init(EnGo2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGo2_Draw(EnGo2* this, GlobalContext* globalCtx); const ActorInit En_Go2_InitVars = { ACTOR_EN_GO2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGo2), diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index e9352ab070..eac098795e 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -1,6 +1,5 @@ #include "z_en_goma.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void EnGoma_Init(EnGoma* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGoma_Draw(EnGoma* this, GlobalContext* globalCtx); const ActorInit En_Goma_InitVars = { ACTOR_BOSS_GOMA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_GOL, sizeof(EnGoma), diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index cad9e75fbd..8265e83cc1 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -1,6 +1,5 @@ #include "z_en_goroiwa.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnGoroiwa_Init(EnGoroiwa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGoroiwa_Draw(EnGoroiwa* this, GlobalContext* globalCtx); const ActorInit En_Goroiwa_InitVars = { ACTOR_EN_GOROIWA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GOROIWA, sizeof(EnGoroiwa), diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index a77a3fef79..dbb0c6083d 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -1,6 +1,5 @@ #include "z_en_gs.h" -#define ROOM 0x00 #define FLAGS 0x02000009 void EnGs_Init(EnGs* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnGs_Draw(EnGs* this, GlobalContext* globalCtx); const ActorInit En_Gs_InitVars = { ACTOR_EN_GS, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GS, sizeof(EnGs), diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 071a83801f..5bbba98691 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -1,6 +1,5 @@ #include "z_en_guest.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnGuest_Init(EnGuest* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnGuest_Update(EnGuest* this, GlobalContext* globalCtx); const ActorInit En_Guest_InitVars = { ACTOR_EN_GUEST, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_BOJ, sizeof(EnGuest), diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index ec66c0888b..fbde62fd56 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -1,6 +1,11 @@ +/* + * File: z_en_hata.c + * Overlay: ovl_En_Hata + * Description: Wooden post with red cloth + */ + #include "z_en_hata.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnHata_Init(EnHata* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHata_Draw(EnHata* this, GlobalContext* globalCtx); const ActorInit En_Hata_InitVars = { ACTOR_EN_HATA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_HATA, sizeof(EnHata), diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index b7d547d372..1513974720 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -1,6 +1,5 @@ #include "z_en_heishi1.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHeishi1_Init(EnHeishi1* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHeishi1_Draw(EnHeishi1* this, GlobalContext* globalCtx); const ActorInit En_Heishi1_InitVars = { ACTOR_PLAYER, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SD, sizeof(EnHeishi1), diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index d62494a2ba..020f903fb3 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -1,6 +1,5 @@ #include "z_en_heishi2.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnHeishi2_Init(EnHeishi2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHeishi2_Draw(EnHeishi2* this, GlobalContext* globalCtx); const ActorInit En_Heishi2_InitVars = { ACTOR_EN_HEISHI2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SD, sizeof(EnHeishi2), diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index c47b28b4ed..55fd6a5983 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -1,6 +1,11 @@ +/* + * File: z_en_heishi3.c + * Overlay: ovl_En_Heishi3 + * Description: Hyrule Castle Guard + */ + #include "z_en_heishi3.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnHeishi3_Init(EnHeishi3* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHeishi3_Draw(EnHeishi3* this, GlobalContext* globalCtx); const ActorInit En_Heishi3_InitVars = { ACTOR_EN_HEISHI3, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SD, sizeof(EnHeishi3), diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 63ef25296b..228c15f43d 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -1,6 +1,5 @@ #include "z_en_heishi4.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnHeishi4_Init(EnHeishi4* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHeishi4_Draw(EnHeishi4* this, GlobalContext* globalCtx); const ActorInit En_Heishi4_InitVars = { ACTOR_EN_HEISHI4, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SD, sizeof(EnHeishi4), diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index a06cc52739..db442f2562 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -1,6 +1,11 @@ +/* + * File: z_en_hintnuts.c + * Overlay: ovl_En_Hintnuts + * Description: Hint Deku Scrubs (Deku Tree) + */ + #include "z_en_hintnuts.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnHintnuts_Init(EnHintnuts* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHintnuts_Draw(EnHintnuts* this, GlobalContext* globalCtx); const ActorInit En_Hintnuts_InitVars = { ACTOR_EN_HINTNUTS, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_HINTNUTS, sizeof(EnHintnuts), diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 3d24d7812b..3b99f9c1c5 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -1,6 +1,5 @@ #include "z_en_holl.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHoll_Init(EnHoll* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHoll_Draw(EnHoll* this, GlobalContext* globalCtx); const ActorInit En_Holl_InitVars = { ACTOR_EN_HOLL, ACTORTYPE_DOOR, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnHoll), diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index eb9bd021ea..70d28542b5 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -1,6 +1,5 @@ #include "z_en_honotrap.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHonotrap_Init(EnHonotrap* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHonotrap_Draw(EnHonotrap* this, GlobalContext* globalCtx); const ActorInit En_Honotrap_InitVars = { ACTOR_EN_HONOTRAP, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(EnHonotrap), diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 6ec7c4c506..c5cb03df5c 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -1,6 +1,5 @@ #include "z_en_horse.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorse_Init(EnHorse* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHorse_Draw(EnHorse* this, GlobalContext* globalCtx); const ActorInit En_Horse_InitVars = { ACTOR_EN_HORSE, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HORSE, sizeof(EnHorse), diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index a90d34cd5b..0791b43d1f 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -1,6 +1,11 @@ +/* + * File: z_en_horse_game_check.c + * Overlay: ovl_En_Horse_Game_Check + * Description: Horseback Minigames + */ + #include "z_en_horse_game_check.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorseGameCheck_Init(EnHorseGameCheck* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHorseGameCheck_Draw(EnHorseGameCheck* this, GlobalContext* globalCtx); const ActorInit En_Horse_Game_Check_InitVars = { ACTOR_EN_HORSE_GAME_CHECK, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnHorseGameCheck), diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 5a4f8266f7..e38ede66ff 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -1,6 +1,11 @@ +/* + * File: z_en_horse_ganon.c + * Overlay: ovl_En_Horse_Ganon + * Description: Ganondorf's Horse + */ + #include "z_en_horse_ganon.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorseGanon_Init(EnHorseGanon* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHorseGanon_Draw(EnHorseGanon* this, GlobalContext* globalCtx); const ActorInit En_Horse_Ganon_InitVars = { ACTOR_EN_HORSE_GANON, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HORSE_GANON, sizeof(EnHorseGanon), diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 8e86242098..7ebcdab82d 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -1,6 +1,11 @@ +/* + * File: z_en_horse_link_child.c + * Overlay: ovl_En_Horse_Link_Child + * Description: Young Epona + */ + #include "z_en_horse_link_child.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void EnHorseLinkChild_Init(EnHorseLinkChild* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHorseLinkChild_Draw(EnHorseLinkChild* this, GlobalContext* globalCtx); const ActorInit En_Horse_Link_Child_InitVars = { ACTOR_EN_HORSE_LINK_CHILD, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HORSE_LINK_CHILD, sizeof(EnHorseLinkChild), diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 69ced1610b..25ff310fe4 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -1,6 +1,5 @@ #include "z_en_horse_normal.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnHorseNormal_Init(EnHorseNormal* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHorseNormal_Draw(EnHorseNormal* this, GlobalContext* globalCtx); const ActorInit En_Horse_Normal_InitVars = { ACTOR_EN_HORSE_NORMAL, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HORSE_NORMAL, sizeof(EnHorseNormal), diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 7cc04e5435..c5e79a3236 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -1,6 +1,11 @@ +/* + * File: z_en_horse_zelda.c + * Overlay: ovl_En_Horse_Zelda + * Description: Zelda's Horse + */ + #include "z_en_horse_zelda.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorseZelda_Init(EnHorseZelda* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHorseZelda_Draw(EnHorseZelda* this, GlobalContext* globalCtx); const ActorInit En_Horse_Zelda_InitVars = { ACTOR_EN_HORSE_ZELDA, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_HORSE_ZELDA, sizeof(EnHorseZelda), diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index a81eee8b8d..c9c2d3f171 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -1,6 +1,5 @@ #include "z_en_hs.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnHs_Init(EnHs* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHs_Draw(EnHs* this, GlobalContext* globalCtx); const ActorInit En_Hs_InitVars = { ACTOR_EN_HS, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_HS, sizeof(EnHs), diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 97fb28ea12..6a6e90e2bc 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -1,6 +1,11 @@ +/* + * File: z_en_hs2.c + * Overlay: ovl_En_Hs2 + * Description: Carpenter's Son (Child Link version) + */ + #include "z_en_hs2.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnHs2_Init(EnHs2* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnHs2_Draw(EnHs2* this, GlobalContext* globalCtx); const ActorInit En_Hs2_InitVars = { ACTOR_EN_HS2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_HS, sizeof(EnHs2), diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 75a6185d87..a1024f8ba1 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1,6 +1,5 @@ #include "z_en_hy.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnHy_Init(EnHy* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnHy_Draw(EnHy* this, GlobalContext* globalCtx); const ActorInit En_Hy_InitVars = { ACTOR_EN_HY, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnHy), diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 2e62e5bc49..943b33cc9b 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -1,6 +1,5 @@ #include "z_en_ice_hono.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnIceHono_Init(EnIceHono* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnIceHono_Draw(EnIceHono* this, GlobalContext* globalCtx); const ActorInit En_Ice_Hono_InitVars = { ACTOR_EN_ICE_HONO, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnIceHono), diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 8233f73d91..c6805684eb 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -1,6 +1,5 @@ #include "z_en_ik.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnIk_Init(EnIk* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnIk_Draw(EnIk* this, GlobalContext* globalCtx); const ActorInit En_Ik_InitVars = { ACTOR_EN_IK, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_IK, sizeof(EnIk), diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 2617d2aa8a..80864c0961 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1,6 +1,5 @@ #include "z_en_in.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnIn_Init(EnIn* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnIn_Draw(EnIn* this, GlobalContext* globalCtx); const ActorInit En_In_InitVars = { ACTOR_EN_IN, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_IN, sizeof(EnIn), diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index fe931c2774..0b4d581404 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -1,6 +1,5 @@ #include "z_en_insect.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnInsect_Init(EnInsect* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnInsect_Draw(EnInsect* this, GlobalContext* globalCtx); const ActorInit En_Insect_InitVars = { ACTOR_EN_INSECT, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnInsect), diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 4b04945aeb..d11c5e1b74 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -1,6 +1,5 @@ #include "z_en_ishi.h" -#define ROOM 0x00 #define FLAGS 0x00800000 void EnIshi_Init(EnIshi* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnIshi_Draw(EnIshi* this, GlobalContext* globalCtx); const ActorInit En_Ishi_InitVars = { ACTOR_EN_ISHI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(EnIshi), diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index e96f5b1f50..f96c66296a 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -4,22 +4,13 @@ * Description: Dampe's Minigame digging spot hitboxes */ -#include -#include -#include +#include "z_en_it.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 unk_14C; - /* 0x0150 */ ColliderCylinderMain cylinderCollider; -} ActorIt; // size = 0x019C - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorIt* this, GlobalContext* globalCtx); -static void Destroy(ActorIt* this, GlobalContext* globalCtx); -static void Update(ActorIt* this, GlobalContext* globalCtx); +void EnIt_Init(EnIt* this, GlobalContext* globalCtx); +void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx); +void EnIt_Update(EnIt* this, GlobalContext* globalCtx); static ColliderCylinderInit cylinderInitData = { 0x0A, 0x00, 0x00, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, @@ -31,14 +22,19 @@ static u8 damageTblInitData[] = { }; const ActorInit En_It_InitVars = { - ACTOR_EN_IT, ACTORTYPE_PROP, ROOM, - FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorIt), - (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, + ACTOR_EN_IT, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GAMEPLAY_KEEP, + sizeof(EnIt), + (ActorFunc)EnIt_Init, + (ActorFunc)EnIt_Destroy, + (ActorFunc)EnIt_Update, (ActorFunc)NULL, }; -static void Init(ActorIt* this, GlobalContext* globalCtx) { - ActorIt* it = this; +void EnIt_Init(EnIt* this, GlobalContext* globalCtx) { + EnIt* it = this; it->actor.params = 0x0D05; ActorCollider_AllocCylinder(globalCtx, &it->cylinderCollider); @@ -46,15 +42,15 @@ static void Init(ActorIt* this, GlobalContext* globalCtx) { func_80061EFC(&it->actor.sub_98.damageChart, 0, &damageTblInitData); // Init Damage Chart } -static void Destroy(ActorIt* this, GlobalContext* globalCtx) { - ActorIt* it = this; +void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx) { + EnIt* it = this; ActorCollider_FreeCylinder(globalCtx, &it->cylinderCollider); } -static void Update(ActorIt* this, GlobalContext* globalCtx) { +void EnIt_Update(EnIt* this, GlobalContext* globalCtx) { s32 pad; - ActorIt* it = this; + EnIt* it = this; ActorCollider_Cylinder_Update(&it->actor, &it->cylinderCollider); Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &it->cylinderCollider); diff --git a/src/overlays/actors/ovl_En_It/z_en_it.h b/src/overlays/actors/ovl_En_It/z_en_it.h new file mode 100644 index 0000000000..c9c63ee3cf --- /dev/null +++ b/src/overlays/actors/ovl_En_It/z_en_it.h @@ -0,0 +1,15 @@ +#ifndef _Z_EN_IT_H_ +#define _Z_EN_IT_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 unk_14C; + /* 0x0150 */ ColliderCylinderMain cylinderCollider; +} EnIt; // size = 0x019C + +extern const ActorInit En_It_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 0e5ea72232..cd4a7df838 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -1,6 +1,11 @@ +/* + * File: z_en_jj.c + * Overlay: ovl_En_Jj + * Description: Lord Jabu-Jabu + */ + #include "z_en_jj.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnJj_Init(EnJj* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnJj_Draw(EnJj* this, GlobalContext* globalCtx); const ActorInit En_Jj_InitVars = { ACTOR_EN_JJ, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_JJ, sizeof(EnJj), diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 1e6b1681ad..dc740611a8 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -1,6 +1,5 @@ #include "z_en_js.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnJs_Init(EnJs* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnJs_Draw(EnJs* this, GlobalContext* globalCtx); const ActorInit En_Js_InitVars = { ACTOR_EN_JS, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_JS, sizeof(EnJs), diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index b9c546d2b4..cbb2a4f34c 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -1,6 +1,5 @@ #include "z_en_jsjutan.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnJsjutan_Init(EnJsjutan* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnJsjutan_Draw(EnJsjutan* this, GlobalContext* globalCtx); const ActorInit En_Jsjutan_InitVars = { ACTOR_EN_JSJUTAN, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnJsjutan), diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 40f2f10dcd..9e21e43942 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -1,6 +1,5 @@ #include "z_en_kakasi.h" -#define ROOM 0x00 #define FLAGS 0x02000009 void EnKakasi_Init(EnKakasi* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnKakasi_Draw(EnKakasi* this, GlobalContext* globalCtx); const ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_KA, sizeof(EnKakasi), diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 63ca13aa17..a64ee99701 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -1,6 +1,5 @@ #include "z_en_kakasi2.h" -#define ROOM 0x00 #define FLAGS 0x0A000031 void EnKakasi2_Init(EnKakasi2* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnKakasi2_Update(EnKakasi2* this, GlobalContext* globalCtx); const ActorInit En_Kakasi2_InitVars = { ACTOR_EN_KAKASI2, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_KA, sizeof(EnKakasi2), diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index f20570467c..f0643353e7 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -1,6 +1,5 @@ #include "z_en_kakasi3.h" -#define ROOM 0x00 #define FLAGS 0x02000009 void EnKakasi3_Init(EnKakasi3* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnKakasi3_Draw(EnKakasi3* this, GlobalContext* globalCtx); const ActorInit En_Kakasi3_InitVars = { ACTOR_EN_KAKASI3, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_KA, sizeof(EnKakasi3), diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 080967817f..32eac6aa41 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -1,6 +1,5 @@ #include "z_en_kanban.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnKanban_Init(EnKanban* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnKanban_Draw(EnKanban* this, GlobalContext* globalCtx); const ActorInit En_Kanban_InitVars = { ACTOR_EN_KANBAN, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_KANBAN, sizeof(EnKanban), diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 807cd3c235..5d3316653c 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -1,6 +1,5 @@ #include "z_en_karebaba.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnKarebaba_Init(EnKarebaba* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnKarebaba_Draw(EnKarebaba* this, GlobalContext* globalCtx); const ActorInit En_Karebaba_InitVars = { ACTOR_EN_KAREBABA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_DEKUBABA, sizeof(EnKarebaba), diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index cb84c75994..2e7dc393aa 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -1,6 +1,5 @@ #include "z_en_ko.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnKo_Init(EnKo* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnKo_Draw(EnKo* this, GlobalContext* globalCtx); const ActorInit En_Ko_InitVars = { ACTOR_EN_KO, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnKo), diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 6983341329..7653601c41 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -1,6 +1,5 @@ #include "z_en_kusa.h" -#define ROOM 0x00 #define FLAGS 0x00800010 void EnKusa_Init(EnKusa* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnKusa_Update(EnKusa* this, GlobalContext* globalCtx); const ActorInit En_Kusa_InitVars = { ACTOR_EN_KUSA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnKusa), diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index fedd9bfc8c..dab51846fe 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -1,6 +1,5 @@ #include "z_en_kz.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnKz_Init(EnKz* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnKz_Draw(EnKz* this, GlobalContext* globalCtx); const ActorInit En_Kz_InitVars = { ACTOR_EN_KZ, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_KZ, sizeof(EnKz), diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index cc38ff519e..5720045be2 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -1,6 +1,5 @@ #include "z_en_light.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnLight_Init(EnLight* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnLight_Draw(EnLight* this, GlobalContext* globalCtx); const ActorInit En_Light_InitVars = { ACTOR_EN_LIGHT, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnLight), diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index e0e30d1932..d4e9422ad1 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -6,18 +6,16 @@ #include "z_en_lightbox.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx); -static void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx); -static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx); -static void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx); +void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx); +void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx); +void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx); +void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx); const ActorInit En_Lightbox_InitVars = { ACTOR_EN_LIGHTBOX, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_LIGHTBOX, sizeof(EnLightbox), @@ -30,7 +28,7 @@ const ActorInit En_Lightbox_InitVars = { extern u32 D_06000B70; extern u32 D_06001F10; -static void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx) { +void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx) { u32 local_c = 0; Actor* thisx = &this->dyna.actor; s32 pad[4]; @@ -63,11 +61,11 @@ static void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx) { this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); } -static void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx) { +void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { +void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (this->dyna.unk_162 != 0) { @@ -108,6 +106,6 @@ static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { thisx->posRot2.pos = thisx->posRot.pos; } -static void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx) { +void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_06000B70); } diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 5d4affcf75..e5a1ee9141 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -4,26 +4,24 @@ * Description: The attack from a Deku Nut. Spawned by ovl_En_Arrow. */ -#include -#include -#include +#include "z_en_m_fire1.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ ColliderCylinderMain capsule; - /* 0x0198 */ f32 unk_0198; -} ActorMFire; // size = 0x019C - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorMFire* this, GlobalContext* globalCtx); -static void Destroy(ActorMFire* this, GlobalContext* globalCtx); -static void Update(ActorMFire* this, GlobalContext* globalCtx); +void EnMFire1_Init(EnMFire1* this, GlobalContext* globalCtx); +void EnMFire1_Destroy(EnMFire1* this, GlobalContext* globalCtx); +void EnMFire1_Update(EnMFire1* this, GlobalContext* globalCtx); const ActorInit En_M_Fire1_InitVars = { - ACTOR_EN_M_FIRE1, ACTORTYPE_MISC, ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorMFire), (ActorFunc)Init, - (ActorFunc)Destroy, (ActorFunc)Update, NULL, + ACTOR_EN_M_FIRE1, + ACTORTYPE_MISC, + FLAGS, + OBJECT_GAMEPLAY_KEEP, + sizeof(EnMFire1), + (ActorFunc)EnMFire1_Init, + (ActorFunc)EnMFire1_Destroy, + (ActorFunc)EnMFire1_Update, + NULL, }; static ColliderCylinderInit cylinderInitData = { @@ -31,9 +29,9 @@ static ColliderCylinderInit cylinderInitData = { 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x0000, 0x0000, 0x0000, 0x00C8, 0x00C8, 0x0000, }; -static void Init(ActorMFire* this, GlobalContext* globalCtx) { +void EnMFire1_Init(EnMFire1* this, GlobalContext* globalCtx) { s32 pad; - ActorMFire* thisLocal; + EnMFire1* thisLocal; thisLocal = this; @@ -45,14 +43,14 @@ static void Init(ActorMFire* this, GlobalContext* globalCtx) { ActorCollider_InitCylinder(globalCtx, &thisLocal->capsule, &thisLocal->actor, &cylinderInitData); } -static void Destroy(ActorMFire* this, GlobalContext* globalCtx) { +void EnMFire1_Destroy(EnMFire1* this, GlobalContext* globalCtx) { ColliderCylinderMain* capsule = &this->capsule; ActorCollider_FreeCylinder(globalCtx, capsule); } -static void Update(ActorMFire* this, GlobalContext* globalCtx) { +void EnMFire1_Update(EnMFire1* this, GlobalContext* globalCtx) { s32 pad; - ActorMFire* thisLocal = this; + EnMFire1* thisLocal = this; if (Math_ApproxF(&thisLocal->unk_0198, 1.0, 0.2)) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h new file mode 100644 index 0000000000..cbba916e6a --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h @@ -0,0 +1,15 @@ +#ifndef _Z_EN_M_FIRE1_H_ +#define _Z_EN_M_FIRE1_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ColliderCylinderMain capsule; + /* 0x0198 */ f32 unk_0198; +} EnMFire1; // size = 0x019C + +extern const ActorInit En_M_Fire1_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index b5b66a347a..fec47ff82a 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -1,6 +1,5 @@ #include "z_en_m_thunder.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnMThunder_Init(EnMThunder* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMThunder_Draw(EnMThunder* this, GlobalContext* globalCtx); const ActorInit En_M_Thunder_InitVars = { ACTOR_EN_M_THUNDER, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnMThunder), diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 56fe512673..7acb4e94f1 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -1,6 +1,5 @@ #include "z_en_ma1.h" -#define ROOM 0x00 #define FLAGS 0x02000039 void EnMa1_Init(EnMa1* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMa1_Draw(EnMa1* this, GlobalContext* globalCtx); const ActorInit En_Ma1_InitVars = { ACTOR_EN_MA1, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MA1, sizeof(EnMa1), diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 6728ff6d34..dae18e110d 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -1,6 +1,5 @@ #include "z_en_ma2.h" -#define ROOM 0x00 #define FLAGS 0x02000039 void EnMa2_Init(EnMa2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMa2_Draw(EnMa2* this, GlobalContext* globalCtx); const ActorInit En_Ma2_InitVars = { ACTOR_EN_MA2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MA2, sizeof(EnMa2), diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 87c01eff48..1f551b1737 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -1,6 +1,5 @@ #include "z_en_ma3.h" -#define ROOM 0x00 #define FLAGS 0x00000039 void EnMa3_Init(EnMa3* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMa3_Draw(EnMa3* this, GlobalContext* globalCtx); const ActorInit En_Ma3_InitVars = { ACTOR_EN_MA3, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MA2, sizeof(EnMa3), diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index a763911bf6..967d8fd5f8 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -1,6 +1,11 @@ +/* + * File: z_en_mag.c + * Overlay: ovl_En_Mag + * Description: Title Screen Actor + */ + #include "z_en_mag.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnMag_Init(EnMag* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnMag_Draw(EnMag* this, GlobalContext* globalCtx); const ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_MAG, sizeof(EnMag), diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 94451d199e..6b42ca8d51 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -1,6 +1,5 @@ #include "z_en_mb.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnMb_Init(EnMb* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMb_Draw(EnMb* this, GlobalContext* globalCtx); const ActorInit En_Mb_InitVars = { ACTOR_EN_MB, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_MB, sizeof(EnMb), diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 1dd9c3cfe4..1b4db67cd9 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -1,6 +1,5 @@ #include "z_en_md.h" -#define ROOM 0x00 #define FLAGS 0x02000019 void EnMd_Init(EnMd* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMd_Draw(EnMd* this, GlobalContext* globalCtx); const ActorInit En_Md_InitVars = { ACTOR_EN_MD, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MD, sizeof(EnMd), diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 795f8d1ea4..e58484966b 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -1,6 +1,11 @@ +/* + * File: z_en_mk.c + * Overlay: ovl_En_Mk + * Description: Lakeside Professor + */ + #include "z_en_mk.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnMk_Init(EnMk* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnMk_Draw(EnMk* this, GlobalContext* globalCtx); const ActorInit En_Mk_InitVars = { ACTOR_EN_MK, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MK, sizeof(EnMk), diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 7e70419f40..526af68dd3 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -1,6 +1,5 @@ #include "z_en_mm.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnMm_Init(EnMm* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMm_Draw(EnMm* this, GlobalContext* globalCtx); const ActorInit En_Mm_InitVars = { ACTOR_EN_MM, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MM, sizeof(EnMm), diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 9f6773a8f1..94b9895516 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -1,6 +1,5 @@ #include "z_en_mm2.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnMm2_Init(EnMm2* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMm2_Draw(EnMm2* this, GlobalContext* globalCtx); const ActorInit En_Mm2_InitVars = { ACTOR_EN_MM2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MM, sizeof(EnMm2), diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 44ae6dae29..facc283404 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -4,38 +4,23 @@ * Description: Magic Bean Salesman */ -#include -#include +#include "z_en_ms.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ SkelAnime skelAnime; - /* 0x0190 */ UNK_PTR unkSkelAnimeStruct; - /* 0x0194 */ char unk_194[0x32]; - /* 0x01C6 */ s16 unk_1C6; - /* 0x01C8 */ char unk_1C8[0x34]; - /* 0x01FC */ ActorFunc actionFunc; - /* 0x0200 */ ColliderCylinderMain collider; - /* 0x024C */ s16 activeTimer; -} EnMs; // size = 0x0250 - -#define ROOM 0x00 #define FLAGS 0x00000009 -static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Init(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Wait(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Talk(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Sell(EnMs* this, GlobalContext* globalCtx); -static void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Update(EnMs* this, GlobalContext* globalCtx); -static void EnMs_Draw(EnMs* this, GlobalContext* globalCtx); +void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx); +void EnMs_Init(EnMs* this, GlobalContext* globalCtx); +void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx); +void EnMs_Wait(EnMs* this, GlobalContext* globalCtx); +void EnMs_Talk(EnMs* this, GlobalContext* globalCtx); +void EnMs_Sell(EnMs* this, GlobalContext* globalCtx); +void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx); +void EnMs_Update(EnMs* this, GlobalContext* globalCtx); +void EnMs_Draw(EnMs* this, GlobalContext* globalCtx); const ActorInit En_Ms_InitVars = { ACTOR_EN_MS, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MS, sizeof(EnMs), @@ -66,7 +51,7 @@ static InitChainEntry initChain[] = { extern AnimationHeader D_060005EC; extern SkeletonHeader D_06003DC0; -static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) { +void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) { this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B); if (this->actor.textId == 0) { if (BEANS_BOUGHT >= 10) { @@ -77,7 +62,7 @@ static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) { } } -static void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { +void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; @@ -103,12 +88,12 @@ static void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { this->actionFunc = EnMs_Wait; } -static void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx) { +void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) { +void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) { s16 unkAngle; unkAngle = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; @@ -123,7 +108,7 @@ static void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) { } } -static void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) { +void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) { u8 dialogState; dialogState = func_8010BDBC(&globalCtx->msgCtx); @@ -151,7 +136,7 @@ static void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) { } } -static void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { +void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { if (func_8002F410(&this->actor, globalCtx) != 0) { // if attached is set Rupees_ChangeBy(-prices[BEANS_BOUGHT]); // decrease ruppees this->actor.attachedA = NULL; @@ -161,7 +146,7 @@ static void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { func_8002F434(&this->actor, globalCtx, GI_BEAN, 90.0f, 10.0f); } -static void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx) { +void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx) { // if dialog state is 6 and player responded to textbox if ((func_8010BDBC(&globalCtx->msgCtx)) == 6 && (func_80106BC8(globalCtx) != 0)) { func_8010B720(globalCtx, 0x406C); @@ -169,7 +154,7 @@ static void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx) { } } -static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { +void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h new file mode 100644 index 0000000000..45a06987d0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -0,0 +1,22 @@ +#ifndef _Z_EN_MS_H_ +#define _Z_EN_MS_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ UNK_PTR unkSkelAnimeStruct; + /* 0x0194 */ char unk_194[0x32]; + /* 0x01C6 */ s16 unk_1C6; + /* 0x01C8 */ char unk_1C8[0x34]; + /* 0x01FC */ ActorFunc actionFunc; + /* 0x0200 */ ColliderCylinderMain collider; + /* 0x024C */ s16 activeTimer; +} EnMs; // size = 0x0250 + + +extern const ActorInit En_Ms_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index cf0a64bc0e..9790dce43a 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -1,6 +1,5 @@ #include "z_en_mu.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnMu_Init(EnMu* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnMu_Draw(EnMu* this, GlobalContext* globalCtx); const ActorInit En_Mu_InitVars = { ACTOR_EN_MU, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MU, sizeof(EnMu), diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index f864f9f25c..c256455d9e 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -1,6 +1,5 @@ #include "z_en_nb.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnNb_Init(EnNb* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnNb_Draw(EnNb* this, GlobalContext* globalCtx); const ActorInit En_Nb_InitVars = { ACTOR_EN_NB, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_NB, sizeof(EnNb), diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index ceea1510f7..772bcf9e96 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -1,6 +1,5 @@ #include "z_en_niw.h" -#define ROOM 0x00 #define FLAGS 0x00800010 void EnNiw_Init(EnNiw* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnNiw_Draw(EnNiw* this, GlobalContext* globalCtx); const ActorInit En_Niw_InitVars = { ACTOR_EN_NIW, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_NIW, sizeof(EnNiw), diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index a9cfad506d..30ee410482 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -1,6 +1,5 @@ #include "z_en_niw_girl.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnNiwGirl_Init(EnNiwGirl* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnNiwGirl_Draw(EnNiwGirl* this, GlobalContext* globalCtx); const ActorInit En_Niw_Girl_InitVars = { ACTOR_EN_NIW_GIRL, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GR, sizeof(EnNiwGirl), diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index c56b051507..01b3e6472e 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -1,6 +1,5 @@ #include "z_en_niw_lady.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnNiwLady_Init(EnNiwLady* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnNiwLady_Update(EnNiwLady* this, GlobalContext* globalCtx); const ActorInit En_Niw_Lady_InitVars = { ACTOR_EN_NIW_LADY, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ANE, sizeof(EnNiwLady), diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index ad8c86e93c..739d1f94f3 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -6,20 +6,18 @@ #include "z_en_nutsball.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx); -static void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx); -static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx); -static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx); -static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx); -static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx); +void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx); +void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx); +void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx); +void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx); +void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx); +void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx); const ActorInit En_Nutsball_InitVars = { ACTOR_EN_NUTSBALL, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnNutsball), @@ -38,7 +36,7 @@ static ColliderCylinderInit cylinderInitData = { static s16 objectTbl[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK }; static u32 dListTbl[] = { 0x06002028, 0x060012F0, 0x06004008, 0x06002410, 0x06001890 }; -static void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) { +void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) { s32 pad[2]; ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawFunc_Circle, 13.0f); @@ -53,12 +51,12 @@ static void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) { } } -static void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx) { +void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) { +void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) { if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { this->actor.objBankIndex = this->objBankIndex; this->actor.draw = (ActorFunc)EnNutsball_Draw; @@ -69,7 +67,7 @@ static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) { } } -static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { +void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { Player* player = PLAYER; Vec3s sp4C; Vec3f sp40; @@ -114,7 +112,7 @@ static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { } } -static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) { +void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) { EnNutsball* nutsball = this; Player* player = PLAYER; s32 pad; @@ -134,7 +132,7 @@ static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) { } } -static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) { +void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 16954fbb86..2320d0ce75 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -1,6 +1,5 @@ #include "z_en_nwc.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnNwc_Init(EnNwc* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnNwc_Draw(EnNwc* this, GlobalContext* globalCtx); const ActorInit En_Nwc_InitVars = { ACTOR_EN_NWC, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_NWC, sizeof(EnNwc), diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 811da6c573..4e0d5e677f 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -1,6 +1,5 @@ #include "z_en_ny.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnNy_Init(EnNy* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnNy_Draw(EnNy* this, GlobalContext* globalCtx); const ActorInit En_Ny_InitVars = { ACTOR_EN_NY, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_NY, sizeof(EnNy), diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c index 9d4b366928..f6612847d0 100644 --- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c @@ -4,49 +4,45 @@ * Description: Blue Navi Target. Probably unused since NPC's are blue and they do not use this actor. */ -#include -#include -#include +#include "z_en_oe2.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x44]; - /* 0x0190 */ ActorFunc updateFunc; -} ActorEnOE2; // size = 0x0194 - -#define ROOM 0x00 #define FLAGS 0x00000009 -static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func); -static void Init(ActorEnOE2* this, GlobalContext* globalCtx); -static void Destroy(ActorEnOE2* this, GlobalContext* globalCtx); -static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx); -static void Update(ActorEnOE2* this, GlobalContext* globalCtx); -static void Draw(ActorEnOE2* this, GlobalContext* globalCtx); +void func_80ABE6A0(EnOE2* this, ActorFunc func); +void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx); +void EnOE2_Destroy(EnOE2* this, GlobalContext* globalCtx); +void func_80ABE6DC(EnOE2* this, GlobalContext* globalCtx); +void EnOE2_Update(EnOE2* this, GlobalContext* globalCtx); +void EnOE2_Draw(EnOE2* this, GlobalContext* globalCtx); const ActorInit En_OE2_InitVars = { - ACTOR_EN_OE2, ACTORTYPE_NPC, ROOM, - FLAGS, OBJECT_OE2, sizeof(ActorEnOE2), - (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, - (ActorFunc)Draw, + ACTOR_EN_OE2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OE2, + sizeof(EnOE2), + (ActorFunc)EnOE2_Init, + (ActorFunc)EnOE2_Destroy, + (ActorFunc)EnOE2_Update, + (ActorFunc)EnOE2_Draw, }; -static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func) { - this->updateFunc = func; +void EnOE2_SetupAction(EnOE2* this, ActorFunc actionFunc) { + this->updateFunc = actionFunc; } -static void Init(ActorEnOE2* this, GlobalContext* globalCtx) { - func_80ABE6A0(this, (ActorFunc)func_80ABE6DC); +void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx) { + EnOE2_SetupAction(this, func_80ABE6DC); } -static void Destroy(ActorEnOE2* this, GlobalContext* globalCtx) { +void EnOE2_Destroy(EnOE2* this, GlobalContext* globalCtx) { } -static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx) { +void func_80ABE6DC(EnOE2* this, GlobalContext* globalCtx) { } -static void Update(ActorEnOE2* this, GlobalContext* globalCtx) { +void EnOE2_Update(EnOE2* this, GlobalContext* globalCtx) { } -static void Draw(ActorEnOE2* this, GlobalContext* globalCtx) { +void EnOE2_Draw(EnOE2* this, GlobalContext* globalCtx) { } diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h new file mode 100644 index 0000000000..e0fcb26b31 --- /dev/null +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h @@ -0,0 +1,14 @@ +#ifndef _Z_EN_OE2_H_ +#define _Z_EN_OE2_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ char unk_14C[0x44]; + /* 0x0190 */ ActorFunc updateFunc; +} EnOE2; // size = 0x0194 + +extern const ActorInit En_OE2_InitVars; +#endif diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index baf298eb1f..bec9deb126 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -15,20 +15,18 @@ typedef struct { /* 0x0150 */ ActorFunc actionFunc; } EnOkarinaEffect; // size = 0x0154 -#define ROOM 0x00 #define FLAGS 0x02000010 -static void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc); -static void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx); -static void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx); -static void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx); -static void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx); -static void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx); +void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc); +void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx); +void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx); +void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx); +void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx); +void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx); const ActorInit En_Okarina_Effect_InitVars = { ACTOR_EN_OKARINA_EFFECT, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnOkarinaEffect), @@ -38,11 +36,11 @@ const ActorInit En_Okarina_Effect_InitVars = { NULL, }; -static void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc) { +void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc) { this->actionFunc = newActionFunc; } -static void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx) { +void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx) { globalCtx->unk_10B16[0] = 0; if ((D_8011FB30 != 4) && (D_8011FB30 != 5) && (globalCtx->gloomySkyEvent == 1)) { globalCtx->gloomySkyEvent = 2; // end gloomy sky @@ -51,7 +49,7 @@ static void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* global globalCtx->lightning = 2; // end lightning } -static void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx) { +void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx) { osSyncPrintf("\n\n"); //"Ocarina Storm Effect" osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST); @@ -62,7 +60,7 @@ static void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx EnOkarinaEffect_SetupAction(this, &EnOkarinaEffect_TriggerStorm); } -static void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { +void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { this->timer = 400; // 20 seconds globalCtx->unk_10B16[0] = 20; // rain intensity target globalCtx->gloomySkyEvent = 1; // start gloomy sky @@ -74,7 +72,7 @@ static void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* g EnOkarinaEffect_SetupAction(this, &EnOkarinaEffect_ManageStorm); } -static void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { +void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { func_8006C438(globalCtx, 5); // clear bean grow env flag if (((globalCtx->pauseCtx.state == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->msgCtx.unk_E300 == 0) && (func_800C0D28(globalCtx) == 0) && ((globalCtx->unk_1241B == 0) || (gSaveContext.game_mode != 0))) || @@ -115,7 +113,7 @@ static void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* gl } } -static void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx) { +void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); if (BREG(0) != 0) { DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 0c18b62d4d..96852a2e6d 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -1,6 +1,5 @@ #include "z_en_okarina_tag.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void EnOkarinaTag_Init(EnOkarinaTag* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnOkarinaTag_Update(EnOkarinaTag* this, GlobalContext* globalCtx); const ActorInit En_Okarina_Tag_InitVars = { ACTOR_EN_OKARINA_TAG, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnOkarinaTag), diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 468ec54c33..5a1c3af4e6 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -1,6 +1,5 @@ #include "z_en_okuta.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnOkuta_Init(EnOkuta* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnOkuta_Draw(EnOkuta* this, GlobalContext* globalCtx); const ActorInit En_Okuta_InitVars = { ACTOR_EN_OKUTA, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_OKUTA, sizeof(EnOkuta), diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 8e98fcdc49..b602d4241b 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,6 +1,5 @@ #include "z_en_ossan.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnOssan_Init(EnOssan* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnOssan_Update(EnOssan* this, GlobalContext* globalCtx); const ActorInit En_Ossan_InitVars = { ACTOR_EN_OSSAN, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnOssan), diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 8c59bdecc1..6d5f4a2ba5 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -1,6 +1,5 @@ #include "z_en_owl.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnOwl_Init(EnOwl* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnOwl_Draw(EnOwl* this, GlobalContext* globalCtx); const ActorInit En_Owl_InitVars = { ACTOR_EN_OWL, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_OWL, sizeof(EnOwl), diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index e177e39154..a76838fb59 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -1,6 +1,5 @@ #include "z_en_part.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnPart_Init(EnPart* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnPart_Draw(EnPart* this, GlobalContext* globalCtx); const ActorInit En_Part_InitVars = { ACTOR_EN_PART, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnPart), diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 50e2893d80..1b70a3cf59 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1,6 +1,5 @@ #include "z_en_peehat.h" -#define ROOM 0x00 #define FLAGS 0x01000015 void EnPeehat_Init(EnPeehat* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnPeehat_Draw(EnPeehat* this, GlobalContext* globalCtx); const ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_PEEHAT, sizeof(EnPeehat), diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index a1d68a6f21..2f5f182e84 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -1,6 +1,11 @@ +/* + * File: z_en_po_desert.c + * Overlay: ovl_En_Po_Desert + * Description: Guide Poe (Haunted Wasteland) + */ + #include "z_en_po_desert.h" -#define ROOM 0x00 #define FLAGS 0x00001090 void EnPoDesert_Init(EnPoDesert* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnPoDesert_Draw(EnPoDesert* this, GlobalContext* globalCtx); const ActorInit En_Po_Desert_InitVars = { ACTOR_EN_PO_DESERT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_PO_FIELD, sizeof(EnPoDesert), diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index f3024f2547..30df1e36c1 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -1,6 +1,5 @@ #include "z_en_po_field.h" -#define ROOM 0x00 #define FLAGS 0x00001035 void EnPoField_Init(EnPoField* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnPoField_Draw(EnPoField* this, GlobalContext* globalCtx); const ActorInit En_Po_Field_InitVars = { ACTOR_EN_PO_FIELD, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_PO_FIELD, sizeof(EnPoField), diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index ec50de4b6f..7ad74b9329 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -1,6 +1,5 @@ #include "z_en_po_relay.h" -#define ROOM 0x00 #define FLAGS 0x00011019 void EnPoRelay_Init(EnPoRelay* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnPoRelay_Draw(EnPoRelay* this, GlobalContext* globalCtx); const ActorInit En_Po_Relay_InitVars = { ACTOR_EN_PO_RELAY, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_TK, sizeof(EnPoRelay), diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 5e5c6c7cee..f833fc696a 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -1,6 +1,5 @@ #include "z_en_po_sisters.h" -#define ROOM 0x00 #define FLAGS 0x00005215 void EnPoSisters_Init(EnPoSisters* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnPoSisters_Draw(EnPoSisters* this, GlobalContext* globalCtx); const ActorInit En_Po_Sisters_InitVars = { ACTOR_EN_PO_SISTERS, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_PO_SISTERS, sizeof(EnPoSisters), diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index a05d23ce29..c9aae8cb9b 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -1,6 +1,5 @@ #include "z_en_poh.h" -#define ROOM 0x00 #define FLAGS 0x00001015 void EnPoh_Init(EnPoh* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnPoh_Update(EnPoh* this, GlobalContext* globalCtx); const ActorInit En_Poh_InitVars = { ACTOR_EN_POH, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnPoh), diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index f8da2fd8ec..8c8bb92dfe 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -6,18 +6,16 @@ #include "z_en_pu_box.h" -#define ROOM 0x00 #define FLAGS 0x00000010 -static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx); -static void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx); -static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx); -static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx); +void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx); +void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx); +void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx); +void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx); const ActorInit En_Pu_box_InitVars = { ACTOR_EN_PU_BOX, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_PU_BOX, sizeof(EnPubox), @@ -30,7 +28,7 @@ const ActorInit En_Pu_box_InitVars = { extern u32 D_06000380; extern u32 D_060006D0; -static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) { +void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) { u32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -63,11 +61,11 @@ static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) { this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); } -static void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx) { +void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { +void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->speedXZ += this->dyna.unk_150; @@ -84,6 +82,6 @@ static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { thisx->posRot2.pos = thisx->posRot.pos; } -static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx) { +void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_06000380); } diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 393552557b..9eecc95ed2 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -1,6 +1,5 @@ #include "z_en_rd.h" -#define ROOM 0x00 #define FLAGS 0x00000415 void EnRd_Init(EnRd* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnRd_Draw(EnRd* this, GlobalContext* globalCtx); const ActorInit En_Rd_InitVars = { ACTOR_EN_RD, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_RD, sizeof(EnRd), diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index afbc515ca2..02616f7d11 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -1,6 +1,5 @@ #include "z_en_reeba.h" -#define ROOM 0x00 #define FLAGS 0x08000015 void EnReeba_Init(EnReeba* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnReeba_Draw(EnReeba* this, GlobalContext* globalCtx); const ActorInit En_Reeba_InitVars = { ACTOR_EN_REEBA, ACTORTYPE_MISC, - ROOM, FLAGS, OBJECT_REEBA, sizeof(EnReeba), diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 46eddbd721..4fc67559d1 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -1,6 +1,11 @@ +/* + * File: z_en_river_sound.c + * Overlay: ovl_En_River_Sound + * Description: Ambient Sound Effects + */ + #include "z_en_river_sound.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnRiverSound_Init(EnRiverSound* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnRiverSound_Draw(EnRiverSound* this, GlobalContext* globalCtx); const ActorInit En_River_Sound_InitVars = { ACTOR_EN_RIVER_SOUND, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnRiverSound), diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index ee90fefb68..88c283b29f 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -1,6 +1,5 @@ #include "z_en_rl.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnRl_Init(EnRl* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnRl_Draw(EnRl* this, GlobalContext* globalCtx); const ActorInit En_Rl_InitVars = { ACTOR_EN_RL, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_RL, sizeof(EnRl), diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 78350277b0..fb8e834437 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -1,6 +1,5 @@ #include "z_en_rr.h" -#define ROOM 0x00 #define FLAGS 0x00000435 void EnRr_Init(EnRr* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnRr_Draw(EnRr* this, GlobalContext* globalCtx); const ActorInit En_Rr_InitVars = { ACTOR_EN_RR, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_RR, sizeof(EnRr), diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 52b7571cbd..525a8fd465 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1,6 +1,5 @@ #include "z_en_ru1.h" -#define ROOM 0x00 #define FLAGS 0x04000011 void EnRu1_Init(EnRu1* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnRu1_Draw(EnRu1* this, GlobalContext* globalCtx); const ActorInit En_Ru1_InitVars = { ACTOR_EN_RU1, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_RU1, sizeof(EnRu1), diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 8b0829275d..f9e4322cc0 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -1,47 +1,46 @@ /* * File: z_en_ru2.c * Overlay: En_Ru2 - * Description: + * Description: Adult Ruto */ #include "z_en_ru2.h" #include -#define ROOM 0x00 #define FLAGS 0x00000010 -static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx); -static void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); -static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); -static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); +void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx); +void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); +void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); +void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3144(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3604(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF366C(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3144(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3174(EnRu2* this, GlobalContext* globalCtx); +void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3604(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3624(EnRu2* this, GlobalContext* globalCtx); +void func_80AF366C(EnRu2* this, GlobalContext* globalCtx); +void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx); +void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx); +void func_80AF321C(EnRu2* this, GlobalContext* globalCtx); -static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx); +void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx); static ColliderCylinderInit D_80AF40E0 = { 0x0A, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -76,7 +75,6 @@ static ActorFunc D_80AF510C[] = { const ActorInit En_Ru2_InitVars = { ACTOR_EN_RU2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_RU2, sizeof(EnRu2), @@ -95,13 +93,13 @@ extern AnimationHeader* D_0600E630; extern AnimationHeader* D_0600F03C; extern AnimationHeader* D_0600F8B8; -static void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { EnRu2* thisLocal = this; ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); func_8005C450(globalCtx, &thisLocal->collider, &this->actor, &D_80AF40E0); } -static void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { s32 pad; ColliderCylinderMain* collider = &this->collider; Actor* thisx = &this->actor; @@ -111,12 +109,12 @@ static void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, collider); } -static void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx) { +void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void func_80AF2608(EnRu2* this) { +void func_80AF2608(EnRu2* this) { s32 pad[3]; s16* unk_2A6 = &this->unk_2A6; s16* unk_2A4 = &this->unk_2A4; @@ -141,7 +139,7 @@ s32 func_80AF26A0(EnRu2* this) { return params & 0xFF; } -static void func_80AF26AC(EnRu2* this) { +void func_80AF26AC(EnRu2* this) { this->action = 7; this->drawConfig = 0; this->unk_2B4 = 0; @@ -150,7 +148,7 @@ static void func_80AF26AC(EnRu2* this) { this->unk_2B0 = 0.0f; } -static void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { s32 one; // Needed to match if (globalCtx->csCtx.state == 0) { if (D_80AF4118 != 0) { @@ -168,7 +166,7 @@ static void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) { func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4); } @@ -201,7 +199,7 @@ s32 func_80AF281C(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActi return 0; } -static void func_80AF2868(EnRu2* this, GlobalContext* globalCtx, u32 actorActionIdx) { +void func_80AF2868(EnRu2* this, GlobalContext* globalCtx, u32 actorActionIdx) { CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); s16 newRotY; Actor* thisx = &this->actor; @@ -216,7 +214,7 @@ static void func_80AF2868(EnRu2* this, GlobalContext* globalCtx, u32 actorAction } } -static void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { +void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { f32 frameCount = SkelAnime_GetFrameCount(&animation->genericHeader); f32 playbackSpeed; f32 unk0; @@ -235,16 +233,16 @@ static void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); } -static void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { this->actor.shape.unk_08 += 83.333336f; } -static void func_80AF2994(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2994(EnRu2* this, GlobalContext* globalCtx) { func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); this->actor.shape.unk_08 = -10000.0f; } -static void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; f32 posX = thisx->posRot.pos.x; f32 posY = thisx->posRot.pos.y; @@ -252,7 +250,7 @@ static void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); } -static void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { Player* player = PLAYER; f32 posX = player->actor.posRot.pos.x; f32 posY = player->actor.posRot.pos.y + 50.0f; @@ -263,7 +261,7 @@ static void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { Item_Give(globalCtx, ITEM_MEDALLION_WATER); } -static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2]; Player* player; s16 temp; @@ -280,7 +278,7 @@ static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF2B44(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2B44(EnRu2* this, GlobalContext* globalCtx) { CutsceneContext* csCtx = &globalCtx->csCtx; CsCmdActorAction* csCmdActorAction; if (csCtx->state != 0) { @@ -293,14 +291,14 @@ static void func_80AF2B44(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF2B94(EnRu2* this) { +void func_80AF2B94(EnRu2* this) { if (this->actor.shape.unk_08 >= 0.0f) { this->action = 3; this->actor.shape.unk_08 = 0.0f; } } -static void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { AnimationHeader* animation = &D_0600D3DC; CsCmdActorAction* csCmdActorAction; if (globalCtx->csCtx.state != 0) { @@ -312,13 +310,13 @@ static void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF2C54(EnRu2* this, UNK_TYPE arg1) { +void func_80AF2C54(EnRu2* this, UNK_TYPE arg1) { if (arg1 != 0) { this->action = 5; } } -static void func_80AF2C68(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2C68(EnRu2* this, GlobalContext* globalCtx) { CsCmdActorAction* csCmdActorAction; if (globalCtx->csCtx.state != 0) { csCmdActorAction = globalCtx->csCtx.actorActions[6]; @@ -329,29 +327,29 @@ static void func_80AF2C68(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx) { func_80AF2AB4(this, globalCtx); } -static void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) { func_80AF2B44(this, globalCtx); } -static void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) { func_80AF2978(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); func_80AF2B94(this); } -static void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); func_80AF2BC0(this, globalCtx); } -static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) { UNK_TYPE something; func_80AF2744(this, globalCtx); @@ -360,35 +358,35 @@ static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) { func_80AF2C54(this, something); } -static void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); func_80AF2C68(this, globalCtx); } -static void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); } -static void func_80AF2E1C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2E1C(EnRu2* this, GlobalContext* globalCtx) { func_80AF28E8(this, &D_060004CC, 2, 0.0f, 0); this->action = 7; this->actor.shape.unk_14 = 0; } -static void func_80AF2E64() { +void func_80AF2E64() { func_800788CC(NA_SE_SY_WHITE_OUT_T); } -static void func_80AF2E84(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2E84(EnRu2* this, GlobalContext* globalCtx) { Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, kREG(19) + 24.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 8); } -static void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { if (func_80AF27D0(this, globalCtx, 4, 3)) { this->action = 8; this->drawConfig = 2; @@ -399,7 +397,7 @@ static void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { f32* unk_2B0 = &this->unk_2B0; s32 something; @@ -429,7 +427,7 @@ static void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { this->actor.shape.unk_14 = something; } -static void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { if (func_80AF281C(this, globalCtx, 4, 3)) { this->action = 8; this->drawConfig = 2; @@ -443,12 +441,12 @@ static void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) { func_80AF2F04(this, globalCtx); func_80AF26D0(this, globalCtx); } -static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); @@ -456,7 +454,7 @@ static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) { func_80AF26D0(this, globalCtx); } -static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); @@ -464,7 +462,7 @@ static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { func_80AF26D0(this, globalCtx); } -static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2]; s16 temp = this->unk_2A4; UNK_PTR addr = D_80AF410C[temp]; @@ -486,14 +484,14 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); } -static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0); this->action = 10; this->drawConfig = 0; this->actor.shape.unk_14 = 0; } -static void func_80AF33E0(EnRu2* this) { +void func_80AF33E0(EnRu2* this) { f32* unk_2B0 = &this->unk_2B0; f32 temp_f0; s32 temp_f18; @@ -511,31 +509,31 @@ static void func_80AF33E0(EnRu2* this) { } } -static void func_80AF346C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF346C(EnRu2* this, GlobalContext* globalCtx) { func_80AF2868(this, globalCtx, 3); this->action = 11; this->drawConfig = 2; } -static void func_80AF34A4(EnRu2* this) { +void func_80AF34A4(EnRu2* this) { if (this->unk_2B0 >= kREG(17) + 10.0f) { this->action = 12; this->drawConfig = 1; } } -static void func_80AF34F0(EnRu2* this) { +void func_80AF34F0(EnRu2* this) { func_80AF28E8(this, &D_0600DCAC, 2, 0.0f, 0); this->action = 13; } -static void func_80AF3530(EnRu2* this, UNK_TYPE arg1) { +void func_80AF3530(EnRu2* this, UNK_TYPE arg1) { if (arg1 != 0) { func_80AF28E8(this, &D_0600F03C, 0, 0.0f, 0); } } -static void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) { CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, 3); s32 action; s32 unk_2BC; @@ -560,11 +558,11 @@ static void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) { func_80AF3564(this, globalCtx); } -static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); @@ -572,14 +570,14 @@ static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) { func_80AF34A4(this); } -static void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); func_80AF3564(this, globalCtx); } -static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) { UNK_TYPE something; func_80AF2744(this, globalCtx); @@ -588,7 +586,7 @@ static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) { func_80AF3530(this, something); } -static void func_80AF36EC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF36EC(EnRu2* this, GlobalContext* globalCtx) { Flags_SetSwitch(globalCtx, func_80AF2690(this)); } @@ -596,7 +594,7 @@ s32 func_80AF3718(EnRu2* this, GlobalContext* globalCtx) { return Flags_GetSwitch(globalCtx, func_80AF2690(this)); } -static void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { if (func_80AF3718(this, globalCtx)) { Actor_Kill(&this->actor); } else { @@ -606,11 +604,11 @@ static void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF37AC() { +void func_80AF37AC() { func_800F5C64(0x51); } -static void func_80AF37CC(EnRu2* this) { +void func_80AF37CC(EnRu2* this) { f32 funcFloat; this->unk_2C0 += 1; funcFloat = func_8006F9BC((kREG(2) + 0x96) & 0xFFFF, 0, this->unk_2C0, 8, 0); @@ -627,19 +625,19 @@ s32 func_80AF383C(EnRu2* this, GlobalContext* globalCtx) { return 0; } -static void func_80AF3878(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3878(EnRu2* this, GlobalContext* globalCtx) { if (func_80AF383C(this, globalCtx) && !func_800BFC84(globalCtx)) { this->action = 16; func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); } } -static void func_80AF38D0(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF38D0(EnRu2* this, GlobalContext* globalCtx) { this->action = 16; func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); } -static void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { f32* unk_2C4 = &this->unk_2C4; *unk_2C4 += 1.0f; if (*unk_2C4 == kREG(6) + 40.0f) { @@ -651,7 +649,7 @@ static void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { s32 pad; MessageContext* msgCtx; s32 pad2; @@ -684,7 +682,7 @@ static void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { this->unk_2C4 += 1.0f; if (this->unk_2C4 > kREG(5) + 100.0f) { func_80AF28E8(this, &D_0600F8B8, 0, -12.0f, 0); @@ -693,19 +691,19 @@ static void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { } } -static void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) { if (this->unk_2C0 > (((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96)) & 0xFFFF)) { Actor_Kill(&this->actor); } } -static void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) { func_80AF3878(this, globalCtx); Actor_SetHeight(&this->actor, 50.0f); func_80AF259C(this, globalCtx); } -static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); func_80AF259C(this, globalCtx); EnRu2_FrameUpdateMatrix(this); @@ -714,7 +712,7 @@ static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) { func_80AF38D0(this, globalCtx); } -static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); @@ -722,7 +720,7 @@ static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) { func_80AF390C(this, globalCtx); } -static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); @@ -730,7 +728,7 @@ static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) { func_80AF39DC(this, globalCtx); } -static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) { func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); func_80AF2608(this); @@ -738,7 +736,7 @@ static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) { func_80AF3ADC(this, globalCtx); } -static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) { func_80AF37CC(this); func_80AF2744(this, globalCtx); EnRu2_FrameUpdateMatrix(this); @@ -747,7 +745,7 @@ static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) { func_80AF3B74(this, globalCtx); } -static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { +void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { if (this->action < 0 || this->action >= 20 || D_80AF50BC[this->action] == 0) { osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; @@ -755,7 +753,7 @@ static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { D_80AF50BC[this->action](this, globalCtx); } -static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { +void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); func_80AF2550(this, globalCtx); SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->unk_190, &this->unk_21A, 0x17); @@ -779,10 +777,10 @@ static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { this->unk_2C3 = 3; } -static void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) { } -static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { +void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2]; s16 temp = this->unk_2A4; UNK_PTR addr = D_80AF410C[temp]; @@ -803,7 +801,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); } -static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { +void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) { osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 1e8c95a2db..d433a666e5 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -1,6 +1,5 @@ #include "z_en_sa.h" -#define ROOM 0x00 #define FLAGS 0x02000019 void EnSa_Init(EnSa* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSa_Draw(EnSa* this, GlobalContext* globalCtx); const ActorInit En_Sa_InitVars = { ACTOR_EN_SA, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SA, sizeof(EnSa), diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index a396c9d0c0..3c9baf83d2 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -1,6 +1,5 @@ #include "z_en_sb.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnSb_Init(EnSb* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSb_Draw(EnSb* this, GlobalContext* globalCtx); const ActorInit En_Sb_InitVars = { ACTOR_EN_SB, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_SB, sizeof(EnSb), diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 9ebf49ef59..bdfe9d5f66 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -12,20 +12,18 @@ typedef struct { /* 0x014C */ ActorFunc updateFunc; } EnSceneChange; // size = 0x0150 -#define ROOM 0x00 #define FLAGS 0x00000000 -static void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx); -static void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx); -static void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx); -static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx); -static void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc); -static void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx); +void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx); +void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx); +void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx); +void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx); +void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc); +void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx); const ActorInit En_Scene_Change_InitVars = { ACTOR_EN_SCENE_CHANGE, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_JJ, sizeof(EnSceneChange), @@ -35,25 +33,25 @@ const ActorInit En_Scene_Change_InitVars = { (ActorFunc)EnSceneChange_Draw, }; -static void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc) { +void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc) { this->updateFunc = updateFunc; } -static void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx) { +void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx) { func_80AF8C70(this, func_80AF8CAC); } -static void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx) { +void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx) { } -static void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx) { +void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx) { } -static void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx) { +void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx) { this->updateFunc(&this->actor, globalCtx); } -static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) { +void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) { s32 pad[0x2]; Gfx* displayList; s32 pad1[0x2]; diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index b388a07669..6aa27a7398 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -1,6 +1,5 @@ #include "z_en_sda.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnSda_Init(EnSda* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSda_Draw(EnSda* this, GlobalContext* globalCtx); const ActorInit En_Sda_InitVars = { ACTOR_EN_SDA, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnSda), diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index de318c5245..8fbe69e69b 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -1,6 +1,5 @@ #include "z_en_shopnuts.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnShopnuts_Init(EnShopnuts* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnShopnuts_Draw(EnShopnuts* this, GlobalContext* globalCtx); const ActorInit En_Shopnuts_InitVars = { ACTOR_EN_SHOPNUTS, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_SHOPNUTS, sizeof(EnShopnuts), diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 54fb3a7b87..a014c1def2 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -1,18 +1,20 @@ #include "z_en_si.h" -#define ROOM 0x00 #define FLAGS 0x00000201 void EnSi_Init(EnSi* this, GlobalContext* globalCtx); void EnSi_Destroy(EnSi* this, GlobalContext* globalCtx); void EnSi_Update(EnSi* this, GlobalContext* globalCtx); void EnSi_Draw(EnSi* this, GlobalContext* globalCtx); +s32 func_80AFB748(EnSi* this, GlobalContext* globalCtx); +void func_80AFB768(EnSi* this, GlobalContext* globalCtx); +void func_80AFB89C(EnSi* this, GlobalContext* globalCtx); +void func_80AFB950(EnSi* this, GlobalContext* globalCtx); /* const ActorInit En_Si_InitVars = { ACTOR_EN_SI, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_ST, sizeof(EnSi), diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h index a185c3f2d3..751c117ab7 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x54]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ char unk_150[0x50]; } EnSi; // size = 0x01A0 extern const ActorInit En_Si_InitVars; diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 72ba9806c1..92a56faa34 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -1,6 +1,5 @@ #include "z_en_siofuki.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnSiofuki_Init(EnSiofuki* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSiofuki_Draw(EnSiofuki* this, GlobalContext* globalCtx); const ActorInit En_Siofuki_InitVars = { ACTOR_EN_SIOFUKI, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_SIOFUKI, sizeof(EnSiofuki), diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index e9faac31eb..b0ed771149 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -1,6 +1,5 @@ #include "z_en_skb.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnSkb_Init(EnSkb* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSkb_Draw(EnSkb* this, GlobalContext* globalCtx); const ActorInit En_Skb_InitVars = { ACTOR_EN_SKB, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_SKB, sizeof(EnSkb), diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 930a99cfe4..83d00d45f8 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -1,6 +1,5 @@ #include "z_en_skj.h" -#define ROOM 0x00 #define FLAGS 0x02000015 void EnSkj_Init(EnSkj* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSkj_Draw(EnSkj* this, GlobalContext* globalCtx); const ActorInit En_Skj_InitVars = { ACTOR_EN_SKJ, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_SKJ, sizeof(EnSkj), diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 43e50e2447..d64bd0ebb9 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -1,6 +1,11 @@ +/* + * File: z_en_skjneedle.c + * Overlay: ovl_En_Skjneedle + * Description: Skullkid Needle Attack + */ + #include "z_en_skjneedle.h" -#define ROOM 0x00 #define FLAGS 0x00000205 void EnSkjneedle_Init(EnSkjneedle* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnSkjneedle_Draw(EnSkjneedle* this, GlobalContext* globalCtx); const ActorInit En_Skjneedle_InitVars = { ACTOR_EN_SKJNEEDLE, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_SKJ, sizeof(EnSkjneedle), diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 150aeb3630..dfd3755e28 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -1,6 +1,5 @@ #include "z_en_ssh.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void EnSsh_Init(EnSsh* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSsh_Draw(EnSsh* this, GlobalContext* globalCtx); const ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_SSH, sizeof(EnSsh), diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 5d6d999b20..db98a19a38 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -1,6 +1,5 @@ #include "z_en_st.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void EnSt_Init(EnSt* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSt_Draw(EnSt* this, GlobalContext* globalCtx); const ActorInit En_St_InitVars = { ACTOR_EN_ST, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_ST, sizeof(EnSt), diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 9aef65cc14..d1acef8b28 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -1,6 +1,5 @@ #include "z_en_sth.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnSth_Init(EnSth* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnSth_Update(EnSth* this, GlobalContext* globalCtx); const ActorInit En_Sth_InitVars = { ACTOR_EN_STH, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnSth), diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 99f4198942..37e098e717 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -1,6 +1,11 @@ +/* + * File: z_en_stream.c + * Overlay: ovl_En_Stream + * Description: Water Vortex + */ + #include "z_en_stream.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnStream_Init(EnStream* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnStream_Draw(EnStream* this, GlobalContext* globalCtx); const ActorInit En_Stream_InitVars = { ACTOR_EN_STREAM, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_STREAM, sizeof(EnStream), diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 826a2b50c8..cd4c49e32e 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,6 +1,5 @@ #include "z_en_sw.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnSw_Init(EnSw* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSw_Draw(EnSw* this, GlobalContext* globalCtx); const ActorInit En_Sw_InitVars = { ACTOR_EN_SW, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ST, sizeof(EnSw), diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 64c8844759..e1b22ff597 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -1,6 +1,5 @@ #include "z_en_syateki_itm.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnSyatekiItm_Init(EnSyatekiItm* this, GlobalContext* globalCtx); @@ -11,7 +10,6 @@ void EnSyatekiItm_Update(EnSyatekiItm* this, GlobalContext* globalCtx); const ActorInit En_Syateki_Itm_InitVars = { ACTOR_EN_SYATEKI_ITM, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnSyatekiItm), diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 6721a5666e..8a8c72424b 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1,6 +1,5 @@ #include "z_en_syateki_man.h" -#define ROOM 0x00 #define FLAGS 0x08000019 void EnSyatekiMan_Init(EnSyatekiMan* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSyatekiMan_Draw(EnSyatekiMan* this, GlobalContext* globalCtx); const ActorInit En_Syateki_Man_InitVars = { ACTOR_EN_SYATEKI_MAN, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_OSSAN, sizeof(EnSyatekiMan), diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index f27fcd9022..3a3e63da2d 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -1,6 +1,5 @@ #include "z_en_syateki_niw.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnSyatekiNiw_Init(EnSyatekiNiw* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnSyatekiNiw_Draw(EnSyatekiNiw* this, GlobalContext* globalCtx); const ActorInit En_Syateki_Niw_InitVars = { ACTOR_EN_SYATEKI_NIW, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_NIW, sizeof(EnSyatekiNiw), diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index e57e4acd0f..2383924269 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -1,6 +1,11 @@ +/* + * File: z_en_ta.c + * Overlay: ovl_En_Ta + * Description: Talon + */ + #include "z_en_ta.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnTa_Init(EnTa* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTa_Draw(EnTa* this, GlobalContext* globalCtx); const ActorInit En_Ta_InitVars = { ACTOR_EN_TA, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_TA, sizeof(EnTa), diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index ed828866c9..a1026d76b8 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -1,6 +1,11 @@ +/* + * File: z_en_takara_man.c + * Overlay: ovl_En_Takara_Man + * Description: Treasure Chest Game Man + */ + #include "z_en_takara_man.h" -#define ROOM 0x00 #define FLAGS 0x08000039 void EnTakaraMan_Init(EnTakaraMan* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTakaraMan_Draw(EnTakaraMan* this, GlobalContext* globalCtx); const ActorInit En_Takara_Man_InitVars = { ACTOR_EN_TAKARA_MAN, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_TS, sizeof(EnTakaraMan), diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index b4b2ec070b..6a8f6dd972 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -6,19 +6,17 @@ #include "z_en_tana.h" -#define ROOM 0x00 #define FLAGS 0x00000009 -static void EnTana_Init(EnTana* this, GlobalContext* globalCtx); -static void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx); -static void EnTana_Update(EnTana* this, GlobalContext* globalCtx); -static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx); -static void func_80B1809C(EnTana* this, GlobalContext* globalCtx); +void EnTana_Init(EnTana* this, GlobalContext* globalCtx); +void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx); +void EnTana_Update(EnTana* this, GlobalContext* globalCtx); +void func_80B17FC4(EnTana* this, GlobalContext* globalCtx); +void func_80B1809C(EnTana* this, GlobalContext* globalCtx); const ActorInit En_Tana_InitVars = { ACTOR_EN_TANA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SHOP_DUNGEN, sizeof(EnTana), @@ -51,7 +49,7 @@ static Gfx* dListTbl2[] = { 0x06001608, }; -static void EnTana_Init(EnTana* this, GlobalContext* globalCtx) { +void EnTana_Init(EnTana* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; osSyncPrintf("☆☆☆ %s ☆☆☆\n", shelfTypes[thisx->params]); Actor_SetScale(thisx, 1.0f); @@ -59,13 +57,13 @@ static void EnTana_Init(EnTana* this, GlobalContext* globalCtx) { thisx->draw = drawFuncs[thisx->params]; } -static void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx) { +void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx) { } -static void EnTana_Update(EnTana* this, GlobalContext* globalCtx) { +void EnTana_Update(EnTana* this, GlobalContext* globalCtx) { } -static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) { +void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; GraphicsContext* gfxCtx; @@ -80,7 +78,7 @@ static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 157); } -static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) { +void func_80B1809C(EnTana* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; GraphicsContext* gfxCtx; Gfx* dispRefs[4]; diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index ea54423748..9cf269358c 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -1,18 +1,52 @@ +/* + * File: z_en_test.c + * Overlay: ovl_En_Test + * Description: Stalfos + */ + #include "z_en_test.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnTest_Init(EnTest* this, GlobalContext* globalCtx); void EnTest_Destroy(EnTest* this, GlobalContext* globalCtx); void EnTest_Update(EnTest* this, GlobalContext* globalCtx); void EnTest_Draw(EnTest* this, GlobalContext* globalCtx); +void EnTest_SetupAction(EnTest* this, ActorFunc actionFunc); +void func_8085F938(EnTest* this, GlobalContext* globalCtx); +void func_8085FAB0(EnTest* this, GlobalContext* globalCtx); +void func_8085FE48(EnTest* this, GlobalContext* globalCtx); +void func_8085FF9C(EnTest* this, GlobalContext* globalCtx); +void func_80860318(EnTest* this, GlobalContext* globalCtx); +void func_808603CC(EnTest* this, GlobalContext* globalCtx); +void func_80863360(EnTest* this, GlobalContext* globalCtx); +void func_808600EC(EnTest* this, GlobalContext* globalCtx); +void func_808604FC(EnTest* this, GlobalContext* globalCtx); +void func_80860C24(EnTest* this, GlobalContext* globalCtx); +void func_80860F84(EnTest* this, GlobalContext* globalCtx); +void func_8086149C(EnTest* this, GlobalContext* globalCtx); +void func_808615F4(EnTest* this, GlobalContext* globalCtx); +void func_80861898(EnTest* this, GlobalContext* globalCtx); +void func_808619EC(EnTest* this, GlobalContext* globalCtx); +void func_80861C40(EnTest* this, GlobalContext* globalCtx); +void func_80861DC8(EnTest* this, GlobalContext* globalCtx); +void func_80861F80(EnTest* this, GlobalContext* globalCtx); +void func_8086209C(EnTest* this, GlobalContext* globalCtx); +void func_808621D4(EnTest* this, GlobalContext* globalCtx); +void func_80862418(EnTest* this, GlobalContext* globalCtx); +void func_80862650(EnTest* this, GlobalContext* globalCtx); +void func_808628C8(EnTest* this, GlobalContext* globalCtx); +void func_80862E6C(EnTest* this, GlobalContext* globalCtx); +void func_80863044(EnTest* this, GlobalContext* globalCtx); +void func_8086318C(EnTest* this, GlobalContext* globalCtx); +void func_80863294(EnTest* this, GlobalContext* globalCtx); +s32 func_80863AB8(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, EnTest* this); +void func_80863CC4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, EnTest* this); /* const ActorInit En_Test_InitVars = { ACTOR_EN_TEST, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_SK2, sizeof(EnTest), @@ -22,7 +56,8 @@ const ActorInit En_Test_InitVars = { (ActorFunc)EnTest_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F650.s") + +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s") diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index 0ed753ca5c..fe5cc2d6a1 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -6,7 +6,14 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x7DC]; + /* 0x014C */ char unk_14C[0x03C]; + /* 0x0188 */ SkelAnime skelAnime_188; + /* 0x01CC */ Vec3s actorDrawTbl_1CC[61]; + /* 0x033A */ Vec3s transitionTbl_16E[61]; + /* 0x04A8 */ SkelAnime skelAnime_4A8; + /* 0x04EC */ Vec3s actorDrawTbl_4EC[61]; + /* 0x065A */ Vec3s transitionTbl_65A[61]; + /* 0x07C8 */ char unk_7C8[0x160]; } EnTest; // size = 0x0928 extern const ActorInit En_Test_InitVars; diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 12b02484b4..b0bfea68e2 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -1,6 +1,11 @@ +/* + * File: z_en_tg.c + * Overlay: ovl_En_Tg + * Description: Honey & Darling + */ + #include "z_en_tg.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnTg_Init(EnTg* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTg_Draw(EnTg* this, GlobalContext* globalCtx); const ActorInit En_Tg_InitVars = { ACTOR_EN_TG, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_MU, sizeof(EnTg), diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index ec3c9b19e4..400a26efb0 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -1,6 +1,11 @@ +/* + * File: z_en_tite.c + * Overlay: ovl_En_Tite + * Description: Tektite + */ + #include "z_en_tite.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnTite_Init(EnTite* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTite_Draw(EnTite* this, GlobalContext* globalCtx); const ActorInit En_Tite_InitVars = { ACTOR_EN_TITE, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_TITE, sizeof(EnTite), diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 35c0977e2b..4635ac07c8 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -6,7 +6,6 @@ #include "z_en_tk.h" -#define ROOM 0x00 #define FLAGS 0x00000009 s32 EnTk_CheckNextSpot(EnTk* this, GlobalContext* globalCtx); @@ -40,7 +39,6 @@ extern SkeletonHeader D_0600BE40; const ActorInit En_Tk_InitVars = { ACTOR_EN_TK, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_TK, sizeof(EnTk), diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 7c973a93cc..67892f628e 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -4,29 +4,29 @@ * Description: Spawns a chest with the appropriate contents then unloads. Used in grottos. */ -#include -#include -#include +#include "z_en_torch.h" -typedef struct { - /* 0x0000 */ Actor actor; -} ActorEnTorch; // size = 0x014C - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorEnTorch* this, GlobalContext* globalCtx); +void EnTorch_Init(EnTorch* this, GlobalContext* globalCtx); const ActorInit En_Torch_InitVars = { - ACTOR_EN_TORCH, ACTORTYPE_ITEMACTION, ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, - sizeof(ActorEnTorch), (ActorFunc)Init, NULL, NULL, NULL, + ACTOR_EN_TORCH, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_GAMEPLAY_KEEP, + sizeof(EnTorch), + (ActorFunc)EnTorch_Init, + NULL, + NULL, + NULL, }; static u8 sChestContents[] = { GI_RUPEE_BLUE, GI_RUPEE_RED, GI_RUPEE_GOLD, GI_BOMBS_20, GI_BOMBS_1, GI_BOMBS_1, GI_BOMBS_1, GI_BOMBS_1, }; -static void Init(ActorEnTorch* this, GlobalContext* globalCtx) { +void EnTorch_Init(EnTorch* this, GlobalContext* globalCtx) { s8 returnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data; /* Spawn chest with desired contents. diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h new file mode 100644 index 0000000000..495f2b9940 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h @@ -0,0 +1,13 @@ +#ifndef _Z_EN_TORCH_H_ +#define _Z_EN_TORCH_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; +} EnTorch; // size = 0x014C + +extern const ActorInit En_Torch_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 45d4c18990..cebe28842e 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -1,6 +1,11 @@ +/* + * File: z_en_torch2.c + * Overlay: ovl_En_Torch2 + * Description: Dark Link + */ + #include "z_en_torch2.h" -#define ROOM 0x00 #define FLAGS 0x00000035 void EnTorch2_Init(EnTorch2* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTorch2_Draw(EnTorch2* this, GlobalContext* globalCtx); const ActorInit En_Torch2_InitVars = { ACTOR_EN_TORCH2, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_TORCH2, sizeof(EnTorch2), diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index ec322d13cd..4e1693505d 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -1,6 +1,11 @@ +/* + * File: z_en_tory.c + * Overlay: ovl_En_Toryo + * Description: Boss Carpenter + */ + #include "z_en_toryo.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnToryo_Init(EnToryo* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnToryo_Draw(EnToryo* this, GlobalContext* globalCtx); const ActorInit En_Toryo_InitVars = { ACTOR_EN_TORYO, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_TORYO, sizeof(EnToryo), diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 500aa4573b..97a389bf0a 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -1,6 +1,11 @@ +/* + * File: z_en_tp.c + * Overlay: ovl_En_Tp + * Description: Electric Tailpasaran + */ + #include "z_en_tp.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnTp_Init(EnTp* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTp_Draw(EnTp* this, GlobalContext* globalCtx); const ActorInit En_Tp_InitVars = { ACTOR_EN_TP, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_TP, sizeof(EnTp), diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index ae1160abea..175b53d787 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -1,6 +1,11 @@ +/* + * File: z_en_tr.c + * Overlay: ovl_En_Tr + * Description: Koume and Kotake + */ + #include "z_en_tr.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnTr_Init(EnTr* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTr_Draw(EnTr* this, GlobalContext* globalCtx); const ActorInit En_Tr_InitVars = { ACTOR_EN_TR, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_TR, sizeof(EnTr), diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index b4dcc2f2f3..c7b26b392c 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -1,6 +1,11 @@ +/* + * File: z_en_trap.c + * Overlay: ovl_En_Trap + * Description: Metal Spike Trap + */ + #include "z_en_trap.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnTrap_Init(EnTrap* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnTrap_Draw(EnTrap* this, GlobalContext* globalCtx); const ActorInit En_Trap_InitVars = { ACTOR_EN_TRAP, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_TRAP, sizeof(EnTrap), diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 0d27f285e2..98e8ebeb23 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -16,7 +16,6 @@ void EnTuboTrap_WaitForProximity(EnTuboTrap* this, GlobalContext* globalCtx); void EnTuboTrap_Levitate(EnTuboTrap* this, GlobalContext* globalCtx); void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx); -#define ROOM 0x00 #define FLAGS 0x00000010 static ColliderCylinderInit cylinderInitData = { @@ -28,7 +27,6 @@ static ColliderCylinderInit cylinderInitData = { const ActorInit En_Tubo_Trap_InitVars = { ACTOR_EN_TUBO_TRAP, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(EnTuboTrap), diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 29cae7a222..3755b92cae 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -1,6 +1,11 @@ +/* + * File: z_en_vali.c + * Overlay: ovl_En_Vali + * Description: Bari (Big Jellyfish) + */ + #include "z_en_vali.h" -#define ROOM 0x00 #define FLAGS 0x00001015 void EnVali_Init(EnVali* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnVali_Draw(EnVali* this, GlobalContext* globalCtx); const ActorInit En_Vali_InitVars = { ACTOR_EN_VALI, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_VALI, sizeof(EnVali), diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 1ba1683859..854261ff2b 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -4,39 +4,37 @@ * Description: An unused, orange pot based on ALTTP. Lacks collision. */ -#include -#include -#include +#include "z_en_vase.h" -typedef struct { - /* 0x0000 */ Actor actor; -} ActorEnVase; // size = 0x014C - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void Init(ActorEnVase* this, GlobalContext* globalCtx); -static void Destroy(ActorEnVase* this, GlobalContext* globalCtx); -static void Draw(ActorEnVase* this, GlobalContext* globalCtx); +void EnVase_Init(EnVase* this, GlobalContext* globalCtx); +void EnVase_Destroy(EnVase* this, GlobalContext* globalCtx); +void EnVase_Draw(EnVase* this, GlobalContext* globalCtx); const ActorInit En_Vase_InitVars = { - ACTOR_EN_VASE, ACTORTYPE_PROP, ROOM, - FLAGS, OBJECT_VASE, sizeof(ActorEnVase), - (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Actor_Noop, - (ActorFunc)Draw, + ACTOR_EN_VASE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_VASE, + sizeof(EnVase), + (ActorFunc)EnVase_Init, + (ActorFunc)EnVase_Destroy, + (ActorFunc)Actor_Noop, + (ActorFunc)EnVase_Draw, }; extern u32 DL_VASE; -static void Init(ActorEnVase* this, GlobalContext* globalCtx) { +void EnVase_Init(EnVase* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.01f); this->actor.posRot2.pos = this->actor.posRot.pos; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f); } -static void Destroy(ActorEnVase* this, GlobalContext* globalCtx) { +void EnVase_Destroy(EnVase* this, GlobalContext* globalCtx) { } -static void Draw(ActorEnVase* this, GlobalContext* globalCtx) { +void EnVase_Draw(EnVase* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &DL_VASE); } diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.h b/src/overlays/actors/ovl_En_Vase/z_en_vase.h new file mode 100644 index 0000000000..f34289aa39 --- /dev/null +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.h @@ -0,0 +1,13 @@ +#ifndef _Z_EN_VASE_H_ +#define _Z_EN_VASE_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; +} EnVase; // size = 0x014C + +extern const ActorInit En_Vase_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 36de850e5f..041bc9d884 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -1,6 +1,11 @@ +/* + * File: z_en_vb_ball.c + * Overlay: ovl_En_Vb_Ball + * Description: Volvagia's Rocks + */ + #include "z_en_vb_ball.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EnVbBall_Init(EnVbBall* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnVbBall_Draw(EnVbBall* this, GlobalContext* globalCtx); const ActorInit En_Vb_Ball_InitVars = { ACTOR_PLAYER, ACTORTYPE_BOSS, - ROOM, FLAGS, OBJECT_FD, sizeof(EnVbBall), diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index cf6fdda264..e4f87b4163 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -1,6 +1,11 @@ +/* + * File: z_en_viewer.c + * Overlay: ovl_En_Viewer + * Description: Cutscene Actors + */ + #include "z_en_viewer.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnViewer_Init(EnViewer* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnViewer_Draw(EnViewer* this, GlobalContext* globalCtx); const ActorInit En_Viewer_InitVars = { ACTOR_EN_VIEWER, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnViewer), diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 188b524f76..c7a4eeeb83 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -1,6 +1,11 @@ +/* + * File: z_en_vm.c + * Overlay: ovl_En_Vm + * Description: Beamos + */ + #include "z_en_vm.h" -#define ROOM 0x00 #define FLAGS 0x00000011 void EnVm_Init(EnVm* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnVm_Draw(EnVm* this, GlobalContext* globalCtx); const ActorInit En_Vm_InitVars = { ACTOR_EN_VM, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_VM, sizeof(EnVm), diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 07df431aee..bdac84e678 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -1,6 +1,11 @@ +/* + * File: z_en_wall_tubo.c + * Overlay: ovl_En_Wall_Tubo + * Description: Bombchu Bowling Alley Wall 2 + */ + #include "z_en_wall_tubo.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnWallTubo_Init(EnWallTubo* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void EnWallTubo_Update(EnWallTubo* this, GlobalContext* globalCtx); const ActorInit En_Wall_Tubo_InitVars = { ACTOR_EN_WALL_TUBO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnWallTubo), diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 93233a3cc9..99017f0881 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -6,7 +6,6 @@ #include "z_en_wallmas.h" -#define ROOM 0x00 #define FLAGS 0x00000015 #define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000) @@ -17,31 +16,30 @@ #define DAMAGE_EFFECT_STUN_WHITE 4 #define DAMAGE_EFFECT_STUN_BLUE 1 -static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_ProximityOrSwitchInit(EnWallmas* this); -static void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Land(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_JumpToCeiling(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_DamageCoolDown(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_WaitForProximity(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_WaitForSwitchFlag(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_ProximityOrSwitchInit(EnWallmas* this); +void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Land(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_JumpToCeiling(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_DamageCoolDown(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_WaitForProximity(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_WaitForSwitchFlag(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx); +void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx); const ActorInit En_Wallmas_InitVars = { ACTOR_EN_WALLMAS, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_WALLMASTER, sizeof(EnWallmas), @@ -91,7 +89,7 @@ extern AnimationHeader D_060041F4; extern AnimationHeader D_0600A054; extern Gfx D_06008688[]; -static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { EnWallmas* this2 = this; Actor_ProcessInitChain(&this->actor, initChain); @@ -119,12 +117,12 @@ static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx) { ColliderCylinderMain* col = &this->colCylinder; ActorCollider_FreeCylinder(globalCtx, col); } -static void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; this->actor.flags &= ~1; @@ -137,7 +135,7 @@ static void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx) { this->actionFunc = (ActorFunc)&EnWallmas_WaitToDrop; } -static void EnWallmas_DropStart(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_DropStart(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; AnimationHeader* objSegChangeAnime = &D_0600299C; @@ -153,7 +151,7 @@ static void EnWallmas_DropStart(EnWallmas* this, GlobalContext* globalCtx) { this->actionFunc = (ActorFunc)&EnWallmas_Drop; } -static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { AnimationHeader* objSegFrameCount = &D_060019CC; AnimationHeader* objSegChangeAnime = &D_060019CC; @@ -165,23 +163,23 @@ static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { this->actionFunc = (ActorFunc)&EnWallmas_Land; } -static void EnWallmas_StandStart(EnWallmas* this) { +void EnWallmas_StandStart(EnWallmas* this) { SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600A054); this->actionFunc = (ActorFunc)&EnWallmas_Stand; } -static void EnWallmas_WalkStart(EnWallmas* this) { +void EnWallmas_WalkStart(EnWallmas* this) { SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_060041F4, 3.0f); this->actionFunc = (ActorFunc)&EnWallmas_Walk; this->actor.speedXZ = 3.0f; } -static void EnWallmas_JumpToCeilingStart(EnWallmas* this) { +void EnWallmas_JumpToCeilingStart(EnWallmas* this) { SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009244); this->actionFunc = (ActorFunc)&EnWallmas_JumpToCeiling; this->actor.speedXZ = 0.0f; } -static void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { +void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { AnimationHeader* objSegFrameCount = &D_060019CC; AnimationHeader* objSegChangeAnime = &D_060019CC; @@ -194,7 +192,7 @@ static void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { this->actionFunc = (ActorFunc)&EnWallmas_ReturnToCeiling; } -static void EnWallmas_TakeDamageStart(EnWallmas* this) { +void EnWallmas_TakeDamageStart(EnWallmas* this) { SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06000590, -3.0f); if ((this->colCylinder.body.colliding->toucher.flags & 0x1F824) != 0) { this->actor.posRot.rot.y = this->colCylinder.base.ac->posRot.rot.y; @@ -208,7 +206,7 @@ static void EnWallmas_TakeDamageStart(EnWallmas* this) { this->actor.velocity.y = 10.0f; } -static void EnWallmas_DamageCoolDownStart(EnWallmas* this) { +void EnWallmas_DamageCoolDownStart(EnWallmas* this) { SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000EA4); this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; @@ -216,7 +214,7 @@ static void EnWallmas_DamageCoolDownStart(EnWallmas* this) { this->actionFunc = (ActorFunc)&EnWallmas_DamageCoolDown; } -static void EnWallMas_DieBegin(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallMas_DieBegin(EnWallmas* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; @@ -227,7 +225,7 @@ static void EnWallMas_DieBegin(EnWallmas* this, GlobalContext* globalCtx) { this->actionFunc = (ActorFunc)&EnWallmas_Die; } -static void EnWallmas_TakePlayerBegin(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_TakePlayerBegin(EnWallmas* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06009520, -5.0f); this->timer = -0x1e; this->actionFunc = (ActorFunc)&EnWallmas_TakePlayer; @@ -239,7 +237,7 @@ static void EnWallmas_TakePlayerBegin(EnWallmas* this, GlobalContext* globalCtx) func_800800F8(globalCtx, 0x251C, 0x270F, &this->actor, 0); } -static void EnWallmas_ProximityOrSwitchInit(EnWallmas* this) { +void EnWallmas_ProximityOrSwitchInit(EnWallmas* this) { this->timer = 0; this->actor.draw = NULL; this->actor.flags = this->actor.flags & ~1; @@ -250,7 +248,7 @@ static void EnWallmas_ProximityOrSwitchInit(EnWallmas* this) { } } -static void EnWallmas_StunBegin(EnWallmas* this) { +void EnWallmas_StunBegin(EnWallmas* this) { SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.5f, 0, 20.0f, 2, -3.0f); this->actor.speedXZ = 0.0f; @@ -265,7 +263,7 @@ static void EnWallmas_StunBegin(EnWallmas* this) { this->actionFunc = (ActorFunc)&EnWallmas_Stun; } -static void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { Vec3f* playerPos; Player* player; @@ -295,7 +293,7 @@ static void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; if ((func_8008E988(globalCtx) == 0) && (player->stateFlags2 & 0x10) == 0 && (player->unk_A78 >= 0) && (this->actor.xzDistanceFromLink < 30.0f) && (this->actor.yDistanceFromLink < -5.0f) && @@ -304,13 +302,13 @@ static void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_Land(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Land(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_StandStart(this); } } -static void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_WalkStart(this); } @@ -318,7 +316,7 @@ static void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx) { Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.rotTowardsLinkY + 0x8000, 0xB6); } -static void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_JumpToCeilingStart(this); } @@ -331,13 +329,13 @@ static void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_JumpToCeiling(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_JumpToCeiling(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_ReturnToCeilingStart(this); } } -static void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->skelAnime.animCurrentFrame > 20.0f) { @@ -365,7 +363,7 @@ static void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx) } } -static void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { if (this->actor.sub_98.health == 0) { EnWallMas_DieBegin(this, globalCtx); @@ -380,13 +378,13 @@ static void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx) { Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); } -static void EnWallmas_DamageCoolDown(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_DamageCoolDown(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_ReturnToCeilingStart(this); } } -static void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx) { if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0015) != 0) { Actor_SetScale(&this->actor, 0.01f); Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0xC0); @@ -396,7 +394,7 @@ static void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx) { this->actor.scale.y = this->actor.scale.x; } -static void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { Player* player; player = PLAYER; @@ -451,21 +449,21 @@ static void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_WaitForProximity(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_WaitForProximity(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < 200.0f) { EnWallmas_TimerInit(this, globalCtx); } } -static void EnWallmas_WaitForSwitchFlag(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_WaitForSwitchFlag(EnWallmas* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) { EnWallmas_TimerInit(this, globalCtx); this->timer = 0x51; } } -static void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->timer != 0) { this->timer--; @@ -480,7 +478,7 @@ static void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) { if ((this->colCylinder.base.collideFlags & 2) != 0) { this->colCylinder.base.collideFlags &= ~2; func_80035650(&this->actor, &this->colCylinder.body, 1); @@ -511,7 +509,7 @@ static void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) { } } -static void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) { EnWallmas* this2 = this; char pad[4]; @@ -557,7 +555,7 @@ static void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) { this2->actor.shape.rot.y = this2->actor.posRot.rot.y; } -static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { char pad[8]; MtxF mf; GraphicsContext* gfxCtx; @@ -594,8 +592,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); } -static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, - Actor* actor) { +s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { EnWallmas* this = (EnWallmas*)actor; if (limbIndex == 1) { if (this->actionFunc != (ActorFunc)EnWallmas_TakePlayer) { @@ -608,7 +605,7 @@ static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL return 0; } -static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { +void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { GraphicsContext* gfxCtx; Gfx* dispRefs[4]; @@ -630,7 +627,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi } } -static void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx) { +void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx) { if (this->actionFunc != (ActorFunc)&EnWallmas_WaitToDrop) { func_80093D18(globalCtx->state.gfxCtx); SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 7c1d9bf7b4..573226e9b4 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -1,6 +1,11 @@ +/* + * File: z_en_weather_tag.c + * Overlay: ovl_En_Weather_Tag + * Description: Proximity Rain/Weather Effects + */ + #include "z_en_weather_tag.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnWeatherTag_Init(EnWeatherTag* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void EnWeatherTag_Update(EnWeatherTag* this, GlobalContext* globalCtx); const ActorInit En_Weather_Tag_InitVars = { ACTOR_EN_WEATHER_TAG, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnWeatherTag), diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 846409a0b1..048a5e43db 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -1,6 +1,11 @@ +/* + * File: z_en_weiyer.c + * Overlay: ovl_En_Weiyer + * Description: Stinger (Water) + */ + #include "z_en_weiyer.h" -#define ROOM 0x00 #define FLAGS 0x00000005 void EnWeiyer_Init(EnWeiyer* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnWeiyer_Draw(EnWeiyer* this, GlobalContext* globalCtx); const ActorInit En_Weiyer_InitVars = { ACTOR_EN_WEIYER, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_EI, sizeof(EnWeiyer), diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 6bbd5ed315..ddc630d836 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -1,6 +1,11 @@ +/* + * File: z_en_wf.c + * Overlay: ovl_En_Wf + * Description: Wolfos + */ + #include "z_en_wf.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnWf_Init(EnWf* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnWf_Draw(EnWf* this, GlobalContext* globalCtx); const ActorInit En_Wf_InitVars = { ACTOR_EN_WF, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_WF, sizeof(EnWf), diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index e8383a72ea..987f4bd8c9 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -1,6 +1,11 @@ +/* + * File: z_en_wonder_item.c + * Overlay: ovl_En_Wonder_Item + * Description: Invisible Collectable; Used in MQ to create "Cow" switches + */ + #include "z_en_wonder_item.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnWonderItem_Init(EnWonderItem* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void EnWonderItem_Update(EnWonderItem* this, GlobalContext* globalCtx); const ActorInit En_Wonder_Item_InitVars = { ACTOR_EN_WONDER_ITEM, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnWonderItem), diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index 8d353b14f0..e46bffb4ba 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -1,6 +1,11 @@ +/* + * File: z_en_wonder_talk.c + * Overlay: ovl_En_Wonder_Talk + * Description: Checkable spot (Green Navi) + */ + #include "z_en_wonder_talk.h" -#define ROOM 0x00 #define FLAGS 0x08000009 void EnWonderTalk_Init(EnWonderTalk* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void EnWonderTalk_Update(EnWonderTalk* this, GlobalContext* globalCtx); const ActorInit En_Wonder_Talk_InitVars = { ACTOR_EN_WONDER_TALK, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnWonderTalk), diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index ebcb7b6625..e46cf0da58 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -1,6 +1,11 @@ +/* + * File: z_en_wonder_talk2.c + * Overlay: ovl_En_Wonder_Talk2 + * Description: Dialog spot + */ + #include "z_en_wonder_talk2.h" -#define ROOM 0x00 #define FLAGS 0x08000009 void EnWonderTalk2_Init(EnWonderTalk2* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void EnWonderTalk2_Update(EnWonderTalk2* this, GlobalContext* globalCtx); const ActorInit En_Wonder_Talk2_InitVars = { ACTOR_EN_WONDER_TALK2, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnWonderTalk2), diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 802c153f1d..8a35c5f504 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -1,6 +1,11 @@ +/* + * File: z_en_wood02.c + * Overlay: ovl_En_Wood02 + * Description: Trees & Bushes + */ + #include "z_en_wood02.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnWood02_Init(EnWood02* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnWood02_Draw(EnWood02* this, GlobalContext* globalCtx); const ActorInit En_Wood02_InitVars = { ACTOR_EN_WOOD02, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_WOOD02, sizeof(EnWood02), diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 2692a409d2..a59cff8638 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1,6 +1,11 @@ +/* + * File: z_en_xc.c + * Overlay: ovl_En_Xc + * Description: Sheik + */ + #include "z_en_xc.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnXc_Init(EnXc* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnXc_Draw(EnXc* this, GlobalContext* globalCtx); const ActorInit En_Xc_InitVars = { ACTOR_EN_XC, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_XC, sizeof(EnXc), diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index f053a21c29..e9220307b2 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -1,6 +1,11 @@ +/* + * File: z_en_yabusame_mark.c + * Overlay: ovl_En_Yabusame_Mark + * Description: Horseback Archery Target (arrow hitbox) + */ + #include "z_en_yabusame_mark.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void EnYabusameMark_Init(EnYabusameMark* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void EnYabusameMark_Update(EnYabusameMark* this, GlobalContext* globalCtx); const ActorInit En_Yabusame_Mark_InitVars = { ACTOR_EN_YABUSAME_MARK, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EnYabusameMark), diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 693d1801c2..daf0369c03 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -1,6 +1,11 @@ +/* + * File: z_en_yukabyun.c + * Overlay: ovl_En_Yukabyun + * Description: Flying floor tile + */ + #include "z_en_yukabyun.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnYukabyun_Init(EnYukabyun* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnYukabyun_Draw(EnYukabyun* this, GlobalContext* globalCtx); const ActorInit En_Yukabyun_InitVars = { ACTOR_EN_YUKABYUN, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_YUKABYUN, sizeof(EnYukabyun), diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 6b5c2a6459..b70b9f3102 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -1,6 +1,11 @@ +/* + * File: z_en_zf.c + * Overlay: ovl_En_Zf + * Description: Lizalfos and Dinolfos + */ + #include "z_en_zf.h" -#define ROOM 0x00 #define FLAGS 0x00000015 void EnZf_Init(EnZf* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnZf_Draw(EnZf* this, GlobalContext* globalCtx); const ActorInit En_Zf_InitVars = { ACTOR_EN_ZF, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_ZF, sizeof(EnZf), diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 2cc382efb1..e42d01e47a 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -1,6 +1,11 @@ +/* + * File: z_en_zl1.c + * Overlay: ovl_En_Zl1 + * Description: Child Princess Zelda (at window) + */ + #include "z_en_zl1.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnZl1_Init(EnZl1* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnZl1_Draw(EnZl1* this, GlobalContext* globalCtx); const ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZL1, sizeof(EnZl1), diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index eb67587b49..f6f870b515 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1,6 +1,11 @@ +/* + * File: z_en_zl2.c + * Overlay: ovl_En_Zl2 + * Description: Adult Zelda (Cutscenes) + */ + #include "z_en_zl2.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnZl2_Init(EnZl2* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnZl2_Draw(EnZl2* this, GlobalContext* globalCtx); const ActorInit En_Zl2_InitVars = { ACTOR_EN_ZL2, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZL2, sizeof(EnZl2), diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 8bc7fd6fff..7e28b83f09 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -1,6 +1,11 @@ +/* + * File: z_en_zl3.c + * Overlay: ovl_En_Zl3 + * Description: Adult Zelda + */ + #include "z_en_zl3.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnZl3_Init(EnZl3* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnZl3_Draw(EnZl3* this, GlobalContext* globalCtx); const ActorInit En_Zl3_InitVars = { ACTOR_EN_ZL3, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZL2, sizeof(EnZl3), diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 38a9bef697..5847ad5ac8 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -1,6 +1,11 @@ +/* + * File: z_en_zl4.c + * Overlay: ovl_En_Zl4 + * Description: Child Princess Zelda + */ + #include "z_en_zl4.h" -#define ROOM 0x00 #define FLAGS 0x00000019 void EnZl4_Init(EnZl4* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnZl4_Draw(EnZl4* this, GlobalContext* globalCtx); const ActorInit En_Zl4_InitVars = { ACTOR_EN_ZL4, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZL4, sizeof(EnZl4), diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 4c806476e0..0c9f96060a 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -1,6 +1,11 @@ +/* + * File: z_en_zo.c + * Overlay: ovl_En_Zo + * Description: Zora + */ + #include "z_en_zo.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void EnZo_Init(EnZo* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EnZo_Draw(EnZo* this, GlobalContext* globalCtx); const ActorInit En_Zo_InitVars = { ACTOR_EN_ZO, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_ZO, sizeof(EnZo), diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 1f6fbfbbe1..77421ee622 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -1,6 +1,5 @@ #include "z_en_fhg.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void EnfHG_Init(EnfHG* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void EnfHG_Draw(EnfHG* this, GlobalContext* globalCtx); const ActorInit En_fHG_InitVars = { ACTOR_EN_FHG, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_FHG, sizeof(EnfHG), diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 8a605455aa..9d672f578d 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -1,6 +1,11 @@ +/* + * File: z_end_title.c + * Overlay: ovl_End_Title + * Description: "The End" message + */ + #include "z_end_title.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void EndTitle_Init(EndTitle* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void EndTitle_Draw(EndTitle* this, GlobalContext* globalCtx); const ActorInit End_Title_InitVars = { ACTOR_END_TITLE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(EndTitle), diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index baa2d30933..fb381e6dee 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1,6 +1,11 @@ +/* + * File: z_fishing.c + * Overlay: ovl_Fishing + * Description: Fishing Pond man and Fish + */ + #include "z_fishing.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void Fishing_Init(Fishing* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void Fishing_Draw(Fishing* this, GlobalContext* globalCtx); const ActorInit Fishing_InitVars = { ACTOR_FISHING, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_FISH, sizeof(Fishing), diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index d1e9fed3ca..f949a03833 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -1,6 +1,11 @@ +/* + * File: z_item_b_heart.c + * Overlay: ovl_Item_B_Heart + * Description: Heart Container + */ + #include "z_item_b_heart.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ItemBHeart_Init(ItemBHeart* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ItemBHeart_Draw(ItemBHeart* this, GlobalContext* globalCtx); const ActorInit Item_B_Heart_InitVars = { ACTOR_ITEM_B_HEART, ACTORTYPE_MISC, - ROOM, FLAGS, OBJECT_GI_HEARTS, sizeof(ItemBHeart), diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index ee8297b042..8673ad0dbc 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -1,6 +1,11 @@ +/* + * File: z_item_etcetera.c + * Overlay: ovl_Item_Etcetera + * Description: Collectible Items + */ + #include "z_item_etcetera.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ItemEtcetera_Init(ItemEtcetera* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void ItemEtcetera_Update(ItemEtcetera* this, GlobalContext* globalCtx); const ActorInit Item_Etcetera_InitVars = { ACTOR_ITEM_ETCETERA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ItemEtcetera), diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index e84c5c390e..63970df7e3 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -4,56 +4,47 @@ * Description: Zelda's magic to open gates. */ -#include -#include -#include +#include "z_item_inbox.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ ActorFunc updateFunc; -} ActorItemInbox; // size = 0x0154 - -#define ROOM 0x00 #define FLAGS 0x00000009 -static void Init(ActorItemInbox* this, GlobalContext* globalCtx); -static void Destroy(ActorItemInbox* this, GlobalContext* globalCtx); -static void func_80B86020(ActorItemInbox* this, GlobalContext* globalCtx); -static void Update(ActorItemInbox* this, GlobalContext* globalCtx); -static void Draw(ActorItemInbox* this, GlobalContext* globalCtx); +void ItemInbox_Init(ItemInbox* this, GlobalContext* globalCtx); +void ItemInbox_Destroy(ItemInbox* this, GlobalContext* globalCtx); +void func_80B86020(ItemInbox* this, GlobalContext* globalCtx); +void ItemInbox_Update(ItemInbox* this, GlobalContext* globalCtx); +void ItemInbox_Draw(ItemInbox* this, GlobalContext* globalCtx); const ActorInit Item_Inbox_InitVars = { ACTOR_ITEM_INBOX, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, - sizeof(ActorItemInbox), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw, + sizeof(ItemInbox), + (ActorFunc)ItemInbox_Init, + (ActorFunc)ItemInbox_Destroy, + (ActorFunc)ItemInbox_Update, + (ActorFunc)ItemInbox_Draw, }; -static void Init(ActorItemInbox* this, GlobalContext* globalCtx) { - this->updateFunc = (ActorFunc)func_80B86020; +void ItemInbox_Init(ItemInbox* this, GlobalContext* globalCtx) { + this->updateFunc = func_80B86020; Actor_SetScale(&this->actor, 0.2); } -static void Destroy(ActorItemInbox* this, GlobalContext* globalCtx) { +void ItemInbox_Destroy(ItemInbox* this, GlobalContext* globalCtx) { } -static void func_80B86020(ActorItemInbox* this, GlobalContext* globalCtx) { +void func_80B86020(ItemInbox* this, GlobalContext* globalCtx) { if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) { Actor_Kill(&this->actor); } } -static void Update(ActorItemInbox* this, GlobalContext* globalCtx) { +void ItemInbox_Update(ItemInbox* this, GlobalContext* globalCtx) { this->updateFunc(this, globalCtx); } -static void Draw(ActorItemInbox* this, GlobalContext* globalCtx) { +void ItemInbox_Draw(ItemInbox* this, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); func_8002ED80(&this->actor, globalCtx, 0); func_800694A0(globalCtx, this->actor.params & 0xFF); diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h new file mode 100644 index 0000000000..ecb3b9c17c --- /dev/null +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -0,0 +1,14 @@ +#ifndef _Z_ITEM_INBOX_H_ +#define _Z_ITEM_INBOX_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ActorFunc updateFunc; +} ItemInbox; // size = 0x0154 + +extern const ActorInit Item_Inbox_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 4c62ecb28e..b024c62d66 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -1,6 +1,11 @@ +/* + * File: z_item_ocarina.c + * Overlay: ovl_Item_Ocarina + * Description: Ocarina of Time + */ + #include "z_item_ocarina.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ItemOcarina_Init(ItemOcarina* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ItemOcarina_Draw(ItemOcarina* this, GlobalContext* globalCtx); const ActorInit Item_Ocarina_InitVars = { ACTOR_ITEM_OCARINA, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GI_OCARINA, sizeof(ItemOcarina), diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index f4936f70fe..33f7314482 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -1,6 +1,11 @@ +/* + * File: z_item_shield.c + * Overlay: ovl_Item_Shield + * Description: Deku Shield + */ + #include "z_item_shield.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ItemShield_Init(ItemShield* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ItemShield_Draw(ItemShield* this, GlobalContext* globalCtx); const ActorInit Item_Shield_InitVars = { ACTOR_ITEM_SHIELD, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_LINK_CHILD, sizeof(ItemShield), diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 1f57a7bbda..f435f98381 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -1,6 +1,11 @@ +/* + * File: z_magic_dark.c + * Overlay: ovl_Magic_Dark + * Description: Nayru's Love + */ + #include "z_magic_dark.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void MagicDark_Init(MagicDark* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void MagicDark_Draw(MagicDark* this, GlobalContext* globalCtx); const ActorInit Magic_Dark_InitVars = { ACTOR_MAGIC_DARK, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(MagicDark), diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 0f0ad4ea4b..6f65b00c1d 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -1,6 +1,11 @@ +/* + * File: z_magic_fire.c + * Overlay: ovl_Magic_Fire + * Description: Din's Fire + */ + #include "z_magic_fire.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void MagicFire_Init(MagicFire* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void MagicFire_Draw(MagicFire* this, GlobalContext* globalCtx); const ActorInit Magic_Fire_InitVars = { ACTOR_MAGIC_FIRE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(MagicFire), diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 34b89509db..8cfab660da 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -1,6 +1,11 @@ +/* + * File: z_magic_wind.c + * Overlay: ovl_Magic_Wind + * Description: Farore's Wind + */ + #include "z_magic_wind.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void MagicWind_Init(MagicWind* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void MagicWind_Draw(MagicWind* this, GlobalContext* globalCtx); const ActorInit Magic_Wind_InitVars = { ACTOR_MAGIC_WIND, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(MagicWind), diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 4a5c247c5b..57e4236f30 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -1,6 +1,11 @@ +/* + * File: z_mir_ray.c + * Overlay: ovl_Mir_Ray + * Description: Reflectable Light Beam + */ + #include "z_mir_ray.h" -#define ROOM 0x00 #define FLAGS 0x00000030 void MirRay_Init(MirRay* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void MirRay_Draw(MirRay* this, GlobalContext* globalCtx); const ActorInit Mir_Ray_InitVars = { ACTOR_MIR_RAY, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay), diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index ae03298aad..c8909ef63a 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_bean.c + * Overlay: ovl_Obj_Bean + * Description: Bean plant spot + */ + #include "z_obj_bean.h" -#define ROOM 0x00 #define FLAGS 0x00400000 void ObjBean_Init(ObjBean* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjBean_Draw(ObjBean* this, GlobalContext* globalCtx); const ActorInit Obj_Bean_InitVars = { ACTOR_OBJ_BEAN, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_MAMENOKI, sizeof(ObjBean), diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h index dcfbf9787c..57571c69d9 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xAC]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x94]; } ObjBean; // size = 0x01F8 extern const ActorInit Obj_Bean_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 06596da0f6..3c35f1e26d 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -4,35 +4,27 @@ * Description: Stops blocks and sets relevant flags when the block is in position. */ -#include -#include -#include +#include "z_obj_blockstop.h" -typedef struct { - /* 0x0000 */ Actor actor; -} ActorObjBlockstop; // size = 0x014C - -#define ROOM 0x00 #define FLAGS 0x00000000 -static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx); -static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx); -static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx); +void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx); +void ObjBlockstop_Destroy(ObjBlockstop* this, GlobalContext* globalCtx); +void ObjBlockstop_Update(ObjBlockstop* this, GlobalContext* globalCtx); const ActorInit Obj_Blockstop_InitVars = { ACTOR_OBJ_BLOCKSTOP, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, - sizeof(ActorObjBlockstop), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, + sizeof(ObjBlockstop), + (ActorFunc)ObjBlockstop_Init, + (ActorFunc)ObjBlockstop_Destroy, + (ActorFunc)ObjBlockstop_Update, NULL, }; -static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx) { +void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->actor.params)) { Actor_Kill(&this->actor); } else { @@ -40,10 +32,10 @@ static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx) { } } -static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx) { +void ObjBlockstop_Destroy(ObjBlockstop* this, GlobalContext* globalCtx) { } -static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx) { +void ObjBlockstop_Update(ObjBlockstop* this, GlobalContext* globalCtx) { DynaPolyActor* dynaActor; s32 pad; Vec3f sp4C; diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h new file mode 100644 index 0000000000..ebded0ee7f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h @@ -0,0 +1,13 @@ +#ifndef _Z_OBJ_BLOCKSTOP_H_ +#define _Z_OBJ_BLOCKSTOP_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; +} ObjBlockstop; // size = 0x014C + +extern const ActorInit ObjBlockstop_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index b333a5bfa3..3ab37b6d71 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -6,21 +6,19 @@ #include "z_obj_bombiwa.h" -#define ROOM 0x00 #define FLAGS 0x00000000 -static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx); -static void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx); -static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx); -static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx); +void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx); +void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx); +void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx); +void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx); -static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx); -static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx); +void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx); +void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx); const ActorInit Obj_Bombiwa_InitVars = { ACTOR_OBJ_BOMBIWA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_BOMBIWA, sizeof(ObjBombiwa), @@ -54,14 +52,14 @@ static s16 effectScales[] = { extern Gfx* D_060009E0; // dlist -static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx) { +void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx) { ObjBombiwa* thisLocal = this; ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); ActorCollider_InitCylinder(globalCtx, &thisLocal->collider, &thisLocal->actor, &colliderInit); ActorCollider_Cylinder_Update(&thisLocal->actor, &thisLocal->collider); } -static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { +void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); ObjBombiwa_InitCollision(this, globalCtx); if ((Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) != 0)) { @@ -78,11 +76,11 @@ static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { } } -static void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx) { +void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx) { ActorCollider_FreeCylinder(globalCtx, &this->collider); } -static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { +void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { Vec3f temp_s2; Vec3f temp_s3; Gfx** dlist; @@ -106,7 +104,7 @@ static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { func_80033480(globalCtx, &this->actor.posRot.pos, 60.0f, 8, 100, 160, 1); } -static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { +void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { SubGlobalContext11E60* sub_11E60; ColliderCylinderMain* collider; @@ -131,6 +129,6 @@ static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { } } -static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx) { +void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_060009E0); } diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 1811ad2d6e..b8ceea03d1 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -6,7 +6,6 @@ #include "z_obj_comb.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx); @@ -22,7 +21,6 @@ void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx); const ActorInit Obj_Comb_InitVars = { ACTOR_OBJ_COMB, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(ObjComb), diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 0369f30f70..b0b42e0cad 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_dekujr.c + * Overlay: ovl_Obj_Dekujr + * Description: Deku Tree Sprout + */ + #include "z_obj_dekujr.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void ObjDekujr_Init(ObjDekujr* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjDekujr_Draw(ObjDekujr* this, GlobalContext* globalCtx); const ActorInit Obj_Dekujr_InitVars = { ACTOR_OBJ_DEKUJR, ACTORTYPE_NPC, - ROOM, FLAGS, OBJECT_DEKUJR, sizeof(ObjDekujr), diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index da113c4e32..60fbb73ba9 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -6,25 +6,23 @@ #include "z_obj_elevator.h" -#define ROOM 0x00 #define FLAGS 0x00000000 #define SIZE_PARAM 1 -static void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx); -static void ObjElevator_Destroy(ObjElevator* this, GlobalContext* globalCtx); -static void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx); -static void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx); +void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx); +void ObjElevator_Destroy(ObjElevator* this, GlobalContext* globalCtx); +void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx); +void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx); -static void func_80B92C5C(ObjElevator* this); -static void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx); -static void func_80B92D20(ObjElevator* this); -static void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx); +void func_80B92C5C(ObjElevator* this); +void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx); +void func_80B92D20(ObjElevator* this); +void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx); const ActorInit Obj_Elevator_InitVars = { ACTOR_OBJ_ELEVATOR, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_D_ELEVATOR, sizeof(ObjElevator), @@ -45,11 +43,11 @@ static f32 sizes[] = { 0.1f, 0.05f }; extern u32 D_06000180; extern u32 D_06000360; -static void ObjElevator_SetupAction(ObjElevator* this, ActorFunc actionFunc) { +void ObjElevator_SetupAction(ObjElevator* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { +void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; u32 local_c = 0; s16 pad2; @@ -64,7 +62,7 @@ static void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, u32 colli } } -static void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx) { +void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx) { f32 temp_f0; Actor* thisx = &this->dyna.actor; @@ -77,15 +75,15 @@ static void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx) { osSyncPrintf("(Dungeon Elevator)(arg_data 0x%04x)\n", thisx->params); } -static void ObjElevator_Destroy(ObjElevator* this, GlobalContext* globalCtx) { +void ObjElevator_Destroy(ObjElevator* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_80B92C5C(ObjElevator* this) { +void func_80B92C5C(ObjElevator* this) { ObjElevator_SetupAction(this, func_80B92C80); } -static void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx) { +void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx) { f32 sub; Actor* thisx = &this->dyna.actor; if ((this->dyna.unk_160 & 2) && !(this->unk_170 & 2)) { @@ -99,11 +97,11 @@ static void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx) { } } -static void func_80B92D20(ObjElevator* this) { +void func_80B92D20(ObjElevator* this) { ObjElevator_SetupAction(this, func_80B92D44); } -static void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) { +void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (fabsf(Math_SmoothScaleMaxMinF(&thisx->posRot.pos.y, this->unk_168, 1.0f, this->unk_16C, 0.0f)) < 0.001f) { Audio_PlayActorSound2(thisx, NA_SE_EV_FOOT_SWITCH); @@ -113,13 +111,13 @@ static void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) { } } -static void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx) { +void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx) { if (this->actionFunc) { this->actionFunc(this, globalCtx); } this->unk_170 = this->dyna.unk_160; } -static void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx) { +void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, &D_06000180); } diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 2b89979907..8c7e4bae61 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_hamishi.c + * Overlay: ovl_Obj_Hamishi + * Description: Bronze Boulder + */ + #include "z_obj_hamishi.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjHamishi_Init(ObjHamishi* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjHamishi_Draw(ObjHamishi* this, GlobalContext* globalCtx); const ActorInit Obj_Hamishi_InitVars = { ACTOR_OBJ_HAMISHI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(ObjHamishi), diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index dd397901dc..07908b74e7 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_hana.c + * Overlay: Obj_Hana + * Description: Grave Flower + */ + #include "z_obj_hana.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjHana_Init(ObjHana* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjHana_Draw(ObjHana* this, GlobalContext* globalCtx); const ActorInit Obj_Hana_InitVars = { ACTOR_OBJ_HANA, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_FIELD_KEEP, sizeof(ObjHana), diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 75422d0b73..7b302e9708 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_hsblock.c + * Overlay: ovl_Obj_Hsblock + * Description: Stone Hookshot Target + */ + #include "z_obj_hsblock.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjHsblock_Init(ObjHsblock* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjHsblock_Draw(ObjHsblock* this, GlobalContext* globalCtx); const ActorInit Obj_Hsblock_InitVars = { ACTOR_OBJ_HSBLOCK, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_D_HSBLOCK, sizeof(ObjHsblock), diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h index 2311f5d8bc..aec8ec39bc 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x4]; } ObjHsblock; // size = 0x0168 extern const ActorInit Obj_Hsblock_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 14cbd08e18..a9d73677a7 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_ice_poly.c + * Overlay: ovl_Obj_Ice_Poly + * Description: Ice / Frozen Actors + */ + #include "z_obj_ice_poly.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ObjIcePoly_Init(ObjIcePoly* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjIcePoly_Draw(ObjIcePoly* this, GlobalContext* globalCtx); const ActorInit Obj_Ice_Poly_InitVars = { ACTOR_OBJ_ICE_POLY, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjIcePoly), diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 8adc1d88e8..28ea95c75e 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_kibako.c + * Overlay: ovl_Obj_Kibako + * Description: Small, Liftable Crate + */ + #include "z_obj_kibako.h" -#define ROOM 0x00 #define FLAGS 0x04000010 void ObjKibako_Init(ObjKibako* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjKibako_Draw(ObjKibako* this, GlobalContext* globalCtx); const ActorInit Obj_Kibako_InitVars = { ACTOR_OBJ_KIBAKO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(ObjKibako), diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index e9cfeab898..c36c100b27 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_kibako2.c + * Overlay: ovl_Obj_Kibako2 + * Description: Large crate + */ + #include "z_obj_kibako2.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjKibako2_Init(ObjKibako2* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjKibako2_Draw(ObjKibako2* this, GlobalContext* globalCtx); const ActorInit Obj_Kibako2_InitVars = { ACTOR_OBJ_KIBAKO2, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_KIBAKO2, sizeof(ObjKibako2), diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h index 31e7ff4a09..b07548dc94 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x6C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x54]; } ObjKibako2; // size = 0x01B8 extern const ActorInit Obj_Kibako2_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 7880566526..817fbe8c8f 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_lift.c + * Overlay: ovl_Obj_Lift + * Description: Square, collapsing platform + */ + #include "z_obj_lift.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ObjLift_Init(ObjLift* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjLift_Draw(ObjLift* this, GlobalContext* globalCtx); const ActorInit Obj_Lift_InitVars = { ACTOR_OBJ_LIFT, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_D_LIFT, sizeof(ObjLift), diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h index d964a978ea..7eadd4de43 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0xC]; } ObjLift; // size = 0x0170 extern const ActorInit Obj_Lift_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 83d2361d49..6b9d5ee1ba 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_lightswitch.c + * Overlay: ovl_Obj_Lightswitch + * Description: Sun Emblem Trigger (Spirit Temple) + */ + #include "z_obj_lightswitch.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ObjLightswitch_Init(ObjLightswitch* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjLightswitch_Draw(ObjLightswitch* this, GlobalContext* globalCtx); const ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, ACTORTYPE_SWITCH, - ROOM, FLAGS, OBJECT_LIGHTSWITCH, sizeof(ObjLightswitch), diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 65ff6f8d26..9de45885dc 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -4,29 +4,18 @@ * Description: Skulltula Sprouting from Bean Spot. */ -#include -#include -#include +#include "z_obj_makekinsuta.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ ActorFunc actionFunc; - /* 0x150 */ s16 unk_150; - /* 0x152 */ s16 unk_152; -} ObjMakekinsuta; // size = 0x0154 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx); -static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx); -static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx); -static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx); +void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx); +void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx); +void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx); +void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx); const ActorInit Obj_Makekinsuta_InitVars = { ACTOR_OBJ_MAKEKINSUTA, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjMakekinsuta), @@ -36,7 +25,7 @@ const ActorInit Obj_Makekinsuta_InitVars = { NULL, }; -static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) { +void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) { if ((this->actor.params & 0x6000) == 0x4000) { osSyncPrintf(VT_FGCOL(BLUE)); // Translation: Gold Star Enemy(arg_data %x) @@ -51,7 +40,7 @@ static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) this->actionFunc = func_80B98320; } -static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) { +void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) { if (this->unk_152 != 0) { if (this->unk_150 >= 0x3C && !func_8002DEEC(PLAYER)) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW, this->actor.posRot.pos.x, @@ -66,9 +55,9 @@ static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) { this->unk_150 = 0; } -static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) { +void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) { } -static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) { +void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) { this->actionFunc(&this->actor, globalCtx); } diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h new file mode 100644 index 0000000000..e481beea9c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h @@ -0,0 +1,17 @@ +#ifndef _Z_OBJ_MAKEKINSUTA_H_ +#define _Z_OBJ_MAKEKINSUTA_H_ + +#include +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ActorFunc actionFunc; + /* 0x150 */ s16 unk_150; + /* 0x152 */ s16 unk_152; +} ObjMakekinsuta; // size = 0x0154 + +extern const ActorInit Obj_Makekinsuta_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 1900eb462c..a16fd0d282 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_makeoshihiki.c + * Overlay: ovl_Obj_Makeoshihiki + * Description: Push Block (Hardcoded) + */ + #include "z_obj_makeoshihiki.h" -#define ROOM 0x00 #define FLAGS 0x00000020 void ObjMakeoshihiki_Init(ObjMakeoshihiki* this, GlobalContext* globalCtx); @@ -10,7 +15,6 @@ void ObjMakeoshihiki_Draw(ObjMakeoshihiki* this, GlobalContext* globalCtx); const ActorInit Obj_Makeoshihiki_InitVars = { ACTOR_OBJ_MAKEOSHIHIKI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(ObjMakeoshihiki), diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 67dc8c0b35..f6569c55ff 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_mure.c + * Overlay: ovl_Obj_Mure + * Description: Fish, Bugs, Butterflies + */ + #include "z_obj_mure.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjMure_Init(ObjMure* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void ObjMure_Update(ObjMure* this, GlobalContext* globalCtx); const ActorInit Obj_Mure_InitVars = { ACTOR_OBJ_MURE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjMure), diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index e8654d8416..3c9b8c95d5 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_mure2.c + * Overlay: ovl_Obj_Mure2 + * Description: Rock/Bush groups + */ + #include "z_obj_mure2.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjMure2_Init(ObjMure2* this, GlobalContext* globalCtx); @@ -10,7 +15,6 @@ void ObjMure2_Update(ObjMure2* this, GlobalContext* globalCtx); const ActorInit Obj_Mure2_InitVars = { ACTOR_OBJ_MURE2, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjMure2), diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index ff6168d255..07a6faff9e 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_mure3.c + * Overlay: ovl_Obj_Mure3 + * Description: Tower of Rupees + */ + #include "z_obj_mure3.h" -#define ROOM 0x00 #define FLAGS 0x00000000 void ObjMure3_Init(ObjMure3* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void ObjMure3_Update(ObjMure3* this, GlobalContext* globalCtx); const ActorInit Obj_Mure3_InitVars = { ACTOR_OBJ_MURE3, ACTORTYPE_BG, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjMure3), diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 3f95cbb2cf..0939c56367 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_oshihiki.c + * Overlay: ovl_Obj_Oshihiki + * Description: Movable Block + */ + #include "z_obj_oshihiki.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ObjOshihiki_Init(ObjOshihiki* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjOshihiki_Draw(ObjOshihiki* this, GlobalContext* globalCtx); const ActorInit Obj_Oshihiki_InitVars = { ACTOR_OBJ_OSHIHIKI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(ObjOshihiki), diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h index a8c6c3fc8e..39f88d3850 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x88]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x70]; } ObjOshihiki; // size = 0x01D4 extern const ActorInit Obj_Oshihiki_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 6689ab0121..105f9f83b9 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -1,42 +1,32 @@ /* * File: z_obj_roomtimer.c * Overlay: ovl_Obj_Roomtimer - * Description: + * Description: Timer */ -#include -#include -#include +#include "z_obj_roomtimer.h" -typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ ActorFunc updateFunc; - /* 0x0150 */ u32 switchFlag; -} ActorRoomTimer; // size = 0x0154 - -#define ROOM 0x00 #define FLAGS 0x00000010 -static void Init(ActorRoomTimer* this, GlobalContext* globalCtx); -static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx); -static void Update(ActorRoomTimer* this, GlobalContext* globalCtx); -static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx); -static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx); +void ObjRoomtimer_Init(ObjRoomtimer* this, GlobalContext* globalCtx); +void ObjRoomtimer_Destroy(ObjRoomtimer* this, GlobalContext* globalCtx); +void ObjRoomtimer_Update(ObjRoomtimer* this, GlobalContext* globalCtx); +void func_80B9D054(ObjRoomtimer* this, GlobalContext* globalCtx); +void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx); const ActorInit Obj_Roomtimer_InitVars = { ACTOR_OBJ_ROOMTIMER, ACTORTYPE_ENEMY, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, - sizeof(ActorRoomTimer), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, + sizeof(ObjRoomtimer), + (ActorFunc)ObjRoomtimer_Init, + (ActorFunc)ObjRoomtimer_Destroy, + (ActorFunc)ObjRoomtimer_Update, (ActorFunc)NULL, }; -static void Init(ActorRoomTimer* this, GlobalContext* globalCtx) { +void ObjRoomtimer_Init(ObjRoomtimer* this, GlobalContext* globalCtx) { s16 params = this->actor.params; this->switchFlag = (params >> 10) & 0x3F; @@ -54,7 +44,7 @@ static void Init(ActorRoomTimer* this, GlobalContext* globalCtx) { this->updateFunc = (ActorFunc)func_80B9D054; } -static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx) { +void ObjRoomtimer_Destroy(ObjRoomtimer* this, GlobalContext* globalCtx) { if (this->actor.params != 0x3FF) { if (gSaveContext.timer_1_value > 0) { gSaveContext.timer_1_state = 10; @@ -62,7 +52,7 @@ static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx) { } } -static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx) { +void func_80B9D054(ObjRoomtimer* this, GlobalContext* globalCtx) { if (this->actor.params != 0x3FF) { func_80088B34(this->actor.params); } @@ -71,7 +61,7 @@ static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx) { this->updateFunc = (ActorFunc)func_80B9D0B0; } -static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx) { +void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) { if (Flags_GetTempClear(globalCtx, this->actor.room)) { if (this->actor.params != 0x3FF) { gSaveContext.timer_1_state = 10; @@ -92,6 +82,6 @@ static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx) { } } -static void Update(ActorRoomTimer* this, GlobalContext* globalCtx) { +void ObjRoomtimer_Update(ObjRoomtimer* this, GlobalContext* globalCtx) { this->updateFunc(this, globalCtx); } diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h new file mode 100644 index 0000000000..0a3e8ef21e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h @@ -0,0 +1,16 @@ +#ifndef _Z_OBJ_ROOMTIMER_H_ +#define _Z_OBJ_ROOMTIMER_H_ + +#include +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ActorFunc updateFunc; + /* 0x0150 */ u32 switchFlag; +} ObjRoomtimer; // size = 0x0154 + +extern const ActorInit Obj_Roomtimer_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index bca0894b91..4668be96aa 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_switch.c + * Overlay: ovl_Obj_Switch + * Description: Switches + */ + #include "z_obj_switch.h" -#define ROOM 0x00 #define FLAGS 0x00000010 void ObjSwitch_Init(ObjSwitch* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjSwitch_Draw(ObjSwitch* this, GlobalContext* globalCtx); const ActorInit Obj_Switch_InitVars = { ACTOR_OBJ_SWITCH, ACTORTYPE_SWITCH, - ROOM, FLAGS, OBJECT_GAMEPLAY_DANGEON_KEEP, sizeof(ObjSwitch), diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h index 05953d002a..fc2f914cf7 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h @@ -5,8 +5,8 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x10C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0xF4]; } ObjSwitch; // size = 0x0258 extern const ActorInit Obj_Switch_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 83fbf3eb78..cad2008f0e 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_syokudai.c + * Overlay: ovl_Obj_Syokudai + * Description: Torch + */ + #include "z_obj_syokudai.h" -#define ROOM 0x00 #define FLAGS 0x00000410 void ObjSyokudai_Init(ObjSyokudai* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjSyokudai_Draw(ObjSyokudai* this, GlobalContext* globalCtx); const ActorInit Obj_Syokudai_InitVars = { ACTOR_OBJ_SYOKUDAI, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_SYOKUDAI, sizeof(ObjSyokudai), diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 4edecb082b..04676e2c0f 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_timeblock.c + * Overlay: ovl_Obj_Timeblock + * Description: Song of Time Block + */ + #include "z_obj_timeblock.h" -#define ROOM 0x00 #define FLAGS 0x0A000011 void ObjTimeblock_Init(ObjTimeblock* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void ObjTimeblock_Draw(ObjTimeblock* this, GlobalContext* globalCtx); const ActorInit Obj_Timeblock_InitVars = { ACTOR_OBJ_TIMEBLOCK, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_TIMEBLOCK, sizeof(ObjTimeblock), diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h index eb337b5136..8e2da631c5 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h @@ -5,8 +5,10 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x30]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x4]; + /* 0x0168 */ ActorFunc actionFunc; + /* 0x016C */ char unk_16C[0x10]; } ObjTimeblock; // size = 0x017C extern const ActorInit Obj_Timeblock_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 6eb47ed986..3898f636ed 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -1,6 +1,11 @@ +/* + * File: z_obj_tsubo.c + * Overlay: ovl_Obj_Tsubo + * Description: Breakable pot + */ + #include "z_obj_tsubo.h" -#define ROOM 0x00 #define FLAGS 0x00800010 void ObjTsubo_Init(ObjTsubo* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void ObjTsubo_Update(ObjTsubo* this, GlobalContext* globalCtx); const ActorInit Obj_Tsubo_InitVars = { ACTOR_OBJ_TSUBO, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjTsubo), diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h index 7d0bd71315..b6b7887999 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x54]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ char unk_150[0x50]; } ObjTsubo; // size = 0x01A0 extern const ActorInit Obj_Tsubo_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index fb3a372c28..77ed86c536 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -1,18 +1,33 @@ +/* + * File: z_obj_warp2block.c + * Overlay: ovl_Obj_Warp2Block + * Description: Navi Infospot (Green, Time Block) + */ + #include "z_obj_warp2block.h" -#define ROOM 0x00 #define FLAGS 0x0A000011 void ObjWarp2block_Init(ObjWarp2block* this, GlobalContext* globalCtx); void ObjWarp2block_Destroy(ObjWarp2block* this, GlobalContext* globalCtx); void ObjWarp2block_Update(ObjWarp2block* this, GlobalContext* globalCtx); void ObjWarp2block_Draw(ObjWarp2block* this, GlobalContext* globalCtx); - +// func_80BA1DF0 +// func_80BA1EEC +void func_80BA2048(ObjWarp2block* this, GlobalContext* globalCtx); +void func_80BA2218(ObjWarp2block* this, GlobalContext* globalCtx); +void func_80BA228C(ObjWarp2block* this, GlobalContext* globalCtx); +void func_80BA2304(ObjWarp2block* this, GlobalContext* globalCtx); +// func_80BA24C8 +void func_80BA24DC(ObjWarp2block* this, GlobalContext* globalCtx); +// func_80BA24E8 +void func_80BA24F8(ObjWarp2block* this, GlobalContext* globalCtx); +// func_80BA2600 +void func_80BA2610(ObjWarp2block* this, GlobalContext* globalCtx); /* const ActorInit Obj_Warp2block_InitVars = { ACTOR_OBJ_WARP2BLOCK, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_TIMEBLOCK, sizeof(ObjWarp2block), @@ -22,6 +37,7 @@ const ActorInit Obj_Warp2block_InitVars = { (ActorFunc)ObjWarp2block_Draw, }; */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1DF0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/func_80BA1ECC.s") diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h index 768a85afdc..69e69bf189 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h @@ -5,8 +5,10 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc_164; + /* 0x0168 */ ActorFunc actionFunc_168; + /* 0x016C */ char unk_16C[0xC]; } ObjWarp2block; // size = 0x0178 extern const ActorInit Obj_Warp2block_InitVars; diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 4da1a95751..742bea383d 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -1,18 +1,23 @@ +/* + * File: z_object_kankyo.c + * Overlay: ovl_Object_Kankyo + * Description: Environmental Effects + */ + #include "z_object_kankyo.h" -#define ROOM 0x00 #define FLAGS 0x02000030 void ObjectKankyo_Init(ObjectKankyo* this, GlobalContext* globalCtx); void ObjectKankyo_Destroy(ObjectKankyo* this, GlobalContext* globalCtx); void ObjectKankyo_Update(ObjectKankyo* this, GlobalContext* globalCtx); void ObjectKankyo_Draw(ObjectKankyo* this, GlobalContext* globalCtx); +void ObjectKankyo_SetupAction(ObjectKankyo* this, ActorFunc actionFunc); /* const ActorInit Object_Kankyo_InitVars = { ACTOR_OBJECT_KANKYO, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ObjectKankyo), @@ -22,7 +27,7 @@ const ActorInit Object_Kankyo_InitVars = { (ActorFunc)ObjectKankyo_Draw, }; */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2AA0.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_SetupAction.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s") diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h index 1b47732923..abf2218122 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1514]; + /* 0x014C */ char unk_14C[0x1510]; + /* 0x165C */ ActorFunc actionFunc; } ObjectKankyo; // size = 0x1660 extern const ActorInit Object_Kankyo_InitVars; diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index f8c5b83e20..ed701702e7 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -1,6 +1,5 @@ #include "z_oceff_spot.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void OceffSpot_Init(OceffSpot* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void OceffSpot_Draw(OceffSpot* this, GlobalContext* globalCtx); const ActorInit Oceff_Spot_InitVars = { ACTOR_OCEFF_SPOT, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(OceffSpot), diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index eb81f0a02b..32472d6359 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -1,6 +1,5 @@ #include "z_oceff_storm.h" -#define ROOM 0x00 #define FLAGS 0x02000030 void OceffStorm_Init(OceffStorm* this, GlobalContext* globalCtx); @@ -12,7 +11,6 @@ void OceffStorm_Draw(OceffStorm* this, GlobalContext* globalCtx); const ActorInit Oceff_Storm_InitVars = { ACTOR_OCEFF_STORM, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(OceffStorm), diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index cad1ecdbfe..dbacbe7b6a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -1,6 +1,11 @@ +/* + * File: z_oceff_wipe.c + * Overlay: ovl_Oceff_Wipe + * Description: Zelda's Lullaby Effect + */ + #include "z_oceff_wipe.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe_Init(OceffWipe* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void OceffWipe_Draw(OceffWipe* this, GlobalContext* globalCtx); const ActorInit Oceff_Wipe_InitVars = { ACTOR_OCEFF_WIPE, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(OceffWipe), diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index f15afc1c59..b884a91c6b 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -1,6 +1,11 @@ +/* + * File: z_oceff_wipe2.c + * Overlay: ovl_Oceff_Wipe2 + * Description: Epona's Song Effect + */ + #include "z_oceff_wipe2.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe2_Init(OceffWipe2* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void OceffWipe2_Draw(OceffWipe2* this, GlobalContext* globalCtx); const ActorInit Oceff_Wipe2_InitVars = { ACTOR_OCEFF_WIPE2, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(OceffWipe2), diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h index 63417a3efa..6b093d5e05 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4]; + /* 0x014C */ s16 unk_14C; + /* 0x014E */ s16 unk_14E; } OceffWipe2; // size = 0x0150 extern const ActorInit Oceff_Wipe2_InitVars; diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 138bd0486e..538fe9df87 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -1,6 +1,11 @@ +/* + * File: z_oceff_wipe3.c + * Overlay: ovl_Oceff_Wipe3 + * Description: Saria's Song Effect + */ + #include "z_oceff_wipe3.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe3_Init(OceffWipe3* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void OceffWipe3_Draw(OceffWipe3* this, GlobalContext* globalCtx); const ActorInit Oceff_Wipe3_InitVars = { ACTOR_OCEFF_WIPE3, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(OceffWipe3), diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h index 1564054464..79f012a353 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4]; + /* 0x014C */ s16 unk_14C; + /* 0x014E */ s16 unk_14E; } OceffWipe3; // size = 0x0150 extern const ActorInit Oceff_Wipe3_InitVars; diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index df85e2b07a..9fe1cb53de 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -1,6 +1,11 @@ +/* + * File: z_oceff_wipe4.c + * Overlay: ovl_Oceff_Wipe4 + * Description: Song of Time effect + */ + #include "z_oceff_wipe4.h" -#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe4_Init(OceffWipe4* this, GlobalContext* globalCtx); @@ -12,7 +17,6 @@ void OceffWipe4_Draw(OceffWipe4* this, GlobalContext* globalCtx); const ActorInit Oceff_Wipe4_InitVars = { ACTOR_OCEFF_WIPE4, ACTORTYPE_ITEMACTION, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(OceffWipe4), diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h index ba47313545..00eb60767c 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4]; + /* 0x014C */ s16 unk_14C; + /* 0x014E */ char unk_14E[0x2]; } OceffWipe4; // size = 0x0150 extern const ActorInit Oceff_Wipe4_InitVars; diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index e07455820a..e1e77d195a 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -1,6 +1,11 @@ +/* + * File: z_shot_sun.c + * Overlay: ovl_Shot_Sun + * Description: Song of Storms Fairy + */ + #include "z_shot_sun.h" -#define ROOM 0x00 #define FLAGS 0x00000009 void ShotSun_Init(ShotSun* this, GlobalContext* globalCtx); @@ -11,7 +16,6 @@ void ShotSun_Update(ShotSun* this, GlobalContext* globalCtx); const ActorInit Shot_Sun_InitVars = { ACTOR_SHOT_SUN, ACTORTYPE_PROP, - ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ShotSun), diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h index 6a0c9b88db..232e8d0026 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -6,7 +6,9 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x5C]; + /* 0x014C */ char unk_14C[0x4C]; + /* 0x0198 */ ActorFunc actionFunc; + /* 0x019C */ char unk_19C[0xC]; } ShotSun; // size = 0x01A8 extern const ActorInit Shot_Sun_InitVars; diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c index f11d7dd407..45b58bb37a 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c @@ -1,3 +1,9 @@ +/* + * File: z_kaleido_scope.c + * Overlay: ovl_kaleido_scope + * Description: Manages the pause and game over screens. + */ + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CC8.s") diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index ffed1b22a1..d54f10f0c0 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -1,3 +1,9 @@ +/* + * File: z_player.c + * Overlay: ovl_player_actor + * Description: Link + */ + #include #include diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index 61113886a6..1348ce4248 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -7,7 +7,7 @@ #include #include -static void Opening_SetNextGameState(OpeningContext* this) { +void Opening_SetNextGameState(OpeningContext* this) { gSaveContext.game_mode = 1; this->state.running = false; gSaveContext.link_age = 0; @@ -17,10 +17,10 @@ static void Opening_SetNextGameState(OpeningContext* this) { SET_NEXT_GAMESTATE(&this->state, func_800BCA64, GlobalContext); } -static void func_80803C5C(OpeningContext* this) { +void func_80803C5C(OpeningContext* this) { } -static void Opening_Update(OpeningContext* this) { +void Opening_Update(OpeningContext* this) { func_80095248(this->state.gfxCtx, 0, 0, 0); Opening_SetNextGameState(this); func_80803C5C(this); diff --git a/tools/decompile_data.py b/tools/decompile_data.py old mode 100644 new mode 100755 index e70206c2f7..e5d98d2168 --- a/tools/decompile_data.py +++ b/tools/decompile_data.py @@ -3,12 +3,128 @@ import os import re import sys +import struct script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" data_dir = root_dir + "data/" +asm_dir = root_dir + "asm/" - +floats = {} +floats["0x3F800000"] = "1.0" +floats["0x46EC7A00"] = "30269.0" +floats["0x46ECC600"] = "30307.0" +floats["0x46ECE600"] = "30323.0" +floats["0x3B23D70A"] = "0.0025" +floats["0x3D4CCCCD"] = "0.05" +floats["0x3DCCCCCD"] = "0.1" +floats["0x451C4000"] = "2500.0" +floats["0x453B8000"] = "3000.0" +floats["0x44BB8000"] = "1500.0" +floats["0x3FCCCCCD"] = "1.6" +floats["0x3E99999A"] = "0.3" +floats["0x40C90FDB"] = "6.28318548203" +floats["0x3DA3D70A"] = "0.08" +floats["0x3F333333"] = "0.7" +floats["0x3F19999A"] = "0.6" +floats["0x40133333"] = "2.3" +floats["0x40933333"] = "4.6" +floats["0x44758000"] = "982.0" +floats["0x409FFFEB"] = "4.99998998642" +floats["0x40FFFFEB"] = "7.99998998642" +floats["0x3F3AE148"] = "0.73" +floats["0x3A83126F"] = "0.001" +floats["0x494EA400"] = "846400.0" +floats["0x3DE147AE"] = "0.11" +floats["0x3C23D70B"] = "0.0100000007078" +floats["0x3E16872B"] = "0.147" +floats["0x3B03126F"] = "0.002" +floats["0x40490FDB"] = "3.14159274101" +floats["0xC49C4000"] = "-1250.0" +floats["0x3FC90FDB"] = "1.57079637051" +floats["0x44278000"] = "670.0" +floats["0x3CA3D70A"] = "0.02" +floats["0x3F7851EC"] = "0.97" +floats["0x3E999999"] = "0.299999982119" +floats["0x3E4CCCCD"] = "0.2" +floats["0x3B83126E"] = "0.00399999972433" +floats["0x3F59999A"] = "0.85" +floats["0x38C90FDB"] = "9.58738019108e-05" +floats["0x3D23D70A"] = "0.04" +floats["0xC4548000"] = "-850.0" +floats["0x45034000"] = "2100.0" +floats["0xBC23D70A"] = "-0.01" +floats["0x3C23D70A"] = "0.01" +floats["0x3CCCCCCD"] = "0.025" +floats["0xBCF5C28F"] = "-0.03" +floats["0x3FE1307A"] = "1.75929188728" +floats["0x3FA4DEEC"] = "1.28805303574" +floats["0xBF20D97B"] = "-0.628318488598" +floats["0x3EF1463A"] = "0.471238911152" +floats["0x3F333334"] = "0.700000047684" +floats["0x407FEF9E"] = "3.99900007248" +floats["0x3FF33333"] = "1.9" +floats["0x3F666666"] = "0.9" +floats["0x44A8C000"] = "1350.0" +floats["0x44898000"] = "1100.0" +floats["0x40C8F5C3"] = "6.28" +floats["0x48742400"] = "250000.0" +floats["0xBF060A92"] = "-0.523598790169" +floats["0x3C888889"] = "0.0166666675359" +floats["0x3F4CCCCD"] = "0.8" +floats["0x3FFFDF3B"] = "1.99899995327" +floats["0x3A031270"] = "0.000500000081956" +floats["0x3F99999A"] = "1.2" +floats["0x471C4000"] = "40000.0" +floats["0x45992000"] = "4900.0" +floats["0x461C4000"] = "10000.0" +floats["0x3E19999A"] = "0.15" +floats["0x448FC000"] = "1150.0" +floats["0x3727C5AC"] = "9.99999974738e-06" +floats["0x358637BD"] = "9.99999997475e-07" +floats["0xBF99999A"] = "-1.2" +floats["0x3F8CCCCD"] = "1.1" +floats["0x40066666"] = "2.1" +floats["0x3ECCCCCD"] = "0.4" +floats["0x44A28000"] = "1300.0" +floats["0x3CF5C28F"] = "0.03" +floats["0x43A6AAAB"] = "333.333343506" +floats["0x3BA3D70A"] = "0.005" +floats["0x3C03126F"] = "0.008" +floats["0x459C4000"] = "5000.0" +floats["0x3FAAAAA8"] = "1.33333301544" +floats["0x3FD9999A"] = "1.7" +floats["0x45DAC000"] = "7000.0" +floats["0x4016CBE4"] = "2.35619449615" +floats["0x49095440"] = "562500.0" +floats["0x45BB8000"] = "6000.0" +floats["0x3FB33333"] = "1.4" +floats["0x3C134ACB"] = "0.00899" +floats["0x458CA000"] = "4500.0" +floats["0x3FA66666"] = "1.3" +floats["0xBF4CCCCD"] = "-0.8" +floats["0xBF666666"] = "-0.9" +floats["0xBF59999A"] = "-0.85" +floats["0x3FFEB852"] = "1.99000000954" +floats["0x404CCCCD"] = "3.2" +floats["0xBB449BA6"] = "-0.003" +floats["0x3D99999A"] = "0.075" +floats["0x3D0F5C29"] = "0.035" +floats["0xBFC90FDB"] = "-1.57079637051" +floats["0xB8D1B717"] = "-9.99999974738e-05" +floats["0x3B59E83E"] = "0.003325" +floats["0x3B9BA5E3"] = "0.00475" +floats["0x3AC49BA6"] = "0.0015" +floats["0x3CA3D70B"] = "0.0200000014156" +floats["0x4316199A"] = "150.1" +floats["0x3FD5DCA8"] = "1.67079639435" +floats["0xB8C90FDB"] = "-9.58738019108e-05" +floats["0x3B6BEDFA"] = "0.0036" +floats["0x3DF5C28F"] = "0.12" +floats["0x3B30F27C"] = "0.0027" +floats["0xC3E28000"] = "-453.0" +floats["0xC4DC2000"] = "-1761.0" +floats["0x449FC000"] = "1278.0" def try_text(text_bytes): bad_bytes = 0 for byte in text_bytes: @@ -16,8 +132,8 @@ def try_text(text_bytes): bad_bytes += 1 # Arbitrary string detection heuristic - if bad_bytes / len(text_bytes) >= 0.3: - return None + #if bad_bytes / len(text_bytes) >= 0.3: + # return None try: text = text_bytes.decode("EUC-JP") @@ -29,10 +145,32 @@ def try_text(text_bytes): text = text.replace("\\x00", "") text = text.replace("\n", "\\n") text = text.replace("\"", "\\\"") - ret = "\n .asciz \"" + text + "\"\n .balign 4\n" - return ret + return text +def is_zeros(stuff): + for piece in stuff: + if piece.strip() != "0x00000000": + return False + return True + + +def try_float(word): + if (word in floats): + return floats[word] + if (word[:3] == "0x3") or (word[:3] == "0x4") or \ + (word[:3] == "0xB") or (word[:3] == "0xC"): + return struct.unpack('!f', bytes.fromhex(word[2:10]))[0] + + +def quick_convert(words_string): + words = words_string.split(",") + byte_array = b"" + for word in words: + data = word.strip()[2:] + byte_array += bytearray.fromhex(data) + return byte_array.decode("EUC-JP") + def word_convert(byte_string): try: words = byte_string.split(",") @@ -43,10 +181,18 @@ def word_convert(byte_string): except ValueError: return byte_string - if len(words) > 1: + if byte_array[0] == 63 and byte_array[-1] == 45: + return byte_string + if data == '0A0A0000': + return "\\n\\n" + if len(words) > 1 and not is_zeros(words[1:]): res = try_text(byte_array) if res is not None: - return res + return " .asciz \"" + res + "\"\n .balign 4\n" + if len(words) == 1 or is_zeros(words[1:]): + res = str(try_float(words[0].strip())) + if res is not None: + return " .float " + res + "\n" return byte_string @@ -73,18 +219,16 @@ def process_data_file(file_path): def main(): - skip_list = ['z_en_kanban.rodata.s', 'z_demo_tre_lgt.rodata.s', 'z_en_light.rodata.s'] - i = 0 - for root, dirs, files in os.walk(data_dir): + for root, dirs, files in os.walk(asm_dir): for file in files: - if i == 10: - return - if file.endswith(".rodata.s") and file not in skip_list: + #if i == 10: + # return + if file.endswith(".s"): path = os.path.join(root, file) if process_data_file(path): print("Processed " + path) i += 1 -main() +#main() diff --git a/tools/format_s_files.py b/tools/format_s_files.py new file mode 100644 index 0000000000..ecac74f43d --- /dev/null +++ b/tools/format_s_files.py @@ -0,0 +1,86 @@ +#!/usr/bin/python3 + +import os +import sys +import re +from disassemble import get_z_name + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +src_dir = root_dir + "src/overlays/" +asm_dir = root_dir + "asm/non_matchings/overlays/" + + +def remove_empty_lines_after_glabel(file_text): + file_lines = file_text.splitlines() + last_glabel = False + to_remove = [] + for i, line in enumerate(file_lines): + if "glabel" in line: + last_glabel = True + continue + if last_glabel and not line.strip(): + to_remove.append(i) + last_glabel = False + if len(to_remove) > 0: + for line_num in reversed(to_remove): + del file_lines[line_num] + file_text = "\n".join(file_lines) + return file_text + +def remove_balign_after_float(file_text): + file_lines = file_text.splitlines() + last_float = False + to_remove = [] + for i, line in enumerate(file_lines): + if ".float" in line: + last_float = True + continue + if last_float and line == " .balign 4": + to_remove.append(i) + last_float = False + if len(to_remove) > 0: + for line_num in reversed(to_remove): + del file_lines[line_num] + file_text = "\n".join(file_lines) + return file_text + + +def format_file(file_path): + with open(file_path) as f: + orig_file_text = f.read() + + file_text = orig_file_text + + # Condense 2+ empty lines to 1 + file_text = file_text.replace("\n\n\n+", "\n\n") + + # Remove empty lines after section declarations + file_text = file_text.replace(".rdata\n\n", ".rdata\n") + file_text = file_text.replace(".late_rodata\n\n", ".late_rodata\n") + file_text = file_text.replace(".text\n\n", ".text\n") + + # Remove dumb empty lines after glabel + file_text = remove_empty_lines_after_glabel(file_text) + + # Remove dumb balign 4 lines after float + file_text = remove_balign_after_float(file_text) + + # Make sure there's only one empty line at the end + file_text = file_text.rstrip("\n") + "\n" + + if file_text != orig_file_text: + with open(file_path, "w", newline="\n") as f: + f.write(file_text) + return True + return False + + +def main(): + for root, dirs, files in os.walk(asm_dir): + for f in files: + if f.endswith(".s"): + format_file(os.path.join(root, f)) + + +main() diff --git a/tools/migrate-rodata.py b/tools/migrate-rodata.py new file mode 100644 index 0000000000..ab63785e1c --- /dev/null +++ b/tools/migrate-rodata.py @@ -0,0 +1,304 @@ +""" +Given a code file name (excluding the file extension, e.g. z_view) this script +will attempt to build rodata and late_rodata sections for all of its functions. + +This supports overlays to an extent but before running it for any check to +ensure the rodata file is formatted correctly (see files in code for examples +of properly formatted rodata sections) + +This supports automatically commenting or deleting the rodata file from the +spec and automatic deletion of the rodata file itself (only use if you are sure +it will build afterwards) + +Place this in the root of your project (same folder as the makefile) and run. + +Not sure if this works well with .incbin if that can even be found in rodata +""" + +import re +import os +from os import system, listdir, remove, walk +from os.path import exists, isdir, sep + +# FUNCTIONS ----------------------------------------------------------------- + +""" +Extracts rodata symbols from asm +""" +def asm_syms(asm): + split = re.split("jtbl_|D_",asm) + return [s.partition(")")[0] for s in split[1:len(split)]] + +""" +Extracts rodata symbols from rodata +""" +def rodata_syms(rodata): + split = re.split("glabel jtbl_|glabel D_",rodata) + return [s.partition("\n")[0] for s in split[1:len(split)]] + +""" +Extracts the symbol from a single rodata block +""" +def rodata_sym(rodata_block): + return (re.split("glabel jtbl_|glabel D_",rodata_block)[1]).split("\n")[0] + +""" +Splits rodata into blocks +""" +def rodata_blocks(rodata): + split = rodata.split("glabel") + return ["glabel" + b for b in split[1:len(split)]] + +""" +Gets the block size +""" +def rodata_block_size(rodata): + split = rodata.split(" .") + elements = split[1:len(split)] + size = 0 + for e in elements: + element_type = e.split(" ")[0] + if element_type == "double": + size += 8 + if element_type == "float": + size += 4 + if element_type == "word": + size += 4 + if element_type == "incbin": + size += int(e.rpartition(", ")[2].split("\n")[0],16) + if element_type == "ascii": + size += len(e.split("\"")[1].split("\"")[0]) + if element_type == "asciz": + size += len(e.split("\"")[1].split("\"")[0]) + if element_type == "balign": + size += size % int(e.split(" ")[1]) + return size + +""" +Gets the text size +""" +def text_size(asm): + instructions = [l for l in asm.split("\n") if l.startswith("/* ")] + return 4*(len(instructions)-1) + +""" +Gets the rodata-to-text +""" +def late_rodata_ratio(asm,late_rodata_blocks): + total_rodata_size = 0 + for b in late_rodata_blocks: + total_rodata_size += rodata_block_size(b) + return total_rodata_size/text_size(asm) + +""" +Accepts a single block of rodata and extracts the type +""" +def rodata_type(rodata_block): + first_split = re.split("\s+\.", rodata_block) + return first_split[1].split(" ")[0] + +""" +Checks if a block should go in .rdata or .late_rodata +""" +def is_rodata(r): + if rodata_type(r)=="asciz" or rodata_type=="ascii": + return True + if rodata_type(r)=="incbin": + return True + return False + +""" +For given asm and rodata files, build a rodata section for the asm file +""" +def build_rodata(asm, rodata): + contained_syms = [s for s in asm_syms(asm) if s in rodata_syms(rodata)] + contained_blocks = [b for b in rodata_blocks(rodata) if rodata_sym(b) in contained_syms] + # TODO include arrays in rodata_list + rodata_list = [r for r in contained_blocks if is_rodata(r)] + return_str = "" + if (len(rodata_list)!=0): + return_str += ".rdata\n" + for r in rodata_list: + return_str += r + late_rodata_list = [r for r in contained_blocks if r not in rodata_list] + if (len(late_rodata_list)!=0): + if late_rodata_ratio(asm,late_rodata_list) > (1/3): + top_sym = rodata_sym(late_rodata_list[0]) + if top_sym.endswith("0") or top_sym.endswith("8"): + return_str += ".late_rodata\n.late_rodata_alignment 8\n" + elif top_sym.endswith("4") or top_sym.endswith("C"): + return_str += ".late_rodata\n.late_rodata_alignment 4\n" + else: + return_str += ".late_rodata\n" + for r in late_rodata_list: + return_str += r + return None if return_str=="" else return_str + ("" if return_str.endswith("\n\n") else "\n") + ".text\n" + +""" +Gets all file paths contained in a given folder, does not enter subfolders +""" +def get_file_paths(folder_path): + return next(walk(folder_path),(None,None,[]))[2] + +""" +Given a path, reads the asm .s file into a single string +""" +def file_read(path): + with open(path, 'r', encoding="utf-8") as infile: + return infile.read() + +""" +Writes the rodata section to the start of the file specified by path +""" +def rodata_write(path, section): + with open(path, 'r+', encoding="utf-8", newline="\n") as outfile: + original = outfile.read() + outfile.seek(0,0) + outfile.write(str(section) + original) + +""" +Comments out the line in spec associated with the given filenames +""" +def modify_spec(filenames, identifier, delete): + lines = "" + with open("spec", 'r+', encoding="utf-8", newline="\n") as spec: + lines = spec.read().split("\n") + changed = False + files = filenames.split(",") + for filename in files: + if identifier == "code" and " include \"build/data/" + filename + ".rodata.o\"" in lines: + e = lines.index(" include \"build/data/" + filename + ".rodata.o\"") + if delete: + del lines[e] + else: + lines[e] = " //include \"build/data/" + filename + ".rodata.o\"" + changed = True + elif " include \"build/data/overlays/" + identifier + "/z_" + filename.lower() + ".rodata.o\"" in lines: + e = lines.index(" include \"build/data/overlays/" + identifier + "/z_" + filename.lower() + ".rodata.o\"") + if delete: + del lines[e] + else: + lines[e] = " //include \"build/data/overlays/" + identifier + "/z_" + filename.lower() + ".rodata.o\"" + changed = True + if changed: + modified = "\n".join(lines) + with open("spec", 'w', encoding="utf-8", newline="\n") as spec: + #spec.seek(0,0) + spec.write(modified) + +""" +Processes each individual file + asm\non_matchings\overlays\ + data\overlays\ + asm\non_matchings\code\ + data\code\ +""" +def process_file(filename, identifier, delete_rodata): + folder_path = "asm" + sep + "non_matchings" + sep + ("code" + sep if identifier=="code" else "overlays" + sep + identifier.lower() + sep + "ovl_") + filename + sep + rodata_path = "data" + sep + (sep if identifier=="code" else "overlays" + sep + identifier.lower() + sep + "z_") + filename.lower() + ".rodata.s" + if filename == "player": + folder_path = "asm" + sep + "non_matchings" + sep + "overlays" + sep + "actors" + sep + "ovl_player_actor" + sep + print("ASM at: " + folder_path) + print("Data at: " + rodata_path) + if not exists(folder_path): + print("Aborting: ASM does not exist") + return + if not exists(rodata_path): + print("Aborting: Data does not exist") + return + files = [folder_path + f for f in get_file_paths(folder_path)] + for asm_file in files: + asm = file_read(asm_file) + print("Found asm file " + asm_file) + if ".rdata" in asm: + print("Skipping: it already has a rodata section") + continue + print("Processing asm file " + asm_file) + section = build_rodata(asm, file_read(rodata_path)) + if section is not None: + print("Writing asm file " + asm_file) + rodata_write(asm_file, section) + else: print("Skipping: no rodata to write") + print("Built rodata sections for " + identifier + " file " + filename) + if delete_rodata: + remove(rodata_path) + print("Deleted rodata at " + rodata_path) + +""" +Allows files to be provided as comma-separated filenames for batch migration +""" +def process_files(filenames, identifier, spechandle, delete_rodata): + if "," in filenames: + files = filenames.split(",") + for f in files: + process_file(f, identifier, delete_rodata) + else: + process_file(filenames, identifier, delete_rodata) + if spechandle.lower() == "delete": + modify_spec(filenames, identifier, True) + print("Deleted rodata for files in spec") + elif spechandle.lower() == "comment": + result = modify_spec(filenames, identifier, False) + if result: + print("Commented out rodata for files in spec") + +""" +Asks what to do about spec and rodata, converts 'all' to comma-separated filenames +""" +def check_spec_rodata(filenames, identifier): + spechandle = input("Delete, Comment or Leave spec? ") + delete_rodata = input("Delete rodata file(s)? (Y/N) ") + if filenames == "all" or "all|" in filenames: + to_remove_list = [] + if "all|" in filenames: + print("all| in filenames") + to_remove_list = filenames.split("|")[1] + basedir = "asm" + sep + "non_matchings" + sep + ("code" if identifier=="code" else "overlays" + sep + identifier.lower()) + sep + folder_names = [name.replace("ovl_","") for name in listdir(basedir) if isdir(basedir + name) and name not in to_remove_list] + filenames = ",".join(map(str, folder_names)) + print(filenames) + process_files(filenames, identifier, spechandle, delete_rodata == "Y") + +""" +Main execution +""" +def run(show_help): + if(show_help): + print("""Usage: Enter 'Code' or 'Overlay' and follow the instructions. +Batch migrate files by entering comma-separated filenames instead of a single filename. +Migrate all files by entering 'all' for filenames. Exclude files from all with all| followed by comma-separated filenames Use at your own risk. +Enter 'q' to the code or overlay question to quit.""") + code_or_overlay = input("Code or Overlay? ") + if(code_or_overlay == "q"): + return + if(code_or_overlay == "Code"): + filename = input("Enter the code file name(s) (excluding .c) or all: ") + check_spec_rodata(filename, "code") + elif(code_or_overlay == "Overlay"): + overlay_type = input("Actor, Effect or Gamestate? ") + if(overlay_type == "Actor"): + filename = input("Enter the actor name(s) (excluding ovl_ or z_, ex. obj_bombiwa) or all: ") + check_spec_rodata(filename, "actors") + elif(overlay_type == "Effect"): + filename = input("Enter the effect name(s) (excluding ovl_ or z_, ex. effect_ss_bomb) or all: ") + check_spec_rodata(filename, "effects") + elif(overlay_type == "Gamestate"): + filename = input("Enter the gamestate name(s) (excluding ovl_ or z_, ex. kaleido_scope) or all: ") + check_spec_rodata(filename, "gamestates") + run(True) + +# PROGRAM ------------------------------------------------------------------- + +#run(False) +#bigs = ["Boss_Ganon", "Boss_Ganondrof","En_Wf", "Door_Warp1",] +ovls = ["En_Elf"] + +for i, ovl in enumerate(ovls): + if i == 10: + break + process_files(ovl, "actors", "Delete", True) + command = "echo >> src/overlays/actors/ovl_" + ovls[i] + "/z_" + ovls[i].lower() + ".c" + if ovls[0] == "player": + command = "echo >> src/overlays/actors/ovl_player_actor/z_player.c" + os.system(command) # purpose of this is to "modify" each C file in order to prevent undefined symbol errors. + # the new line will be removed by format.sh \ No newline at end of file