From bd4682495bb908d21709e7d64672484b30a33ad6 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 10 Apr 2022 15:29:28 -0700 Subject: [PATCH] d_s_logo (#188) * d_s_logo * match fpcM_Management * asm --- asm/d/s/d_s_logo/__ct__10dLog_HIO_cFv.s | 5 - asm/d/s/d_s_logo/__dt__10dLog_HIO_cFv.s | 20 - asm/d/s/d_s_logo/__dt__10dScnLogo_cFv.s | 440 ----- asm/d/s/d_s_logo/__sinit_d_s_logo_cpp.s | 116 -- .../checkProgSelect__10dScnLogo_cFv.s | 33 - asm/d/s/d_s_logo/create__10dScnLogo_cFv.s | 105 -- .../dScnLogo_Delete__FP10dScnLogo_c.s | 11 - .../d_s_logo/dScnLogo_Draw__FP10dScnLogo_c.s | 10 - .../dScnLogo_Execute__FP10dScnLogo_c.s | 18 - .../s/d_s_logo/dolbyInDraw__10dScnLogo_cFv.s | 35 - .../d_s_logo/dolbyOutDraw2__10dScnLogo_cFv.s | 7 - .../s/d_s_logo/dolbyOutDraw__10dScnLogo_cFv.s | 35 - asm/d/s/d_s_logo/draw__10dScnLogo_cFv.s | 22 - .../s/d_s_logo/dvdDataLoad__10dScnLogo_cFv.s | 270 --- .../s/d_s_logo/dvdWaitDraw__10dScnLogo_cFv.s | 135 -- asm/d/s/d_s_logo/func_802585A4.s | 9 - .../getProgressiveMode__10dScnLogo_cFv.s | 10 - .../isProgressiveMode__10dScnLogo_cFv.s | 12 - asm/d/s/d_s_logo/logoInitGC__10dScnLogo_cFv.s | 235 --- .../nextSceneChange__10dScnLogo_cFv.s | 15 - .../d_s_logo/nintendoInDraw__10dScnLogo_cFv.s | 35 - .../nintendoOutDraw__10dScnLogo_cFv.s | 35 - asm/d/s/d_s_logo/phase_1__FP10dScnLogo_c.s | 50 - asm/d/s/d_s_logo/phase_2__FP10dScnLogo_c.s | 18 - .../s/d_s_logo/preLoad_dyl__10dScnLogo_cFv.s | 34 - .../preLoad_dyl_create__10dScnLogo_cFv.s | 18 - .../preLoad_dyl_remove__10dScnLogo_cFv.s | 10 - .../d_s_logo/progChangeDraw__10dScnLogo_cFv.s | 51 - asm/d/s/d_s_logo/progInDraw__10dScnLogo_cFv.s | 48 - .../s/d_s_logo/progOutDraw__10dScnLogo_cFv.s | 93 - .../s/d_s_logo/progSelDraw__10dScnLogo_cFv.s | 389 ---- .../s/d_s_logo/progSet2Draw__10dScnLogo_cFv.s | 35 - .../s/d_s_logo/progSetDraw__10dScnLogo_cFv.s | 35 - ...uest_of_phase_process_classP10dScnLogo_c.s | 12 - .../setProgressiveMode__10dScnLogo_cFUc.s | 10 - .../d_s_logo/setRenderMode__10dScnLogo_cFv.s | 5 - .../warningDispDraw__10dScnLogo_cFv.s | 94 - .../d_s_logo/warningInDraw__10dScnLogo_cFv.s | 31 - .../d_s_logo/warningOutDraw__10dScnLogo_cFv.s | 35 - .../fpcM_Management__FPFv_vPFv_v.s | 97 - include/JSystem/JFramework/JFWDisplay.h | 5 + include/JSystem/JUtility/JUTConsole.h | 2 +- include/JSystem/JUtility/JUTGamePad.h | 2 + include/Z2AudioLib/Z2SceneMgr.h | 2 +- include/c/c_dylink.h | 2 + include/d/com/d_com_inf_game.h | 126 +- include/d/d_drawlist.h | 23 +- include/d/d_lib.h | 4 +- include/d/map/d_map_path_dmap.h | 2 +- include/d/particle/d_particle.h | 4 + include/d/s/d_s_logo.h | 118 ++ include/d/s/d_s_play.h | 3 + include/f_op/f_op_scene.h | 2 - include/f_pc/f_pc_manager.h | 2 +- include/m_Do/m_Do_Reset.h | 2 + include/m_Do/m_Do_audio.h | 1 + include/m_Do/m_Do_controller_pad.h | 1 + include/m_Do/m_Do_dvd_thread.h | 4 + include/m_Do/m_Do_ext.h | 3 + include/m_Do/m_Do_graphic.h | 2 + include/m_Do/m_Do_machine.h | 5 + libs/Z2AudioLib/Z2SceneMgr.cpp | 2 +- src/d/d_drawlist.cpp | 15 +- src/d/menu/d_menu_dmap.cpp | 6 - src/d/s/d_s_logo.cpp | 1603 ++++++++--------- src/f_pc/f_pc_manager.cpp | 105 +- src/m_Do/m_Do_main.cpp | 9 +- 67 files changed, 1111 insertions(+), 3622 deletions(-) delete mode 100644 asm/d/s/d_s_logo/__ct__10dLog_HIO_cFv.s delete mode 100644 asm/d/s/d_s_logo/__dt__10dLog_HIO_cFv.s delete mode 100644 asm/d/s/d_s_logo/__dt__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/__sinit_d_s_logo_cpp.s delete mode 100644 asm/d/s/d_s_logo/checkProgSelect__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/create__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/dScnLogo_Delete__FP10dScnLogo_c.s delete mode 100644 asm/d/s/d_s_logo/dScnLogo_Draw__FP10dScnLogo_c.s delete mode 100644 asm/d/s/d_s_logo/dScnLogo_Execute__FP10dScnLogo_c.s delete mode 100644 asm/d/s/d_s_logo/dolbyInDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/dolbyOutDraw2__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/dolbyOutDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/draw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/dvdDataLoad__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/dvdWaitDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/func_802585A4.s delete mode 100644 asm/d/s/d_s_logo/getProgressiveMode__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/isProgressiveMode__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/logoInitGC__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/nextSceneChange__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/nintendoInDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/nintendoOutDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/phase_1__FP10dScnLogo_c.s delete mode 100644 asm/d/s/d_s_logo/phase_2__FP10dScnLogo_c.s delete mode 100644 asm/d/s/d_s_logo/preLoad_dyl__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/preLoad_dyl_create__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/preLoad_dyl_remove__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/progChangeDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/progInDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/progOutDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/progSelDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/progSet2Draw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/progSetDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/resLoad__FP30request_of_phase_process_classP10dScnLogo_c.s delete mode 100644 asm/d/s/d_s_logo/setProgressiveMode__10dScnLogo_cFUc.s delete mode 100644 asm/d/s/d_s_logo/setRenderMode__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/warningDispDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/warningInDraw__10dScnLogo_cFv.s delete mode 100644 asm/d/s/d_s_logo/warningOutDraw__10dScnLogo_cFv.s delete mode 100644 asm/f_pc/f_pc_manager/fpcM_Management__FPFv_vPFv_v.s diff --git a/asm/d/s/d_s_logo/__ct__10dLog_HIO_cFv.s b/asm/d/s/d_s_logo/__ct__10dLog_HIO_cFv.s deleted file mode 100644 index b6e0daec50..0000000000 --- a/asm/d/s/d_s_logo/__ct__10dLog_HIO_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802560A4: -/* 802560A4 3C 80 80 3C */ lis r4, __vt__10dLog_HIO_c@ha /* 0x803C300C@ha */ -/* 802560A8 38 04 30 0C */ addi r0, r4, __vt__10dLog_HIO_c@l /* 0x803C300C@l */ -/* 802560AC 90 03 00 00 */ stw r0, 0(r3) -/* 802560B0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/__dt__10dLog_HIO_cFv.s b/asm/d/s/d_s_logo/__dt__10dLog_HIO_cFv.s deleted file mode 100644 index 469cd0dcbf..0000000000 --- a/asm/d/s/d_s_logo/__dt__10dLog_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025855C: -/* 8025855C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258560 7C 08 02 A6 */ mflr r0 -/* 80258564 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258568 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025856C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80258570 41 82 00 1C */ beq lbl_8025858C -/* 80258574 3C A0 80 3C */ lis r5, __vt__10dLog_HIO_c@ha /* 0x803C300C@ha */ -/* 80258578 38 05 30 0C */ addi r0, r5, __vt__10dLog_HIO_c@l /* 0x803C300C@l */ -/* 8025857C 90 1F 00 00 */ stw r0, 0(r31) -/* 80258580 7C 80 07 35 */ extsh. r0, r4 -/* 80258584 40 81 00 08 */ ble lbl_8025858C -/* 80258588 48 07 67 B5 */ bl __dl__FPv -lbl_8025858C: -/* 8025858C 7F E3 FB 78 */ mr r3, r31 -/* 80258590 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258594 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258598 7C 08 03 A6 */ mtlr r0 -/* 8025859C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802585A0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/__dt__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/__dt__10dScnLogo_cFv.s deleted file mode 100644 index d02c6b4ef7..0000000000 --- a/asm/d/s/d_s_logo/__dt__10dScnLogo_cFv.s +++ /dev/null @@ -1,440 +0,0 @@ -lbl_802572B8: -/* 802572B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802572BC 7C 08 02 A6 */ mflr r0 -/* 802572C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802572C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802572C8 48 10 AF 0D */ bl _savegpr_27 -/* 802572CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802572D0 7C 9D 23 78 */ mr r29, r4 -/* 802572D4 41 82 06 20 */ beq lbl_802578F4 -/* 802572D8 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 802572DC 80 03 00 00 */ lwz r0, 0(r3) -/* 802572E0 2C 00 00 00 */ cmpwi r0, 0 -/* 802572E4 41 82 00 30 */ beq lbl_80257314 -/* 802572E8 88 0D 86 38 */ lbz r0, struct_80450BB8+0x0(r13) -/* 802572EC 28 00 00 00 */ cmplwi r0, 0 -/* 802572F0 41 82 00 14 */ beq lbl_80257304 -/* 802572F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802572F8 38 80 00 05 */ li r4, 5 -/* 802572FC 38 A0 00 01 */ li r5, 1 -/* 80257300 48 07 66 75 */ bl resetProcess__10Z2AudioMgrFUlb -lbl_80257304: -/* 80257304 38 60 00 00 */ li r3, 0 -/* 80257308 3C 80 80 00 */ lis r4, 0x8000 -/* 8025730C 38 A0 00 00 */ li r5, 0 -/* 80257310 4B DB E3 05 */ bl mDoRst_reset__FiUli -lbl_80257314: -/* 80257314 83 9F 01 E4 */ lwz r28, 0x1e4(r31) -/* 80257318 28 1C 00 00 */ cmplwi r28, 0 -/* 8025731C 41 82 00 24 */ beq lbl_80257340 -/* 80257320 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 80257324 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 80257328 90 1C 00 00 */ stw r0, 0(r28) -/* 8025732C 38 7C 00 08 */ addi r3, r28, 8 -/* 80257330 38 80 FF FF */ li r4, -1 -/* 80257334 48 0A 5C BD */ bl __dt__10J2DPictureFv -/* 80257338 7F 83 E3 78 */ mr r3, r28 -/* 8025733C 48 07 7A 01 */ bl __dl__FPv -lbl_80257340: -/* 80257340 83 9F 01 DC */ lwz r28, 0x1dc(r31) -/* 80257344 28 1C 00 00 */ cmplwi r28, 0 -/* 80257348 41 82 00 24 */ beq lbl_8025736C -/* 8025734C 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 80257350 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 80257354 90 1C 00 00 */ stw r0, 0(r28) -/* 80257358 38 7C 00 08 */ addi r3, r28, 8 -/* 8025735C 38 80 FF FF */ li r4, -1 -/* 80257360 48 0A 5C 91 */ bl __dt__10J2DPictureFv -/* 80257364 7F 83 E3 78 */ mr r3, r28 -/* 80257368 48 07 79 D5 */ bl __dl__FPv -lbl_8025736C: -/* 8025736C 83 9F 01 E0 */ lwz r28, 0x1e0(r31) -/* 80257370 28 1C 00 00 */ cmplwi r28, 0 -/* 80257374 41 82 00 24 */ beq lbl_80257398 -/* 80257378 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 8025737C 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 80257380 90 1C 00 00 */ stw r0, 0(r28) -/* 80257384 38 7C 00 08 */ addi r3, r28, 8 -/* 80257388 38 80 FF FF */ li r4, -1 -/* 8025738C 48 0A 5C 65 */ bl __dt__10J2DPictureFv -/* 80257390 7F 83 E3 78 */ mr r3, r28 -/* 80257394 48 07 79 A9 */ bl __dl__FPv -lbl_80257398: -/* 80257398 83 9F 01 E8 */ lwz r28, 0x1e8(r31) -/* 8025739C 28 1C 00 00 */ cmplwi r28, 0 -/* 802573A0 41 82 00 24 */ beq lbl_802573C4 -/* 802573A4 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 802573A8 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 802573AC 90 1C 00 00 */ stw r0, 0(r28) -/* 802573B0 38 7C 00 08 */ addi r3, r28, 8 -/* 802573B4 38 80 FF FF */ li r4, -1 -/* 802573B8 48 0A 5C 39 */ bl __dt__10J2DPictureFv -/* 802573BC 7F 83 E3 78 */ mr r3, r28 -/* 802573C0 48 07 79 7D */ bl __dl__FPv -lbl_802573C4: -/* 802573C4 83 9F 01 EC */ lwz r28, 0x1ec(r31) -/* 802573C8 28 1C 00 00 */ cmplwi r28, 0 -/* 802573CC 41 82 00 24 */ beq lbl_802573F0 -/* 802573D0 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 802573D4 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 802573D8 90 1C 00 00 */ stw r0, 0(r28) -/* 802573DC 38 7C 00 08 */ addi r3, r28, 8 -/* 802573E0 38 80 FF FF */ li r4, -1 -/* 802573E4 48 0A 5C 0D */ bl __dt__10J2DPictureFv -/* 802573E8 7F 83 E3 78 */ mr r3, r28 -/* 802573EC 48 07 79 51 */ bl __dl__FPv -lbl_802573F0: -/* 802573F0 83 9F 01 F0 */ lwz r28, 0x1f0(r31) -/* 802573F4 28 1C 00 00 */ cmplwi r28, 0 -/* 802573F8 41 82 00 24 */ beq lbl_8025741C -/* 802573FC 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 80257400 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 80257404 90 1C 00 00 */ stw r0, 0(r28) -/* 80257408 38 7C 00 08 */ addi r3, r28, 8 -/* 8025740C 38 80 FF FF */ li r4, -1 -/* 80257410 48 0A 5B E1 */ bl __dt__10J2DPictureFv -/* 80257414 7F 83 E3 78 */ mr r3, r28 -/* 80257418 48 07 79 25 */ bl __dl__FPv -lbl_8025741C: -/* 8025741C 83 9F 01 F4 */ lwz r28, 0x1f4(r31) -/* 80257420 28 1C 00 00 */ cmplwi r28, 0 -/* 80257424 41 82 00 24 */ beq lbl_80257448 -/* 80257428 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 8025742C 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 80257430 90 1C 00 00 */ stw r0, 0(r28) -/* 80257434 38 7C 00 08 */ addi r3, r28, 8 -/* 80257438 38 80 FF FF */ li r4, -1 -/* 8025743C 48 0A 5B B5 */ bl __dt__10J2DPictureFv -/* 80257440 7F 83 E3 78 */ mr r3, r28 -/* 80257444 48 07 78 F9 */ bl __dl__FPv -lbl_80257448: -/* 80257448 83 9F 01 F8 */ lwz r28, 0x1f8(r31) -/* 8025744C 28 1C 00 00 */ cmplwi r28, 0 -/* 80257450 41 82 00 24 */ beq lbl_80257474 -/* 80257454 3C 60 80 3B */ lis r3, __vt__10dDlst_2D_c@ha /* 0x803A8E20@ha */ -/* 80257458 38 03 8E 20 */ addi r0, r3, __vt__10dDlst_2D_c@l /* 0x803A8E20@l */ -/* 8025745C 90 1C 00 00 */ stw r0, 0(r28) -/* 80257460 38 7C 00 08 */ addi r3, r28, 8 -/* 80257464 38 80 FF FF */ li r4, -1 -/* 80257468 48 0A 5B 89 */ bl __dt__10J2DPictureFv -/* 8025746C 7F 83 E3 78 */ mr r3, r28 -/* 80257470 48 07 78 CD */ bl __dl__FPv -lbl_80257474: -/* 80257474 7F E3 FB 78 */ mr r3, r31 -/* 80257478 4B FF EC 81 */ bl preLoad_dyl_remove__10dScnLogo_cFv -/* 8025747C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257480 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257484 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257488 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025748C 3F C4 00 02 */ addis r30, r4, 2 -/* 80257490 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80257494 7F C4 F3 78 */ mr r4, r30 -/* 80257498 38 A0 00 80 */ li r5, 0x80 -/* 8025749C 4B DE 4C F9 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 802574A0 80 7F 01 D4 */ lwz r3, 0x1d4(r31) -/* 802574A4 48 07 6F A5 */ bl destroy__7JKRHeapFv -/* 802574A8 80 7F 01 D0 */ lwz r3, 0x1d0(r31) -/* 802574AC 48 07 6F 9D */ bl destroy__7JKRHeapFv -/* 802574B0 80 7F 02 1C */ lwz r3, 0x21c(r31) -/* 802574B4 38 80 00 00 */ li r4, 0 -/* 802574B8 48 07 70 49 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802574BC 80 7F 02 9C */ lwz r3, 0x29c(r31) -/* 802574C0 80 83 00 1C */ lwz r4, 0x1c(r3) -/* 802574C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802574C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802574CC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 802574D0 4B DF 46 A9 */ bl createCommon__13dPa_control_cFPCv -/* 802574D4 80 7F 02 20 */ lwz r3, 0x220(r31) -/* 802574D8 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802574DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802574E0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802574E4 90 05 5C 68 */ stw r0, 0x5c68(r5) -/* 802574E8 80 7F 02 24 */ lwz r3, 0x224(r31) -/* 802574EC 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802574F0 90 05 5C AC */ stw r0, 0x5cac(r5) -/* 802574F4 80 7F 02 2C */ lwz r3, 0x22c(r31) -/* 802574F8 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802574FC 90 05 5C BC */ stw r0, 0x5cbc(r5) -/* 80257500 80 7F 02 30 */ lwz r3, 0x230(r31) -/* 80257504 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257508 90 05 5C C0 */ stw r0, 0x5cc0(r5) -/* 8025750C 80 7F 02 34 */ lwz r3, 0x234(r31) -/* 80257510 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257514 90 05 5C B8 */ stw r0, 0x5cb8(r5) -/* 80257518 80 7F 02 3C */ lwz r3, 0x23c(r31) -/* 8025751C 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257520 90 05 5C D0 */ stw r0, 0x5cd0(r5) -/* 80257524 38 80 00 00 */ li r4, 0 -/* 80257528 90 85 5C E0 */ stw r4, 0x5ce0(r5) -/* 8025752C 80 7F 02 40 */ lwz r3, 0x240(r31) -/* 80257530 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257534 90 05 5C E8 */ stw r0, 0x5ce8(r5) -/* 80257538 80 7F 02 48 */ lwz r3, 0x248(r31) -/* 8025753C 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257540 90 05 5C D4 */ stw r0, 0x5cd4(r5) -/* 80257544 80 7F 02 4C */ lwz r3, 0x24c(r31) -/* 80257548 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 8025754C 90 05 5C 98 */ stw r0, 0x5c98(r5) -/* 80257550 80 7F 02 50 */ lwz r3, 0x250(r31) -/* 80257554 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257558 90 05 5C 9C */ stw r0, 0x5c9c(r5) -/* 8025755C 90 85 5C D8 */ stw r4, 0x5cd8(r5) -/* 80257560 80 7F 02 58 */ lwz r3, 0x258(r31) -/* 80257564 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257568 90 05 5C F0 */ stw r0, 0x5cf0(r5) -/* 8025756C 80 7F 02 5C */ lwz r3, 0x25c(r31) -/* 80257570 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257574 90 05 5C F4 */ stw r0, 0x5cf4(r5) -/* 80257578 80 7F 02 60 */ lwz r3, 0x260(r31) -/* 8025757C 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257580 90 05 5C E4 */ stw r0, 0x5ce4(r5) -/* 80257584 38 00 00 07 */ li r0, 7 -/* 80257588 7C 09 03 A6 */ mtctr r0 -lbl_8025758C: -/* 8025758C 38 04 02 64 */ addi r0, r4, 0x264 -/* 80257590 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80257594 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257598 7C 65 22 14 */ add r3, r5, r4 -/* 8025759C 90 03 5C 6C */ stw r0, 0x5c6c(r3) -/* 802575A0 38 84 00 04 */ addi r4, r4, 4 -/* 802575A4 42 00 FF E8 */ bdnz lbl_8025758C -/* 802575A8 80 7F 02 90 */ lwz r3, 0x290(r31) -/* 802575AC 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802575B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802575B4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802575B8 90 04 5C A4 */ stw r0, 0x5ca4(r4) -/* 802575BC 80 7F 02 98 */ lwz r3, 0x298(r31) -/* 802575C0 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802575C4 90 04 5C A8 */ stw r0, 0x5ca8(r4) -/* 802575C8 80 7F 02 94 */ lwz r3, 0x294(r31) -/* 802575CC 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802575D0 90 04 5D 30 */ stw r0, 0x5d30(r4) -/* 802575D4 80 7F 02 20 */ lwz r3, 0x220(r31) -/* 802575D8 28 03 00 00 */ cmplwi r3, 0 -/* 802575DC 41 82 00 18 */ beq lbl_802575F4 -/* 802575E0 38 80 00 01 */ li r4, 1 -/* 802575E4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802575E8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802575EC 7D 89 03 A6 */ mtctr r12 -/* 802575F0 4E 80 04 21 */ bctrl -lbl_802575F4: -/* 802575F4 80 7F 02 24 */ lwz r3, 0x224(r31) -/* 802575F8 28 03 00 00 */ cmplwi r3, 0 -/* 802575FC 41 82 00 18 */ beq lbl_80257614 -/* 80257600 38 80 00 01 */ li r4, 1 -/* 80257604 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257608 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025760C 7D 89 03 A6 */ mtctr r12 -/* 80257610 4E 80 04 21 */ bctrl -lbl_80257614: -/* 80257614 80 7F 02 2C */ lwz r3, 0x22c(r31) -/* 80257618 28 03 00 00 */ cmplwi r3, 0 -/* 8025761C 41 82 00 18 */ beq lbl_80257634 -/* 80257620 38 80 00 01 */ li r4, 1 -/* 80257624 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257628 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025762C 7D 89 03 A6 */ mtctr r12 -/* 80257630 4E 80 04 21 */ bctrl -lbl_80257634: -/* 80257634 80 7F 02 30 */ lwz r3, 0x230(r31) -/* 80257638 28 03 00 00 */ cmplwi r3, 0 -/* 8025763C 41 82 00 18 */ beq lbl_80257654 -/* 80257640 38 80 00 01 */ li r4, 1 -/* 80257644 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257648 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025764C 7D 89 03 A6 */ mtctr r12 -/* 80257650 4E 80 04 21 */ bctrl -lbl_80257654: -/* 80257654 80 7F 02 34 */ lwz r3, 0x234(r31) -/* 80257658 28 03 00 00 */ cmplwi r3, 0 -/* 8025765C 41 82 00 18 */ beq lbl_80257674 -/* 80257660 38 80 00 01 */ li r4, 1 -/* 80257664 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257668 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025766C 7D 89 03 A6 */ mtctr r12 -/* 80257670 4E 80 04 21 */ bctrl -lbl_80257674: -/* 80257674 80 7F 02 3C */ lwz r3, 0x23c(r31) -/* 80257678 28 03 00 00 */ cmplwi r3, 0 -/* 8025767C 41 82 00 18 */ beq lbl_80257694 -/* 80257680 38 80 00 01 */ li r4, 1 -/* 80257684 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257688 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025768C 7D 89 03 A6 */ mtctr r12 -/* 80257690 4E 80 04 21 */ bctrl -lbl_80257694: -/* 80257694 80 7F 02 40 */ lwz r3, 0x240(r31) -/* 80257698 28 03 00 00 */ cmplwi r3, 0 -/* 8025769C 41 82 00 18 */ beq lbl_802576B4 -/* 802576A0 38 80 00 01 */ li r4, 1 -/* 802576A4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802576A8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802576AC 7D 89 03 A6 */ mtctr r12 -/* 802576B0 4E 80 04 21 */ bctrl -lbl_802576B4: -/* 802576B4 80 7F 02 48 */ lwz r3, 0x248(r31) -/* 802576B8 28 03 00 00 */ cmplwi r3, 0 -/* 802576BC 41 82 00 18 */ beq lbl_802576D4 -/* 802576C0 38 80 00 01 */ li r4, 1 -/* 802576C4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802576C8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802576CC 7D 89 03 A6 */ mtctr r12 -/* 802576D0 4E 80 04 21 */ bctrl -lbl_802576D4: -/* 802576D4 80 7F 02 4C */ lwz r3, 0x24c(r31) -/* 802576D8 28 03 00 00 */ cmplwi r3, 0 -/* 802576DC 41 82 00 18 */ beq lbl_802576F4 -/* 802576E0 38 80 00 01 */ li r4, 1 -/* 802576E4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802576E8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802576EC 7D 89 03 A6 */ mtctr r12 -/* 802576F0 4E 80 04 21 */ bctrl -lbl_802576F4: -/* 802576F4 80 7F 02 50 */ lwz r3, 0x250(r31) -/* 802576F8 28 03 00 00 */ cmplwi r3, 0 -/* 802576FC 41 82 00 18 */ beq lbl_80257714 -/* 80257700 38 80 00 01 */ li r4, 1 -/* 80257704 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257708 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025770C 7D 89 03 A6 */ mtctr r12 -/* 80257710 4E 80 04 21 */ bctrl -lbl_80257714: -/* 80257714 80 7F 02 58 */ lwz r3, 0x258(r31) -/* 80257718 28 03 00 00 */ cmplwi r3, 0 -/* 8025771C 41 82 00 18 */ beq lbl_80257734 -/* 80257720 38 80 00 01 */ li r4, 1 -/* 80257724 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257728 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025772C 7D 89 03 A6 */ mtctr r12 -/* 80257730 4E 80 04 21 */ bctrl -lbl_80257734: -/* 80257734 80 7F 02 5C */ lwz r3, 0x25c(r31) -/* 80257738 28 03 00 00 */ cmplwi r3, 0 -/* 8025773C 41 82 00 18 */ beq lbl_80257754 -/* 80257740 38 80 00 01 */ li r4, 1 -/* 80257744 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257748 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025774C 7D 89 03 A6 */ mtctr r12 -/* 80257750 4E 80 04 21 */ bctrl -lbl_80257754: -/* 80257754 80 7F 02 60 */ lwz r3, 0x260(r31) -/* 80257758 28 03 00 00 */ cmplwi r3, 0 -/* 8025775C 41 82 00 18 */ beq lbl_80257774 -/* 80257760 38 80 00 01 */ li r4, 1 -/* 80257764 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257768 81 8C 00 08 */ lwz r12, 8(r12) -/* 8025776C 7D 89 03 A6 */ mtctr r12 -/* 80257770 4E 80 04 21 */ bctrl -lbl_80257774: -/* 80257774 3B 60 00 00 */ li r27, 0 -/* 80257778 3B 80 00 00 */ li r28, 0 -lbl_8025777C: -/* 8025777C 38 1C 02 64 */ addi r0, r28, 0x264 -/* 80257780 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80257784 28 03 00 00 */ cmplwi r3, 0 -/* 80257788 41 82 00 18 */ beq lbl_802577A0 -/* 8025778C 38 80 00 01 */ li r4, 1 -/* 80257790 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257794 81 8C 00 08 */ lwz r12, 8(r12) -/* 80257798 7D 89 03 A6 */ mtctr r12 -/* 8025779C 4E 80 04 21 */ bctrl -lbl_802577A0: -/* 802577A0 3B 7B 00 01 */ addi r27, r27, 1 -/* 802577A4 2C 1B 00 07 */ cmpwi r27, 7 -/* 802577A8 3B 9C 00 04 */ addi r28, r28, 4 -/* 802577AC 41 80 FF D0 */ blt lbl_8025777C -/* 802577B0 80 7F 02 90 */ lwz r3, 0x290(r31) -/* 802577B4 28 03 00 00 */ cmplwi r3, 0 -/* 802577B8 41 82 00 18 */ beq lbl_802577D0 -/* 802577BC 38 80 00 01 */ li r4, 1 -/* 802577C0 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802577C4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802577C8 7D 89 03 A6 */ mtctr r12 -/* 802577CC 4E 80 04 21 */ bctrl -lbl_802577D0: -/* 802577D0 80 7F 02 94 */ lwz r3, 0x294(r31) -/* 802577D4 28 03 00 00 */ cmplwi r3, 0 -/* 802577D8 41 82 00 18 */ beq lbl_802577F0 -/* 802577DC 38 80 00 01 */ li r4, 1 -/* 802577E0 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802577E4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802577E8 7D 89 03 A6 */ mtctr r12 -/* 802577EC 4E 80 04 21 */ bctrl -lbl_802577F0: -/* 802577F0 80 7F 02 98 */ lwz r3, 0x298(r31) -/* 802577F4 28 03 00 00 */ cmplwi r3, 0 -/* 802577F8 41 82 00 18 */ beq lbl_80257810 -/* 802577FC 38 80 00 01 */ li r4, 1 -/* 80257800 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257804 81 8C 00 08 */ lwz r12, 8(r12) -/* 80257808 7D 89 03 A6 */ mtctr r12 -/* 8025780C 4E 80 04 21 */ bctrl -lbl_80257810: -/* 80257810 80 7F 02 9C */ lwz r3, 0x29c(r31) -/* 80257814 28 03 00 00 */ cmplwi r3, 0 -/* 80257818 41 82 00 18 */ beq lbl_80257830 -/* 8025781C 38 80 00 01 */ li r4, 1 -/* 80257820 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257824 81 8C 00 08 */ lwz r12, 8(r12) -/* 80257828 7D 89 03 A6 */ mtctr r12 -/* 8025782C 4E 80 04 21 */ bctrl -lbl_80257830: -/* 80257830 80 6D 8E 48 */ lwz r3, sAramObject__7JKRAram(r13) -/* 80257834 83 63 00 94 */ lwz r27, 0x94(r3) -/* 80257838 7F 63 DB 78 */ mr r3, r27 -/* 8025783C 48 07 B9 71 */ bl getTotalFreeSize__11JKRAramHeapFv -/* 80257840 7C 7C 1B 78 */ mr r28, r3 -/* 80257844 4B DB D1 AD */ bl mDoExt_getMesgFont__Fv -/* 80257848 4B DB D3 59 */ bl mDoExt_getSubFont__Fv -/* 8025784C 4B DB D2 B9 */ bl mDoExt_getRubyFont__Fv -/* 80257850 7F 63 DB 78 */ mr r3, r27 -/* 80257854 48 07 B9 59 */ bl getTotalFreeSize__11JKRAramHeapFv -/* 80257858 7C 63 E0 50 */ subf r3, r3, r28 -/* 8025785C 4B DB D5 01 */ bl mDoExt_setAraCacheSize__FUl -/* 80257860 80 7F 02 A0 */ lwz r3, 0x2a0(r31) -/* 80257864 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257868 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025786C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80257870 90 04 5F 54 */ stw r0, 0x5f54(r4) -/* 80257874 28 03 00 00 */ cmplwi r3, 0 -/* 80257878 41 82 00 18 */ beq lbl_80257890 -/* 8025787C 38 80 00 01 */ li r4, 1 -/* 80257880 81 83 00 10 */ lwz r12, 0x10(r3) -/* 80257884 81 8C 00 08 */ lwz r12, 8(r12) -/* 80257888 7D 89 03 A6 */ mtctr r12 -/* 8025788C 4E 80 04 21 */ bctrl -lbl_80257890: -/* 80257890 80 7F 02 A4 */ lwz r3, 0x2a4(r31) -/* 80257894 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257898 90 0D 8A 10 */ stw r0, mData__12dEnemyItem_c(r13) -/* 8025789C 80 7F 02 A4 */ lwz r3, 0x2a4(r31) -/* 802578A0 28 03 00 00 */ cmplwi r3, 0 -/* 802578A4 41 82 00 18 */ beq lbl_802578BC -/* 802578A8 38 80 00 01 */ li r4, 1 -/* 802578AC 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802578B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802578B4 7D 89 03 A6 */ mtctr r12 -/* 802578B8 4E 80 04 21 */ bctrl -lbl_802578BC: -/* 802578BC 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802578C0 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802578C4 38 63 00 07 */ addi r3, r3, 7 -/* 802578C8 38 80 00 4A */ li r4, 0x4a -/* 802578CC 7F C5 F3 78 */ mr r5, r30 -/* 802578D0 38 C0 00 80 */ li r6, 0x80 -/* 802578D4 4B DE 4A 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 802578D8 4B DF E7 11 */ bl setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG -/* 802578DC 4B E4 42 FD */ bl createWork__7dTres_cFv -/* 802578E0 4B DE 7F 09 */ bl createWork__8dMpath_cFv -/* 802578E4 7F A0 07 35 */ extsh. r0, r29 -/* 802578E8 40 81 00 0C */ ble lbl_802578F4 -/* 802578EC 7F E3 FB 78 */ mr r3, r31 -/* 802578F0 48 07 74 4D */ bl __dl__FPv -lbl_802578F4: -/* 802578F4 7F E3 FB 78 */ mr r3, r31 -/* 802578F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802578FC 48 10 A9 25 */ bl _restgpr_27 -/* 80257900 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80257904 7C 08 03 A6 */ mtlr r0 -/* 80257908 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025790C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/__sinit_d_s_logo_cpp.s b/asm/d/s/d_s_logo/__sinit_d_s_logo_cpp.s deleted file mode 100644 index 438dbe70ce..0000000000 --- a/asm/d/s/d_s_logo/__sinit_d_s_logo_cpp.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_802585C0: -/* 802585C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802585C4 7C 08 02 A6 */ mflr r0 -/* 802585C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802585CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802585D0 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C2E38@ha */ -/* 802585D4 3B E3 2E 38 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x803C2E38@l */ -/* 802585D8 38 6D 8B 68 */ la r3, g_LogHIO(r13) /* 804510E8-_SDA_BASE_ */ -/* 802585DC 4B FF DA C9 */ bl __ct__10dLog_HIO_cFv -/* 802585E0 3C 80 80 26 */ lis r4, __dt__10dLog_HIO_cFv@ha /* 0x8025855C@ha */ -/* 802585E4 38 84 85 5C */ addi r4, r4, __dt__10dLog_HIO_cFv@l /* 0x8025855C@l */ -/* 802585E8 3C A0 80 43 */ lis r5, lit_3702@ha /* 0x80430758@ha */ -/* 802585EC 38 A5 07 58 */ addi r5, r5, lit_3702@l /* 0x80430758@l */ -/* 802585F0 48 10 96 35 */ bl __register_global_object -/* 802585F4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802585F8 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 802585FC 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80258600 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80258604 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 80258608 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 8025860C 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80258610 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 80258614 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80258618 90 83 00 0C */ stw r4, 0xc(r3) -/* 8025861C 90 03 00 10 */ stw r0, 0x10(r3) -/* 80258620 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 80258624 90 03 00 14 */ stw r0, 0x14(r3) -/* 80258628 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 8025862C 80 1F 00 28 */ lwz r0, 0x28(r31) -/* 80258630 90 83 00 18 */ stw r4, 0x18(r3) -/* 80258634 90 03 00 1C */ stw r0, 0x1c(r3) -/* 80258638 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 8025863C 90 03 00 20 */ stw r0, 0x20(r3) -/* 80258640 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 80258644 80 1F 00 34 */ lwz r0, 0x34(r31) -/* 80258648 90 83 00 24 */ stw r4, 0x24(r3) -/* 8025864C 90 03 00 28 */ stw r0, 0x28(r3) -/* 80258650 80 1F 00 38 */ lwz r0, 0x38(r31) -/* 80258654 90 03 00 2C */ stw r0, 0x2c(r3) -/* 80258658 80 9F 00 3C */ lwz r4, 0x3c(r31) -/* 8025865C 80 1F 00 40 */ lwz r0, 0x40(r31) -/* 80258660 90 83 00 30 */ stw r4, 0x30(r3) -/* 80258664 90 03 00 34 */ stw r0, 0x34(r3) -/* 80258668 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 8025866C 90 03 00 38 */ stw r0, 0x38(r3) -/* 80258670 80 9F 00 48 */ lwz r4, 0x48(r31) -/* 80258674 80 1F 00 4C */ lwz r0, 0x4c(r31) -/* 80258678 90 83 00 3C */ stw r4, 0x3c(r3) -/* 8025867C 90 03 00 40 */ stw r0, 0x40(r3) -/* 80258680 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80258684 90 03 00 44 */ stw r0, 0x44(r3) -/* 80258688 80 9F 00 54 */ lwz r4, 0x54(r31) -/* 8025868C 80 1F 00 58 */ lwz r0, 0x58(r31) -/* 80258690 90 83 00 48 */ stw r4, 0x48(r3) -/* 80258694 90 03 00 4C */ stw r0, 0x4c(r3) -/* 80258698 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 8025869C 90 03 00 50 */ stw r0, 0x50(r3) -/* 802586A0 80 9F 00 60 */ lwz r4, 0x60(r31) -/* 802586A4 80 1F 00 64 */ lwz r0, 0x64(r31) -/* 802586A8 90 83 00 54 */ stw r4, 0x54(r3) -/* 802586AC 90 03 00 58 */ stw r0, 0x58(r3) -/* 802586B0 80 1F 00 68 */ lwz r0, 0x68(r31) -/* 802586B4 90 03 00 5C */ stw r0, 0x5c(r3) -/* 802586B8 80 9F 00 6C */ lwz r4, 0x6c(r31) -/* 802586BC 80 1F 00 70 */ lwz r0, 0x70(r31) -/* 802586C0 90 83 00 60 */ stw r4, 0x60(r3) -/* 802586C4 90 03 00 64 */ stw r0, 0x64(r3) -/* 802586C8 80 1F 00 74 */ lwz r0, 0x74(r31) -/* 802586CC 90 03 00 68 */ stw r0, 0x68(r3) -/* 802586D0 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 802586D4 80 1F 00 7C */ lwz r0, 0x7c(r31) -/* 802586D8 90 83 00 6C */ stw r4, 0x6c(r3) -/* 802586DC 90 03 00 70 */ stw r0, 0x70(r3) -/* 802586E0 80 1F 00 80 */ lwz r0, 0x80(r31) -/* 802586E4 90 03 00 74 */ stw r0, 0x74(r3) -/* 802586E8 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 802586EC 80 1F 00 88 */ lwz r0, 0x88(r31) -/* 802586F0 90 83 00 78 */ stw r4, 0x78(r3) -/* 802586F4 90 03 00 7C */ stw r0, 0x7c(r3) -/* 802586F8 80 1F 00 8C */ lwz r0, 0x8c(r31) -/* 802586FC 90 03 00 80 */ stw r0, 0x80(r3) -/* 80258700 80 9F 00 90 */ lwz r4, 0x90(r31) -/* 80258704 80 1F 00 94 */ lwz r0, 0x94(r31) -/* 80258708 90 83 00 84 */ stw r4, 0x84(r3) -/* 8025870C 90 03 00 88 */ stw r0, 0x88(r3) -/* 80258710 80 1F 00 98 */ lwz r0, 0x98(r31) -/* 80258714 90 03 00 8C */ stw r0, 0x8c(r3) -/* 80258718 80 9F 00 9C */ lwz r4, 0x9c(r31) -/* 8025871C 80 1F 00 A0 */ lwz r0, 0xa0(r31) -/* 80258720 90 83 00 90 */ stw r4, 0x90(r3) -/* 80258724 90 03 00 94 */ stw r0, 0x94(r3) -/* 80258728 80 1F 00 A4 */ lwz r0, 0xa4(r31) -/* 8025872C 90 03 00 98 */ stw r0, 0x98(r3) -/* 80258730 80 9F 00 A8 */ lwz r4, 0xa8(r31) -/* 80258734 80 1F 00 AC */ lwz r0, 0xac(r31) -/* 80258738 90 83 00 9C */ stw r4, 0x9c(r3) -/* 8025873C 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 80258740 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80258744 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 80258748 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 8025874C 80 1F 00 B8 */ lwz r0, 0xb8(r31) -/* 80258750 90 83 00 A8 */ stw r4, 0xa8(r3) -/* 80258754 90 03 00 AC */ stw r0, 0xac(r3) -/* 80258758 80 1F 00 BC */ lwz r0, 0xbc(r31) -/* 8025875C 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80258760 80 9F 00 C0 */ lwz r4, 0xc0(r31) -/* 80258764 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 80258768 90 83 00 B4 */ stw r4, 0xb4(r3) -/* 8025876C 90 03 00 B8 */ stw r0, 0xb8(r3) -/* 80258770 80 1F 00 C8 */ lwz r0, 0xc8(r31) -/* 80258774 90 03 00 BC */ stw r0, 0xbc(r3) -/* 80258778 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025877C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258780 7C 08 03 A6 */ mtlr r0 -/* 80258784 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258788 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/checkProgSelect__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/checkProgSelect__10dScnLogo_cFv.s deleted file mode 100644 index c60edd7a1d..0000000000 --- a/asm/d/s/d_s_logo/checkProgSelect__10dScnLogo_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80256198: -/* 80256198 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025619C 7C 08 02 A6 */ mflr r0 -/* 802561A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802561A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802561A8 7C 7F 1B 78 */ mr r31, r3 -/* 802561AC 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 802561B0 88 03 00 13 */ lbz r0, 0x13(r3) -/* 802561B4 28 00 00 00 */ cmplwi r0, 0 -/* 802561B8 40 82 00 44 */ bne lbl_802561FC -/* 802561BC 48 0F 79 49 */ bl VIGetDTVStatus -/* 802561C0 28 03 00 00 */ cmplwi r3, 0 -/* 802561C4 41 82 00 38 */ beq lbl_802561FC -/* 802561C8 7F E3 FB 78 */ mr r3, r31 -/* 802561CC 48 00 23 55 */ bl isProgressiveMode__10dScnLogo_cFv -/* 802561D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802561D4 40 82 00 18 */ bne lbl_802561EC -/* 802561D8 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 802561DC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 802561E0 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802561E4 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 802561E8 41 82 00 14 */ beq lbl_802561FC -lbl_802561EC: -/* 802561EC 38 00 00 01 */ li r0, 1 -/* 802561F0 98 1F 02 0A */ stb r0, 0x20a(r31) -/* 802561F4 38 00 00 00 */ li r0, 0 -/* 802561F8 98 1F 02 09 */ stb r0, 0x209(r31) -lbl_802561FC: -/* 802561FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256204 7C 08 03 A6 */ mtlr r0 -/* 80256208 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025620C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/create__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/create__10dScnLogo_cFv.s deleted file mode 100644 index b9258e1235..0000000000 --- a/asm/d/s/d_s_logo/create__10dScnLogo_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_80257AE0: -/* 80257AE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80257AE4 7C 08 02 A6 */ mflr r0 -/* 80257AE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257AEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80257AF0 93 C1 00 08 */ stw r30, 8(r1) -/* 80257AF4 7C 7E 1B 78 */ mr r30, r3 -/* 80257AF8 38 7E 01 C4 */ addi r3, r30, 0x1c4 -/* 80257AFC 7F C4 F3 78 */ mr r4, r30 -/* 80257B00 4B FF FF B5 */ bl resLoad__FP30request_of_phase_process_classP10dScnLogo_c -/* 80257B04 7C 7F 1B 78 */ mr r31, r3 -/* 80257B08 2C 1F 00 04 */ cmpwi r31, 4 -/* 80257B0C 41 82 00 08 */ beq lbl_80257B14 -/* 80257B10 48 00 01 3C */ b lbl_80257C4C -lbl_80257B14: -/* 80257B14 80 7E 01 D4 */ lwz r3, 0x1d4(r30) -/* 80257B18 4B DB 76 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80257B1C 90 7E 01 D8 */ stw r3, 0x1d8(r30) -/* 80257B20 7F C3 F3 78 */ mr r3, r30 -/* 80257B24 48 00 01 41 */ bl logoInitGC__10dScnLogo_cFv -/* 80257B28 80 7E 01 D8 */ lwz r3, 0x1d8(r30) -/* 80257B2C 48 07 69 0D */ bl becomeCurrentHeap__7JKRHeapFv -/* 80257B30 7F C3 F3 78 */ mr r3, r30 -/* 80257B34 48 00 04 B9 */ bl dvdDataLoad__10dScnLogo_cFv -/* 80257B38 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80257B3C 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 80257B40 48 06 2A 2D */ bl loadStaticWaves__10Z2SceneMgrFv -/* 80257B44 80 8D 8C 40 */ lwz r4, sManager__10JFWDisplay(r13) -/* 80257B48 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80257B4C 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80257B50 54 03 F0 BE */ srwi r3, r0, 2 -/* 80257B54 38 00 00 3C */ li r0, 0x3c -/* 80257B58 7C 03 03 96 */ divwu r0, r3, r0 -/* 80257B5C 90 04 00 20 */ stw r0, 0x20(r4) -/* 80257B60 38 00 00 00 */ li r0, 0 -/* 80257B64 B0 04 00 1C */ sth r0, 0x1c(r4) -/* 80257B68 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80257B6C 38 80 00 00 */ li r4, 0 -/* 80257B70 48 01 B0 F1 */ bl waitBlanking__10JFWDisplayFi -/* 80257B74 38 00 00 00 */ li r0, 0 -/* 80257B78 98 1E 02 0A */ stb r0, 0x20a(r30) -/* 80257B7C 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80257B80 80 63 00 04 */ lwz r3, 4(r3) -/* 80257B84 28 03 00 00 */ cmplwi r3, 0 -/* 80257B88 41 82 00 18 */ beq lbl_80257BA0 -/* 80257B8C 38 80 00 1E */ li r4, 0x1e -/* 80257B90 81 83 00 00 */ lwz r12, 0(r3) -/* 80257B94 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80257B98 7D 89 03 A6 */ mtctr r12 -/* 80257B9C 4E 80 04 21 */ bctrl -lbl_80257BA0: -/* 80257BA0 7F C3 F3 78 */ mr r3, r30 -/* 80257BA4 4B FF E5 F5 */ bl checkProgSelect__10dScnLogo_cFv -/* 80257BA8 88 1E 02 0A */ lbz r0, 0x20a(r30) -/* 80257BAC 28 00 00 00 */ cmplwi r0, 0 -/* 80257BB0 41 82 00 28 */ beq lbl_80257BD8 -/* 80257BB4 38 00 00 08 */ li r0, 8 -/* 80257BB8 98 1E 02 08 */ stb r0, 0x208(r30) -/* 80257BBC 38 00 00 1E */ li r0, 0x1e -/* 80257BC0 B0 1E 02 0C */ sth r0, 0x20c(r30) -/* 80257BC4 7F C3 F3 78 */ mr r3, r30 -/* 80257BC8 48 00 09 35 */ bl getProgressiveMode__10dScnLogo_cFv -/* 80257BCC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80257BD0 90 1E 02 18 */ stw r0, 0x218(r30) -/* 80257BD4 48 00 00 44 */ b lbl_80257C18 -lbl_80257BD8: -/* 80257BD8 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257BDC 88 03 00 15 */ lbz r0, 0x15(r3) -/* 80257BE0 28 00 00 00 */ cmplwi r0, 0 -/* 80257BE4 41 82 00 18 */ beq lbl_80257BFC -/* 80257BE8 38 00 00 5A */ li r0, 0x5a -/* 80257BEC B0 1E 02 0C */ sth r0, 0x20c(r30) -/* 80257BF0 38 00 00 03 */ li r0, 3 -/* 80257BF4 98 1E 02 08 */ stb r0, 0x208(r30) -/* 80257BF8 48 00 00 14 */ b lbl_80257C0C -lbl_80257BFC: -/* 80257BFC 38 00 00 78 */ li r0, 0x78 -/* 80257C00 B0 1E 02 0C */ sth r0, 0x20c(r30) -/* 80257C04 38 00 00 00 */ li r0, 0 -/* 80257C08 98 1E 02 08 */ stb r0, 0x208(r30) -lbl_80257C0C: -/* 80257C0C 38 00 00 01 */ li r0, 1 -/* 80257C10 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257C14 98 03 00 13 */ stb r0, 0x13(r3) -lbl_80257C18: -/* 80257C18 38 80 00 00 */ li r4, 0 -/* 80257C1C 98 8D 8F 81 */ stb r4, struct_80451500+0x1(r13) -/* 80257C20 3C 60 80 01 */ lis r3, mDoRst_resetCallBack__FiPv@ha /* 0x8001574C@ha */ -/* 80257C24 38 03 57 4C */ addi r0, r3, mDoRst_resetCallBack__FiPv@l /* 0x8001574C@l */ -/* 80257C28 90 0D 8F 6C */ stw r0, sCallback__Q210JUTGamePad13C3ButtonReset(r13) -/* 80257C2C 90 8D 8F 70 */ stw r4, sCallbackArg__Q210JUTGamePad13C3ButtonReset(r13) -/* 80257C30 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257C34 90 83 00 00 */ stw r4, 0(r3) -/* 80257C38 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257C3C 90 83 00 04 */ stw r4, 4(r3) -/* 80257C40 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257C44 90 83 00 04 */ stw r4, 4(r3) -/* 80257C48 7F E3 FB 78 */ mr r3, r31 -lbl_80257C4C: -/* 80257C4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80257C50 83 C1 00 08 */ lwz r30, 8(r1) -/* 80257C54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80257C58 7C 08 03 A6 */ mtlr r0 -/* 80257C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80257C60 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dScnLogo_Delete__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/dScnLogo_Delete__FP10dScnLogo_c.s deleted file mode 100644 index a83a762974..0000000000 --- a/asm/d/s/d_s_logo/dScnLogo_Delete__FP10dScnLogo_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_802584A8: -/* 802584A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802584AC 7C 08 02 A6 */ mflr r0 -/* 802584B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802584B4 38 80 FF FF */ li r4, -1 -/* 802584B8 4B FF EE 01 */ bl __dt__10dScnLogo_cFv -/* 802584BC 38 60 00 01 */ li r3, 1 -/* 802584C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802584C4 7C 08 03 A6 */ mtlr r0 -/* 802584C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802584CC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dScnLogo_Draw__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/dScnLogo_Draw__FP10dScnLogo_c.s deleted file mode 100644 index f3951cb7e9..0000000000 --- a/asm/d/s/d_s_logo/dScnLogo_Draw__FP10dScnLogo_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80258484: -/* 80258484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258488 7C 08 02 A6 */ mflr r0 -/* 8025848C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258490 4B FF DD 81 */ bl draw__10dScnLogo_cFv -/* 80258494 38 60 00 01 */ li r3, 1 -/* 80258498 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025849C 7C 08 03 A6 */ mtlr r0 -/* 802584A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802584A4 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dScnLogo_Execute__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/dScnLogo_Execute__FP10dScnLogo_c.s deleted file mode 100644 index 928c5722b1..0000000000 --- a/asm/d/s/d_s_logo/dScnLogo_Execute__FP10dScnLogo_c.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80258444: -/* 80258444 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258448 7C 08 02 A6 */ mflr r0 -/* 8025844C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258450 80 8D 86 F8 */ lwz r4, mResetData__6mDoRst(r13) -/* 80258454 80 04 00 00 */ lwz r0, 0(r4) -/* 80258458 2C 00 00 00 */ cmpwi r0, 0 -/* 8025845C 41 82 00 14 */ beq lbl_80258470 -/* 80258460 38 80 00 09 */ li r4, 9 -/* 80258464 38 A0 00 00 */ li r5, 0 -/* 80258468 38 C0 00 05 */ li r6, 5 -/* 8025846C 4B DC 68 75 */ bl fopScnM_ChangeReq__FP11scene_classssUs -lbl_80258470: -/* 80258470 38 60 00 01 */ li r3, 1 -/* 80258474 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258478 7C 08 03 A6 */ mtlr r0 -/* 8025847C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258480 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dolbyInDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/dolbyInDraw__10dScnLogo_cFv.s deleted file mode 100644 index 55babc9065..0000000000 --- a/asm/d/s/d_s_logo/dolbyInDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256F50: -/* 80256F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256F54 7C 08 02 A6 */ mflr r0 -/* 80256F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256F5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256F60 7C 7F 1B 78 */ mr r31, r3 -/* 80256F64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256F68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256F6C 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256F70 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256F74 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256F78 80 DF 01 E8 */ lwz r6, 0x1e8(r31) -/* 80256F7C 4B DF F8 19 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256F80 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256F84 28 00 00 00 */ cmplwi r0, 0 -/* 80256F88 40 82 00 38 */ bne lbl_80256FC0 -/* 80256F8C 38 00 00 06 */ li r0, 6 -/* 80256F90 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256F94 38 00 00 1E */ li r0, 0x1e -/* 80256F98 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256F9C 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256FA0 80 63 00 04 */ lwz r3, 4(r3) -/* 80256FA4 28 03 00 00 */ cmplwi r3, 0 -/* 80256FA8 41 82 00 18 */ beq lbl_80256FC0 -/* 80256FAC 38 80 00 1E */ li r4, 0x1e -/* 80256FB0 81 83 00 00 */ lwz r12, 0(r3) -/* 80256FB4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80256FB8 7D 89 03 A6 */ mtctr r12 -/* 80256FBC 4E 80 04 21 */ bctrl -lbl_80256FC0: -/* 80256FC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256FC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256FC8 7C 08 03 A6 */ mtlr r0 -/* 80256FCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256FD0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dolbyOutDraw2__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/dolbyOutDraw2__10dScnLogo_cFv.s deleted file mode 100644 index 4d3db9c13b..0000000000 --- a/asm/d/s/d_s_logo/dolbyOutDraw2__10dScnLogo_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80257058: -/* 80257058 A0 03 02 0C */ lhz r0, 0x20c(r3) -/* 8025705C 28 00 00 00 */ cmplwi r0, 0 -/* 80257060 4C 82 00 20 */ bnelr -/* 80257064 38 00 00 0E */ li r0, 0xe -/* 80257068 98 03 02 08 */ stb r0, 0x208(r3) -/* 8025706C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dolbyOutDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/dolbyOutDraw__10dScnLogo_cFv.s deleted file mode 100644 index acd990170a..0000000000 --- a/asm/d/s/d_s_logo/dolbyOutDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256FD4: -/* 80256FD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256FD8 7C 08 02 A6 */ mflr r0 -/* 80256FDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256FE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256FE4 7C 7F 1B 78 */ mr r31, r3 -/* 80256FE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256FEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256FF0 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256FF4 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256FF8 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256FFC 80 DF 01 E8 */ lwz r6, 0x1e8(r31) -/* 80257000 4B DF F7 95 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80257004 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80257008 28 00 00 00 */ cmplwi r0, 0 -/* 8025700C 40 82 00 38 */ bne lbl_80257044 -/* 80257010 38 00 00 07 */ li r0, 7 -/* 80257014 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80257018 38 00 00 1E */ li r0, 0x1e -/* 8025701C B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80257020 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80257024 80 63 00 04 */ lwz r3, 4(r3) -/* 80257028 28 03 00 00 */ cmplwi r3, 0 -/* 8025702C 41 82 00 18 */ beq lbl_80257044 -/* 80257030 38 80 00 1E */ li r4, 0x1e -/* 80257034 81 83 00 00 */ lwz r12, 0(r3) -/* 80257038 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8025703C 7D 89 03 A6 */ mtctr r12 -/* 80257040 4E 80 04 21 */ bctrl -lbl_80257044: -/* 80257044 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80257048 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025704C 7C 08 03 A6 */ mtlr r0 -/* 80257050 38 21 00 10 */ addi r1, r1, 0x10 -/* 80257054 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/draw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/draw__10dScnLogo_cFv.s deleted file mode 100644 index b9d1e061cc..0000000000 --- a/asm/d/s/d_s_logo/draw__10dScnLogo_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80256210: -/* 80256210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256214 7C 08 02 A6 */ mflr r0 -/* 80256218 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025621C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256220 7C 7F 1B 78 */ mr r31, r3 -/* 80256224 38 7F 02 0C */ addi r3, r31, 0x20c -/* 80256228 48 00 23 7D */ bl func_802585A4 -/* 8025622C 7F E3 FB 78 */ mr r3, r31 -/* 80256230 88 1F 02 08 */ lbz r0, 0x208(r31) -/* 80256234 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80256238 3C 80 80 3C */ lis r4, l_execFunc@ha /* 0x803C2F04@ha */ -/* 8025623C 38 04 2F 04 */ addi r0, r4, l_execFunc@l /* 0x803C2F04@l */ -/* 80256240 7D 80 2A 14 */ add r12, r0, r5 -/* 80256244 48 10 BE 41 */ bl __ptmf_scall -/* 80256248 60 00 00 00 */ nop -/* 8025624C 38 60 00 01 */ li r3, 1 -/* 80256250 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256258 7C 08 03 A6 */ mtlr r0 -/* 8025625C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256260 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dvdDataLoad__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/dvdDataLoad__10dScnLogo_cFv.s deleted file mode 100644 index 3865afc20b..0000000000 --- a/asm/d/s/d_s_logo/dvdDataLoad__10dScnLogo_cFv.s +++ /dev/null @@ -1,270 +0,0 @@ -lbl_80257FEC: -/* 80257FEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80257FF0 7C 08 02 A6 */ mflr r0 -/* 80257FF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257FF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80257FFC 93 C1 00 08 */ stw r30, 8(r1) -/* 80258000 7C 7F 1B 78 */ mr r31, r3 -/* 80258004 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258008 38 C3 9F FC */ addi r6, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 8025800C 38 66 00 07 */ addi r3, r6, 7 -/* 80258010 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258014 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258018 3F C4 00 02 */ addis r30, r4, 2 -/* 8025801C 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80258020 7F C4 F3 78 */ mr r4, r30 -/* 80258024 38 A0 00 80 */ li r5, 0x80 -/* 80258028 38 C6 00 0E */ addi r6, r6, 0xe -/* 8025802C 38 E0 00 00 */ li r7, 0 -/* 80258030 39 00 00 00 */ li r8, 0 -/* 80258034 4B DE 40 45 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap -/* 80258038 80 6D 86 B4 */ lwz r3, archiveHeap(r13) -/* 8025803C 81 83 00 00 */ lwz r12, 0(r3) -/* 80258040 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80258044 7D 89 03 A6 */ mtctr r12 -/* 80258048 4E 80 04 21 */ bctrl -/* 8025804C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258050 38 C3 9F FC */ addi r6, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258054 38 66 00 1B */ addi r3, r6, 0x1b -/* 80258058 7F C4 F3 78 */ mr r4, r30 -/* 8025805C 38 A0 00 80 */ li r5, 0x80 -/* 80258060 38 C6 00 0E */ addi r6, r6, 0xe -/* 80258064 38 E0 00 00 */ li r7, 0 -/* 80258068 39 00 00 00 */ li r8, 0 -/* 8025806C 4B DE 40 0D */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap -/* 80258070 4B DB 6D C1 */ bl mDoExt_getJ2dHeap__Fv -/* 80258074 7C 66 1B 78 */ mr r6, r3 -/* 80258078 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 8025807C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258080 38 63 00 21 */ addi r3, r3, 0x21 -/* 80258084 38 80 00 00 */ li r4, 0 -/* 80258088 38 A0 00 02 */ li r5, 2 -/* 8025808C 4B DB E1 55 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258090 90 7F 02 20 */ stw r3, 0x220(r31) -/* 80258094 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258098 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 8025809C 38 63 00 3A */ addi r3, r3, 0x3a -/* 802580A0 38 80 00 00 */ li r4, 0 -/* 802580A4 38 A0 00 02 */ li r5, 2 -/* 802580A8 38 C0 00 00 */ li r6, 0 -/* 802580AC 4B DB E1 35 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802580B0 90 7F 02 24 */ stw r3, 0x224(r31) -/* 802580B4 4B DB 6D 7D */ bl mDoExt_getJ2dHeap__Fv -/* 802580B8 7C 66 1B 78 */ mr r6, r3 -/* 802580BC 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802580C0 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802580C4 38 63 00 50 */ addi r3, r3, 0x50 -/* 802580C8 38 80 00 00 */ li r4, 0 -/* 802580CC 38 A0 00 02 */ li r5, 2 -/* 802580D0 4B DB E1 11 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802580D4 90 7F 02 2C */ stw r3, 0x22c(r31) -/* 802580D8 4B DB 6D 59 */ bl mDoExt_getJ2dHeap__Fv -/* 802580DC 7C 66 1B 78 */ mr r6, r3 -/* 802580E0 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802580E4 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802580E8 38 63 00 68 */ addi r3, r3, 0x68 -/* 802580EC 38 80 00 00 */ li r4, 0 -/* 802580F0 38 A0 00 02 */ li r5, 2 -/* 802580F4 4B DB E0 ED */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802580F8 90 7F 02 30 */ stw r3, 0x230(r31) -/* 802580FC 4B DB 6D 35 */ bl mDoExt_getJ2dHeap__Fv -/* 80258100 7C 66 1B 78 */ mr r6, r3 -/* 80258104 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258108 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 8025810C 38 63 00 80 */ addi r3, r3, 0x80 -/* 80258110 38 80 00 00 */ li r4, 0 -/* 80258114 38 A0 00 02 */ li r5, 2 -/* 80258118 4B DB E0 C9 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 8025811C 90 7F 02 34 */ stw r3, 0x234(r31) -/* 80258120 4B DB 6D 11 */ bl mDoExt_getJ2dHeap__Fv -/* 80258124 7C 66 1B 78 */ mr r6, r3 -/* 80258128 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 8025812C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258130 38 63 00 98 */ addi r3, r3, 0x98 -/* 80258134 38 80 00 00 */ li r4, 0 -/* 80258138 38 A0 00 02 */ li r5, 2 -/* 8025813C 4B DB E0 A5 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258140 90 7F 02 3C */ stw r3, 0x23c(r31) -/* 80258144 4B DB 6C ED */ bl mDoExt_getJ2dHeap__Fv -/* 80258148 7C 66 1B 78 */ mr r6, r3 -/* 8025814C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258150 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258154 38 63 00 B1 */ addi r3, r3, 0xb1 -/* 80258158 38 80 00 00 */ li r4, 0 -/* 8025815C 38 A0 00 02 */ li r5, 2 -/* 80258160 4B DB E0 81 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258164 90 7F 02 40 */ stw r3, 0x240(r31) -/* 80258168 4B DB 6C C9 */ bl mDoExt_getJ2dHeap__Fv -/* 8025816C 7C 66 1B 78 */ mr r6, r3 -/* 80258170 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258174 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258178 38 63 00 C9 */ addi r3, r3, 0xc9 -/* 8025817C 38 80 00 00 */ li r4, 0 -/* 80258180 38 A0 00 02 */ li r5, 2 -/* 80258184 4B DB E0 5D */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258188 90 7F 02 48 */ stw r3, 0x248(r31) -/* 8025818C 4B DB 6C A5 */ bl mDoExt_getJ2dHeap__Fv -/* 80258190 7C 66 1B 78 */ mr r6, r3 -/* 80258194 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258198 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 8025819C 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 802581A0 38 80 00 00 */ li r4, 0 -/* 802581A4 38 A0 00 02 */ li r5, 2 -/* 802581A8 4B DB E0 39 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802581AC 90 7F 02 4C */ stw r3, 0x24c(r31) -/* 802581B0 4B DB 6C 81 */ bl mDoExt_getJ2dHeap__Fv -/* 802581B4 7C 66 1B 78 */ mr r6, r3 -/* 802581B8 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802581BC 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802581C0 38 63 00 FE */ addi r3, r3, 0xfe -/* 802581C4 38 80 00 00 */ li r4, 0 -/* 802581C8 38 A0 00 02 */ li r5, 2 -/* 802581CC 4B DB E0 15 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802581D0 90 7F 02 50 */ stw r3, 0x250(r31) -/* 802581D4 4B DB 6C 5D */ bl mDoExt_getJ2dHeap__Fv -/* 802581D8 7C 66 1B 78 */ mr r6, r3 -/* 802581DC 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802581E0 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802581E4 38 63 01 15 */ addi r3, r3, 0x115 -/* 802581E8 38 80 00 00 */ li r4, 0 -/* 802581EC 38 A0 00 02 */ li r5, 2 -/* 802581F0 4B DB DF F1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802581F4 90 7F 02 58 */ stw r3, 0x258(r31) -/* 802581F8 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802581FC 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258200 38 63 01 30 */ addi r3, r3, 0x130 -/* 80258204 38 80 00 00 */ li r4, 0 -/* 80258208 38 A0 00 01 */ li r5, 1 -/* 8025820C 38 C0 00 00 */ li r6, 0 -/* 80258210 4B DB DF D1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258214 90 7F 02 5C */ stw r3, 0x25c(r31) -/* 80258218 4B DB 6C 19 */ bl mDoExt_getJ2dHeap__Fv -/* 8025821C 7C 66 1B 78 */ mr r6, r3 -/* 80258220 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258224 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258228 38 63 01 46 */ addi r3, r3, 0x146 -/* 8025822C 38 80 00 00 */ li r4, 0 -/* 80258230 38 A0 00 02 */ li r5, 2 -/* 80258234 4B DB DF AD */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258238 90 7F 02 60 */ stw r3, 0x260(r31) -/* 8025823C 4B DB 6B F5 */ bl mDoExt_getJ2dHeap__Fv -/* 80258240 7C 66 1B 78 */ mr r6, r3 -/* 80258244 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258248 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 8025824C 38 63 01 5D */ addi r3, r3, 0x15d -/* 80258250 38 80 00 00 */ li r4, 0 -/* 80258254 38 A0 00 02 */ li r5, 2 -/* 80258258 4B DB DF 89 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 8025825C 90 7F 02 64 */ stw r3, 0x264(r31) -/* 80258260 4B DB 6B D1 */ bl mDoExt_getJ2dHeap__Fv -/* 80258264 7C 66 1B 78 */ mr r6, r3 -/* 80258268 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 8025826C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258270 38 63 01 76 */ addi r3, r3, 0x176 -/* 80258274 38 80 00 00 */ li r4, 0 -/* 80258278 38 A0 00 02 */ li r5, 2 -/* 8025827C 4B DB DF 65 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258280 90 7F 02 68 */ stw r3, 0x268(r31) -/* 80258284 4B DB 6B AD */ bl mDoExt_getJ2dHeap__Fv -/* 80258288 7C 66 1B 78 */ mr r6, r3 -/* 8025828C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258290 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258294 38 63 01 8F */ addi r3, r3, 0x18f -/* 80258298 38 80 00 00 */ li r4, 0 -/* 8025829C 38 A0 00 02 */ li r5, 2 -/* 802582A0 4B DB DF 41 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802582A4 90 7F 02 6C */ stw r3, 0x26c(r31) -/* 802582A8 4B DB 6B 89 */ bl mDoExt_getJ2dHeap__Fv -/* 802582AC 7C 66 1B 78 */ mr r6, r3 -/* 802582B0 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802582B4 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802582B8 38 63 01 A8 */ addi r3, r3, 0x1a8 -/* 802582BC 38 80 00 00 */ li r4, 0 -/* 802582C0 38 A0 00 02 */ li r5, 2 -/* 802582C4 4B DB DF 1D */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802582C8 90 7F 02 70 */ stw r3, 0x270(r31) -/* 802582CC 4B DB 6B 65 */ bl mDoExt_getJ2dHeap__Fv -/* 802582D0 7C 66 1B 78 */ mr r6, r3 -/* 802582D4 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802582D8 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802582DC 38 63 01 C1 */ addi r3, r3, 0x1c1 -/* 802582E0 38 80 00 00 */ li r4, 0 -/* 802582E4 38 A0 00 02 */ li r5, 2 -/* 802582E8 4B DB DE F9 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 802582EC 90 7F 02 74 */ stw r3, 0x274(r31) -/* 802582F0 4B DB 6B 41 */ bl mDoExt_getJ2dHeap__Fv -/* 802582F4 7C 66 1B 78 */ mr r6, r3 -/* 802582F8 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802582FC 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258300 38 63 01 DB */ addi r3, r3, 0x1db -/* 80258304 38 80 00 00 */ li r4, 0 -/* 80258308 38 A0 00 02 */ li r5, 2 -/* 8025830C 4B DB DE D5 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258310 90 7F 02 78 */ stw r3, 0x278(r31) -/* 80258314 4B DB 6B 1D */ bl mDoExt_getJ2dHeap__Fv -/* 80258318 7C 66 1B 78 */ mr r6, r3 -/* 8025831C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80258320 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258324 38 63 01 F4 */ addi r3, r3, 0x1f4 -/* 80258328 38 80 00 00 */ li r4, 0 -/* 8025832C 38 A0 00 02 */ li r5, 2 -/* 80258330 4B DB DE B1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258334 90 7F 02 7C */ stw r3, 0x27c(r31) -/* 80258338 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 8025833C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258340 38 63 02 0D */ addi r3, r3, 0x20d -/* 80258344 38 80 00 00 */ li r4, 0 -/* 80258348 38 A0 00 01 */ li r5, 1 -/* 8025834C 38 C0 00 00 */ li r6, 0 -/* 80258350 4B DB DE 91 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258354 90 7F 02 94 */ stw r3, 0x294(r31) -/* 80258358 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 8025835C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258360 38 63 02 24 */ addi r3, r3, 0x224 -/* 80258364 38 80 00 00 */ li r4, 0 -/* 80258368 38 A0 00 01 */ li r5, 1 -/* 8025836C 38 C0 00 00 */ li r6, 0 -/* 80258370 4B DB DE 71 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258374 90 7F 02 90 */ stw r3, 0x290(r31) -/* 80258378 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 8025837C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80258380 38 63 02 3C */ addi r3, r3, 0x23c -/* 80258384 38 80 00 00 */ li r4, 0 -/* 80258388 38 A0 00 01 */ li r5, 1 -/* 8025838C 38 C0 00 00 */ li r6, 0 -/* 80258390 4B DB DE 51 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap -/* 80258394 90 7F 02 98 */ stw r3, 0x298(r31) -/* 80258398 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025839C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802583A0 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 802583A4 80 A3 00 08 */ lwz r5, 8(r3) -/* 802583A8 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802583AC 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802583B0 38 63 02 54 */ addi r3, r3, 0x254 -/* 802583B4 38 80 00 00 */ li r4, 0 -/* 802583B8 4B DB DF DD */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap -/* 802583BC 90 7F 02 9C */ stw r3, 0x29c(r31) -/* 802583C0 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802583C4 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802583C8 38 63 02 6D */ addi r3, r3, 0x26d -/* 802583CC 38 80 00 00 */ li r4, 0 -/* 802583D0 38 A0 00 00 */ li r5, 0 -/* 802583D4 4B DB DF C1 */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap -/* 802583D8 90 7F 02 A0 */ stw r3, 0x2a0(r31) -/* 802583DC 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 802583E0 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 802583E4 38 63 02 8B */ addi r3, r3, 0x28b -/* 802583E8 38 80 00 00 */ li r4, 0 -/* 802583EC 38 A0 00 00 */ li r5, 0 -/* 802583F0 4B DB DF A5 */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap -/* 802583F4 90 7F 02 A4 */ stw r3, 0x2a4(r31) -/* 802583F8 7F E3 FB 78 */ mr r3, r31 -/* 802583FC 4B FF DC B9 */ bl preLoad_dyl_create__10dScnLogo_cFv -/* 80258400 7F E3 FB 78 */ mr r3, r31 -/* 80258404 4B FF DD 19 */ bl preLoad_dyl__10dScnLogo_cFv -/* 80258408 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025840C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80258410 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258414 7C 08 03 A6 */ mtlr r0 -/* 80258418 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025841C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dvdWaitDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/dvdWaitDraw__10dScnLogo_cFv.s deleted file mode 100644 index aadf4b8dec..0000000000 --- a/asm/d/s/d_s_logo/dvdWaitDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,135 +0,0 @@ -lbl_80257070: -/* 80257070 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80257074 7C 08 02 A6 */ mflr r0 -/* 80257078 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025707C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80257080 7C 7F 1B 78 */ mr r31, r3 -/* 80257084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025708C 3C 63 00 02 */ addis r3, r3, 2 -/* 80257090 38 80 00 80 */ li r4, 0x80 -/* 80257094 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80257098 4B DE 53 D9 */ bl syncAllRes__14dRes_control_cFP11dRes_info_ci -/* 8025709C 2C 03 00 00 */ cmpwi r3, 0 -/* 802570A0 40 82 01 D0 */ bne lbl_80257270 -/* 802570A4 80 7F 02 20 */ lwz r3, 0x220(r31) -/* 802570A8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802570AC 2C 00 00 00 */ cmpwi r0, 0 -/* 802570B0 41 82 01 C0 */ beq lbl_80257270 -/* 802570B4 80 7F 02 24 */ lwz r3, 0x224(r31) -/* 802570B8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802570BC 2C 00 00 00 */ cmpwi r0, 0 -/* 802570C0 41 82 01 B0 */ beq lbl_80257270 -/* 802570C4 80 7F 02 2C */ lwz r3, 0x22c(r31) -/* 802570C8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802570CC 2C 00 00 00 */ cmpwi r0, 0 -/* 802570D0 41 82 01 A0 */ beq lbl_80257270 -/* 802570D4 80 7F 02 30 */ lwz r3, 0x230(r31) -/* 802570D8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802570DC 2C 00 00 00 */ cmpwi r0, 0 -/* 802570E0 41 82 01 90 */ beq lbl_80257270 -/* 802570E4 80 7F 02 34 */ lwz r3, 0x234(r31) -/* 802570E8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802570EC 2C 00 00 00 */ cmpwi r0, 0 -/* 802570F0 41 82 01 80 */ beq lbl_80257270 -/* 802570F4 80 7F 02 3C */ lwz r3, 0x23c(r31) -/* 802570F8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802570FC 2C 00 00 00 */ cmpwi r0, 0 -/* 80257100 41 82 01 70 */ beq lbl_80257270 -/* 80257104 80 7F 02 40 */ lwz r3, 0x240(r31) -/* 80257108 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025710C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257110 41 82 01 60 */ beq lbl_80257270 -/* 80257114 80 7F 02 48 */ lwz r3, 0x248(r31) -/* 80257118 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025711C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257120 41 82 01 50 */ beq lbl_80257270 -/* 80257124 80 7F 02 4C */ lwz r3, 0x24c(r31) -/* 80257128 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025712C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257130 41 82 01 40 */ beq lbl_80257270 -/* 80257134 80 7F 02 50 */ lwz r3, 0x250(r31) -/* 80257138 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025713C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257140 41 82 01 30 */ beq lbl_80257270 -/* 80257144 80 7F 02 58 */ lwz r3, 0x258(r31) -/* 80257148 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025714C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257150 41 82 01 20 */ beq lbl_80257270 -/* 80257154 80 7F 02 5C */ lwz r3, 0x25c(r31) -/* 80257158 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025715C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257160 41 82 01 10 */ beq lbl_80257270 -/* 80257164 80 7F 02 60 */ lwz r3, 0x260(r31) -/* 80257168 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025716C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257170 41 82 01 00 */ beq lbl_80257270 -/* 80257174 80 7F 02 64 */ lwz r3, 0x264(r31) -/* 80257178 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025717C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257180 41 82 00 F0 */ beq lbl_80257270 -/* 80257184 80 7F 02 68 */ lwz r3, 0x268(r31) -/* 80257188 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025718C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257190 41 82 00 E0 */ beq lbl_80257270 -/* 80257194 80 7F 02 6C */ lwz r3, 0x26c(r31) -/* 80257198 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025719C 2C 00 00 00 */ cmpwi r0, 0 -/* 802571A0 41 82 00 D0 */ beq lbl_80257270 -/* 802571A4 80 7F 02 70 */ lwz r3, 0x270(r31) -/* 802571A8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802571AC 2C 00 00 00 */ cmpwi r0, 0 -/* 802571B0 41 82 00 C0 */ beq lbl_80257270 -/* 802571B4 80 7F 02 74 */ lwz r3, 0x274(r31) -/* 802571B8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802571BC 2C 00 00 00 */ cmpwi r0, 0 -/* 802571C0 41 82 00 B0 */ beq lbl_80257270 -/* 802571C4 80 7F 02 78 */ lwz r3, 0x278(r31) -/* 802571C8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802571CC 2C 00 00 00 */ cmpwi r0, 0 -/* 802571D0 41 82 00 A0 */ beq lbl_80257270 -/* 802571D4 80 7F 02 7C */ lwz r3, 0x27c(r31) -/* 802571D8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802571DC 2C 00 00 00 */ cmpwi r0, 0 -/* 802571E0 41 82 00 90 */ beq lbl_80257270 -/* 802571E4 80 7F 02 90 */ lwz r3, 0x290(r31) -/* 802571E8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802571EC 2C 00 00 00 */ cmpwi r0, 0 -/* 802571F0 41 82 00 80 */ beq lbl_80257270 -/* 802571F4 80 7F 02 94 */ lwz r3, 0x294(r31) -/* 802571F8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 802571FC 2C 00 00 00 */ cmpwi r0, 0 -/* 80257200 41 82 00 70 */ beq lbl_80257270 -/* 80257204 80 7F 02 98 */ lwz r3, 0x298(r31) -/* 80257208 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025720C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257210 41 82 00 60 */ beq lbl_80257270 -/* 80257214 80 7F 02 9C */ lwz r3, 0x29c(r31) -/* 80257218 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025721C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257220 41 82 00 50 */ beq lbl_80257270 -/* 80257224 80 7F 02 A0 */ lwz r3, 0x2a0(r31) -/* 80257228 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025722C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257230 41 82 00 40 */ beq lbl_80257270 -/* 80257234 80 7F 02 A4 */ lwz r3, 0x2a4(r31) -/* 80257238 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8025723C 2C 00 00 00 */ cmpwi r0, 0 -/* 80257240 41 82 00 30 */ beq lbl_80257270 -/* 80257244 7F E3 FB 78 */ mr r3, r31 -/* 80257248 4B FF EE D5 */ bl preLoad_dyl__10dScnLogo_cFv -/* 8025724C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80257250 41 82 00 20 */ beq lbl_80257270 -/* 80257254 38 00 00 00 */ li r0, 0 -/* 80257258 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 8025725C 98 03 00 12 */ stb r0, 0x12(r3) -/* 80257260 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257264 98 03 00 14 */ stb r0, 0x14(r3) -/* 80257268 38 00 00 0F */ li r0, 0xf -/* 8025726C 98 1F 02 08 */ stb r0, 0x208(r31) -lbl_80257270: -/* 80257270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80257274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80257278 7C 08 03 A6 */ mtlr r0 -/* 8025727C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80257280 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/func_802585A4.s b/asm/d/s/d_s_logo/func_802585A4.s deleted file mode 100644 index eb23bc6ce5..0000000000 --- a/asm/d/s/d_s_logo/func_802585A4.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802585A4: -/* 802585A4 A0 83 00 00 */ lhz r4, 0(r3) -/* 802585A8 28 04 00 00 */ cmplwi r4, 0 -/* 802585AC 41 82 00 0C */ beq lbl_802585B8 -/* 802585B0 38 04 FF FF */ addi r0, r4, -1 -/* 802585B4 B0 03 00 00 */ sth r0, 0(r3) -lbl_802585B8: -/* 802585B8 A0 63 00 00 */ lhz r3, 0(r3) -/* 802585BC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/getProgressiveMode__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/getProgressiveMode__10dScnLogo_cFv.s deleted file mode 100644 index c0d004e337..0000000000 --- a/asm/d/s/d_s_logo/getProgressiveMode__10dScnLogo_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802584FC: -/* 802584FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258500 7C 08 02 A6 */ mflr r0 -/* 80258504 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258508 48 0E 81 AD */ bl OSGetProgressiveMode -/* 8025850C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80258510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258514 7C 08 03 A6 */ mtlr r0 -/* 80258518 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025851C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/isProgressiveMode__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/isProgressiveMode__10dScnLogo_cFv.s deleted file mode 100644 index 5bc1f7d8b2..0000000000 --- a/asm/d/s/d_s_logo/isProgressiveMode__10dScnLogo_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80258520: -/* 80258520 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258524 7C 08 02 A6 */ mflr r0 -/* 80258528 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025852C 48 0E 81 89 */ bl OSGetProgressiveMode -/* 80258530 20 03 00 01 */ subfic r0, r3, 1 -/* 80258534 7C 00 00 34 */ cntlzw r0, r0 -/* 80258538 54 03 D9 7E */ srwi r3, r0, 5 -/* 8025853C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258540 7C 08 03 A6 */ mtlr r0 -/* 80258544 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258548 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/logoInitGC__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/logoInitGC__10dScnLogo_cFv.s deleted file mode 100644 index 495b887837..0000000000 --- a/asm/d/s/d_s_logo/logoInitGC__10dScnLogo_cFv.s +++ /dev/null @@ -1,235 +0,0 @@ -lbl_80257C64: -/* 80257C64 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80257C68 7C 08 02 A6 */ mflr r0 -/* 80257C6C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80257C70 39 61 00 30 */ addi r11, r1, 0x30 -/* 80257C74 48 10 A5 69 */ bl _savegpr_29 -/* 80257C78 7C 7F 1B 78 */ mr r31, r3 -/* 80257C7C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257C80 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257C84 38 80 00 04 */ li r4, 4 -/* 80257C88 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257C8C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80257C90 3F C5 00 02 */ addis r30, r5, 2 -/* 80257C94 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80257C98 7F C5 F3 78 */ mr r5, r30 -/* 80257C9C 38 C0 00 80 */ li r6, 0x80 -/* 80257CA0 4B DE 46 4D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257CA4 7C 7D 1B 78 */ mr r29, r3 -/* 80257CA8 38 60 01 68 */ li r3, 0x168 -/* 80257CAC 48 07 6F A1 */ bl __nw__FUl -/* 80257CB0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257CB4 41 82 00 24 */ beq lbl_80257CD8 -/* 80257CB8 7F A4 EB 78 */ mr r4, r29 -/* 80257CBC 38 A0 00 75 */ li r5, 0x75 -/* 80257CC0 38 C0 00 9A */ li r6, 0x9a -/* 80257CC4 38 E0 01 78 */ li r7, 0x178 -/* 80257CC8 39 00 00 68 */ li r8, 0x68 -/* 80257CCC 39 20 00 FF */ li r9, 0xff -/* 80257CD0 4B DF BD 31 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257CD4 7C 60 1B 78 */ mr r0, r3 -lbl_80257CD8: -/* 80257CD8 90 1F 01 E4 */ stw r0, 0x1e4(r31) -/* 80257CDC 38 00 00 DC */ li r0, 0xdc -/* 80257CE0 98 01 00 18 */ stb r0, 0x18(r1) -/* 80257CE4 38 00 00 00 */ li r0, 0 -/* 80257CE8 98 01 00 19 */ stb r0, 0x19(r1) -/* 80257CEC 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80257CF0 38 00 00 FF */ li r0, 0xff -/* 80257CF4 98 01 00 1B */ stb r0, 0x1b(r1) -/* 80257CF8 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80257CFC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80257D00 80 7F 01 E4 */ lwz r3, 0x1e4(r31) -/* 80257D04 38 81 00 1C */ addi r4, r1, 0x1c -/* 80257D08 85 83 00 08 */ lwzu r12, 8(r3) -/* 80257D0C 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80257D10 7D 89 03 A6 */ mtctr r12 -/* 80257D14 4E 80 04 21 */ bctrl -/* 80257D18 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257D1C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257D20 38 80 00 03 */ li r4, 3 -/* 80257D24 7F C5 F3 78 */ mr r5, r30 -/* 80257D28 38 C0 00 80 */ li r6, 0x80 -/* 80257D2C 4B DE 45 C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257D30 7C 7D 1B 78 */ mr r29, r3 -/* 80257D34 38 60 01 68 */ li r3, 0x168 -/* 80257D38 48 07 6F 15 */ bl __nw__FUl -/* 80257D3C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257D40 41 82 00 24 */ beq lbl_80257D64 -/* 80257D44 7F A4 EB 78 */ mr r4, r29 -/* 80257D48 38 A0 00 BD */ li r5, 0xbd -/* 80257D4C 38 C0 00 96 */ li r6, 0x96 -/* 80257D50 38 E0 00 E8 */ li r7, 0xe8 -/* 80257D54 39 00 00 70 */ li r8, 0x70 -/* 80257D58 39 20 00 FF */ li r9, 0xff -/* 80257D5C 4B DF BC A5 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257D60 7C 60 1B 78 */ mr r0, r3 -lbl_80257D64: -/* 80257D64 90 1F 01 E8 */ stw r0, 0x1e8(r31) -/* 80257D68 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257D6C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257D70 38 80 00 0A */ li r4, 0xa -/* 80257D74 7F C5 F3 78 */ mr r5, r30 -/* 80257D78 38 C0 00 80 */ li r6, 0x80 -/* 80257D7C 4B DE 45 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257D80 7C 7D 1B 78 */ mr r29, r3 -/* 80257D84 38 60 01 68 */ li r3, 0x168 -/* 80257D88 48 07 6E C5 */ bl __nw__FUl -/* 80257D8C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257D90 41 82 00 24 */ beq lbl_80257DB4 -/* 80257D94 7F A4 EB 78 */ mr r4, r29 -/* 80257D98 38 A0 00 00 */ li r5, 0 -/* 80257D9C 38 C0 00 00 */ li r6, 0 -/* 80257DA0 38 E0 02 60 */ li r7, 0x260 -/* 80257DA4 39 00 01 C0 */ li r8, 0x1c0 -/* 80257DA8 39 20 00 FF */ li r9, 0xff -/* 80257DAC 4B DF BC 55 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257DB0 7C 60 1B 78 */ mr r0, r3 -lbl_80257DB4: -/* 80257DB4 90 1F 01 DC */ stw r0, 0x1dc(r31) -/* 80257DB8 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257DBC 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257DC0 38 80 00 0B */ li r4, 0xb -/* 80257DC4 7F C5 F3 78 */ mr r5, r30 -/* 80257DC8 38 C0 00 80 */ li r6, 0x80 -/* 80257DCC 4B DE 45 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257DD0 7C 7D 1B 78 */ mr r29, r3 -/* 80257DD4 38 60 01 68 */ li r3, 0x168 -/* 80257DD8 48 07 6E 75 */ bl __nw__FUl -/* 80257DDC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257DE0 41 82 00 24 */ beq lbl_80257E04 -/* 80257DE4 7F A4 EB 78 */ mr r4, r29 -/* 80257DE8 38 A0 00 00 */ li r5, 0 -/* 80257DEC 38 C0 01 67 */ li r6, 0x167 -/* 80257DF0 38 E0 02 60 */ li r7, 0x260 -/* 80257DF4 39 00 00 30 */ li r8, 0x30 -/* 80257DF8 39 20 00 FF */ li r9, 0xff -/* 80257DFC 4B DF BC 05 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257E00 7C 60 1B 78 */ mr r0, r3 -lbl_80257E04: -/* 80257E04 90 1F 01 E0 */ stw r0, 0x1e0(r31) -/* 80257E08 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257E0C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257E10 38 80 00 05 */ li r4, 5 -/* 80257E14 7F C5 F3 78 */ mr r5, r30 -/* 80257E18 38 C0 00 80 */ li r6, 0x80 -/* 80257E1C 4B DE 44 D1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257E20 7C 7D 1B 78 */ mr r29, r3 -/* 80257E24 38 60 01 68 */ li r3, 0x168 -/* 80257E28 48 07 6E 25 */ bl __nw__FUl -/* 80257E2C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257E30 41 82 00 24 */ beq lbl_80257E54 -/* 80257E34 7F A4 EB 78 */ mr r4, r29 -/* 80257E38 38 A0 00 71 */ li r5, 0x71 -/* 80257E3C 38 C0 01 19 */ li r6, 0x119 -/* 80257E40 38 E0 01 A0 */ li r7, 0x1a0 -/* 80257E44 39 00 00 48 */ li r8, 0x48 -/* 80257E48 39 20 00 FF */ li r9, 0xff -/* 80257E4C 4B DF BB B5 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257E50 7C 60 1B 78 */ mr r0, r3 -lbl_80257E54: -/* 80257E54 90 1F 01 EC */ stw r0, 0x1ec(r31) -/* 80257E58 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257E5C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257E60 38 80 00 09 */ li r4, 9 -/* 80257E64 7F C5 F3 78 */ mr r5, r30 -/* 80257E68 38 C0 00 80 */ li r6, 0x80 -/* 80257E6C 4B DE 44 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257E70 7C 7D 1B 78 */ mr r29, r3 -/* 80257E74 38 60 01 68 */ li r3, 0x168 -/* 80257E78 48 07 6D D5 */ bl __nw__FUl -/* 80257E7C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257E80 41 82 00 24 */ beq lbl_80257EA4 -/* 80257E84 7F A4 EB 78 */ mr r4, r29 -/* 80257E88 38 A0 00 D3 */ li r5, 0xd3 -/* 80257E8C 38 C0 01 74 */ li r6, 0x174 -/* 80257E90 38 E0 00 50 */ li r7, 0x50 -/* 80257E94 39 00 00 20 */ li r8, 0x20 -/* 80257E98 39 20 00 FF */ li r9, 0xff -/* 80257E9C 4B DF BB 65 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257EA0 7C 60 1B 78 */ mr r0, r3 -lbl_80257EA4: -/* 80257EA4 90 1F 01 F0 */ stw r0, 0x1f0(r31) -/* 80257EA8 38 00 00 A0 */ li r0, 0xa0 -/* 80257EAC 98 01 00 10 */ stb r0, 0x10(r1) -/* 80257EB0 98 01 00 11 */ stb r0, 0x11(r1) -/* 80257EB4 98 01 00 12 */ stb r0, 0x12(r1) -/* 80257EB8 38 00 00 FF */ li r0, 0xff -/* 80257EBC 98 01 00 13 */ stb r0, 0x13(r1) -/* 80257EC0 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80257EC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257EC8 80 7F 01 F0 */ lwz r3, 0x1f0(r31) -/* 80257ECC 38 81 00 14 */ addi r4, r1, 0x14 -/* 80257ED0 85 83 00 08 */ lwzu r12, 8(r3) -/* 80257ED4 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80257ED8 7D 89 03 A6 */ mtctr r12 -/* 80257EDC 4E 80 04 21 */ bctrl -/* 80257EE0 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257EE4 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257EE8 38 80 00 07 */ li r4, 7 -/* 80257EEC 7F C5 F3 78 */ mr r5, r30 -/* 80257EF0 38 C0 00 80 */ li r6, 0x80 -/* 80257EF4 4B DE 43 F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257EF8 7C 7D 1B 78 */ mr r29, r3 -/* 80257EFC 38 60 01 68 */ li r3, 0x168 -/* 80257F00 48 07 6D 4D */ bl __nw__FUl -/* 80257F04 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257F08 41 82 00 24 */ beq lbl_80257F2C -/* 80257F0C 7F A4 EB 78 */ mr r4, r29 -/* 80257F10 38 A0 01 5E */ li r5, 0x15e -/* 80257F14 38 C0 01 74 */ li r6, 0x174 -/* 80257F18 38 E0 00 50 */ li r7, 0x50 -/* 80257F1C 39 00 00 20 */ li r8, 0x20 -/* 80257F20 39 20 00 FF */ li r9, 0xff -/* 80257F24 4B DF BA DD */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257F28 7C 60 1B 78 */ mr r0, r3 -lbl_80257F2C: -/* 80257F2C 90 1F 01 F4 */ stw r0, 0x1f4(r31) -/* 80257F30 38 00 00 A0 */ li r0, 0xa0 -/* 80257F34 98 01 00 08 */ stb r0, 8(r1) -/* 80257F38 98 01 00 09 */ stb r0, 9(r1) -/* 80257F3C 98 01 00 0A */ stb r0, 0xa(r1) -/* 80257F40 38 00 00 FF */ li r0, 0xff -/* 80257F44 98 01 00 0B */ stb r0, 0xb(r1) -/* 80257F48 80 01 00 08 */ lwz r0, 8(r1) -/* 80257F4C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80257F50 80 7F 01 F4 */ lwz r3, 0x1f4(r31) -/* 80257F54 38 81 00 0C */ addi r4, r1, 0xc -/* 80257F58 85 83 00 08 */ lwzu r12, 8(r3) -/* 80257F5C 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80257F60 7D 89 03 A6 */ mtctr r12 -/* 80257F64 4E 80 04 21 */ bctrl -/* 80257F68 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257F6C 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257F70 38 80 00 08 */ li r4, 8 -/* 80257F74 7F C5 F3 78 */ mr r5, r30 -/* 80257F78 38 C0 00 80 */ li r6, 0x80 -/* 80257F7C 4B DE 43 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257F80 90 7F 02 00 */ stw r3, 0x200(r31) -/* 80257F84 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257F88 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257F8C 38 80 00 06 */ li r4, 6 -/* 80257F90 7F C5 F3 78 */ mr r5, r30 -/* 80257F94 38 C0 00 80 */ li r6, 0x80 -/* 80257F98 4B DE 43 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80257F9C 90 7F 02 04 */ stw r3, 0x204(r31) -/* 80257FA0 38 60 01 68 */ li r3, 0x168 -/* 80257FA4 48 07 6C A9 */ bl __nw__FUl -/* 80257FA8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80257FAC 41 82 00 24 */ beq lbl_80257FD0 -/* 80257FB0 80 9F 02 00 */ lwz r4, 0x200(r31) -/* 80257FB4 38 A0 00 99 */ li r5, 0x99 -/* 80257FB8 38 C0 01 35 */ li r6, 0x135 -/* 80257FBC 38 E0 01 50 */ li r7, 0x150 -/* 80257FC0 39 00 00 58 */ li r8, 0x58 -/* 80257FC4 39 20 00 FF */ li r9, 0xff -/* 80257FC8 4B DF BA 39 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc -/* 80257FCC 7C 60 1B 78 */ mr r0, r3 -lbl_80257FD0: -/* 80257FD0 90 1F 01 F8 */ stw r0, 0x1f8(r31) -/* 80257FD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80257FD8 48 10 A2 51 */ bl _restgpr_29 -/* 80257FDC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80257FE0 7C 08 03 A6 */ mtlr r0 -/* 80257FE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80257FE8 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/nextSceneChange__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/nextSceneChange__10dScnLogo_cFv.s deleted file mode 100644 index 0f09b82064..0000000000 --- a/asm/d/s/d_s_logo/nextSceneChange__10dScnLogo_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80257284: -/* 80257284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80257288 7C 08 02 A6 */ mflr r0 -/* 8025728C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257290 80 8D 86 F8 */ lwz r4, mResetData__6mDoRst(r13) -/* 80257294 80 04 00 00 */ lwz r0, 0(r4) -/* 80257298 2C 00 00 00 */ cmpwi r0, 0 -/* 8025729C 40 82 00 0C */ bne lbl_802572A8 -/* 802572A0 38 80 00 0C */ li r4, 0xc -/* 802572A4 4B DD 59 B1 */ bl dComIfG_changeOpeningScene__FP11scene_classs -lbl_802572A8: -/* 802572A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802572AC 7C 08 03 A6 */ mtlr r0 -/* 802572B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802572B4 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/nintendoInDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/nintendoInDraw__10dScnLogo_cFv.s deleted file mode 100644 index 6bb3334de5..0000000000 --- a/asm/d/s/d_s_logo/nintendoInDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256E48: -/* 80256E48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256E4C 7C 08 02 A6 */ mflr r0 -/* 80256E50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256E54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256E58 7C 7F 1B 78 */ mr r31, r3 -/* 80256E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256E64 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256E68 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256E6C 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256E70 80 DF 01 E4 */ lwz r6, 0x1e4(r31) -/* 80256E74 4B DF F9 21 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256E78 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256E7C 28 00 00 00 */ cmplwi r0, 0 -/* 80256E80 40 82 00 38 */ bne lbl_80256EB8 -/* 80256E84 38 00 00 04 */ li r0, 4 -/* 80256E88 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256E8C 38 00 00 1E */ li r0, 0x1e -/* 80256E90 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256E94 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256E98 80 63 00 04 */ lwz r3, 4(r3) -/* 80256E9C 28 03 00 00 */ cmplwi r3, 0 -/* 80256EA0 41 82 00 18 */ beq lbl_80256EB8 -/* 80256EA4 38 80 00 1E */ li r4, 0x1e -/* 80256EA8 81 83 00 00 */ lwz r12, 0(r3) -/* 80256EAC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80256EB0 7D 89 03 A6 */ mtctr r12 -/* 80256EB4 4E 80 04 21 */ bctrl -lbl_80256EB8: -/* 80256EB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256EBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256EC0 7C 08 03 A6 */ mtlr r0 -/* 80256EC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256EC8 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/nintendoOutDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/nintendoOutDraw__10dScnLogo_cFv.s deleted file mode 100644 index fb366a7950..0000000000 --- a/asm/d/s/d_s_logo/nintendoOutDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256ECC: -/* 80256ECC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256ED0 7C 08 02 A6 */ mflr r0 -/* 80256ED4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256ED8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256EDC 7C 7F 1B 78 */ mr r31, r3 -/* 80256EE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256EE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256EE8 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256EEC 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256EF0 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256EF4 80 DF 01 E4 */ lwz r6, 0x1e4(r31) -/* 80256EF8 4B DF F8 9D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256EFC A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256F00 28 00 00 00 */ cmplwi r0, 0 -/* 80256F04 40 82 00 38 */ bne lbl_80256F3C -/* 80256F08 38 00 00 05 */ li r0, 5 -/* 80256F0C 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256F10 38 00 00 5A */ li r0, 0x5a -/* 80256F14 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256F18 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256F1C 80 63 00 04 */ lwz r3, 4(r3) -/* 80256F20 28 03 00 00 */ cmplwi r3, 0 -/* 80256F24 41 82 00 18 */ beq lbl_80256F3C -/* 80256F28 38 80 00 1E */ li r4, 0x1e -/* 80256F2C 81 83 00 00 */ lwz r12, 0(r3) -/* 80256F30 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80256F34 7D 89 03 A6 */ mtctr r12 -/* 80256F38 4E 80 04 21 */ bctrl -lbl_80256F3C: -/* 80256F3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256F40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256F44 7C 08 03 A6 */ mtlr r0 -/* 80256F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256F4C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/phase_1__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/phase_1__FP10dScnLogo_c.s deleted file mode 100644 index 5517996468..0000000000 --- a/asm/d/s/d_s_logo/phase_1__FP10dScnLogo_c.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_802579BC: -/* 802579BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802579C0 7C 08 02 A6 */ mflr r0 -/* 802579C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802579C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802579CC 7C 7F 1B 78 */ mr r31, r3 -/* 802579D0 4B DC 0D C9 */ bl cDyl_InitAsyncIsDone__Fv -/* 802579D4 2C 03 00 00 */ cmpwi r3, 0 -/* 802579D8 40 82 00 0C */ bne lbl_802579E4 -/* 802579DC 38 60 00 00 */ li r3, 0 -/* 802579E0 48 00 00 7C */ b lbl_80257A5C -lbl_802579E4: -/* 802579E4 88 0D 86 38 */ lbz r0, struct_80450BB8+0x0(r13) -/* 802579E8 28 00 00 00 */ cmplwi r0, 0 -/* 802579EC 41 82 00 18 */ beq lbl_80257A04 -/* 802579F0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802579F4 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 802579F8 48 06 2B C9 */ bl checkFirstWaves__10Z2SceneMgrFv -/* 802579FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80257A00 41 82 00 0C */ beq lbl_80257A0C -lbl_80257A04: -/* 80257A04 38 60 00 00 */ li r3, 0 -/* 80257A08 48 00 00 54 */ b lbl_80257A5C -lbl_80257A0C: -/* 80257A0C 3C 60 80 3A */ lis r3, d_s_d_s_logo__stringBase0@ha /* 0x80399FFC@ha */ -/* 80257A10 38 63 9F FC */ addi r3, r3, d_s_d_s_logo__stringBase0@l /* 0x80399FFC@l */ -/* 80257A14 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257A18 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80257A1C 3C 84 00 02 */ addis r4, r4, 2 -/* 80257A20 38 A0 00 80 */ li r5, 0x80 -/* 80257A24 38 C3 00 0E */ addi r6, r3, 0xe -/* 80257A28 38 E0 00 00 */ li r7, 0 -/* 80257A2C 81 1F 01 D0 */ lwz r8, 0x1d0(r31) -/* 80257A30 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80257A34 4B DE 46 45 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap -/* 80257A38 38 00 00 01 */ li r0, 1 -/* 80257A3C 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80257A40 98 03 00 12 */ stb r0, 0x12(r3) -/* 80257A44 80 6D 86 B4 */ lwz r3, archiveHeap(r13) -/* 80257A48 81 83 00 00 */ lwz r12, 0(r3) -/* 80257A4C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80257A50 7D 89 03 A6 */ mtctr r12 -/* 80257A54 4E 80 04 21 */ bctrl -/* 80257A58 38 60 00 02 */ li r3, 2 -lbl_80257A5C: -/* 80257A5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80257A60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80257A64 7C 08 03 A6 */ mtlr r0 -/* 80257A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80257A6C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/phase_2__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/phase_2__FP10dScnLogo_c.s deleted file mode 100644 index 4ff92c1243..0000000000 --- a/asm/d/s/d_s_logo/phase_2__FP10dScnLogo_c.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80257A70: -/* 80257A70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80257A74 7C 08 02 A6 */ mflr r0 -/* 80257A78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257A7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257A80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80257A84 3C 63 00 02 */ addis r3, r3, 2 -/* 80257A88 38 80 00 80 */ li r4, 0x80 -/* 80257A8C 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80257A90 4B DE 49 E1 */ bl syncAllRes__14dRes_control_cFP11dRes_info_ci -/* 80257A94 20 03 00 00 */ subfic r0, r3, 0 -/* 80257A98 7C 60 01 10 */ subfe r3, r0, r0 -/* 80257A9C 38 00 00 04 */ li r0, 4 -/* 80257AA0 7C 03 18 78 */ andc r3, r0, r3 -/* 80257AA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80257AA8 7C 08 03 A6 */ mtlr r0 -/* 80257AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80257AB0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/preLoad_dyl__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/preLoad_dyl__10dScnLogo_cFv.s deleted file mode 100644 index 11479cbf7f..0000000000 --- a/asm/d/s/d_s_logo/preLoad_dyl__10dScnLogo_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8025611C: -/* 8025611C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80256120 7C 08 02 A6 */ mflr r0 -/* 80256124 90 01 00 24 */ stw r0, 0x24(r1) -/* 80256128 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025612C 48 10 C0 A5 */ bl _savegpr_26 -/* 80256130 7C 7A 1B 78 */ mr r26, r3 -/* 80256134 3B 80 00 01 */ li r28, 1 -/* 80256138 3B 60 00 00 */ li r27, 0 -/* 8025613C 3B E0 00 00 */ li r31, 0 -/* 80256140 3B C0 00 00 */ li r30, 0 -/* 80256144 3C 60 80 3A */ lis r3, l_preLoad_dylKeyTbl@ha /* 0x80399FE0@ha */ -/* 80256148 3B A3 9F E0 */ addi r29, r3, l_preLoad_dylKeyTbl@l /* 0x80399FE0@l */ -lbl_8025614C: -/* 8025614C 80 1A 01 FC */ lwz r0, 0x1fc(r26) -/* 80256150 7C 60 F2 14 */ add r3, r0, r30 -/* 80256154 7C 9D FA AE */ lhax r4, r29, r31 -/* 80256158 4B DC 26 F5 */ bl Link__7cDylPhsFP30request_of_phase_process_classs -/* 8025615C 2C 03 00 04 */ cmpwi r3, 4 -/* 80256160 41 82 00 08 */ beq lbl_80256168 -/* 80256164 3B 80 00 00 */ li r28, 0 -lbl_80256168: -/* 80256168 3B 7B 00 01 */ addi r27, r27, 1 -/* 8025616C 2C 1B 00 0E */ cmpwi r27, 0xe -/* 80256170 3B FF 00 02 */ addi r31, r31, 2 -/* 80256174 3B DE 00 08 */ addi r30, r30, 8 -/* 80256178 41 80 FF D4 */ blt lbl_8025614C -/* 8025617C 7F 83 E3 78 */ mr r3, r28 -/* 80256180 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256184 48 10 C0 99 */ bl _restgpr_26 -/* 80256188 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025618C 7C 08 03 A6 */ mtlr r0 -/* 80256190 38 21 00 20 */ addi r1, r1, 0x20 -/* 80256194 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/preLoad_dyl_create__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/preLoad_dyl_create__10dScnLogo_cFv.s deleted file mode 100644 index ed5e6a994e..0000000000 --- a/asm/d/s/d_s_logo/preLoad_dyl_create__10dScnLogo_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802560B4: -/* 802560B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802560B8 7C 08 02 A6 */ mflr r0 -/* 802560BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802560C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802560C4 7C 7F 1B 78 */ mr r31, r3 -/* 802560C8 38 60 00 70 */ li r3, 0x70 -/* 802560CC 48 07 8B F9 */ bl __nwa__FUl -/* 802560D0 90 7F 01 FC */ stw r3, 0x1fc(r31) -/* 802560D4 80 7F 01 FC */ lwz r3, 0x1fc(r31) -/* 802560D8 38 80 00 00 */ li r4, 0 -/* 802560DC 38 A0 00 70 */ li r5, 0x70 -/* 802560E0 4B DA D3 79 */ bl memset -/* 802560E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802560E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802560EC 7C 08 03 A6 */ mtlr r0 -/* 802560F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802560F4 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/preLoad_dyl_remove__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/preLoad_dyl_remove__10dScnLogo_cFv.s deleted file mode 100644 index e83914169e..0000000000 --- a/asm/d/s/d_s_logo/preLoad_dyl_remove__10dScnLogo_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802560F8: -/* 802560F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802560FC 7C 08 02 A6 */ mflr r0 -/* 80256100 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256104 80 63 01 FC */ lwz r3, 0x1fc(r3) -/* 80256108 48 07 8C 59 */ bl __dla__FPv -/* 8025610C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256110 7C 08 03 A6 */ mtlr r0 -/* 80256114 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256118 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/progChangeDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/progChangeDraw__10dScnLogo_cFv.s deleted file mode 100644 index 1272162fea..0000000000 --- a/asm/d/s/d_s_logo/progChangeDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80256B3C: -/* 80256B3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256B40 7C 08 02 A6 */ mflr r0 -/* 80256B44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256B48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256B4C 7C 7F 1B 78 */ mr r31, r3 -/* 80256B50 48 00 19 AD */ bl getProgressiveMode__10dScnLogo_cFv -/* 80256B54 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80256B58 41 82 00 24 */ beq lbl_80256B7C -/* 80256B5C A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256B60 28 00 00 5A */ cmplwi r0, 0x5a -/* 80256B64 40 82 00 18 */ bne lbl_80256B7C -/* 80256B68 88 1F 02 09 */ lbz r0, 0x209(r31) -/* 80256B6C 28 00 00 00 */ cmplwi r0, 0 -/* 80256B70 40 82 00 0C */ bne lbl_80256B7C -/* 80256B74 7F E3 FB 78 */ mr r3, r31 -/* 80256B78 48 00 19 D5 */ bl setRenderMode__10dScnLogo_cFv -lbl_80256B7C: -/* 80256B7C A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256B80 28 00 00 00 */ cmplwi r0, 0 -/* 80256B84 40 82 00 5C */ bne lbl_80256BE0 -/* 80256B88 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80256B8C 88 03 00 15 */ lbz r0, 0x15(r3) -/* 80256B90 28 00 00 00 */ cmplwi r0, 0 -/* 80256B94 41 82 00 18 */ beq lbl_80256BAC -/* 80256B98 38 00 00 5A */ li r0, 0x5a -/* 80256B9C B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256BA0 38 00 00 03 */ li r0, 3 -/* 80256BA4 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256BA8 48 00 00 14 */ b lbl_80256BBC -lbl_80256BAC: -/* 80256BAC 38 00 00 78 */ li r0, 0x78 -/* 80256BB0 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256BB4 38 00 00 00 */ li r0, 0 -/* 80256BB8 98 1F 02 08 */ stb r0, 0x208(r31) -lbl_80256BBC: -/* 80256BBC 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256BC0 80 63 00 04 */ lwz r3, 4(r3) -/* 80256BC4 28 03 00 00 */ cmplwi r3, 0 -/* 80256BC8 41 82 00 18 */ beq lbl_80256BE0 -/* 80256BCC 38 80 00 1E */ li r4, 0x1e -/* 80256BD0 81 83 00 00 */ lwz r12, 0(r3) -/* 80256BD4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80256BD8 7D 89 03 A6 */ mtctr r12 -/* 80256BDC 4E 80 04 21 */ bctrl -lbl_80256BE0: -/* 80256BE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256BE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256BE8 7C 08 03 A6 */ mtlr r0 -/* 80256BEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256BF0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/progInDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/progInDraw__10dScnLogo_cFv.s deleted file mode 100644 index aa4f63b7b1..0000000000 --- a/asm/d/s/d_s_logo/progInDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80256264: -/* 80256264 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80256268 7C 08 02 A6 */ mflr r0 -/* 8025626C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80256270 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256274 48 10 BF 65 */ bl _savegpr_28 -/* 80256278 7C 7C 1B 78 */ mr r28, r3 -/* 8025627C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256284 3B E3 5F 64 */ addi r31, r3, 0x5f64 -/* 80256288 7F E3 FB 78 */ mr r3, r31 -/* 8025628C 3B BF 01 B4 */ addi r29, r31, 0x1b4 -/* 80256290 7F A4 EB 78 */ mr r4, r29 -/* 80256294 3B DF 01 B8 */ addi r30, r31, 0x1b8 -/* 80256298 7F C5 F3 78 */ mr r5, r30 -/* 8025629C 80 DC 01 EC */ lwz r6, 0x1ec(r28) -/* 802562A0 4B E0 04 F5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 802562A4 7F E3 FB 78 */ mr r3, r31 -/* 802562A8 7F A4 EB 78 */ mr r4, r29 -/* 802562AC 7F C5 F3 78 */ mr r5, r30 -/* 802562B0 80 DC 01 F0 */ lwz r6, 0x1f0(r28) -/* 802562B4 4B E0 04 E1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 802562B8 7F E3 FB 78 */ mr r3, r31 -/* 802562BC 7F A4 EB 78 */ mr r4, r29 -/* 802562C0 7F C5 F3 78 */ mr r5, r30 -/* 802562C4 80 DC 01 F4 */ lwz r6, 0x1f4(r28) -/* 802562C8 4B E0 04 CD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 802562CC A0 1C 02 0C */ lhz r0, 0x20c(r28) -/* 802562D0 28 00 00 00 */ cmplwi r0, 0 -/* 802562D4 40 82 00 30 */ bne lbl_80256304 -/* 802562D8 38 00 00 09 */ li r0, 9 -/* 802562DC 98 1C 02 08 */ stb r0, 0x208(r28) -/* 802562E0 38 00 02 58 */ li r0, 0x258 -/* 802562E4 B0 1C 02 0C */ sth r0, 0x20c(r28) -/* 802562E8 38 00 00 1E */ li r0, 0x1e -/* 802562EC B0 1C 02 0E */ sth r0, 0x20e(r28) -/* 802562F0 A0 1C 02 0E */ lhz r0, 0x20e(r28) -/* 802562F4 B0 1C 02 10 */ sth r0, 0x210(r28) -/* 802562F8 38 00 00 00 */ li r0, 0 -/* 802562FC B0 1C 02 12 */ sth r0, 0x212(r28) -/* 80256300 98 1C 02 0B */ stb r0, 0x20b(r28) -lbl_80256304: -/* 80256304 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256308 48 10 BF 1D */ bl _restgpr_28 -/* 8025630C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80256310 7C 08 03 A6 */ mtlr r0 -/* 80256314 38 21 00 20 */ addi r1, r1, 0x20 -/* 80256318 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/progOutDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/progOutDraw__10dScnLogo_cFv.s deleted file mode 100644 index 17ec678eab..0000000000 --- a/asm/d/s/d_s_logo/progOutDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_802568E0: -/* 802568E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802568E4 7C 08 02 A6 */ mflr r0 -/* 802568E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802568EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802568F0 48 10 B8 E9 */ bl _savegpr_28 -/* 802568F4 7C 7F 1B 78 */ mr r31, r3 -/* 802568F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802568FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256900 3B C3 5F 64 */ addi r30, r3, 0x5f64 -/* 80256904 7F C3 F3 78 */ mr r3, r30 -/* 80256908 3B 9E 01 B4 */ addi r28, r30, 0x1b4 -/* 8025690C 7F 84 E3 78 */ mr r4, r28 -/* 80256910 3B BE 01 B8 */ addi r29, r30, 0x1b8 -/* 80256914 7F A5 EB 78 */ mr r5, r29 -/* 80256918 80 DF 01 EC */ lwz r6, 0x1ec(r31) -/* 8025691C 4B DF FE 79 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256920 7F C3 F3 78 */ mr r3, r30 -/* 80256924 7F 84 E3 78 */ mr r4, r28 -/* 80256928 7F A5 EB 78 */ mr r5, r29 -/* 8025692C 80 DF 01 F0 */ lwz r6, 0x1f0(r31) -/* 80256930 4B DF FE 65 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256934 7F C3 F3 78 */ mr r3, r30 -/* 80256938 7F 84 E3 78 */ mr r4, r28 -/* 8025693C 7F A5 EB 78 */ mr r5, r29 -/* 80256940 80 DF 01 F4 */ lwz r6, 0x1f4(r31) -/* 80256944 4B DF FE 51 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256948 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 8025694C 28 00 00 00 */ cmplwi r0, 0 -/* 80256950 40 82 00 D4 */ bne lbl_80256A24 -/* 80256954 80 7F 02 18 */ lwz r3, 0x218(r31) -/* 80256958 28 03 00 00 */ cmplwi r3, 0 -/* 8025695C 41 82 00 24 */ beq lbl_80256980 -/* 80256960 88 1F 02 09 */ lbz r0, 0x209(r31) -/* 80256964 28 00 00 00 */ cmplwi r0, 0 -/* 80256968 40 82 00 18 */ bne lbl_80256980 -/* 8025696C 38 00 00 0D */ li r0, 0xd -/* 80256970 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256974 38 00 00 96 */ li r0, 0x96 -/* 80256978 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 8025697C 48 00 00 A8 */ b lbl_80256A24 -lbl_80256980: -/* 80256980 28 03 00 00 */ cmplwi r3, 0 -/* 80256984 40 82 00 6C */ bne lbl_802569F0 -/* 80256988 88 1F 02 09 */ lbz r0, 0x209(r31) -/* 8025698C 28 00 00 00 */ cmplwi r0, 0 -/* 80256990 41 82 00 60 */ beq lbl_802569F0 -/* 80256994 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80256998 88 03 00 15 */ lbz r0, 0x15(r3) -/* 8025699C 28 00 00 00 */ cmplwi r0, 0 -/* 802569A0 41 82 00 18 */ beq lbl_802569B8 -/* 802569A4 38 00 00 5A */ li r0, 0x5a -/* 802569A8 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 802569AC 38 00 00 03 */ li r0, 3 -/* 802569B0 98 1F 02 08 */ stb r0, 0x208(r31) -/* 802569B4 48 00 00 14 */ b lbl_802569C8 -lbl_802569B8: -/* 802569B8 38 00 00 78 */ li r0, 0x78 -/* 802569BC B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 802569C0 38 00 00 00 */ li r0, 0 -/* 802569C4 98 1F 02 08 */ stb r0, 0x208(r31) -lbl_802569C8: -/* 802569C8 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 802569CC 80 63 00 04 */ lwz r3, 4(r3) -/* 802569D0 28 03 00 00 */ cmplwi r3, 0 -/* 802569D4 41 82 00 50 */ beq lbl_80256A24 -/* 802569D8 38 80 00 1E */ li r4, 0x1e -/* 802569DC 81 83 00 00 */ lwz r12, 0(r3) -/* 802569E0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802569E4 7D 89 03 A6 */ mtctr r12 -/* 802569E8 4E 80 04 21 */ bctrl -/* 802569EC 48 00 00 38 */ b lbl_80256A24 -lbl_802569F0: -/* 802569F0 38 00 00 0B */ li r0, 0xb -/* 802569F4 98 1F 02 08 */ stb r0, 0x208(r31) -/* 802569F8 38 00 00 96 */ li r0, 0x96 -/* 802569FC B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256A00 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256A04 80 63 00 04 */ lwz r3, 4(r3) -/* 80256A08 28 03 00 00 */ cmplwi r3, 0 -/* 80256A0C 41 82 00 18 */ beq lbl_80256A24 -/* 80256A10 38 80 00 1E */ li r4, 0x1e -/* 80256A14 81 83 00 00 */ lwz r12, 0(r3) -/* 80256A18 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80256A1C 7D 89 03 A6 */ mtctr r12 -/* 80256A20 4E 80 04 21 */ bctrl -lbl_80256A24: -/* 80256A24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256A28 48 10 B7 FD */ bl _restgpr_28 -/* 80256A2C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80256A30 7C 08 03 A6 */ mtlr r0 -/* 80256A34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80256A38 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/progSelDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/progSelDraw__10dScnLogo_cFv.s deleted file mode 100644 index 4bf9f014b6..0000000000 --- a/asm/d/s/d_s_logo/progSelDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,389 +0,0 @@ -lbl_8025631C: -/* 8025631C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80256320 7C 08 02 A6 */ mflr r0 -/* 80256324 90 01 00 94 */ stw r0, 0x94(r1) -/* 80256328 39 61 00 90 */ addi r11, r1, 0x90 -/* 8025632C 48 10 BE AD */ bl _savegpr_28 -/* 80256330 7C 7D 1B 78 */ mr r29, r3 -/* 80256334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025633C 3B C3 5F 64 */ addi r30, r3, 0x5f64 -/* 80256340 7F C3 F3 78 */ mr r3, r30 -/* 80256344 3B 9E 01 B4 */ addi r28, r30, 0x1b4 -/* 80256348 7F 84 E3 78 */ mr r4, r28 -/* 8025634C 3B FE 01 B8 */ addi r31, r30, 0x1b8 -/* 80256350 7F E5 FB 78 */ mr r5, r31 -/* 80256354 80 DD 01 EC */ lwz r6, 0x1ec(r29) -/* 80256358 4B E0 04 3D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 8025635C 7F C3 F3 78 */ mr r3, r30 -/* 80256360 7F 84 E3 78 */ mr r4, r28 -/* 80256364 7F E5 FB 78 */ mr r5, r31 -/* 80256368 80 DD 01 F0 */ lwz r6, 0x1f0(r29) -/* 8025636C 4B E0 04 29 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256370 7F C3 F3 78 */ mr r3, r30 -/* 80256374 7F 84 E3 78 */ mr r4, r28 -/* 80256378 7F E5 FB 78 */ mr r5, r31 -/* 8025637C 80 DD 01 F4 */ lwz r6, 0x1f4(r29) -/* 80256380 4B E0 04 15 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256384 88 1D 02 0B */ lbz r0, 0x20b(r29) -/* 80256388 28 00 00 00 */ cmplwi r0, 0 -/* 8025638C 40 82 02 74 */ bne lbl_80256600 -/* 80256390 88 1D 02 09 */ lbz r0, 0x209(r29) -/* 80256394 28 00 00 00 */ cmplwi r0, 0 -/* 80256398 40 82 00 80 */ bne lbl_80256418 -/* 8025639C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 802563A0 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 802563A4 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802563A8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802563AC 40 82 00 14 */ bne lbl_802563C0 -/* 802563B0 C0 23 00 00 */ lfs f1, 0(r3) -/* 802563B4 C0 02 B4 D8 */ lfs f0, lit_3933(r2) -/* 802563B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802563BC 40 81 00 D0 */ ble lbl_8025648C -lbl_802563C0: -/* 802563C0 38 00 00 A0 */ li r0, 0xa0 -/* 802563C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802563C8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802563CC 38 81 00 14 */ addi r4, r1, 0x14 -/* 802563D0 38 A0 00 00 */ li r5, 0 -/* 802563D4 38 C0 00 00 */ li r6, 0 -/* 802563D8 38 E0 00 00 */ li r7, 0 -/* 802563DC C0 22 B4 DC */ lfs f1, lit_3934(r2) -/* 802563E0 FC 40 08 90 */ fmr f2, f1 -/* 802563E4 C0 62 B4 E0 */ lfs f3, lit_3935(r2) -/* 802563E8 FC 80 18 90 */ fmr f4, f3 -/* 802563EC 39 00 00 00 */ li r8, 0 -/* 802563F0 48 05 55 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802563F4 38 00 00 01 */ li r0, 1 -/* 802563F8 98 1D 02 09 */ stb r0, 0x209(r29) -/* 802563FC 38 00 00 1E */ li r0, 0x1e -/* 80256400 B0 1D 02 0E */ sth r0, 0x20e(r29) -/* 80256404 A0 1D 02 0E */ lhz r0, 0x20e(r29) -/* 80256408 B0 1D 02 10 */ sth r0, 0x210(r29) -/* 8025640C 38 00 00 00 */ li r0, 0 -/* 80256410 B0 1D 02 12 */ sth r0, 0x212(r29) -/* 80256414 48 00 00 78 */ b lbl_8025648C -lbl_80256418: -/* 80256418 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 8025641C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80256420 80 03 00 30 */ lwz r0, 0x30(r3) -/* 80256424 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80256428 40 82 00 14 */ bne lbl_8025643C -/* 8025642C C0 23 00 00 */ lfs f1, 0(r3) -/* 80256430 C0 02 B4 E4 */ lfs f0, lit_3936(r2) -/* 80256434 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80256438 40 80 00 54 */ bge lbl_8025648C -lbl_8025643C: -/* 8025643C 38 00 00 A0 */ li r0, 0xa0 -/* 80256440 90 01 00 10 */ stw r0, 0x10(r1) -/* 80256444 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80256448 38 81 00 10 */ addi r4, r1, 0x10 -/* 8025644C 38 A0 00 00 */ li r5, 0 -/* 80256450 38 C0 00 00 */ li r6, 0 -/* 80256454 38 E0 00 00 */ li r7, 0 -/* 80256458 C0 22 B4 DC */ lfs f1, lit_3934(r2) -/* 8025645C FC 40 08 90 */ fmr f2, f1 -/* 80256460 C0 62 B4 E0 */ lfs f3, lit_3935(r2) -/* 80256464 FC 80 18 90 */ fmr f4, f3 -/* 80256468 39 00 00 00 */ li r8, 0 -/* 8025646C 48 05 55 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80256470 38 60 00 00 */ li r3, 0 -/* 80256474 98 7D 02 09 */ stb r3, 0x209(r29) -/* 80256478 38 00 00 1E */ li r0, 0x1e -/* 8025647C B0 1D 02 0E */ sth r0, 0x20e(r29) -/* 80256480 A0 1D 02 0E */ lhz r0, 0x20e(r29) -/* 80256484 B0 1D 02 10 */ sth r0, 0x210(r29) -/* 80256488 B0 7D 02 12 */ sth r3, 0x212(r29) -lbl_8025648C: -/* 8025648C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80256490 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80256494 80 03 00 34 */ lwz r0, 0x34(r3) -/* 80256498 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8025649C 40 82 00 10 */ bne lbl_802564AC -/* 802564A0 A0 1D 02 0C */ lhz r0, 0x20c(r29) -/* 802564A4 28 00 00 00 */ cmplwi r0, 0 -/* 802564A8 40 82 01 BC */ bne lbl_80256664 -lbl_802564AC: -/* 802564AC 88 1D 02 09 */ lbz r0, 0x209(r29) -/* 802564B0 28 00 00 00 */ cmplwi r0, 0 -/* 802564B4 40 82 00 70 */ bne lbl_80256524 -/* 802564B8 80 7D 01 F8 */ lwz r3, 0x1f8(r29) -/* 802564BC 80 9D 02 00 */ lwz r4, 0x200(r29) -/* 802564C0 38 A0 00 00 */ li r5, 0 -/* 802564C4 85 83 00 08 */ lwzu r12, 8(r3) -/* 802564C8 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 802564CC 7D 89 03 A6 */ mtctr r12 -/* 802564D0 4E 80 04 21 */ bctrl -/* 802564D4 7F A3 EB 78 */ mr r3, r29 -/* 802564D8 38 80 00 01 */ li r4, 1 -/* 802564DC 48 00 1F FD */ bl setProgressiveMode__10dScnLogo_cFUc -/* 802564E0 38 00 00 01 */ li r0, 1 -/* 802564E4 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 802564E8 98 03 00 14 */ stb r0, 0x14(r3) -/* 802564EC 38 00 00 6D */ li r0, 0x6d -/* 802564F0 90 01 00 0C */ stw r0, 0xc(r1) -/* 802564F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802564F8 38 81 00 0C */ addi r4, r1, 0xc -/* 802564FC 38 A0 00 00 */ li r5, 0 -/* 80256500 38 C0 00 00 */ li r6, 0 -/* 80256504 38 E0 00 00 */ li r7, 0 -/* 80256508 C0 22 B4 DC */ lfs f1, lit_3934(r2) -/* 8025650C FC 40 08 90 */ fmr f2, f1 -/* 80256510 C0 62 B4 E0 */ lfs f3, lit_3935(r2) -/* 80256514 FC 80 18 90 */ fmr f4, f3 -/* 80256518 39 00 00 00 */ li r8, 0 -/* 8025651C 48 05 54 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80256520 48 00 00 60 */ b lbl_80256580 -lbl_80256524: -/* 80256524 80 7D 01 F8 */ lwz r3, 0x1f8(r29) -/* 80256528 80 9D 02 04 */ lwz r4, 0x204(r29) -/* 8025652C 38 A0 00 00 */ li r5, 0 -/* 80256530 85 83 00 08 */ lwzu r12, 8(r3) -/* 80256534 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80256538 7D 89 03 A6 */ mtctr r12 -/* 8025653C 4E 80 04 21 */ bctrl -/* 80256540 7F A3 EB 78 */ mr r3, r29 -/* 80256544 38 80 00 00 */ li r4, 0 -/* 80256548 48 00 1F 91 */ bl setProgressiveMode__10dScnLogo_cFUc -/* 8025654C 38 00 00 6D */ li r0, 0x6d -/* 80256550 90 01 00 08 */ stw r0, 8(r1) -/* 80256554 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80256558 38 81 00 08 */ addi r4, r1, 8 -/* 8025655C 38 A0 00 00 */ li r5, 0 -/* 80256560 38 C0 00 00 */ li r6, 0 -/* 80256564 38 E0 00 00 */ li r7, 0 -/* 80256568 C0 22 B4 DC */ lfs f1, lit_3934(r2) -/* 8025656C FC 40 08 90 */ fmr f2, f1 -/* 80256570 C0 62 B4 E0 */ lfs f3, lit_3935(r2) -/* 80256574 FC 80 18 90 */ fmr f4, f3 -/* 80256578 39 00 00 00 */ li r8, 0 -/* 8025657C 48 05 54 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80256580: -/* 80256580 A0 1D 02 0C */ lhz r0, 0x20c(r29) -/* 80256584 28 00 02 1C */ cmplwi r0, 0x21c -/* 80256588 40 81 00 1C */ ble lbl_802565A4 -/* 8025658C 38 00 00 01 */ li r0, 1 -/* 80256590 98 1D 02 0B */ stb r0, 0x20b(r29) -/* 80256594 A0 7D 02 0C */ lhz r3, 0x20c(r29) -/* 80256598 38 03 FD E4 */ addi r0, r3, -540 -/* 8025659C B0 1D 02 14 */ sth r0, 0x214(r29) -/* 802565A0 48 00 00 50 */ b lbl_802565F0 -lbl_802565A4: -/* 802565A4 38 00 00 0A */ li r0, 0xa -/* 802565A8 98 1D 02 08 */ stb r0, 0x208(r29) -/* 802565AC 38 00 00 1E */ li r0, 0x1e -/* 802565B0 B0 1D 02 0C */ sth r0, 0x20c(r29) -/* 802565B4 A0 9D 02 0C */ lhz r4, 0x20c(r29) -/* 802565B8 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 802565BC 80 63 00 04 */ lwz r3, 4(r3) -/* 802565C0 28 03 00 00 */ cmplwi r3, 0 -/* 802565C4 41 82 00 14 */ beq lbl_802565D8 -/* 802565C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802565CC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802565D0 7D 89 03 A6 */ mtctr r12 -/* 802565D4 4E 80 04 21 */ bctrl -lbl_802565D8: -/* 802565D8 38 00 00 1E */ li r0, 0x1e -/* 802565DC B0 1D 02 0E */ sth r0, 0x20e(r29) -/* 802565E0 A0 1D 02 0E */ lhz r0, 0x20e(r29) -/* 802565E4 B0 1D 02 10 */ sth r0, 0x210(r29) -/* 802565E8 38 00 00 00 */ li r0, 0 -/* 802565EC B0 1D 02 12 */ sth r0, 0x212(r29) -lbl_802565F0: -/* 802565F0 38 00 00 01 */ li r0, 1 -/* 802565F4 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 802565F8 98 03 00 13 */ stb r0, 0x13(r3) -/* 802565FC 48 00 00 68 */ b lbl_80256664 -lbl_80256600: -/* 80256600 A0 7D 02 14 */ lhz r3, 0x214(r29) -/* 80256604 28 03 00 00 */ cmplwi r3, 0 -/* 80256608 40 82 00 54 */ bne lbl_8025665C -/* 8025660C 38 00 00 0A */ li r0, 0xa -/* 80256610 98 1D 02 08 */ stb r0, 0x208(r29) -/* 80256614 38 00 00 1E */ li r0, 0x1e -/* 80256618 B0 1D 02 0C */ sth r0, 0x20c(r29) -/* 8025661C 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256620 80 63 00 04 */ lwz r3, 4(r3) -/* 80256624 28 03 00 00 */ cmplwi r3, 0 -/* 80256628 41 82 00 18 */ beq lbl_80256640 -/* 8025662C 38 80 00 1E */ li r4, 0x1e -/* 80256630 81 83 00 00 */ lwz r12, 0(r3) -/* 80256634 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80256638 7D 89 03 A6 */ mtctr r12 -/* 8025663C 4E 80 04 21 */ bctrl -lbl_80256640: -/* 80256640 38 00 00 1E */ li r0, 0x1e -/* 80256644 B0 1D 02 0E */ sth r0, 0x20e(r29) -/* 80256648 A0 1D 02 0E */ lhz r0, 0x20e(r29) -/* 8025664C B0 1D 02 10 */ sth r0, 0x210(r29) -/* 80256650 38 00 00 00 */ li r0, 0 -/* 80256654 B0 1D 02 12 */ sth r0, 0x212(r29) -/* 80256658 48 00 00 0C */ b lbl_80256664 -lbl_8025665C: -/* 8025665C 38 03 FF FF */ addi r0, r3, -1 -/* 80256660 B0 1D 02 14 */ sth r0, 0x214(r29) -lbl_80256664: -/* 80256664 A0 1D 02 10 */ lhz r0, 0x210(r29) -/* 80256668 C8 42 B4 F0 */ lfd f2, lit_3940(r2) -/* 8025666C 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80256670 3C 60 43 30 */ lis r3, 0x4330 -/* 80256674 90 61 00 58 */ stw r3, 0x58(r1) -/* 80256678 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 8025667C EC 20 10 28 */ fsubs f1, f0, f2 -/* 80256680 A0 1D 02 0E */ lhz r0, 0x20e(r29) -/* 80256684 90 01 00 64 */ stw r0, 0x64(r1) -/* 80256688 90 61 00 60 */ stw r3, 0x60(r1) -/* 8025668C C8 01 00 60 */ lfd f0, 0x60(r1) -/* 80256690 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80256694 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80256698 A0 1D 02 12 */ lhz r0, 0x212(r29) -/* 8025669C 28 00 00 00 */ cmplwi r0, 0 -/* 802566A0 41 82 00 0C */ beq lbl_802566AC -/* 802566A4 C0 02 B4 DC */ lfs f0, lit_3934(r2) -/* 802566A8 EC 20 08 28 */ fsubs f1, f0, f1 -lbl_802566AC: -/* 802566AC C0 02 B4 E8 */ lfs f0, lit_3937(r2) -/* 802566B0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 802566B4 FC 00 00 1E */ fctiwz f0, f0 -/* 802566B8 D8 01 00 68 */ stfd f0, 0x68(r1) -/* 802566BC 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 802566C0 C0 02 B4 EC */ lfs f0, lit_3938(r2) -/* 802566C4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 802566C8 FC 00 00 1E */ fctiwz f0, f0 -/* 802566CC D8 01 00 70 */ stfd f0, 0x70(r1) -/* 802566D0 83 C1 00 74 */ lwz r30, 0x74(r1) -/* 802566D4 88 1D 02 09 */ lbz r0, 0x209(r29) -/* 802566D8 28 00 00 00 */ cmplwi r0, 0 -/* 802566DC 41 82 00 E4 */ beq lbl_802567C0 -/* 802566E0 38 00 00 A0 */ li r0, 0xa0 -/* 802566E4 98 01 00 50 */ stb r0, 0x50(r1) -/* 802566E8 98 01 00 51 */ stb r0, 0x51(r1) -/* 802566EC 98 01 00 52 */ stb r0, 0x52(r1) -/* 802566F0 38 00 00 FF */ li r0, 0xff -/* 802566F4 98 01 00 53 */ stb r0, 0x53(r1) -/* 802566F8 80 01 00 50 */ lwz r0, 0x50(r1) -/* 802566FC 90 01 00 54 */ stw r0, 0x54(r1) -/* 80256700 80 7D 01 F0 */ lwz r3, 0x1f0(r29) -/* 80256704 38 81 00 54 */ addi r4, r1, 0x54 -/* 80256708 85 83 00 08 */ lwzu r12, 8(r3) -/* 8025670C 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80256710 7D 89 03 A6 */ mtctr r12 -/* 80256714 4E 80 04 21 */ bctrl -/* 80256718 38 00 00 00 */ li r0, 0 -/* 8025671C 98 01 00 48 */ stb r0, 0x48(r1) -/* 80256720 98 01 00 49 */ stb r0, 0x49(r1) -/* 80256724 98 01 00 4A */ stb r0, 0x4a(r1) -/* 80256728 98 01 00 4B */ stb r0, 0x4b(r1) -/* 8025672C 80 01 00 48 */ lwz r0, 0x48(r1) -/* 80256730 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80256734 80 7D 01 F0 */ lwz r3, 0x1f0(r29) -/* 80256738 38 81 00 4C */ addi r4, r1, 0x4c -/* 8025673C 85 83 00 08 */ lwzu r12, 8(r3) -/* 80256740 81 8C 01 28 */ lwz r12, 0x128(r12) -/* 80256744 7D 89 03 A6 */ mtctr r12 -/* 80256748 4E 80 04 21 */ bctrl -/* 8025674C 38 60 00 FF */ li r3, 0xff -/* 80256750 98 61 00 40 */ stb r3, 0x40(r1) -/* 80256754 38 00 00 C8 */ li r0, 0xc8 -/* 80256758 98 01 00 41 */ stb r0, 0x41(r1) -/* 8025675C 38 00 00 00 */ li r0, 0 -/* 80256760 98 01 00 42 */ stb r0, 0x42(r1) -/* 80256764 98 61 00 43 */ stb r3, 0x43(r1) -/* 80256768 80 01 00 40 */ lwz r0, 0x40(r1) -/* 8025676C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80256770 80 7D 01 F4 */ lwz r3, 0x1f4(r29) -/* 80256774 38 81 00 44 */ addi r4, r1, 0x44 -/* 80256778 85 83 00 08 */ lwzu r12, 8(r3) -/* 8025677C 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80256780 7D 89 03 A6 */ mtctr r12 -/* 80256784 4E 80 04 21 */ bctrl -/* 80256788 9B E1 00 38 */ stb r31, 0x38(r1) -/* 8025678C 9B C1 00 39 */ stb r30, 0x39(r1) -/* 80256790 38 00 00 00 */ li r0, 0 -/* 80256794 98 01 00 3A */ stb r0, 0x3a(r1) -/* 80256798 98 01 00 3B */ stb r0, 0x3b(r1) -/* 8025679C 80 01 00 38 */ lwz r0, 0x38(r1) -/* 802567A0 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802567A4 80 7D 01 F4 */ lwz r3, 0x1f4(r29) -/* 802567A8 38 81 00 3C */ addi r4, r1, 0x3c -/* 802567AC 85 83 00 08 */ lwzu r12, 8(r3) -/* 802567B0 81 8C 01 28 */ lwz r12, 0x128(r12) -/* 802567B4 7D 89 03 A6 */ mtctr r12 -/* 802567B8 4E 80 04 21 */ bctrl -/* 802567BC 48 00 00 E0 */ b lbl_8025689C -lbl_802567C0: -/* 802567C0 38 60 00 FF */ li r3, 0xff -/* 802567C4 98 61 00 30 */ stb r3, 0x30(r1) -/* 802567C8 38 00 00 C8 */ li r0, 0xc8 -/* 802567CC 98 01 00 31 */ stb r0, 0x31(r1) -/* 802567D0 38 00 00 00 */ li r0, 0 -/* 802567D4 98 01 00 32 */ stb r0, 0x32(r1) -/* 802567D8 98 61 00 33 */ stb r3, 0x33(r1) -/* 802567DC 80 01 00 30 */ lwz r0, 0x30(r1) -/* 802567E0 90 01 00 34 */ stw r0, 0x34(r1) -/* 802567E4 80 7D 01 F0 */ lwz r3, 0x1f0(r29) -/* 802567E8 38 81 00 34 */ addi r4, r1, 0x34 -/* 802567EC 85 83 00 08 */ lwzu r12, 8(r3) -/* 802567F0 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 802567F4 7D 89 03 A6 */ mtctr r12 -/* 802567F8 4E 80 04 21 */ bctrl -/* 802567FC 9B E1 00 28 */ stb r31, 0x28(r1) -/* 80256800 9B C1 00 29 */ stb r30, 0x29(r1) -/* 80256804 38 00 00 00 */ li r0, 0 -/* 80256808 98 01 00 2A */ stb r0, 0x2a(r1) -/* 8025680C 98 01 00 2B */ stb r0, 0x2b(r1) -/* 80256810 80 01 00 28 */ lwz r0, 0x28(r1) -/* 80256814 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80256818 80 7D 01 F0 */ lwz r3, 0x1f0(r29) -/* 8025681C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80256820 85 83 00 08 */ lwzu r12, 8(r3) -/* 80256824 81 8C 01 28 */ lwz r12, 0x128(r12) -/* 80256828 7D 89 03 A6 */ mtctr r12 -/* 8025682C 4E 80 04 21 */ bctrl -/* 80256830 38 00 00 A0 */ li r0, 0xa0 -/* 80256834 98 01 00 20 */ stb r0, 0x20(r1) -/* 80256838 98 01 00 21 */ stb r0, 0x21(r1) -/* 8025683C 98 01 00 22 */ stb r0, 0x22(r1) -/* 80256840 38 00 00 FF */ li r0, 0xff -/* 80256844 98 01 00 23 */ stb r0, 0x23(r1) -/* 80256848 80 01 00 20 */ lwz r0, 0x20(r1) -/* 8025684C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80256850 80 7D 01 F4 */ lwz r3, 0x1f4(r29) -/* 80256854 38 81 00 24 */ addi r4, r1, 0x24 -/* 80256858 85 83 00 08 */ lwzu r12, 8(r3) -/* 8025685C 81 8C 01 2C */ lwz r12, 0x12c(r12) -/* 80256860 7D 89 03 A6 */ mtctr r12 -/* 80256864 4E 80 04 21 */ bctrl -/* 80256868 38 00 00 00 */ li r0, 0 -/* 8025686C 98 01 00 18 */ stb r0, 0x18(r1) -/* 80256870 98 01 00 19 */ stb r0, 0x19(r1) -/* 80256874 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80256878 98 01 00 1B */ stb r0, 0x1b(r1) -/* 8025687C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80256880 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80256884 80 7D 01 F4 */ lwz r3, 0x1f4(r29) -/* 80256888 38 81 00 1C */ addi r4, r1, 0x1c -/* 8025688C 85 83 00 08 */ lwzu r12, 8(r3) -/* 80256890 81 8C 01 28 */ lwz r12, 0x128(r12) -/* 80256894 7D 89 03 A6 */ mtctr r12 -/* 80256898 4E 80 04 21 */ bctrl -lbl_8025689C: -/* 8025689C A0 7D 02 10 */ lhz r3, 0x210(r29) -/* 802568A0 28 03 00 00 */ cmplwi r3, 0 -/* 802568A4 40 82 00 1C */ bne lbl_802568C0 -/* 802568A8 A0 1D 02 0E */ lhz r0, 0x20e(r29) -/* 802568AC B0 1D 02 10 */ sth r0, 0x210(r29) -/* 802568B0 A0 1D 02 12 */ lhz r0, 0x212(r29) -/* 802568B4 68 00 00 01 */ xori r0, r0, 1 -/* 802568B8 B0 1D 02 12 */ sth r0, 0x212(r29) -/* 802568BC 48 00 00 0C */ b lbl_802568C8 -lbl_802568C0: -/* 802568C0 38 03 FF FF */ addi r0, r3, -1 -/* 802568C4 B0 1D 02 10 */ sth r0, 0x210(r29) -lbl_802568C8: -/* 802568C8 39 61 00 90 */ addi r11, r1, 0x90 -/* 802568CC 48 10 B9 59 */ bl _restgpr_28 -/* 802568D0 80 01 00 94 */ lwz r0, 0x94(r1) -/* 802568D4 7C 08 03 A6 */ mtlr r0 -/* 802568D8 38 21 00 90 */ addi r1, r1, 0x90 -/* 802568DC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/progSet2Draw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/progSet2Draw__10dScnLogo_cFv.s deleted file mode 100644 index 382421da56..0000000000 --- a/asm/d/s/d_s_logo/progSet2Draw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256AC0: -/* 80256AC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256AC4 7C 08 02 A6 */ mflr r0 -/* 80256AC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256ACC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256AD0 7C 7F 1B 78 */ mr r31, r3 -/* 80256AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256ADC 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256AE0 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256AE4 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256AE8 80 DF 01 F8 */ lwz r6, 0x1f8(r31) -/* 80256AEC 4B DF FC A9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256AF0 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256AF4 28 00 00 00 */ cmplwi r0, 0 -/* 80256AF8 40 82 00 30 */ bne lbl_80256B28 -/* 80256AFC 7F E3 FB 78 */ mr r3, r31 -/* 80256B00 48 00 19 FD */ bl getProgressiveMode__10dScnLogo_cFv -/* 80256B04 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80256B08 41 82 00 10 */ beq lbl_80256B18 -/* 80256B0C 38 00 00 96 */ li r0, 0x96 -/* 80256B10 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256B14 48 00 00 0C */ b lbl_80256B20 -lbl_80256B18: -/* 80256B18 38 00 00 1E */ li r0, 0x1e -/* 80256B1C B0 1F 02 0C */ sth r0, 0x20c(r31) -lbl_80256B20: -/* 80256B20 38 00 00 0D */ li r0, 0xd -/* 80256B24 98 1F 02 08 */ stb r0, 0x208(r31) -lbl_80256B28: -/* 80256B28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256B2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256B30 7C 08 03 A6 */ mtlr r0 -/* 80256B34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256B38 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/progSetDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/progSetDraw__10dScnLogo_cFv.s deleted file mode 100644 index 3980945e1c..0000000000 --- a/asm/d/s/d_s_logo/progSetDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256A3C: -/* 80256A3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256A40 7C 08 02 A6 */ mflr r0 -/* 80256A44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256A48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256A4C 7C 7F 1B 78 */ mr r31, r3 -/* 80256A50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256A54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256A58 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256A5C 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256A60 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256A64 80 DF 01 F8 */ lwz r6, 0x1f8(r31) -/* 80256A68 4B DF FD 2D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256A6C A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256A70 28 00 00 00 */ cmplwi r0, 0 -/* 80256A74 40 82 00 38 */ bne lbl_80256AAC -/* 80256A78 38 00 00 0C */ li r0, 0xc -/* 80256A7C 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256A80 38 00 00 1E */ li r0, 0x1e -/* 80256A84 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256A88 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256A8C 80 63 00 04 */ lwz r3, 4(r3) -/* 80256A90 28 03 00 00 */ cmplwi r3, 0 -/* 80256A94 41 82 00 18 */ beq lbl_80256AAC -/* 80256A98 38 80 00 1E */ li r4, 0x1e -/* 80256A9C 81 83 00 00 */ lwz r12, 0(r3) -/* 80256AA0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80256AA4 7D 89 03 A6 */ mtctr r12 -/* 80256AA8 4E 80 04 21 */ bctrl -lbl_80256AAC: -/* 80256AAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256AB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256AB4 7C 08 03 A6 */ mtlr r0 -/* 80256AB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256ABC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/resLoad__FP30request_of_phase_process_classP10dScnLogo_c.s b/asm/d/s/d_s_logo/resLoad__FP30request_of_phase_process_classP10dScnLogo_c.s deleted file mode 100644 index ee9baaf941..0000000000 --- a/asm/d/s/d_s_logo/resLoad__FP30request_of_phase_process_classP10dScnLogo_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80257AB4: -/* 80257AB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80257AB8 7C 08 02 A6 */ mflr r0 -/* 80257ABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257AC0 7C 85 23 78 */ mr r5, r4 -/* 80257AC4 3C 80 80 3C */ lis r4, l_method@ha /* 0x803C2FC4@ha */ -/* 80257AC8 38 84 2F C4 */ addi r4, r4, l_method@l /* 0x803C2FC4@l */ -/* 80257ACC 4B DD 80 55 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv -/* 80257AD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80257AD4 7C 08 03 A6 */ mtlr r0 -/* 80257AD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80257ADC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/setProgressiveMode__10dScnLogo_cFUc.s b/asm/d/s/d_s_logo/setProgressiveMode__10dScnLogo_cFUc.s deleted file mode 100644 index 5b3cfe9d85..0000000000 --- a/asm/d/s/d_s_logo/setProgressiveMode__10dScnLogo_cFUc.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802584D8: -/* 802584D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802584DC 7C 08 02 A6 */ mflr r0 -/* 802584E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802584E4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 802584E8 48 0E 82 3D */ bl OSSetProgressiveMode -/* 802584EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802584F0 7C 08 03 A6 */ mtlr r0 -/* 802584F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802584F8 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/setRenderMode__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/setRenderMode__10dScnLogo_cFv.s deleted file mode 100644 index 0c07962c58..0000000000 --- a/asm/d/s/d_s_logo/setRenderMode__10dScnLogo_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8025854C: -/* 8025854C 3C 60 80 3A */ lis r3, g_ntscZeldaProg@ha /* 0x803A2F9C@ha */ -/* 80258550 38 03 2F 9C */ addi r0, r3, g_ntscZeldaProg@l /* 0x803A2F9C@l */ -/* 80258554 90 0D 80 20 */ stw r0, mRenderModeObj__15mDoMch_render_c(r13) -/* 80258558 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/warningDispDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/warningDispDraw__10dScnLogo_cFv.s deleted file mode 100644 index 878219ddba..0000000000 --- a/asm/d/s/d_s_logo/warningDispDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80256C68: -/* 80256C68 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80256C6C 7C 08 02 A6 */ mflr r0 -/* 80256C70 90 01 00 34 */ stw r0, 0x34(r1) -/* 80256C74 39 61 00 30 */ addi r11, r1, 0x30 -/* 80256C78 48 10 B5 61 */ bl _savegpr_28 -/* 80256C7C 7C 7F 1B 78 */ mr r31, r3 -/* 80256C80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256C84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256C88 3B C3 5F 64 */ addi r30, r3, 0x5f64 -/* 80256C8C 7F C3 F3 78 */ mr r3, r30 -/* 80256C90 3B 9E 01 B4 */ addi r28, r30, 0x1b4 -/* 80256C94 7F 84 E3 78 */ mr r4, r28 -/* 80256C98 3B BE 01 B8 */ addi r29, r30, 0x1b8 -/* 80256C9C 7F A5 EB 78 */ mr r5, r29 -/* 80256CA0 80 DF 01 DC */ lwz r6, 0x1dc(r31) -/* 80256CA4 4B DF FA F1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256CA8 7F C3 F3 78 */ mr r3, r30 -/* 80256CAC 7F 84 E3 78 */ mr r4, r28 -/* 80256CB0 7F A5 EB 78 */ mr r5, r29 -/* 80256CB4 80 DF 01 E0 */ lwz r6, 0x1e0(r31) -/* 80256CB8 4B DF FA DD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256CBC A0 1F 02 10 */ lhz r0, 0x210(r31) -/* 80256CC0 C8 42 B4 F0 */ lfd f2, lit_3940(r2) -/* 80256CC4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80256CC8 3C 60 43 30 */ lis r3, 0x4330 -/* 80256CCC 90 61 00 08 */ stw r3, 8(r1) -/* 80256CD0 C8 01 00 08 */ lfd f0, 8(r1) -/* 80256CD4 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80256CD8 A0 1F 02 0E */ lhz r0, 0x20e(r31) -/* 80256CDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256CE0 90 61 00 10 */ stw r3, 0x10(r1) -/* 80256CE4 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80256CE8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80256CEC EC 21 00 24 */ fdivs f1, f1, f0 -/* 80256CF0 A0 1F 02 12 */ lhz r0, 0x212(r31) -/* 80256CF4 28 00 00 00 */ cmplwi r0, 0 -/* 80256CF8 41 82 00 0C */ beq lbl_80256D04 -/* 80256CFC C0 02 B4 DC */ lfs f0, lit_3934(r2) -/* 80256D00 EC 20 08 28 */ fsubs f1, f0, f1 -lbl_80256D04: -/* 80256D04 C0 02 B4 E8 */ lfs f0, lit_3937(r2) -/* 80256D08 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80256D0C FC 00 00 1E */ fctiwz f0, f0 -/* 80256D10 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80256D14 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80256D18 80 7F 01 E0 */ lwz r3, 0x1e0(r31) -/* 80256D1C 98 03 01 60 */ stb r0, 0x160(r3) -/* 80256D20 A0 7F 02 10 */ lhz r3, 0x210(r31) -/* 80256D24 28 03 00 00 */ cmplwi r3, 0 -/* 80256D28 40 82 00 1C */ bne lbl_80256D44 -/* 80256D2C A0 1F 02 0E */ lhz r0, 0x20e(r31) -/* 80256D30 B0 1F 02 10 */ sth r0, 0x210(r31) -/* 80256D34 A0 1F 02 12 */ lhz r0, 0x212(r31) -/* 80256D38 68 00 00 01 */ xori r0, r0, 1 -/* 80256D3C B0 1F 02 12 */ sth r0, 0x212(r31) -/* 80256D40 48 00 00 0C */ b lbl_80256D4C -lbl_80256D44: -/* 80256D44 38 03 FF FF */ addi r0, r3, -1 -/* 80256D48 B0 1F 02 10 */ sth r0, 0x210(r31) -lbl_80256D4C: -/* 80256D4C A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256D50 28 00 00 00 */ cmplwi r0, 0 -/* 80256D54 41 82 00 18 */ beq lbl_80256D6C -/* 80256D58 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80256D5C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80256D60 80 03 00 34 */ lwz r0, 0x34(r3) -/* 80256D64 70 00 1F 7F */ andi. r0, r0, 0x1f7f -/* 80256D68 41 82 00 44 */ beq lbl_80256DAC -lbl_80256D6C: -/* 80256D6C 38 00 00 02 */ li r0, 2 -/* 80256D70 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256D74 38 00 00 1E */ li r0, 0x1e -/* 80256D78 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256D7C 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256D80 80 63 00 04 */ lwz r3, 4(r3) -/* 80256D84 28 03 00 00 */ cmplwi r3, 0 -/* 80256D88 41 82 00 18 */ beq lbl_80256DA0 -/* 80256D8C 38 80 00 1E */ li r4, 0x1e -/* 80256D90 81 83 00 00 */ lwz r12, 0(r3) -/* 80256D94 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80256D98 7D 89 03 A6 */ mtctr r12 -/* 80256D9C 4E 80 04 21 */ bctrl -lbl_80256DA0: -/* 80256DA0 38 00 00 01 */ li r0, 1 -/* 80256DA4 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80256DA8 98 03 00 15 */ stb r0, 0x15(r3) -lbl_80256DAC: -/* 80256DAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80256DB0 48 10 B4 75 */ bl _restgpr_28 -/* 80256DB4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80256DB8 7C 08 03 A6 */ mtlr r0 -/* 80256DBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80256DC0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/warningInDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/warningInDraw__10dScnLogo_cFv.s deleted file mode 100644 index 44f1de9919..0000000000 --- a/asm/d/s/d_s_logo/warningInDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80256BF4: -/* 80256BF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256BF8 7C 08 02 A6 */ mflr r0 -/* 80256BFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256C00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256C04 7C 7F 1B 78 */ mr r31, r3 -/* 80256C08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256C0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256C10 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256C14 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256C18 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256C1C 80 DF 01 DC */ lwz r6, 0x1dc(r31) -/* 80256C20 4B DF FB 75 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256C24 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256C28 28 00 00 00 */ cmplwi r0, 0 -/* 80256C2C 40 82 00 28 */ bne lbl_80256C54 -/* 80256C30 38 60 00 01 */ li r3, 1 -/* 80256C34 98 7F 02 08 */ stb r3, 0x208(r31) -/* 80256C38 38 00 0D B6 */ li r0, 0xdb6 -/* 80256C3C B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256C40 38 00 00 1E */ li r0, 0x1e -/* 80256C44 B0 1F 02 0E */ sth r0, 0x20e(r31) -/* 80256C48 A0 1F 02 0E */ lhz r0, 0x20e(r31) -/* 80256C4C B0 1F 02 10 */ sth r0, 0x210(r31) -/* 80256C50 B0 7F 02 12 */ sth r3, 0x212(r31) -lbl_80256C54: -/* 80256C54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256C5C 7C 08 03 A6 */ mtlr r0 -/* 80256C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256C64 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/warningOutDraw__10dScnLogo_cFv.s b/asm/d/s/d_s_logo/warningOutDraw__10dScnLogo_cFv.s deleted file mode 100644 index c49ae35aec..0000000000 --- a/asm/d/s/d_s_logo/warningOutDraw__10dScnLogo_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80256DC4: -/* 80256DC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80256DC8 7C 08 02 A6 */ mflr r0 -/* 80256DCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80256DD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80256DD4 7C 7F 1B 78 */ mr r31, r3 -/* 80256DD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80256DDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80256DE0 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80256DE4 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80256DE8 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80256DEC 80 DF 01 DC */ lwz r6, 0x1dc(r31) -/* 80256DF0 4B DF F9 A5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80256DF4 A0 1F 02 0C */ lhz r0, 0x20c(r31) -/* 80256DF8 28 00 00 00 */ cmplwi r0, 0 -/* 80256DFC 40 82 00 38 */ bne lbl_80256E34 -/* 80256E00 38 00 00 5A */ li r0, 0x5a -/* 80256E04 B0 1F 02 0C */ sth r0, 0x20c(r31) -/* 80256E08 38 00 00 03 */ li r0, 3 -/* 80256E0C 98 1F 02 08 */ stb r0, 0x208(r31) -/* 80256E10 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80256E14 80 63 00 04 */ lwz r3, 4(r3) -/* 80256E18 28 03 00 00 */ cmplwi r3, 0 -/* 80256E1C 41 82 00 18 */ beq lbl_80256E34 -/* 80256E20 38 80 00 1E */ li r4, 0x1e -/* 80256E24 81 83 00 00 */ lwz r12, 0(r3) -/* 80256E28 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80256E2C 7D 89 03 A6 */ mtctr r12 -/* 80256E30 4E 80 04 21 */ bctrl -lbl_80256E34: -/* 80256E34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80256E38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80256E3C 7C 08 03 A6 */ mtlr r0 -/* 80256E40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80256E44 4E 80 00 20 */ blr diff --git a/asm/f_pc/f_pc_manager/fpcM_Management__FPFv_vPFv_v.s b/asm/f_pc/f_pc_manager/fpcM_Management__FPFv_vPFv_v.s deleted file mode 100644 index 4914e592f1..0000000000 --- a/asm/f_pc/f_pc_manager/fpcM_Management__FPFv_vPFv_v.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80022158: -/* 80022158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002215C 7C 08 02 A6 */ mflr r0 -/* 80022160 90 01 00 14 */ stw r0, 0x14(r1) -/* 80022164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80022168 93 C1 00 08 */ stw r30, 8(r1) -/* 8002216C 7C 7E 1B 78 */ mr r30, r3 -/* 80022170 7C 9F 23 78 */ mr r31, r4 -/* 80022174 48 24 EC D9 */ bl MtxInit__Fv -/* 80022178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002217C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80022180 3C 63 00 02 */ addis r3, r3, 2 -/* 80022184 38 63 C0 F4 */ addi r3, r3, -16140 -/* 80022188 48 03 3E F9 */ bl peekData__13dDlst_peekZ_cFv -/* 8002218C 48 07 B6 05 */ bl execute__19dShutdownErrorMsg_cFv -/* 80022190 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80022194 40 82 01 0C */ bne lbl_800222A0 -/* 80022198 88 0D 87 B9 */ lbz r0, struct_80450D38+0x1(r13) -/* 8002219C 7C 00 07 75 */ extsb. r0, r0 -/* 800221A0 40 82 00 14 */ bne lbl_800221B4 -/* 800221A4 38 00 00 00 */ li r0, 0 -/* 800221A8 98 0D 87 B8 */ stb r0, struct_80450D38+0x0(r13) -/* 800221AC 38 00 00 01 */ li r0, 1 -/* 800221B0 98 0D 87 B9 */ stb r0, struct_80450D38+0x1(r13) -lbl_800221B4: -/* 800221B4 48 07 B1 A1 */ bl execute__14dDvdErrorMsg_cFv -/* 800221B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800221BC 40 82 00 AC */ bne lbl_80022268 -/* 800221C0 88 0D 87 B8 */ lbz r0, struct_80450D38+0x0(r13) -/* 800221C4 28 00 00 00 */ cmplwi r0, 0 -/* 800221C8 41 82 00 1C */ beq lbl_800221E4 -/* 800221CC 48 01 06 F1 */ bl startTime__11dLib_time_cFv -/* 800221D0 80 6D 85 E0 */ lwz r3, data_80450B60(r13) -/* 800221D4 38 80 00 00 */ li r4, 0 -/* 800221D8 48 28 84 D9 */ bl pauseAllGameSound__10Z2SoundMgrFb -/* 800221DC 38 00 00 00 */ li r0, 0 -/* 800221E0 98 0D 87 B8 */ stb r0, struct_80450D38+0x0(r13) -lbl_800221E4: -/* 800221E4 48 24 10 E5 */ bl cAPIGph_Painter__Fv -/* 800221E8 88 6D 89 44 */ lbz r3, data_80450EC4(r13) -/* 800221EC 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 800221F0 40 82 00 0C */ bne lbl_800221FC -/* 800221F4 4B FF EE E1 */ bl fpcDt_Handler__Fv -/* 800221F8 48 00 00 0C */ b lbl_80022204 -lbl_800221FC: -/* 800221FC 54 60 06 3C */ rlwinm r0, r3, 0, 0x18, 0x1e -/* 80022200 98 0D 89 44 */ stb r0, data_80450EC4(r13) -lbl_80022204: -/* 80022204 48 00 12 25 */ bl fpcPi_Handler__Fv -/* 80022208 4B FF ED 09 */ bl fpcCt_Handler__Fv -/* 8002220C 28 1E 00 00 */ cmplwi r30, 0 -/* 80022210 41 82 00 10 */ beq lbl_80022220 -/* 80022214 7F CC F3 78 */ mr r12, r30 -/* 80022218 7D 89 03 A6 */ mtctr r12 -/* 8002221C 4E 80 04 21 */ bctrl -lbl_80022220: -/* 80022220 3C 60 80 02 */ lis r3, fpcM_Execute__FPv@ha /* 0x800220F8@ha */ -/* 80022224 38 63 20 F8 */ addi r3, r3, fpcM_Execute__FPv@l /* 0x800220F8@l */ -/* 80022228 4B FF F3 41 */ bl fpcEx_Handler__FPFPvPv_i -/* 8002222C 3C 60 80 02 */ lis r3, fpcM_DrawIterater@ha /* 0x800220C0@ha */ -/* 80022230 38 63 20 C0 */ addi r3, r3, fpcM_DrawIterater@l /* 0x800220C0@l */ -/* 80022234 3C 80 80 02 */ lis r4, fpcM_Draw__FPv@ha /* 0x800220A0@ha */ -/* 80022238 38 84 20 A0 */ addi r4, r4, fpcM_Draw__FPv@l /* 0x800220A0@l */ -/* 8002223C 48 00 17 B9 */ bl fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i -/* 80022240 28 1F 00 00 */ cmplwi r31, 0 -/* 80022244 41 82 00 10 */ beq lbl_80022254 -/* 80022248 7F EC FB 78 */ mr r12, r31 -/* 8002224C 7D 89 03 A6 */ mtctr r12 -/* 80022250 4E 80 04 21 */ bctrl -lbl_80022254: -/* 80022254 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80022258 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002225C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80022260 48 00 A8 65 */ bl drawSimpleModel__14dComIfG_play_cFv -/* 80022264 48 00 00 3C */ b lbl_800222A0 -lbl_80022268: -/* 80022268 88 0D 87 B8 */ lbz r0, struct_80450D38+0x0(r13) -/* 8002226C 28 00 00 00 */ cmplwi r0, 0 -/* 80022270 40 82 00 30 */ bne lbl_800222A0 -/* 80022274 48 01 06 0D */ bl stopTime__11dLib_time_cFv -/* 80022278 80 6D 85 E0 */ lwz r3, data_80450B60(r13) -/* 8002227C 38 80 00 01 */ li r4, 1 -/* 80022280 48 28 84 31 */ bl pauseAllGameSound__10Z2SoundMgrFb -/* 80022284 3C 60 80 3E */ lis r3, m_gamePad__8mDoCPd_c@ha /* 0x803DD2D8@ha */ -/* 80022288 80 83 D2 D8 */ lwz r4, m_gamePad__8mDoCPd_c@l(r3) /* 0x803DD2D8@l */ -/* 8002228C 38 64 00 68 */ addi r3, r4, 0x68 -/* 80022290 A8 84 00 7C */ lha r4, 0x7c(r4) -/* 80022294 48 2B F6 B5 */ bl stopPatternedRumble__Q210JUTGamePad7CRumbleFs -/* 80022298 38 00 00 01 */ li r0, 1 -/* 8002229C 98 0D 87 B8 */ stb r0, struct_80450D38+0x0(r13) -lbl_800222A0: -/* 800222A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800222A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800222A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800222AC 7C 08 03 A6 */ mtlr r0 -/* 800222B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800222B4 4E 80 00 20 */ blr diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index 925954c245..3a007a1922 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -77,6 +77,11 @@ public: return 1; } + void setTickRate(u32 rate) { + mTickRate = rate; + mFrameRate = 0; + } + static JFWDisplay* sManager; private: diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 8e68ef8ca8..01fedd9692 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -36,7 +36,7 @@ public: /* 802E755C */ virtual ~JUTConsole(); - void setOutput(u32 output) { mOutput = output; } + void setOutput(unsigned int output) { mOutput = output; } void setPosition(int x, int y) { mPositionX = x; mPositionY = y; diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 456bd345d9..e1b9639df1 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -180,6 +180,8 @@ public: /* 0xF */ s8 field_0xf; }; // Size: 0x10 + void stopMotorWaveHard() { mRumble.stopPatternedRumble(mPortNum); } + struct CRumble { static PADMask sChannelMask[4]; static bool mStatus[4]; diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h index 6445f8f6b2..4f09b34d1e 100644 --- a/include/Z2AudioLib/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr.h @@ -21,7 +21,7 @@ public: void load2ndDynamicWave(); void sceneBgmStart(); void loadStaticWaves(); - bool checkFirstWaves(); + BOOL checkFirstWaves(); void eraseSeWave(u32); void eraseBgmWave(u32); void getWaveLoadStatus(u32, u32); diff --git a/include/c/c_dylink.h b/include/c/c_dylink.h index 6d511b2c12..74734c763e 100644 --- a/include/c/c_dylink.h +++ b/include/c/c_dylink.h @@ -17,4 +17,6 @@ struct DynamicNameTableEntry { char* name; }; +int cDyl_InitAsyncIsDone(); + #endif /* C_C_DYLINK_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 63c4cba892..bea6fd06c7 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -332,7 +332,28 @@ public: JKRArchive* getAnmArchive() { return mAnmArchive; } JKRArchive* getCollectResArchive() { return mCollectResArchive; } JKRArchive* getItemIconArchive() { return mItemIconArchive; } - JKRAramArchive* getFieldMapArchive2() { return mFieldMapArchive2; } + JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; } + + void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; } + void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; } + void setFmapResArchive(JKRArchive* arc) { mFmapResArchive = arc; } + void setDmapResArchive(JKRArchive* arc) { mDmapResArchive = arc; } + void setCollectResArchive(JKRArchive* arc) { mCollectResArchive = arc; } + void setItemIconArchive(JKRArchive* arc) { mItemIconArchive = arc; } + void setAllMapArchive(JKRArchive* arc) { mAllMapArchive = arc; } + void setRingResArchive(JKRArchive* arc) { mRingResArchive = arc; } + void setNameResArchive(JKRArchive* arc) { mNameResArchive = arc; } + void setDemoMsgArchive(JKRArchive* arc) { mDemoMsgArchive = arc; } + void setMeterButtonArchive(JKRArchive* arc) { mMeterButtonArchive = arc; } + void setErrorResArchive(JKRArchive* arc) { mErrorResArchive = arc; } + void setCardIconResArchive(JKRArchive* arc) { mCardIconResArchive = arc; } + void setMsgDtArchive(int i, JKRArchive* arc) { mMsgDtArchive[i] = arc; } + void setMsgCommonArchive(JKRArchive* arc) { mMsgCommonArchive = arc; } + void setMsgArchive(int i, JKRArchive* arc) { mMsgArchive[i] = arc; } + void setFontArchive(JKRArchive* arc) { mFontArchive = arc; } + void setRubyArchive(JKRArchive* arc) { mRubyArchive = arc; } + void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; } + void setItemTable(void* data) { mItemTable = data; } void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; } void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; } @@ -367,7 +388,7 @@ public: /* 0x04780 */ dAttention_c mAttention; /* 0x04C9C */ dVibration_c mVibration; /* 0x04D2C */ u8 field_0x4d2c[4]; - /* 0x04D30 */ JKRAramArchive* mFieldMapArchive2; + /* 0x04D30 */ JKRArchive* mFieldMapArchive2; /* 0x04D34 */ JKRArchive* mMsgArchive[11]; /* 0x04D60 */ JKRArchive* mDemoMsgArchive; /* 0x04D64 */ JKRArchive* mMeterButtonArchive; @@ -615,6 +636,7 @@ void* dComIfG_getStageRes(char const* resName); void* dComIfG_getOldStageRes(char const* resName); void dComIfG_get_timelayer(int* layer); int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName); +int dComIfG_changeOpeningScene(scene_class* scene, s16 procName); inline void dComIfG_setBrightness(u8 brightness) { g_dComIfG_gameInfo.mFadeBrightness = brightness; @@ -1382,6 +1404,86 @@ inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) { return g_dComIfG_gameInfo.play.getMsgDtArchive(idx); } +inline void dComIfGp_setFieldMapArchive2(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setFieldMapArchive2(arc); +} + +inline void dComIfGp_setAnmArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setAnmArchive(arc); +} + +inline void dComIfGp_setFmapResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setFmapResArchive(arc); +} + +inline void dComIfGp_setDmapResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setDmapResArchive(arc); +} + +inline void dComIfGp_setCollectResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setCollectResArchive(arc); +} + +inline void dComIfGp_setItemIconArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setItemIconArchive(arc); +} + +inline void dComIfGp_setAllMapArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setAllMapArchive(arc); +} + +inline void dComIfGp_setRingResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setRingResArchive(arc); +} + +inline void dComIfGp_setNameResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setNameResArchive(arc); +} + +inline void dComIfGp_setDemoMsgArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setDemoMsgArchive(arc); +} + +inline void dComIfGp_setMeterButtonArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setMeterButtonArchive(arc); +} + +inline void dComIfGp_setErrorResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setErrorResArchive(arc); +} + +inline void dComIfGp_setCardIconResArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setCardIconResArchive(arc); +} + +inline void dComIfGp_setMsgDtArchive(int i, JKRArchive* arc) { + g_dComIfG_gameInfo.play.setMsgDtArchive(i, arc); +} + +inline void dComIfGp_setMsgCommonArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setMsgCommonArchive(arc); +} + +inline void dComIfGp_setMsgArchive(int i, JKRArchive* arc) { + g_dComIfG_gameInfo.play.setMsgArchive(i, arc); +} + +inline void dComIfGp_setFontArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setFontArchive(arc); +} + +inline void dComIfGp_setRubyArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setRubyArchive(arc); +} + +inline void dComIfGp_setMain2DArchive(JKRArchive* arc) { + g_dComIfG_gameInfo.play.setMain2DArchive(arc); +} + +inline void dComIfGp_setItemTable(void* data) { + g_dComIfG_gameInfo.play.setItemTable(data); +} + inline JKRExpHeap* dComIfGp_getExpHeap2D() { return g_dComIfG_gameInfo.play.getExpHeap2D(); } @@ -1826,6 +1928,10 @@ inline void dComIfGp_setStartStageLayer(s8 layer) { g_dComIfG_gameInfo.play.setStartStageLayer(layer); } +inline void dComIfGp_drawSimpleModel() { + g_dComIfG_gameInfo.play.drawSimpleModel(); +} + inline dStage_Multi_c* dComIfGp_getMulti() { return g_dComIfG_gameInfo.play.getStage().getMulti(); } @@ -1906,6 +2012,18 @@ inline void dComIfGp_evmng_remove() { g_dComIfG_gameInfo.play.getEvtManager().remove(); } +inline void dComIfGp_particle_createCommon(const void* data) { + g_dComIfG_gameInfo.play.getParticle()->createCommon(data); +} + +inline void dComIfGp_particle_create() { + g_dComIfG_gameInfo.play.createParticle(); +} + +inline JKRExpHeap* dComIfGp_particle_getResHeap() { + return g_dComIfG_gameInfo.play.getParticle()->getResHeap(); +} + inline void dComIfGp_particle_readScene(u8 particle_no, mDoDvdThd_toMainRam_c** param_1) { g_dComIfG_gameInfo.play.getParticle()->readScene(particle_no, param_1); } @@ -2036,6 +2154,10 @@ inline void dComIfGd_init() { g_dComIfG_gameInfo.drawlist.init(); } +inline void dComIfGd_peekZdata() { + g_dComIfG_gameInfo.drawlist.peekZdata(); +} + inline daPy_py_c* daPy_getLinkPlayerActorClass() { return dComIfGp_getLinkPlayer(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 5f68fe598e..54908ab78e 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -1,6 +1,7 @@ #ifndef D_D_DRAWLIST_H #define D_D_DRAWLIST_H +#include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -56,6 +57,24 @@ public: /* 0x10 */ J2DPane* field_0x10; }; +class dDlst_2D_c : public dDlst_base_c { +public: + /* 80053A00 */ dDlst_2D_c(ResTIMG* image, s16 posX, s16 posY, s16 width, s16 height, u8 alpha); + /* 80053A9C */ virtual void draw(); + + void setAlpha(u8 alpha) { mAlpha = alpha; } + J2DPicture* getPicture() { return &mpPicture; } + +private: + /* 0x004 */ u8 field_0x4; + /* 0x008 */ J2DPicture mpPicture; + /* 0x158 */ s16 mPosX; + /* 0x15A */ s16 mPosY; + /* 0x15C */ s16 mSizeX; + /* 0x15E */ s16 mSizeY; + /* 0x160 */ u8 mAlpha; +}; + class dDlst_peekZ_c { public: dDlst_peekZ_c() { field_0x0 = 0; } @@ -145,7 +164,7 @@ public: /* 80055C74 */ int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*); /* 80055F1C */ void addReal(u32, J3DModel*); /* 80055F84 */ int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - /* 80055FE8 */ void setSimpleTex(ResTIMG const*); + /* 80055FE8 */ static void setSimpleTex(ResTIMG const*); static GXTexObj* getSimpleTex() { return &mSimpleTexObj; } @@ -233,6 +252,8 @@ public: void setOpaListBG() { setOpaDrawList(mOpaListBG); } void setXluList2DScreen() { setXluDrawList(mList2DScreen); } + void peekZdata() { mPeekZ.peekData(); } + int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4, f32 param_5, _GXTexObj* param_6) { return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5, diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 028b9b68e9..769e80635b 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -60,8 +60,8 @@ struct CSTControl : public STControl { struct dLib_time_c { /* 80032804 */ void getTime(); - /* 80032880 */ void stopTime(); - /* 800328BC */ void startTime(); + /* 80032880 */ static void stopTime(); + /* 800328BC */ static void startTime(); static u8 m_diffTime[4]; static u8 m_stopTime[4]; diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 6af6485e74..d3467a3ad2 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -10,7 +10,7 @@ class dMpath_c { public: /* 8003F758 */ static u8 isExistMapPathData(); /* 8003F760 */ void getTopBottomFloorNo(s8*, s8*); - /* 8003F7E8 */ void createWork(); + /* 8003F7E8 */ static void createWork(); /* 8003FA40 */ void setPointer(s8, void*, int); /* 8003F810 */ void setPointer(dDrawPath_c::room_class*, s8*, s8*); /* 8003FB70 */ void create(); diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 6c63643051..ff1857407e 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -152,7 +152,11 @@ public: param_9, param_10, param_11, param_12); } + JKRExpHeap* getResHeap() { return m_resHeap; } + static void onStatus(u8 status) { data_80450EC4 |= status; } + static void offStatus(u8 status) { data_80450EC4 &= ~status; } + static bool isStatus(u8 status) { return data_80450EC4 & status; } static u8 mTsubo[64]; static u8 mLifeBall[24]; diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h index a0786737b2..6c8d2e1b91 100644 --- a/include/d/s/d_s_logo.h +++ b/include/d/s/d_s_logo.h @@ -1,6 +1,124 @@ #ifndef D_S_D_S_LOGO_H #define D_S_D_S_LOGO_H +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +class dLog_HIO_c { +public: + /* 802560A4 */ dLog_HIO_c(); + /* 8025855C */ virtual ~dLog_HIO_c(); +}; // Size: 0x8 + +class dScnLogo_c : public scene_class { +public: + enum { + /* 0x0 */ EXEC_WARNING_IN, + /* 0x1 */ EXEC_WARNING_DISP, + /* 0x2 */ EXEC_WARNING_OUT, + /* 0x3 */ EXEC_NINTENDO_IN, + /* 0x4 */ EXEC_NINTENDO_OUT, + /* 0x5 */ EXEC_DOLBY_IN, + /* 0x6 */ EXEC_DOLBY_OUT, + /* 0x7 */ EXEC_DOLBY_OUT2, + /* 0x8 */ EXEC_PROG_IN, + /* 0x9 */ EXEC_PROG_SEL, + /* 0xA */ EXEC_PROG_OUT, + /* 0xB */ EXEC_PROG_SET, + /* 0xC */ EXEC_PROG_SET2, + /* 0xD */ EXEC_PROG_CHANGE, + /* 0xE */ EXEC_DVD_WAIT, + /* 0xF */ EXEC_SCENE_CHANGE, + }; + + /* 802560B4 */ void preLoad_dyl_create(); + /* 802560F8 */ void preLoad_dyl_remove(); + /* 8025611C */ bool preLoad_dyl(); + /* 80256198 */ void checkProgSelect(); + /* 80256210 */ int draw(); + /* 80256264 */ void progInDraw(); + /* 8025631C */ void progSelDraw(); + /* 802568E0 */ void progOutDraw(); + /* 80256A3C */ void progSetDraw(); + /* 80256AC0 */ void progSet2Draw(); + /* 80256B3C */ void progChangeDraw(); + /* 80256BF4 */ void warningInDraw(); + /* 80256C68 */ void warningDispDraw(); + /* 80256DC4 */ void warningOutDraw(); + /* 80256E48 */ void nintendoInDraw(); + /* 80256ECC */ void nintendoOutDraw(); + /* 80256F50 */ void dolbyInDraw(); + /* 80256FD4 */ void dolbyOutDraw(); + /* 80257058 */ void dolbyOutDraw2(); + /* 80257070 */ void dvdWaitDraw(); + /* 80257284 */ void nextSceneChange(); + /* 802572B8 */ ~dScnLogo_c(); + /* 80257AE0 */ int create(); + /* 80257C64 */ void logoInitGC(); + /* 80257FEC */ void dvdDataLoad(); + /* 802584D8 */ void setProgressiveMode(u8); + /* 802584FC */ u8 getProgressiveMode(); + /* 80258520 */ bool isProgressiveMode(); + /* 8025854C */ void setRenderMode(); + +public: + /* 0x1D0 */ JKRExpHeap* field_0x1d0; + /* 0x1D4 */ JKRExpHeap* field_0x1d4; + /* 0x1D8 */ JKRHeap* mpHeap; + /* 0x1DC */ dDlst_2D_c* mWarning; + /* 0x1E0 */ dDlst_2D_c* mWarningStart; + /* 0x1E4 */ dDlst_2D_c* mNintendoLogo; + /* 0x1E8 */ dDlst_2D_c* mDolbyLogo; + /* 0x1EC */ dDlst_2D_c* mProgressiveChoice; + /* 0x1F0 */ dDlst_2D_c* mProgressiveYes; + /* 0x1F4 */ dDlst_2D_c* mProgressiveNo; + /* 0x1F8 */ dDlst_2D_c* mProgressiveSel; + /* 0x1FC */ request_of_phase_process_class* m_preLoad_dylPhase; + /* 0x200 */ ResTIMG* mProgressivePro; + /* 0x204 */ ResTIMG* mProgressiveInter; + /* 0x208 */ u8 mExecCommand; + /* 0x209 */ u8 field_0x209; + /* 0x20A */ u8 field_0x20a; + /* 0x20B */ u8 field_0x20b; + /* 0x20C */ u16 mTimer; + /* 0x20E */ u16 field_0x20e; + /* 0x210 */ u16 field_0x210; + /* 0x212 */ u16 field_0x212; + /* 0x214 */ u16 field_0x214; + /* 0x218 */ u32 field_0x218; + /* 0x21C */ void* buffer; + /* 0x220 */ mDoDvdThd_mountXArchive_c* mpField0Command; + /* 0x224 */ mDoDvdThd_mountXArchive_c* mpAlAnmCommand; + /* 0x228 */ u8 field_0x228[4]; + /* 0x22C */ mDoDvdThd_mountXArchive_c* mpFmapResCommand; + /* 0x230 */ mDoDvdThd_mountXArchive_c* mpDmapResCommand; + /* 0x234 */ mDoDvdThd_mountXArchive_c* mpCollectResCommand; + /* 0x238 */ u8 field_0x238[4]; + /* 0x23C */ mDoDvdThd_mountXArchive_c* mpItemIconCommand; + /* 0x240 */ mDoDvdThd_mountXArchive_c* mpRingResCommand; + /* 0x244 */ u8 field_0x244[4]; + /* 0x248 */ mDoDvdThd_mountXArchive_c* mpPlayerNameCommand; + /* 0x24C */ mDoDvdThd_mountXArchive_c* mpItemInfResCommand; + /* 0x250 */ mDoDvdThd_mountXArchive_c* mpButtonCommand; + /* 0x254 */ u8 field_0x254[4]; + /* 0x258 */ mDoDvdThd_mountXArchive_c* mpCardIconCommand; + /* 0x25C */ mDoDvdThd_mountXArchive_c* mpBmgResCommand; + /* 0x260 */ mDoDvdThd_mountXArchive_c* mpMsgComCommand; + /* 0x264 */ mDoDvdThd_mountXArchive_c* mpMsgResCommand[7]; + /* 0x280 */ u8 field_0x280[0x10]; + /* 0x290 */ mDoDvdThd_mountXArchive_c* mpFontResCommand; + /* 0x294 */ mDoDvdThd_mountXArchive_c* mpMain2DCommand; + /* 0x298 */ mDoDvdThd_mountXArchive_c* mpRubyResCommand; + /* 0x29C */ mDoDvdThd_toMainRam_c* mParticleCommand; + /* 0x2A0 */ mDoDvdThd_toMainRam_c* mItemTableCommand; + /* 0x2A4 */ mDoDvdThd_toMainRam_c* mEnemyItemCommand; +}; + +static int phase_0(dScnLogo_c* logo); +static int phase_1(dScnLogo_c* logo); +static int phase_2(dScnLogo_c* logo); + +template +T cLib_calcTimer(T* val); + #endif /* D_S_D_S_LOGO_H */ diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index d4e3f8f4ed..fb812dbf8d 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -68,6 +68,9 @@ public: static bool isPause() { return struct_80451124 == 0; } static void setPauseTimer(s8 time) { data_80451125 = time; } + + /* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0; + /* 0x1D4 */ u8 field_0x1d4; }; #endif /* D_S_D_S_PLAY_H */ diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index b68fae10d8..9efba5f2c1 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -22,8 +22,6 @@ public: /* 0x1B4 */ u8 field_0x1b4[0x10]; /* 0x1C4 */ request_of_phase_process_class field_0x1c4; /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; - /* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0; - /* 0x1D4 */ u8 field_0x1d4; }; #endif \ No newline at end of file diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index f71009a5f8..6d5fbb611c 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -38,7 +38,7 @@ inline s32 fpcM_ChangeLayerID(void* proc, int layerID) { void fpcM_Draw(void* pProc); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); -void fpcM_Execute(void* pProc); +s32 fpcM_Execute(void* pProc); s32 fpcM_Delete(void* pProc); BOOL fpcM_IsCreating(unsigned int pID); void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2); diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 262554724b..3045816bd8 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -35,6 +35,8 @@ public: mResetData->mResetPrepare = 0; } static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; } + static u8 getProgSeqFlag() { return mResetData->mProgSeqFlag; } + static u8 getWarningDispFlag() { return mResetData->mWarningDispFlag; } static BOOL isReturnToMenu() { return mResetData->mReturnToMenu; } static bool isShutdown() { return mResetData->mShutdown; } static int isReset() { return mResetData->mReset; } diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 5095b82aa4..c5ee806886 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -23,6 +23,7 @@ public: ~mDoAud_zelAudio_c() {} static void onInitFlag() { struct_80450BB8 = true; } + static bool isInitFlag() { return struct_80450BB8; } static bool isResetFlag() { return sResetFlag; } static void onResetFlag() { sResetFlag = true; } static void offResetFlag() { sResetFlag = false; } diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index 12e87d80bd..31cfd81b4a 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -59,6 +59,7 @@ public: static f32 getAnalogR(u32 pad) { return getCpadInfo(pad).mTriggerRight; } static f32 getAnalogL(u32 pad) { return getCpadInfo(pad).mTriggerLeft; } static BOOL isConnect(u32 pad) { return JUTGamePad::getPortStatus(pad) == 0; } + static void stopMotorWaveHard(u32 pad) { return m_gamePad[pad]->stopMotorWaveHard(); } static JUTGamePad* m_gamePad[4]; static interface_of_controller_pad m_cpadInfo[4]; diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h index 8d8097ad98..fa95ed7347 100644 --- a/include/m_Do/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread.h @@ -28,6 +28,8 @@ public: /* 8001645C */ virtual ~mDoDvdThd_toMainRam_c(); /* 800164BC */ virtual s32 execute(); + void* getMemAddress() const { return mData; } + private: /* 0x14 */ u8 mMountDirection; /* 0x18 */ s32 mEntryNum; @@ -61,6 +63,8 @@ public: JKRHeap*); /* 800162B0 */ virtual s32 execute(); + JKRArchive* getArchive() const { return mArchive; } + private: /* 0x14 */ u8 mMountDirection; /* 0x18 */ s32 mEntryNum; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 76cd28eb34..8902e23641 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -228,9 +228,12 @@ JKRHeap* mDoExt_getCurrentHeap(); void mDoExt_removeMesgFont(); void mDoExt_modelUpdateDL(J3DModel*); J3DModel* mDoExt_J3DModel__create(J3DModelData*, u32, u32); +void mDoExt_setAraCacheSize(u32 param_0); struct JUTFont; JUTFont* mDoExt_getMesgFont(); +void mDoExt_getSubFont(); +void mDoExt_getRubyFont(); extern JKRExpHeap* zeldaHeap; extern JKRExpHeap* gameHeap; diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 01fa2efbf9..dee9991aa0 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -47,6 +47,8 @@ public: static void endFrame() { JFWDisplay::getManager()->endFrame(); } static void offFade() { data_80450BE6 = 0; } static void offBlure() { struct_80450BE4 = 0; } + static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); } + static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); } static GXTexObj mFrameBufferTexObj; static GXTexObj mZbufferTexObj; diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 4a54d8b5de..5871f47a9c 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -15,8 +15,13 @@ void exceptionRestart(); void myExceptionCallback(u16, OSContext*, u32, u32); void my_SysPrintHeap(char const*, void*, u32); +extern GXRenderModeObj g_ntscZeldaProg; + class mDoMch_render_c { public: + static void setRenderModeObj(GXRenderModeObj* obj) { mRenderModeObj = obj; } + static void setProgressiveMode() { setRenderModeObj(&g_ntscZeldaProg); } + static GXRenderModeObj* getRenderModeObj() { return mRenderModeObj; } static GXRenderModeObj* mRenderModeObj; diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 99f61d824d..e128658047 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -1070,7 +1070,7 @@ asm void Z2SceneMgr::loadStaticWaves() { #pragma pop /* 802BA5C0-802BA5C8 2B4F00 0008+00 0/0 1/1 0/0 .text checkFirstWaves__10Z2SceneMgrFv */ -bool Z2SceneMgr::checkFirstWaves() { +BOOL Z2SceneMgr::checkFirstWaves() { return false; } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 200e2f485b..4833a9c046 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -44,11 +44,6 @@ struct dDlst_2Dm_c { /* 8005312C */ void draw(); }; -struct dDlst_2D_c { - /* 80053A00 */ dDlst_2D_c(ResTIMG*, s16, s16, s16, s16, u8); - /* 80053A9C */ void draw(); -}; - struct dDlst_2DTri_c { /* 80051AF0 */ void draw(); }; @@ -102,13 +97,6 @@ struct J3DUClipper { /* 80273A44 */ void clip(f32 const (*)[4], Vec*, Vec*) const; }; -struct J2DPicture { - /* 800539DC */ void getTexture(u8) const; - /* 80053C44 */ void setWhite(JUtility::TColor); - /* 80053C6C */ void setBlack(JUtility::TColor); - /* 802FC050 */ J2DPicture(); -}; - // // Forward References: // @@ -2156,7 +2144,8 @@ asm dDlst_2D_c::dDlst_2D_c(ResTIMG* param_0, s16 param_1, s16 param_2, s16 param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_2D_c::draw() { +// asm void dDlst_2D_c::draw() { +extern "C" asm void draw__10dDlst_2D_cFv() { nofralloc #include "asm/d/d_drawlist/draw__10dDlst_2D_cFv.s" } diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index f672982e0a..29af0cfc34 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -72,12 +72,6 @@ struct dMeterHaihai_c { /* 8020BC20 */ void setScale(f32); }; -struct J2DPicture { - /* 801BDD40 */ void append(ResTIMG const*, f32); - /* 801BDD70 */ void insert(ResTIMG const*, u8, f32); - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - struct JMSMesgEntry_c {}; struct dMeter2Info_c { diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index ac37784aa4..7e1081a6d6 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -4,185 +4,23 @@ // #include "d/s/d_s_logo.h" +#include "JSystem/JKernel/JKRAram.h" +#include "c/c_dylink.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_machine.h" // // Types: // -struct scene_class {}; +class dEnemyItem_c { +public: + static void setItemData(u8* data) { mData = data; } -struct request_of_phase_process_class {}; - -struct mDoRst { - static u8 mResetData[4 + 4 /* padding */]; -}; - -struct mDoMch_render_c { - static void* mRenderModeObj[1 + 1 /* padding */]; -}; - -struct mDoGph_gInf_c { - static u8 mFader[4]; -}; - -struct JKRHeap { - /* 802CE438 */ void becomeCurrentHeap(); - /* 802CE448 */ void destroy(); - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE500 */ void free(void*, JKRHeap*); -}; - -struct mDoDvdThd_toMainRam_c { - /* 80016394 */ void create(char const*, u8, JKRHeap*); -}; - -struct JKRArchive { - struct EMountMode {}; -}; - -struct mDoDvdThd_mountXArchive_c { - /* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*); -}; - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dTres_c { - /* 8009BBD8 */ void createWork(); -}; - -struct dScnLogo_c { - /* 802560B4 */ void preLoad_dyl_create(); - /* 802560F8 */ void preLoad_dyl_remove(); - /* 8025611C */ void preLoad_dyl(); - /* 80256198 */ void checkProgSelect(); - /* 80256210 */ void draw(); - /* 80256264 */ void progInDraw(); - /* 8025631C */ void progSelDraw(); - /* 802568E0 */ void progOutDraw(); - /* 80256A3C */ void progSetDraw(); - /* 80256AC0 */ void progSet2Draw(); - /* 80256B3C */ void progChangeDraw(); - /* 80256BF4 */ void warningInDraw(); - /* 80256C68 */ void warningDispDraw(); - /* 80256DC4 */ void warningOutDraw(); - /* 80256E48 */ void nintendoInDraw(); - /* 80256ECC */ void nintendoOutDraw(); - /* 80256F50 */ void dolbyInDraw(); - /* 80256FD4 */ void dolbyOutDraw(); - /* 80257058 */ void dolbyOutDraw2(); - /* 80257070 */ void dvdWaitDraw(); - /* 80257284 */ void nextSceneChange(); - /* 802572B8 */ ~dScnLogo_c(); - /* 80257AE0 */ void create(); - /* 80257C64 */ void logoInitGC(); - /* 80257FEC */ void dvdDataLoad(); - /* 802584D8 */ void setProgressiveMode(u8); - /* 802584FC */ void getProgressiveMode(); - /* 80258520 */ void isProgressiveMode(); - /* 8025854C */ void setRenderMode(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C078 */ void setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); - /* 8003C194 */ void deleteRes(char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); - /* 8003C470 */ void syncAllRes(dRes_info_c*, int); -}; - -struct dPa_control_c { - /* 8004BB78 */ void createCommon(void const*); -}; - -struct dMpath_c { - /* 8003F7E8 */ void createWork(); -}; - -struct dLog_HIO_c { - /* 802560A4 */ dLog_HIO_c(); - /* 8025855C */ ~dLog_HIO_c(); -}; - -struct dEnemyItem_c { - static u8 mData[4 + 4 /* padding */]; -}; - -struct ResTIMG {}; - -struct dDlst_shadowControl_c { - /* 80055FE8 */ void setSimpleTex(ResTIMG const*); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct dDlst_2D_c { - /* 80053A00 */ dDlst_2D_c(ResTIMG*, s16, s16, s16, s16, u8); -}; - -struct dComIfG_play_c { - /* 8002C9D8 */ void createParticle(); -}; - -struct cDylPhs { - /* 8001884C */ void Link(request_of_phase_process_class*, s16); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2SceneMgr { - /* 802BA56C */ void loadStaticWaves(); - /* 802BA5C0 */ bool checkFirstWaves(); -}; - -struct Z2AudioMgr { - /* 802CD974 */ void resetProcess(u32, bool); - - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTGamePad { - struct C3ButtonReset { - static u8 sCallback[4]; - static u8 sCallbackArg[4 + 4 /* padding */]; - }; -}; - -struct JKRExpHeap { - /* 802CEF00 */ void create(void*, u32, JKRHeap*, bool); - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - -struct JKRAramHeap { - /* 802D31AC */ void getTotalFreeSize(); -}; - -struct JKRAram { - static u8 sAramObject[4]; -}; - -struct JFWDisplay { - /* 80272C60 */ void waitBlanking(int); - - static u8 sManager[4]; -}; - -struct J2DPicture { - /* 802FCFF0 */ ~J2DPicture(); + static u8* mData; }; // @@ -229,7 +67,7 @@ extern "C" void getProgressiveMode__10dScnLogo_cFv(); extern "C" void isProgressiveMode__10dScnLogo_cFv(); extern "C" void setRenderMode__10dScnLogo_cFv(); extern "C" void __dt__10dLog_HIO_cFv(); -extern "C" void func_802585A4(void* _this, u16*); +extern "C" void func_802585A4(u16*); extern "C" void __sinit_d_s_logo_cpp(); extern "C" extern char const* const d_s_d_s_logo__stringBase0; @@ -237,7 +75,6 @@ extern "C" extern char const* const d_s_d_s_logo__stringBase0; // External References: // -SECTION_INIT void memset(); extern "C" void mDoExt_getGameHeap__Fv(); extern "C" void mDoExt_getJ2dHeap__Fv(); extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); @@ -282,9 +119,9 @@ extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); extern "C" void create__10JKRExpHeapFPvUlP7JKRHeapb(); extern "C" void getTotalFreeSize__11JKRAramHeapFv(); extern "C" void __dt__10J2DPictureFv(); -extern "C" void OSGetProgressiveMode(); -extern "C" void OSSetProgressiveMode(); -extern "C" void VIGetDTVStatus(); +extern "C" u32 OSGetProgressiveMode(); +extern "C" void OSSetProgressiveMode(u32); +extern "C" u32 VIGetDTVStatus(); extern "C" void __register_global_object(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_26(); @@ -295,17 +132,12 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 g_ntscZeldaProg[60]; extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__10dDlst_2D_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 struct_80450BB8[4]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 archiveHeap[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; extern "C" u8 sManager__10JFWDisplay[4]; @@ -313,7 +145,6 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sAramObject__7JKRAram[4]; extern "C" u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; // // Declarations: @@ -325,188 +156,741 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803C2E44-803C2E50 -00001 000C+00 0/1 0/0 0/0 .data @3737 */ +/* 804510E8-804510F0 0005E8 0008+00 1/1 0/0 0/0 .sbss g_LogHIO */ +static dLog_HIO_c g_LogHIO; + +typedef void (dScnLogo_c::*execFunc)(); +SECTION_DATA static execFunc l_execFunc[16] = { + &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, + &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, + &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, + &dScnLogo_c::progSelDraw, &dScnLogo_c::progOutDraw, &dScnLogo_c::progSetDraw, + &dScnLogo_c::progSet2Draw, &dScnLogo_c::progChangeDraw, &dScnLogo_c::dvdWaitDraw, + &dScnLogo_c::nextSceneChange, +}; + +/* 802560A4-802560B4 2509E4 0010+00 1/1 0/0 0/0 .text __ct__10dLog_HIO_cFv */ +dLog_HIO_c::dLog_HIO_c() {} + +/* 802560B4-802560F8 2509F4 0044+00 1/1 0/0 0/0 .text preLoad_dyl_create__10dScnLogo_cFv + */ +void dScnLogo_c::preLoad_dyl_create() { + m_preLoad_dylPhase = new request_of_phase_process_class[14]; + memset(m_preLoad_dylPhase, 0, sizeof(request_of_phase_process_class) * 14); +} + +/* 802560F8-8025611C 250A38 0024+00 1/1 0/0 0/0 .text preLoad_dyl_remove__10dScnLogo_cFv + */ +void dScnLogo_c::preLoad_dyl_remove() { + delete[] m_preLoad_dylPhase; +} + +/* ############################################################################################## */ +/* 80399FE0-80399FFC 026640 001C+00 1/1 0/0 0/0 .rodata l_preLoad_dylKeyTbl */ +SECTION_RODATA static s16 const l_preLoad_dylKeyTbl[14] = { + 0x02DC, 0x02CE, 0x0221, 0x00F2, 0x021B, 0x02F4, 0x0139, + 0x015A, 0x02E4, 0x00FE, 0x0308, 0x030F, 0x00FF, 0x013F, +}; +COMPILER_STRIP_GATE(0x80399FE0, &l_preLoad_dylKeyTbl); + +/* 8025611C-80256198 250A5C 007C+00 2/2 0/0 0/0 .text preLoad_dyl__10dScnLogo_cFv */ +bool dScnLogo_c::preLoad_dyl() { + bool ret = 1; + + for (int i = 0; i < 14; i++) { + int link = cDylPhs::Link(&m_preLoad_dylPhase[i], l_preLoad_dylKeyTbl[i]); + + if (link != 4) { + ret = 0; + } + } + + return ret; +} + +/* 80256198-80256210 250AD8 0078+00 1/1 0/0 0/0 .text checkProgSelect__10dScnLogo_cFv */ +void dScnLogo_c::checkProgSelect() { + if (mDoRst::getProgSeqFlag() == 0 && VIGetDTVStatus() != 0) { + if (isProgressiveMode() || mDoCPd_c::getHoldB(0)) { + field_0x20a = 1; + field_0x209 = 0; + } + } +} + +/* 80256210-80256264 250B50 0054+00 1/1 0/0 0/0 .text draw__10dScnLogo_cFv */ +int dScnLogo_c::draw() { + cLib_calcTimer(&mTimer); + (this->*l_execFunc[mExecCommand])(); + return 1; +} + +/* 80256264-8025631C 250BA4 00B8+00 1/0 0/0 0/0 .text progInDraw__10dScnLogo_cFv */ +void dScnLogo_c::progInDraw() { + dComIfGd_set2DOpa(mProgressiveChoice); + dComIfGd_set2DOpa(mProgressiveYes); + dComIfGd_set2DOpa(mProgressiveNo); + + if (mTimer == 0) { + mExecCommand = EXEC_PROG_SEL; + mTimer = 600; + field_0x20e = 30; + field_0x210 = field_0x20e; + field_0x212 = 0; + field_0x20b = 0; + } +} + +/* 8025631C-802568E0 250C5C 05C4+00 1/0 0/0 0/0 .text progSelDraw__10dScnLogo_cFv */ +void dScnLogo_c::progSelDraw() { + dComIfGd_set2DOpa(mProgressiveChoice); + dComIfGd_set2DOpa(mProgressiveYes); + dComIfGd_set2DOpa(mProgressiveNo); + + if (field_0x20b == 0) { + if (field_0x209 == 0) { + if (mDoCPd_c::getHoldRight(0) || mDoCPd_c::getStickX(0) > 0.5f) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + field_0x209 = 1; + field_0x20e = 30; + field_0x210 = field_0x20e; + field_0x212 = 0; + } + } else { + if (mDoCPd_c::getHoldLeft(0) || mDoCPd_c::getStickX(0) < -0.5f) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + field_0x209 = 0; + field_0x20e = 30; + field_0x210 = field_0x20e; + field_0x212 = 0; + } + } + + if (mDoCPd_c::getTrigA(0) || mTimer == 0) { + if (field_0x209 == 0) { + mProgressiveSel->getPicture()->changeTexture(mProgressivePro, 0); + setProgressiveMode(1); + mDoRst::setProgChgFlag(1); + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + } else { + mProgressiveSel->getPicture()->changeTexture(mProgressiveInter, 0); + setProgressiveMode(0); + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + } + + if (mTimer > 540) { + field_0x20b = 1; + field_0x214 = mTimer - 540; + } else { + mExecCommand = EXEC_PROG_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(mTimer); + field_0x20e = 30; + field_0x210 = field_0x20e; + field_0x212 = 0; + } + mDoRst::setProgSeqFlag(1); + } + } else { + if (field_0x214 == 0) { + mExecCommand = EXEC_PROG_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + field_0x20e = 30; + field_0x210 = field_0x20e; + field_0x212 = 0; + } else { + field_0x214--; + } + } + + f32 alpha = (f32)field_0x210 / (f32)field_0x20e; + if (field_0x212 != 0) { + alpha = 1.0f - alpha; + } + u8 r = alpha * 255.0f; + u8 g = alpha * 200.0f; + + if (field_0x209 != 0) { + mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); + mProgressiveYes->getPicture()->setBlack(JUtility::TColor(0, 0, 0, 0)); + + mProgressiveNo->getPicture()->setWhite(JUtility::TColor(255, 200, 0, 255)); + mProgressiveNo->getPicture()->setBlack(JUtility::TColor(r, g, 0, 0)); + } else { + mProgressiveYes->getPicture()->setWhite(JUtility::TColor(255, 200, 0, 255)); + mProgressiveYes->getPicture()->setBlack(JUtility::TColor(r, g, 0, 0)); + + mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); + mProgressiveNo->getPicture()->setBlack(JUtility::TColor(0, 0, 0, 0)); + } + + if (field_0x210 == 0) { + field_0x210 = field_0x20e; + field_0x212 ^= 1; + } else { + field_0x210--; + } +} + +/* 802568E0-80256A3C 251220 015C+00 1/0 0/0 0/0 .text progOutDraw__10dScnLogo_cFv */ +void dScnLogo_c::progOutDraw() { + dComIfGd_set2DOpa(mProgressiveChoice); + dComIfGd_set2DOpa(mProgressiveYes); + dComIfGd_set2DOpa(mProgressiveNo); + + if (mTimer == 0) { + if (field_0x218 != 0 && field_0x209 == 0) { + mExecCommand = EXEC_PROG_CHANGE; + mTimer = 150; + } else if (field_0x218 == 0 && field_0x209 != 0) { + if (mDoRst::getWarningDispFlag() != 0) { + mTimer = 90; + mExecCommand = EXEC_NINTENDO_IN; + } else { + mTimer = 120; + mExecCommand = EXEC_WARNING_IN; + } + + mDoGph_gInf_c::startFadeIn(30); + } else { + mExecCommand = EXEC_PROG_SET; + mTimer = 150; + mDoGph_gInf_c::startFadeIn(30); + } + } +} + +/* 80256A3C-80256AC0 25137C 0084+00 1/0 0/0 0/0 .text progSetDraw__10dScnLogo_cFv */ +void dScnLogo_c::progSetDraw() { + dComIfGd_set2DOpa(mProgressiveSel); + + if (mTimer == 0) { + mExecCommand = EXEC_PROG_SET2; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +/* 80256AC0-80256B3C 251400 007C+00 1/0 0/0 0/0 .text progSet2Draw__10dScnLogo_cFv */ +void dScnLogo_c::progSet2Draw() { + dComIfGd_set2DOpa(mProgressiveSel); + + if (mTimer == 0) { + if (getProgressiveMode() != 0) { + mTimer = 150; + } else { + mTimer = 30; + } + + mExecCommand = EXEC_PROG_CHANGE; + } +} + +/* 80256B3C-80256BF4 25147C 00B8+00 1/0 0/0 0/0 .text progChangeDraw__10dScnLogo_cFv */ +void dScnLogo_c::progChangeDraw() { + if (getProgressiveMode() != 0 && mTimer == 90 && field_0x209 == 0) { + setRenderMode(); + } + + if (mTimer == 0) { + if (mDoRst::getWarningDispFlag() != 0) { + mTimer = 90; + mExecCommand = EXEC_NINTENDO_IN; + } else { + mTimer = 120; + mExecCommand = EXEC_WARNING_IN; + } + + mDoGph_gInf_c::startFadeIn(30); + } +} + +/* 80256BF4-80256C68 251534 0074+00 1/0 0/0 0/0 .text warningInDraw__10dScnLogo_cFv */ +void dScnLogo_c::warningInDraw() { + dComIfGd_set2DOpa(mWarning); + + if (mTimer == 0) { + mExecCommand = EXEC_WARNING_DISP; + mTimer = 3510; + field_0x20e = 30; + field_0x210 = field_0x20e; + field_0x212 = 1; + } +} + +/* 80256C68-80256DC4 2515A8 015C+00 1/0 0/0 0/0 .text warningDispDraw__10dScnLogo_cFv */ +void dScnLogo_c::warningDispDraw() { + dComIfGd_set2DOpa(mWarning); + dComIfGd_set2DOpa(mWarningStart); + + f32 alpha = (f32)field_0x210 / (f32)field_0x20e; + if (field_0x212 != 0) { + alpha = 1.0f - alpha; + } + + mWarningStart->setAlpha(255.0f * alpha); + if (field_0x210 == 0) { + field_0x210 = field_0x20e; + field_0x212 ^= 1; + } else { + field_0x210--; + } + + if (mTimer == 0 || + mDoCPd_c::getTrig(0) & (CButton::A | CButton::B | CButton::X | CButton::Y | CButton::START | + CButton::Z | CButton::L | CButton::R | CButton::DPAD_LEFT | + CButton::DPAD_RIGHT | CButton::DPAD_DOWN | CButton::DPAD_UP)) { + mExecCommand = EXEC_WARNING_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + mDoRst::setWarningDispFlag(1); + } +} + +/* 80256DC4-80256E48 251704 0084+00 1/0 0/0 0/0 .text warningOutDraw__10dScnLogo_cFv */ +void dScnLogo_c::warningOutDraw() { + dComIfGd_set2DOpa(mWarning); + + if (mTimer == 0) { + mTimer = 90; + mExecCommand = EXEC_NINTENDO_IN; + mDoGph_gInf_c::startFadeIn(30); + } +} + +/* 80256E48-80256ECC 251788 0084+00 1/0 0/0 0/0 .text nintendoInDraw__10dScnLogo_cFv */ +void dScnLogo_c::nintendoInDraw() { + dComIfGd_set2DOpa(mNintendoLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_NINTENDO_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +/* 80256ECC-80256F50 25180C 0084+00 1/0 0/0 0/0 .text nintendoOutDraw__10dScnLogo_cFv */ +void dScnLogo_c::nintendoOutDraw() { + dComIfGd_set2DOpa(mNintendoLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_DOLBY_IN; + mTimer = 90; + mDoGph_gInf_c::startFadeIn(30); + } +} + +/* 80256F50-80256FD4 251890 0084+00 1/0 0/0 0/0 .text dolbyInDraw__10dScnLogo_cFv */ +void dScnLogo_c::dolbyInDraw() { + dComIfGd_set2DOpa(mDolbyLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_DOLBY_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +/* 80256FD4-80257058 251914 0084+00 1/0 0/0 0/0 .text dolbyOutDraw__10dScnLogo_cFv */ +void dScnLogo_c::dolbyOutDraw() { + dComIfGd_set2DOpa(mDolbyLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_DOLBY_OUT2; + mTimer = 30; + mDoGph_gInf_c::startFadeIn(30); + } +} + +/* 80257058-80257070 251998 0018+00 1/0 0/0 0/0 .text dolbyOutDraw2__10dScnLogo_cFv */ +void dScnLogo_c::dolbyOutDraw2() { + if (mTimer != 0) { + return; + } + mExecCommand = EXEC_DVD_WAIT; +} + +/* 80257070-80257284 2519B0 0214+00 1/0 0/0 0/0 .text dvdWaitDraw__10dScnLogo_cFv */ +void dScnLogo_c::dvdWaitDraw() { + if (!dComIfG_syncAllObjectRes()) { + if (mpField0Command->sync() && mpAlAnmCommand->sync() && mpFmapResCommand->sync() && + mpDmapResCommand->sync() && mpCollectResCommand->sync() && mpItemIconCommand->sync() && + mpRingResCommand->sync() && mpPlayerNameCommand->sync() && + mpItemInfResCommand->sync() && mpButtonCommand->sync() && mpCardIconCommand->sync() && + mpBmgResCommand->sync() && mpMsgComCommand->sync() && mpMsgResCommand[0]->sync() && + mpMsgResCommand[1]->sync() && mpMsgResCommand[2]->sync() && + mpMsgResCommand[3]->sync() && mpMsgResCommand[4]->sync() && + mpMsgResCommand[5]->sync() && mpMsgResCommand[6]->sync() && mpFontResCommand->sync() && + mpMain2DCommand->sync() && mpRubyResCommand->sync() && mParticleCommand->sync() && + mItemTableCommand->sync() && mEnemyItemCommand->sync() && preLoad_dyl()) { + mDoRst::setLogoScnFlag(0); + mDoRst::setProgChgFlag(0); + mExecCommand = EXEC_SCENE_CHANGE; + } + } +} + +/* 80257284-802572B8 251BC4 0034+00 1/0 0/0 0/0 .text nextSceneChange__10dScnLogo_cFv */ +void dScnLogo_c::nextSceneChange() { + if (!mDoRst::isReset()) { + dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + } +} + +/* 802572B8-80257910 251BF8 0658+00 1/1 0/0 0/0 .text __dt__10dScnLogo_cFv */ +dScnLogo_c::~dScnLogo_c() { + if (mDoRst::isReset()) { + if (mDoAud_zelAudio_c::isInitFlag()) { + Z2AudioMgr::getInterface()->resetProcess(5, true); + } + mDoRst_reset(0, 0x80000000, 0); + } + + delete mNintendoLogo; + delete mWarning; + delete mWarningStart; + delete mDolbyLogo; + delete mProgressiveChoice; + delete mProgressiveYes; + delete mProgressiveNo; + delete mProgressiveSel; + + preLoad_dyl_remove(); + dComIfG_deleteObjectResMain("LogoUs"); + + field_0x1d4->destroy(); + field_0x1d0->destroy(); + JKRFree(buffer); + + dComIfGp_particle_createCommon(mParticleCommand->getMemAddress()); + dComIfGp_setFieldMapArchive2(mpField0Command->getArchive()); + dComIfGp_setAnmArchive(mpAlAnmCommand->getArchive()); + dComIfGp_setFmapResArchive(mpFmapResCommand->getArchive()); + dComIfGp_setDmapResArchive(mpDmapResCommand->getArchive()); + dComIfGp_setCollectResArchive(mpCollectResCommand->getArchive()); + dComIfGp_setItemIconArchive(mpItemIconCommand->getArchive()); + dComIfGp_setAllMapArchive(NULL); + dComIfGp_setRingResArchive(mpRingResCommand->getArchive()); + dComIfGp_setNameResArchive(mpPlayerNameCommand->getArchive()); + dComIfGp_setDemoMsgArchive(mpItemInfResCommand->getArchive()); + dComIfGp_setMeterButtonArchive(mpButtonCommand->getArchive()); + dComIfGp_setErrorResArchive(NULL); + dComIfGp_setCardIconResArchive(mpCardIconCommand->getArchive()); + dComIfGp_setMsgDtArchive(0, mpBmgResCommand->getArchive()); + dComIfGp_setMsgCommonArchive(mpMsgComCommand->getArchive()); + for (int i = 0; i < 7; i++) { + dComIfGp_setMsgArchive(i, mpMsgResCommand[i]->getArchive()); + } + dComIfGp_setFontArchive(mpFontResCommand->getArchive()); + dComIfGp_setRubyArchive(mpRubyResCommand->getArchive()); + dComIfGp_setMain2DArchive(mpMain2DCommand->getArchive()); + + mpField0Command->destroy(); + mpAlAnmCommand->destroy(); + mpFmapResCommand->destroy(); + mpDmapResCommand->destroy(); + mpCollectResCommand->destroy(); + mpItemIconCommand->destroy(); + mpRingResCommand->destroy(); + mpPlayerNameCommand->destroy(); + mpItemInfResCommand->destroy(); + mpButtonCommand->destroy(); + mpCardIconCommand->destroy(); + mpBmgResCommand->destroy(); + mpMsgComCommand->destroy(); + for (int i = 0; i < 7; i++) { + mpMsgResCommand[i]->destroy(); + } + mpFontResCommand->destroy(); + mpMain2DCommand->destroy(); + mpRubyResCommand->destroy(); + mParticleCommand->destroy(); + + JKRAramHeap* aram_heap = JKRAram::getAramHeap(); + u32 free_size = aram_heap->getTotalFreeSize(); + mDoExt_getMesgFont(); + mDoExt_getSubFont(); + mDoExt_getRubyFont(); + mDoExt_setAraCacheSize(free_size - aram_heap->getTotalFreeSize()); + + dComIfGp_setItemTable(mItemTableCommand->getMemAddress()); + mItemTableCommand->destroy(); + + dEnemyItem_c::setItemData((u8*)mEnemyItemCommand->getMemAddress()); + mEnemyItemCommand->destroy(); + + dDlst_shadowControl_c::setSimpleTex((ResTIMG*)dComIfG_getObjectRes("Always", 0x4A)); + dTres_c::createWork(); + dMpath_c::createWork(); +} + +/* 80257910-802579BC 252250 00AC+00 1/0 0/0 0/0 .text phase_0__FP10dScnLogo_c */ +// setFadeColor instruction reordering +#ifdef NONMATCHING +static int phase_0(dScnLogo_c* logo) { + mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); + dComIfGp_particle_create(); + + logo->buffer = mDoExt_getGameHeap()->alloc(0x340000, -0x10); + logo->field_0x1d0 = JKRExpHeap::create(logo->buffer, 0x340000, NULL, false); + logo->field_0x1d4 = JKRExpHeap::create(0x130000, logo->field_0x1d0, false); + + return 2; +} +#else #pragma push -#pragma force_active on -SECTION_DATA static void* lit_3737[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)warningInDraw__10dScnLogo_cFv, -}; +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm int phase_0(dScnLogo_c* param_0) { + nofralloc +#include "asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s" +} #pragma pop +#endif -/* 803C2E50-803C2E5C -00001 000C+00 0/1 0/0 0/0 .data @3738 */ +/* 802579BC-80257A70 2522FC 00B4+00 1/0 0/0 0/0 .text phase_1__FP10dScnLogo_c */ +static int phase_1(dScnLogo_c* logo) { + if (!cDyl_InitAsyncIsDone()) { + return 0; + } + + if (!mDoAud_zelAudio_c::isInitFlag() || + Z2AudioMgr::getInterface()->mSceneMgr.checkFirstWaves()) { + return 0; + } + + dComIfG_setObjectRes("LogoUs", 0, logo->field_0x1d0); + mDoRst::setLogoScnFlag(1); + archiveHeap->dump_sort(); + return 2; +} + +/* 80257A70-80257AB4 2523B0 0044+00 1/0 0/0 0/0 .text phase_2__FP10dScnLogo_c */ +static int phase_2(dScnLogo_c* param_0) { + return dComIfG_syncAllObjectRes() ? 0 : 4; +} + +/* 80257AB4-80257AE0 2523F4 002C+00 1/1 0/0 0/0 .text + * resLoad__FP30request_of_phase_process_classP10dScnLogo_c */ +static int resLoad(request_of_phase_process_class* i_phase, dScnLogo_c* param_1) { + static int (*l_method[3])(void*) = {(int (*)(void*))phase_0, (int (*)(void*))phase_1, + (int (*)(void*))phase_2}; + + return dComLbG_PhaseHandler(i_phase, l_method, param_1); +} + +/* 80257AE0-80257C64 252420 0184+00 1/1 0/0 0/0 .text create__10dScnLogo_cFv */ +int dScnLogo_c::create() { + int stat = resLoad(&field_0x1c4, this); + if (stat != 4) { + return stat; + } + + mpHeap = mDoExt_setCurrentHeap(field_0x1d4); + logoInitGC(); + mpHeap->becomeCurrentHeap(); + + dvdDataLoad(); + Z2AudioMgr::getInterface()->mSceneMgr.loadStaticWaves(); + mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60); + mDoGph_gInf_c::waitBlanking(0); + field_0x20a = 0; + mDoGph_gInf_c::startFadeIn(30); + + checkProgSelect(); + if (field_0x20a != 0) { + mExecCommand = EXEC_PROG_IN; + mTimer = 30; + field_0x218 = getProgressiveMode(); + } else { + if (mDoRst::getWarningDispFlag()) { + mTimer = 90; + mExecCommand = EXEC_NINTENDO_IN; + } else { + mTimer = 120; + mExecCommand = EXEC_WARNING_IN; + } + mDoRst::setProgSeqFlag(1); + } + + JUTGamePad::clearResetOccurred(); + JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); + mDoRst::offReset(); + mDoRst::offResetPrepare(); + + return stat; +} + +/* 80257C64-80257FEC 2525A4 0388+00 1/1 0/0 0/0 .text logoInitGC__10dScnLogo_cFv */ +void dScnLogo_c::logoInitGC() { + ResTIMG* nintendoImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 4); + mNintendoLogo = new dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255); + mNintendoLogo->getPicture()->setWhite(JUtility::TColor(220, 0, 0, 255)); + + ResTIMG* dolbyImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 3); + mDolbyLogo = new dDlst_2D_c(dolbyImg, 189, 150, 232, 112, 255); + + ResTIMG* warningImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 10); + mWarning = new dDlst_2D_c(warningImg, 0, 0, 608, 448, 255); + + ResTIMG* warnStartImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 11); + mWarningStart = new dDlst_2D_c(warnStartImg, 0, 359, 608, 48, 255); + + ResTIMG* progChoiceImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 5); + mProgressiveChoice = new dDlst_2D_c(progChoiceImg, 113, 281, 416, 72, 255); + + ResTIMG* progYesImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 9); + mProgressiveYes = new dDlst_2D_c(progYesImg, 211, 372, 80, 32, 255); + mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); + + ResTIMG* progNoImg = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 7); + mProgressiveNo = new dDlst_2D_c(progNoImg, 350, 372, 80, 32, 255); + mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); + + mProgressivePro = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 8); + mProgressiveInter = (ResTIMG*)dComIfG_getObjectRes("LogoUs", 6); + mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); +} + +/* 80257FEC-80258420 25292C 0434+00 1/1 0/0 0/0 .text dvdDataLoad__10dScnLogo_cFv */ +void dScnLogo_c::dvdDataLoad() { + dComIfG_setObjectRes("Always", 0, NULL); + archiveHeap->dump_sort(); + + dComIfG_setObjectRes("Alink", 0, NULL); + + mpField0Command = mDoDvdThd_mountXArchive_c::create( + "/res/FieldMap/Field0.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpAlAnmCommand = + mDoDvdThd_mountXArchive_c::create("/res/Object/AlAnm.arc", 0, JKRArchive::MOUNT_ARAM, NULL); + mpFmapResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/fmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpDmapResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/dmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpCollectResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/clctres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpItemIconCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/itemicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpRingResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/ringres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpPlayerNameCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/playerName.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpItemInfResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/itmInfRes.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpButtonCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/button.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpCardIconCommand = mDoDvdThd_mountXArchive_c::create( + "/res/CardIcon/cardicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpBmgResCommand = + mDoDvdThd_mountXArchive_c::create("/res/Msgus/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpMsgComCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgcom.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[0] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres00.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[1] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres01.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[2] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres02.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[3] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres03.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres04F.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[5] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres05.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[6] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres06.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMain2DCommand = + mDoDvdThd_mountXArchive_c::create("/res/Layout/main2D.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/fontres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); + mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/rubyres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); + mParticleCommand = mDoDvdThd_toMainRam_c::create("/res/Particle/common.jpc", 0, + dComIfGp_particle_getResHeap()); + mItemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", 0, NULL); + mEnemyItemCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/enemy_table.bin", 0, NULL); + + preLoad_dyl_create(); + preLoad_dyl(); +} + +/* 80258420-80258444 252D60 0024+00 1/0 0/0 0/0 .text dScnLogo_Create__FP11scene_class */ +#ifdef NONMATCHING +static int dScnLogo_Create(scene_class* scn) { + return static_cast(scn)->create(); +} +#else #pragma push -#pragma force_active on -SECTION_DATA static void* lit_3738[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)warningDispDraw__10dScnLogo_cFv, -}; +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void dScnLogo_Create(scene_class* param_0) { + nofralloc +#include "asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s" +} #pragma pop +#endif -/* 803C2E5C-803C2E68 -00001 000C+00 0/1 0/0 0/0 .data @3739 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3739[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)warningOutDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 80258444-80258484 252D84 0040+00 1/0 0/0 0/0 .text dScnLogo_Execute__FP10dScnLogo_c */ +static int dScnLogo_Execute(dScnLogo_c* logo) { + if (mDoRst::isReset()) { + fopScnM_ChangeReq(logo, 9, 0, 5); + } + return 1; +} -/* 803C2E68-803C2E74 -00001 000C+00 0/1 0/0 0/0 .data @3740 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3740[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)nintendoInDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 80258484-802584A8 252DC4 0024+00 1/0 0/0 0/0 .text dScnLogo_Draw__FP10dScnLogo_c */ +static int dScnLogo_Draw(dScnLogo_c* logo) { + logo->draw(); + return 1; +} -/* 803C2E74-803C2E80 -00001 000C+00 0/1 0/0 0/0 .data @3741 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3741[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)nintendoOutDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 802584A8-802584D0 252DE8 0028+00 1/0 0/0 0/0 .text dScnLogo_Delete__FP10dScnLogo_c */ +static int dScnLogo_Delete(dScnLogo_c* logo) { + logo->~dScnLogo_c(); + return 1; +} -/* 803C2E80-803C2E8C -00001 000C+00 0/1 0/0 0/0 .data @3742 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3742[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)dolbyInDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 802584D0-802584D8 252E10 0008+00 1/0 0/0 0/0 .text dScnLogo_IsDelete__FP10dScnLogo_c + */ +static int dScnLogo_IsDelete(dScnLogo_c* logo) { + return 1; +} -/* 803C2E8C-803C2E98 -00001 000C+00 0/1 0/0 0/0 .data @3743 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3743[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)dolbyOutDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 802584D8-802584FC 252E18 0024+00 1/1 0/0 0/0 .text setProgressiveMode__10dScnLogo_cFUc + */ +void dScnLogo_c::setProgressiveMode(u8 mode) { + OSSetProgressiveMode(mode); +} -/* 803C2E98-803C2EA4 -00001 000C+00 0/1 0/0 0/0 .data @3744 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3744[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)dolbyOutDraw2__10dScnLogo_cFv, -}; -#pragma pop +/* 802584FC-80258520 252E3C 0024+00 3/3 0/0 0/0 .text getProgressiveMode__10dScnLogo_cFv + */ +u8 dScnLogo_c::getProgressiveMode() { + return OSGetProgressiveMode(); +} -/* 803C2EA4-803C2EB0 -00001 000C+00 0/1 0/0 0/0 .data @3745 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3745[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)progInDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 80258520-8025854C 252E60 002C+00 1/1 0/0 0/0 .text isProgressiveMode__10dScnLogo_cFv + */ +bool dScnLogo_c::isProgressiveMode() { + return OSGetProgressiveMode() == 1; +} -/* 803C2EB0-803C2EBC -00001 000C+00 0/1 0/0 0/0 .data @3746 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3746[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)progSelDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 8025854C-8025855C 252E8C 0010+00 1/1 0/0 0/0 .text setRenderMode__10dScnLogo_cFv */ +void dScnLogo_c::setRenderMode() { + mDoMch_render_c::setProgressiveMode(); +} -/* 803C2EBC-803C2EC8 -00001 000C+00 0/1 0/0 0/0 .data @3747 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3747[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)progOutDraw__10dScnLogo_cFv, -}; -#pragma pop +/* 8025855C-802585A4 252E9C 0048+00 2/1 0/0 0/0 .text __dt__10dLog_HIO_cFv */ +dLog_HIO_c::~dLog_HIO_c() {} -/* 803C2EC8-803C2ED4 -00001 000C+00 0/1 0/0 0/0 .data @3748 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3748[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)progSetDraw__10dScnLogo_cFv, -}; -#pragma pop - -/* 803C2ED4-803C2EE0 -00001 000C+00 0/1 0/0 0/0 .data @3749 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3749[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)progSet2Draw__10dScnLogo_cFv, -}; -#pragma pop - -/* 803C2EE0-803C2EEC -00001 000C+00 0/1 0/0 0/0 .data @3750 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3750[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)progChangeDraw__10dScnLogo_cFv, -}; -#pragma pop - -/* 803C2EEC-803C2EF8 -00001 000C+00 0/1 0/0 0/0 .data @3751 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3751[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)dvdWaitDraw__10dScnLogo_cFv, -}; -#pragma pop - -/* 803C2EF8-803C2F04 -00001 000C+00 0/1 0/0 0/0 .data @3752 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3752[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)nextSceneChange__10dScnLogo_cFv, -}; -#pragma pop - -/* 803C2F04-803C2FC4 020024 00C0+00 1/2 0/0 0/0 .data l_execFunc */ -SECTION_DATA static u8 l_execFunc[192] = { - 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, - 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, - 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, - 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, -}; - -/* 803C2FC4-803C2FD0 -00001 000C+00 1/1 0/0 0/0 .data l_method$4611 */ -SECTION_DATA static void* l_method[3] = { - (void*)phase_0__FP10dScnLogo_c, - (void*)phase_1__FP10dScnLogo_c, - (void*)phase_2__FP10dScnLogo_c, -}; +/* 802585A4-802585C0 252EE4 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUs */ +template +T cLib_calcTimer(T* value) { + if (*value != 0) { + *value = *value - 1; + } + return *value; +} /* 803C2FD0-803C2FE4 -00001 0014+00 1/0 0/0 0/0 .data l_dScnLogo_Method */ SECTION_DATA static void* l_dScnLogo_Method[5] = { @@ -529,525 +913,4 @@ SECTION_DATA extern void* g_profile_LOGO_SCENE[10] = { (void*)NULL, }; -/* 803C300C-803C3018 02012C 000C+00 2/2 0/0 0/0 .data __vt__10dLog_HIO_c */ -SECTION_DATA extern void* __vt__10dLog_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dLog_HIO_cFv, -}; - -/* 802560A4-802560B4 2509E4 0010+00 1/1 0/0 0/0 .text __ct__10dLog_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dLog_HIO_c::dLog_HIO_c() { - nofralloc -#include "asm/d/s/d_s_logo/__ct__10dLog_HIO_cFv.s" -} -#pragma pop - -/* 802560B4-802560F8 2509F4 0044+00 1/1 0/0 0/0 .text preLoad_dyl_create__10dScnLogo_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::preLoad_dyl_create() { - nofralloc -#include "asm/d/s/d_s_logo/preLoad_dyl_create__10dScnLogo_cFv.s" -} -#pragma pop - -/* 802560F8-8025611C 250A38 0024+00 1/1 0/0 0/0 .text preLoad_dyl_remove__10dScnLogo_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::preLoad_dyl_remove() { - nofralloc -#include "asm/d/s/d_s_logo/preLoad_dyl_remove__10dScnLogo_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399FE0-80399FFC 026640 001C+00 1/1 0/0 0/0 .rodata l_preLoad_dylKeyTbl */ -SECTION_RODATA static u8 const l_preLoad_dylKeyTbl[28] = { - 0x02, 0xDC, 0x02, 0xCE, 0x02, 0x21, 0x00, 0xF2, 0x02, 0x1B, 0x02, 0xF4, 0x01, 0x39, - 0x01, 0x5A, 0x02, 0xE4, 0x00, 0xFE, 0x03, 0x08, 0x03, 0x0F, 0x00, 0xFF, 0x01, 0x3F, -}; -COMPILER_STRIP_GATE(0x80399FE0, &l_preLoad_dylKeyTbl); - -/* 8025611C-80256198 250A5C 007C+00 2/2 0/0 0/0 .text preLoad_dyl__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::preLoad_dyl() { - nofralloc -#include "asm/d/s/d_s_logo/preLoad_dyl__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256198-80256210 250AD8 0078+00 1/1 0/0 0/0 .text checkProgSelect__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::checkProgSelect() { - nofralloc -#include "asm/d/s/d_s_logo/checkProgSelect__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256210-80256264 250B50 0054+00 1/1 0/0 0/0 .text draw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::draw() { - nofralloc -#include "asm/d/s/d_s_logo/draw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256264-8025631C 250BA4 00B8+00 1/0 0/0 0/0 .text progInDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::progInDraw() { - nofralloc -#include "asm/d/s/d_s_logo/progInDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454ED8-80454EDC 0034D8 0004+00 1/1 0/0 0/0 .sdata2 @3933 */ -SECTION_SDATA2 static f32 lit_3933 = 0.5f; - -/* 80454EDC-80454EE0 0034DC 0004+00 2/2 0/0 0/0 .sdata2 @3934 */ -SECTION_SDATA2 static f32 lit_3934 = 1.0f; - -/* 80454EE0-80454EE4 0034E0 0004+00 1/1 0/0 0/0 .sdata2 @3935 */ -SECTION_SDATA2 static f32 lit_3935 = -1.0f; - -/* 80454EE4-80454EE8 0034E4 0004+00 1/1 0/0 0/0 .sdata2 @3936 */ -SECTION_SDATA2 static f32 lit_3936 = -0.5f; - -/* 80454EE8-80454EEC 0034E8 0004+00 2/2 0/0 0/0 .sdata2 @3937 */ -SECTION_SDATA2 static f32 lit_3937 = 255.0f; - -/* 80454EEC-80454EF0 0034EC 0004+00 1/1 0/0 0/0 .sdata2 @3938 */ -SECTION_SDATA2 static f32 lit_3938 = 200.0f; - -/* 80454EF0-80454EF8 0034F0 0008+00 2/2 0/0 0/0 .sdata2 @3940 */ -SECTION_SDATA2 static f64 lit_3940 = 4503599627370496.0 /* cast u32 to float */; - -/* 8025631C-802568E0 250C5C 05C4+00 1/0 0/0 0/0 .text progSelDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::progSelDraw() { - nofralloc -#include "asm/d/s/d_s_logo/progSelDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 802568E0-80256A3C 251220 015C+00 1/0 0/0 0/0 .text progOutDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::progOutDraw() { - nofralloc -#include "asm/d/s/d_s_logo/progOutDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256A3C-80256AC0 25137C 0084+00 1/0 0/0 0/0 .text progSetDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::progSetDraw() { - nofralloc -#include "asm/d/s/d_s_logo/progSetDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256AC0-80256B3C 251400 007C+00 1/0 0/0 0/0 .text progSet2Draw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::progSet2Draw() { - nofralloc -#include "asm/d/s/d_s_logo/progSet2Draw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256B3C-80256BF4 25147C 00B8+00 1/0 0/0 0/0 .text progChangeDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::progChangeDraw() { - nofralloc -#include "asm/d/s/d_s_logo/progChangeDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256BF4-80256C68 251534 0074+00 1/0 0/0 0/0 .text warningInDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::warningInDraw() { - nofralloc -#include "asm/d/s/d_s_logo/warningInDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256C68-80256DC4 2515A8 015C+00 1/0 0/0 0/0 .text warningDispDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::warningDispDraw() { - nofralloc -#include "asm/d/s/d_s_logo/warningDispDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256DC4-80256E48 251704 0084+00 1/0 0/0 0/0 .text warningOutDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::warningOutDraw() { - nofralloc -#include "asm/d/s/d_s_logo/warningOutDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256E48-80256ECC 251788 0084+00 1/0 0/0 0/0 .text nintendoInDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::nintendoInDraw() { - nofralloc -#include "asm/d/s/d_s_logo/nintendoInDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256ECC-80256F50 25180C 0084+00 1/0 0/0 0/0 .text nintendoOutDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::nintendoOutDraw() { - nofralloc -#include "asm/d/s/d_s_logo/nintendoOutDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256F50-80256FD4 251890 0084+00 1/0 0/0 0/0 .text dolbyInDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::dolbyInDraw() { - nofralloc -#include "asm/d/s/d_s_logo/dolbyInDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80256FD4-80257058 251914 0084+00 1/0 0/0 0/0 .text dolbyOutDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::dolbyOutDraw() { - nofralloc -#include "asm/d/s/d_s_logo/dolbyOutDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80257058-80257070 251998 0018+00 1/0 0/0 0/0 .text dolbyOutDraw2__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::dolbyOutDraw2() { - nofralloc -#include "asm/d/s/d_s_logo/dolbyOutDraw2__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80257070-80257284 2519B0 0214+00 1/0 0/0 0/0 .text dvdWaitDraw__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::dvdWaitDraw() { - nofralloc -#include "asm/d/s/d_s_logo/dvdWaitDraw__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80257284-802572B8 251BC4 0034+00 1/0 0/0 0/0 .text nextSceneChange__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::nextSceneChange() { - nofralloc -#include "asm/d/s/d_s_logo/nextSceneChange__10dScnLogo_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399FFC = "LogoUs"; -SECTION_DEAD static char const* const stringBase_8039A003 = "Always"; -#pragma pop - -/* 802572B8-80257910 251BF8 0658+00 1/1 0/0 0/0 .text __dt__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dScnLogo_c::~dScnLogo_c() { - nofralloc -#include "asm/d/s/d_s_logo/__dt__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80257910-802579BC 252250 00AC+00 1/0 0/0 0/0 .text phase_0__FP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_0(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A00A = "/res/Object/"; -#pragma pop - -/* 802579BC-80257A70 2522FC 00B4+00 1/0 0/0 0/0 .text phase_1__FP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_1(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/phase_1__FP10dScnLogo_c.s" -} -#pragma pop - -/* 80257A70-80257AB4 2523B0 0044+00 1/0 0/0 0/0 .text phase_2__FP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_2(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/phase_2__FP10dScnLogo_c.s" -} -#pragma pop - -/* 80257AB4-80257AE0 2523F4 002C+00 1/1 0/0 0/0 .text - * resLoad__FP30request_of_phase_process_classP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void resLoad(request_of_phase_process_class* param_0, dScnLogo_c* param_1) { - nofralloc -#include "asm/d/s/d_s_logo/resLoad__FP30request_of_phase_process_classP10dScnLogo_c.s" -} -#pragma pop - -/* 80257AE0-80257C64 252420 0184+00 1/1 0/0 0/0 .text create__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::create() { - nofralloc -#include "asm/d/s/d_s_logo/create__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80257C64-80257FEC 2525A4 0388+00 1/1 0/0 0/0 .text logoInitGC__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::logoInitGC() { - nofralloc -#include "asm/d/s/d_s_logo/logoInitGC__10dScnLogo_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A017 = "Alink"; -SECTION_DEAD static char const* const stringBase_8039A01D = "/res/FieldMap/Field0.arc"; -SECTION_DEAD static char const* const stringBase_8039A036 = "/res/Object/AlAnm.arc"; -SECTION_DEAD static char const* const stringBase_8039A04C = "/res/Layout/fmapres.arc"; -SECTION_DEAD static char const* const stringBase_8039A064 = "/res/Layout/dmapres.arc"; -SECTION_DEAD static char const* const stringBase_8039A07C = "/res/Layout/clctres.arc"; -SECTION_DEAD static char const* const stringBase_8039A094 = "/res/Layout/itemicon.arc"; -SECTION_DEAD static char const* const stringBase_8039A0AD = "/res/Layout/ringres.arc"; -SECTION_DEAD static char const* const stringBase_8039A0C5 = "/res/Layout/playerName.arc"; -SECTION_DEAD static char const* const stringBase_8039A0E0 = "/res/Layout/itmInfRes.arc"; -SECTION_DEAD static char const* const stringBase_8039A0FA = "/res/Layout/button.arc"; -SECTION_DEAD static char const* const stringBase_8039A111 = "/res/CardIcon/cardicon.arc"; -SECTION_DEAD static char const* const stringBase_8039A12C = "/res/Msgus/bmgres.arc"; -SECTION_DEAD static char const* const stringBase_8039A142 = "/res/Layout/msgcom.arc"; -SECTION_DEAD static char const* const stringBase_8039A159 = "/res/Layout/msgres00.arc"; -SECTION_DEAD static char const* const stringBase_8039A172 = "/res/Layout/msgres01.arc"; -SECTION_DEAD static char const* const stringBase_8039A18B = "/res/Layout/msgres02.arc"; -SECTION_DEAD static char const* const stringBase_8039A1A4 = "/res/Layout/msgres03.arc"; -SECTION_DEAD static char const* const stringBase_8039A1BD = "/res/Layout/msgres04F.arc"; -SECTION_DEAD static char const* const stringBase_8039A1D7 = "/res/Layout/msgres05.arc"; -SECTION_DEAD static char const* const stringBase_8039A1F0 = "/res/Layout/msgres06.arc"; -SECTION_DEAD static char const* const stringBase_8039A209 = "/res/Layout/main2D.arc"; -SECTION_DEAD static char const* const stringBase_8039A220 = "/res/Fontus/fontres.arc"; -SECTION_DEAD static char const* const stringBase_8039A238 = "/res/Fontus/rubyres.arc"; -SECTION_DEAD static char const* const stringBase_8039A250 = "/res/Particle/common.jpc"; -SECTION_DEAD static char const* const stringBase_8039A269 = "/res/ItemTable/item_table.bin"; -SECTION_DEAD static char const* const stringBase_8039A287 = "/res/ItemTable/enemy_table.bin"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A2A6 = "\0"; -#pragma pop - -/* 80257FEC-80258420 25292C 0434+00 1/1 0/0 0/0 .text dvdDataLoad__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::dvdDataLoad() { - nofralloc -#include "asm/d/s/d_s_logo/dvdDataLoad__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80258420-80258444 252D60 0024+00 1/0 0/0 0/0 .text dScnLogo_Create__FP11scene_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnLogo_Create(scene_class* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s" -} -#pragma pop - -/* 80258444-80258484 252D84 0040+00 1/0 0/0 0/0 .text dScnLogo_Execute__FP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnLogo_Execute(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/dScnLogo_Execute__FP10dScnLogo_c.s" -} -#pragma pop - -/* 80258484-802584A8 252DC4 0024+00 1/0 0/0 0/0 .text dScnLogo_Draw__FP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnLogo_Draw(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/dScnLogo_Draw__FP10dScnLogo_c.s" -} -#pragma pop - -/* 802584A8-802584D0 252DE8 0028+00 1/0 0/0 0/0 .text dScnLogo_Delete__FP10dScnLogo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnLogo_Delete(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/dScnLogo_Delete__FP10dScnLogo_c.s" -} -#pragma pop - -/* 802584D0-802584D8 252E10 0008+00 1/0 0/0 0/0 .text dScnLogo_IsDelete__FP10dScnLogo_c - */ -static bool dScnLogo_IsDelete(dScnLogo_c* param_0) { - return true; -} - -/* 802584D8-802584FC 252E18 0024+00 1/1 0/0 0/0 .text setProgressiveMode__10dScnLogo_cFUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::setProgressiveMode(u8 param_0) { - nofralloc -#include "asm/d/s/d_s_logo/setProgressiveMode__10dScnLogo_cFUc.s" -} -#pragma pop - -/* 802584FC-80258520 252E3C 0024+00 3/3 0/0 0/0 .text getProgressiveMode__10dScnLogo_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::getProgressiveMode() { - nofralloc -#include "asm/d/s/d_s_logo/getProgressiveMode__10dScnLogo_cFv.s" -} -#pragma pop - -/* 80258520-8025854C 252E60 002C+00 1/1 0/0 0/0 .text isProgressiveMode__10dScnLogo_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::isProgressiveMode() { - nofralloc -#include "asm/d/s/d_s_logo/isProgressiveMode__10dScnLogo_cFv.s" -} -#pragma pop - -/* 8025854C-8025855C 252E8C 0010+00 1/1 0/0 0/0 .text setRenderMode__10dScnLogo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnLogo_c::setRenderMode() { - nofralloc -#include "asm/d/s/d_s_logo/setRenderMode__10dScnLogo_cFv.s" -} -#pragma pop - -/* 8025855C-802585A4 252E9C 0048+00 2/1 0/0 0/0 .text __dt__10dLog_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dLog_HIO_c::~dLog_HIO_c() { - nofralloc -#include "asm/d/s/d_s_logo/__dt__10dLog_HIO_cFv.s" -} -#pragma pop - -/* 802585A4-802585C0 252EE4 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_802585A4(void* _this, u16* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/func_802585A4.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80430758-80430768 05D478 000C+04 1/1 0/0 0/0 .bss @3702 */ -static u8 lit_3702[12 + 4 /* padding */]; - -/* 804510E8-804510F0 0005E8 0008+00 1/1 0/0 0/0 .sbss g_LogHIO */ -static u8 g_LogHIO[8]; - -/* 802585C0-8025878C 252F00 01CC+00 0/0 1/0 0/0 .text __sinit_d_s_logo_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_s_logo_cpp() { - nofralloc -#include "asm/d/s/d_s_logo/__sinit_d_s_logo_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x802585C0, __sinit_d_s_logo_cpp); -#pragma pop - /* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index f5c0982068..7ba8946c34 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -26,39 +26,20 @@ #include "f_pc/f_pc_priority.h" #include "f_pc/f_pc_profile.h" +#include "d/com/d_com_inf_game.h" +#include "m_Do/m_Do_audio.h" +#include "SSystem/SComponent/c_API_graphic.h" + // // Types: // struct dShutdownErrorMsg_c { - /* 8009D790 */ void execute(); -}; - -struct dLib_time_c { - /* 80032880 */ void stopTime(); - /* 800328BC */ void startTime(); + /* 8009D790 */ static bool execute(); }; struct dDvdErrorMsg_c { - /* 8009D354 */ void execute(); -}; - -struct dDlst_peekZ_c { - /* 80056080 */ void peekData(); -}; - -struct dComIfG_play_c { - /* 8002CAC4 */ void drawSimpleModel(); -}; - -struct Z2SoundMgr { - /* 802AA6B0 */ void pauseAllGameSound(bool); -}; - -struct JUTGamePad { - struct CRumble { - /* 802E1948 */ void stopPatternedRumble(s16); - }; + /* 8009D354 */ static u8 execute(); }; // @@ -116,17 +97,22 @@ extern "C" void stopPatternedRumble__Q210JUTGamePad7CRumbleFs(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 struct_80450D38[8]; -extern "C" extern u8 data_80450EC4[4]; +extern "C" extern Z2SoundMgr* data_80450B60; +extern "C" extern u8 struct_80450D38; // // Declarations: // +// move / fix for JASGlobalInstance eventually +inline Z2SoundMgr* Z2GetSoundMgr() { + return data_80450B60; +} + /* 80450D38-80450D40 0008+00 s=0 e=1 z=0 None .sbss None */ -u8 struct_80450D38[8]; +u8 struct_80450D38; + +s8 data_80450D39; /* 800220A0-800220C0 0020+00 s=1 e=1 z=0 None .text fpcM_Draw__FPv */ void fpcM_Draw(void* pProc) { @@ -139,8 +125,8 @@ s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc) { } /* 800220F8-80022118 0020+00 s=1 e=0 z=1 None .text fpcM_Execute__FPv */ -void fpcM_Execute(void* pProc) { - fpcEx_Execute((base_process_class*)pProc); +s32 fpcM_Execute(void* pProc) { + return fpcEx_Execute((base_process_class*)pProc); } /* 80022118-80022138 0020+00 s=0 e=7 z=0 None .text fpcM_Delete__FPv */ @@ -153,16 +139,55 @@ BOOL fpcM_IsCreating(unsigned int pID) { return fpcCt_IsCreatingByID(pID); } -// TODO, uses a lot of functions outside f_pc/SSystem /* 80022158-800222B8 0160+00 s=0 e=1 z=0 None .text fpcM_Management__FPFv_vPFv_v */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void fpcM_Management(fpcM_ManagementFunc, fpcM_ManagementFunc) { - nofralloc -#include "asm/f_pc/f_pc_manager/fpcM_Management__FPFv_vPFv_v.s" +void fpcM_Management(fpcM_ManagementFunc func1, fpcM_ManagementFunc func2) { + MtxInit(); + dComIfGd_peekZdata(); + + if (!dShutdownErrorMsg_c::execute()) { + if (data_80450D39 == 0) { + struct_80450D38 = 0; + data_80450D39 = 1; + } + + if (!dDvdErrorMsg_c::execute()) { + if (struct_80450D38 != 0) { + dLib_time_c::startTime(); + Z2GetSoundMgr()->pauseAllGameSound(false); + struct_80450D38 = 0; + } + + cAPIGph_Painter(); + + if (!dPa_control_c::isStatus(1)) { + fpcDt_Handler(); + } else { + dPa_control_c::offStatus(1); + } + + fpcPi_Handler(); + fpcCt_Handler(); + + if (func1 != NULL) { + func1(); + } + + fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute); + fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw); + + if (func2 != NULL) { + func2(); + } + + dComIfGp_drawSimpleModel(); + } else if (struct_80450D38 == 0) { + dLib_time_c::stopTime(); + Z2GetSoundMgr()->pauseAllGameSound(true); + mDoCPd_c::stopMotorWaveHard(0); + struct_80450D38 = 1; + } + } } -#pragma pop /* ############################################################################################## */ /* 803F4DB0-803F4DDC 002C+00 s=1 e=0 z=0 None .bss rootlayer$3716 */ diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 5d77a1ec3d..9e206cc8ca 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -708,9 +708,11 @@ void main01(void) { } JUTConsole* console = JFWSystem::getSystemConsole(); + u32 output = JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE; if (data_80450580 != 0) { - console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); + data_80450580 = JUTConsole::OUTPUT_NONE; } + console->setOutput(output); console->setPosition(32, 42); @@ -724,13 +726,14 @@ void main01(void) { do { frame++; - - if (data_80450B00 && frame == data_80450B00 * (frame / data_80450B00)) { + if (data_80450B00 != 0 && frame % data_80450B00 == 0) { mDoMch_HeapCheckAll__Fv(); } + if (struct_80450C80[0]) { g_mDoMemCd_control.update(); } + mDoCPd_c::read(); fapGm_Execute__Fv(); mDoAud_Execute__Fv();