From 4682deae990086677d01b65679d3bcac8aff0244 Mon Sep 17 00:00:00 2001 From: Trueffeloot Date: Sat, 22 Jul 2023 03:46:09 +0200 Subject: [PATCH] d_menu_skill basically OK --- Progress.md | 18 +- .../d_menu_skill/__dt__13dMenu_Skill_cFv.s | 210 --- .../d_menu_skill/__sinit_d_menu_skill_cpp.s | 54 - .../d_menu_skill/_close__13dMenu_Skill_cFv.s | 82 -- .../d_menu_skill/_create__13dMenu_Skill_cFv.s | 58 - .../d_menu_skill/_draw__13dMenu_Skill_cFv.s | 108 -- .../d_menu_skill/_move__13dMenu_Skill_cFv.s | 40 - .../d_menu_skill/_open__13dMenu_Skill_cFv.s | 126 -- .../changeActiveColor__13dMenu_Skill_cFv.s | 139 -- .../getSkillNum__13dMenu_Skill_cFv.s | 39 - .../d_menu_skill/init__13dMenu_Skill_cFv.s | 22 - .../d_menu_skill/isSync__13dMenu_Skill_cFv.s | 12 - .../read_close_init__13dMenu_Skill_cFv.s | 22 - .../read_close_move__13dMenu_Skill_cFv.s | 74 - .../read_move_init__13dMenu_Skill_cFv.s | 16 - .../read_move_move__13dMenu_Skill_cFv.s | 53 - .../read_open_init__13dMenu_Skill_cFv.s | 54 - .../read_open_move__13dMenu_Skill_cFv.s | 74 - .../screenSetDoIcon__13dMenu_Skill_cFv.s | 99 -- .../screenSetLetter__13dMenu_Skill_cFv.s | 201 --- .../screenSetMenu__13dMenu_Skill_cFv.s | 433 ------ .../setAButtonString__13dMenu_Skill_cFUs.s | 49 - .../setBButtonString__13dMenu_Skill_cFUs.s | 49 - .../setCursorPos__13dMenu_Skill_cFv.s | 36 - .../d_menu_skill/setHIO__13dMenu_Skill_cFb.s | 334 ----- .../setNameString__13dMenu_Skill_cFUs.s | 49 - .../setPageText__13dMenu_Skill_cFv.s | 74 - .../skill_init_calc__13dMenu_Skill_cFv.s | 34 - .../wait_init__13dMenu_Skill_cFv.s | 16 - .../wait_move__13dMenu_Skill_cFv.s | 106 -- .../Execute__20dalv4CandleDemoTag_cFv.s | 18 - .../__ct__24dalv4CandleDemoTag_HIO_cFv.s | 10 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__24dalv4CandleDemoTag_HIO_cFv.s | 26 - ...alv4CandleDemoTag_Create__FP10fopAc_ac_c.s | 9 - ...DemoTag_Delete__FP20dalv4CandleDemoTag_c.s | 9 - ...leDemoTag_Draw__FP20dalv4CandleDemoTag_c.s | 9 - ...emoTag_Execute__FP20dalv4CandleDemoTag_c.s | 9 - .../eventStart__20dalv4CandleDemoTag_cFv.s | 10 - .../init_modeEnd__20dalv4CandleDemoTag_cFv.s | 4 - ...odeEnemyCreate__20dalv4CandleDemoTag_cFv.s | 47 - .../init_modeNG__20dalv4CandleDemoTag_cFv.s | 4 - ...init_modeWatch__20dalv4CandleDemoTag_cFv.s | 8 - .../modeEnd__20dalv4CandleDemoTag_cFv.s | 15 - ...odeEnemyCreate__20dalv4CandleDemoTag_cFv.s | 19 - .../modeNG__20dalv4CandleDemoTag_cFv.s | 31 - .../modeWatch__20dalv4CandleDemoTag_cFv.s | 71 - ...hShutterAct__20dalv4CandleDemoTag_cFPvPv.s | 23 - .../setBaseMtx__20dalv4CandleDemoTag_cFv.s | 15 - .../d_a_obj_lv4Gate/Delete__11daLv4Gate_cFv.s | 13 - .../d_a_obj_lv4Gate/Draw__11daLv4Gate_cFv.s | 42 - .../Execute__11daLv4Gate_cFPPA3_A4_f.s | 21 - .../__ct__15daLv4Gate_HIO_cFv.s | 13 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__15daLv4Gate_HIO_cFv.s | 26 - .../__sinit_d_a_obj_lv4Gate_cpp.s | 16 - .../d_a_obj_lv4Gate/create__11daLv4Gate_cFv.s | 100 -- .../daLv4Gate_Create__FP10fopAc_ac_c.s | 9 - .../daLv4Gate_Delete__FP11daLv4Gate_c.s | 9 - .../daLv4Gate_Draw__FP11daLv4Gate_c.s | 12 - .../daLv4Gate_Execute__FP11daLv4Gate_c.s | 9 - .../init_modeMoveEnd__11daLv4Gate_cFv.s | 74 - .../init_modeMove__11daLv4Gate_cFv.s | 4 - .../init_modeWait__11daLv4Gate_cFv.s | 4 - .../modeMove__11daLv4Gate_cFv.s | 68 - .../modeWait__11daLv4Gate_cFv.s | 25 - .../moveGate__11daLv4Gate_cFv.s | 43 - .../setBaseMtx__11daLv4Gate_cFv.s | 40 - .../Delete__13daLv4PoGate_cFv.s | 13 - .../Draw__13daLv4PoGate_cFv.s | 42 - .../Execute__13daLv4PoGate_cFPPA3_A4_f.s | 21 - .../__ct__17daLv4PoGate_HIO_cFv.s | 29 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__17daLv4PoGate_HIO_cFv.s | 26 - .../__sinit_d_a_obj_lv4PoGate_cpp.s | 16 - .../create__13daLv4PoGate_cFv.s | 83 -- .../daLv4PoGate_Create__FP10fopAc_ac_c.s | 9 - .../daLv4PoGate_Delete__FP13daLv4PoGate_c.s | 9 - .../daLv4PoGate_Draw__FP13daLv4PoGate_c.s | 12 - .../daLv4PoGate_Execute__FP13daLv4PoGate_c.s | 9 - ...it_modeMoveClose2Wait__13daLv4PoGate_cFv.s | 8 - .../init_modeMoveClose2__13daLv4PoGate_cFv.s | 4 - .../init_modeMoveClose3__13daLv4PoGate_cFv.s | 8 - ...nit_modeMoveCloseWait__13daLv4PoGate_cFv.s | 8 - .../init_modeMoveClose__13daLv4PoGate_cFv.s | 45 - .../init_modeMoveOpen__13daLv4PoGate_cFv.s | 45 - .../init_modeWait__13daLv4PoGate_cFv.s | 4 - .../modeMoveClose2Wait__13daLv4PoGate_cFv.s | 17 - .../modeMoveClose2__13daLv4PoGate_cFv.s | 27 - .../modeMoveClose3__13daLv4PoGate_cFv.s | 36 - .../modeMoveCloseWait__13daLv4PoGate_cFv.s | 17 - .../modeMoveClose__13daLv4PoGate_cFv.s | 29 - .../modeMoveOpen__13daLv4PoGate_cFv.s | 46 - .../moveGate__13daLv4PoGate_cFv.s | 93 -- .../setBaseMtx__13daLv4PoGate_cFv.s | 40 - .../setEffect__13daLv4PoGate_cFi.s | 54 - .../setSe__13daLv4PoGate_cFv.s | 24 - include/d/menu/d_menu_skill.h | 83 +- src/d/menu/d_menu_skill.cpp | 1238 ++++++++--------- 99 files changed, 644 insertions(+), 5057 deletions(-) delete mode 100644 asm/d/menu/d_menu_skill/__dt__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/__sinit_d_menu_skill_cpp.s delete mode 100644 asm/d/menu/d_menu_skill/_close__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/_create__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/_draw__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/_move__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/_open__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/changeActiveColor__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/getSkillNum__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/init__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/read_close_init__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/read_close_move__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/read_move_init__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/read_move_move__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/read_open_init__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/read_open_move__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/screenSetDoIcon__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/screenSetLetter__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/screenSetMenu__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/setAButtonString__13dMenu_Skill_cFUs.s delete mode 100644 asm/d/menu/d_menu_skill/setBButtonString__13dMenu_Skill_cFUs.s delete mode 100644 asm/d/menu/d_menu_skill/setCursorPos__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/setHIO__13dMenu_Skill_cFb.s delete mode 100644 asm/d/menu/d_menu_skill/setNameString__13dMenu_Skill_cFUs.s delete mode 100644 asm/d/menu/d_menu_skill/setPageText__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/skill_init_calc__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/wait_init__13dMenu_Skill_cFv.s delete mode 100644 asm/d/menu/d_menu_skill/wait_move__13dMenu_Skill_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/Execute__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__ct__24dalv4CandleDemoTag_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__24dalv4CandleDemoTag_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/eventStart__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnd__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnemyCreate__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeNG__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeWatch__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnd__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnemyCreate__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeNG__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeWatch__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/searchShutterAct__20dalv4CandleDemoTag_cFPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/setBaseMtx__20dalv4CandleDemoTag_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Delete__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Draw__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Execute__11daLv4Gate_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__ct__15daLv4Gate_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__15daLv4Gate_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__sinit_d_a_obj_lv4Gate_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/create__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Delete__FP11daLv4Gate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Draw__FP11daLv4Gate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Execute__FP11daLv4Gate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMoveEnd__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMove__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeWait__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeMove__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeWait__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/moveGate__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/setBaseMtx__11daLv4Gate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Delete__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Draw__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Execute__13daLv4PoGate_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__ct__17daLv4PoGate_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__17daLv4PoGate_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__sinit_d_a_obj_lv4PoGate_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/create__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Delete__FP13daLv4PoGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Draw__FP13daLv4PoGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Execute__FP13daLv4PoGate_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2Wait__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose3__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveCloseWait__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveOpen__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeWait__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2Wait__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose3__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveCloseWait__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveOpen__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/moveGate__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setBaseMtx__13daLv4PoGate_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setEffect__13daLv4PoGate_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setSe__13daLv4PoGate_cFv.s diff --git a/Progress.md b/Progress.md index 8d4693b78a1..4ecd33b0aae 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 29.253861% | 1052128 | 3596544 +.text | 29.535576% | 1062260 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 36.711873% | 1476064 | 4020672 +Total | 36.963871% | 1486196 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 36.711873% | 1476064 | 4020672 -RELs | 33.883741% | 3896740 | 11500324 -Total | 34.616361% | 5372804 | 15520996 +main.dol | 36.963871% | 1486196 | 4020672 +RELs | 33.938592% | 3903048 | 11500324 +Total | 34.722282% | 5389244 | 15520996 ## RELs @@ -490,12 +490,12 @@ d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672 d_a_obj_lv3WaterB | 46.278317% | 1716 | 3708 d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 d_a_obj_lv3waterEff | 100.000000% | 1704 | 1704 -d_a_obj_lv4CandleDemoTag | 46.972860% | 1800 | 3832 +d_a_obj_lv4CandleDemoTag | 80.688935% | 3092 | 3832 d_a_obj_lv4CandleTag | 50.114416% | 1752 | 3496 d_a_obj_lv4EdShutter | 45.846154% | 2384 | 5200 -d_a_obj_lv4Gate | 48.863636% | 2064 | 4224 +d_a_obj_lv4Gate | 97.443182% | 4116 | 4224 d_a_obj_lv4HsTarget | 100.000000% | 2448 | 2448 -d_a_obj_lv4PoGate | 44.906743% | 2504 | 5576 +d_a_obj_lv4PoGate | 98.063128% | 5468 | 5576 d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208 d_a_obj_lv4bridge | 47.146866% | 2016 | 4276 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.883741% | 3896740 | 11500324 +Total | 33.938592% | 3903048 | 11500324 diff --git a/asm/d/menu/d_menu_skill/__dt__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/__dt__13dMenu_Skill_cFv.s deleted file mode 100644 index e44962327ef..00000000000 --- a/asm/d/menu/d_menu_skill/__dt__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,210 +0,0 @@ -lbl_801F7348: -/* 801F7348 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F734C 7C 08 02 A6 */ mflr r0 -/* 801F7350 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F7354 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7358 48 16 AE 79 */ bl _savegpr_26 -/* 801F735C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801F7360 7C 9F 23 78 */ mr r31, r4 -/* 801F7364 41 82 02 BC */ beq lbl_801F7620 -/* 801F7368 3C 60 80 3C */ lis r3, __vt__13dMenu_Skill_c@ha /* 0x803BE8C0@ha */ -/* 801F736C 38 03 E8 C0 */ addi r0, r3, __vt__13dMenu_Skill_c@l /* 0x803BE8C0@l */ -/* 801F7370 90 1E 00 00 */ stw r0, 0(r30) -/* 801F7374 80 7E 01 98 */ lwz r3, 0x198(r30) -/* 801F7378 28 03 00 00 */ cmplwi r3, 0 -/* 801F737C 41 82 00 18 */ beq lbl_801F7394 -/* 801F7380 38 80 00 01 */ li r4, 1 -/* 801F7384 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7388 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801F738C 7D 89 03 A6 */ mtctr r12 -/* 801F7390 4E 80 04 21 */ bctrl -lbl_801F7394: -/* 801F7394 38 00 00 00 */ li r0, 0 -/* 801F7398 90 1E 01 98 */ stw r0, 0x198(r30) -/* 801F739C 80 7E 01 9C */ lwz r3, 0x19c(r30) -/* 801F73A0 38 80 00 01 */ li r4, 1 -/* 801F73A4 48 05 29 85 */ bl __dt__12dMsgString_cFv -/* 801F73A8 38 00 00 00 */ li r0, 0 -/* 801F73AC 90 1E 01 9C */ stw r0, 0x19c(r30) -/* 801F73B0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801F73B4 28 03 00 00 */ cmplwi r3, 0 -/* 801F73B8 41 82 00 18 */ beq lbl_801F73D0 -/* 801F73BC 38 80 00 01 */ li r4, 1 -/* 801F73C0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F73C4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F73C8 7D 89 03 A6 */ mtctr r12 -/* 801F73CC 4E 80 04 21 */ bctrl -lbl_801F73D0: -/* 801F73D0 38 00 00 00 */ li r0, 0 -/* 801F73D4 90 1E 00 18 */ stw r0, 0x18(r30) -/* 801F73D8 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801F73DC 28 03 00 00 */ cmplwi r3, 0 -/* 801F73E0 41 82 00 18 */ beq lbl_801F73F8 -/* 801F73E4 38 80 00 01 */ li r4, 1 -/* 801F73E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F73EC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F73F0 7D 89 03 A6 */ mtctr r12 -/* 801F73F4 4E 80 04 21 */ bctrl -lbl_801F73F8: -/* 801F73F8 38 00 00 00 */ li r0, 0 -/* 801F73FC 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 801F7400 80 7E 01 80 */ lwz r3, 0x180(r30) -/* 801F7404 28 03 00 00 */ cmplwi r3, 0 -/* 801F7408 41 82 00 18 */ beq lbl_801F7420 -/* 801F740C 38 80 00 01 */ li r4, 1 -/* 801F7410 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7414 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7418 7D 89 03 A6 */ mtctr r12 -/* 801F741C 4E 80 04 21 */ bctrl -lbl_801F7420: -/* 801F7420 38 00 00 00 */ li r0, 0 -/* 801F7424 90 1E 01 80 */ stw r0, 0x180(r30) -/* 801F7428 80 7E 01 84 */ lwz r3, 0x184(r30) -/* 801F742C 28 03 00 00 */ cmplwi r3, 0 -/* 801F7430 41 82 00 18 */ beq lbl_801F7448 -/* 801F7434 38 80 00 01 */ li r4, 1 -/* 801F7438 81 83 00 00 */ lwz r12, 0(r3) -/* 801F743C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7440 7D 89 03 A6 */ mtctr r12 -/* 801F7444 4E 80 04 21 */ bctrl -lbl_801F7448: -/* 801F7448 38 00 00 00 */ li r0, 0 -/* 801F744C 90 1E 01 84 */ stw r0, 0x184(r30) -/* 801F7450 80 7E 01 7C */ lwz r3, 0x17c(r30) -/* 801F7454 28 03 00 00 */ cmplwi r3, 0 -/* 801F7458 41 82 00 18 */ beq lbl_801F7470 -/* 801F745C 38 80 00 01 */ li r4, 1 -/* 801F7460 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7464 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7468 7D 89 03 A6 */ mtctr r12 -/* 801F746C 4E 80 04 21 */ bctrl -lbl_801F7470: -/* 801F7470 38 00 00 00 */ li r0, 0 -/* 801F7474 90 1E 01 7C */ stw r0, 0x17c(r30) -/* 801F7478 80 7E 01 58 */ lwz r3, 0x158(r30) -/* 801F747C 28 03 00 00 */ cmplwi r3, 0 -/* 801F7480 41 82 00 18 */ beq lbl_801F7498 -/* 801F7484 38 80 00 01 */ li r4, 1 -/* 801F7488 81 83 00 00 */ lwz r12, 0(r3) -/* 801F748C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7490 7D 89 03 A6 */ mtctr r12 -/* 801F7494 4E 80 04 21 */ bctrl -lbl_801F7498: -/* 801F7498 38 00 00 00 */ li r0, 0 -/* 801F749C 90 1E 01 58 */ stw r0, 0x158(r30) -/* 801F74A0 80 7E 01 5C */ lwz r3, 0x15c(r30) -/* 801F74A4 28 03 00 00 */ cmplwi r3, 0 -/* 801F74A8 41 82 00 18 */ beq lbl_801F74C0 -/* 801F74AC 38 80 00 01 */ li r4, 1 -/* 801F74B0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F74B4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F74B8 7D 89 03 A6 */ mtctr r12 -/* 801F74BC 4E 80 04 21 */ bctrl -lbl_801F74C0: -/* 801F74C0 3B 80 00 00 */ li r28, 0 -/* 801F74C4 93 9E 01 5C */ stw r28, 0x15c(r30) -/* 801F74C8 3B 40 00 00 */ li r26, 0 -/* 801F74CC 7F 9D E3 78 */ mr r29, r28 -lbl_801F74D0: -/* 801F74D0 3B 7D 01 60 */ addi r27, r29, 0x160 -/* 801F74D4 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 801F74D8 28 03 00 00 */ cmplwi r3, 0 -/* 801F74DC 41 82 00 18 */ beq lbl_801F74F4 -/* 801F74E0 38 80 00 01 */ li r4, 1 -/* 801F74E4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F74E8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F74EC 7D 89 03 A6 */ mtctr r12 -/* 801F74F0 4E 80 04 21 */ bctrl -lbl_801F74F4: -/* 801F74F4 7F 9E D9 2E */ stwx r28, r30, r27 -/* 801F74F8 3B 5A 00 01 */ addi r26, r26, 1 -/* 801F74FC 2C 1A 00 07 */ cmpwi r26, 7 -/* 801F7500 3B BD 00 04 */ addi r29, r29, 4 -/* 801F7504 41 80 FF CC */ blt lbl_801F74D0 -/* 801F7508 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 801F750C 28 03 00 00 */ cmplwi r3, 0 -/* 801F7510 41 82 00 18 */ beq lbl_801F7528 -/* 801F7514 38 80 00 01 */ li r4, 1 -/* 801F7518 81 83 00 00 */ lwz r12, 0(r3) -/* 801F751C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7520 7D 89 03 A6 */ mtctr r12 -/* 801F7524 4E 80 04 21 */ bctrl -lbl_801F7528: -/* 801F7528 38 00 00 00 */ li r0, 0 -/* 801F752C 90 1E 00 20 */ stw r0, 0x20(r30) -/* 801F7530 3B 40 00 00 */ li r26, 0 -/* 801F7534 3B A0 00 00 */ li r29, 0 -lbl_801F7538: -/* 801F7538 7F 7E EA 14 */ add r27, r30, r29 -/* 801F753C 80 7B 01 88 */ lwz r3, 0x188(r27) -/* 801F7540 28 03 00 00 */ cmplwi r3, 0 -/* 801F7544 41 82 00 24 */ beq lbl_801F7568 -/* 801F7548 41 82 00 18 */ beq lbl_801F7560 -/* 801F754C 38 80 00 01 */ li r4, 1 -/* 801F7550 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7554 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7558 7D 89 03 A6 */ mtctr r12 -/* 801F755C 4E 80 04 21 */ bctrl -lbl_801F7560: -/* 801F7560 38 00 00 00 */ li r0, 0 -/* 801F7564 90 1B 01 88 */ stw r0, 0x188(r27) -lbl_801F7568: -/* 801F7568 80 7B 01 90 */ lwz r3, 0x190(r27) -/* 801F756C 28 03 00 00 */ cmplwi r3, 0 -/* 801F7570 41 82 00 24 */ beq lbl_801F7594 -/* 801F7574 41 82 00 18 */ beq lbl_801F758C -/* 801F7578 38 80 00 01 */ li r4, 1 -/* 801F757C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7580 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7584 7D 89 03 A6 */ mtctr r12 -/* 801F7588 4E 80 04 21 */ bctrl -lbl_801F758C: -/* 801F758C 38 00 00 00 */ li r0, 0 -/* 801F7590 90 1B 01 90 */ stw r0, 0x190(r27) -lbl_801F7594: -/* 801F7594 3B 5A 00 01 */ addi r26, r26, 1 -/* 801F7598 2C 1A 00 02 */ cmpwi r26, 2 -/* 801F759C 3B BD 00 04 */ addi r29, r29, 4 -/* 801F75A0 41 80 FF 98 */ blt lbl_801F7538 -/* 801F75A4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801F75A8 28 03 00 00 */ cmplwi r3, 0 -/* 801F75AC 41 82 00 40 */ beq lbl_801F75EC -/* 801F75B0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801F75B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F75B8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801F75BC 7D 89 03 A6 */ mtctr r12 -/* 801F75C0 4E 80 04 21 */ bctrl -/* 801F75C4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801F75C8 28 03 00 00 */ cmplwi r3, 0 -/* 801F75CC 41 82 00 18 */ beq lbl_801F75E4 -/* 801F75D0 38 80 00 01 */ li r4, 1 -/* 801F75D4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801F75D8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F75DC 7D 89 03 A6 */ mtctr r12 -/* 801F75E0 4E 80 04 21 */ bctrl -lbl_801F75E4: -/* 801F75E4 38 00 00 00 */ li r0, 0 -/* 801F75E8 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_801F75EC: -/* 801F75EC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801F75F0 28 03 00 00 */ cmplwi r3, 0 -/* 801F75F4 41 82 00 1C */ beq lbl_801F7610 -/* 801F75F8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F75FC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801F7600 7D 89 03 A6 */ mtctr r12 -/* 801F7604 4E 80 04 21 */ bctrl -/* 801F7608 38 00 00 00 */ li r0, 0 -/* 801F760C 90 1E 00 08 */ stw r0, 8(r30) -lbl_801F7610: -/* 801F7610 7F E0 07 35 */ extsh. r0, r31 -/* 801F7614 40 81 00 0C */ ble lbl_801F7620 -/* 801F7618 7F C3 F3 78 */ mr r3, r30 -/* 801F761C 48 0D 77 21 */ bl __dl__FPv -lbl_801F7620: -/* 801F7620 7F C3 F3 78 */ mr r3, r30 -/* 801F7624 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7628 48 16 AB F5 */ bl _restgpr_26 -/* 801F762C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F7630 7C 08 03 A6 */ mtlr r0 -/* 801F7634 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F7638 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/__sinit_d_menu_skill_cpp.s b/asm/d/menu/d_menu_skill/__sinit_d_menu_skill_cpp.s deleted file mode 100644 index 7e963927c75..00000000000 --- a/asm/d/menu/d_menu_skill/__sinit_d_menu_skill_cpp.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801F9A28: -/* 801F9A28 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BE7D8@ha */ -/* 801F9A2C 38 A3 E7 D8 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x803BE7D8@l */ -/* 801F9A30 80 65 00 0C */ lwz r3, 0xc(r5) -/* 801F9A34 80 05 00 10 */ lwz r0, 0x10(r5) -/* 801F9A38 90 65 00 3C */ stw r3, 0x3c(r5) -/* 801F9A3C 90 05 00 40 */ stw r0, 0x40(r5) -/* 801F9A40 80 05 00 14 */ lwz r0, 0x14(r5) -/* 801F9A44 90 05 00 44 */ stw r0, 0x44(r5) -/* 801F9A48 38 85 00 3C */ addi r4, r5, 0x3c -/* 801F9A4C 80 65 00 18 */ lwz r3, 0x18(r5) -/* 801F9A50 80 05 00 1C */ lwz r0, 0x1c(r5) -/* 801F9A54 90 64 00 0C */ stw r3, 0xc(r4) -/* 801F9A58 90 04 00 10 */ stw r0, 0x10(r4) -/* 801F9A5C 80 05 00 20 */ lwz r0, 0x20(r5) -/* 801F9A60 90 04 00 14 */ stw r0, 0x14(r4) -/* 801F9A64 80 65 00 24 */ lwz r3, 0x24(r5) -/* 801F9A68 80 05 00 28 */ lwz r0, 0x28(r5) -/* 801F9A6C 90 64 00 18 */ stw r3, 0x18(r4) -/* 801F9A70 90 04 00 1C */ stw r0, 0x1c(r4) -/* 801F9A74 80 05 00 2C */ lwz r0, 0x2c(r5) -/* 801F9A78 90 04 00 20 */ stw r0, 0x20(r4) -/* 801F9A7C 80 65 00 30 */ lwz r3, 0x30(r5) -/* 801F9A80 80 05 00 34 */ lwz r0, 0x34(r5) -/* 801F9A84 90 64 00 24 */ stw r3, 0x24(r4) -/* 801F9A88 90 04 00 28 */ stw r0, 0x28(r4) -/* 801F9A8C 80 05 00 38 */ lwz r0, 0x38(r5) -/* 801F9A90 90 04 00 2C */ stw r0, 0x2c(r4) -/* 801F9A94 80 65 00 6C */ lwz r3, 0x6c(r5) -/* 801F9A98 80 05 00 70 */ lwz r0, 0x70(r5) -/* 801F9A9C 90 65 00 9C */ stw r3, 0x9c(r5) -/* 801F9AA0 90 05 00 A0 */ stw r0, 0xa0(r5) -/* 801F9AA4 80 05 00 74 */ lwz r0, 0x74(r5) -/* 801F9AA8 90 05 00 A4 */ stw r0, 0xa4(r5) -/* 801F9AAC 38 85 00 9C */ addi r4, r5, 0x9c -/* 801F9AB0 80 65 00 78 */ lwz r3, 0x78(r5) -/* 801F9AB4 80 05 00 7C */ lwz r0, 0x7c(r5) -/* 801F9AB8 90 64 00 0C */ stw r3, 0xc(r4) -/* 801F9ABC 90 04 00 10 */ stw r0, 0x10(r4) -/* 801F9AC0 80 05 00 80 */ lwz r0, 0x80(r5) -/* 801F9AC4 90 04 00 14 */ stw r0, 0x14(r4) -/* 801F9AC8 80 65 00 84 */ lwz r3, 0x84(r5) -/* 801F9ACC 80 05 00 88 */ lwz r0, 0x88(r5) -/* 801F9AD0 90 64 00 18 */ stw r3, 0x18(r4) -/* 801F9AD4 90 04 00 1C */ stw r0, 0x1c(r4) -/* 801F9AD8 80 05 00 8C */ lwz r0, 0x8c(r5) -/* 801F9ADC 90 04 00 20 */ stw r0, 0x20(r4) -/* 801F9AE0 80 65 00 90 */ lwz r3, 0x90(r5) -/* 801F9AE4 80 05 00 94 */ lwz r0, 0x94(r5) -/* 801F9AE8 90 64 00 24 */ stw r3, 0x24(r4) -/* 801F9AEC 90 04 00 28 */ stw r0, 0x28(r4) -/* 801F9AF0 80 05 00 98 */ lwz r0, 0x98(r5) -/* 801F9AF4 90 04 00 2C */ stw r0, 0x2c(r4) -/* 801F9AF8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/_close__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/_close__13dMenu_Skill_cFv.s deleted file mode 100644 index 3e1fa600558..00000000000 --- a/asm/d/menu/d_menu_skill/_close__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_801F7C1C: -/* 801F7C1C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801F7C20 7C 08 02 A6 */ mflr r0 -/* 801F7C24 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F7C28 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 801F7C2C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 801F7C30 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801F7C34 7C 7F 1B 78 */ mr r31, r3 -/* 801F7C38 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F7C3C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F7C40 A8 A3 0A 68 */ lha r5, 0xa68(r3) -/* 801F7C44 38 60 00 00 */ li r3, 0 -/* 801F7C48 B0 7F 02 00 */ sth r3, 0x200(r31) -/* 801F7C4C A8 9F 02 00 */ lha r4, 0x200(r31) -/* 801F7C50 7C 80 07 35 */ extsh. r0, r4 -/* 801F7C54 41 81 00 64 */ bgt lbl_801F7CB8 -/* 801F7C58 B0 7F 02 00 */ sth r3, 0x200(r31) -/* 801F7C5C 98 7F 02 04 */ stb r3, 0x204(r31) -/* 801F7C60 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7C64 80 63 00 04 */ lwz r3, 4(r3) -/* 801F7C68 C0 02 AA 88 */ lfs f0, lit_3808(r2) -/* 801F7C6C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F7C70 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F7C74 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7C78 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F7C7C 7D 89 03 A6 */ mtctr r12 -/* 801F7C80 4E 80 04 21 */ bctrl -/* 801F7C84 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7C88 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F7C8C 48 05 DB 45 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F7C90 7F E3 FB 78 */ mr r3, r31 -/* 801F7C94 48 00 12 09 */ bl setCursorPos__13dMenu_Skill_cFv -/* 801F7C98 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7C9C C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F7CA0 4B F9 D6 01 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 801F7CA4 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7CA8 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F7CAC 4B F9 D5 1D */ bl setScale__16dSelect_cursor_cFf -/* 801F7CB0 38 60 00 01 */ li r3, 1 -/* 801F7CB4 48 00 00 88 */ b lbl_801F7D3C -lbl_801F7CB8: -/* 801F7CB8 C8 42 AA B0 */ lfd f2, lit_4016(r2) -/* 801F7CBC 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801F7CC0 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F7CC4 3C 60 43 30 */ lis r3, 0x4330 -/* 801F7CC8 90 61 00 08 */ stw r3, 8(r1) -/* 801F7CCC C8 01 00 08 */ lfd f0, 8(r1) -/* 801F7CD0 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801F7CD4 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 801F7CD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F7CDC 90 61 00 10 */ stw r3, 0x10(r1) -/* 801F7CE0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801F7CE4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801F7CE8 EF E1 00 24 */ fdivs f31, f1, f0 -/* 801F7CEC 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7CF0 80 63 00 04 */ lwz r3, 4(r3) -/* 801F7CF4 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 801F7CF8 D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 801F7CFC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7D00 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F7D04 7D 89 03 A6 */ mtctr r12 -/* 801F7D08 4E 80 04 21 */ bctrl -/* 801F7D0C 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7D10 FC 20 F8 90 */ fmr f1, f31 -/* 801F7D14 48 05 DA BD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F7D18 7F E3 FB 78 */ mr r3, r31 -/* 801F7D1C 48 00 11 81 */ bl setCursorPos__13dMenu_Skill_cFv -/* 801F7D20 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7D24 FC 20 F8 90 */ fmr f1, f31 -/* 801F7D28 4B F9 D5 79 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 801F7D2C 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7D30 FC 20 F8 90 */ fmr f1, f31 -/* 801F7D34 4B F9 D4 95 */ bl setScale__16dSelect_cursor_cFf -/* 801F7D38 38 60 00 00 */ li r3, 0 -lbl_801F7D3C: -/* 801F7D3C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 801F7D40 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 801F7D44 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801F7D48 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801F7D4C 7C 08 03 A6 */ mtlr r0 -/* 801F7D50 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F7D54 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/_create__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/_create__13dMenu_Skill_cFv.s deleted file mode 100644 index 6ab73a2519f..00000000000 --- a/asm/d/menu/d_menu_skill/_create__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_801F763C: -/* 801F763C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F7640 7C 08 02 A6 */ mflr r0 -/* 801F7644 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F7648 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F764C 7C 7F 1B 78 */ mr r31, r3 -/* 801F7650 38 60 00 B8 */ li r3, 0xb8 -/* 801F7654 48 0D 75 F9 */ bl __nw__FUl -/* 801F7658 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F765C 41 82 00 18 */ beq lbl_801F7674 -/* 801F7660 38 80 00 02 */ li r4, 2 -/* 801F7664 C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7668 38 A0 00 00 */ li r5, 0 -/* 801F766C 4B F9 CB B5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive -/* 801F7670 7C 60 1B 78 */ mr r0, r3 -lbl_801F7674: -/* 801F7674 90 1F 01 98 */ stw r0, 0x198(r31) -/* 801F7678 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F767C C0 22 AA 90 */ lfs f1, lit_3904(r2) -/* 801F7680 C0 42 AA 94 */ lfs f2, lit_3905(r2) -/* 801F7684 C0 62 AA 98 */ lfs f3, lit_3906(r2) -/* 801F7688 C0 82 AA 9C */ lfs f4, lit_3907(r2) -/* 801F768C FC A0 20 90 */ fmr f5, f4 -/* 801F7690 4B F9 DB 21 */ bl setParam__16dSelect_cursor_cFfffff -/* 801F7694 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7698 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F769C 4B F9 DC 05 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 801F76A0 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F76A4 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F76A8 4B F9 DB 21 */ bl setScale__16dSelect_cursor_cFf -/* 801F76AC 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F76B0 88 03 00 B4 */ lbz r0, 0xb4(r3) -/* 801F76B4 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 801F76B8 98 03 00 B4 */ stb r0, 0xb4(r3) -/* 801F76BC 38 60 00 2C */ li r3, 0x2c -/* 801F76C0 48 0D 75 8D */ bl __nw__FUl -/* 801F76C4 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F76C8 41 82 00 0C */ beq lbl_801F76D4 -/* 801F76CC 48 05 25 55 */ bl __ct__12dMsgString_cFv -/* 801F76D0 7C 60 1B 78 */ mr r0, r3 -lbl_801F76D4: -/* 801F76D4 90 1F 01 9C */ stw r0, 0x19c(r31) -/* 801F76D8 7F E3 FB 78 */ mr r3, r31 -/* 801F76DC 48 00 0C AD */ bl screenSetMenu__13dMenu_Skill_cFv -/* 801F76E0 7F E3 FB 78 */ mr r3, r31 -/* 801F76E4 48 00 13 35 */ bl screenSetLetter__13dMenu_Skill_cFv -/* 801F76E8 7F E3 FB 78 */ mr r3, r31 -/* 801F76EC 48 00 16 35 */ bl screenSetDoIcon__13dMenu_Skill_cFv -/* 801F76F0 7F E3 FB 78 */ mr r3, r31 -/* 801F76F4 38 80 00 01 */ li r4, 1 -/* 801F76F8 48 00 1E 09 */ bl setHIO__13dMenu_Skill_cFb -/* 801F76FC 7F E3 FB 78 */ mr r3, r31 -/* 801F7700 48 00 02 ED */ bl init__13dMenu_Skill_cFv -/* 801F7704 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F7708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F770C 7C 08 03 A6 */ mtlr r0 -/* 801F7710 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F7714 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/_draw__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/_draw__13dMenu_Skill_cFv.s deleted file mode 100644 index 53b50274c5a..00000000000 --- a/asm/d/menu/d_menu_skill/_draw__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_801F77B0: -/* 801F77B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F77B4 7C 08 02 A6 */ mflr r0 -/* 801F77B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F77BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F77C0 48 16 AA 1D */ bl _savegpr_29 -/* 801F77C4 7C 7D 1B 78 */ mr r29, r3 -/* 801F77C8 80 03 00 08 */ lwz r0, 8(r3) -/* 801F77CC 28 00 00 00 */ cmplwi r0, 0 -/* 801F77D0 41 82 01 68 */ beq lbl_801F7938 -/* 801F77D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F77D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F77DC 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 801F77E0 80 7D 01 58 */ lwz r3, 0x158(r29) -/* 801F77E4 8B C3 00 B2 */ lbz r30, 0xb2(r3) -/* 801F77E8 38 80 00 FF */ li r4, 0xff -/* 801F77EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F77F0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F77F4 7D 89 03 A6 */ mtctr r12 -/* 801F77F8 4E 80 04 21 */ bctrl -/* 801F77FC 80 7D 01 58 */ lwz r3, 0x158(r29) -/* 801F7800 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F7804 FC 40 08 90 */ fmr f2, f1 -/* 801F7808 C0 62 AA A0 */ lfs f3, lit_3944(r2) -/* 801F780C C0 82 AA A4 */ lfs f4, lit_3945(r2) -/* 801F7810 38 80 00 00 */ li r4, 0 -/* 801F7814 38 A0 00 00 */ li r5, 0 -/* 801F7818 38 C0 00 00 */ li r6, 0 -/* 801F781C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7820 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801F7824 7D 89 03 A6 */ mtctr r12 -/* 801F7828 4E 80 04 21 */ bctrl -/* 801F782C 80 7D 01 58 */ lwz r3, 0x158(r29) -/* 801F7830 7F C4 F3 78 */ mr r4, r30 -/* 801F7834 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7838 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F783C 7D 89 03 A6 */ mtctr r12 -/* 801F7840 4E 80 04 21 */ bctrl -/* 801F7844 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 801F7848 C0 3D 01 F0 */ lfs f1, 0x1f0(r29) -/* 801F784C C0 42 AA 88 */ lfs f2, lit_3808(r2) -/* 801F7850 7F E4 FB 78 */ mr r4, r31 -/* 801F7854 48 10 16 81 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801F7858 80 7D 01 98 */ lwz r3, 0x198(r29) -/* 801F785C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7860 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7864 7D 89 03 A6 */ mtctr r12 -/* 801F7868 4E 80 04 21 */ bctrl -/* 801F786C 88 1D 02 05 */ lbz r0, 0x205(r29) -/* 801F7870 28 00 00 01 */ cmplwi r0, 1 -/* 801F7874 41 82 00 14 */ beq lbl_801F7888 -/* 801F7878 28 00 00 02 */ cmplwi r0, 2 -/* 801F787C 41 82 00 0C */ beq lbl_801F7888 -/* 801F7880 28 00 00 03 */ cmplwi r0, 3 -/* 801F7884 40 82 00 A0 */ bne lbl_801F7924 -lbl_801F7888: -/* 801F7888 80 7D 01 58 */ lwz r3, 0x158(r29) -/* 801F788C C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F7890 FC 40 08 90 */ fmr f2, f1 -/* 801F7894 C0 62 AA A0 */ lfs f3, lit_3944(r2) -/* 801F7898 C0 82 AA A4 */ lfs f4, lit_3945(r2) -/* 801F789C 38 80 00 00 */ li r4, 0 -/* 801F78A0 38 A0 00 00 */ li r5, 0 -/* 801F78A4 38 C0 00 00 */ li r6, 0 -/* 801F78A8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F78AC 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801F78B0 7D 89 03 A6 */ mtctr r12 -/* 801F78B4 4E 80 04 21 */ bctrl -/* 801F78B8 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 801F78BC C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F78C0 FC 40 08 90 */ fmr f2, f1 -/* 801F78C4 7F E4 FB 78 */ mr r4, r31 -/* 801F78C8 48 10 16 0D */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801F78CC 80 9D 01 FC */ lwz r4, 0x1fc(r29) -/* 801F78D0 28 04 00 00 */ cmplwi r4, 0 -/* 801F78D4 41 82 00 50 */ beq lbl_801F7924 -/* 801F78D8 80 7D 01 80 */ lwz r3, 0x180(r29) -/* 801F78DC 80 A3 00 04 */ lwz r5, 4(r3) -/* 801F78E0 80 7D 01 9C */ lwz r3, 0x19c(r29) -/* 801F78E4 38 C0 00 00 */ li r6, 0 -/* 801F78E8 38 E0 00 00 */ li r7, 0 -/* 801F78EC 39 00 00 00 */ li r8, 0 -/* 801F78F0 39 20 00 00 */ li r9, 0 -/* 801F78F4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F78F8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F78FC 7D 89 03 A6 */ mtctr r12 -/* 801F7900 4E 80 04 21 */ bctrl -/* 801F7904 80 7D 01 80 */ lwz r3, 0x180(r29) -/* 801F7908 80 83 00 04 */ lwz r4, 4(r3) -/* 801F790C 80 7D 01 9C */ lwz r3, 0x19c(r29) -/* 801F7910 C0 22 AA A8 */ lfs f1, lit_3946(r2) -/* 801F7914 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7918 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801F791C 7D 89 03 A6 */ mtctr r12 -/* 801F7920 4E 80 04 21 */ bctrl -lbl_801F7924: -/* 801F7924 80 7D 00 20 */ lwz r3, 0x20(r29) -/* 801F7928 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F792C FC 40 08 90 */ fmr f2, f1 -/* 801F7930 7F E4 FB 78 */ mr r4, r31 -/* 801F7934 48 10 15 A1 */ bl draw__9J2DScreenFffPC14J2DGrafContext -lbl_801F7938: -/* 801F7938 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F793C 48 16 A8 ED */ bl _restgpr_29 -/* 801F7940 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F7944 7C 08 03 A6 */ mtlr r0 -/* 801F7948 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F794C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/_move__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/_move__13dMenu_Skill_cFv.s deleted file mode 100644 index d12ceadb114..00000000000 --- a/asm/d/menu/d_menu_skill/_move__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801F7718: -/* 801F7718 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F771C 7C 08 02 A6 */ mflr r0 -/* 801F7720 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F7724 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7728 48 16 AA B5 */ bl _savegpr_29 -/* 801F772C 7C 7D 1B 78 */ mr r29, r3 -/* 801F7730 80 63 00 04 */ lwz r3, 4(r3) -/* 801F7734 4B E1 7A 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801F7738 7C 7E 1B 78 */ mr r30, r3 -/* 801F773C 8B FD 02 05 */ lbz r31, 0x205(r29) -/* 801F7740 7F A3 EB 78 */ mr r3, r29 -/* 801F7744 1C BF 00 0C */ mulli r5, r31, 0xc -/* 801F7748 3C 80 80 3C */ lis r4, map_move_process@ha /* 0x803BE874@ha */ -/* 801F774C 38 04 E8 74 */ addi r0, r4, map_move_process@l /* 0x803BE874@l */ -/* 801F7750 7D 80 2A 14 */ add r12, r0, r5 -/* 801F7754 48 16 A9 31 */ bl __ptmf_scall -/* 801F7758 60 00 00 00 */ nop -/* 801F775C 88 1D 02 05 */ lbz r0, 0x205(r29) -/* 801F7760 7C 1F 00 40 */ cmplw r31, r0 -/* 801F7764 41 82 00 20 */ beq lbl_801F7784 -/* 801F7768 7F A3 EB 78 */ mr r3, r29 -/* 801F776C 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801F7770 3C 80 80 3C */ lis r4, map_init_process@ha /* 0x803BE814@ha */ -/* 801F7774 38 04 E8 14 */ addi r0, r4, map_init_process@l /* 0x803BE814@l */ -/* 801F7778 7D 80 2A 14 */ add r12, r0, r5 -/* 801F777C 48 16 A9 09 */ bl __ptmf_scall -/* 801F7780 60 00 00 00 */ nop -lbl_801F7784: -/* 801F7784 7F A3 EB 78 */ mr r3, r29 -/* 801F7788 38 80 00 00 */ li r4, 0 -/* 801F778C 48 00 1D 75 */ bl setHIO__13dMenu_Skill_cFb -/* 801F7790 7F C3 F3 78 */ mr r3, r30 -/* 801F7794 4B E1 7A 39 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801F7798 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F779C 48 16 AA 8D */ bl _restgpr_29 -/* 801F77A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F77A4 7C 08 03 A6 */ mtlr r0 -/* 801F77A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F77AC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/_open__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/_open__13dMenu_Skill_cFv.s deleted file mode 100644 index 75158ea5d52..00000000000 --- a/asm/d/menu/d_menu_skill/_open__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_801F7A40: -/* 801F7A40 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801F7A44 7C 08 02 A6 */ mflr r0 -/* 801F7A48 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F7A4C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 801F7A50 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 801F7A54 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801F7A58 7C 7F 1B 78 */ mr r31, r3 -/* 801F7A5C 80 03 00 14 */ lwz r0, 0x14(r3) -/* 801F7A60 28 00 00 00 */ cmplwi r0, 0 -/* 801F7A64 40 82 00 1C */ bne lbl_801F7A80 -/* 801F7A68 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F7A6C 38 63 7D B8 */ addi r3, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F7A70 38 80 00 00 */ li r4, 0 -/* 801F7A74 38 A0 00 00 */ li r5, 0 -/* 801F7A78 4B E1 E3 9D */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap -/* 801F7A7C 90 7F 00 14 */ stw r3, 0x14(r31) -lbl_801F7A80: -/* 801F7A80 80 7F 00 08 */ lwz r3, 8(r31) -/* 801F7A84 28 03 00 00 */ cmplwi r3, 0 -/* 801F7A88 40 82 00 60 */ bne lbl_801F7AE8 -/* 801F7A8C 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 801F7A90 88 04 00 0C */ lbz r0, 0xc(r4) -/* 801F7A94 2C 00 00 00 */ cmpwi r0, 0 -/* 801F7A98 41 82 00 48 */ beq lbl_801F7AE0 -/* 801F7A9C 28 03 00 00 */ cmplwi r3, 0 -/* 801F7AA0 40 82 00 48 */ bne lbl_801F7AE8 -/* 801F7AA4 80 04 00 1C */ lwz r0, 0x1c(r4) -/* 801F7AA8 90 1F 00 08 */ stw r0, 8(r31) -/* 801F7AAC 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801F7AB0 28 03 00 00 */ cmplwi r3, 0 -/* 801F7AB4 41 82 00 18 */ beq lbl_801F7ACC -/* 801F7AB8 38 80 00 01 */ li r4, 1 -/* 801F7ABC 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801F7AC0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7AC4 7D 89 03 A6 */ mtctr r12 -/* 801F7AC8 4E 80 04 21 */ bctrl -lbl_801F7ACC: -/* 801F7ACC 38 00 00 00 */ li r0, 0 -/* 801F7AD0 90 1F 00 14 */ stw r0, 0x14(r31) -/* 801F7AD4 7F E3 FB 78 */ mr r3, r31 -/* 801F7AD8 4B FF FB 65 */ bl _create__13dMenu_Skill_cFv -/* 801F7ADC 48 00 00 0C */ b lbl_801F7AE8 -lbl_801F7AE0: -/* 801F7AE0 38 60 00 00 */ li r3, 0 -/* 801F7AE4 48 00 01 1C */ b lbl_801F7C00 -lbl_801F7AE8: -/* 801F7AE8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F7AEC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F7AF0 A8 83 0A 64 */ lha r4, 0xa64(r3) -/* 801F7AF4 A8 63 0A 68 */ lha r3, 0xa68(r3) -/* 801F7AF8 B0 9F 02 00 */ sth r4, 0x200(r31) -/* 801F7AFC A8 1F 02 00 */ lha r0, 0x200(r31) -/* 801F7B00 7C 00 20 00 */ cmpw r0, r4 -/* 801F7B04 41 80 00 78 */ blt lbl_801F7B7C -/* 801F7B08 B0 7F 02 00 */ sth r3, 0x200(r31) -/* 801F7B0C 38 00 00 02 */ li r0, 2 -/* 801F7B10 98 1F 02 04 */ stb r0, 0x204(r31) -/* 801F7B14 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7B18 80 63 00 04 */ lwz r3, 4(r3) -/* 801F7B1C C0 02 AA 8C */ lfs f0, lit_3809(r2) -/* 801F7B20 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F7B24 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F7B28 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7B2C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F7B30 7D 89 03 A6 */ mtctr r12 -/* 801F7B34 4E 80 04 21 */ bctrl -/* 801F7B38 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7B3C C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7B40 48 05 DC 91 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F7B44 7F E3 FB 78 */ mr r3, r31 -/* 801F7B48 48 00 13 55 */ bl setCursorPos__13dMenu_Skill_cFv -/* 801F7B4C 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7B50 C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7B54 4B F9 D7 4D */ bl setAlphaRate__16dSelect_cursor_cFf -/* 801F7B58 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7B5C C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7B60 4B F9 D6 69 */ bl setScale__16dSelect_cursor_cFf -/* 801F7B64 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7B68 88 03 00 B4 */ lbz r0, 0xb4(r3) -/* 801F7B6C 60 00 00 01 */ ori r0, r0, 1 -/* 801F7B70 98 03 00 B4 */ stb r0, 0xb4(r3) -/* 801F7B74 38 60 00 01 */ li r3, 1 -/* 801F7B78 48 00 00 88 */ b lbl_801F7C00 -lbl_801F7B7C: -/* 801F7B7C C8 42 AA B0 */ lfd f2, lit_4016(r2) -/* 801F7B80 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801F7B84 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F7B88 3C 60 43 30 */ lis r3, 0x4330 -/* 801F7B8C 90 61 00 08 */ stw r3, 8(r1) -/* 801F7B90 C8 01 00 08 */ lfd f0, 8(r1) -/* 801F7B94 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801F7B98 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801F7B9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F7BA0 90 61 00 10 */ stw r3, 0x10(r1) -/* 801F7BA4 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801F7BA8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801F7BAC EF E1 00 24 */ fdivs f31, f1, f0 -/* 801F7BB0 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7BB4 80 63 00 04 */ lwz r3, 4(r3) -/* 801F7BB8 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 801F7BBC D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 801F7BC0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7BC4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F7BC8 7D 89 03 A6 */ mtctr r12 -/* 801F7BCC 4E 80 04 21 */ bctrl -/* 801F7BD0 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F7BD4 FC 20 F8 90 */ fmr f1, f31 -/* 801F7BD8 48 05 DB F9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F7BDC 7F E3 FB 78 */ mr r3, r31 -/* 801F7BE0 48 00 12 BD */ bl setCursorPos__13dMenu_Skill_cFv -/* 801F7BE4 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7BE8 FC 20 F8 90 */ fmr f1, f31 -/* 801F7BEC 4B F9 D6 B5 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 801F7BF0 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F7BF4 FC 20 F8 90 */ fmr f1, f31 -/* 801F7BF8 4B F9 D5 D1 */ bl setScale__16dSelect_cursor_cFf -/* 801F7BFC 38 60 00 00 */ li r3, 0 -lbl_801F7C00: -/* 801F7C00 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 801F7C04 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 801F7C08 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801F7C0C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801F7C10 7C 08 03 A6 */ mtlr r0 -/* 801F7C14 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F7C18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/changeActiveColor__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/changeActiveColor__13dMenu_Skill_cFv.s deleted file mode 100644 index 6e660b9b4ab..00000000000 --- a/asm/d/menu/d_menu_skill/changeActiveColor__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,139 +0,0 @@ -lbl_801F8F28: -/* 801F8F28 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801F8F2C 7C 08 02 A6 */ mflr r0 -/* 801F8F30 90 01 00 64 */ stw r0, 0x64(r1) -/* 801F8F34 39 61 00 60 */ addi r11, r1, 0x60 -/* 801F8F38 48 16 92 9D */ bl _savegpr_27 -/* 801F8F3C 7C 7E 1B 78 */ mr r30, r3 -/* 801F8F40 4B FF FF 5D */ bl setCursorPos__13dMenu_Skill_cFv -/* 801F8F44 3B E0 00 00 */ li r31, 0 -/* 801F8F48 3B A0 00 00 */ li r29, 0 -/* 801F8F4C 3B 80 00 00 */ li r28, 0 -lbl_801F8F50: -/* 801F8F50 88 1E 02 06 */ lbz r0, 0x206(r30) -/* 801F8F54 7C 1F 00 00 */ cmpw r31, r0 -/* 801F8F58 40 82 00 E4 */ bne lbl_801F903C -/* 801F8F5C 80 1E 01 C8 */ lwz r0, 0x1c8(r30) -/* 801F8F60 90 01 00 40 */ stw r0, 0x40(r1) -/* 801F8F64 80 1E 01 A0 */ lwz r0, 0x1a0(r30) -/* 801F8F68 90 01 00 44 */ stw r0, 0x44(r1) -/* 801F8F6C 7F 7E E2 14 */ add r27, r30, r28 -/* 801F8F70 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801F8F74 38 81 00 44 */ addi r4, r1, 0x44 -/* 801F8F78 38 A1 00 40 */ addi r5, r1, 0x40 -/* 801F8F7C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8F80 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F8F84 7D 89 03 A6 */ mtctr r12 -/* 801F8F88 4E 80 04 21 */ bctrl -/* 801F8F8C 80 1E 01 D4 */ lwz r0, 0x1d4(r30) -/* 801F8F90 90 01 00 38 */ stw r0, 0x38(r1) -/* 801F8F94 80 1E 01 AC */ lwz r0, 0x1ac(r30) -/* 801F8F98 90 01 00 3C */ stw r0, 0x3c(r1) -/* 801F8F9C 80 7B 00 B4 */ lwz r3, 0xb4(r27) -/* 801F8FA0 38 81 00 3C */ addi r4, r1, 0x3c -/* 801F8FA4 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801F8FA8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8FAC 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 801F8FB0 7D 89 03 A6 */ mtctr r12 -/* 801F8FB4 4E 80 04 21 */ bctrl -/* 801F8FB8 80 1E 01 D4 */ lwz r0, 0x1d4(r30) -/* 801F8FBC 90 01 00 30 */ stw r0, 0x30(r1) -/* 801F8FC0 80 1E 01 AC */ lwz r0, 0x1ac(r30) -/* 801F8FC4 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F8FC8 80 7B 00 BC */ lwz r3, 0xbc(r27) -/* 801F8FCC 38 81 00 34 */ addi r4, r1, 0x34 -/* 801F8FD0 38 A1 00 30 */ addi r5, r1, 0x30 -/* 801F8FD4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8FD8 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 801F8FDC 7D 89 03 A6 */ mtctr r12 -/* 801F8FE0 4E 80 04 21 */ bctrl -/* 801F8FE4 C0 1E 01 F4 */ lfs f0, 0x1f4(r30) -/* 801F8FE8 7F 7E EA 14 */ add r27, r30, r29 -/* 801F8FEC 80 7B 01 60 */ lwz r3, 0x160(r27) -/* 801F8FF0 80 63 00 04 */ lwz r3, 4(r3) -/* 801F8FF4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F8FF8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F8FFC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9000 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F9004 7D 89 03 A6 */ mtctr r12 -/* 801F9008 4E 80 04 21 */ bctrl -/* 801F900C 80 1E 01 D8 */ lwz r0, 0x1d8(r30) -/* 801F9010 90 01 00 28 */ stw r0, 0x28(r1) -/* 801F9014 80 1E 01 B0 */ lwz r0, 0x1b0(r30) -/* 801F9018 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801F901C 80 7B 00 94 */ lwz r3, 0x94(r27) -/* 801F9020 38 81 00 2C */ addi r4, r1, 0x2c -/* 801F9024 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801F9028 81 83 00 00 */ lwz r12, 0(r3) -/* 801F902C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F9030 7D 89 03 A6 */ mtctr r12 -/* 801F9034 4E 80 04 21 */ bctrl -/* 801F9038 48 00 00 E0 */ b lbl_801F9118 -lbl_801F903C: -/* 801F903C 80 1E 01 DC */ lwz r0, 0x1dc(r30) -/* 801F9040 90 01 00 20 */ stw r0, 0x20(r1) -/* 801F9044 80 1E 01 B4 */ lwz r0, 0x1b4(r30) -/* 801F9048 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F904C 7F 7E E2 14 */ add r27, r30, r28 -/* 801F9050 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801F9054 38 81 00 24 */ addi r4, r1, 0x24 -/* 801F9058 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801F905C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9060 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F9064 7D 89 03 A6 */ mtctr r12 -/* 801F9068 4E 80 04 21 */ bctrl -/* 801F906C 80 1E 01 E8 */ lwz r0, 0x1e8(r30) -/* 801F9070 90 01 00 18 */ stw r0, 0x18(r1) -/* 801F9074 80 1E 01 C0 */ lwz r0, 0x1c0(r30) -/* 801F9078 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F907C 80 7B 00 B4 */ lwz r3, 0xb4(r27) -/* 801F9080 38 81 00 1C */ addi r4, r1, 0x1c -/* 801F9084 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801F9088 81 83 00 00 */ lwz r12, 0(r3) -/* 801F908C 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 801F9090 7D 89 03 A6 */ mtctr r12 -/* 801F9094 4E 80 04 21 */ bctrl -/* 801F9098 80 1E 01 E8 */ lwz r0, 0x1e8(r30) -/* 801F909C 90 01 00 10 */ stw r0, 0x10(r1) -/* 801F90A0 80 1E 01 C0 */ lwz r0, 0x1c0(r30) -/* 801F90A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F90A8 80 7B 00 BC */ lwz r3, 0xbc(r27) -/* 801F90AC 38 81 00 14 */ addi r4, r1, 0x14 -/* 801F90B0 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801F90B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F90B8 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 801F90BC 7D 89 03 A6 */ mtctr r12 -/* 801F90C0 4E 80 04 21 */ bctrl -/* 801F90C4 C0 1E 01 F8 */ lfs f0, 0x1f8(r30) -/* 801F90C8 7F 7E EA 14 */ add r27, r30, r29 -/* 801F90CC 80 7B 01 60 */ lwz r3, 0x160(r27) -/* 801F90D0 80 63 00 04 */ lwz r3, 4(r3) -/* 801F90D4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F90D8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F90DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F90E0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F90E4 7D 89 03 A6 */ mtctr r12 -/* 801F90E8 4E 80 04 21 */ bctrl -/* 801F90EC 80 1E 01 EC */ lwz r0, 0x1ec(r30) -/* 801F90F0 90 01 00 08 */ stw r0, 8(r1) -/* 801F90F4 80 1E 01 C4 */ lwz r0, 0x1c4(r30) -/* 801F90F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F90FC 80 7B 00 94 */ lwz r3, 0x94(r27) -/* 801F9100 38 81 00 0C */ addi r4, r1, 0xc -/* 801F9104 38 A1 00 08 */ addi r5, r1, 8 -/* 801F9108 81 83 00 00 */ lwz r12, 0(r3) -/* 801F910C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F9110 7D 89 03 A6 */ mtctr r12 -/* 801F9114 4E 80 04 21 */ bctrl -lbl_801F9118: -/* 801F9118 3B FF 00 01 */ addi r31, r31, 1 -/* 801F911C 2C 1F 00 07 */ cmpwi r31, 7 -/* 801F9120 3B BD 00 04 */ addi r29, r29, 4 -/* 801F9124 3B 9C 00 10 */ addi r28, r28, 0x10 -/* 801F9128 41 80 FE 28 */ blt lbl_801F8F50 -/* 801F912C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801F9130 48 16 90 F1 */ bl _restgpr_27 -/* 801F9134 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801F9138 7C 08 03 A6 */ mtlr r0 -/* 801F913C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801F9140 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/getSkillNum__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/getSkillNum__13dMenu_Skill_cFv.s deleted file mode 100644 index 5d12e94c153..00000000000 --- a/asm/d/menu/d_menu_skill/getSkillNum__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801F9470: -/* 801F9470 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F9474 7C 08 02 A6 */ mflr r0 -/* 801F9478 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F947C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F9480 48 16 8D 51 */ bl _savegpr_26 -/* 801F9484 3B 60 00 00 */ li r27, 0 -/* 801F9488 3B 40 00 00 */ li r26, 0 -/* 801F948C 3B E0 00 00 */ li r31, 0 -/* 801F9490 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F9494 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F9498 3B 83 07 F0 */ addi r28, r3, 0x7f0 -/* 801F949C 3C 60 80 3C */ lis r3, evt_id@ha /* 0x803BE8A4@ha */ -/* 801F94A0 3B A3 E8 A4 */ addi r29, r3, evt_id@l /* 0x803BE8A4@l */ -/* 801F94A4 3C 60 80 3A */ lis r3, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801F94A8 3B C3 72 88 */ addi r30, r3, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -lbl_801F94AC: -/* 801F94AC 7F 83 E3 78 */ mr r3, r28 -/* 801F94B0 7C 1D F8 2E */ lwzx r0, r29, r31 -/* 801F94B4 54 00 08 3C */ slwi r0, r0, 1 -/* 801F94B8 7C 9E 02 2E */ lhzx r4, r30, r0 -/* 801F94BC 4B E3 B5 01 */ bl isEventBit__11dSv_event_cCFUs -/* 801F94C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801F94C4 41 82 00 10 */ beq lbl_801F94D4 -/* 801F94C8 57 63 06 3E */ clrlwi r3, r27, 0x18 -/* 801F94CC 38 03 00 01 */ addi r0, r3, 1 -/* 801F94D0 54 1B 06 3E */ clrlwi r27, r0, 0x18 -lbl_801F94D4: -/* 801F94D4 3B 5A 00 01 */ addi r26, r26, 1 -/* 801F94D8 2C 1A 00 07 */ cmpwi r26, 7 -/* 801F94DC 3B FF 00 04 */ addi r31, r31, 4 -/* 801F94E0 41 80 FF CC */ blt lbl_801F94AC -/* 801F94E4 7F 63 DB 78 */ mr r3, r27 -/* 801F94E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F94EC 48 16 8D 31 */ bl _restgpr_26 -/* 801F94F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F94F4 7C 08 03 A6 */ mtlr r0 -/* 801F94F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F94FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/init__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/init__13dMenu_Skill_cFv.s deleted file mode 100644 index 31301035232..00000000000 --- a/asm/d/menu/d_menu_skill/init__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801F79EC: -/* 801F79EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F79F0 7C 08 02 A6 */ mflr r0 -/* 801F79F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F79F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F79FC 7C 7F 1B 78 */ mr r31, r3 -/* 801F7A00 48 00 17 45 */ bl setPageText__13dMenu_Skill_cFv -/* 801F7A04 7F E3 FB 78 */ mr r3, r31 -/* 801F7A08 48 00 15 21 */ bl changeActiveColor__13dMenu_Skill_cFv -/* 801F7A0C 7F E3 FB 78 */ mr r3, r31 -/* 801F7A10 88 1F 02 05 */ lbz r0, 0x205(r31) -/* 801F7A14 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801F7A18 3C 80 80 3C */ lis r4, map_init_process@ha /* 0x803BE814@ha */ -/* 801F7A1C 38 04 E8 14 */ addi r0, r4, map_init_process@l /* 0x803BE814@l */ -/* 801F7A20 7D 80 2A 14 */ add r12, r0, r5 -/* 801F7A24 48 16 A6 61 */ bl __ptmf_scall -/* 801F7A28 60 00 00 00 */ nop -/* 801F7A2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F7A30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F7A34 7C 08 03 A6 */ mtlr r0 -/* 801F7A38 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F7A3C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s deleted file mode 100644 index aebe2dc16a9..00000000000 --- a/asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801F7950: -/* 801F7950 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801F7954 28 03 00 00 */ cmplwi r3, 0 -/* 801F7958 41 82 00 18 */ beq lbl_801F7970 -/* 801F795C 88 03 00 0C */ lbz r0, 0xc(r3) -/* 801F7960 2C 00 00 00 */ cmpwi r0, 0 -/* 801F7964 40 82 00 0C */ bne lbl_801F7970 -/* 801F7968 38 60 00 00 */ li r3, 0 -/* 801F796C 4E 80 00 20 */ blr -lbl_801F7970: -/* 801F7970 38 60 00 01 */ li r3, 1 -/* 801F7974 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/read_close_init__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/read_close_init__13dMenu_Skill_cFv.s deleted file mode 100644 index 84d38755e4b..00000000000 --- a/asm/d/menu/d_menu_skill/read_close_init__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801F8218: -/* 801F8218 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F821C 7C 08 02 A6 */ mflr r0 -/* 801F8220 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F8224 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F8228 7C 7F 1B 78 */ mr r31, r3 -/* 801F822C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F8230 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F8234 A8 04 0A 6A */ lha r0, 0xa6a(r4) -/* 801F8238 B0 03 02 02 */ sth r0, 0x202(r3) -/* 801F823C 38 00 00 00 */ li r0, 0 -/* 801F8240 90 03 01 FC */ stw r0, 0x1fc(r3) -/* 801F8244 38 80 00 00 */ li r4, 0 -/* 801F8248 48 00 10 19 */ bl setAButtonString__13dMenu_Skill_cFUs -/* 801F824C 7F E3 FB 78 */ mr r3, r31 -/* 801F8250 38 80 00 00 */ li r4, 0 -/* 801F8254 48 00 10 BD */ bl setBButtonString__13dMenu_Skill_cFUs -/* 801F8258 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F825C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F8260 7C 08 03 A6 */ mtlr r0 -/* 801F8264 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F8268 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/read_close_move__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/read_close_move__13dMenu_Skill_cFv.s deleted file mode 100644 index 08a86a51577..00000000000 --- a/asm/d/menu/d_menu_skill/read_close_move__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_801F826C: -/* 801F826C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801F8270 7C 08 02 A6 */ mflr r0 -/* 801F8274 90 01 00 44 */ stw r0, 0x44(r1) -/* 801F8278 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801F827C F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801F8280 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801F8284 7C 7F 1B 78 */ mr r31, r3 -/* 801F8288 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F828C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F8290 A8 83 0A 6A */ lha r4, 0xa6a(r3) -/* 801F8294 A8 7F 02 02 */ lha r3, 0x202(r31) -/* 801F8298 38 03 FF FF */ addi r0, r3, -1 -/* 801F829C B0 1F 02 02 */ sth r0, 0x202(r31) -/* 801F82A0 A8 7F 02 02 */ lha r3, 0x202(r31) -/* 801F82A4 7C 60 07 35 */ extsh. r0, r3 -/* 801F82A8 41 81 00 3C */ bgt lbl_801F82E4 -/* 801F82AC 38 00 00 00 */ li r0, 0 -/* 801F82B0 98 1F 02 05 */ stb r0, 0x205(r31) -/* 801F82B4 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 801F82B8 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F82BC 48 05 D5 15 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F82C0 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 801F82C4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F82C8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F82CC 88 84 0A 8D */ lbz r4, 0xa8d(r4) -/* 801F82D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F82D4 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F82D8 7D 89 03 A6 */ mtctr r12 -/* 801F82DC 4E 80 04 21 */ bctrl -/* 801F82E0 48 00 00 8C */ b lbl_801F836C -lbl_801F82E4: -/* 801F82E4 C8 42 AA B0 */ lfd f2, lit_4016(r2) -/* 801F82E8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 801F82EC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F82F0 3C 60 43 30 */ lis r3, 0x4330 -/* 801F82F4 90 61 00 08 */ stw r3, 8(r1) -/* 801F82F8 C8 01 00 08 */ lfd f0, 8(r1) -/* 801F82FC EC 20 10 28 */ fsubs f1, f0, f2 -/* 801F8300 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801F8304 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F8308 90 61 00 10 */ stw r3, 0x10(r1) -/* 801F830C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801F8310 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801F8314 EF E1 00 24 */ fdivs f31, f1, f0 -/* 801F8318 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 801F831C FC 20 F8 90 */ fmr f1, f31 -/* 801F8320 48 05 D4 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F8324 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 801F8328 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F832C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F8330 88 04 0A 8D */ lbz r0, 0xa8d(r4) -/* 801F8334 C8 22 AA B8 */ lfd f1, lit_4104(r2) -/* 801F8338 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F833C 3C 00 43 30 */ lis r0, 0x4330 -/* 801F8340 90 01 00 18 */ stw r0, 0x18(r1) -/* 801F8344 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 801F8348 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801F834C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 801F8350 FC 00 00 1E */ fctiwz f0, f0 -/* 801F8354 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 801F8358 80 81 00 24 */ lwz r4, 0x24(r1) -/* 801F835C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8360 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F8364 7D 89 03 A6 */ mtctr r12 -/* 801F8368 4E 80 04 21 */ bctrl -lbl_801F836C: -/* 801F836C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801F8370 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801F8374 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801F8378 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801F837C 7C 08 03 A6 */ mtlr r0 -/* 801F8380 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F8384 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/read_move_init__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/read_move_init__13dMenu_Skill_cFv.s deleted file mode 100644 index 762e527ec42..00000000000 --- a/asm/d/menu/d_menu_skill/read_move_init__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801F8114: -/* 801F8114 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F8118 7C 08 02 A6 */ mflr r0 -/* 801F811C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F8120 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F8124 7C 7F 1B 78 */ mr r31, r3 -/* 801F8128 38 80 00 00 */ li r4, 0 -/* 801F812C 48 00 11 35 */ bl setAButtonString__13dMenu_Skill_cFUs -/* 801F8130 7F E3 FB 78 */ mr r3, r31 -/* 801F8134 38 80 03 F9 */ li r4, 0x3f9 -/* 801F8138 48 00 11 D9 */ bl setBButtonString__13dMenu_Skill_cFUs -/* 801F813C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F8140 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F8144 7C 08 03 A6 */ mtlr r0 -/* 801F8148 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F814C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/read_move_move__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/read_move_move__13dMenu_Skill_cFv.s deleted file mode 100644 index 4b695cb0cce..00000000000 --- a/asm/d/menu/d_menu_skill/read_move_move__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_801F8150: -/* 801F8150 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F8154 7C 08 02 A6 */ mflr r0 -/* 801F8158 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F815C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801F8160 7C 7F 1B 78 */ mr r31, r3 -/* 801F8164 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801F8168 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801F816C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 801F8170 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 801F8174 41 82 00 48 */ beq lbl_801F81BC -/* 801F8178 38 00 00 52 */ li r0, 0x52 -/* 801F817C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F8180 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801F8184 38 81 00 0C */ addi r4, r1, 0xc -/* 801F8188 38 A0 00 00 */ li r5, 0 -/* 801F818C 38 C0 00 00 */ li r6, 0 -/* 801F8190 38 E0 00 00 */ li r7, 0 -/* 801F8194 C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F8198 FC 40 08 90 */ fmr f2, f1 -/* 801F819C C0 62 AA A8 */ lfs f3, lit_3946(r2) -/* 801F81A0 FC 80 18 90 */ fmr f4, f3 -/* 801F81A4 39 00 00 00 */ li r8, 0 -/* 801F81A8 48 0B 37 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F81AC 48 02 68 25 */ bl dMeter2Info_set2DVibration__Fv -/* 801F81B0 38 00 00 03 */ li r0, 3 -/* 801F81B4 98 1F 02 05 */ stb r0, 0x205(r31) -/* 801F81B8 48 00 00 4C */ b lbl_801F8204 -lbl_801F81BC: -/* 801F81BC 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801F81C0 41 82 00 44 */ beq lbl_801F8204 -/* 801F81C4 38 00 00 52 */ li r0, 0x52 -/* 801F81C8 90 01 00 08 */ stw r0, 8(r1) -/* 801F81CC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801F81D0 38 81 00 08 */ addi r4, r1, 8 -/* 801F81D4 38 A0 00 00 */ li r5, 0 -/* 801F81D8 38 C0 00 00 */ li r6, 0 -/* 801F81DC 38 E0 00 00 */ li r7, 0 -/* 801F81E0 C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F81E4 FC 40 08 90 */ fmr f2, f1 -/* 801F81E8 C0 62 AA A8 */ lfs f3, lit_3946(r2) -/* 801F81EC FC 80 18 90 */ fmr f4, f3 -/* 801F81F0 39 00 00 00 */ li r8, 0 -/* 801F81F4 48 0B 37 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F81F8 48 02 67 D9 */ bl dMeter2Info_set2DVibration__Fv -/* 801F81FC 38 00 00 03 */ li r0, 3 -/* 801F8200 98 1F 02 05 */ stb r0, 0x205(r31) -lbl_801F8204: -/* 801F8204 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801F8208 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F820C 7C 08 03 A6 */ mtlr r0 -/* 801F8210 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F8214 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/read_open_init__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/read_open_init__13dMenu_Skill_cFv.s deleted file mode 100644 index f516521fd51..00000000000 --- a/asm/d/menu/d_menu_skill/read_open_init__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801F7F24: -/* 801F7F24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F7F28 7C 08 02 A6 */ mflr r0 -/* 801F7F2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F7F30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F7F34 93 C1 00 08 */ stw r30, 8(r1) -/* 801F7F38 7C 7E 1B 78 */ mr r30, r3 -/* 801F7F3C 38 00 00 00 */ li r0, 0 -/* 801F7F40 B0 03 02 02 */ sth r0, 0x202(r3) -/* 801F7F44 88 03 02 06 */ lbz r0, 0x206(r3) -/* 801F7F48 54 1F 10 3A */ slwi r31, r0, 2 -/* 801F7F4C 3C 60 80 39 */ lis r3, i_id@ha /* 0x80397A18@ha */ -/* 801F7F50 38 63 7A 18 */ addi r3, r3, i_id@l /* 0x80397A18@l */ -/* 801F7F54 7C 03 F8 2E */ lwzx r0, r3, r31 -/* 801F7F58 90 1E 01 FC */ stw r0, 0x1fc(r30) -/* 801F7F5C 80 7E 01 7C */ lwz r3, 0x17c(r30) -/* 801F7F60 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F7F64 48 05 D8 6D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F7F68 7F C3 F3 78 */ mr r3, r30 -/* 801F7F6C 3C 80 80 39 */ lis r4, i_id1_4088@ha /* 0x80397A34@ha */ -/* 801F7F70 38 84 7A 34 */ addi r4, r4, i_id1_4088@l /* 0x80397A34@l */ -/* 801F7F74 7C 04 F8 2E */ lwzx r0, r4, r31 -/* 801F7F78 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 801F7F7C 48 00 14 45 */ bl setNameString__13dMenu_Skill_cFUs -/* 801F7F80 80 7E 01 80 */ lwz r3, 0x180(r30) -/* 801F7F84 80 A3 00 04 */ lwz r5, 4(r3) -/* 801F7F88 80 7E 01 9C */ lwz r3, 0x19c(r30) -/* 801F7F8C 80 9E 01 FC */ lwz r4, 0x1fc(r30) -/* 801F7F90 38 C0 00 00 */ li r6, 0 -/* 801F7F94 38 E0 00 00 */ li r7, 0 -/* 801F7F98 39 00 00 00 */ li r8, 0 -/* 801F7F9C 39 20 00 00 */ li r9, 0 -/* 801F7FA0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7FA4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F7FA8 7D 89 03 A6 */ mtctr r12 -/* 801F7FAC 4E 80 04 21 */ bctrl -/* 801F7FB0 7F C3 F3 78 */ mr r3, r30 -/* 801F7FB4 38 80 00 00 */ li r4, 0 -/* 801F7FB8 48 00 12 A9 */ bl setAButtonString__13dMenu_Skill_cFUs -/* 801F7FBC 7F C3 F3 78 */ mr r3, r30 -/* 801F7FC0 38 80 00 00 */ li r4, 0 -/* 801F7FC4 48 00 13 4D */ bl setBButtonString__13dMenu_Skill_cFUs -/* 801F7FC8 80 7E 01 58 */ lwz r3, 0x158(r30) -/* 801F7FCC 38 80 00 00 */ li r4, 0 -/* 801F7FD0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F7FD4 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F7FD8 7D 89 03 A6 */ mtctr r12 -/* 801F7FDC 4E 80 04 21 */ bctrl -/* 801F7FE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F7FE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F7FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F7FEC 7C 08 03 A6 */ mtlr r0 -/* 801F7FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F7FF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/read_open_move__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/read_open_move__13dMenu_Skill_cFv.s deleted file mode 100644 index 027f3f07f52..00000000000 --- a/asm/d/menu/d_menu_skill/read_open_move__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_801F7FF8: -/* 801F7FF8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801F7FFC 7C 08 02 A6 */ mflr r0 -/* 801F8000 90 01 00 44 */ stw r0, 0x44(r1) -/* 801F8004 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801F8008 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801F800C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801F8010 7C 7F 1B 78 */ mr r31, r3 -/* 801F8014 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F8018 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F801C A8 83 0A 66 */ lha r4, 0xa66(r3) -/* 801F8020 A8 7F 02 02 */ lha r3, 0x202(r31) -/* 801F8024 38 03 00 01 */ addi r0, r3, 1 -/* 801F8028 B0 1F 02 02 */ sth r0, 0x202(r31) -/* 801F802C A8 1F 02 02 */ lha r0, 0x202(r31) -/* 801F8030 7C 00 20 00 */ cmpw r0, r4 -/* 801F8034 41 80 00 3C */ blt lbl_801F8070 -/* 801F8038 38 00 00 02 */ li r0, 2 -/* 801F803C 98 1F 02 05 */ stb r0, 0x205(r31) -/* 801F8040 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 801F8044 C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F8048 48 05 D7 89 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F804C 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 801F8050 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F8054 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F8058 88 84 0A 8D */ lbz r4, 0xa8d(r4) -/* 801F805C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8060 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F8064 7D 89 03 A6 */ mtctr r12 -/* 801F8068 4E 80 04 21 */ bctrl -/* 801F806C 48 00 00 8C */ b lbl_801F80F8 -lbl_801F8070: -/* 801F8070 C8 42 AA B0 */ lfd f2, lit_4016(r2) -/* 801F8074 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801F8078 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F807C 3C 60 43 30 */ lis r3, 0x4330 -/* 801F8080 90 61 00 08 */ stw r3, 8(r1) -/* 801F8084 C8 01 00 08 */ lfd f0, 8(r1) -/* 801F8088 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801F808C 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801F8090 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F8094 90 61 00 10 */ stw r3, 0x10(r1) -/* 801F8098 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801F809C EC 00 10 28 */ fsubs f0, f0, f2 -/* 801F80A0 EF E1 00 24 */ fdivs f31, f1, f0 -/* 801F80A4 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 801F80A8 FC 20 F8 90 */ fmr f1, f31 -/* 801F80AC 48 05 D7 25 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F80B0 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 801F80B4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F80B8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F80BC 88 04 0A 8D */ lbz r0, 0xa8d(r4) -/* 801F80C0 C8 22 AA B8 */ lfd f1, lit_4104(r2) -/* 801F80C4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F80C8 3C 00 43 30 */ lis r0, 0x4330 -/* 801F80CC 90 01 00 18 */ stw r0, 0x18(r1) -/* 801F80D0 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 801F80D4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801F80D8 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 801F80DC FC 00 00 1E */ fctiwz f0, f0 -/* 801F80E0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 801F80E4 80 81 00 24 */ lwz r4, 0x24(r1) -/* 801F80E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F80EC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F80F0 7D 89 03 A6 */ mtctr r12 -/* 801F80F4 4E 80 04 21 */ bctrl -lbl_801F80F8: -/* 801F80F8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801F80FC CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801F8100 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801F8104 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801F8108 7C 08 03 A6 */ mtlr r0 -/* 801F810C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F8110 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/screenSetDoIcon__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/screenSetDoIcon__13dMenu_Skill_cFv.s deleted file mode 100644 index dc30b66a884..00000000000 --- a/asm/d/menu/d_menu_skill/screenSetDoIcon__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_801F8D20: -/* 801F8D20 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801F8D24 7C 08 02 A6 */ mflr r0 -/* 801F8D28 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F8D2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F8D30 48 16 94 99 */ bl _savegpr_24 -/* 801F8D34 7C 7F 1B 78 */ mr r31, r3 -/* 801F8D38 38 60 01 18 */ li r3, 0x118 -/* 801F8D3C 48 0D 5F 11 */ bl __nw__FUl -/* 801F8D40 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F8D44 41 82 00 0C */ beq lbl_801F8D50 -/* 801F8D48 48 0F F7 51 */ bl __ct__9J2DScreenFv -/* 801F8D4C 7C 60 1B 78 */ mr r0, r3 -lbl_801F8D50: -/* 801F8D50 90 1F 00 20 */ stw r0, 0x20(r31) -/* 801F8D54 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801F8D58 3C 80 80 39 */ lis r4, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8D5C 38 84 7D B8 */ addi r4, r4, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F8D60 38 84 00 54 */ addi r4, r4, 0x54 -/* 801F8D64 3C A0 00 02 */ lis r5, 2 -/* 801F8D68 80 DF 00 08 */ lwz r6, 8(r31) -/* 801F8D6C 48 0F F8 DD */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801F8D70 38 60 00 00 */ li r3, 0 -/* 801F8D74 7C 65 1B 78 */ mr r5, r3 -/* 801F8D78 7C 64 1B 78 */ mr r4, r3 -/* 801F8D7C 38 00 00 02 */ li r0, 2 -/* 801F8D80 7C 09 03 A6 */ mtctr r0 -lbl_801F8D84: -/* 801F8D84 7C DF 1A 14 */ add r6, r31, r3 -/* 801F8D88 90 A6 01 88 */ stw r5, 0x188(r6) -/* 801F8D8C 90 86 01 90 */ stw r4, 0x190(r6) -/* 801F8D90 38 63 00 04 */ addi r3, r3, 4 -/* 801F8D94 42 00 FF F0 */ bdnz lbl_801F8D84 -/* 801F8D98 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801F8D9C 48 05 C3 4D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801F8DA0 3B 00 00 00 */ li r24, 0 -/* 801F8DA4 3B C0 00 00 */ li r30, 0 -/* 801F8DA8 3B A0 00 00 */ li r29, 0 -/* 801F8DAC 3C 60 80 39 */ lis r3, text_a_tag@ha /* 0x80397D30@ha */ -/* 801F8DB0 3B 43 7D 30 */ addi r26, r3, text_a_tag@l /* 0x80397D30@l */ -/* 801F8DB4 3C 60 80 39 */ lis r3, text_b_tag@ha /* 0x80397D58@ha */ -/* 801F8DB8 3B 63 7D 58 */ addi r27, r3, text_b_tag@l /* 0x80397D58@l */ -/* 801F8DBC 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8DC0 3B 83 7D B8 */ addi r28, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -lbl_801F8DC4: -/* 801F8DC4 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801F8DC8 7C 9A EA 14 */ add r4, r26, r29 -/* 801F8DCC 80 A4 00 00 */ lwz r5, 0(r4) -/* 801F8DD0 80 C4 00 04 */ lwz r6, 4(r4) -/* 801F8DD4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8DD8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8DDC 7D 89 03 A6 */ mtctr r12 -/* 801F8DE0 4E 80 04 21 */ bctrl -/* 801F8DE4 7F 3F F2 14 */ add r25, r31, r30 -/* 801F8DE8 90 79 01 20 */ stw r3, 0x120(r25) -/* 801F8DEC 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801F8DF0 7C 9B EA 14 */ add r4, r27, r29 -/* 801F8DF4 80 A4 00 00 */ lwz r5, 0(r4) -/* 801F8DF8 80 C4 00 04 */ lwz r6, 4(r4) -/* 801F8DFC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8E00 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8E04 7D 89 03 A6 */ mtctr r12 -/* 801F8E08 4E 80 04 21 */ bctrl -/* 801F8E0C 90 79 01 34 */ stw r3, 0x134(r25) -/* 801F8E10 4B E1 BB E1 */ bl mDoExt_getMesgFont__Fv -/* 801F8E14 7C 64 1B 78 */ mr r4, r3 -/* 801F8E18 80 79 01 20 */ lwz r3, 0x120(r25) -/* 801F8E1C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8E20 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801F8E24 7D 89 03 A6 */ mtctr r12 -/* 801F8E28 4E 80 04 21 */ bctrl -/* 801F8E2C 4B E1 BB C5 */ bl mDoExt_getMesgFont__Fv -/* 801F8E30 7C 64 1B 78 */ mr r4, r3 -/* 801F8E34 80 79 01 34 */ lwz r3, 0x134(r25) -/* 801F8E38 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8E3C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801F8E40 7D 89 03 A6 */ mtctr r12 -/* 801F8E44 4E 80 04 21 */ bctrl -/* 801F8E48 80 79 01 20 */ lwz r3, 0x120(r25) -/* 801F8E4C 38 80 00 20 */ li r4, 0x20 -/* 801F8E50 38 BC 00 2F */ addi r5, r28, 0x2f -/* 801F8E54 4C C6 31 82 */ crclr 6 -/* 801F8E58 48 10 78 F5 */ bl setString__10J2DTextBoxFsPCce -/* 801F8E5C 80 79 01 34 */ lwz r3, 0x134(r25) -/* 801F8E60 38 80 00 20 */ li r4, 0x20 -/* 801F8E64 38 BC 00 2F */ addi r5, r28, 0x2f -/* 801F8E68 4C C6 31 82 */ crclr 6 -/* 801F8E6C 48 10 78 E1 */ bl setString__10J2DTextBoxFsPCce -/* 801F8E70 3B 18 00 01 */ addi r24, r24, 1 -/* 801F8E74 2C 18 00 05 */ cmpwi r24, 5 -/* 801F8E78 3B DE 00 04 */ addi r30, r30, 4 -/* 801F8E7C 3B BD 00 08 */ addi r29, r29, 8 -/* 801F8E80 41 80 FF 44 */ blt lbl_801F8DC4 -/* 801F8E84 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F8E88 48 16 93 8D */ bl _restgpr_24 -/* 801F8E8C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801F8E90 7C 08 03 A6 */ mtlr r0 -/* 801F8E94 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F8E98 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/screenSetLetter__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/screenSetLetter__13dMenu_Skill_cFv.s deleted file mode 100644 index 5329908a3df..00000000000 --- a/asm/d/menu/d_menu_skill/screenSetLetter__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,201 +0,0 @@ -lbl_801F8A18: -/* 801F8A18 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801F8A1C 7C 08 02 A6 */ mflr r0 -/* 801F8A20 90 01 00 44 */ stw r0, 0x44(r1) -/* 801F8A24 39 61 00 40 */ addi r11, r1, 0x40 -/* 801F8A28 48 16 97 A1 */ bl _savegpr_24 -/* 801F8A2C 7C 7F 1B 78 */ mr r31, r3 -/* 801F8A30 38 60 01 18 */ li r3, 0x118 -/* 801F8A34 48 0D 62 19 */ bl __nw__FUl -/* 801F8A38 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F8A3C 41 82 00 0C */ beq lbl_801F8A48 -/* 801F8A40 48 0F FA 59 */ bl __ct__9J2DScreenFv -/* 801F8A44 7C 60 1B 78 */ mr r0, r3 -lbl_801F8A48: -/* 801F8A48 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 801F8A4C 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F8A50 3C 80 80 39 */ lis r4, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8A54 38 84 7D B8 */ addi r4, r4, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F8A58 38 84 00 30 */ addi r4, r4, 0x30 -/* 801F8A5C 3C A0 00 02 */ lis r5, 2 -/* 801F8A60 80 DF 00 08 */ lwz r6, 8(r31) -/* 801F8A64 48 0F FB E5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801F8A68 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F8A6C 48 05 C6 7D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801F8A70 38 60 00 6C */ li r3, 0x6c -/* 801F8A74 48 0D 61 D9 */ bl __nw__FUl -/* 801F8A78 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F8A7C 41 82 00 28 */ beq lbl_801F8AA4 -/* 801F8A80 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801F8A84 3C A0 34 6C */ lis r5, 0x346C /* 0x346C696E@ha */ -/* 801F8A88 38 C5 69 6E */ addi r6, r5, 0x696E /* 0x346C696E@l */ -/* 801F8A8C 3C A0 6D 67 */ lis r5, 0x6D67 /* 0x6D675F65@ha */ -/* 801F8A90 38 A5 5F 65 */ addi r5, r5, 0x5F65 /* 0x6D675F65@l */ -/* 801F8A94 38 E0 00 00 */ li r7, 0 -/* 801F8A98 39 00 00 00 */ li r8, 0 -/* 801F8A9C 48 05 AE E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801F8AA0 7C 60 1B 78 */ mr r0, r3 -lbl_801F8AA4: -/* 801F8AA4 90 1F 01 80 */ stw r0, 0x180(r31) -/* 801F8AA8 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F8AAC 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 801F8AB0 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 801F8AB4 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F33@ha */ -/* 801F8AB8 38 A4 5F 33 */ addi r5, r4, 0x5F33 /* 0x006E5F33@l */ -/* 801F8ABC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8AC0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8AC4 7D 89 03 A6 */ mtctr r12 -/* 801F8AC8 4E 80 04 21 */ bctrl -/* 801F8ACC 38 00 00 00 */ li r0, 0 -/* 801F8AD0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8AD4 38 60 00 6C */ li r3, 0x6c -/* 801F8AD8 48 0D 61 75 */ bl __nw__FUl -/* 801F8ADC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F8AE0 41 82 00 28 */ beq lbl_801F8B08 -/* 801F8AE4 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801F8AE8 3C A0 65 6C */ lis r5, 0x656C /* 0x656C5F6E@ha */ -/* 801F8AEC 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x656C5F6E@l */ -/* 801F8AF0 3C A0 00 6C */ lis r5, 0x006C /* 0x006C6162@ha */ -/* 801F8AF4 38 A5 61 62 */ addi r5, r5, 0x6162 /* 0x006C6162@l */ -/* 801F8AF8 38 E0 00 00 */ li r7, 0 -/* 801F8AFC 39 00 00 00 */ li r8, 0 -/* 801F8B00 48 05 AE 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801F8B04 7C 60 1B 78 */ mr r0, r3 -lbl_801F8B08: -/* 801F8B08 90 1F 01 84 */ stw r0, 0x184(r31) -/* 801F8B0C 80 7F 01 80 */ lwz r3, 0x180(r31) -/* 801F8B10 83 43 00 04 */ lwz r26, 4(r3) -/* 801F8B14 4B E1 BE DD */ bl mDoExt_getMesgFont__Fv -/* 801F8B18 7C 64 1B 78 */ mr r4, r3 -/* 801F8B1C 7F 43 D3 78 */ mr r3, r26 -/* 801F8B20 81 9A 00 00 */ lwz r12, 0(r26) -/* 801F8B24 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801F8B28 7D 89 03 A6 */ mtctr r12 -/* 801F8B2C 4E 80 04 21 */ bctrl -/* 801F8B30 80 7F 01 80 */ lwz r3, 0x180(r31) -/* 801F8B34 80 63 00 04 */ lwz r3, 4(r3) -/* 801F8B38 38 80 02 00 */ li r4, 0x200 -/* 801F8B3C 3C A0 80 39 */ lis r5, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8B40 38 A5 7D B8 */ addi r5, r5, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F8B44 38 A5 00 2F */ addi r5, r5, 0x2f -/* 801F8B48 4C C6 31 82 */ crclr 6 -/* 801F8B4C 48 10 7C 01 */ bl setString__10J2DTextBoxFsPCce -/* 801F8B50 3B 00 00 00 */ li r24, 0 -/* 801F8B54 3B C0 00 00 */ li r30, 0 -/* 801F8B58 3B A0 00 00 */ li r29, 0 -/* 801F8B5C 3C 60 80 39 */ lis r3, fame_tag@ha /* 0x80397D10@ha */ -/* 801F8B60 3B 43 7D 10 */ addi r26, r3, fame_tag@l /* 0x80397D10@l */ -/* 801F8B64 3C 60 80 39 */ lis r3, name_tag@ha /* 0x80397CF0@ha */ -/* 801F8B68 3B 63 7C F0 */ addi r27, r3, name_tag@l /* 0x80397CF0@l */ -/* 801F8B6C 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8B70 3B 83 7D B8 */ addi r28, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -lbl_801F8B74: -/* 801F8B74 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F8B78 7C 9A EA 14 */ add r4, r26, r29 -/* 801F8B7C 80 A4 00 00 */ lwz r5, 0(r4) -/* 801F8B80 80 C4 00 04 */ lwz r6, 4(r4) -/* 801F8B84 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8B88 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8B8C 7D 89 03 A6 */ mtctr r12 -/* 801F8B90 4E 80 04 21 */ bctrl -/* 801F8B94 3B 3E 01 48 */ addi r25, r30, 0x148 -/* 801F8B98 7C 7F C9 2E */ stwx r3, r31, r25 -/* 801F8B9C 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F8BA0 7C 9B EA 14 */ add r4, r27, r29 -/* 801F8BA4 80 A4 00 00 */ lwz r5, 0(r4) -/* 801F8BA8 80 C4 00 04 */ lwz r6, 4(r4) -/* 801F8BAC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8BB0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8BB4 7D 89 03 A6 */ mtctr r12 -/* 801F8BB8 4E 80 04 21 */ bctrl -/* 801F8BBC 38 00 00 00 */ li r0, 0 -/* 801F8BC0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8BC4 4B E1 BE 2D */ bl mDoExt_getMesgFont__Fv -/* 801F8BC8 7C 64 1B 78 */ mr r4, r3 -/* 801F8BCC 7C 7F C8 2E */ lwzx r3, r31, r25 -/* 801F8BD0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8BD4 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801F8BD8 7D 89 03 A6 */ mtctr r12 -/* 801F8BDC 4E 80 04 21 */ bctrl -/* 801F8BE0 7C 7F C8 2E */ lwzx r3, r31, r25 -/* 801F8BE4 38 80 00 40 */ li r4, 0x40 -/* 801F8BE8 38 BC 00 2F */ addi r5, r28, 0x2f -/* 801F8BEC 4C C6 31 82 */ crclr 6 -/* 801F8BF0 48 10 7B 5D */ bl setString__10J2DTextBoxFsPCce -/* 801F8BF4 3B 18 00 01 */ addi r24, r24, 1 -/* 801F8BF8 2C 18 00 04 */ cmpwi r24, 4 -/* 801F8BFC 3B DE 00 04 */ addi r30, r30, 4 -/* 801F8C00 3B BD 00 08 */ addi r29, r29, 8 -/* 801F8C04 41 80 FF 70 */ blt lbl_801F8B74 -/* 801F8C08 38 60 00 6C */ li r3, 0x6c -/* 801F8C0C 48 0D 60 41 */ bl __nw__FUl -/* 801F8C10 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F8C14 41 82 00 24 */ beq lbl_801F8C38 -/* 801F8C18 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801F8C1C 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 801F8C20 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 801F8C24 38 A0 00 6E */ li r5, 0x6e -/* 801F8C28 38 E0 00 02 */ li r7, 2 -/* 801F8C2C 39 00 00 00 */ li r8, 0 -/* 801F8C30 48 05 AD 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801F8C34 7C 60 1B 78 */ mr r0, r3 -lbl_801F8C38: -/* 801F8C38 90 1F 01 7C */ stw r0, 0x17c(r31) -/* 801F8C3C 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 801F8C40 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F8C44 48 05 CB 8D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F8C48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F8C4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F8C50 80 63 5D 30 */ lwz r3, 0x5d30(r3) -/* 801F8C54 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801F8C58 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801F8C5C 3C A0 80 39 */ lis r5, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8C60 38 A5 7D B8 */ addi r5, r5, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F8C64 38 A5 00 44 */ addi r5, r5, 0x44 -/* 801F8C68 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8C6C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801F8C70 7D 89 03 A6 */ mtctr r12 -/* 801F8C74 4E 80 04 21 */ bctrl -/* 801F8C78 7C 78 1B 78 */ mr r24, r3 -/* 801F8C7C 38 60 01 50 */ li r3, 0x150 -/* 801F8C80 48 0D 5F CD */ bl __nw__FUl -/* 801F8C84 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F8C88 41 82 00 10 */ beq lbl_801F8C98 -/* 801F8C8C 7F 04 C3 78 */ mr r4, r24 -/* 801F8C90 48 10 3A 79 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801F8C94 7C 60 1B 78 */ mr r0, r3 -lbl_801F8C98: -/* 801F8C98 90 1F 01 58 */ stw r0, 0x158(r31) -/* 801F8C9C 38 60 00 00 */ li r3, 0 -/* 801F8CA0 98 61 00 08 */ stb r3, 8(r1) -/* 801F8CA4 98 61 00 09 */ stb r3, 9(r1) -/* 801F8CA8 98 61 00 0A */ stb r3, 0xa(r1) -/* 801F8CAC 38 00 00 FF */ li r0, 0xff -/* 801F8CB0 98 01 00 0B */ stb r0, 0xb(r1) -/* 801F8CB4 80 01 00 08 */ lwz r0, 8(r1) -/* 801F8CB8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F8CBC 98 61 00 10 */ stb r3, 0x10(r1) -/* 801F8CC0 98 61 00 11 */ stb r3, 0x11(r1) -/* 801F8CC4 98 61 00 12 */ stb r3, 0x12(r1) -/* 801F8CC8 98 61 00 13 */ stb r3, 0x13(r1) -/* 801F8CCC 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801F8CD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F8CD4 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 801F8CD8 38 81 00 14 */ addi r4, r1, 0x14 -/* 801F8CDC 38 A1 00 0C */ addi r5, r1, 0xc -/* 801F8CE0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8CE4 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F8CE8 7D 89 03 A6 */ mtctr r12 -/* 801F8CEC 4E 80 04 21 */ bctrl -/* 801F8CF0 80 7F 01 58 */ lwz r3, 0x158(r31) -/* 801F8CF4 38 80 00 00 */ li r4, 0 -/* 801F8CF8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8CFC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F8D00 7D 89 03 A6 */ mtctr r12 -/* 801F8D04 4E 80 04 21 */ bctrl -/* 801F8D08 39 61 00 40 */ addi r11, r1, 0x40 -/* 801F8D0C 48 16 95 09 */ bl _restgpr_24 -/* 801F8D10 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801F8D14 7C 08 03 A6 */ mtlr r0 -/* 801F8D18 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F8D1C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/screenSetMenu__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/screenSetMenu__13dMenu_Skill_cFv.s deleted file mode 100644 index c567f0f8e8b..00000000000 --- a/asm/d/menu/d_menu_skill/screenSetMenu__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,433 +0,0 @@ -lbl_801F8388: -/* 801F8388 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 801F838C 7C 08 02 A6 */ mflr r0 -/* 801F8390 90 01 00 74 */ stw r0, 0x74(r1) -/* 801F8394 39 61 00 70 */ addi r11, r1, 0x70 -/* 801F8398 48 16 9E 09 */ bl _savegpr_14 -/* 801F839C 7C 7F 1B 78 */ mr r31, r3 -/* 801F83A0 3C 60 80 39 */ lis r3, i_id@ha /* 0x80397A18@ha */ -/* 801F83A4 3A E3 7A 18 */ addi r23, r3, i_id@l /* 0x80397A18@l */ -/* 801F83A8 38 60 01 18 */ li r3, 0x118 -/* 801F83AC 48 0D 68 A1 */ bl __nw__FUl -/* 801F83B0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F83B4 41 82 00 0C */ beq lbl_801F83C0 -/* 801F83B8 48 10 00 E1 */ bl __ct__9J2DScreenFv -/* 801F83BC 7C 60 1B 78 */ mr r0, r3 -lbl_801F83C0: -/* 801F83C0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 801F83C4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F83C8 3C 80 80 39 */ lis r4, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F83CC 38 84 7D B8 */ addi r4, r4, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F83D0 38 84 00 19 */ addi r4, r4, 0x19 -/* 801F83D4 3C A0 00 02 */ lis r5, 2 -/* 801F83D8 80 DF 00 08 */ lwz r6, 8(r31) -/* 801F83DC 48 10 02 6D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801F83E0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F83E4 48 05 CD 05 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801F83E8 38 60 00 6C */ li r3, 0x6c -/* 801F83EC 48 0D 68 61 */ bl __nw__FUl -/* 801F83F0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801F83F4 41 82 00 24 */ beq lbl_801F8418 -/* 801F83F8 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801F83FC 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 801F8400 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 801F8404 38 A0 00 6E */ li r5, 0x6e -/* 801F8408 38 E0 00 02 */ li r7, 2 -/* 801F840C 39 00 00 00 */ li r8, 0 -/* 801F8410 48 05 B5 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801F8414 7C 60 1B 78 */ mr r0, r3 -lbl_801F8418: -/* 801F8418 90 1F 01 5C */ stw r0, 0x15c(r31) -/* 801F841C 80 7F 01 5C */ lwz r3, 0x15c(r31) -/* 801F8420 C0 22 AA 88 */ lfs f1, lit_3808(r2) -/* 801F8424 48 05 D3 AD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801F8428 3A 80 00 00 */ li r20, 0 -/* 801F842C 3A 40 00 00 */ li r18, 0 -/* 801F8430 3A 20 00 00 */ li r17, 0 -/* 801F8434 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F8438 39 C3 7D B8 */ addi r14, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F843C 3B 17 01 18 */ addi r24, r23, 0x118 -/* 801F8440 3B 37 01 50 */ addi r25, r23, 0x150 -/* 801F8444 3B 57 01 88 */ addi r26, r23, 0x188 -/* 801F8448 3B 77 01 C0 */ addi r27, r23, 0x1c0 -/* 801F844C 3B 97 00 38 */ addi r28, r23, 0x38 -/* 801F8450 3B B7 00 70 */ addi r29, r23, 0x70 -/* 801F8454 3B D7 00 A8 */ addi r30, r23, 0xa8 -/* 801F8458 39 F7 00 E0 */ addi r15, r23, 0xe0 -lbl_801F845C: -/* 801F845C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F8460 7C D8 8A 14 */ add r6, r24, r17 -/* 801F8464 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F8468 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F846C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8470 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8474 7D 89 03 A6 */ mtctr r12 -/* 801F8478 4E 80 04 21 */ bctrl -/* 801F847C 7E DF 92 14 */ add r22, r31, r18 -/* 801F8480 90 76 00 B0 */ stw r3, 0xb0(r22) -/* 801F8484 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F8488 7C D9 8A 14 */ add r6, r25, r17 -/* 801F848C 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F8490 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F8494 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8498 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F849C 7D 89 03 A6 */ mtctr r12 -/* 801F84A0 4E 80 04 21 */ bctrl -/* 801F84A4 90 76 00 B4 */ stw r3, 0xb4(r22) -/* 801F84A8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F84AC 7C DA 8A 14 */ add r6, r26, r17 -/* 801F84B0 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F84B4 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F84B8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F84BC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F84C0 7D 89 03 A6 */ mtctr r12 -/* 801F84C4 4E 80 04 21 */ bctrl -/* 801F84C8 90 76 00 B8 */ stw r3, 0xb8(r22) -/* 801F84CC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F84D0 7C DB 8A 14 */ add r6, r27, r17 -/* 801F84D4 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F84D8 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F84DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F84E0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F84E4 7D 89 03 A6 */ mtctr r12 -/* 801F84E8 4E 80 04 21 */ bctrl -/* 801F84EC 90 76 00 BC */ stw r3, 0xbc(r22) -/* 801F84F0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F84F4 7C DC 8A 14 */ add r6, r28, r17 -/* 801F84F8 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F84FC 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F8500 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8504 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8508 7D 89 03 A6 */ mtctr r12 -/* 801F850C 4E 80 04 21 */ bctrl -/* 801F8510 38 00 00 00 */ li r0, 0 -/* 801F8514 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8518 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F851C 7C DD 8A 14 */ add r6, r29, r17 -/* 801F8520 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F8524 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F8528 81 83 00 00 */ lwz r12, 0(r3) -/* 801F852C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8530 7D 89 03 A6 */ mtctr r12 -/* 801F8534 4E 80 04 21 */ bctrl -/* 801F8538 38 00 00 00 */ li r0, 0 -/* 801F853C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8540 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F8544 7C DE 8A 14 */ add r6, r30, r17 -/* 801F8548 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F854C 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F8550 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8554 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8558 7D 89 03 A6 */ mtctr r12 -/* 801F855C 4E 80 04 21 */ bctrl -/* 801F8560 38 00 00 00 */ li r0, 0 -/* 801F8564 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8568 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F856C 7C CF 8A 14 */ add r6, r15, r17 -/* 801F8570 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F8574 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F8578 81 83 00 00 */ lwz r12, 0(r3) -/* 801F857C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8580 7D 89 03 A6 */ mtctr r12 -/* 801F8584 4E 80 04 21 */ bctrl -/* 801F8588 3A 00 00 00 */ li r16, 0 -/* 801F858C 9A 03 00 B0 */ stb r16, 0xb0(r3) -/* 801F8590 3A 60 00 00 */ li r19, 0 -lbl_801F8594: -/* 801F8594 4B E1 C4 5D */ bl mDoExt_getMesgFont__Fv -/* 801F8598 7C 64 1B 78 */ mr r4, r3 -/* 801F859C 3A B0 00 B0 */ addi r21, r16, 0xb0 -/* 801F85A0 7C 76 A8 2E */ lwzx r3, r22, r21 -/* 801F85A4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F85A8 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801F85AC 7D 89 03 A6 */ mtctr r12 -/* 801F85B0 4E 80 04 21 */ bctrl -/* 801F85B4 7C 76 A8 2E */ lwzx r3, r22, r21 -/* 801F85B8 38 80 00 40 */ li r4, 0x40 -/* 801F85BC 38 AE 00 2F */ addi r5, r14, 0x2f -/* 801F85C0 4C C6 31 82 */ crclr 6 -/* 801F85C4 48 10 81 89 */ bl setString__10J2DTextBoxFsPCce -/* 801F85C8 3A 73 00 01 */ addi r19, r19, 1 -/* 801F85CC 2C 13 00 04 */ cmpwi r19, 4 -/* 801F85D0 3A 10 00 04 */ addi r16, r16, 4 -/* 801F85D4 41 80 FF C0 */ blt lbl_801F8594 -/* 801F85D8 3A 94 00 01 */ addi r20, r20, 1 -/* 801F85DC 2C 14 00 07 */ cmpwi r20, 7 -/* 801F85E0 3A 52 00 10 */ addi r18, r18, 0x10 -/* 801F85E4 3A 31 00 08 */ addi r17, r17, 8 -/* 801F85E8 41 80 FE 74 */ blt lbl_801F845C -/* 801F85EC 3A 20 00 00 */ li r17, 0 -/* 801F85F0 39 C0 00 00 */ li r14, 0 -/* 801F85F4 39 E0 00 00 */ li r15, 0 -/* 801F85F8 3A 17 01 F8 */ addi r16, r23, 0x1f8 -lbl_801F85FC: -/* 801F85FC 38 60 00 6C */ li r3, 0x6c -/* 801F8600 48 0D 66 4D */ bl __nw__FUl -/* 801F8604 7C 64 1B 79 */ or. r4, r3, r3 -/* 801F8608 41 82 00 24 */ beq lbl_801F862C -/* 801F860C 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801F8610 7C D0 7A 14 */ add r6, r16, r15 -/* 801F8614 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F8618 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F861C 38 E0 00 00 */ li r7, 0 -/* 801F8620 39 00 00 00 */ li r8, 0 -/* 801F8624 48 05 B3 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801F8628 7C 64 1B 78 */ mr r4, r3 -lbl_801F862C: -/* 801F862C 38 0E 01 60 */ addi r0, r14, 0x160 -/* 801F8630 7C 9F 01 2E */ stwx r4, r31, r0 -/* 801F8634 3A 31 00 01 */ addi r17, r17, 1 -/* 801F8638 2C 11 00 07 */ cmpwi r17, 7 -/* 801F863C 39 CE 00 04 */ addi r14, r14, 4 -/* 801F8640 39 EF 00 08 */ addi r15, r15, 8 -/* 801F8644 41 80 FF B8 */ blt lbl_801F85FC -/* 801F8648 3A 20 00 00 */ li r17, 0 -/* 801F864C 3A 40 00 00 */ li r18, 0 -/* 801F8650 3A 60 00 00 */ li r19, 0 -/* 801F8654 3A 80 00 00 */ li r20, 0 -/* 801F8658 3A 17 02 30 */ addi r16, r23, 0x230 -/* 801F865C 39 F7 02 68 */ addi r15, r23, 0x268 -/* 801F8660 39 D7 01 F8 */ addi r14, r23, 0x1f8 -/* 801F8664 3A B7 02 A0 */ addi r21, r23, 0x2a0 -lbl_801F8668: -/* 801F8668 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F866C 7C D0 A2 14 */ add r6, r16, r20 -/* 801F8670 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F8674 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F8678 81 83 00 00 */ lwz r12, 0(r3) -/* 801F867C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8680 7D 89 03 A6 */ mtctr r12 -/* 801F8684 4E 80 04 21 */ bctrl -/* 801F8688 7E DF 9A 14 */ add r22, r31, r19 -/* 801F868C 90 76 00 24 */ stw r3, 0x24(r22) -/* 801F8690 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F8694 7C CF A2 14 */ add r6, r15, r20 -/* 801F8698 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F869C 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F86A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F86A4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F86A8 7D 89 03 A6 */ mtctr r12 -/* 801F86AC 4E 80 04 21 */ bctrl -/* 801F86B0 90 76 00 28 */ stw r3, 0x28(r22) -/* 801F86B4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F86B8 7C CE A2 14 */ add r6, r14, r20 -/* 801F86BC 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F86C0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F86C4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F86C8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F86CC 7D 89 03 A6 */ mtctr r12 -/* 801F86D0 4E 80 04 21 */ bctrl -/* 801F86D4 90 76 00 2C */ stw r3, 0x2c(r22) -/* 801F86D8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F86DC 7C D5 A2 14 */ add r6, r21, r20 -/* 801F86E0 80 A6 00 00 */ lwz r5, 0(r6) -/* 801F86E4 80 C6 00 04 */ lwz r6, 4(r6) -/* 801F86E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F86EC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F86F0 7D 89 03 A6 */ mtctr r12 -/* 801F86F4 4E 80 04 21 */ bctrl -/* 801F86F8 38 12 00 94 */ addi r0, r18, 0x94 -/* 801F86FC 7C 7F 01 2E */ stwx r3, r31, r0 -/* 801F8700 88 1F 02 07 */ lbz r0, 0x207(r31) -/* 801F8704 7C 11 00 00 */ cmpw r17, r0 -/* 801F8708 40 80 00 1C */ bge lbl_801F8724 -/* 801F870C 38 00 00 01 */ li r0, 1 -/* 801F8710 80 76 00 28 */ lwz r3, 0x28(r22) -/* 801F8714 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8718 80 76 00 2C */ lwz r3, 0x2c(r22) -/* 801F871C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8720 48 00 00 18 */ b lbl_801F8738 -lbl_801F8724: -/* 801F8724 38 00 00 00 */ li r0, 0 -/* 801F8728 80 76 00 28 */ lwz r3, 0x28(r22) -/* 801F872C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8730 80 76 00 2C */ lwz r3, 0x2c(r22) -/* 801F8734 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_801F8738: -/* 801F8738 3A 31 00 01 */ addi r17, r17, 1 -/* 801F873C 2C 11 00 07 */ cmpwi r17, 7 -/* 801F8740 3A 52 00 04 */ addi r18, r18, 4 -/* 801F8744 3A 73 00 10 */ addi r19, r19, 0x10 -/* 801F8748 3A 94 00 08 */ addi r20, r20, 8 -/* 801F874C 41 80 FF 1C */ blt lbl_801F8668 -/* 801F8750 39 E0 00 00 */ li r15, 0 -/* 801F8754 3A 00 00 00 */ li r16, 0 -lbl_801F8758: -/* 801F8758 2C 0F 00 00 */ cmpwi r15, 0 -/* 801F875C 40 82 00 F8 */ bne lbl_801F8854 -/* 801F8760 38 61 00 24 */ addi r3, r1, 0x24 -/* 801F8764 7D DF 82 14 */ add r14, r31, r16 -/* 801F8768 80 8E 00 24 */ lwz r4, 0x24(r14) -/* 801F876C 81 84 00 00 */ lwz r12, 0(r4) -/* 801F8770 81 8C 01 34 */ lwz r12, 0x134(r12) -/* 801F8774 7D 89 03 A6 */ mtctr r12 -/* 801F8778 4E 80 04 21 */ bctrl -/* 801F877C 88 01 00 24 */ lbz r0, 0x24(r1) -/* 801F8780 98 0E 01 B4 */ stb r0, 0x1b4(r14) -/* 801F8784 88 01 00 25 */ lbz r0, 0x25(r1) -/* 801F8788 98 0E 01 B5 */ stb r0, 0x1b5(r14) -/* 801F878C 88 01 00 26 */ lbz r0, 0x26(r1) -/* 801F8790 98 0E 01 B6 */ stb r0, 0x1b6(r14) -/* 801F8794 88 01 00 27 */ lbz r0, 0x27(r1) -/* 801F8798 98 0E 01 B7 */ stb r0, 0x1b7(r14) -/* 801F879C 38 61 00 20 */ addi r3, r1, 0x20 -/* 801F87A0 80 8E 00 24 */ lwz r4, 0x24(r14) -/* 801F87A4 81 84 00 00 */ lwz r12, 0(r4) -/* 801F87A8 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 801F87AC 7D 89 03 A6 */ mtctr r12 -/* 801F87B0 4E 80 04 21 */ bctrl -/* 801F87B4 88 01 00 20 */ lbz r0, 0x20(r1) -/* 801F87B8 98 0E 01 DC */ stb r0, 0x1dc(r14) -/* 801F87BC 88 01 00 21 */ lbz r0, 0x21(r1) -/* 801F87C0 98 0E 01 DD */ stb r0, 0x1dd(r14) -/* 801F87C4 88 01 00 22 */ lbz r0, 0x22(r1) -/* 801F87C8 98 0E 01 DE */ stb r0, 0x1de(r14) -/* 801F87CC 88 01 00 23 */ lbz r0, 0x23(r1) -/* 801F87D0 98 0E 01 DF */ stb r0, 0x1df(r14) -/* 801F87D4 38 61 00 1C */ addi r3, r1, 0x1c -/* 801F87D8 80 8E 00 34 */ lwz r4, 0x34(r14) -/* 801F87DC 81 84 00 00 */ lwz r12, 0(r4) -/* 801F87E0 81 8C 01 34 */ lwz r12, 0x134(r12) -/* 801F87E4 7D 89 03 A6 */ mtctr r12 -/* 801F87E8 4E 80 04 21 */ bctrl -/* 801F87EC 88 01 00 1C */ lbz r0, 0x1c(r1) -/* 801F87F0 98 0E 01 A0 */ stb r0, 0x1a0(r14) -/* 801F87F4 88 01 00 1D */ lbz r0, 0x1d(r1) -/* 801F87F8 98 0E 01 A1 */ stb r0, 0x1a1(r14) -/* 801F87FC 88 01 00 1E */ lbz r0, 0x1e(r1) -/* 801F8800 98 0E 01 A2 */ stb r0, 0x1a2(r14) -/* 801F8804 88 01 00 1F */ lbz r0, 0x1f(r1) -/* 801F8808 98 0E 01 A3 */ stb r0, 0x1a3(r14) -/* 801F880C 38 61 00 18 */ addi r3, r1, 0x18 -/* 801F8810 80 8E 00 34 */ lwz r4, 0x34(r14) -/* 801F8814 81 84 00 00 */ lwz r12, 0(r4) -/* 801F8818 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 801F881C 7D 89 03 A6 */ mtctr r12 -/* 801F8820 4E 80 04 21 */ bctrl -/* 801F8824 88 01 00 18 */ lbz r0, 0x18(r1) -/* 801F8828 98 0E 01 C8 */ stb r0, 0x1c8(r14) -/* 801F882C 88 01 00 19 */ lbz r0, 0x19(r1) -/* 801F8830 98 0E 01 C9 */ stb r0, 0x1c9(r14) -/* 801F8834 88 01 00 1A */ lbz r0, 0x1a(r1) -/* 801F8838 98 0E 01 CA */ stb r0, 0x1ca(r14) -/* 801F883C 88 01 00 1B */ lbz r0, 0x1b(r1) -/* 801F8840 98 0E 01 CB */ stb r0, 0x1cb(r14) -/* 801F8844 38 00 00 FF */ li r0, 0xff -/* 801F8848 98 0E 01 B7 */ stb r0, 0x1b7(r14) -/* 801F884C 98 0E 01 A3 */ stb r0, 0x1a3(r14) -/* 801F8850 48 00 00 F0 */ b lbl_801F8940 -lbl_801F8854: -/* 801F8854 2C 0F 00 03 */ cmpwi r15, 3 -/* 801F8858 40 82 00 E8 */ bne lbl_801F8940 -/* 801F885C 38 61 00 14 */ addi r3, r1, 0x14 -/* 801F8860 7D DF 82 14 */ add r14, r31, r16 -/* 801F8864 80 8E 00 B0 */ lwz r4, 0xb0(r14) -/* 801F8868 81 84 00 00 */ lwz r12, 0(r4) -/* 801F886C 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 801F8870 7D 89 03 A6 */ mtctr r12 -/* 801F8874 4E 80 04 21 */ bctrl -/* 801F8878 88 01 00 14 */ lbz r0, 0x14(r1) -/* 801F887C 98 0E 01 B4 */ stb r0, 0x1b4(r14) -/* 801F8880 88 01 00 15 */ lbz r0, 0x15(r1) -/* 801F8884 98 0E 01 B5 */ stb r0, 0x1b5(r14) -/* 801F8888 88 01 00 16 */ lbz r0, 0x16(r1) -/* 801F888C 98 0E 01 B6 */ stb r0, 0x1b6(r14) -/* 801F8890 88 01 00 17 */ lbz r0, 0x17(r1) -/* 801F8894 98 0E 01 B7 */ stb r0, 0x1b7(r14) -/* 801F8898 38 61 00 10 */ addi r3, r1, 0x10 -/* 801F889C 80 8E 00 B0 */ lwz r4, 0xb0(r14) -/* 801F88A0 81 84 00 00 */ lwz r12, 0(r4) -/* 801F88A4 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 801F88A8 7D 89 03 A6 */ mtctr r12 -/* 801F88AC 4E 80 04 21 */ bctrl -/* 801F88B0 88 01 00 10 */ lbz r0, 0x10(r1) -/* 801F88B4 98 0E 01 DC */ stb r0, 0x1dc(r14) -/* 801F88B8 88 01 00 11 */ lbz r0, 0x11(r1) -/* 801F88BC 98 0E 01 DD */ stb r0, 0x1dd(r14) -/* 801F88C0 88 01 00 12 */ lbz r0, 0x12(r1) -/* 801F88C4 98 0E 01 DE */ stb r0, 0x1de(r14) -/* 801F88C8 88 01 00 13 */ lbz r0, 0x13(r1) -/* 801F88CC 98 0E 01 DF */ stb r0, 0x1df(r14) -/* 801F88D0 38 61 00 0C */ addi r3, r1, 0xc -/* 801F88D4 80 8E 00 C0 */ lwz r4, 0xc0(r14) -/* 801F88D8 81 84 00 00 */ lwz r12, 0(r4) -/* 801F88DC 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 801F88E0 7D 89 03 A6 */ mtctr r12 -/* 801F88E4 4E 80 04 21 */ bctrl -/* 801F88E8 88 01 00 0C */ lbz r0, 0xc(r1) -/* 801F88EC 98 0E 01 A0 */ stb r0, 0x1a0(r14) -/* 801F88F0 88 01 00 0D */ lbz r0, 0xd(r1) -/* 801F88F4 98 0E 01 A1 */ stb r0, 0x1a1(r14) -/* 801F88F8 88 01 00 0E */ lbz r0, 0xe(r1) -/* 801F88FC 98 0E 01 A2 */ stb r0, 0x1a2(r14) -/* 801F8900 88 01 00 0F */ lbz r0, 0xf(r1) -/* 801F8904 98 0E 01 A3 */ stb r0, 0x1a3(r14) -/* 801F8908 38 61 00 08 */ addi r3, r1, 8 -/* 801F890C 80 8E 00 C0 */ lwz r4, 0xc0(r14) -/* 801F8910 81 84 00 00 */ lwz r12, 0(r4) -/* 801F8914 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 801F8918 7D 89 03 A6 */ mtctr r12 -/* 801F891C 4E 80 04 21 */ bctrl -/* 801F8920 88 01 00 08 */ lbz r0, 8(r1) -/* 801F8924 98 0E 01 C8 */ stb r0, 0x1c8(r14) -/* 801F8928 88 01 00 09 */ lbz r0, 9(r1) -/* 801F892C 98 0E 01 C9 */ stb r0, 0x1c9(r14) -/* 801F8930 88 01 00 0A */ lbz r0, 0xa(r1) -/* 801F8934 98 0E 01 CA */ stb r0, 0x1ca(r14) -/* 801F8938 88 01 00 0B */ lbz r0, 0xb(r1) -/* 801F893C 98 0E 01 CB */ stb r0, 0x1cb(r14) -lbl_801F8940: -/* 801F8940 39 EF 00 01 */ addi r15, r15, 1 -/* 801F8944 2C 0F 00 04 */ cmpwi r15, 4 -/* 801F8948 3A 10 00 04 */ addi r16, r16, 4 -/* 801F894C 41 80 FE 0C */ blt lbl_801F8758 -/* 801F8950 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F8954 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 801F8958 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 801F895C 38 A0 00 66 */ li r5, 0x66 -/* 801F8960 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8964 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F8968 7D 89 03 A6 */ mtctr r12 -/* 801F896C 4E 80 04 21 */ bctrl -/* 801F8970 7C 6E 1B 78 */ mr r14, r3 -/* 801F8974 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F8978 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 801F897C 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 801F8980 38 A0 00 74 */ li r5, 0x74 -/* 801F8984 81 83 00 00 */ lwz r12, 0(r3) -/* 801F8988 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801F898C 7D 89 03 A6 */ mtctr r12 -/* 801F8990 4E 80 04 21 */ bctrl -/* 801F8994 38 00 00 00 */ li r0, 0 -/* 801F8998 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F899C 4B E1 C2 05 */ bl mDoExt_getSubFont__Fv -/* 801F89A0 7C 64 1B 78 */ mr r4, r3 -/* 801F89A4 7D C3 73 78 */ mr r3, r14 -/* 801F89A8 81 8E 00 00 */ lwz r12, 0(r14) -/* 801F89AC 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801F89B0 7D 89 03 A6 */ mtctr r12 -/* 801F89B4 4E 80 04 21 */ bctrl -/* 801F89B8 7D C3 73 78 */ mr r3, r14 -/* 801F89BC 38 80 02 00 */ li r4, 0x200 -/* 801F89C0 3C A0 80 39 */ lis r5, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F89C4 38 A5 7D B8 */ addi r5, r5, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -/* 801F89C8 38 A5 00 2F */ addi r5, r5, 0x2f -/* 801F89CC 4C C6 31 82 */ crclr 6 -/* 801F89D0 48 10 7D 7D */ bl setString__10J2DTextBoxFsPCce -/* 801F89D4 80 7F 01 9C */ lwz r3, 0x19c(r31) -/* 801F89D8 38 80 06 A4 */ li r4, 0x6a4 -/* 801F89DC 7D C5 73 78 */ mr r5, r14 -/* 801F89E0 38 C0 00 00 */ li r6, 0 -/* 801F89E4 38 E0 00 00 */ li r7, 0 -/* 801F89E8 39 00 00 00 */ li r8, 0 -/* 801F89EC 39 20 00 00 */ li r9, 0 -/* 801F89F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F89F4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F89F8 7D 89 03 A6 */ mtctr r12 -/* 801F89FC 4E 80 04 21 */ bctrl -/* 801F8A00 39 61 00 70 */ addi r11, r1, 0x70 -/* 801F8A04 48 16 97 E9 */ bl _restgpr_14 -/* 801F8A08 80 01 00 74 */ lwz r0, 0x74(r1) -/* 801F8A0C 7C 08 03 A6 */ mtlr r0 -/* 801F8A10 38 21 00 70 */ addi r1, r1, 0x70 -/* 801F8A14 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/setAButtonString__13dMenu_Skill_cFUs.s b/asm/d/menu/d_menu_skill/setAButtonString__13dMenu_Skill_cFUs.s deleted file mode 100644 index b216d52d583..00000000000 --- a/asm/d/menu/d_menu_skill/setAButtonString__13dMenu_Skill_cFUs.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801F9260: -/* 801F9260 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F9264 7C 08 02 A6 */ mflr r0 -/* 801F9268 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F926C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F9270 48 16 8F 65 */ bl _savegpr_27 -/* 801F9274 7C 7B 1B 78 */ mr r27, r3 -/* 801F9278 54 9D 04 3F */ clrlwi. r29, r4, 0x10 -/* 801F927C 40 82 00 3C */ bne lbl_801F92B8 -/* 801F9280 3B A0 00 00 */ li r29, 0 -/* 801F9284 3B E0 00 00 */ li r31, 0 -/* 801F9288 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F928C 3B C3 7D B8 */ addi r30, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -lbl_801F9290: -/* 801F9290 38 1F 01 20 */ addi r0, r31, 0x120 -/* 801F9294 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9298 48 10 73 C1 */ bl getStringPtr__10J2DTextBoxCFv -/* 801F929C 38 9E 00 2F */ addi r4, r30, 0x2f -/* 801F92A0 48 16 F8 8D */ bl strcpy -/* 801F92A4 3B BD 00 01 */ addi r29, r29, 1 -/* 801F92A8 2C 1D 00 05 */ cmpwi r29, 5 -/* 801F92AC 3B FF 00 04 */ addi r31, r31, 4 -/* 801F92B0 41 80 FF E0 */ blt lbl_801F9290 -/* 801F92B4 48 00 00 44 */ b lbl_801F92F8 -lbl_801F92B8: -/* 801F92B8 3B 80 00 00 */ li r28, 0 -/* 801F92BC 3B E0 00 00 */ li r31, 0 -/* 801F92C0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F92C4 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801F92C8: -/* 801F92C8 38 1F 01 20 */ addi r0, r31, 0x120 -/* 801F92CC 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F92D0 48 10 73 89 */ bl getStringPtr__10J2DTextBoxCFv -/* 801F92D4 7C 65 1B 78 */ mr r5, r3 -/* 801F92D8 7F C3 F3 78 */ mr r3, r30 -/* 801F92DC 7F A4 EB 78 */ mr r4, r29 -/* 801F92E0 38 C0 00 00 */ li r6, 0 -/* 801F92E4 48 02 32 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801F92E8 3B 9C 00 01 */ addi r28, r28, 1 -/* 801F92EC 2C 1C 00 05 */ cmpwi r28, 5 -/* 801F92F0 3B FF 00 04 */ addi r31, r31, 4 -/* 801F92F4 41 80 FF D4 */ blt lbl_801F92C8 -lbl_801F92F8: -/* 801F92F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F92FC 48 16 8F 25 */ bl _restgpr_27 -/* 801F9300 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F9304 7C 08 03 A6 */ mtlr r0 -/* 801F9308 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F930C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/setBButtonString__13dMenu_Skill_cFUs.s b/asm/d/menu/d_menu_skill/setBButtonString__13dMenu_Skill_cFUs.s deleted file mode 100644 index 1e63a44ed26..00000000000 --- a/asm/d/menu/d_menu_skill/setBButtonString__13dMenu_Skill_cFUs.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801F9310: -/* 801F9310 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F9314 7C 08 02 A6 */ mflr r0 -/* 801F9318 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F931C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F9320 48 16 8E B5 */ bl _savegpr_27 -/* 801F9324 7C 7B 1B 78 */ mr r27, r3 -/* 801F9328 54 9D 04 3F */ clrlwi. r29, r4, 0x10 -/* 801F932C 40 82 00 3C */ bne lbl_801F9368 -/* 801F9330 3B A0 00 00 */ li r29, 0 -/* 801F9334 3B E0 00 00 */ li r31, 0 -/* 801F9338 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F933C 3B C3 7D B8 */ addi r30, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -lbl_801F9340: -/* 801F9340 38 1F 01 34 */ addi r0, r31, 0x134 -/* 801F9344 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9348 48 10 73 11 */ bl getStringPtr__10J2DTextBoxCFv -/* 801F934C 38 9E 00 2F */ addi r4, r30, 0x2f -/* 801F9350 48 16 F7 DD */ bl strcpy -/* 801F9354 3B BD 00 01 */ addi r29, r29, 1 -/* 801F9358 2C 1D 00 05 */ cmpwi r29, 5 -/* 801F935C 3B FF 00 04 */ addi r31, r31, 4 -/* 801F9360 41 80 FF E0 */ blt lbl_801F9340 -/* 801F9364 48 00 00 44 */ b lbl_801F93A8 -lbl_801F9368: -/* 801F9368 3B 80 00 00 */ li r28, 0 -/* 801F936C 3B E0 00 00 */ li r31, 0 -/* 801F9370 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F9374 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801F9378: -/* 801F9378 38 1F 01 34 */ addi r0, r31, 0x134 -/* 801F937C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9380 48 10 72 D9 */ bl getStringPtr__10J2DTextBoxCFv -/* 801F9384 7C 65 1B 78 */ mr r5, r3 -/* 801F9388 7F C3 F3 78 */ mr r3, r30 -/* 801F938C 7F A4 EB 78 */ mr r4, r29 -/* 801F9390 38 C0 00 00 */ li r6, 0 -/* 801F9394 48 02 31 B1 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801F9398 3B 9C 00 01 */ addi r28, r28, 1 -/* 801F939C 2C 1C 00 05 */ cmpwi r28, 5 -/* 801F93A0 3B FF 00 04 */ addi r31, r31, 4 -/* 801F93A4 41 80 FF D4 */ blt lbl_801F9378 -lbl_801F93A8: -/* 801F93A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F93AC 48 16 8E 75 */ bl _restgpr_27 -/* 801F93B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F93B4 7C 08 03 A6 */ mtlr r0 -/* 801F93B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F93BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/setCursorPos__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/setCursorPos__13dMenu_Skill_cFv.s deleted file mode 100644 index 651b3c44974..00000000000 --- a/asm/d/menu/d_menu_skill/setCursorPos__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801F8E9C: -/* 801F8E9C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801F8EA0 7C 08 02 A6 */ mflr r0 -/* 801F8EA4 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F8EA8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801F8EAC 7C 7F 1B 78 */ mr r31, r3 -/* 801F8EB0 88 03 02 06 */ lbz r0, 0x206(r3) -/* 801F8EB4 54 00 10 3A */ slwi r0, r0, 2 -/* 801F8EB8 7C 7F 02 14 */ add r3, r31, r0 -/* 801F8EBC 80 83 01 60 */ lwz r4, 0x160(r3) -/* 801F8EC0 38 61 00 08 */ addi r3, r1, 8 -/* 801F8EC4 80 A4 00 04 */ lwz r5, 4(r4) -/* 801F8EC8 38 C0 00 00 */ li r6, 0 -/* 801F8ECC 38 E0 00 00 */ li r7, 0 -/* 801F8ED0 48 05 BF ED */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 801F8ED4 80 61 00 08 */ lwz r3, 8(r1) -/* 801F8ED8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801F8EDC 90 61 00 14 */ stw r3, 0x14(r1) -/* 801F8EE0 90 01 00 18 */ stw r0, 0x18(r1) -/* 801F8EE4 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801F8EE8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F8EEC 88 1F 02 06 */ lbz r0, 0x206(r31) -/* 801F8EF0 54 00 10 3A */ slwi r0, r0, 2 -/* 801F8EF4 7C 7F 02 14 */ add r3, r31, r0 -/* 801F8EF8 80 63 01 60 */ lwz r3, 0x160(r3) -/* 801F8EFC 80 83 00 04 */ lwz r4, 4(r3) -/* 801F8F00 80 7F 01 98 */ lwz r3, 0x198(r31) -/* 801F8F04 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801F8F08 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801F8F0C 38 A0 00 00 */ li r5, 0 -/* 801F8F10 4B F9 C1 E5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 801F8F14 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801F8F18 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801F8F1C 7C 08 03 A6 */ mtlr r0 -/* 801F8F20 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F8F24 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/setHIO__13dMenu_Skill_cFb.s b/asm/d/menu/d_menu_skill/setHIO__13dMenu_Skill_cFb.s deleted file mode 100644 index 9734fefe547..00000000000 --- a/asm/d/menu/d_menu_skill/setHIO__13dMenu_Skill_cFb.s +++ /dev/null @@ -1,334 +0,0 @@ -lbl_801F9500: -/* 801F9500 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 801F9504 7C 08 02 A6 */ mflr r0 -/* 801F9508 90 01 00 74 */ stw r0, 0x74(r1) -/* 801F950C 39 61 00 70 */ addi r11, r1, 0x70 -/* 801F9510 48 16 8C C1 */ bl _savegpr_26 -/* 801F9514 7C 7D 1B 78 */ mr r29, r3 -/* 801F9518 7C 9E 23 78 */ mr r30, r4 -/* 801F951C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801F9520 40 82 00 18 */ bne lbl_801F9538 -/* 801F9524 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F9528 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F952C 88 03 0A 8F */ lbz r0, 0xa8f(r3) -/* 801F9530 28 00 00 00 */ cmplwi r0, 0 -/* 801F9534 41 82 03 70 */ beq lbl_801F98A4 -lbl_801F9538: -/* 801F9538 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F953C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F9540 80 03 0A 7C */ lwz r0, 0xa7c(r3) -/* 801F9544 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801F9548 88 01 00 4C */ lbz r0, 0x4c(r1) -/* 801F954C 98 1D 01 A0 */ stb r0, 0x1a0(r29) -/* 801F9550 88 01 00 4D */ lbz r0, 0x4d(r1) -/* 801F9554 98 1D 01 A1 */ stb r0, 0x1a1(r29) -/* 801F9558 88 01 00 4E */ lbz r0, 0x4e(r1) -/* 801F955C 98 1D 01 A2 */ stb r0, 0x1a2(r29) -/* 801F9560 88 01 00 4F */ lbz r0, 0x4f(r1) -/* 801F9564 98 1D 01 A3 */ stb r0, 0x1a3(r29) -/* 801F9568 80 03 0A 80 */ lwz r0, 0xa80(r3) -/* 801F956C 90 01 00 48 */ stw r0, 0x48(r1) -/* 801F9570 88 01 00 48 */ lbz r0, 0x48(r1) -/* 801F9574 98 1D 01 C8 */ stb r0, 0x1c8(r29) -/* 801F9578 88 01 00 49 */ lbz r0, 0x49(r1) -/* 801F957C 98 1D 01 C9 */ stb r0, 0x1c9(r29) -/* 801F9580 88 01 00 4A */ lbz r0, 0x4a(r1) -/* 801F9584 98 1D 01 CA */ stb r0, 0x1ca(r29) -/* 801F9588 88 01 00 4B */ lbz r0, 0x4b(r1) -/* 801F958C 98 1D 01 CB */ stb r0, 0x1cb(r29) -/* 801F9590 80 03 0A 84 */ lwz r0, 0xa84(r3) -/* 801F9594 90 01 00 44 */ stw r0, 0x44(r1) -/* 801F9598 88 01 00 44 */ lbz r0, 0x44(r1) -/* 801F959C 98 1D 01 AC */ stb r0, 0x1ac(r29) -/* 801F95A0 88 01 00 45 */ lbz r0, 0x45(r1) -/* 801F95A4 98 1D 01 AD */ stb r0, 0x1ad(r29) -/* 801F95A8 88 01 00 46 */ lbz r0, 0x46(r1) -/* 801F95AC 98 1D 01 AE */ stb r0, 0x1ae(r29) -/* 801F95B0 88 01 00 47 */ lbz r0, 0x47(r1) -/* 801F95B4 98 1D 01 AF */ stb r0, 0x1af(r29) -/* 801F95B8 80 03 0A 88 */ lwz r0, 0xa88(r3) -/* 801F95BC 90 01 00 40 */ stw r0, 0x40(r1) -/* 801F95C0 88 01 00 40 */ lbz r0, 0x40(r1) -/* 801F95C4 98 1D 01 D4 */ stb r0, 0x1d4(r29) -/* 801F95C8 88 01 00 41 */ lbz r0, 0x41(r1) -/* 801F95CC 98 1D 01 D5 */ stb r0, 0x1d5(r29) -/* 801F95D0 88 01 00 42 */ lbz r0, 0x42(r1) -/* 801F95D4 98 1D 01 D6 */ stb r0, 0x1d6(r29) -/* 801F95D8 88 01 00 43 */ lbz r0, 0x43(r1) -/* 801F95DC 98 1D 01 D7 */ stb r0, 0x1d7(r29) -/* 801F95E0 C0 03 0A 3C */ lfs f0, 0xa3c(r3) -/* 801F95E4 D0 1D 01 F4 */ stfs f0, 0x1f4(r29) -/* 801F95E8 C0 03 0A 40 */ lfs f0, 0xa40(r3) -/* 801F95EC D0 1D 01 F8 */ stfs f0, 0x1f8(r29) -/* 801F95F0 80 03 0A 6C */ lwz r0, 0xa6c(r3) -/* 801F95F4 90 01 00 3C */ stw r0, 0x3c(r1) -/* 801F95F8 88 01 00 3C */ lbz r0, 0x3c(r1) -/* 801F95FC 98 1D 01 B0 */ stb r0, 0x1b0(r29) -/* 801F9600 88 01 00 3D */ lbz r0, 0x3d(r1) -/* 801F9604 98 1D 01 B1 */ stb r0, 0x1b1(r29) -/* 801F9608 88 01 00 3E */ lbz r0, 0x3e(r1) -/* 801F960C 98 1D 01 B2 */ stb r0, 0x1b2(r29) -/* 801F9610 88 01 00 3F */ lbz r0, 0x3f(r1) -/* 801F9614 98 1D 01 B3 */ stb r0, 0x1b3(r29) -/* 801F9618 80 03 0A 70 */ lwz r0, 0xa70(r3) -/* 801F961C 90 01 00 38 */ stw r0, 0x38(r1) -/* 801F9620 88 01 00 38 */ lbz r0, 0x38(r1) -/* 801F9624 98 1D 01 D8 */ stb r0, 0x1d8(r29) -/* 801F9628 88 01 00 39 */ lbz r0, 0x39(r1) -/* 801F962C 98 1D 01 D9 */ stb r0, 0x1d9(r29) -/* 801F9630 88 01 00 3A */ lbz r0, 0x3a(r1) -/* 801F9634 98 1D 01 DA */ stb r0, 0x1da(r29) -/* 801F9638 88 01 00 3B */ lbz r0, 0x3b(r1) -/* 801F963C 98 1D 01 DB */ stb r0, 0x1db(r29) -/* 801F9640 80 03 0A 74 */ lwz r0, 0xa74(r3) -/* 801F9644 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F9648 88 01 00 34 */ lbz r0, 0x34(r1) -/* 801F964C 98 1D 01 C4 */ stb r0, 0x1c4(r29) -/* 801F9650 88 01 00 35 */ lbz r0, 0x35(r1) -/* 801F9654 98 1D 01 C5 */ stb r0, 0x1c5(r29) -/* 801F9658 88 01 00 36 */ lbz r0, 0x36(r1) -/* 801F965C 98 1D 01 C6 */ stb r0, 0x1c6(r29) -/* 801F9660 88 01 00 37 */ lbz r0, 0x37(r1) -/* 801F9664 98 1D 01 C7 */ stb r0, 0x1c7(r29) -/* 801F9668 80 03 0A 78 */ lwz r0, 0xa78(r3) -/* 801F966C 90 01 00 30 */ stw r0, 0x30(r1) -/* 801F9670 88 01 00 30 */ lbz r0, 0x30(r1) -/* 801F9674 98 1D 01 EC */ stb r0, 0x1ec(r29) -/* 801F9678 88 01 00 31 */ lbz r0, 0x31(r1) -/* 801F967C 98 1D 01 ED */ stb r0, 0x1ed(r29) -/* 801F9680 88 01 00 32 */ lbz r0, 0x32(r1) -/* 801F9684 98 1D 01 EE */ stb r0, 0x1ee(r29) -/* 801F9688 88 01 00 33 */ lbz r0, 0x33(r1) -/* 801F968C 98 1D 01 EF */ stb r0, 0x1ef(r29) -/* 801F9690 3B E0 00 00 */ li r31, 0 -/* 801F9694 3B 80 00 00 */ li r28, 0 -/* 801F9698 3B 60 00 00 */ li r27, 0 -lbl_801F969C: -/* 801F969C 88 1D 02 06 */ lbz r0, 0x206(r29) -/* 801F96A0 7C 1F 00 00 */ cmpw r31, r0 -/* 801F96A4 40 82 00 E4 */ bne lbl_801F9788 -/* 801F96A8 80 1D 01 C8 */ lwz r0, 0x1c8(r29) -/* 801F96AC 90 01 00 28 */ stw r0, 0x28(r1) -/* 801F96B0 80 1D 01 A0 */ lwz r0, 0x1a0(r29) -/* 801F96B4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801F96B8 7F 5D DA 14 */ add r26, r29, r27 -/* 801F96BC 80 7A 00 24 */ lwz r3, 0x24(r26) -/* 801F96C0 38 81 00 2C */ addi r4, r1, 0x2c -/* 801F96C4 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801F96C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F96CC 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F96D0 7D 89 03 A6 */ mtctr r12 -/* 801F96D4 4E 80 04 21 */ bctrl -/* 801F96D8 80 1D 01 D4 */ lwz r0, 0x1d4(r29) -/* 801F96DC 90 01 00 20 */ stw r0, 0x20(r1) -/* 801F96E0 80 1D 01 AC */ lwz r0, 0x1ac(r29) -/* 801F96E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F96E8 80 7A 00 B4 */ lwz r3, 0xb4(r26) -/* 801F96EC 38 81 00 24 */ addi r4, r1, 0x24 -/* 801F96F0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801F96F4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F96F8 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 801F96FC 7D 89 03 A6 */ mtctr r12 -/* 801F9700 4E 80 04 21 */ bctrl -/* 801F9704 80 1D 01 D4 */ lwz r0, 0x1d4(r29) -/* 801F9708 90 01 00 18 */ stw r0, 0x18(r1) -/* 801F970C 80 1D 01 AC */ lwz r0, 0x1ac(r29) -/* 801F9710 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F9714 80 7A 00 BC */ lwz r3, 0xbc(r26) -/* 801F9718 38 81 00 1C */ addi r4, r1, 0x1c -/* 801F971C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801F9720 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9724 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 801F9728 7D 89 03 A6 */ mtctr r12 -/* 801F972C 4E 80 04 21 */ bctrl -/* 801F9730 C0 1D 01 F4 */ lfs f0, 0x1f4(r29) -/* 801F9734 7F 5D E2 14 */ add r26, r29, r28 -/* 801F9738 80 7A 01 60 */ lwz r3, 0x160(r26) -/* 801F973C 80 63 00 04 */ lwz r3, 4(r3) -/* 801F9740 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F9744 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F9748 81 83 00 00 */ lwz r12, 0(r3) -/* 801F974C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F9750 7D 89 03 A6 */ mtctr r12 -/* 801F9754 4E 80 04 21 */ bctrl -/* 801F9758 80 1D 01 D8 */ lwz r0, 0x1d8(r29) -/* 801F975C 90 01 00 10 */ stw r0, 0x10(r1) -/* 801F9760 80 1D 01 B0 */ lwz r0, 0x1b0(r29) -/* 801F9764 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F9768 80 7A 00 94 */ lwz r3, 0x94(r26) -/* 801F976C 38 81 00 14 */ addi r4, r1, 0x14 -/* 801F9770 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801F9774 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9778 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F977C 7D 89 03 A6 */ mtctr r12 -/* 801F9780 4E 80 04 21 */ bctrl -/* 801F9784 48 00 00 58 */ b lbl_801F97DC -lbl_801F9788: -/* 801F9788 C0 1D 01 F8 */ lfs f0, 0x1f8(r29) -/* 801F978C 7F 5D E2 14 */ add r26, r29, r28 -/* 801F9790 80 7A 01 60 */ lwz r3, 0x160(r26) -/* 801F9794 80 63 00 04 */ lwz r3, 4(r3) -/* 801F9798 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F979C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F97A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F97A4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F97A8 7D 89 03 A6 */ mtctr r12 -/* 801F97AC 4E 80 04 21 */ bctrl -/* 801F97B0 80 1D 01 EC */ lwz r0, 0x1ec(r29) -/* 801F97B4 90 01 00 08 */ stw r0, 8(r1) -/* 801F97B8 80 1D 01 C4 */ lwz r0, 0x1c4(r29) -/* 801F97BC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F97C0 80 7A 00 94 */ lwz r3, 0x94(r26) -/* 801F97C4 38 81 00 0C */ addi r4, r1, 0xc -/* 801F97C8 38 A1 00 08 */ addi r5, r1, 8 -/* 801F97CC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F97D0 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801F97D4 7D 89 03 A6 */ mtctr r12 -/* 801F97D8 4E 80 04 21 */ bctrl -lbl_801F97DC: -/* 801F97DC 3B FF 00 01 */ addi r31, r31, 1 -/* 801F97E0 2C 1F 00 07 */ cmpwi r31, 7 -/* 801F97E4 3B 9C 00 04 */ addi r28, r28, 4 -/* 801F97E8 3B 7B 00 10 */ addi r27, r27, 0x10 -/* 801F97EC 41 80 FE B0 */ blt lbl_801F969C -/* 801F97F0 80 7D 01 7C */ lwz r3, 0x17c(r29) -/* 801F97F4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F97F8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F97FC C0 24 0A 44 */ lfs f1, 0xa44(r4) -/* 801F9800 C0 44 0A 48 */ lfs f2, 0xa48(r4) -/* 801F9804 48 05 AD AD */ bl paneTrans__8CPaneMgrFff -/* 801F9808 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F980C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F9810 C0 03 0A 4C */ lfs f0, 0xa4c(r3) -/* 801F9814 80 7D 01 7C */ lwz r3, 0x17c(r29) -/* 801F9818 80 63 00 04 */ lwz r3, 4(r3) -/* 801F981C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F9820 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F9824 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9828 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F982C 7D 89 03 A6 */ mtctr r12 -/* 801F9830 4E 80 04 21 */ bctrl -/* 801F9834 88 1D 02 05 */ lbz r0, 0x205(r29) -/* 801F9838 28 00 00 02 */ cmplwi r0, 2 -/* 801F983C 40 82 00 24 */ bne lbl_801F9860 -/* 801F9840 80 7D 01 58 */ lwz r3, 0x158(r29) -/* 801F9844 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F9848 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F984C 88 84 0A 8D */ lbz r4, 0xa8d(r4) -/* 801F9850 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9854 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801F9858 7D 89 03 A6 */ mtctr r12 -/* 801F985C 4E 80 04 21 */ bctrl -lbl_801F9860: -/* 801F9860 80 7D 01 84 */ lwz r3, 0x184(r29) -/* 801F9864 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F9868 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F986C C0 24 0A 50 */ lfs f1, 0xa50(r4) -/* 801F9870 C0 44 0A 54 */ lfs f2, 0xa54(r4) -/* 801F9874 48 05 AD 3D */ bl paneTrans__8CPaneMgrFff -/* 801F9878 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F987C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F9880 C0 03 0A 58 */ lfs f0, 0xa58(r3) -/* 801F9884 80 7D 01 84 */ lwz r3, 0x184(r29) -/* 801F9888 80 63 00 04 */ lwz r3, 4(r3) -/* 801F988C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F9890 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F9894 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9898 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F989C 7D 89 03 A6 */ mtctr r12 -/* 801F98A0 4E 80 04 21 */ bctrl -lbl_801F98A4: -/* 801F98A4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F98A8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F98AC 88 03 06 B4 */ lbz r0, 0x6b4(r3) -/* 801F98B0 28 00 00 00 */ cmplwi r0, 0 -/* 801F98B4 40 82 00 0C */ bne lbl_801F98C0 -/* 801F98B8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 801F98BC 41 82 01 34 */ beq lbl_801F99F0 -lbl_801F98C0: -/* 801F98C0 80 7D 01 88 */ lwz r3, 0x188(r29) -/* 801F98C4 28 03 00 00 */ cmplwi r3, 0 -/* 801F98C8 41 82 00 44 */ beq lbl_801F990C -/* 801F98CC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F98D0 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F98D4 C0 24 06 60 */ lfs f1, 0x660(r4) -/* 801F98D8 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801F98DC 48 05 AC D5 */ bl paneTrans__8CPaneMgrFff -/* 801F98E0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F98E4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F98E8 C0 03 06 68 */ lfs f0, 0x668(r3) -/* 801F98EC 80 7D 01 88 */ lwz r3, 0x188(r29) -/* 801F98F0 80 63 00 04 */ lwz r3, 4(r3) -/* 801F98F4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F98F8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F98FC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9900 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F9904 7D 89 03 A6 */ mtctr r12 -/* 801F9908 4E 80 04 21 */ bctrl -lbl_801F990C: -/* 801F990C 80 7D 01 8C */ lwz r3, 0x18c(r29) -/* 801F9910 28 03 00 00 */ cmplwi r3, 0 -/* 801F9914 41 82 00 44 */ beq lbl_801F9958 -/* 801F9918 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F991C 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F9920 C0 24 06 6C */ lfs f1, 0x66c(r4) -/* 801F9924 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801F9928 48 05 AC 89 */ bl paneTrans__8CPaneMgrFff -/* 801F992C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F9930 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F9934 C0 03 06 74 */ lfs f0, 0x674(r3) -/* 801F9938 80 7D 01 8C */ lwz r3, 0x18c(r29) -/* 801F993C 80 63 00 04 */ lwz r3, 4(r3) -/* 801F9940 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F9944 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F9948 81 83 00 00 */ lwz r12, 0(r3) -/* 801F994C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F9950 7D 89 03 A6 */ mtctr r12 -/* 801F9954 4E 80 04 21 */ bctrl -lbl_801F9958: -/* 801F9958 80 7D 01 90 */ lwz r3, 0x190(r29) -/* 801F995C 28 03 00 00 */ cmplwi r3, 0 -/* 801F9960 41 82 00 44 */ beq lbl_801F99A4 -/* 801F9964 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F9968 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F996C C0 24 06 78 */ lfs f1, 0x678(r4) -/* 801F9970 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801F9974 48 05 AC 3D */ bl paneTrans__8CPaneMgrFff -/* 801F9978 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F997C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F9980 C0 03 06 80 */ lfs f0, 0x680(r3) -/* 801F9984 80 7D 01 90 */ lwz r3, 0x190(r29) -/* 801F9988 80 63 00 04 */ lwz r3, 4(r3) -/* 801F998C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F9990 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F9994 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9998 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F999C 7D 89 03 A6 */ mtctr r12 -/* 801F99A0 4E 80 04 21 */ bctrl -lbl_801F99A4: -/* 801F99A4 80 7D 01 94 */ lwz r3, 0x194(r29) -/* 801F99A8 28 03 00 00 */ cmplwi r3, 0 -/* 801F99AC 41 82 00 44 */ beq lbl_801F99F0 -/* 801F99B0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F99B4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F99B8 C0 24 06 84 */ lfs f1, 0x684(r4) -/* 801F99BC C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801F99C0 48 05 AB F1 */ bl paneTrans__8CPaneMgrFff -/* 801F99C4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801F99C8 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801F99CC C0 03 06 8C */ lfs f0, 0x68c(r3) -/* 801F99D0 80 7D 01 94 */ lwz r3, 0x194(r29) -/* 801F99D4 80 63 00 04 */ lwz r3, 4(r3) -/* 801F99D8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801F99DC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801F99E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801F99E4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801F99E8 7D 89 03 A6 */ mtctr r12 -/* 801F99EC 4E 80 04 21 */ bctrl -lbl_801F99F0: -/* 801F99F0 39 61 00 70 */ addi r11, r1, 0x70 -/* 801F99F4 48 16 88 29 */ bl _restgpr_26 -/* 801F99F8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 801F99FC 7C 08 03 A6 */ mtlr r0 -/* 801F9A00 38 21 00 70 */ addi r1, r1, 0x70 -/* 801F9A04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/setNameString__13dMenu_Skill_cFUs.s b/asm/d/menu/d_menu_skill/setNameString__13dMenu_Skill_cFUs.s deleted file mode 100644 index f4023937bac..00000000000 --- a/asm/d/menu/d_menu_skill/setNameString__13dMenu_Skill_cFUs.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801F93C0: -/* 801F93C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F93C4 7C 08 02 A6 */ mflr r0 -/* 801F93C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F93CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F93D0 48 16 8E 05 */ bl _savegpr_27 -/* 801F93D4 7C 7B 1B 78 */ mr r27, r3 -/* 801F93D8 54 9D 04 3F */ clrlwi. r29, r4, 0x10 -/* 801F93DC 40 82 00 3C */ bne lbl_801F9418 -/* 801F93E0 3B A0 00 00 */ li r29, 0 -/* 801F93E4 3B E0 00 00 */ li r31, 0 -/* 801F93E8 3C 60 80 39 */ lis r3, d_menu_d_menu_skill__stringBase0@ha /* 0x80397DB8@ha */ -/* 801F93EC 3B C3 7D B8 */ addi r30, r3, d_menu_d_menu_skill__stringBase0@l /* 0x80397DB8@l */ -lbl_801F93F0: -/* 801F93F0 38 1F 01 48 */ addi r0, r31, 0x148 -/* 801F93F4 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F93F8 48 10 72 61 */ bl getStringPtr__10J2DTextBoxCFv -/* 801F93FC 38 9E 00 2F */ addi r4, r30, 0x2f -/* 801F9400 48 16 F7 2D */ bl strcpy -/* 801F9404 3B BD 00 01 */ addi r29, r29, 1 -/* 801F9408 2C 1D 00 04 */ cmpwi r29, 4 -/* 801F940C 3B FF 00 04 */ addi r31, r31, 4 -/* 801F9410 41 80 FF E0 */ blt lbl_801F93F0 -/* 801F9414 48 00 00 44 */ b lbl_801F9458 -lbl_801F9418: -/* 801F9418 3B 80 00 00 */ li r28, 0 -/* 801F941C 3B E0 00 00 */ li r31, 0 -/* 801F9420 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F9424 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801F9428: -/* 801F9428 38 1F 01 48 */ addi r0, r31, 0x148 -/* 801F942C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9430 48 10 72 29 */ bl getStringPtr__10J2DTextBoxCFv -/* 801F9434 7C 65 1B 78 */ mr r5, r3 -/* 801F9438 7F C3 F3 78 */ mr r3, r30 -/* 801F943C 7F A4 EB 78 */ mr r4, r29 -/* 801F9440 38 C0 00 00 */ li r6, 0 -/* 801F9444 48 02 31 01 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801F9448 3B 9C 00 01 */ addi r28, r28, 1 -/* 801F944C 2C 1C 00 04 */ cmpwi r28, 4 -/* 801F9450 3B FF 00 04 */ addi r31, r31, 4 -/* 801F9454 41 80 FF D4 */ blt lbl_801F9428 -lbl_801F9458: -/* 801F9458 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F945C 48 16 8D C5 */ bl _restgpr_27 -/* 801F9460 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F9464 7C 08 03 A6 */ mtlr r0 -/* 801F9468 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F946C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/setPageText__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/setPageText__13dMenu_Skill_cFv.s deleted file mode 100644 index 27cadf3561c..00000000000 --- a/asm/d/menu/d_menu_skill/setPageText__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_801F9144: -/* 801F9144 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801F9148 7C 08 02 A6 */ mflr r0 -/* 801F914C 90 01 00 34 */ stw r0, 0x34(r1) -/* 801F9150 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F9154 48 16 90 79 */ bl _savegpr_25 -/* 801F9158 7C 79 1B 78 */ mr r25, r3 -/* 801F915C 3B 40 00 00 */ li r26, 0 -/* 801F9160 3B E0 00 00 */ li r31, 0 -/* 801F9164 3B C0 00 00 */ li r30, 0 -/* 801F9168 3C 60 80 39 */ lis r3, i_id0@ha /* 0x80397D80@ha */ -/* 801F916C 3B 83 7D 80 */ addi r28, r3, i_id0@l /* 0x80397D80@l */ -/* 801F9170 3C 60 80 39 */ lis r3, i_id1_4479@ha /* 0x80397D9C@ha */ -/* 801F9174 3B A3 7D 9C */ addi r29, r3, i_id1_4479@l /* 0x80397D9C@l */ -/* 801F9178 48 00 00 C4 */ b lbl_801F923C -lbl_801F917C: -/* 801F917C 80 79 01 9C */ lwz r3, 0x19c(r25) -/* 801F9180 7C 9C F0 2E */ lwzx r4, r28, r30 -/* 801F9184 7F 79 FA 14 */ add r27, r25, r31 -/* 801F9188 80 BB 00 B0 */ lwz r5, 0xb0(r27) -/* 801F918C 38 C0 00 00 */ li r6, 0 -/* 801F9190 38 E0 00 00 */ li r7, 0 -/* 801F9194 39 00 00 00 */ li r8, 0 -/* 801F9198 39 20 00 00 */ li r9, 0 -/* 801F919C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F91A0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F91A4 7D 89 03 A6 */ mtctr r12 -/* 801F91A8 4E 80 04 21 */ bctrl -/* 801F91AC 80 79 01 9C */ lwz r3, 0x19c(r25) -/* 801F91B0 7C 9C F0 2E */ lwzx r4, r28, r30 -/* 801F91B4 80 BB 00 B4 */ lwz r5, 0xb4(r27) -/* 801F91B8 38 C0 00 00 */ li r6, 0 -/* 801F91BC 38 E0 00 00 */ li r7, 0 -/* 801F91C0 39 00 00 00 */ li r8, 0 -/* 801F91C4 39 20 00 00 */ li r9, 0 -/* 801F91C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F91CC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F91D0 7D 89 03 A6 */ mtctr r12 -/* 801F91D4 4E 80 04 21 */ bctrl -/* 801F91D8 80 79 01 9C */ lwz r3, 0x19c(r25) -/* 801F91DC 7C 9D F0 2E */ lwzx r4, r29, r30 -/* 801F91E0 80 BB 00 B8 */ lwz r5, 0xb8(r27) -/* 801F91E4 38 C0 00 00 */ li r6, 0 -/* 801F91E8 38 E0 00 00 */ li r7, 0 -/* 801F91EC 39 00 00 00 */ li r8, 0 -/* 801F91F0 39 20 00 00 */ li r9, 0 -/* 801F91F4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F91F8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F91FC 7D 89 03 A6 */ mtctr r12 -/* 801F9200 4E 80 04 21 */ bctrl -/* 801F9204 80 79 01 9C */ lwz r3, 0x19c(r25) -/* 801F9208 7C 9D F0 2E */ lwzx r4, r29, r30 -/* 801F920C 80 BB 00 BC */ lwz r5, 0xbc(r27) -/* 801F9210 38 C0 00 00 */ li r6, 0 -/* 801F9214 38 E0 00 00 */ li r7, 0 -/* 801F9218 39 00 00 00 */ li r8, 0 -/* 801F921C 39 20 00 00 */ li r9, 0 -/* 801F9220 81 83 00 00 */ lwz r12, 0(r3) -/* 801F9224 81 8C 00 08 */ lwz r12, 8(r12) -/* 801F9228 7D 89 03 A6 */ mtctr r12 -/* 801F922C 4E 80 04 21 */ bctrl -/* 801F9230 3B 5A 00 01 */ addi r26, r26, 1 -/* 801F9234 3B FF 00 10 */ addi r31, r31, 0x10 -/* 801F9238 3B DE 00 04 */ addi r30, r30, 4 -lbl_801F923C: -/* 801F923C 88 19 02 07 */ lbz r0, 0x207(r25) -/* 801F9240 7C 1A 00 00 */ cmpw r26, r0 -/* 801F9244 41 80 FF 38 */ blt lbl_801F917C -/* 801F9248 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F924C 48 16 8F CD */ bl _restgpr_25 -/* 801F9250 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801F9254 7C 08 03 A6 */ mtlr r0 -/* 801F9258 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F925C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/skill_init_calc__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/skill_init_calc__13dMenu_Skill_cFv.s deleted file mode 100644 index 5bcfc9651b9..00000000000 --- a/asm/d/menu/d_menu_skill/skill_init_calc__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801F7978: -/* 801F7978 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F797C 7C 08 02 A6 */ mflr r0 -/* 801F7980 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F7984 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F7988 7C 7F 1B 78 */ mr r31, r3 -/* 801F798C 48 00 1A E5 */ bl getSkillNum__13dMenu_Skill_cFv -/* 801F7990 98 7F 02 0B */ stb r3, 0x20b(r31) -/* 801F7994 88 1F 02 0B */ lbz r0, 0x20b(r31) -/* 801F7998 28 00 00 07 */ cmplwi r0, 7 -/* 801F799C 40 80 00 0C */ bge lbl_801F79A8 -/* 801F79A0 98 1F 02 07 */ stb r0, 0x207(r31) -/* 801F79A4 48 00 00 0C */ b lbl_801F79B0 -lbl_801F79A8: -/* 801F79A8 38 00 00 07 */ li r0, 7 -/* 801F79AC 98 1F 02 07 */ stb r0, 0x207(r31) -lbl_801F79B0: -/* 801F79B0 88 9F 02 0B */ lbz r4, 0x20b(r31) -/* 801F79B4 38 00 00 07 */ li r0, 7 -/* 801F79B8 7C 64 03 D6 */ divw r3, r4, r0 -/* 801F79BC 7C 03 01 D6 */ mullw r0, r3, r0 -/* 801F79C0 7C 00 20 51 */ subf. r0, r0, r4 -/* 801F79C4 40 82 00 0C */ bne lbl_801F79D0 -/* 801F79C8 98 7F 02 08 */ stb r3, 0x208(r31) -/* 801F79CC 48 00 00 0C */ b lbl_801F79D8 -lbl_801F79D0: -/* 801F79D0 38 03 00 01 */ addi r0, r3, 1 -/* 801F79D4 98 1F 02 08 */ stb r0, 0x208(r31) -lbl_801F79D8: -/* 801F79D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F79DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F79E0 7C 08 03 A6 */ mtlr r0 -/* 801F79E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F79E8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/wait_init__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/wait_init__13dMenu_Skill_cFv.s deleted file mode 100644 index 2bb9683372c..00000000000 --- a/asm/d/menu/d_menu_skill/wait_init__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801F7D58: -/* 801F7D58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F7D5C 7C 08 02 A6 */ mflr r0 -/* 801F7D60 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F7D64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F7D68 7C 7F 1B 78 */ mr r31, r3 -/* 801F7D6C 38 80 04 0C */ li r4, 0x40c -/* 801F7D70 48 00 14 F1 */ bl setAButtonString__13dMenu_Skill_cFUs -/* 801F7D74 7F E3 FB 78 */ mr r3, r31 -/* 801F7D78 38 80 03 F9 */ li r4, 0x3f9 -/* 801F7D7C 48 00 15 95 */ bl setBButtonString__13dMenu_Skill_cFUs -/* 801F7D80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F7D84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F7D88 7C 08 03 A6 */ mtlr r0 -/* 801F7D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F7D90 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/wait_move__13dMenu_Skill_cFv.s b/asm/d/menu/d_menu_skill/wait_move__13dMenu_Skill_cFv.s deleted file mode 100644 index 77ef3cb075d..00000000000 --- a/asm/d/menu/d_menu_skill/wait_move__13dMenu_Skill_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_801F7D94: -/* 801F7D94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F7D98 7C 08 02 A6 */ mflr r0 -/* 801F7D9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F7DA0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801F7DA4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801F7DA8 7C 7E 1B 78 */ mr r30, r3 -/* 801F7DAC 8B E3 02 06 */ lbz r31, 0x206(r3) -/* 801F7DB0 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801F7DB4 80 03 00 04 */ lwz r0, 4(r3) -/* 801F7DB8 2C 00 00 01 */ cmpwi r0, 1 -/* 801F7DBC 40 82 01 50 */ bne lbl_801F7F0C -/* 801F7DC0 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801F7DC4 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801F7DC8 80 63 00 34 */ lwz r3, 0x34(r3) -/* 801F7DCC 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801F7DD0 41 82 00 20 */ beq lbl_801F7DF0 -/* 801F7DD4 80 7E 01 98 */ lwz r3, 0x198(r30) -/* 801F7DD8 88 03 00 B4 */ lbz r0, 0xb4(r3) -/* 801F7DDC 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 801F7DE0 98 03 00 B4 */ stb r0, 0xb4(r3) -/* 801F7DE4 38 00 00 03 */ li r0, 3 -/* 801F7DE8 98 1E 02 04 */ stb r0, 0x204(r30) -/* 801F7DEC 48 00 01 0C */ b lbl_801F7EF8 -lbl_801F7DF0: -/* 801F7DF0 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 801F7DF4 41 82 00 48 */ beq lbl_801F7E3C -/* 801F7DF8 38 00 00 01 */ li r0, 1 -/* 801F7DFC 98 1E 02 05 */ stb r0, 0x205(r30) -/* 801F7E00 38 00 00 51 */ li r0, 0x51 -/* 801F7E04 90 01 00 10 */ stw r0, 0x10(r1) -/* 801F7E08 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801F7E0C 38 81 00 10 */ addi r4, r1, 0x10 -/* 801F7E10 38 A0 00 00 */ li r5, 0 -/* 801F7E14 38 C0 00 00 */ li r6, 0 -/* 801F7E18 38 E0 00 00 */ li r7, 0 -/* 801F7E1C C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7E20 FC 40 08 90 */ fmr f2, f1 -/* 801F7E24 C0 62 AA A8 */ lfs f3, lit_3946(r2) -/* 801F7E28 FC 80 18 90 */ fmr f4, f3 -/* 801F7E2C 39 00 00 00 */ li r8, 0 -/* 801F7E30 48 0B 3B 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F7E34 48 02 6B 9D */ bl dMeter2Info_set2DVibration__Fv -/* 801F7E38 48 00 00 C0 */ b lbl_801F7EF8 -lbl_801F7E3C: -/* 801F7E3C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801F7E40 4B E3 A6 E5 */ bl checkUpTrigger__9STControlFv -/* 801F7E44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801F7E48 41 82 00 50 */ beq lbl_801F7E98 -/* 801F7E4C 88 7E 02 06 */ lbz r3, 0x206(r30) -/* 801F7E50 28 03 00 00 */ cmplwi r3, 0 -/* 801F7E54 41 82 00 A4 */ beq lbl_801F7EF8 -/* 801F7E58 38 03 FF FF */ addi r0, r3, -1 -/* 801F7E5C 98 1E 02 06 */ stb r0, 0x206(r30) -/* 801F7E60 38 00 00 4D */ li r0, 0x4d -/* 801F7E64 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F7E68 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801F7E6C 38 81 00 0C */ addi r4, r1, 0xc -/* 801F7E70 38 A0 00 00 */ li r5, 0 -/* 801F7E74 38 C0 00 00 */ li r6, 0 -/* 801F7E78 38 E0 00 00 */ li r7, 0 -/* 801F7E7C C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7E80 FC 40 08 90 */ fmr f2, f1 -/* 801F7E84 C0 62 AA A8 */ lfs f3, lit_3946(r2) -/* 801F7E88 FC 80 18 90 */ fmr f4, f3 -/* 801F7E8C 39 00 00 00 */ li r8, 0 -/* 801F7E90 48 0B 3A F5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F7E94 48 00 00 64 */ b lbl_801F7EF8 -lbl_801F7E98: -/* 801F7E98 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801F7E9C 4B E3 A7 05 */ bl checkDownTrigger__9STControlFv -/* 801F7EA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801F7EA4 41 82 00 54 */ beq lbl_801F7EF8 -/* 801F7EA8 88 9E 02 06 */ lbz r4, 0x206(r30) -/* 801F7EAC 88 7E 02 07 */ lbz r3, 0x207(r30) -/* 801F7EB0 38 03 FF FF */ addi r0, r3, -1 -/* 801F7EB4 7C 04 00 00 */ cmpw r4, r0 -/* 801F7EB8 40 80 00 40 */ bge lbl_801F7EF8 -/* 801F7EBC 38 04 00 01 */ addi r0, r4, 1 -/* 801F7EC0 98 1E 02 06 */ stb r0, 0x206(r30) -/* 801F7EC4 38 00 00 4D */ li r0, 0x4d -/* 801F7EC8 90 01 00 08 */ stw r0, 8(r1) -/* 801F7ECC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801F7ED0 38 81 00 08 */ addi r4, r1, 8 -/* 801F7ED4 38 A0 00 00 */ li r5, 0 -/* 801F7ED8 38 C0 00 00 */ li r6, 0 -/* 801F7EDC 38 E0 00 00 */ li r7, 0 -/* 801F7EE0 C0 22 AA 8C */ lfs f1, lit_3809(r2) -/* 801F7EE4 FC 40 08 90 */ fmr f2, f1 -/* 801F7EE8 C0 62 AA A8 */ lfs f3, lit_3946(r2) -/* 801F7EEC FC 80 18 90 */ fmr f4, f3 -/* 801F7EF0 39 00 00 00 */ li r8, 0 -/* 801F7EF4 48 0B 3A 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801F7EF8: -/* 801F7EF8 88 1E 02 06 */ lbz r0, 0x206(r30) -/* 801F7EFC 7C 1F 00 40 */ cmplw r31, r0 -/* 801F7F00 41 82 00 0C */ beq lbl_801F7F0C -/* 801F7F04 7F C3 F3 78 */ mr r3, r30 -/* 801F7F08 48 00 10 21 */ bl changeActiveColor__13dMenu_Skill_cFv -lbl_801F7F0C: -/* 801F7F0C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801F7F10 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801F7F14 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F7F18 7C 08 03 A6 */ mtlr r0 -/* 801F7F1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F7F20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/Execute__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/Execute__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index 850a46e5722..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/Execute__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80C5CBA4: -/* 80C5CBA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CBA8 7C 08 02 A6 */ mflr r0 -/* 80C5CBAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CBB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5CBB4 7C 7F 1B 78 */ mr r31, r3 -/* 80C5CBB8 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80C5CBBC 4B 3E BC B1 */ bl eventUpdate__17dEvLib_callback_cFv -/* 80C5CBC0 7F E3 FB 78 */ mr r3, r31 -/* 80C5CBC4 48 00 00 25 */ bl procMain__20dalv4CandleDemoTag_cFv -/* 80C5CBC8 7F E3 FB 78 */ mr r3, r31 -/* 80C5CBCC 4B FF FE 8D */ bl setBaseMtx__20dalv4CandleDemoTag_cFv -/* 80C5CBD0 38 60 00 01 */ li r3, 1 -/* 80C5CBD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5CBD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CBDC 7C 08 03 A6 */ mtlr r0 -/* 80C5CBE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CBE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__ct__24dalv4CandleDemoTag_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__ct__24dalv4CandleDemoTag_HIO_cFv.s deleted file mode 100644 index 496e18a8374..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__ct__24dalv4CandleDemoTag_HIO_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80C5C9EC: -/* 80C5C9EC 3C 80 80 C6 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C5D334@ha */ -/* 80C5C9F0 38 04 D3 34 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C5D334@l */ -/* 80C5C9F4 90 03 00 00 */ stw r0, 0(r3) -/* 80C5C9F8 3C 80 80 C6 */ lis r4, __vt__24dalv4CandleDemoTag_HIO_c@ha /* 0x80C5D328@ha */ -/* 80C5C9FC 38 04 D3 28 */ addi r0, r4, __vt__24dalv4CandleDemoTag_HIO_c@l /* 0x80C5D328@l */ -/* 80C5CA00 90 03 00 00 */ stw r0, 0(r3) -/* 80C5CA04 38 00 00 3C */ li r0, 0x3c -/* 80C5CA08 B0 03 00 04 */ sth r0, 4(r3) -/* 80C5CA0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 082a352ea62..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C5CA10: -/* 80C5CA10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CA14 7C 08 02 A6 */ mflr r0 -/* 80C5CA18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CA1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5CA20 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5CA24 41 82 00 1C */ beq lbl_80C5CA40 -/* 80C5CA28 3C A0 80 C6 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C5D334@ha */ -/* 80C5CA2C 38 05 D3 34 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C5D334@l */ -/* 80C5CA30 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5CA34 7C 80 07 35 */ extsh. r0, r4 -/* 80C5CA38 40 81 00 08 */ ble lbl_80C5CA40 -/* 80C5CA3C 4B 67 23 01 */ bl __dl__FPv -lbl_80C5CA40: -/* 80C5CA40 7F E3 FB 78 */ mr r3, r31 -/* 80C5CA44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5CA48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CA4C 7C 08 03 A6 */ mtlr r0 -/* 80C5CA50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CA54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__24dalv4CandleDemoTag_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__24dalv4CandleDemoTag_HIO_cFv.s deleted file mode 100644 index 3ea2314a771..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/__dt__24dalv4CandleDemoTag_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5D07C: -/* 80C5D07C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5D080 7C 08 02 A6 */ mflr r0 -/* 80C5D084 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5D088 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5D08C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5D090 41 82 00 30 */ beq lbl_80C5D0C0 -/* 80C5D094 3C 60 80 C6 */ lis r3, __vt__24dalv4CandleDemoTag_HIO_c@ha /* 0x80C5D328@ha */ -/* 80C5D098 38 03 D3 28 */ addi r0, r3, __vt__24dalv4CandleDemoTag_HIO_c@l /* 0x80C5D328@l */ -/* 80C5D09C 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5D0A0 41 82 00 10 */ beq lbl_80C5D0B0 -/* 80C5D0A4 3C 60 80 C6 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C5D334@ha */ -/* 80C5D0A8 38 03 D3 34 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C5D334@l */ -/* 80C5D0AC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C5D0B0: -/* 80C5D0B0 7C 80 07 35 */ extsh. r0, r4 -/* 80C5D0B4 40 81 00 0C */ ble lbl_80C5D0C0 -/* 80C5D0B8 7F E3 FB 78 */ mr r3, r31 -/* 80C5D0BC 4B 67 1C 81 */ bl __dl__FPv -lbl_80C5D0C0: -/* 80C5D0C0 7F E3 FB 78 */ mr r3, r31 -/* 80C5D0C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5D0C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5D0CC 7C 08 03 A6 */ mtlr r0 -/* 80C5D0D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5D0D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 642806f7c4e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5D05C: -/* 80C5D05C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5D060 7C 08 02 A6 */ mflr r0 -/* 80C5D064 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5D068 4B FF FA 29 */ bl create__20dalv4CandleDemoTag_cFv -/* 80C5D06C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5D070 7C 08 03 A6 */ mtlr r0 -/* 80C5D074 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5D078 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c.s deleted file mode 100644 index c68fe311800..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5D03C: -/* 80C5D03C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5D040 7C 08 02 A6 */ mflr r0 -/* 80C5D044 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5D048 4B FF FF AD */ bl Delete__20dalv4CandleDemoTag_cFv -/* 80C5D04C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5D050 7C 08 03 A6 */ mtlr r0 -/* 80C5D054 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5D058 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c.s deleted file mode 100644 index a968297bbfa..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5CFFC: -/* 80C5CFFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5D000 7C 08 02 A6 */ mflr r0 -/* 80C5D004 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5D008 4B FF FF E5 */ bl Draw__20dalv4CandleDemoTag_cFv -/* 80C5D00C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5D010 7C 08 03 A6 */ mtlr r0 -/* 80C5D014 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5D018 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c.s deleted file mode 100644 index 75e725c8115..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5D01C: -/* 80C5D01C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5D020 7C 08 02 A6 */ mflr r0 -/* 80C5D024 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5D028 4B FF FB 7D */ bl Execute__20dalv4CandleDemoTag_cFv -/* 80C5D02C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5D030 7C 08 03 A6 */ mtlr r0 -/* 80C5D034 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5D038 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/eventStart__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/eventStart__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index 4833f0e0c65..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/eventStart__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80C5CF78: -/* 80C5CF78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CF7C 7C 08 02 A6 */ mflr r0 -/* 80C5CF80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CF84 4B FF FE 3D */ bl init_modeEnemyCreate__20dalv4CandleDemoTag_cFv -/* 80C5CF88 38 60 00 01 */ li r3, 1 -/* 80C5CF8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CF90 7C 08 03 A6 */ mtlr r0 -/* 80C5CF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CF98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnd__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnd__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index 0149aeaa1c4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnd__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C5CF34: -/* 80C5CF34 38 00 00 03 */ li r0, 3 -/* 80C5CF38 98 03 05 84 */ stb r0, 0x584(r3) -/* 80C5CF3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnemyCreate__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnemyCreate__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index a038f100724..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeEnemyCreate__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80C5CDC0: -/* 80C5CDC0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C5CDC4 7C 08 02 A6 */ mflr r0 -/* 80C5CDC8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C5CDCC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C5CDD0 4B 70 54 09 */ bl _savegpr_28 -/* 80C5CDD4 7C 7C 1B 78 */ mr r28, r3 -/* 80C5CDD8 88 63 05 85 */ lbz r3, 0x585(r3) -/* 80C5CDDC 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 80C5CDE0 7C 04 07 74 */ extsb r4, r0 -/* 80C5CDE4 4B 3F 4A 09 */ bl dPath_GetRoomPath__Fii -/* 80C5CDE8 7C 7E 1B 78 */ mr r30, r3 -/* 80C5CDEC 3B A0 00 00 */ li r29, 0 -/* 80C5CDF0 3B E0 00 00 */ li r31, 0 -/* 80C5CDF4 48 00 00 50 */ b lbl_80C5CE44 -lbl_80C5CDF8: -/* 80C5CDF8 80 1E 00 08 */ lwz r0, 8(r30) -/* 80C5CDFC 7C 60 FA 14 */ add r3, r0, r31 -/* 80C5CE00 C0 03 00 04 */ lfs f0, 4(r3) -/* 80C5CE04 D0 01 00 08 */ stfs f0, 8(r1) -/* 80C5CE08 C0 03 00 08 */ lfs f0, 8(r3) -/* 80C5CE0C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C5CE10 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80C5CE14 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C5CE18 38 60 01 B7 */ li r3, 0x1b7 -/* 80C5CE1C 38 80 FE FF */ li r4, -257 -/* 80C5CE20 38 A1 00 08 */ addi r5, r1, 8 -/* 80C5CE24 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 80C5CE28 7C 06 07 74 */ extsb r6, r0 -/* 80C5CE2C 38 E0 00 00 */ li r7, 0 -/* 80C5CE30 39 00 00 00 */ li r8, 0 -/* 80C5CE34 39 20 FF FF */ li r9, -1 -/* 80C5CE38 4B 3B CF 61 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 80C5CE3C 3B BD 00 01 */ addi r29, r29, 1 -/* 80C5CE40 3B FF 00 10 */ addi r31, r31, 0x10 -lbl_80C5CE44: -/* 80C5CE44 A0 1E 00 00 */ lhz r0, 0(r30) -/* 80C5CE48 7C 1D 00 00 */ cmpw r29, r0 -/* 80C5CE4C 41 80 FF AC */ blt lbl_80C5CDF8 -/* 80C5CE50 38 00 00 01 */ li r0, 1 -/* 80C5CE54 98 1C 05 84 */ stb r0, 0x584(r28) -/* 80C5CE58 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C5CE5C 4B 70 53 C9 */ bl _restgpr_28 -/* 80C5CE60 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C5CE64 7C 08 03 A6 */ mtlr r0 -/* 80C5CE68 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C5CE6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeNG__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeNG__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index e993b66a590..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeNG__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C5CEB4: -/* 80C5CEB4 38 00 00 02 */ li r0, 2 -/* 80C5CEB8 98 03 05 84 */ stb r0, 0x584(r3) -/* 80C5CEBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeWatch__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeWatch__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index ae0159ad268..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/init_modeWatch__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C5CCA4: -/* 80C5CCA4 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C5D354@ha */ -/* 80C5CCA8 38 84 D3 54 */ addi r4, r4, l_HIO@l /* 0x80C5D354@l */ -/* 80C5CCAC A8 04 00 04 */ lha r0, 4(r4) -/* 80C5CCB0 B0 03 05 88 */ sth r0, 0x588(r3) -/* 80C5CCB4 38 00 00 00 */ li r0, 0 -/* 80C5CCB8 98 03 05 84 */ stb r0, 0x584(r3) -/* 80C5CCBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnd__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnd__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index a32b6b40155..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnd__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80C5CF40: -/* 80C5CF40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CF44 7C 08 02 A6 */ mflr r0 -/* 80C5CF48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CF4C 7C 65 1B 78 */ mr r5, r3 -/* 80C5CF50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5CF54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5CF58 88 85 05 86 */ lbz r4, 0x586(r5) -/* 80C5CF5C 88 05 04 BA */ lbz r0, 0x4ba(r5) -/* 80C5CF60 7C 05 07 74 */ extsb r5, r0 -/* 80C5CF64 4B 3D 83 4D */ bl offSwitch__10dSv_info_cFii -/* 80C5CF68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CF6C 7C 08 03 A6 */ mtlr r0 -/* 80C5CF70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CF74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnemyCreate__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnemyCreate__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index 6b17534d565..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeEnemyCreate__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80C5CE70: -/* 80C5CE70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CE74 7C 08 02 A6 */ mflr r0 -/* 80C5CE78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CE7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5CE80 7C 7F 1B 78 */ mr r31, r3 -/* 80C5CE84 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80C5CE88 7C 03 07 74 */ extsb r3, r0 -/* 80C5CE8C 4B 3B FB 91 */ bl fopAcM_myRoomSearchEnemy__FSc -/* 80C5CE90 28 03 00 00 */ cmplwi r3, 0 -/* 80C5CE94 41 82 00 0C */ beq lbl_80C5CEA0 -/* 80C5CE98 7F E3 FB 78 */ mr r3, r31 -/* 80C5CE9C 48 00 00 19 */ bl init_modeNG__20dalv4CandleDemoTag_cFv -lbl_80C5CEA0: -/* 80C5CEA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5CEA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CEA8 7C 08 03 A6 */ mtlr r0 -/* 80C5CEAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CEB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeNG__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeNG__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index 935486e18c8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeNG__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C5CEC0: -/* 80C5CEC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CEC4 7C 08 02 A6 */ mflr r0 -/* 80C5CEC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CECC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5CED0 7C 7F 1B 78 */ mr r31, r3 -/* 80C5CED4 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80C5CED8 7C 03 07 74 */ extsb r3, r0 -/* 80C5CEDC 4B 3B FB 41 */ bl fopAcM_myRoomSearchEnemy__FSc -/* 80C5CEE0 28 03 00 00 */ cmplwi r3, 0 -/* 80C5CEE4 40 82 00 3C */ bne lbl_80C5CF20 -/* 80C5CEE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5CEEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5CEF0 88 9F 05 87 */ lbz r4, 0x587(r31) -/* 80C5CEF4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5CEF8 7C 05 07 74 */ extsb r5, r0 -/* 80C5CEFC 4B 3D 83 05 */ bl onSwitch__10dSv_info_cFii -/* 80C5CF00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5CF04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5CF08 88 9F 05 86 */ lbz r4, 0x586(r31) -/* 80C5CF0C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5CF10 7C 05 07 74 */ extsb r5, r0 -/* 80C5CF14 4B 3D 83 9D */ bl offSwitch__10dSv_info_cFii -/* 80C5CF18 7F E3 FB 78 */ mr r3, r31 -/* 80C5CF1C 4B FF FD 89 */ bl init_modeWatch__20dalv4CandleDemoTag_cFv -lbl_80C5CF20: -/* 80C5CF20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5CF24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CF28 7C 08 03 A6 */ mtlr r0 -/* 80C5CF2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CF30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeWatch__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeWatch__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index ba027b8112e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/modeWatch__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_80C5CCC0: -/* 80C5CCC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CCC4 7C 08 02 A6 */ mflr r0 -/* 80C5CCC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CCCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5CCD0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5CCD4 7C 7F 1B 78 */ mr r31, r3 -/* 80C5CCD8 3C 60 80 C6 */ lis r3, searchShutterAct__20dalv4CandleDemoTag_cFPvPv@ha /* 0x80C5CF9C@ha */ -/* 80C5CCDC 38 63 CF 9C */ addi r3, r3, searchShutterAct__20dalv4CandleDemoTag_cFPvPv@l /* 0x80C5CF9C@l */ -/* 80C5CCE0 7F E4 FB 78 */ mr r4, r31 -/* 80C5CCE4 4B 3B CB 15 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C5CCE8 90 7F 05 8C */ stw r3, 0x58c(r31) -/* 80C5CCEC 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80C5CCF0 28 03 00 00 */ cmplwi r3, 0 -/* 80C5CCF4 40 82 00 0C */ bne lbl_80C5CD00 -/* 80C5CCF8 3B C0 00 01 */ li r30, 1 -/* 80C5CCFC 48 00 00 08 */ b lbl_80C5CD04 -lbl_80C5CD00: -/* 80C5CD00 8B C3 05 CA */ lbz r30, 0x5ca(r3) -lbl_80C5CD04: -/* 80C5CD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5CD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5CD0C 88 9F 05 86 */ lbz r4, 0x586(r31) -/* 80C5CD10 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5CD14 7C 05 07 74 */ extsb r5, r0 -/* 80C5CD18 4B 3D 86 49 */ bl isSwitch__10dSv_info_cCFii -/* 80C5CD1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5CD20 41 82 00 5C */ beq lbl_80C5CD7C -/* 80C5CD24 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80C5CD28 41 82 00 54 */ beq lbl_80C5CD7C -/* 80C5CD2C A0 7F 05 88 */ lhz r3, 0x588(r31) -/* 80C5CD30 28 03 00 00 */ cmplwi r3, 0 -/* 80C5CD34 40 82 00 40 */ bne lbl_80C5CD74 -/* 80C5CD38 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5CD3C 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C5CD40 2C 04 00 FF */ cmpwi r4, 0xff -/* 80C5CD44 41 82 00 18 */ beq lbl_80C5CD5C -/* 80C5CD48 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80C5CD4C 38 A0 00 FF */ li r5, 0xff -/* 80C5CD50 38 C0 00 01 */ li r6, 1 -/* 80C5CD54 4B 3E BB ED */ bl orderEvent__17dEvLib_callback_cFiii -/* 80C5CD58 48 00 00 24 */ b lbl_80C5CD7C -lbl_80C5CD5C: -/* 80C5CD5C 7F E3 FB 78 */ mr r3, r31 -/* 80C5CD60 81 9F 05 80 */ lwz r12, 0x580(r31) -/* 80C5CD64 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80C5CD68 7D 89 03 A6 */ mtctr r12 -/* 80C5CD6C 4E 80 04 21 */ bctrl -/* 80C5CD70 48 00 00 0C */ b lbl_80C5CD7C -lbl_80C5CD74: -/* 80C5CD74 38 03 FF FF */ addi r0, r3, -1 -/* 80C5CD78 B0 1F 05 88 */ sth r0, 0x588(r31) -lbl_80C5CD7C: -/* 80C5CD7C A8 1F 04 E4 */ lha r0, 0x4e4(r31) -/* 80C5CD80 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C5CD84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5CD88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5CD8C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5CD90 7C 05 07 74 */ extsb r5, r0 -/* 80C5CD94 4B 3D 85 CD */ bl isSwitch__10dSv_info_cCFii -/* 80C5CD98 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5CD9C 41 82 00 0C */ beq lbl_80C5CDA8 -/* 80C5CDA0 7F E3 FB 78 */ mr r3, r31 -/* 80C5CDA4 48 00 01 91 */ bl init_modeEnd__20dalv4CandleDemoTag_cFv -lbl_80C5CDA8: -/* 80C5CDA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5CDAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5CDB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CDB4 7C 08 03 A6 */ mtlr r0 -/* 80C5CDB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CDBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/searchShutterAct__20dalv4CandleDemoTag_cFPvPv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/searchShutterAct__20dalv4CandleDemoTag_cFPvPv.s deleted file mode 100644 index ab09759450a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/searchShutterAct__20dalv4CandleDemoTag_cFPvPv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80C5CF9C: -/* 80C5CF9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CFA0 7C 08 02 A6 */ mflr r0 -/* 80C5CFA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CFA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5CFAC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5CFB0 41 82 00 24 */ beq lbl_80C5CFD4 -/* 80C5CFB4 4B 3B BD 2D */ bl fopAc_IsActor__FPv -/* 80C5CFB8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5CFBC 41 82 00 18 */ beq lbl_80C5CFD4 -/* 80C5CFC0 A8 1F 00 0E */ lha r0, 0xe(r31) -/* 80C5CFC4 2C 00 00 9B */ cmpwi r0, 0x9b -/* 80C5CFC8 40 82 00 0C */ bne lbl_80C5CFD4 -/* 80C5CFCC 7F E3 FB 78 */ mr r3, r31 -/* 80C5CFD0 48 00 00 08 */ b lbl_80C5CFD8 -lbl_80C5CFD4: -/* 80C5CFD4 38 60 00 00 */ li r3, 0 -lbl_80C5CFD8: -/* 80C5CFD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5CFDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CFE0 7C 08 03 A6 */ mtlr r0 -/* 80C5CFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CFE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/setBaseMtx__20dalv4CandleDemoTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/setBaseMtx__20dalv4CandleDemoTag_cFv.s deleted file mode 100644 index 5a7e1f7a090..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag/setBaseMtx__20dalv4CandleDemoTag_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80C5CA58: -/* 80C5CA58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5CA5C 7C 08 02 A6 */ mflr r0 -/* 80C5CA60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5CA64 7C 64 1B 78 */ mr r4, r3 -/* 80C5CA68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5CA6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5CA70 C0 24 04 D0 */ lfs f1, 0x4d0(r4) -/* 80C5CA74 C0 44 04 D4 */ lfs f2, 0x4d4(r4) -/* 80C5CA78 C0 64 04 D8 */ lfs f3, 0x4d8(r4) -/* 80C5CA7C 4B 6E 9E 6D */ bl PSMTXTrans -/* 80C5CA80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5CA84 7C 08 03 A6 */ mtlr r0 -/* 80C5CA88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5CA8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Delete__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Delete__11daLv4Gate_cFv.s deleted file mode 100644 index defc1920946..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Delete__11daLv4Gate_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C5F28C: -/* 80C5F28C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F290 7C 08 02 A6 */ mflr r0 -/* 80C5F294 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F298 3C 80 80 C6 */ lis r4, d_a_obj_lv4Gate__stringBase0@ha /* 0x80C5F414@ha */ -/* 80C5F29C 38 84 F4 14 */ addi r4, r4, d_a_obj_lv4Gate__stringBase0@l /* 0x80C5F414@l */ -/* 80C5F2A0 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80C5F2A4 4B 3C DD 65 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C5F2A8 38 60 00 01 */ li r3, 1 -/* 80C5F2AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F2B0 7C 08 03 A6 */ mtlr r0 -/* 80C5F2B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F2B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Draw__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Draw__11daLv4Gate_cFv.s deleted file mode 100644 index cb1a5f57030..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Draw__11daLv4Gate_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C5F1E8: -/* 80C5F1E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F1EC 7C 08 02 A6 */ mflr r0 -/* 80C5F1F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F1F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F1F8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5F1FC 7C 7E 1B 78 */ mr r30, r3 -/* 80C5F200 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5F204 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5F208 38 80 00 10 */ li r4, 0x10 -/* 80C5F20C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C5F210 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C5F214 4B 54 45 B1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C5F218 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5F21C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5F220 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C5F224 80 84 00 04 */ lwz r4, 4(r4) -/* 80C5F228 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C5F22C 4B 54 5B 75 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C5F230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5F234 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5F238 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C5F23C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C5F240 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C5F244 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5F248 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C5F24C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C5F250 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C5F254 4B 3A EA 71 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C5F258 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5F25C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5F260 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C5F264 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5F268 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C5F26C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C5F270 38 60 00 01 */ li r3, 1 -/* 80C5F274 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F278 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5F27C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F280 7C 08 03 A6 */ mtlr r0 -/* 80C5F284 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F288 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Execute__11daLv4Gate_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Execute__11daLv4Gate_cFPPA3_A4_f.s deleted file mode 100644 index 106342ef35b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/Execute__11daLv4Gate_cFPPA3_A4_f.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80C5EE54: -/* 80C5EE54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5EE58 7C 08 02 A6 */ mflr r0 -/* 80C5EE5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5EE60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5EE64 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5EE68 7C 7E 1B 78 */ mr r30, r3 -/* 80C5EE6C 7C 9F 23 78 */ mr r31, r4 -/* 80C5EE70 48 00 00 35 */ bl moveGate__11daLv4Gate_cFv -/* 80C5EE74 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C5EE78 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C5EE7C 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5EE80 7F C3 F3 78 */ mr r3, r30 -/* 80C5EE84 4B FF FD 61 */ bl setBaseMtx__11daLv4Gate_cFv -/* 80C5EE88 38 60 00 01 */ li r3, 1 -/* 80C5EE8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5EE90 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5EE94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5EE98 7C 08 03 A6 */ mtlr r0 -/* 80C5EE9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5EEA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__ct__15daLv4Gate_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__ct__15daLv4Gate_HIO_cFv.s deleted file mode 100644 index 104fec4e630..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__ct__15daLv4Gate_HIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C5EB6C: -/* 80C5EB6C 3C 80 80 C6 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C5F508@ha */ -/* 80C5EB70 38 04 F5 08 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C5F508@l */ -/* 80C5EB74 90 03 00 00 */ stw r0, 0(r3) -/* 80C5EB78 3C 80 80 C6 */ lis r4, __vt__15daLv4Gate_HIO_c@ha /* 0x80C5F4FC@ha */ -/* 80C5EB7C 38 04 F4 FC */ addi r0, r4, __vt__15daLv4Gate_HIO_c@l /* 0x80C5F4FC@l */ -/* 80C5EB80 90 03 00 00 */ stw r0, 0(r3) -/* 80C5EB84 3C 80 80 C6 */ lis r4, lit_3625@ha /* 0x80C5F3F4@ha */ -/* 80C5EB88 C0 04 F3 F4 */ lfs f0, lit_3625@l(r4) /* 0x80C5F3F4@l */ -/* 80C5EB8C D0 03 00 04 */ stfs f0, 4(r3) -/* 80C5EB90 38 00 00 03 */ li r0, 3 -/* 80C5EB94 98 03 00 08 */ stb r0, 8(r3) -/* 80C5EB98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 90df4870aa2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C5EB9C: -/* 80C5EB9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5EBA0 7C 08 02 A6 */ mflr r0 -/* 80C5EBA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5EBA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5EBAC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5EBB0 41 82 00 1C */ beq lbl_80C5EBCC -/* 80C5EBB4 3C A0 80 C6 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C5F508@ha */ -/* 80C5EBB8 38 05 F5 08 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C5F508@l */ -/* 80C5EBBC 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5EBC0 7C 80 07 35 */ extsh. r0, r4 -/* 80C5EBC4 40 81 00 08 */ ble lbl_80C5EBCC -/* 80C5EBC8 4B 67 01 75 */ bl __dl__FPv -lbl_80C5EBCC: -/* 80C5EBCC 7F E3 FB 78 */ mr r3, r31 -/* 80C5EBD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5EBD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5EBD8 7C 08 03 A6 */ mtlr r0 -/* 80C5EBDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5EBE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__15daLv4Gate_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__15daLv4Gate_HIO_cFv.s deleted file mode 100644 index 312d3548946..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__dt__15daLv4Gate_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5F348: -/* 80C5F348 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F34C 7C 08 02 A6 */ mflr r0 -/* 80C5F350 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F354 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F358 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5F35C 41 82 00 30 */ beq lbl_80C5F38C -/* 80C5F360 3C 60 80 C6 */ lis r3, __vt__15daLv4Gate_HIO_c@ha /* 0x80C5F4FC@ha */ -/* 80C5F364 38 03 F4 FC */ addi r0, r3, __vt__15daLv4Gate_HIO_c@l /* 0x80C5F4FC@l */ -/* 80C5F368 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5F36C 41 82 00 10 */ beq lbl_80C5F37C -/* 80C5F370 3C 60 80 C6 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C5F508@ha */ -/* 80C5F374 38 03 F5 08 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C5F508@l */ -/* 80C5F378 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C5F37C: -/* 80C5F37C 7C 80 07 35 */ extsh. r0, r4 -/* 80C5F380 40 81 00 0C */ ble lbl_80C5F38C -/* 80C5F384 7F E3 FB 78 */ mr r3, r31 -/* 80C5F388 4B 66 F9 B5 */ bl __dl__FPv -lbl_80C5F38C: -/* 80C5F38C 7F E3 FB 78 */ mr r3, r31 -/* 80C5F390 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F398 7C 08 03 A6 */ mtlr r0 -/* 80C5F39C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F3A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__sinit_d_a_obj_lv4Gate_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__sinit_d_a_obj_lv4Gate_cpp.s deleted file mode 100644 index fe0c66269b2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/__sinit_d_a_obj_lv4Gate_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C5F3A4: -/* 80C5F3A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F3A8 7C 08 02 A6 */ mflr r0 -/* 80C5F3AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F3B0 3C 60 80 C6 */ lis r3, l_HIO@ha /* 0x80C5F52C@ha */ -/* 80C5F3B4 38 63 F5 2C */ addi r3, r3, l_HIO@l /* 0x80C5F52C@l */ -/* 80C5F3B8 4B FF F7 B5 */ bl __ct__15daLv4Gate_HIO_cFv -/* 80C5F3BC 3C 80 80 C6 */ lis r4, __dt__15daLv4Gate_HIO_cFv@ha /* 0x80C5F348@ha */ -/* 80C5F3C0 38 84 F3 48 */ addi r4, r4, __dt__15daLv4Gate_HIO_cFv@l /* 0x80C5F348@l */ -/* 80C5F3C4 3C A0 80 C6 */ lis r5, lit_3619@ha /* 0x80C5F520@ha */ -/* 80C5F3C8 38 A5 F5 20 */ addi r5, r5, lit_3619@l /* 0x80C5F520@l */ -/* 80C5F3CC 4B FF F7 2D */ bl __register_global_object -/* 80C5F3D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F3D4 7C 08 03 A6 */ mtlr r0 -/* 80C5F3D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F3DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/create__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/create__11daLv4Gate_cFv.s deleted file mode 100644 index d3427e0093c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/create__11daLv4Gate_cFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80C5ECEC: -/* 80C5ECEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C5ECF0 7C 08 02 A6 */ mflr r0 -/* 80C5ECF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C5ECF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5ECFC 4B 70 34 E1 */ bl _savegpr_29 -/* 80C5ED00 7C 7D 1B 78 */ mr r29, r3 -/* 80C5ED04 3C 80 80 C6 */ lis r4, lit_3625@ha /* 0x80C5F3F4@ha */ -/* 80C5ED08 3B E4 F3 F4 */ addi r31, r4, lit_3625@l /* 0x80C5F3F4@l */ -/* 80C5ED0C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5ED10 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5ED14 40 82 00 28 */ bne lbl_80C5ED3C -/* 80C5ED18 28 1D 00 00 */ cmplwi r29, 0 -/* 80C5ED1C 41 82 00 14 */ beq lbl_80C5ED30 -/* 80C5ED20 4B 41 99 05 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C5ED24 3C 60 80 C6 */ lis r3, __vt__11daLv4Gate_c@ha /* 0x80C5F4D4@ha */ -/* 80C5ED28 38 03 F4 D4 */ addi r0, r3, __vt__11daLv4Gate_c@l /* 0x80C5F4D4@l */ -/* 80C5ED2C 90 1D 05 9C */ stw r0, 0x59c(r29) -lbl_80C5ED30: -/* 80C5ED30 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80C5ED34 60 00 00 08 */ ori r0, r0, 8 -/* 80C5ED38 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80C5ED3C: -/* 80C5ED3C 38 7D 05 A0 */ addi r3, r29, 0x5a0 -/* 80C5ED40 3C 80 80 C6 */ lis r4, d_a_obj_lv4Gate__stringBase0@ha /* 0x80C5F414@ha */ -/* 80C5ED44 38 84 F4 14 */ addi r4, r4, d_a_obj_lv4Gate__stringBase0@l /* 0x80C5F414@l */ -/* 80C5ED48 4B 3C E1 75 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C5ED4C 7C 7E 1B 78 */ mr r30, r3 -/* 80C5ED50 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C5ED54 40 82 00 E4 */ bne lbl_80C5EE38 -/* 80C5ED58 7F A3 EB 78 */ mr r3, r29 -/* 80C5ED5C 3C 80 80 C6 */ lis r4, d_a_obj_lv4Gate__stringBase0@ha /* 0x80C5F414@ha */ -/* 80C5ED60 38 84 F4 14 */ addi r4, r4, d_a_obj_lv4Gate__stringBase0@l /* 0x80C5F414@l */ -/* 80C5ED64 38 A0 00 07 */ li r5, 7 -/* 80C5ED68 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C5ED6C 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C5ED70 38 E0 23 00 */ li r7, 0x2300 -/* 80C5ED74 39 00 00 00 */ li r8, 0 -/* 80C5ED78 4B 41 9A 45 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C5ED7C 2C 03 00 05 */ cmpwi r3, 5 -/* 80C5ED80 40 82 00 0C */ bne lbl_80C5ED8C -/* 80C5ED84 38 60 00 05 */ li r3, 5 -/* 80C5ED88 48 00 00 B4 */ b lbl_80C5EE3C -lbl_80C5ED8C: -/* 80C5ED8C 80 7D 05 A8 */ lwz r3, 0x5a8(r29) -/* 80C5ED90 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C5ED94 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80C5ED98 80 7D 05 A8 */ lwz r3, 0x5a8(r29) -/* 80C5ED9C 80 83 00 04 */ lwz r4, 4(r3) -/* 80C5EDA0 7F A3 EB 78 */ mr r3, r29 -/* 80C5EDA4 4B 3B B7 D5 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C5EDA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5EDAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5EDB0 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80C5EDB4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C5EDB8 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80C5EDBC 7C 05 07 74 */ extsb r5, r0 -/* 80C5EDC0 4B 3D 65 A1 */ bl isSwitch__10dSv_info_cCFii -/* 80C5EDC4 98 7D 05 AE */ stb r3, 0x5ae(r29) -/* 80C5EDC8 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80C5EDCC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80C5EDD0 98 1D 05 AF */ stb r0, 0x5af(r29) -/* 80C5EDD4 88 1D 05 AF */ lbz r0, 0x5af(r29) -/* 80C5EDD8 28 00 00 00 */ cmplwi r0, 0 -/* 80C5EDDC 40 82 00 0C */ bne lbl_80C5EDE8 -/* 80C5EDE0 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80C5EDE4 48 00 00 08 */ b lbl_80C5EDEC -lbl_80C5EDE8: -/* 80C5EDE8 C0 1F 00 0C */ lfs f0, 0xc(r31) -lbl_80C5EDEC: -/* 80C5EDEC D0 1D 05 B0 */ stfs f0, 0x5b0(r29) -/* 80C5EDF0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80C5EDF4 D0 1D 05 B4 */ stfs f0, 0x5b4(r29) -/* 80C5EDF8 38 00 00 00 */ li r0, 0 -/* 80C5EDFC 98 1D 05 AD */ stb r0, 0x5ad(r29) -/* 80C5EE00 88 1D 05 AE */ lbz r0, 0x5ae(r29) -/* 80C5EE04 28 00 00 00 */ cmplwi r0, 0 -/* 80C5EE08 41 82 00 20 */ beq lbl_80C5EE28 -/* 80C5EE0C C0 1D 05 B0 */ lfs f0, 0x5b0(r29) -/* 80C5EE10 D0 1D 05 B4 */ stfs f0, 0x5b4(r29) -/* 80C5EE14 38 00 00 01 */ li r0, 1 -/* 80C5EE18 98 1D 05 AD */ stb r0, 0x5ad(r29) -/* 80C5EE1C 7F A3 EB 78 */ mr r3, r29 -/* 80C5EE20 48 00 02 A5 */ bl init_modeMoveEnd__11daLv4Gate_cFv -/* 80C5EE24 48 00 00 0C */ b lbl_80C5EE30 -lbl_80C5EE28: -/* 80C5EE28 7F A3 EB 78 */ mr r3, r29 -/* 80C5EE2C 48 00 01 1D */ bl init_modeWait__11daLv4Gate_cFv -lbl_80C5EE30: -/* 80C5EE30 7F A3 EB 78 */ mr r3, r29 -/* 80C5EE34 4B FF FD B1 */ bl setBaseMtx__11daLv4Gate_cFv -lbl_80C5EE38: -/* 80C5EE38 7F C3 F3 78 */ mr r3, r30 -lbl_80C5EE3C: -/* 80C5EE3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5EE40 4B 70 33 E9 */ bl _restgpr_29 -/* 80C5EE44 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C5EE48 7C 08 03 A6 */ mtlr r0 -/* 80C5EE4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C5EE50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 39fdfef8d78..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5F328: -/* 80C5F328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F32C 7C 08 02 A6 */ mflr r0 -/* 80C5F330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F334 4B FF F9 B9 */ bl create__11daLv4Gate_cFv -/* 80C5F338 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F33C 7C 08 03 A6 */ mtlr r0 -/* 80C5F340 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F344 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Delete__FP11daLv4Gate_c.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Delete__FP11daLv4Gate_c.s deleted file mode 100644 index d7b64504663..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Delete__FP11daLv4Gate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5F308: -/* 80C5F308 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F30C 7C 08 02 A6 */ mflr r0 -/* 80C5F310 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F314 4B 41 95 C9 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C5F318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F31C 7C 08 03 A6 */ mtlr r0 -/* 80C5F320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F324 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Draw__FP11daLv4Gate_c.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Draw__FP11daLv4Gate_c.s deleted file mode 100644 index 9a82b94a327..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Draw__FP11daLv4Gate_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C5F2BC: -/* 80C5F2BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F2C0 7C 08 02 A6 */ mflr r0 -/* 80C5F2C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F2C8 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C5F2CC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C5F2D0 7D 89 03 A6 */ mtctr r12 -/* 80C5F2D4 4E 80 04 21 */ bctrl -/* 80C5F2D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F2DC 7C 08 03 A6 */ mtlr r0 -/* 80C5F2E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F2E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Execute__FP11daLv4Gate_c.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Execute__FP11daLv4Gate_c.s deleted file mode 100644 index 912edff5353..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/daLv4Gate_Execute__FP11daLv4Gate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5F2E8: -/* 80C5F2E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F2EC 7C 08 02 A6 */ mflr r0 -/* 80C5F2F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F2F4 4B 41 96 5D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C5F2F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F2FC 7C 08 03 A6 */ mtlr r0 -/* 80C5F300 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F304 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMoveEnd__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMoveEnd__11daLv4Gate_cFv.s deleted file mode 100644 index 1a038677700..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMoveEnd__11daLv4Gate_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80C5F0C4: -/* 80C5F0C4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C5F0C8 7C 08 02 A6 */ mflr r0 -/* 80C5F0CC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C5F0D0 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80C5F0D4 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80C5F0D8 7C 7F 1B 78 */ mr r31, r3 -/* 80C5F0DC 3C 60 80 C6 */ lis r3, lit_3625@ha /* 0x80C5F3F4@ha */ -/* 80C5F0E0 3B C3 F3 F4 */ addi r30, r3, lit_3625@l /* 0x80C5F3F4@l */ -/* 80C5F0E4 88 1F 05 AD */ lbz r0, 0x5ad(r31) -/* 80C5F0E8 28 00 00 00 */ cmplwi r0, 0 -/* 80C5F0EC 40 82 00 D8 */ bne lbl_80C5F1C4 -/* 80C5F0F0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5F0F4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5F0F8 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C5F0FC A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C5F100 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C5F104 4B 3A D1 05 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80C5F108 C0 1F 05 B0 */ lfs f0, 0x5b0(r31) -/* 80C5F10C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C5F110 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80C5F114 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80C5F118 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80C5F11C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5F120 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5F124 38 81 00 18 */ addi r4, r1, 0x18 -/* 80C5F128 7C 85 23 78 */ mr r5, r4 -/* 80C5F12C 4B 6E 7C 41 */ bl PSMTXMultVec -/* 80C5F130 38 61 00 18 */ addi r3, r1, 0x18 -/* 80C5F134 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C5F138 7C 65 1B 78 */ mr r5, r3 -/* 80C5F13C 4B 6E 7F 55 */ bl PSVECAdd -/* 80C5F140 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C5F144 7C 03 07 74 */ extsb r3, r0 -/* 80C5F148 4B 3C DF 25 */ bl dComIfGp_getReverb__Fi -/* 80C5F14C 7C 67 1B 78 */ mr r7, r3 -/* 80C5F150 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008012C@ha */ -/* 80C5F154 38 03 01 2C */ addi r0, r3, 0x012C /* 0x0008012C@l */ -/* 80C5F158 90 01 00 08 */ stw r0, 8(r1) -/* 80C5F15C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C5F160 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C5F164 80 63 00 00 */ lwz r3, 0(r3) -/* 80C5F168 38 81 00 08 */ addi r4, r1, 8 -/* 80C5F16C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80C5F170 38 C0 00 00 */ li r6, 0 -/* 80C5F174 C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 80C5F178 FC 40 08 90 */ fmr f2, f1 -/* 80C5F17C C0 7E 00 14 */ lfs f3, 0x14(r30) -/* 80C5F180 FC 80 18 90 */ fmr f4, f3 -/* 80C5F184 39 00 00 00 */ li r8, 0 -/* 80C5F188 4B 64 C7 FD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C5F18C C0 3E 00 04 */ lfs f1, 4(r30) -/* 80C5F190 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80C5F194 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80C5F198 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C5F19C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80C5F1A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5F1A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5F1A8 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80C5F1AC 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C5F52C@ha */ -/* 80C5F1B0 38 84 F5 2C */ addi r4, r4, l_HIO@l /* 0x80C5F52C@l */ -/* 80C5F1B4 88 84 00 08 */ lbz r4, 8(r4) -/* 80C5F1B8 38 A0 00 0F */ li r5, 0xf -/* 80C5F1BC 38 C1 00 0C */ addi r6, r1, 0xc -/* 80C5F1C0 4B 41 08 65 */ bl StartShock__12dVibration_cFii4cXyz -lbl_80C5F1C4: -/* 80C5F1C4 38 00 00 02 */ li r0, 2 -/* 80C5F1C8 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80C5F1CC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80C5F1D0 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80C5F1D4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C5F1D8 7C 08 03 A6 */ mtlr r0 -/* 80C5F1DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C5F1E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMove__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMove__11daLv4Gate_cFv.s deleted file mode 100644 index 1286b29024b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeMove__11daLv4Gate_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C5EFB0: -/* 80C5EFB0 38 00 00 01 */ li r0, 1 -/* 80C5EFB4 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C5EFB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeWait__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeWait__11daLv4Gate_cFv.s deleted file mode 100644 index a7924532188..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/init_modeWait__11daLv4Gate_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C5EF48: -/* 80C5EF48 38 00 00 00 */ li r0, 0 -/* 80C5EF4C 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C5EF50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeMove__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeMove__11daLv4Gate_cFv.s deleted file mode 100644 index 2a5eaec481b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeMove__11daLv4Gate_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80C5EFBC: -/* 80C5EFBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C5EFC0 7C 08 02 A6 */ mflr r0 -/* 80C5EFC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C5EFC8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C5EFCC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C5EFD0 7C 7E 1B 78 */ mr r30, r3 -/* 80C5EFD4 3C 60 80 C6 */ lis r3, lit_3625@ha /* 0x80C5F3F4@ha */ -/* 80C5EFD8 3B E3 F3 F4 */ addi r31, r3, lit_3625@l /* 0x80C5F3F4@l */ -/* 80C5EFDC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5EFE0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5EFE4 A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 80C5EFE8 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80C5EFEC A8 DE 04 E8 */ lha r6, 0x4e8(r30) -/* 80C5EFF0 4B 3A D2 19 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80C5EFF4 C0 1E 05 B0 */ lfs f0, 0x5b0(r30) -/* 80C5EFF8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C5EFFC C0 1F 00 04 */ lfs f0, 4(r31) -/* 80C5F000 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C5F004 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C5F008 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5F00C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5F010 38 81 00 0C */ addi r4, r1, 0xc -/* 80C5F014 7C 85 23 78 */ mr r5, r4 -/* 80C5F018 4B 6E 7D 55 */ bl PSMTXMultVec -/* 80C5F01C 38 61 00 0C */ addi r3, r1, 0xc -/* 80C5F020 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C5F024 7C 65 1B 78 */ mr r5, r3 -/* 80C5F028 4B 6E 80 69 */ bl PSVECAdd -/* 80C5F02C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C5F030 7C 03 07 74 */ extsb r3, r0 -/* 80C5F034 4B 3C E0 39 */ bl dComIfGp_getReverb__Fi -/* 80C5F038 7C 67 1B 78 */ mr r7, r3 -/* 80C5F03C 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008012B@ha */ -/* 80C5F040 38 03 01 2B */ addi r0, r3, 0x012B /* 0x0008012B@l */ -/* 80C5F044 90 01 00 08 */ stw r0, 8(r1) -/* 80C5F048 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C5F04C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C5F050 80 63 00 00 */ lwz r3, 0(r3) -/* 80C5F054 38 81 00 08 */ addi r4, r1, 8 -/* 80C5F058 38 A1 00 0C */ addi r5, r1, 0xc -/* 80C5F05C 38 C0 00 00 */ li r6, 0 -/* 80C5F060 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80C5F064 FC 40 08 90 */ fmr f2, f1 -/* 80C5F068 C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 80C5F06C FC 80 18 90 */ fmr f4, f3 -/* 80C5F070 39 00 00 00 */ li r8, 0 -/* 80C5F074 4B 64 D4 99 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C5F078 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 80C5F07C C0 3E 05 B0 */ lfs f1, 0x5b0(r30) -/* 80C5F080 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80C5F084 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C5F52C@ha */ -/* 80C5F088 38 84 F5 2C */ addi r4, r4, l_HIO@l /* 0x80C5F52C@l */ -/* 80C5F08C C0 64 00 04 */ lfs f3, 4(r4) -/* 80C5F090 C0 9F 00 1C */ lfs f4, 0x1c(r31) -/* 80C5F094 4B 61 08 E9 */ bl cLib_addCalc__FPfffff -/* 80C5F098 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80C5F09C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C5F0A0 40 82 00 0C */ bne lbl_80C5F0AC -/* 80C5F0A4 7F C3 F3 78 */ mr r3, r30 -/* 80C5F0A8 48 00 00 1D */ bl init_modeMoveEnd__11daLv4Gate_cFv -lbl_80C5F0AC: -/* 80C5F0AC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C5F0B0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C5F0B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C5F0B8 7C 08 03 A6 */ mtlr r0 -/* 80C5F0BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C5F0C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeWait__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeWait__11daLv4Gate_cFv.s deleted file mode 100644 index e6fd1d986d0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/modeWait__11daLv4Gate_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C5EF54: -/* 80C5EF54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5EF58 7C 08 02 A6 */ mflr r0 -/* 80C5EF5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5EF60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5EF64 7C 7F 1B 78 */ mr r31, r3 -/* 80C5EF68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5EF6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5EF70 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5EF74 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C5EF78 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5EF7C 7C 05 07 74 */ extsb r5, r0 -/* 80C5EF80 4B 3D 63 E1 */ bl isSwitch__10dSv_info_cCFii -/* 80C5EF84 98 7F 05 AE */ stb r3, 0x5ae(r31) -/* 80C5EF88 88 1F 05 AE */ lbz r0, 0x5ae(r31) -/* 80C5EF8C 28 00 00 00 */ cmplwi r0, 0 -/* 80C5EF90 41 82 00 0C */ beq lbl_80C5EF9C -/* 80C5EF94 7F E3 FB 78 */ mr r3, r31 -/* 80C5EF98 48 00 00 19 */ bl init_modeMove__11daLv4Gate_cFv -lbl_80C5EF9C: -/* 80C5EF9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5EFA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5EFA4 7C 08 03 A6 */ mtlr r0 -/* 80C5EFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5EFAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/moveGate__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/moveGate__11daLv4Gate_cFv.s deleted file mode 100644 index 3db9c6ed7b9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/moveGate__11daLv4Gate_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80C5EEA4: -/* 80C5EEA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5EEA8 7C 08 02 A6 */ mflr r0 -/* 80C5EEAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5EEB0 3C 80 80 C6 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C5F41C@ha */ -/* 80C5EEB4 38 E4 F4 1C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C5F41C@l */ -/* 80C5EEB8 3C 80 80 C6 */ lis r4, data_80C5F538@ha /* 0x80C5F538@ha */ -/* 80C5EEBC 38 C4 F5 38 */ addi r6, r4, data_80C5F538@l /* 0x80C5F538@l */ -/* 80C5EEC0 88 06 00 00 */ lbz r0, 0(r6) -/* 80C5EEC4 7C 00 07 75 */ extsb. r0, r0 -/* 80C5EEC8 40 82 00 58 */ bne lbl_80C5EF20 -/* 80C5EECC 80 87 00 20 */ lwz r4, 0x20(r7) -/* 80C5EED0 80 07 00 24 */ lwz r0, 0x24(r7) -/* 80C5EED4 90 87 00 44 */ stw r4, 0x44(r7) -/* 80C5EED8 90 07 00 48 */ stw r0, 0x48(r7) -/* 80C5EEDC 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80C5EEE0 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80C5EEE4 38 A7 00 44 */ addi r5, r7, 0x44 -/* 80C5EEE8 80 87 00 2C */ lwz r4, 0x2c(r7) -/* 80C5EEEC 80 07 00 30 */ lwz r0, 0x30(r7) -/* 80C5EEF0 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C5EEF4 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C5EEF8 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80C5EEFC 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C5EF00 80 87 00 38 */ lwz r4, 0x38(r7) -/* 80C5EF04 80 07 00 3C */ lwz r0, 0x3c(r7) -/* 80C5EF08 90 85 00 18 */ stw r4, 0x18(r5) -/* 80C5EF0C 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80C5EF10 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80C5EF14 90 05 00 20 */ stw r0, 0x20(r5) -/* 80C5EF18 38 00 00 01 */ li r0, 1 -/* 80C5EF1C 98 06 00 00 */ stb r0, 0(r6) -lbl_80C5EF20: -/* 80C5EF20 88 03 05 AC */ lbz r0, 0x5ac(r3) -/* 80C5EF24 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C5EF28 39 87 00 44 */ addi r12, r7, 0x44 -/* 80C5EF2C 7D 8C 02 14 */ add r12, r12, r0 -/* 80C5EF30 4B 70 31 55 */ bl __ptmf_scall -/* 80C5EF34 60 00 00 00 */ nop -/* 80C5EF38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5EF3C 7C 08 03 A6 */ mtlr r0 -/* 80C5EF40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5EF44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/setBaseMtx__11daLv4Gate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/setBaseMtx__11daLv4Gate_cFv.s deleted file mode 100644 index b9b80f5da90..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate/setBaseMtx__11daLv4Gate_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80C5EBE4: -/* 80C5EBE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5EBE8 7C 08 02 A6 */ mflr r0 -/* 80C5EBEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5EBF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5EBF4 7C 7F 1B 78 */ mr r31, r3 -/* 80C5EBF8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5EBFC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5EC00 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C5EC04 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C5EC08 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C5EC0C 4B 6E 7C DD */ bl PSMTXTrans -/* 80C5EC10 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5EC14 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5EC18 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C5EC1C A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C5EC20 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C5EC24 4B 3A D6 7D */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C5EC28 C0 3F 05 B4 */ lfs f1, 0x5b4(r31) -/* 80C5EC2C 3C 60 80 C6 */ lis r3, lit_3646@ha /* 0x80C5F3F8@ha */ -/* 80C5EC30 C0 43 F3 F8 */ lfs f2, lit_3646@l(r3) /* 0x80C5F3F8@l */ -/* 80C5EC34 FC 60 10 90 */ fmr f3, f2 -/* 80C5EC38 4B 3A E1 65 */ bl transM__14mDoMtx_stack_cFfff -/* 80C5EC3C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5EC40 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C5EC44 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C5EC48 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C5EC4C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C5EC50 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C5EC54 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C5EC58 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5EC5C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5EC60 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5EC64 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C5EC68 4B 6E 78 49 */ bl PSMTXCopy -/* 80C5EC6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5EC70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5EC74 7C 08 03 A6 */ mtlr r0 -/* 80C5EC78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5EC7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Delete__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Delete__13daLv4PoGate_cFv.s deleted file mode 100644 index 03815578672..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Delete__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C6069C: -/* 80C6069C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C606A0 7C 08 02 A6 */ mflr r0 -/* 80C606A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C606A8 3C 80 80 C6 */ lis r4, d_a_obj_lv4PoGate__stringBase0@ha /* 0x80C60848@ha */ -/* 80C606AC 38 84 08 48 */ addi r4, r4, d_a_obj_lv4PoGate__stringBase0@l /* 0x80C60848@l */ -/* 80C606B0 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80C606B4 4B 3C C9 55 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C606B8 38 60 00 01 */ li r3, 1 -/* 80C606BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C606C0 7C 08 03 A6 */ mtlr r0 -/* 80C606C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C606C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Draw__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Draw__13daLv4PoGate_cFv.s deleted file mode 100644 index f02b84de720..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Draw__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C605F8: -/* 80C605F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C605FC 7C 08 02 A6 */ mflr r0 -/* 80C60600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C60608 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6060C 7C 7E 1B 78 */ mr r30, r3 -/* 80C60610 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C60614 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C60618 38 80 00 10 */ li r4, 0x10 -/* 80C6061C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C60620 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C60624 4B 54 31 A1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C60628 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6062C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C60630 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C60634 80 84 00 04 */ lwz r4, 4(r4) -/* 80C60638 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C6063C 4B 54 47 65 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C60640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C60644 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C60648 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C6064C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C60650 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C60654 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C60658 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C6065C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C60660 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C60664 4B 3A D6 61 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C60668 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6066C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C60670 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C60674 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C60678 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C6067C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C60680 38 60 00 01 */ li r3, 1 -/* 80C60684 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C60688 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6068C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C60690 7C 08 03 A6 */ mtlr r0 -/* 80C60694 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C60698 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Execute__13daLv4PoGate_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Execute__13daLv4PoGate_cFPPA3_A4_f.s deleted file mode 100644 index 67da7d11aa9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/Execute__13daLv4PoGate_cFPPA3_A4_f.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80C5FEDC: -/* 80C5FEDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5FEE0 7C 08 02 A6 */ mflr r0 -/* 80C5FEE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5FEE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5FEEC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5FEF0 7C 7E 1B 78 */ mr r30, r3 -/* 80C5FEF4 7C 9F 23 78 */ mr r31, r4 -/* 80C5FEF8 48 00 00 35 */ bl moveGate__13daLv4PoGate_cFv -/* 80C5FEFC 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C5FF00 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C5FF04 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5FF08 7F C3 F3 78 */ mr r3, r30 -/* 80C5FF0C 4B FF FD 99 */ bl setBaseMtx__13daLv4PoGate_cFv -/* 80C5FF10 38 60 00 01 */ li r3, 1 -/* 80C5FF14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5FF18 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5FF1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5FF20 7C 08 03 A6 */ mtlr r0 -/* 80C5FF24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5FF28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__ct__17daLv4PoGate_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__ct__17daLv4PoGate_HIO_cFv.s deleted file mode 100644 index dbf2c96995c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__ct__17daLv4PoGate_HIO_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80C5FBEC: -/* 80C5FBEC 3C 80 80 C6 */ lis r4, lit_3629@ha /* 0x80C60804@ha */ -/* 80C5FBF0 38 A4 08 04 */ addi r5, r4, lit_3629@l /* 0x80C60804@l */ -/* 80C5FBF4 3C 80 80 C6 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C609A0@ha */ -/* 80C5FBF8 38 04 09 A0 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C609A0@l */ -/* 80C5FBFC 90 03 00 00 */ stw r0, 0(r3) -/* 80C5FC00 3C 80 80 C6 */ lis r4, __vt__17daLv4PoGate_HIO_c@ha /* 0x80C60994@ha */ -/* 80C5FC04 38 04 09 94 */ addi r0, r4, __vt__17daLv4PoGate_HIO_c@l /* 0x80C60994@l */ -/* 80C5FC08 90 03 00 00 */ stw r0, 0(r3) -/* 80C5FC0C C0 05 00 00 */ lfs f0, 0(r5) -/* 80C5FC10 D0 03 00 04 */ stfs f0, 4(r3) -/* 80C5FC14 D0 03 00 08 */ stfs f0, 8(r3) -/* 80C5FC18 C0 05 00 04 */ lfs f0, 4(r5) -/* 80C5FC1C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C5FC20 C0 05 00 08 */ lfs f0, 8(r5) -/* 80C5FC24 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80C5FC28 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 80C5FC2C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80C5FC30 38 00 00 00 */ li r0, 0 -/* 80C5FC34 98 03 00 18 */ stb r0, 0x18(r3) -/* 80C5FC38 38 00 00 05 */ li r0, 5 -/* 80C5FC3C 98 03 00 19 */ stb r0, 0x19(r3) -/* 80C5FC40 C0 05 00 10 */ lfs f0, 0x10(r5) -/* 80C5FC44 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C5FC48 C0 05 00 14 */ lfs f0, 0x14(r5) -/* 80C5FC4C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C5FC50 38 00 00 03 */ li r0, 3 -/* 80C5FC54 98 03 00 24 */ stb r0, 0x24(r3) -/* 80C5FC58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 4b5b71a9305..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C5FC5C: -/* 80C5FC5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5FC60 7C 08 02 A6 */ mflr r0 -/* 80C5FC64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5FC68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5FC6C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5FC70 41 82 00 1C */ beq lbl_80C5FC8C -/* 80C5FC74 3C A0 80 C6 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C609A0@ha */ -/* 80C5FC78 38 05 09 A0 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C609A0@l */ -/* 80C5FC7C 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5FC80 7C 80 07 35 */ extsh. r0, r4 -/* 80C5FC84 40 81 00 08 */ ble lbl_80C5FC8C -/* 80C5FC88 4B 66 F0 B5 */ bl __dl__FPv -lbl_80C5FC8C: -/* 80C5FC8C 7F E3 FB 78 */ mr r3, r31 -/* 80C5FC90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5FC94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5FC98 7C 08 03 A6 */ mtlr r0 -/* 80C5FC9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5FCA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__17daLv4PoGate_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__17daLv4PoGate_HIO_cFv.s deleted file mode 100644 index 772ee2225a9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__dt__17daLv4PoGate_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C60758: -/* 80C60758 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6075C 7C 08 02 A6 */ mflr r0 -/* 80C60760 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60764 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C60768 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6076C 41 82 00 30 */ beq lbl_80C6079C -/* 80C60770 3C 60 80 C6 */ lis r3, __vt__17daLv4PoGate_HIO_c@ha /* 0x80C60994@ha */ -/* 80C60774 38 03 09 94 */ addi r0, r3, __vt__17daLv4PoGate_HIO_c@l /* 0x80C60994@l */ -/* 80C60778 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6077C 41 82 00 10 */ beq lbl_80C6078C -/* 80C60780 3C 60 80 C6 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C609A0@ha */ -/* 80C60784 38 03 09 A0 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C609A0@l */ -/* 80C60788 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6078C: -/* 80C6078C 7C 80 07 35 */ extsh. r0, r4 -/* 80C60790 40 81 00 0C */ ble lbl_80C6079C -/* 80C60794 7F E3 FB 78 */ mr r3, r31 -/* 80C60798 4B 66 E5 A5 */ bl __dl__FPv -lbl_80C6079C: -/* 80C6079C 7F E3 FB 78 */ mr r3, r31 -/* 80C607A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C607A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C607A8 7C 08 03 A6 */ mtlr r0 -/* 80C607AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C607B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__sinit_d_a_obj_lv4PoGate_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__sinit_d_a_obj_lv4PoGate_cpp.s deleted file mode 100644 index 2d84432ed46..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/__sinit_d_a_obj_lv4PoGate_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C607B4: -/* 80C607B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C607B8 7C 08 02 A6 */ mflr r0 -/* 80C607BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C607C0 3C 60 80 C6 */ lis r3, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C607C4 38 63 09 C4 */ addi r3, r3, l_HIO@l /* 0x80C609C4@l */ -/* 80C607C8 4B FF F4 25 */ bl __ct__17daLv4PoGate_HIO_cFv -/* 80C607CC 3C 80 80 C6 */ lis r4, __dt__17daLv4PoGate_HIO_cFv@ha /* 0x80C60758@ha */ -/* 80C607D0 38 84 07 58 */ addi r4, r4, __dt__17daLv4PoGate_HIO_cFv@l /* 0x80C60758@l */ -/* 80C607D4 3C A0 80 C6 */ lis r5, lit_3623@ha /* 0x80C609B8@ha */ -/* 80C607D8 38 A5 09 B8 */ addi r5, r5, lit_3623@l /* 0x80C609B8@l */ -/* 80C607DC 4B FF F3 9D */ bl __register_global_object -/* 80C607E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C607E4 7C 08 03 A6 */ mtlr r0 -/* 80C607E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C607EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/create__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/create__13daLv4PoGate_cFv.s deleted file mode 100644 index 941abc24240..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/create__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_80C5FDAC: -/* 80C5FDAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5FDB0 7C 08 02 A6 */ mflr r0 -/* 80C5FDB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5FDB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5FDBC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5FDC0 7C 7E 1B 78 */ mr r30, r3 -/* 80C5FDC4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5FDC8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5FDCC 40 82 00 28 */ bne lbl_80C5FDF4 -/* 80C5FDD0 28 1E 00 00 */ cmplwi r30, 0 -/* 80C5FDD4 41 82 00 14 */ beq lbl_80C5FDE8 -/* 80C5FDD8 4B 41 88 4D */ bl __ct__16dBgS_MoveBgActorFv -/* 80C5FDDC 3C 60 80 C6 */ lis r3, __vt__13daLv4PoGate_c@ha /* 0x80C6096C@ha */ -/* 80C5FDE0 38 03 09 6C */ addi r0, r3, __vt__13daLv4PoGate_c@l /* 0x80C6096C@l */ -/* 80C5FDE4 90 1E 05 9C */ stw r0, 0x59c(r30) -lbl_80C5FDE8: -/* 80C5FDE8 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80C5FDEC 60 00 00 08 */ ori r0, r0, 8 -/* 80C5FDF0 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80C5FDF4: -/* 80C5FDF4 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80C5FDF8 3C 80 80 C6 */ lis r4, d_a_obj_lv4PoGate__stringBase0@ha /* 0x80C60848@ha */ -/* 80C5FDFC 38 84 08 48 */ addi r4, r4, d_a_obj_lv4PoGate__stringBase0@l /* 0x80C60848@l */ -/* 80C5FE00 4B 3C D0 BD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C5FE04 7C 7F 1B 78 */ mr r31, r3 -/* 80C5FE08 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C5FE0C 40 82 00 B4 */ bne lbl_80C5FEC0 -/* 80C5FE10 7F C3 F3 78 */ mr r3, r30 -/* 80C5FE14 3C 80 80 C6 */ lis r4, d_a_obj_lv4PoGate__stringBase0@ha /* 0x80C60848@ha */ -/* 80C5FE18 38 84 08 48 */ addi r4, r4, d_a_obj_lv4PoGate__stringBase0@l /* 0x80C60848@l */ -/* 80C5FE1C 38 A0 00 07 */ li r5, 7 -/* 80C5FE20 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C5FE24 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C5FE28 38 E0 1F 00 */ li r7, 0x1f00 -/* 80C5FE2C 39 00 00 00 */ li r8, 0 -/* 80C5FE30 4B 41 89 8D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C5FE34 2C 03 00 05 */ cmpwi r3, 5 -/* 80C5FE38 40 82 00 0C */ bne lbl_80C5FE44 -/* 80C5FE3C 38 60 00 05 */ li r3, 5 -/* 80C5FE40 48 00 00 84 */ b lbl_80C5FEC4 -lbl_80C5FE44: -/* 80C5FE44 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C5FE48 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C5FE4C 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C5FE50 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C5FE54 80 83 00 04 */ lwz r4, 4(r3) -/* 80C5FE58 7F C3 F3 78 */ mr r3, r30 -/* 80C5FE5C 4B 3B A7 1D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C5FE60 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C5FE64 98 1E 05 AD */ stb r0, 0x5ad(r30) -/* 80C5FE68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5FE6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5FE70 88 9E 05 AD */ lbz r4, 0x5ad(r30) -/* 80C5FE74 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C5FE78 7C 05 07 74 */ extsb r5, r0 -/* 80C5FE7C 4B 3D 54 E5 */ bl isSwitch__10dSv_info_cCFii -/* 80C5FE80 98 7E 05 AE */ stb r3, 0x5ae(r30) -/* 80C5FE84 3C 60 80 C6 */ lis r3, lit_3713@ha /* 0x80C60820@ha */ -/* 80C5FE88 C0 03 08 20 */ lfs f0, lit_3713@l(r3) /* 0x80C60820@l */ -/* 80C5FE8C D0 1E 05 B0 */ stfs f0, 0x5b0(r30) -/* 80C5FE90 3C 60 80 C6 */ lis r3, lit_3655@ha /* 0x80C6081C@ha */ -/* 80C5FE94 C0 03 08 1C */ lfs f0, lit_3655@l(r3) /* 0x80C6081C@l */ -/* 80C5FE98 D0 1E 05 B4 */ stfs f0, 0x5b4(r30) -/* 80C5FE9C 88 1E 05 AE */ lbz r0, 0x5ae(r30) -/* 80C5FEA0 28 00 00 00 */ cmplwi r0, 0 -/* 80C5FEA4 40 82 00 0C */ bne lbl_80C5FEB0 -/* 80C5FEA8 C0 1E 05 B0 */ lfs f0, 0x5b0(r30) -/* 80C5FEAC D0 1E 05 B4 */ stfs f0, 0x5b4(r30) -lbl_80C5FEB0: -/* 80C5FEB0 7F C3 F3 78 */ mr r3, r30 -/* 80C5FEB4 48 00 01 DD */ bl init_modeWait__13daLv4PoGate_cFv -/* 80C5FEB8 7F C3 F3 78 */ mr r3, r30 -/* 80C5FEBC 4B FF FD E9 */ bl setBaseMtx__13daLv4PoGate_cFv -lbl_80C5FEC0: -/* 80C5FEC0 7F E3 FB 78 */ mr r3, r31 -lbl_80C5FEC4: -/* 80C5FEC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5FEC8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5FECC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5FED0 7C 08 03 A6 */ mtlr r0 -/* 80C5FED4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5FED8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 9ce1274e261..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C60738: -/* 80C60738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6073C 7C 08 02 A6 */ mflr r0 -/* 80C60740 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60744 4B FF F6 69 */ bl create__13daLv4PoGate_cFv -/* 80C60748 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6074C 7C 08 03 A6 */ mtlr r0 -/* 80C60750 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C60754 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Delete__FP13daLv4PoGate_c.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Delete__FP13daLv4PoGate_c.s deleted file mode 100644 index 003a5f6638e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Delete__FP13daLv4PoGate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C60718: -/* 80C60718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6071C 7C 08 02 A6 */ mflr r0 -/* 80C60720 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60724 4B 41 81 B9 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C60728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6072C 7C 08 03 A6 */ mtlr r0 -/* 80C60730 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C60734 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Draw__FP13daLv4PoGate_c.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Draw__FP13daLv4PoGate_c.s deleted file mode 100644 index bb32d5a3cc5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Draw__FP13daLv4PoGate_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C606CC: -/* 80C606CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C606D0 7C 08 02 A6 */ mflr r0 -/* 80C606D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C606D8 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C606DC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C606E0 7D 89 03 A6 */ mtctr r12 -/* 80C606E4 4E 80 04 21 */ bctrl -/* 80C606E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C606EC 7C 08 03 A6 */ mtlr r0 -/* 80C606F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C606F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Execute__FP13daLv4PoGate_c.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Execute__FP13daLv4PoGate_c.s deleted file mode 100644 index 8511184b0d8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/daLv4PoGate_Execute__FP13daLv4PoGate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C606F8: -/* 80C606F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C606FC 7C 08 02 A6 */ mflr r0 -/* 80C60700 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60704 4B 41 82 4D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C60708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6070C 7C 08 03 A6 */ mtlr r0 -/* 80C60710 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C60714 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2Wait__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2Wait__13daLv4PoGate_cFv.s deleted file mode 100644 index e6805971738..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2Wait__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C603E0: -/* 80C603E0 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C603E4 38 84 09 C4 */ addi r4, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C603E8 88 04 00 19 */ lbz r0, 0x19(r4) -/* 80C603EC 98 03 05 B8 */ stb r0, 0x5b8(r3) -/* 80C603F0 38 00 00 05 */ li r0, 5 -/* 80C603F4 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C603F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2__13daLv4PoGate_cFv.s deleted file mode 100644 index 0a5f57e53c4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose2__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C60370: -/* 80C60370 38 00 00 04 */ li r0, 4 -/* 80C60374 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C60378 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose3__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose3__13daLv4PoGate_cFv.s deleted file mode 100644 index be9500bc56c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose3__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C60434: -/* 80C60434 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C60438 38 84 09 C4 */ addi r4, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C6043C C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 80C60440 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80C60444 38 00 00 06 */ li r0, 6 -/* 80C60448 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C6044C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveCloseWait__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveCloseWait__13daLv4PoGate_cFv.s deleted file mode 100644 index 6e22e2c4707..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveCloseWait__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C6031C: -/* 80C6031C 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C60320 38 84 09 C4 */ addi r4, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C60324 88 04 00 18 */ lbz r0, 0x18(r4) -/* 80C60328 98 03 05 B8 */ stb r0, 0x5b8(r3) -/* 80C6032C 38 00 00 03 */ li r0, 3 -/* 80C60330 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C60334 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose__13daLv4PoGate_cFv.s deleted file mode 100644 index 7436f967f94..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveClose__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80C60200: -/* 80C60200 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C60204 7C 08 02 A6 */ mflr r0 -/* 80C60208 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6020C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C60210 7C 7F 1B 78 */ mr r31, r3 -/* 80C60214 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80C60218 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C6021C C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80C60220 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C60224 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80C60228 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C6022C C0 03 04 AC */ lfs f0, 0x4ac(r3) -/* 80C60230 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C60234 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80C60238 7C 03 07 74 */ extsb r3, r0 -/* 80C6023C 4B 3C CE 31 */ bl dComIfGp_getReverb__Fi -/* 80C60240 7C 67 1B 78 */ mr r7, r3 -/* 80C60244 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801B3@ha */ -/* 80C60248 38 03 01 B3 */ addi r0, r3, 0x01B3 /* 0x000801B3@l */ -/* 80C6024C 90 01 00 08 */ stw r0, 8(r1) -/* 80C60250 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C60254 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C60258 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6025C 38 81 00 08 */ addi r4, r1, 8 -/* 80C60260 38 A1 00 0C */ addi r5, r1, 0xc -/* 80C60264 38 C0 00 00 */ li r6, 0 -/* 80C60268 3D 00 80 C6 */ lis r8, lit_3772@ha /* 0x80C60824@ha */ -/* 80C6026C C0 28 08 24 */ lfs f1, lit_3772@l(r8) /* 0x80C60824@l */ -/* 80C60270 FC 40 08 90 */ fmr f2, f1 -/* 80C60274 3D 00 80 C6 */ lis r8, lit_3773@ha /* 0x80C60828@ha */ -/* 80C60278 C0 68 08 28 */ lfs f3, lit_3773@l(r8) /* 0x80C60828@l */ -/* 80C6027C FC 80 18 90 */ fmr f4, f3 -/* 80C60280 39 00 00 00 */ li r8, 0 -/* 80C60284 4B 64 B7 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C60288 7F E3 FB 78 */ mr r3, r31 -/* 80C6028C 38 80 00 01 */ li r4, 1 -/* 80C60290 48 00 02 A5 */ bl setEffect__13daLv4PoGate_cFi -/* 80C60294 38 00 00 02 */ li r0, 2 -/* 80C60298 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80C6029C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C602A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C602A4 7C 08 03 A6 */ mtlr r0 -/* 80C602A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C602AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveOpen__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveOpen__13daLv4PoGate_cFv.s deleted file mode 100644 index 0f242758ed1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeMoveOpen__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80C600A0: -/* 80C600A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C600A4 7C 08 02 A6 */ mflr r0 -/* 80C600A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C600AC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C600B0 7C 7F 1B 78 */ mr r31, r3 -/* 80C600B4 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80C600B8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C600BC C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80C600C0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C600C4 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80C600C8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C600CC C0 03 04 AC */ lfs f0, 0x4ac(r3) -/* 80C600D0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C600D4 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80C600D8 7C 03 07 74 */ extsb r3, r0 -/* 80C600DC 4B 3C CF 91 */ bl dComIfGp_getReverb__Fi -/* 80C600E0 7C 67 1B 78 */ mr r7, r3 -/* 80C600E4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801B4@ha */ -/* 80C600E8 38 03 01 B4 */ addi r0, r3, 0x01B4 /* 0x000801B4@l */ -/* 80C600EC 90 01 00 08 */ stw r0, 8(r1) -/* 80C600F0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C600F4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C600F8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C600FC 38 81 00 08 */ addi r4, r1, 8 -/* 80C60100 38 A1 00 0C */ addi r5, r1, 0xc -/* 80C60104 38 C0 00 00 */ li r6, 0 -/* 80C60108 3D 00 80 C6 */ lis r8, lit_3772@ha /* 0x80C60824@ha */ -/* 80C6010C C0 28 08 24 */ lfs f1, lit_3772@l(r8) /* 0x80C60824@l */ -/* 80C60110 FC 40 08 90 */ fmr f2, f1 -/* 80C60114 3D 00 80 C6 */ lis r8, lit_3773@ha /* 0x80C60828@ha */ -/* 80C60118 C0 68 08 28 */ lfs f3, lit_3773@l(r8) /* 0x80C60828@l */ -/* 80C6011C FC 80 18 90 */ fmr f4, f3 -/* 80C60120 39 00 00 00 */ li r8, 0 -/* 80C60124 4B 64 B8 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C60128 7F E3 FB 78 */ mr r3, r31 -/* 80C6012C 38 80 00 00 */ li r4, 0 -/* 80C60130 48 00 04 05 */ bl setEffect__13daLv4PoGate_cFi -/* 80C60134 38 00 00 01 */ li r0, 1 -/* 80C60138 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80C6013C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C60140 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C60144 7C 08 03 A6 */ mtlr r0 -/* 80C60148 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6014C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeWait__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeWait__13daLv4PoGate_cFv.s deleted file mode 100644 index 3cc851b54b7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/init_modeWait__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C60090: -/* 80C60090 38 00 00 00 */ li r0, 0 -/* 80C60094 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C60098 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2Wait__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2Wait__13daLv4PoGate_cFv.s deleted file mode 100644 index a983a271bb8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2Wait__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C603FC: -/* 80C603FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C60400 7C 08 02 A6 */ mflr r0 -/* 80C60404 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60408 88 83 05 B8 */ lbz r4, 0x5b8(r3) -/* 80C6040C 28 04 00 00 */ cmplwi r4, 0 -/* 80C60410 41 82 00 10 */ beq lbl_80C60420 -/* 80C60414 38 04 FF FF */ addi r0, r4, -1 -/* 80C60418 98 03 05 B8 */ stb r0, 0x5b8(r3) -/* 80C6041C 48 00 00 08 */ b lbl_80C60424 -lbl_80C60420: -/* 80C60420 48 00 00 15 */ bl init_modeMoveClose3__13daLv4PoGate_cFv -lbl_80C60424: -/* 80C60424 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C60428 7C 08 03 A6 */ mtlr r0 -/* 80C6042C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C60430 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2__13daLv4PoGate_cFv.s deleted file mode 100644 index 4e916f5fcfa..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose2__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C6037C: -/* 80C6037C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C60380 7C 08 02 A6 */ mflr r0 -/* 80C60384 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60388 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6038C 7C 7F 1B 78 */ mr r31, r3 -/* 80C60390 38 7F 05 B4 */ addi r3, r31, 0x5b4 -/* 80C60394 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C60398 38 A4 09 C4 */ addi r5, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C6039C C0 25 00 14 */ lfs f1, 0x14(r5) -/* 80C603A0 3C 80 80 C6 */ lis r4, lit_3786@ha /* 0x80C6082C@ha */ -/* 80C603A4 C0 44 08 2C */ lfs f2, lit_3786@l(r4) /* 0x80C6082C@l */ -/* 80C603A8 C0 65 00 0C */ lfs f3, 0xc(r5) -/* 80C603AC FC 80 10 90 */ fmr f4, f2 -/* 80C603B0 4B 60 F5 CD */ bl cLib_addCalc__FPfffff -/* 80C603B4 3C 60 80 C6 */ lis r3, lit_3655@ha /* 0x80C6081C@ha */ -/* 80C603B8 C0 03 08 1C */ lfs f0, lit_3655@l(r3) /* 0x80C6081C@l */ -/* 80C603BC FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C603C0 40 82 00 0C */ bne lbl_80C603CC -/* 80C603C4 7F E3 FB 78 */ mr r3, r31 -/* 80C603C8 48 00 00 19 */ bl init_modeMoveClose2Wait__13daLv4PoGate_cFv -lbl_80C603CC: -/* 80C603CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C603D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C603D4 7C 08 03 A6 */ mtlr r0 -/* 80C603D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C603DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose3__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose3__13daLv4PoGate_cFv.s deleted file mode 100644 index 96e39a978a1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose3__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80C60450: -/* 80C60450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C60454 7C 08 02 A6 */ mflr r0 -/* 80C60458 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6045C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C60460 93 C1 00 08 */ stw r30, 8(r1) -/* 80C60464 7C 7E 1B 78 */ mr r30, r3 -/* 80C60468 3C 60 80 C6 */ lis r3, lit_3629@ha /* 0x80C60804@ha */ -/* 80C6046C 3B E3 08 04 */ addi r31, r3, lit_3629@l /* 0x80C60804@l */ -/* 80C60470 3C 60 80 C6 */ lis r3, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C60474 38 63 09 C4 */ addi r3, r3, l_HIO@l /* 0x80C609C4@l */ -/* 80C60478 C0 23 00 20 */ lfs f1, 0x20(r3) -/* 80C6047C 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80C60480 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80C60484 EC 41 00 24 */ fdivs f2, f1, f0 -/* 80C60488 4B 61 02 B9 */ bl cLib_chaseF__FPfff -/* 80C6048C 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 80C60490 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80C60494 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 80C60498 C0 7E 05 2C */ lfs f3, 0x52c(r30) -/* 80C6049C FC 80 10 90 */ fmr f4, f2 -/* 80C604A0 4B 60 F4 DD */ bl cLib_addCalc__FPfffff -/* 80C604A4 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80C604A8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C604AC 40 82 00 14 */ bne lbl_80C604C0 -/* 80C604B0 7F C3 F3 78 */ mr r3, r30 -/* 80C604B4 48 00 00 25 */ bl setSe__13daLv4PoGate_cFv -/* 80C604B8 7F C3 F3 78 */ mr r3, r30 -/* 80C604BC 4B FF FB D5 */ bl init_modeWait__13daLv4PoGate_cFv -lbl_80C604C0: -/* 80C604C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C604C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C604C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C604CC 7C 08 03 A6 */ mtlr r0 -/* 80C604D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C604D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveCloseWait__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveCloseWait__13daLv4PoGate_cFv.s deleted file mode 100644 index 638fd4f3a30..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveCloseWait__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C60338: -/* 80C60338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6033C 7C 08 02 A6 */ mflr r0 -/* 80C60340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C60344 88 83 05 B8 */ lbz r4, 0x5b8(r3) -/* 80C60348 28 04 00 00 */ cmplwi r4, 0 -/* 80C6034C 41 82 00 10 */ beq lbl_80C6035C -/* 80C60350 38 04 FF FF */ addi r0, r4, -1 -/* 80C60354 98 03 05 B8 */ stb r0, 0x5b8(r3) -/* 80C60358 48 00 00 08 */ b lbl_80C60360 -lbl_80C6035C: -/* 80C6035C 48 00 00 15 */ bl init_modeMoveClose2__13daLv4PoGate_cFv -lbl_80C60360: -/* 80C60360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C60364 7C 08 03 A6 */ mtlr r0 -/* 80C60368 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6036C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose__13daLv4PoGate_cFv.s deleted file mode 100644 index 2e4d308a3f7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveClose__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80C602B0: -/* 80C602B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C602B4 7C 08 02 A6 */ mflr r0 -/* 80C602B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C602BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C602C0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C602C4 7C 7E 1B 78 */ mr r30, r3 -/* 80C602C8 3C 60 80 C6 */ lis r3, lit_3629@ha /* 0x80C60804@ha */ -/* 80C602CC 3B E3 08 04 */ addi r31, r3, lit_3629@l /* 0x80C60804@l */ -/* 80C602D0 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 80C602D4 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C602D8 38 84 09 C4 */ addi r4, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C602DC C0 24 00 10 */ lfs f1, 0x10(r4) -/* 80C602E0 C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 80C602E4 C0 64 00 08 */ lfs f3, 8(r4) -/* 80C602E8 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80C602EC 4B 60 F6 91 */ bl cLib_addCalc__FPfffff -/* 80C602F0 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80C602F4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C602F8 40 82 00 0C */ bne lbl_80C60304 -/* 80C602FC 7F C3 F3 78 */ mr r3, r30 -/* 80C60300 48 00 00 1D */ bl init_modeMoveCloseWait__13daLv4PoGate_cFv -lbl_80C60304: -/* 80C60304 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C60308 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6030C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C60310 7C 08 03 A6 */ mtlr r0 -/* 80C60314 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C60318 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveOpen__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveOpen__13daLv4PoGate_cFv.s deleted file mode 100644 index 0e41d20a216..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/modeMoveOpen__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80C60150: -/* 80C60150 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C60154 7C 08 02 A6 */ mflr r0 -/* 80C60158 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6015C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C60160 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C60164 7C 7E 1B 78 */ mr r30, r3 -/* 80C60168 3C 60 80 C6 */ lis r3, lit_3629@ha /* 0x80C60804@ha */ -/* 80C6016C 3B E3 08 04 */ addi r31, r3, lit_3629@l /* 0x80C60804@l */ -/* 80C60170 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 80C60174 C0 3E 05 B0 */ lfs f1, 0x5b0(r30) -/* 80C60178 C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 80C6017C 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C60180 38 84 09 C4 */ addi r4, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C60184 C0 64 00 04 */ lfs f3, 4(r4) -/* 80C60188 FC 80 10 90 */ fmr f4, f2 -/* 80C6018C 4B 60 F7 F1 */ bl cLib_addCalc__FPfffff -/* 80C60190 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80C60194 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C60198 40 82 00 50 */ bne lbl_80C601E8 -/* 80C6019C 38 00 00 0C */ li r0, 0xc -/* 80C601A0 90 01 00 08 */ stw r0, 8(r1) -/* 80C601A4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C601A8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C601AC 80 63 00 00 */ lwz r3, 0(r3) -/* 80C601B0 38 81 00 08 */ addi r4, r1, 8 -/* 80C601B4 38 A0 00 00 */ li r5, 0 -/* 80C601B8 38 C0 00 00 */ li r6, 0 -/* 80C601BC 38 E0 00 00 */ li r7, 0 -/* 80C601C0 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80C601C4 FC 40 08 90 */ fmr f2, f1 -/* 80C601C8 C0 7F 00 24 */ lfs f3, 0x24(r31) -/* 80C601CC FC 80 18 90 */ fmr f4, f3 -/* 80C601D0 39 00 00 00 */ li r8, 0 -/* 80C601D4 4B 64 B7 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C601D8 7F C3 F3 78 */ mr r3, r30 -/* 80C601DC 48 00 02 FD */ bl setSe__13daLv4PoGate_cFv -/* 80C601E0 7F C3 F3 78 */ mr r3, r30 -/* 80C601E4 4B FF FE AD */ bl init_modeWait__13daLv4PoGate_cFv -lbl_80C601E8: -/* 80C601E8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C601EC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C601F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C601F4 7C 08 03 A6 */ mtlr r0 -/* 80C601F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C601FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/moveGate__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/moveGate__13daLv4PoGate_cFv.s deleted file mode 100644 index a24e3fc983b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/moveGate__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_80C5FF2C: -/* 80C5FF2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C5FF30 7C 08 02 A6 */ mflr r0 -/* 80C5FF34 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C5FF38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5FF3C 4B 70 22 A1 */ bl _savegpr_29 -/* 80C5FF40 7C 7E 1B 78 */ mr r30, r3 -/* 80C5FF44 3C 60 80 C6 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80C60854@ha */ -/* 80C5FF48 3B E3 08 54 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80C60854@l */ -/* 80C5FF4C 3C 60 80 C6 */ lis r3, data_80C609EC@ha /* 0x80C609EC@ha */ -/* 80C5FF50 38 A3 09 EC */ addi r5, r3, data_80C609EC@l /* 0x80C609EC@l */ -/* 80C5FF54 88 05 00 00 */ lbz r0, 0(r5) -/* 80C5FF58 7C 00 07 75 */ extsb. r0, r0 -/* 80C5FF5C 40 82 00 B8 */ bne lbl_80C60014 -/* 80C5FF60 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80C5FF64 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 80C5FF68 90 7F 00 74 */ stw r3, 0x74(r31) -/* 80C5FF6C 90 1F 00 78 */ stw r0, 0x78(r31) -/* 80C5FF70 80 1F 00 28 */ lwz r0, 0x28(r31) -/* 80C5FF74 90 1F 00 7C */ stw r0, 0x7c(r31) -/* 80C5FF78 38 9F 00 74 */ addi r4, r31, 0x74 -/* 80C5FF7C 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80C5FF80 80 1F 00 30 */ lwz r0, 0x30(r31) -/* 80C5FF84 90 64 00 0C */ stw r3, 0xc(r4) -/* 80C5FF88 90 04 00 10 */ stw r0, 0x10(r4) -/* 80C5FF8C 80 1F 00 34 */ lwz r0, 0x34(r31) -/* 80C5FF90 90 04 00 14 */ stw r0, 0x14(r4) -/* 80C5FF94 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80C5FF98 80 1F 00 3C */ lwz r0, 0x3c(r31) -/* 80C5FF9C 90 64 00 18 */ stw r3, 0x18(r4) -/* 80C5FFA0 90 04 00 1C */ stw r0, 0x1c(r4) -/* 80C5FFA4 80 1F 00 40 */ lwz r0, 0x40(r31) -/* 80C5FFA8 90 04 00 20 */ stw r0, 0x20(r4) -/* 80C5FFAC 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80C5FFB0 80 1F 00 48 */ lwz r0, 0x48(r31) -/* 80C5FFB4 90 64 00 24 */ stw r3, 0x24(r4) -/* 80C5FFB8 90 04 00 28 */ stw r0, 0x28(r4) -/* 80C5FFBC 80 1F 00 4C */ lwz r0, 0x4c(r31) -/* 80C5FFC0 90 04 00 2C */ stw r0, 0x2c(r4) -/* 80C5FFC4 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80C5FFC8 80 1F 00 54 */ lwz r0, 0x54(r31) -/* 80C5FFCC 90 64 00 30 */ stw r3, 0x30(r4) -/* 80C5FFD0 90 04 00 34 */ stw r0, 0x34(r4) -/* 80C5FFD4 80 1F 00 58 */ lwz r0, 0x58(r31) -/* 80C5FFD8 90 04 00 38 */ stw r0, 0x38(r4) -/* 80C5FFDC 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 80C5FFE0 80 1F 00 60 */ lwz r0, 0x60(r31) -/* 80C5FFE4 90 64 00 3C */ stw r3, 0x3c(r4) -/* 80C5FFE8 90 04 00 40 */ stw r0, 0x40(r4) -/* 80C5FFEC 80 1F 00 64 */ lwz r0, 0x64(r31) -/* 80C5FFF0 90 04 00 44 */ stw r0, 0x44(r4) -/* 80C5FFF4 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 80C5FFF8 80 1F 00 6C */ lwz r0, 0x6c(r31) -/* 80C5FFFC 90 64 00 48 */ stw r3, 0x48(r4) -/* 80C60000 90 04 00 4C */ stw r0, 0x4c(r4) -/* 80C60004 80 1F 00 70 */ lwz r0, 0x70(r31) -/* 80C60008 90 04 00 50 */ stw r0, 0x50(r4) -/* 80C6000C 38 00 00 01 */ li r0, 1 -/* 80C60010 98 05 00 00 */ stb r0, 0(r5) -lbl_80C60014: -/* 80C60014 8B BE 05 AE */ lbz r29, 0x5ae(r30) -/* 80C60018 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6001C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C60020 88 9E 05 AD */ lbz r4, 0x5ad(r30) -/* 80C60024 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C60028 7C 05 07 74 */ extsb r5, r0 -/* 80C6002C 4B 3D 53 35 */ bl isSwitch__10dSv_info_cCFii -/* 80C60030 98 7E 05 AE */ stb r3, 0x5ae(r30) -/* 80C60034 88 1E 05 AE */ lbz r0, 0x5ae(r30) -/* 80C60038 7C 00 E8 40 */ cmplw r0, r29 -/* 80C6003C 41 82 00 20 */ beq lbl_80C6005C -/* 80C60040 28 00 00 00 */ cmplwi r0, 0 -/* 80C60044 41 82 00 10 */ beq lbl_80C60054 -/* 80C60048 7F C3 F3 78 */ mr r3, r30 -/* 80C6004C 48 00 01 B5 */ bl init_modeMoveClose__13daLv4PoGate_cFv -/* 80C60050 48 00 00 0C */ b lbl_80C6005C -lbl_80C60054: -/* 80C60054 7F C3 F3 78 */ mr r3, r30 -/* 80C60058 48 00 00 49 */ bl init_modeMoveOpen__13daLv4PoGate_cFv -lbl_80C6005C: -/* 80C6005C 7F C3 F3 78 */ mr r3, r30 -/* 80C60060 88 1E 05 AC */ lbz r0, 0x5ac(r30) -/* 80C60064 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C60068 39 9F 00 74 */ addi r12, r31, 0x74 -/* 80C6006C 7D 8C 02 14 */ add r12, r12, r0 -/* 80C60070 4B 70 20 15 */ bl __ptmf_scall -/* 80C60074 60 00 00 00 */ nop -/* 80C60078 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6007C 4B 70 21 AD */ bl _restgpr_29 -/* 80C60080 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C60084 7C 08 03 A6 */ mtlr r0 -/* 80C60088 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6008C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setBaseMtx__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setBaseMtx__13daLv4PoGate_cFv.s deleted file mode 100644 index 3bcc812f80b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setBaseMtx__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80C5FCA4: -/* 80C5FCA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5FCA8 7C 08 02 A6 */ mflr r0 -/* 80C5FCAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5FCB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5FCB4 7C 7F 1B 78 */ mr r31, r3 -/* 80C5FCB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5FCBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5FCC0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C5FCC4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C5FCC8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C5FCCC 4B 6E 6C 1D */ bl PSMTXTrans -/* 80C5FCD0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5FCD4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5FCD8 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C5FCDC A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C5FCE0 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C5FCE4 4B 3A C5 BD */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C5FCE8 3C 60 80 C6 */ lis r3, lit_3655@ha /* 0x80C6081C@ha */ -/* 80C5FCEC C0 23 08 1C */ lfs f1, lit_3655@l(r3) /* 0x80C6081C@l */ -/* 80C5FCF0 C0 5F 05 B4 */ lfs f2, 0x5b4(r31) -/* 80C5FCF4 FC 60 08 90 */ fmr f3, f1 -/* 80C5FCF8 4B 3A D0 A5 */ bl transM__14mDoMtx_stack_cFfff -/* 80C5FCFC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5FD00 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C5FD04 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C5FD08 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C5FD0C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C5FD10 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C5FD14 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C5FD18 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5FD1C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5FD20 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5FD24 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C5FD28 4B 6E 67 89 */ bl PSMTXCopy -/* 80C5FD2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5FD30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5FD34 7C 08 03 A6 */ mtlr r0 -/* 80C5FD38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5FD3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setEffect__13daLv4PoGate_cFi.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setEffect__13daLv4PoGate_cFi.s deleted file mode 100644 index cc8a8e7086a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setEffect__13daLv4PoGate_cFi.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80C60534: -/* 80C60534 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C60538 7C 08 02 A6 */ mflr r0 -/* 80C6053C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C60540 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C60544 4B 70 1C 89 */ bl _savegpr_25 -/* 80C60548 7C 79 1B 78 */ mr r25, r3 -/* 80C6054C 2C 04 00 00 */ cmpwi r4, 0 -/* 80C60550 41 82 00 10 */ beq lbl_80C60560 -/* 80C60554 38 00 00 00 */ li r0, 0 -/* 80C60558 3B 60 00 06 */ li r27, 6 -/* 80C6055C 48 00 00 0C */ b lbl_80C60568 -lbl_80C60560: -/* 80C60560 38 00 00 06 */ li r0, 6 -/* 80C60564 3B 60 00 0A */ li r27, 0xa -lbl_80C60568: -/* 80C60568 7C 1A 03 78 */ mr r26, r0 -/* 80C6056C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C60570 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C60574 3C 60 80 C6 */ lis r3, particle_id@ha /* 0x80C60834@ha */ -/* 80C60578 3B A3 08 34 */ addi r29, r3, particle_id@l /* 0x80C60834@l */ -/* 80C6057C 3C 60 80 C6 */ lis r3, lit_3772@ha /* 0x80C60824@ha */ -/* 80C60580 3B C3 08 24 */ addi r30, r3, lit_3772@l /* 0x80C60824@l */ -/* 80C60584 54 1F 08 3C */ slwi r31, r0, 1 -/* 80C60588 48 00 00 50 */ b lbl_80C605D8 -lbl_80C6058C: -/* 80C6058C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80C60590 38 80 00 00 */ li r4, 0 -/* 80C60594 90 81 00 08 */ stw r4, 8(r1) -/* 80C60598 38 00 FF FF */ li r0, -1 -/* 80C6059C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C605A0 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C605A4 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C605A8 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C605AC 38 80 00 00 */ li r4, 0 -/* 80C605B0 7C BD FA 2E */ lhzx r5, r29, r31 -/* 80C605B4 38 D9 04 D0 */ addi r6, r25, 0x4d0 -/* 80C605B8 38 E0 00 00 */ li r7, 0 -/* 80C605BC 39 19 04 E4 */ addi r8, r25, 0x4e4 -/* 80C605C0 39 39 04 EC */ addi r9, r25, 0x4ec -/* 80C605C4 39 40 00 FF */ li r10, 0xff -/* 80C605C8 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80C605CC 4B 3E C4 C5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C605D0 3B 5A 00 01 */ addi r26, r26, 1 -/* 80C605D4 3B FF 00 02 */ addi r31, r31, 2 -lbl_80C605D8: -/* 80C605D8 7C 1A D8 00 */ cmpw r26, r27 -/* 80C605DC 41 80 FF B0 */ blt lbl_80C6058C -/* 80C605E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C605E4 4B 70 1C 35 */ bl _restgpr_25 -/* 80C605E8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C605EC 7C 08 03 A6 */ mtlr r0 -/* 80C605F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C605F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setSe__13daLv4PoGate_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setSe__13daLv4PoGate_cFv.s deleted file mode 100644 index 12b4409761e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate/setSe__13daLv4PoGate_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80C604D8: -/* 80C604D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C604DC 7C 08 02 A6 */ mflr r0 -/* 80C604E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C604E4 3C 60 80 C6 */ lis r3, lit_3655@ha /* 0x80C6081C@ha */ -/* 80C604E8 C0 23 08 1C */ lfs f1, lit_3655@l(r3) /* 0x80C6081C@l */ -/* 80C604EC D0 21 00 08 */ stfs f1, 8(r1) -/* 80C604F0 3C 60 80 C6 */ lis r3, lit_3772@ha /* 0x80C60824@ha */ -/* 80C604F4 C0 03 08 24 */ lfs f0, lit_3772@l(r3) /* 0x80C60824@l */ -/* 80C604F8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C604FC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80C60500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C60504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C60508 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80C6050C 3C 80 80 C6 */ lis r4, l_HIO@ha /* 0x80C609C4@ha */ -/* 80C60510 38 84 09 C4 */ addi r4, r4, l_HIO@l /* 0x80C609C4@l */ -/* 80C60514 88 84 00 24 */ lbz r4, 0x24(r4) -/* 80C60518 38 A0 00 0F */ li r5, 0xf -/* 80C6051C 38 C1 00 08 */ addi r6, r1, 8 -/* 80C60520 4B 40 F5 05 */ bl StartShock__12dVibration_cFii4cXyz -/* 80C60524 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C60528 7C 08 03 A6 */ mtlr r0 -/* 80C6052C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C60530 4E 80 00 20 */ blr diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h index eb46672d0a9..58971463e6f 100644 --- a/include/d/menu/d_menu_skill.h +++ b/include/d/menu/d_menu_skill.h @@ -14,6 +14,13 @@ class dSelect_cursor_c; class dMenu_Skill_c : public dDlst_base_c { public: + enum { + /* 0 */ PROC_CLOSE_MOVE, + /* 1 */ PROC_WAIT_MOVE, + /* 2 */ PROC_OPEN_MOVE, + /* 3 */ PROC_MOVE_MOVE, + }; + /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F763C */ void _create(); /* 801F7718 */ void _move(); @@ -21,8 +28,8 @@ public: /* 801F7950 */ bool isSync(); /* 801F7978 */ void skill_init_calc(); /* 801F79EC */ void init(); - /* 801F7A40 */ void _open(); - /* 801F7C1C */ void _close(); + /* 801F7A40 */ int _open(); + /* 801F7C1C */ int _close(); /* 801F7D58 */ void wait_init(); /* 801F7D94 */ void wait_move(); /* 801F7F24 */ void read_open_init(); @@ -40,7 +47,7 @@ public: /* 801F9260 */ void setAButtonString(u16); /* 801F9310 */ void setBButtonString(u16); /* 801F93C0 */ void setNameString(u16); - /* 801F9470 */ void getSkillNum(); + /* 801F9470 */ u8 getSkillNum(); /* 801F9500 */ void setHIO(bool); /* 801F9A08 */ virtual void draw(); @@ -49,61 +56,47 @@ public: u8 getStatus() { return mStatus; } private: - /* 0x004 */ JKRExpHeap* field_0x4; - /* 0x008 */ JKRArchive* field_0x8; - /* 0x00C */ STControl* field_0xc; - /* 0x010 */ CSTControl* field_0x10; - /* 0x014 */ mDoDvdThd_mountArchive_c* field_0x14; + /* 0x004 */ JKRExpHeap* mpHeap; + /* 0x008 */ JKRArchive* mpArchive; + /* 0x00C */ STControl* mpStick; + /* 0x010 */ CSTControl* mpCStick; + /* 0x014 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x018 */ J2DScreen* mpMenuScreen; /* 0x01C */ J2DScreen* mpLetterScreen; /* 0x020 */ J2DScreen* mpIconScreen; - /* 0x024 */ J2DPane* field_0x24[4]; - /* 0x034 */ J2DPane* field_0x34[4]; - /* 0x044 */ J2DPane* field_0x44[4]; - /* 0x054 */ J2DPane* field_0x54[4]; - /* 0x064 */ J2DPane* field_0x64[4]; - /* 0x074 */ J2DPane* field_0x74[4]; - /* 0x084 */ J2DPane* field_0x84[4]; - /* 0x094 */ J2DPane* field_0x94[4]; - /* 0x0A4 */ u8 field_0xa4[0xC]; - /* 0x0B0 */ J2DTextBox* field_0xb0[4]; - /* 0x0C0 */ J2DTextBox* field_0xc0[4]; - /* 0x0D0 */ J2DTextBox* field_0xd0[4]; - /* 0x0E0 */ J2DTextBox* field_0xe0[4]; - /* 0x0F0 */ J2DTextBox* field_0xf0[4]; - /* 0x100 */ J2DTextBox* field_0x100[4]; - /* 0x110 */ J2DTextBox* field_0x110[4]; - /* 0x120 */ J2DTextBox* mAButtonString[5]; - /* 0x134 */ J2DTextBox* mBButtonString[5]; - /* 0x148 */ J2DTextBox* mNameString[4]; + /* 0x024 */ J2DPicture* mpTagPicture[7][4]; + /* 0x094 */ J2DPicture* field_0x94[7]; + /* 0x0B0 */ J2DTextBox* mpFTagPicture[7][4]; + /* 0x120 */ J2DTextBox* mpAButtonString[5]; + /* 0x134 */ J2DTextBox* mpBButtonString[5]; + /* 0x148 */ J2DTextBox* mpNameString[4]; /* 0x158 */ J2DPicture* mpBlackTex; /* 0x15C */ CPaneMgr* mpParent; /* 0x160 */ CPaneMgr* mpLetterParent[7]; /* 0x17C */ CPaneMgr* mpTextParent; /* 0x180 */ CPaneMgr* mpTextPane; /* 0x184 */ CPaneMgr* mpExpName; - /* 0x188 */ CPaneMgr* field_0x188[2]; - /* 0x190 */ CPaneMgr* field_0x190[2]; + /* 0x188 */ CPaneMgr* mpButtonAB[2]; + /* 0x190 */ CPaneMgr* mpButtonText[2]; /* 0x198 */ dSelect_cursor_c* mpDrawCursor; /* 0x19C */ dMsgString_c* mpString; - /* 0x1A0 */ JUtility::TColor field_0x1a0[5]; - /* 0x1B4 */ JUtility::TColor field_0x1b4[5]; - /* 0x1C8 */ JUtility::TColor field_0x1c8[5]; - /* 0x1DC */ JUtility::TColor field_0x1dc[5]; - /* 0x1F0 */ f32 field_0x1f0; - /* 0x1F4 */ f32 field_0x1f4; - /* 0x1F8 */ f32 field_0x1f8; - /* 0x1FC */ int field_0x1fc; - /* 0x200 */ u16 field_0x200; - /* 0x202 */ u16 field_0x202; + /* 0x1A0 */ JUtility::TColor mSelectBlack[5]; + /* 0x1B4 */ JUtility::TColor mUnselectBlack[5]; + /* 0x1C8 */ JUtility::TColor mSelectWhite[5]; + /* 0x1DC */ JUtility::TColor mUnselectWhite[5]; + /* 0x1F0 */ f32 mPosX; + /* 0x1F4 */ f32 mBarScale[2]; + /* 0x1FC */ u32 mStringID; + /* 0x200 */ s16 mFrame; + /* 0x202 */ s16 mProcFrame; /* 0x204 */ u8 mStatus; - /* 0x205 */ u8 field_0x205; - /* 0x206 */ u8 field_0x206; - /* 0x207 */ u8 field_0x207; - /* 0x208 */ u8 field_0x208; + /* 0x205 */ u8 mProcess; + /* 0x206 */ u8 mIndex; + /* 0x207 */ u8 mSkillNum; + /* 0x208 */ u8 mRemainder; /* 0x209 */ u8 field_0x209; /* 0x20A */ u8 field_0x20a; - /* 0x20B */ u8 field_0x20b; -}; // Size: 0x20C + /* 0x20B */ u8 mTotalSkillNum; +}; // Size: 0x20C #endif /* D_MENU_D_MENU_SKILL_H */ diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 7ee09c9eaf4..b4be2d9c760 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -1,254 +1,54 @@ -// -// Generated By: dol2asm -// Translation Unit: d/menu/d_menu_skill -// +/** + * d_menu_skill.cpp + * Hidden Skills - Menu + */ #include "d/menu/d_menu_skill.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "MSL_C/string.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_class.h" +#include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" #include "global.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" -// -// Types: -// - -struct mDoGph_gInf_c { - static u8 mFader[4]; -}; - -struct mDoDvdThd_mountArchive_c { - /* 80015E14 */ void create(char const*, u8, JKRHeap*); -}; - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dMsgString_c { - /* 80249C20 */ dMsgString_c(); - /* 80249D28 */ ~dMsgString_c(); -}; - -struct JMSMesgEntry_c {}; - -struct dMeter2Info_c { - /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); -}; - -// -// Forward References: -// - -extern "C" void __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl(); extern "C" void __dt__13dMenu_Skill_cFv(); -extern "C" void _create__13dMenu_Skill_cFv(); -extern "C" void _move__13dMenu_Skill_cFv(); extern "C" void _draw__13dMenu_Skill_cFv(); -extern "C" void isSync__13dMenu_Skill_cFv(); -extern "C" void skill_init_calc__13dMenu_Skill_cFv(); -extern "C" void init__13dMenu_Skill_cFv(); -extern "C" void _open__13dMenu_Skill_cFv(); -extern "C" void _close__13dMenu_Skill_cFv(); -extern "C" void wait_init__13dMenu_Skill_cFv(); -extern "C" void wait_move__13dMenu_Skill_cFv(); -extern "C" void read_open_init__13dMenu_Skill_cFv(); -extern "C" void read_open_move__13dMenu_Skill_cFv(); -extern "C" void read_move_init__13dMenu_Skill_cFv(); -extern "C" void read_move_move__13dMenu_Skill_cFv(); -extern "C" void read_close_init__13dMenu_Skill_cFv(); -extern "C" void read_close_move__13dMenu_Skill_cFv(); -extern "C" void screenSetMenu__13dMenu_Skill_cFv(); -extern "C" void screenSetLetter__13dMenu_Skill_cFv(); -extern "C" void screenSetDoIcon__13dMenu_Skill_cFv(); -extern "C" void setCursorPos__13dMenu_Skill_cFv(); -extern "C" void changeActiveColor__13dMenu_Skill_cFv(); -extern "C" void setPageText__13dMenu_Skill_cFv(); -extern "C" void setAButtonString__13dMenu_Skill_cFUs(); -extern "C" void setBButtonString__13dMenu_Skill_cFUs(); -extern "C" void setNameString__13dMenu_Skill_cFUs(); -extern "C" void getSkillNum__13dMenu_Skill_cFv(); -extern "C" void setHIO__13dMenu_Skill_cFb(); extern "C" void draw__13dMenu_Skill_cFv(); -extern "C" void __sinit_d_menu_skill_cpp(); -extern "C" extern char const* const d_menu_d_menu_skill__stringBase0; -// -// External References: -// - -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoExt_getSubFont__Fv(); -extern "C" void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(); -extern "C" void checkUpTrigger__9STControlFv(); -extern "C" void checkDownTrigger__9STControlFv(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void __ct__Q28JUtility6TColorFv(); -extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive(); -extern "C" void setPos__16dSelect_cursor_cFffP7J2DPaneb(); -extern "C" void setParam__16dSelect_cursor_cFfffff(); -extern "C" void setScale__16dSelect_cursor_cFf(); -extern "C" void setAlphaRate__16dSelect_cursor_cFf(); -extern "C" void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void dMeter2Info_set2DVibration__Fv(); -extern "C" void __ct__12dMsgString_cFv(); -extern "C" void __dt__12dMsgString_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void __ct__10J2DPictureFPC7ResTIMG(); -extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_14(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_14(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 803BE7D8-803BE7E4 01B8F8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803BE7E4-803BE7F0 -00001 000C+00 0/1 0/0 0/0 .data @3795 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3795[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_init__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE7F0-803BE7FC -00001 000C+00 0/1 0/0 0/0 .data @3796 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3796[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)read_open_init__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE7FC-803BE808 -00001 000C+00 0/1 0/0 0/0 .data @3797 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3797[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)read_move_init__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE808-803BE814 -00001 000C+00 0/1 0/0 0/0 .data @3798 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3798[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)read_close_init__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE814-803BE844 01B934 0030+00 2/3 0/0 0/0 .data map_init_process */ -SECTION_DATA static u8 map_init_process[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dMenu_Skill_c::*initFunc)(); +static initFunc map_init_process[] = { + &dMenu_Skill_c::wait_init, + &dMenu_Skill_c::read_open_init, + &dMenu_Skill_c::read_move_init, + &dMenu_Skill_c::read_close_init, }; -/* 803BE844-803BE850 -00001 000C+00 0/1 0/0 0/0 .data @3799 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3799[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_move__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE850-803BE85C -00001 000C+00 0/1 0/0 0/0 .data @3800 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3800[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)read_open_move__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE85C-803BE868 -00001 000C+00 0/1 0/0 0/0 .data @3801 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3801[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)read_move_move__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE868-803BE874 -00001 000C+00 0/1 0/0 0/0 .data @3802 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3802[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)read_close_move__13dMenu_Skill_cFv, -}; -#pragma pop - -/* 803BE874-803BE8A4 01B994 0030+00 1/2 0/0 0/0 .data map_move_process */ -SECTION_DATA static u8 map_move_process[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dMenu_Skill_c::*moveFunc)(); +static moveFunc map_move_process[] = { + &dMenu_Skill_c::wait_move, + &dMenu_Skill_c::read_open_move, + &dMenu_Skill_c::read_move_move, + &dMenu_Skill_c::read_close_move, }; /* 803BE8A4-803BE8C0 01B9C4 001C+00 1/1 0/0 0/0 .data evt_id$4557 */ -SECTION_DATA static u8 evt_id[28] = { - 0x00, 0x00, 0x01, 0x53, 0x00, 0x00, 0x01, 0x52, 0x00, 0x00, 0x01, 0x54, 0x00, 0x00, - 0x01, 0x55, 0x00, 0x00, 0x01, 0x56, 0x00, 0x00, 0x01, 0x57, 0x00, 0x00, 0x01, 0x58, +static u32 evt_id[7] = { + 339, 338, 340, 341, 342, 343, 344, }; /* 803BE8C0-803BE8E0 01B9E0 0010+10 2/2 0/0 0/0 .data __vt__13dMenu_Skill_c */ @@ -264,597 +64,769 @@ SECTION_DATA extern void* __vt__13dMenu_Skill_c[4 + 4 /* padding */] = { NULL, }; -/* 80454488-8045448C 002A88 0004+00 8/8 0/0 0/0 .sdata2 @3808 */ -SECTION_SDATA2 static u8 lit_3808[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045448C-80454490 002A8C 0004+00 6/6 0/0 0/0 .sdata2 @3809 */ -SECTION_SDATA2 static f32 lit_3809 = 1.0f; - /* 801F7224-801F7348 1F1B64 0124+00 0/0 2/2 0/0 .text * __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl */ -dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { - field_0x4 = param_0; - field_0x8 = NULL; - field_0x14 = NULL; - field_0xc = param_1; - field_0x10 = param_2; +dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* i_heap, STControl* i_stcontrol, CSTControl* i_cstcontrol) { + mpHeap = i_heap; + mpArchive = NULL; + mpMount = NULL; + mpStick = i_stcontrol; + mpCStick = i_cstcontrol; mStatus = 1; - field_0x205 = 0; - field_0x200 = 0; - field_0x1fc = 0; - field_0x202 = 0; - field_0x206 = 0; + mProcess = PROC_CLOSE_MOVE; + mFrame = 0; + mStringID = 0; + mProcFrame = 0; + mIndex = 0; field_0x209 = 255; field_0x20a = 255; skill_init_calc(); - field_0x1f0 = FLOAT_LABEL(lit_3808); - f32 tmp_1 = lit_3809; - field_0x1f8 = tmp_1; - field_0x1f4 = tmp_1; + mPosX = 0.0f; + mBarScale[1] = 1.0f; + mBarScale[0] = 1.0f; } /* 801F7348-801F763C 1F1C88 02F4+00 1/0 0/0 0/0 .text __dt__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Skill_c::~dMenu_Skill_c() { - nofralloc -#include "asm/d/menu/d_menu_skill/__dt__13dMenu_Skill_cFv.s" +dMenu_Skill_c::~dMenu_Skill_c() { + delete mpDrawCursor; + mpDrawCursor = NULL; + + delete mpString; + mpString = NULL; + + delete mpMenuScreen; + mpMenuScreen = NULL; + + delete mpLetterScreen; + mpLetterScreen = NULL; + + delete mpTextPane; + mpTextPane = NULL; + + delete mpExpName; + mpExpName = NULL; + + delete mpTextParent; + mpTextParent = NULL; + + delete mpBlackTex; + mpBlackTex = NULL; + + delete mpParent; + mpParent = NULL; + + for (int i = 0; i < 7; i++) { + delete mpLetterParent[i]; + mpLetterParent[i] = NULL; + } + + delete mpIconScreen; + mpIconScreen = NULL; + + for (int i = 0; i < 2; i++) { + if (mpButtonAB[i] != NULL) { + delete mpButtonAB[i]; + mpButtonAB[i] = NULL; + } + if (mpButtonText[i] != NULL) { + delete mpButtonText[i]; + mpButtonText[i] = NULL; + } + } + + if (mpMount != NULL) { + mpMount->getArchive()->unmount(); + delete mpMount; + mpMount = NULL; + } + + if (mpArchive != NULL) { + mpArchive->unmount(); + mpArchive = NULL; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454490-80454494 002A90 0004+00 1/1 0/0 0/0 .sdata2 @3904 */ -SECTION_SDATA2 static f32 lit_3904 = 101.0f / 100.0f; - -/* 80454494-80454498 002A94 0004+00 1/1 0/0 0/0 .sdata2 @3905 */ -SECTION_SDATA2 static f32 lit_3905 = 17.0f / 20.0f; - -/* 80454498-8045449C 002A98 0004+00 1/1 0/0 0/0 .sdata2 @3906 */ -SECTION_SDATA2 static f32 lit_3906 = 1.0f / 50.0f; - -/* 8045449C-804544A0 002A9C 0004+00 1/1 0/0 0/0 .sdata2 @3907 */ -SECTION_SDATA2 static f32 lit_3907 = 0.5f; /* 801F763C-801F7718 1F1F7C 00DC+00 1/1 0/0 0/0 .text _create__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::_create() { - nofralloc -#include "asm/d/menu/d_menu_skill/_create__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::_create() { + mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f); + mpDrawCursor->setAlphaRate(0.0f); + mpDrawCursor->setScale(0.0f); + mpDrawCursor->offPlayAnime(0); + mpString = new dMsgString_c(); + screenSetMenu(); + screenSetLetter(); + screenSetDoIcon(); + setHIO(true); + init(); } -#pragma pop /* 801F7718-801F77B0 1F2058 0098+00 0/0 2/2 0/0 .text _move__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::_move() { - nofralloc -#include "asm/d/menu/d_menu_skill/_move__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::_move() { + JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap); + u8 process = mProcess; + (this->*map_move_process[mProcess])(); + if (process != mProcess) { + (this->*map_init_process[mProcess])(); + } + setHIO(false); + mDoExt_setCurrentHeap(heap); } -#pragma pop - -/* ############################################################################################## */ -/* 804544A0-804544A4 002AA0 0004+00 1/1 0/0 0/0 .sdata2 @3944 */ -SECTION_SDATA2 static f32 lit_3944 = 608.0f; - -/* 804544A4-804544A8 002AA4 0004+00 1/1 0/0 0/0 .sdata2 @3945 */ -SECTION_SDATA2 static f32 lit_3945 = 448.0f; - -/* 804544A8-804544B0 002AA8 0004+04 3/3 0/0 0/0 .sdata2 @3946 */ -SECTION_SDATA2 static f32 lit_3946[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; /* 801F77B0-801F7950 1F20F0 01A0+00 1/1 1/1 0/0 .text _draw__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::_draw() { - nofralloc -#include "asm/d/menu/d_menu_skill/_draw__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::_draw() { + if (mpArchive != NULL) { + J2DGrafContext* context = dComIfGp_getCurrentGrafPort(); + u8 alpha = mpBlackTex->mAlpha; + mpBlackTex->setAlpha(0xff); + mpBlackTex->draw(0.0f, 0.0f, 608.0f, 448.0f, 0, 0, 0); + mpBlackTex->setAlpha(alpha); + mpMenuScreen->draw(mPosX, 0.0f, context); + mpDrawCursor->draw(); + if (mProcess == 1 || mProcess == 2 || mProcess == 3) { + mpBlackTex->draw(0.0f, 0.0f, 608.0f, 448.0f, 0, 0, 0); + mpLetterScreen->draw(0.0f, 0.0f, context); + if (mStringID != 0) { + mpString->getString(mStringID, (J2DTextBox*)mpTextPane->getPanePtr(), NULL, NULL, + NULL, 0); + mpString->drawOutFont((J2DTextBox*)mpTextPane->getPanePtr(), -1.0f); + } + } + mpIconScreen->draw(0.0f, 0.0f, context); + } } -#pragma pop /* 801F7950-801F7978 1F2290 0028+00 0/0 2/2 0/0 .text isSync__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Skill_c::isSync() { - nofralloc -#include "asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s" +bool dMenu_Skill_c::isSync() { + if (mpMount != NULL && mpMount->sync() == false) { + return 0; + } + return 1; } -#pragma pop /* 801F7978-801F79EC 1F22B8 0074+00 1/1 0/0 0/0 .text skill_init_calc__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::skill_init_calc() { - nofralloc -#include "asm/d/menu/d_menu_skill/skill_init_calc__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::skill_init_calc() { + mTotalSkillNum = getSkillNum(); + if (mTotalSkillNum < 7) { + mSkillNum = mTotalSkillNum; + } else { + mSkillNum = 7; + } + + if (mTotalSkillNum % 7 == 0) { + mRemainder = mTotalSkillNum / 7; + } else { + mRemainder = mTotalSkillNum / 7 + 1; + } } -#pragma pop /* 801F79EC-801F7A40 1F232C 0054+00 1/1 0/0 0/0 .text init__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::init() { - nofralloc -#include "asm/d/menu/d_menu_skill/init__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::init() { + setPageText(); + changeActiveColor(); + (this->*map_init_process[mProcess])(); } -#pragma pop - -/* ############################################################################################## */ -/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc"; -#pragma pop - -/* 804544B0-804544B8 002AB0 0008+00 4/4 0/0 0/0 .sdata2 @4016 */ -SECTION_SDATA2 static f64 lit_4016 = 4503601774854144.0 /* cast s32 to float */; /* 801F7A40-801F7C1C 1F2380 01DC+00 0/0 2/2 0/0 .text _open__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::_open() { - nofralloc -#include "asm/d/menu/d_menu_skill/_open__13dMenu_Skill_cFv.s" +int dMenu_Skill_c::_open() { + if (!mpMount) { + mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/skillres.arc", 0, NULL); + } + if (!mpArchive) { + if (mpMount->sync() != 0) { + if (!mpArchive) { + mpArchive = (JKRArchive*)mpMount->getArchive(); + delete mpMount; + mpMount = NULL; + _create(); + } + } else { + return 0; + } + } + + s16 openFrame = g_drawHIO.mSkillListScreen.mOpenFrame[0]; + s16 closeFrame = g_drawHIO.mSkillListScreen.mCloseFrame[0]; + mFrame = g_drawHIO.mSkillListScreen.mOpenFrame[0]; + if (mFrame >= openFrame) { + mFrame = closeFrame; + mStatus = 2; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = 1.0f; + pane->mScaleY = 1.0f; + pane->calcMtx(); + mpParent->setAlphaRate(1.0f); + setCursorPos(); + mpDrawCursor->setAlphaRate(1.0f); + mpDrawCursor->setScale(1.0f); + mpDrawCursor->onPlayAnime(0); + return 1; + } else { + f32 div = (f32)mFrame / (f32)openFrame; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = div; + pane->mScaleY = div; + pane->calcMtx(); + mpParent->setAlphaRate(div); + setCursorPos(); + mpDrawCursor->setAlphaRate(div); + mpDrawCursor->setScale(div); + return 0; + } } -#pragma pop /* 801F7C1C-801F7D58 1F255C 013C+00 0/0 1/1 0/0 .text _close__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::_close() { - nofralloc -#include "asm/d/menu/d_menu_skill/_close__13dMenu_Skill_cFv.s" +int dMenu_Skill_c::_close() { + s16 closeFrame = g_drawHIO.mSkillListScreen.mCloseFrame[0]; + mFrame = 0; + if (mFrame <= 0) { + mFrame = 0; + mStatus = 0; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = 0.0f; + pane->mScaleY = 0.0f; + pane->calcMtx(); + mpParent->setAlphaRate(0.0f); + setCursorPos(); + mpDrawCursor->setAlphaRate(0.0f); + mpDrawCursor->setScale(0.0f); + return 1; + } else { + f32 div = (f32)mFrame / (f32)closeFrame; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = div; + pane->mScaleY = div; + pane->calcMtx(); + mpParent->setAlphaRate(div); + setCursorPos(); + mpDrawCursor->setAlphaRate(div); + mpDrawCursor->setScale(div); + return 0; + } + return mFrame <= 0; } -#pragma pop /* 801F7D58-801F7D94 1F2698 003C+00 1/0 0/0 0/0 .text wait_init__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::wait_init() { - nofralloc -#include "asm/d/menu/d_menu_skill/wait_init__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::wait_init() { + setAButtonString(0x40C); + setBButtonString(0x3f9); } -#pragma pop /* 801F7D94-801F7F24 1F26D4 0190+00 1/0 0/0 0/0 .text wait_move__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::wait_move() { - nofralloc -#include "asm/d/menu/d_menu_skill/wait_move__13dMenu_Skill_cFv.s" -} -#pragma pop +void dMenu_Skill_c::wait_move() { + u8 oldIndex = mIndex; + if (mDoGph_gInf_c::getFader()->getStatus() == 1) { + if ((mDoCPd_c::getTrig(0) & 0x200) != 0) { + mpDrawCursor->offPlayAnime(0); + mStatus = 3; + } else if (mDoCPd_c::getTrigA(0)) { + mProcess = PROC_WAIT_MOVE; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + dMeter2Info_set2DVibration(); + } else if (mpStick->checkUpTrigger()) { + if (mIndex) { + mIndex--; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + + } else if (mpStick->checkDownTrigger() && mIndex < mSkillNum - 1) { + mIndex++; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + if (oldIndex != mIndex) { + changeActiveColor(); + } + } +} -/* ############################################################################################## */ /* 80397A18-80397A34 024078 001C+00 2/2 0/0 0/0 .rodata i_id$4087 */ -SECTION_RODATA static u8 const i_id[28] = { - 0x00, 0x00, 0x06, 0xB4, 0x00, 0x00, 0x06, 0xB3, 0x00, 0x00, 0x06, 0xB5, 0x00, 0x00, - 0x06, 0xB6, 0x00, 0x00, 0x06, 0xB7, 0x00, 0x00, 0x06, 0xB8, 0x00, 0x00, 0x06, 0xB9, +static const u32 i_id[7] = { + 1716, 1715, 1717, 1718, 1719, 1720, 1721, }; -COMPILER_STRIP_GATE(0x80397A18, &i_id); /* 80397A34-80397A50 024094 001C+00 1/1 0/0 0/0 .rodata i_id1$4088 */ -SECTION_RODATA static u8 const i_id1_4088[28] = { - 0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00, - 0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2, +static const u32 i_id1_4088[7] = { + 1709, 1708, 1710, 1711, 1712, 1713, 1714, }; -COMPILER_STRIP_GATE(0x80397A34, &i_id1_4088); /* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::read_open_init() { - nofralloc -#include "asm/d/menu/d_menu_skill/read_open_init__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::read_open_init() { + mProcFrame = 0; + int index = mIndex; + mStringID = i_id[index]; + mpTextParent->setAlphaRate(0.0f); + setNameString(i_id1_4088[index]); + mpString->getString(mStringID, (J2DTextBox*)mpTextPane->getPanePtr(), NULL, NULL, NULL, 0); + setAButtonString(0); + setBButtonString(0); + mpBlackTex->setAlpha(0); } -#pragma pop - -/* ############################################################################################## */ -/* 804544B8-804544C0 002AB8 0008+00 2/2 0/0 0/0 .sdata2 @4104 */ -SECTION_SDATA2 static f64 lit_4104 = 4503599627370496.0 /* cast u32 to float */; /* 801F7FF8-801F8114 1F2938 011C+00 1/0 0/0 0/0 .text read_open_move__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::read_open_move() { - nofralloc -#include "asm/d/menu/d_menu_skill/read_open_move__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::read_open_move() { + s16 openFrame = g_drawHIO.mSkillListScreen.mOpenFrame[1]; + mProcFrame++; + if (mProcFrame >= openFrame) { + mProcess = PROC_OPEN_MOVE; + mpTextParent->setAlphaRate(1.0f); + mpBlackTex->setAlpha(g_drawHIO.mSkillListScreen.mWindowBGalpha); + } else { + f32 alphaRate = (f32)mProcFrame / (f32)openFrame; + mpTextParent->setAlphaRate(alphaRate); + mpBlackTex->setAlpha(g_drawHIO.mSkillListScreen.mWindowBGalpha * alphaRate); + } } -#pragma pop /* 801F8114-801F8150 1F2A54 003C+00 1/0 0/0 0/0 .text read_move_init__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::read_move_init() { - nofralloc -#include "asm/d/menu/d_menu_skill/read_move_init__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::read_move_init() { + setAButtonString(0); + setBButtonString(0x3f9); } -#pragma pop /* 801F8150-801F8218 1F2A90 00C8+00 1/0 0/0 0/0 .text read_move_move__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::read_move_move() { - nofralloc -#include "asm/d/menu/d_menu_skill/read_move_move__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::read_move_move() { + if (mDoCPd_c::getTrigA(0) != 0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + dMeter2Info_set2DVibration(); + mProcess = PROC_MOVE_MOVE; + + } else if ((mDoCPd_c::getTrig(0) & 0x200) != 0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + dMeter2Info_set2DVibration(); + mProcess = PROC_MOVE_MOVE; + } } -#pragma pop /* 801F8218-801F826C 1F2B58 0054+00 1/0 0/0 0/0 .text read_close_init__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::read_close_init() { - nofralloc -#include "asm/d/menu/d_menu_skill/read_close_init__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::read_close_init() { + mProcFrame = g_drawHIO.mSkillListScreen.mCloseFrame[1]; + mStringID = 0; + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801F826C-801F8388 1F2BAC 011C+00 1/0 0/0 0/0 .text read_close_move__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::read_close_move() { - nofralloc -#include "asm/d/menu/d_menu_skill/read_close_move__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::read_close_move() { + s16 closeFrame = g_drawHIO.mSkillListScreen.mCloseFrame[1]; + mProcFrame--; + if (mProcFrame <= 0) { + mProcess = PROC_CLOSE_MOVE; + mpTextParent->setAlphaRate(0.0f); + mpBlackTex->setAlpha(g_drawHIO.mSkillListScreen.mWindowBGalpha); + } else { + f32 alphaRate = (f32)mProcFrame / (f32)closeFrame; + mpTextParent->setAlphaRate(alphaRate); + mpBlackTex->setAlpha(g_drawHIO.mSkillListScreen.mWindowBGalpha * alphaRate); + } } -#pragma pop -/* ############################################################################################## */ /* 80397A50-80397A88 0240B0 0038+00 0/1 0/0 0/0 .rodata tag_sub0$4148 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_sub0[56] = { - 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, - 0x31, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x6D, 0x65, 0x6E, 0x75, - 0x5F, 0x74, 0x33, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65, - 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x31, +static const u64 tag_sub0[7] = { + 'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s', 'menu_t51', }; -COMPILER_STRIP_GATE(0x80397A50, &tag_sub0); #pragma pop /* 80397A88-80397AC0 0240E8 0038+00 0/1 0/0 0/0 .rodata tag_sub1$4149 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_sub1[56] = { - 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, - 0x74, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x6D, 0x65, 0x6E, - 0x75, 0x5F, 0x74, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D, - 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, +static const u64 tag_sub1[7] = { + 'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5', 'menu_t6', }; -COMPILER_STRIP_GATE(0x80397A88, &tag_sub1); #pragma pop /* 80397AC0-80397AF8 024120 0038+00 0/1 0/0 0/0 .rodata tag_name0$4150 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_name0[56] = { - 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x66, - 0x37, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x6D, 0x65, 0x6E, 0x75, - 0x5F, 0x74, 0x39, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65, - 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x32, +static const u64 tag_name0[7] = { + 'menu_t6s', 'menu_f7s', 'menu_f8s', 'menu_t9s', 'menu_10s', 'menu_11s', 'menu_112', }; -COMPILER_STRIP_GATE(0x80397AC0, &tag_name0); #pragma pop /* 80397AF8-80397B30 024158 0038+00 0/1 0/0 0/0 .rodata tag_name1$4151 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_name1[56] = { - 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x36, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, - 0x66, 0x37, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x6D, 0x65, 0x6E, - 0x75, 0x5F, 0x74, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65, - 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x31, +static const u64 tag_name1[7] = { + 'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11', 'menu_t01', }; -COMPILER_STRIP_GATE(0x80397AF8, &tag_name1); #pragma pop /* 80397B30-80397B68 024190 0038+00 0/1 0/0 0/0 .rodata ftag_sub0$4152 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ftag_sub0[56] = { - 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, - 0x31, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, - 0x5F, 0x74, 0x33, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65, - 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x73, +static const u64 ftag_sub0[7] = { + 'fenu_t0s', 'fenu_t1s', 'fenu_t2s', 'fenu_t3s', 'fenu_t4s', 'fenu_t5s', 'fenu_t6s', }; -COMPILER_STRIP_GATE(0x80397B30, &ftag_sub0); #pragma pop /* 80397B68-80397BA0 0241C8 0038+00 0/1 0/0 0/0 .rodata ftag_sub1$4153 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ftag_sub1[56] = { - 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, - 0x74, 0x31, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, - 0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, - 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, +static const u64 ftag_sub1[7] = { + 'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5', 'fenu_t6', }; -COMPILER_STRIP_GATE(0x80397B68, &ftag_sub1); #pragma pop /* 80397BA0-80397BD8 024200 0038+00 0/1 0/0 0/0 .rodata ftag_name0$4154 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ftag_name0[56] = { - 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, - 0x38, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73, 0x66, 0x65, 0x6E, 0x75, - 0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x66, 0x65, - 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, 0x73, +static const u64 ftag_name0[7] = { + 'fenu_t7s', 'fenu_t8s', 'fenu_t9s', 'fenu_10s', 'fenu_11s', 'fenu_12s', 'fenu_13s', }; -COMPILER_STRIP_GATE(0x80397BA0, &ftag_name0); #pragma pop /* 80397BD8-80397C10 024238 0038+00 0/1 0/0 0/0 .rodata ftag_name1$4155 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ftag_name1[56] = { - 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, - 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x00, 0x66, 0x65, 0x6E, - 0x75, 0x5F, 0x31, 0x30, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x00, 0x66, - 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, +static const u64 ftag_name1[7] = { + 'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_10', 'fenu_11', 'fenu_12', 'fenu_13', }; -COMPILER_STRIP_GATE(0x80397BD8, &ftag_name1); #pragma pop /* 80397C10-80397C48 024270 0038+00 0/1 0/0 0/0 .rodata tag_letter$4166 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_letter[56] = { - 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x30, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x31, - 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, - 0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, - 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x36, 0x5F, 0x6E, +static const u64 tag_letter[7] = { + 'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n', 'let_06_n', }; -COMPILER_STRIP_GATE(0x80397C10, &tag_letter); #pragma pop /* 80397C48-80397C80 0242A8 0038+00 0/1 0/0 0/0 .rodata tag_frame$4173 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_frame[56] = { - 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x30, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, - 0x30, 0x31, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, - 0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, - 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x36, +static const u64 tag_frame[7] = { + 'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05', 'flame_06', }; -COMPILER_STRIP_GATE(0x80397C48, &tag_frame); #pragma pop /* 80397C80-80397CB8 0242E0 0038+00 0/1 0/0 0/0 .rodata tag_maki$4174 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_maki[56] = { - 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x30, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, - 0x31, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x32, 0x6E, 0x00, 0x6D, 0x61, 0x6B, - 0x69, 0x5F, 0x33, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x6E, 0x00, 0x6D, - 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, 0x6E, +static const u64 tag_maki[7] = { + 'maki_0n', 'maki_1n', 'maki_2n', 'maki_3n', 'maki_4n', 'maki_5n', 'maki_6n', }; -COMPILER_STRIP_GATE(0x80397C80, &tag_maki); #pragma pop /* 80397CB8-80397CF0 024318 0038+00 0/1 0/0 0/0 .rodata tag_makic$4175 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const tag_makic[56] = { - 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, - 0x5F, 0x31, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x61, - 0x6B, 0x69, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x00, 0x00, - 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, +static const u64 tag_makic[7] = { + 'maki_0', 'maki_1', 'maki_2', 'maki_3', 'maki_4', 'maki_5', 'maki_6', }; -COMPILER_STRIP_GATE(0x80397CB8, &tag_makic); -#pragma pop - -/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo"; -SECTION_DEAD static char const* const stringBase_80397DE7 = ""; #pragma pop /* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::screenSetMenu() { - nofralloc -#include "asm/d/menu/d_menu_skill/screenSetMenu__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::screenSetMenu() { + mpMenuScreen = new J2DScreen(); + mpMenuScreen->setPriority("zelda_ougi_window.blo", 0x20000, mpArchive); + dPaneClass_showNullPane(mpMenuScreen); + mpParent = new CPaneMgr(mpMenuScreen, 'n_all', 2, NULL); + mpParent->setAlphaRate(0.0f); + for (int i = 0; i < 7; i++) { + mpFTagPicture[i][0] = (J2DTextBox*)mpMenuScreen->search(ftag_sub0[i]); + mpFTagPicture[i][1] = (J2DTextBox*)mpMenuScreen->search(ftag_sub1[i]); + mpFTagPicture[i][2] = (J2DTextBox*)mpMenuScreen->search(ftag_name0[i]); + mpFTagPicture[i][3] = (J2DTextBox*)mpMenuScreen->search(ftag_name1[i]); + mpMenuScreen->search(tag_sub0[i])->hide(); + mpMenuScreen->search(tag_sub1[i])->hide(); + mpMenuScreen->search(tag_name0[i])->hide(); + mpMenuScreen->search(tag_name1[i])->hide(); + for (int j = 0; j < 4; j++) { + mpFTagPicture[i][j]->setFont(mDoExt_getMesgFont()); + mpFTagPicture[i][j]->setString(0x40, ""); + } + } + for (int i = 0; i < 7; i++) { + mpLetterParent[i] = new CPaneMgr(mpMenuScreen, tag_letter[i], 0, NULL); + } + for (int i = 0; i < 7; i++) { + mpTagPicture[i][0] = (J2DPicture*)mpMenuScreen->search(tag_frame[i]); + mpTagPicture[i][1] = (J2DPicture*)mpMenuScreen->search(tag_maki[i]); + mpTagPicture[i][2] = (J2DPicture*)mpMenuScreen->search(tag_letter[i]); + field_0x94[i] = (J2DPicture*)mpMenuScreen->search(tag_makic[i]); + if (i < mSkillNum) { + mpTagPicture[i][1]->show(); + mpTagPicture[i][2]->show(); + } else { + mpTagPicture[i][1]->hide(); + mpTagPicture[i][2]->hide(); + } + } + for (int i = 0; i < 4; i++) { + if (i == 0) { + mUnselectBlack[i] = mpTagPicture[0][i]->getBlack(); + mUnselectWhite[i] = mpTagPicture[0][i]->getWhite(); + mSelectBlack[i] = mpTagPicture[1][i]->getBlack(); + mSelectWhite[i] = mpTagPicture[1][i]->getWhite(); + mUnselectBlack[i].a = 255; + mSelectBlack[i].a = 255; + } else if (i == 3) { + mUnselectBlack[i] = mpFTagPicture[0][i]->getBlack(); + mUnselectWhite[i] = mpFTagPicture[0][i]->getWhite(); + mSelectBlack[i] = mpFTagPicture[1][i]->getBlack(); + mSelectWhite[i] = mpFTagPicture[1][i]->getWhite(); + } + } + J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search('f_t00'); + mpMenuScreen->search('t_t00')->hide(); + textBox->setFont(mDoExt_getSubFont()); + textBox->setString(0x200, ""); + mpString->getString(0x6a4, textBox, NULL, NULL, NULL, 0); } -#pragma pop -/* ############################################################################################## */ -/* 80397CF0-80397D10 024350 0020+00 1/1 0/0 0/0 .rodata name_tag$4306 */ -SECTION_RODATA static u8 const name_tag[32] = { - 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35, - 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37, +static const u64 name_tag[4] = { + 'item_n04', + 'item_n05', + 'item_n06', + 'item_n07', }; -COMPILER_STRIP_GATE(0x80397CF0, &name_tag); -/* 80397D10-80397D30 024370 0020+00 1/1 0/0 0/0 .rodata fame_tag$4307 */ -SECTION_RODATA static u8 const fame_tag[32] = { - 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32, - 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34, +static const u64 fame_tag[4] = { + 'f_item_1', + 'f_item_2', + 'f_item_3', + 'f_item_4', }; -COMPILER_STRIP_GATE(0x80397D10, &fame_tag); - -/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo"; -SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti"; -#pragma pop /* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::screenSetLetter() { - nofralloc -#include "asm/d/menu/d_menu_skill/screenSetLetter__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::screenSetLetter() { + mpLetterScreen = new J2DScreen(); + mpLetterScreen->setPriority("zelda_ougi_info.blo", 0x20000, mpArchive); + dPaneClass_showNullPane(mpLetterScreen); + mpTextPane = new CPaneMgr(mpLetterScreen, 'mg_e4lin', 0, NULL); + mpLetterScreen->search('n_3line')->hide(); + mpExpName = new CPaneMgr(mpLetterScreen, 'label_n', 0, NULL); + J2DTextBox* paneFont = (J2DTextBox*)mpTextPane->getPanePtr(); + paneFont->setFont(mDoExt_getMesgFont()); + J2DTextBox* paneString = (J2DTextBox*)mpTextPane->getPanePtr(); + paneString->setString(0x200, ""); + for (int i = 0; i < 4; i++) { + mpNameString[i] = (J2DTextBox*)mpLetterScreen->search(fame_tag[i]); + mpLetterScreen->search(name_tag[i])->hide(); + mpNameString[i]->setFont(mDoExt_getMesgFont()); + mpNameString[i]->setString(0x40, ""); + } + mpTextParent = new CPaneMgr(mpLetterScreen, 'n_all', 2, NULL); + mpTextParent->setAlphaRate(0.0f); + ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBlackTex = new J2DPicture(timg); + mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); + mpBlackTex->setAlpha(0); } -#pragma pop -/* ############################################################################################## */ /* 80397D30-80397D58 024390 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4365 */ -SECTION_RODATA static u64 const text_a_tag[5] = { +static const u64 text_a_tag[5] = { 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', }; -COMPILER_STRIP_GATE(0x80397D30, &text_a_tag); /* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */ -SECTION_RODATA static u64 const text_b_tag[5] = { +static const u64 text_b_tag[5] = { 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', }; -COMPILER_STRIP_GATE(0x80397D58, &text_b_tag); - -/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0"; -#pragma pop /* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::screenSetDoIcon() { - nofralloc -#include "asm/d/menu/d_menu_skill/screenSetDoIcon__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::screenSetDoIcon() { + mpIconScreen = new J2DScreen(); + mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); + for (int i = 0; i < 2; i++) { + mpButtonAB[i] = 0; + mpButtonText[i] = 0; + } + dPaneClass_showNullPane(mpIconScreen); + for (int i = 0; i < 5; i++) { + mpAButtonString[i] = (J2DTextBox*)mpIconScreen->search(text_a_tag[i]); + mpBButtonString[i] = (J2DTextBox*)mpIconScreen->search(text_b_tag[i]); + mpAButtonString[i]->setFont(mDoExt_getMesgFont()); + mpBButtonString[i]->setFont(mDoExt_getMesgFont()); + mpAButtonString[i]->setString(0x20, ""); + mpBButtonString[i]->setString(0x20, ""); + } } -#pragma pop /* 801F8E9C-801F8F28 1F37DC 008C+00 3/3 0/0 0/0 .text setCursorPos__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::setCursorPos() { - nofralloc -#include "asm/d/menu/d_menu_skill/setCursorPos__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::setCursorPos() { + Vec pos = mpLetterParent[mIndex]->getGlobalVtxCenter(mpLetterParent[mIndex]->mPane, false, 0); + mpDrawCursor->setPos(pos.x, pos.y, mpLetterParent[mIndex]->getPanePtr(), false); } -#pragma pop /* 801F8F28-801F9144 1F3868 021C+00 2/2 0/0 0/0 .text changeActiveColor__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::changeActiveColor() { - nofralloc -#include "asm/d/menu/d_menu_skill/changeActiveColor__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::changeActiveColor() { + setCursorPos(); + for (int i = 0; i < 7; i++) { + if (i == mIndex) { + mpTagPicture[i][0]->setBlackWhite(mSelectBlack[0], mSelectWhite[0]); + mpFTagPicture[i][1]->setBlackWhite(mSelectBlack[3], mSelectWhite[3]); + mpFTagPicture[i][3]->setBlackWhite(mSelectBlack[3], mSelectWhite[3]); + mpLetterParent[i]->scale(mBarScale[0], mBarScale[0]); + field_0x94[i]->setBlackWhite(mSelectBlack[4], mSelectWhite[4]); + } else { + mpTagPicture[i][0]->setBlackWhite(mUnselectBlack[0], mUnselectWhite[0]); + mpFTagPicture[i][1]->setBlackWhite(mUnselectBlack[3], mUnselectWhite[3]); + mpFTagPicture[i][3]->setBlackWhite(mUnselectBlack[3], mUnselectWhite[3]); + mpLetterParent[i]->scale(mBarScale[1], mBarScale[1]); + field_0x94[i]->setBlackWhite(mUnselectBlack[4], mUnselectWhite[4]); + } + } } -#pragma pop -/* ############################################################################################## */ /* 80397D80-80397D9C 0243E0 001C+00 1/1 0/0 0/0 .rodata i_id0$4478 */ -SECTION_RODATA static u8 const i_id0[28] = { - 0x00, 0x00, 0x06, 0xA5, 0x00, 0x00, 0x06, 0xA6, 0x00, 0x00, 0x06, 0xA7, 0x00, 0x00, - 0x06, 0xA8, 0x00, 0x00, 0x06, 0xA9, 0x00, 0x00, 0x06, 0xAA, 0x00, 0x00, 0x06, 0xAB, +static const u32 i_id0[7] = { + 1701, 1702, 1703, 1704, 1705, 1706, 1707, }; -COMPILER_STRIP_GATE(0x80397D80, &i_id0); /* 80397D9C-80397DB8 0243FC 001C+00 1/1 0/0 0/0 .rodata i_id1$4479 */ -SECTION_RODATA static u8 const i_id1_4479[28] = { - 0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00, - 0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2, +static const u32 i_id1_4479[7] = { + 1709, 1708, 1710, 1711, 1712, 1713, 1714, }; -COMPILER_STRIP_GATE(0x80397D9C, &i_id1_4479); /* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::setPageText() { - nofralloc -#include "asm/d/menu/d_menu_skill/setPageText__13dMenu_Skill_cFv.s" +void dMenu_Skill_c::setPageText() { + for (int i = 0; i < mSkillNum; i++) { + mpString->getString(i_id0[i], mpFTagPicture[i][0], NULL, NULL, NULL, 0); + mpString->getString(i_id0[i], mpFTagPicture[i][1], NULL, NULL, NULL, 0); + mpString->getString(i_id1_4479[i], mpFTagPicture[i][2], NULL, NULL, NULL, 0); + mpString->getString(i_id1_4479[i], mpFTagPicture[i][3], NULL, NULL, NULL, 0); + } } -#pragma pop /* 801F9260-801F9310 1F3BA0 00B0+00 4/4 0/0 0/0 .text setAButtonString__13dMenu_Skill_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::setAButtonString(u16 param_0) { - nofralloc -#include "asm/d/menu/d_menu_skill/setAButtonString__13dMenu_Skill_cFUs.s" +void dMenu_Skill_c::setAButtonString(u16 i_stringID) { + if (i_stringID == 0) { + for (int i = 0; i < 5; i++) { + strcpy(mpAButtonString[i]->getStringPtr(), ""); + } + } else { + for (int i = 0; i < 5; i++) { + dMeter2Info_getStringKanji(i_stringID, mpAButtonString[i]->getStringPtr(), NULL); + } + } } -#pragma pop /* 801F9310-801F93C0 1F3C50 00B0+00 4/4 0/0 0/0 .text setBButtonString__13dMenu_Skill_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::setBButtonString(u16 param_0) { - nofralloc -#include "asm/d/menu/d_menu_skill/setBButtonString__13dMenu_Skill_cFUs.s" +void dMenu_Skill_c::setBButtonString(u16 i_stringID) { + if (i_stringID == 0) { + for (int i = 0; i < 5; i++) { + strcpy(mpBButtonString[i]->getStringPtr(), ""); + } + } else { + for (int i = 0; i < 5; i++) { + dMeter2Info_getStringKanji(i_stringID, mpBButtonString[i]->getStringPtr(), NULL); + } + } } -#pragma pop /* 801F93C0-801F9470 1F3D00 00B0+00 1/1 0/0 0/0 .text setNameString__13dMenu_Skill_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::setNameString(u16 param_0) { - nofralloc -#include "asm/d/menu/d_menu_skill/setNameString__13dMenu_Skill_cFUs.s" +void dMenu_Skill_c::setNameString(u16 i_stringID) { + if (i_stringID == 0) { + for (int i = 0; i < 4; i++) { + strcpy(mpNameString[i]->getStringPtr(), ""); + } + } else { + for (int i = 0; i < 4; i++) { + dMeter2Info_getStringKanji(i_stringID, mpNameString[i]->getStringPtr(), NULL); + } + } } -#pragma pop /* 801F9470-801F9500 1F3DB0 0090+00 1/1 0/0 0/0 .text getSkillNum__13dMenu_Skill_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::getSkillNum() { - nofralloc -#include "asm/d/menu/d_menu_skill/getSkillNum__13dMenu_Skill_cFv.s" +u8 dMenu_Skill_c::getSkillNum() { + u8 skillNum = 0; + for (int i = 0; i < 7; i++) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[evt_id[i]])) { + skillNum++; + } + } + return skillNum; } -#pragma pop /* 801F9500-801F9A08 1F3E40 0508+00 2/2 0/0 0/0 .text setHIO__13dMenu_Skill_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Skill_c::setHIO(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_skill/setHIO__13dMenu_Skill_cFb.s" +void dMenu_Skill_c::setHIO(bool i_useHIO) { + if (i_useHIO || g_drawHIO.mSkillListScreen.mDebug) { + mSelectBlack[0].set(g_drawHIO.mSkillListScreen.mSelectBarBlack); + mSelectWhite[0].set(g_drawHIO.mSkillListScreen.mSelectBarWhite); + mSelectBlack[3].set(g_drawHIO.mSkillListScreen.mSelectTextBlack); + mSelectWhite[3].set(g_drawHIO.mSkillListScreen.mSelectTextWhite); + mBarScale[0] = g_drawHIO.mSkillListScreen.mSelectBarScale; + mBarScale[1] = g_drawHIO.mSkillListScreen.mUnselectBarScale; + mSelectBlack[4].set(g_drawHIO.mSkillListScreen.mSelectScrollIconBlack); + mSelectWhite[4].set(g_drawHIO.mSkillListScreen.mSelectScrollIconWhite); + mUnselectBlack[4].set(g_drawHIO.mSkillListScreen.mUnselectScrollIconBlack); + mUnselectWhite[4].set(g_drawHIO.mSkillListScreen.mUnselectScrollIconWhite); + for (int i = 0; i < 7; i++) { + if (i == mIndex) { + mpTagPicture[i][0]->setBlackWhite(mSelectBlack[0], mSelectWhite[0]); + mpFTagPicture[i][1]->setBlackWhite(mSelectBlack[3], mSelectWhite[3]); + mpFTagPicture[i][3]->setBlackWhite(mSelectBlack[3], mSelectWhite[3]); + mpLetterParent[i]->scale(mBarScale[0], mBarScale[0]); + field_0x94[i]->setBlackWhite(mSelectBlack[4], mSelectWhite[4]); + } else { + mpLetterParent[i]->scale(mBarScale[1], mBarScale[1]); + field_0x94[i]->setBlackWhite(mUnselectBlack[4], mUnselectWhite[4]); + } + } + mpTextParent->paneTrans(g_drawHIO.mSkillListScreen.mSkillDescPosX, + g_drawHIO.mSkillListScreen.mSkillDescPosY); + mpTextParent->scale(g_drawHIO.mSkillListScreen.mSkillDescScale, + g_drawHIO.mSkillListScreen.mSkillDescScale); + if (mProcess == 2) { + mpBlackTex->setAlpha(g_drawHIO.mSkillListScreen.mWindowBGalpha); + } + mpExpName->paneTrans(g_drawHIO.mSkillListScreen.mSkillTitlePosX, + g_drawHIO.mSkillListScreen.mSkillTitlePosY); + mpExpName->scale(g_drawHIO.mSkillListScreen.mSkillTitleScale, + g_drawHIO.mSkillListScreen.mSkillTitleScale); + } + if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) { + if (mpButtonAB[0]) { + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, + g_drawHIO.mCollectScreen.mAButtonPosY); + mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale, + g_drawHIO.mCollectScreen.mAButtonScale); + } + if (mpButtonAB[1]) { + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, + g_drawHIO.mCollectScreen.mBButtonPosY); + mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale, + g_drawHIO.mCollectScreen.mBButtonScale); + } + if (mpButtonText[0]) { + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, + g_drawHIO.mCollectScreen.mAButtonTextPosY); + mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, + g_drawHIO.mCollectScreen.mAButtonTextScale); + } + if (mpButtonText[1]) { + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, + g_drawHIO.mCollectScreen.mBButtonTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, + g_drawHIO.mCollectScreen.mBButtonTextScale); + } + } } -#pragma pop /* 801F9A08-801F9A28 1F4348 0020+00 1/0 0/0 0/0 .text draw__13dMenu_Skill_cFv */ +#ifdef NONMATCHING +// Size of vtable doesn't match. Same padding occours in d_menu_calibration +void dMenu_Skill_c::draw() { + _draw(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -864,20 +836,4 @@ extern "C" asm void draw__13dMenu_Skill_cFv() { #include "asm/d/menu/d_menu_skill/draw__13dMenu_Skill_cFv.s" } #pragma pop - -/* 801F9A28-801F9AFC 1F4368 00D4+00 0/0 1/0 0/0 .text __sinit_d_menu_skill_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_menu_skill_cpp() { - nofralloc -#include "asm/d/menu/d_menu_skill/__sinit_d_menu_skill_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x801F9A28, __sinit_d_menu_skill_cpp); -#pragma pop - -/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#endif