mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-05 01:30:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol names (#118)

Browse Source 
* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-15 07:12:44 +01:00
committed by GitHub
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com/d_com_inf_game/asm/func_8002B22C.s
+1 -1
View File
@@ -22,7 +22,7 @@ lbl_8002B260:
/* 8002B27C 000281BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002B280 000281C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002B284 000281C4 38 63 4E C4 */ addi r3, r3, 0x4ec4
/* 8002B288 000281C8 4B FF 90 B1 */ bl init__20dStage_roomControl_cFvZone
/* 8002B288 000281C8 4B FF 90 B1 */ bl initZone__20dStage_roomControl_cFv
lbl_8002B28C:
/* 8002B28C 000281CC 38 00 00 00 */ li r0, 0
/* 8002B290 000281D0 98 1F 4F 51 */ stb r0, 0x4f51(r31)
include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s
+2 -2
View File
@@ -6,7 +6,7 @@
/* 8002B2DC 0002821C 7C 7E 1B 78 */ mr r30, r3
/* 8002B2E0 00028220 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8002B2E4 00028224 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8002B2E8 00028228 48 1F 0B 81 */ bl dMeter2Info_c_NS_init
/* 8002B2E8 00028228 48 1F 0B 81 */ bl init__13dMeter2Info_cFv
/* 8002B2EC 0002822C 83 FE 4F 84 */ lwz r31, 0x4f84(r30)
/* 8002B2F0 00028230 38 7E 4E 84 */ addi r3, r30, 0x4e84
/* 8002B2F4 00028234 38 80 00 00 */ li r4, 0
@@ -18,7 +18,7 @@
/* 8002B30C 0002824C 90 1E 4E AC */ stw r0, 0x4eac(r30)
/* 8002B310 00028250 90 1E 4E B0 */ stw r0, 0x4eb0(r30)
/* 8002B314 00028254 38 60 00 3E */ li r3, 0x3e
/* 8002B318 00028258 48 00 31 B5 */ bl dComIfGs_checkGetItem
/* 8002B318 00028258 48 00 31 B5 */ bl dComIfGs_checkGetItem__FUc
/* 8002B31C 0002825C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8002B320 00028260 41 82 00 10 */ beq lbl_8002B330
/* 8002B324 00028264 38 00 00 00 */ li r0, 0
include/d/d_com/d_com_inf_game/asm/func_8002B434.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002B458 00028398 40 80 12 D4 */ bge lbl_8002C72C
/* 8002B45C 0002839C 38 00 FF FF */ li r0, -1
/* 8002B460 000283A0 90 01 00 08 */ stw r0, 8(r1)
/* 8002B464 000283A4 48 18 12 A9 */ bl dKy_darkworld_stage_check
/* 8002B464 000283A4 48 18 12 A9 */ bl dKy_darkworld_stage_check__FPCci
/* 8002B468 000283A8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8002B46C 000283AC 28 00 00 01 */ cmplwi r0, 1
/* 8002B470 000283B0 40 82 00 0C */ bne lbl_8002B47C
include/d/d_com/d_com_inf_game/asm/func_8002C950.s
+1 -1
View File
@@ -1,7 +1,7 @@
/* 8002C950 00029890 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002C954 00029894 7C 08 02 A6 */ mflr r0
/* 8002C958 00029898 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002C95C 0002989C 4B FF EA D9 */ bl dComIfG_play_c_NS_getLayerNo_common_common
/* 8002C95C 0002989C 4B FF EA D9 */ bl getLayerNo_common_common__14dComIfG_play_cFPCcii
/* 8002C960 000298A0 2C 03 00 00 */ cmpwi r3, 0
/* 8002C964 000298A4 40 80 00 08 */ bge lbl_8002C96C
/* 8002C968 000298A8 38 60 00 00 */ li r3, 0
include/d/d_com/d_com_inf_game/asm/func_8002C97C.s
+1 -1
View File
@@ -17,7 +17,7 @@ lbl_8002C9B0:
/* 8002C9B8 000298F8 38 65 4E 00 */ addi r3, r5, 0x4e00
/* 8002C9BC 000298FC 88 05 4E 0B */ lbz r0, 0x4e0b(r5)
/* 8002C9C0 00029900 7C 05 07 74 */ extsb r5, r0
/* 8002C9C4 00029904 4B FF FF 8D */ bl dComIfG_play_c_NS_getLayerNo_common
/* 8002C9C4 00029904 4B FF FF 8D */ bl getLayerNo_common__14dComIfG_play_cFPCcii
/* 8002C9C8 00029908 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002C9CC 0002990C 7C 08 03 A6 */ mtlr r0
/* 8002C9D0 00029910 38 21 00 10 */ addi r1, r1, 0x10
include/d/d_com/d_com_inf_game/asm/func_8002C9D8.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 8002C9F0 00029930 48 2A 22 5D */ bl __nw__FUl
/* 8002C9F4 00029934 7C 60 1B 79 */ or. r0, r3, r3
/* 8002C9F8 00029938 41 82 00 0C */ beq lbl_8002CA04
/* 8002C9FC 0002993C 48 01 F0 D1 */ bl dPa_control_c
/* 8002C9FC 0002993C 48 01 F0 D1 */ bl __ct__13dPa_control_cFv
/* 8002CA00 00029940 7C 60 1B 78 */ mr r0, r3
lbl_8002CA04:
/* 8002CA04 00029944 90 1F 4E 04 */ stw r0, 0x4e04(r31)
include/d/d_com/d_com_inf_game/asm/func_8002CA1C.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002CA40 00029980 48 2A 22 0D */ bl __nw__FUl
/* 8002CA44 00029984 7C 60 1B 79 */ or. r0, r3, r3
/* 8002CA48 00029988 41 82 00 0C */ beq lbl_8002CA54
/* 8002CA4C 0002998C 48 01 C2 69 */ bl dSmplMdl_draw_c
/* 8002CA4C 0002998C 48 01 C2 69 */ bl __ct__15dSmplMdl_draw_cFv
/* 8002CA50 00029990 7C 60 1B 78 */ mr r0, r3
lbl_8002CA54:
/* 8002CA54 00029994 90 1F 4E 08 */ stw r0, 0x4e08(r31)
include/d/d_com/d_com_inf_game/asm/func_8002CAC4.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 8002CAD0 00029A10 80 63 4E 08 */ lwz r3, 0x4e08(r3)
/* 8002CAD4 00029A14 28 03 00 00 */ cmplwi r3, 0
/* 8002CAD8 00029A18 41 82 00 08 */ beq lbl_8002CAE0
/* 8002CADC 00029A1C 48 01 C3 31 */ bl dSmplMdl_draw_c_NS_draw
/* 8002CADC 00029A1C 48 01 C3 31 */ bl draw__15dSmplMdl_draw_cFv
lbl_8002CAE0:
/* 8002CAE0 00029A20 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002CAE4 00029A24 7C 08 03 A6 */ mtlr r0
include/d/d_com/d_com_inf_game/asm/func_8002CAF0.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 8002CAFC 00029A3C 80 63 4E 08 */ lwz r3, 0x4e08(r3)
/* 8002CB00 00029A40 28 03 00 00 */ cmplwi r3, 0
/* 8002CB04 00029A44 41 82 00 18 */ beq lbl_8002CB1C
/* 8002CB08 00029A48 48 01 C4 69 */ bl dSmplMdl_draw_c_NS_addModel
/* 8002CB08 00029A48 48 01 C4 69 */ bl addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc
/* 8002CB0C 00029A4C 2C 03 00 00 */ cmpwi r3, 0
/* 8002CB10 00029A50 41 82 00 0C */ beq lbl_8002CB1C
/* 8002CB14 00029A54 38 60 00 01 */ li r3, 1
include/d/d_com/d_com_inf_game/asm/func_8002CB30.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 8002CB3C 00029A7C 80 63 4E 08 */ lwz r3, 0x4e08(r3)
/* 8002CB40 00029A80 28 03 00 00 */ cmplwi r3, 0
/* 8002CB44 00029A84 41 82 00 10 */ beq lbl_8002CB54
/* 8002CB48 00029A88 48 01 C5 11 */ bl dSmplMdl_draw_c_NS_removeModel
/* 8002CB48 00029A88 48 01 C5 11 */ bl removeModel__15dSmplMdl_draw_cFP12J3DModelDatai
/* 8002CB4C 00029A8C 38 60 00 01 */ li r3, 1
/* 8002CB50 00029A90 48 00 00 08 */ b lbl_8002CB58
lbl_8002CB54:
include/d/d_com/d_com_inf_game/asm/func_8002CB68.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 8002CB74 00029AB4 80 63 4E 08 */ lwz r3, 0x4e08(r3)
/* 8002CB78 00029AB8 28 03 00 00 */ cmplwi r3, 0
/* 8002CB7C 00029ABC 41 82 00 08 */ beq lbl_8002CB84
/* 8002CB80 00029AC0 48 01 C3 3D */ bl dSmplMdl_draw_c_NS_entry
/* 8002CB80 00029AC0 48 01 C3 3D */ bl entry__15dSmplMdl_draw_cFP8J3DModeli
lbl_8002CB84:
/* 8002CB84 00029AC4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002CB88 00029AC8 7C 08 03 A6 */ mtlr r0
include/d/d_com/d_com_inf_game/asm/func_8002CC54.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 8002CC8C 00029BCC 38 80 00 64 */ li r4, 0x64
/* 8002CC90 00029BD0 38 A0 00 00 */ li r5, 0
/* 8002CC94 00029BD4 38 C0 00 0A */ li r6, 0xa
/* 8002CC98 00029BD8 48 00 08 BD */ bl dComIfGp_setNextStage_X1_
/* 8002CC98 00029BD8 48 00 08 BD */ bl dComIfGp_setNextStage__FPCcsScSc
/* 8002CC9C 00029BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002CCA0 00029BE0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l
/* 8002CCA4 00029BE4 38 65 4E 0E */ addi r3, r5, 0x4e0e
include/d/d_com/d_com_inf_game/asm/func_8002CD44.s
+1 -1
View File
@@ -17,7 +17,7 @@ lbl_8002CD7C:
/* 8002CD80 00029CC0 48 00 00 28 */ b lbl_8002CDA8
lbl_8002CD84:
/* 8002CD84 00029CC4 38 80 00 0C */ li r4, 0xc
/* 8002CD88 00029CC8 4B FF FE CD */ bl dComIfG_changeOpeningScene
/* 8002CD88 00029CC8 4B FF FE CD */ bl dComIfG_changeOpeningScene__FP11scene_classs
/* 8002CD8C 00029CCC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 8002CD90 00029CD0 38 63 03 D0 */ addi r3, r3, 0x3d0
/* 8002CD94 00029CD4 38 80 00 1E */ li r4, 0x1e
include/d/d_com/d_com_inf_game/asm/func_8002CDB8.s
+1 -1
View File
@@ -13,7 +13,7 @@
/* 8002CDE8 00029D28 38 E0 00 00 */ li r7, 0
/* 8002CDEC 00029D2C 39 00 00 00 */ li r8, 0
/* 8002CDF0 00029D30 38 84 C2 F8 */ addi r4, r4, -15624
/* 8002CDF4 00029D34 48 00 F2 85 */ bl dRes_control_c_NS_setRes
/* 8002CDF4 00029D34 48 00 F2 85 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap
/* 8002CDF8 00029D38 2C 03 00 00 */ cmpwi r3, 0
/* 8002CDFC 00029D3C 40 82 00 24 */ bne lbl_8002CE20
/* 8002CE00 00029D40 3C 60 80 38 */ lis r3, lbl_80378F38@ha
include/d/d_com/d_com_inf_game/asm/func_8002CE38.s
+1 -1
View File
@@ -8,7 +8,7 @@
/* 8002CE54 00029D94 3C 84 00 02 */ addis r4, r4, 2
/* 8002CE58 00029D98 38 A0 00 80 */ li r5, 0x80
/* 8002CE5C 00029D9C 38 84 C2 F8 */ addi r4, r4, -15624
/* 8002CE60 00029DA0 48 00 F3 01 */ bl dRes_control_c_NS_syncRes
/* 8002CE60 00029DA0 48 00 F3 01 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci
/* 8002CE64 00029DA4 2C 03 00 00 */ cmpwi r3, 0
/* 8002CE68 00029DA8 40 80 00 24 */ bge lbl_8002CE8C
/* 8002CE6C 00029DAC 3C 60 80 38 */ lis r3, lbl_80378F38@ha
include/d/d_com/d_com_inf_game/asm/func_8002CEBC.s
+1 -1
View File
@@ -10,7 +10,7 @@
lbl_8002CEE0:
/* 8002CEE0 00029E20 3C 80 80 3A */ lis r4, lbl_803A71B8@ha
/* 8002CEE4 00029E24 38 84 71 B8 */ addi r4, r4, lbl_803A71B8@l
/* 8002CEE8 00029E28 48 00 2C 39 */ bl dComLbG_PhaseHandler
/* 8002CEE8 00029E28 48 00 2C 39 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv
lbl_8002CEEC:
/* 8002CEEC 00029E2C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002CEF0 00029E30 7C 08 03 A6 */ mtlr r0
include/d/d_com/d_com_inf_game/asm/func_8002CEFC.s
+1 -1
View File
@@ -13,7 +13,7 @@
/* 8002CF2C 00029E6C 38 E0 00 00 */ li r7, 0
/* 8002CF30 00029E70 81 08 00 04 */ lwz r8, 4(r8)
/* 8002CF34 00029E74 38 84 C2 F8 */ addi r4, r4, -15624
/* 8002CF38 00029E78 48 00 F1 41 */ bl dRes_control_c_NS_setRes
/* 8002CF38 00029E78 48 00 F1 41 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap
/* 8002CF3C 00029E7C 2C 03 00 00 */ cmpwi r3, 0
/* 8002CF40 00029E80 38 60 00 02 */ li r3, 2
/* 8002CF44 00029E84 40 82 00 08 */ bne lbl_8002CF4C
include/d/d_com/d_com_inf_game/asm/func_8002CF5C.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 8002CF74 00029EB4 3C 84 00 02 */ addis r4, r4, 2
/* 8002CF78 00029EB8 38 A0 00 80 */ li r5, 0x80
/* 8002CF7C 00029EBC 38 84 C2 F8 */ addi r4, r4, -15624
/* 8002CF80 00029EC0 48 00 F1 E1 */ bl dRes_control_c_NS_syncRes
/* 8002CF80 00029EC0 48 00 F1 E1 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci
/* 8002CF84 00029EC4 2C 03 00 00 */ cmpwi r3, 0
/* 8002CF88 00029EC8 40 80 00 0C */ bge lbl_8002CF94
/* 8002CF8C 00029ECC 38 60 00 05 */ li r3, 5
include/d/d_com/d_com_inf_game/asm/func_8002CFC0.s
+1 -1
View File
@@ -12,7 +12,7 @@ lbl_8002CFE0:
/* 8002CFE8 00029F28 3C 80 80 3A */ lis r4, lbl_803A71C4@ha
/* 8002CFEC 00029F2C 38 84 71 C4 */ addi r4, r4, lbl_803A71C4@l
/* 8002CFF0 00029F30 38 A1 00 08 */ addi r5, r1, 8
/* 8002CFF4 00029F34 48 00 2B 2D */ bl dComLbG_PhaseHandler
/* 8002CFF4 00029F34 48 00 2B 2D */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv
lbl_8002CFF8:
/* 8002CFF8 00029F38 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002CFFC 00029F3C 7C 08 03 A6 */ mtlr r0
include/d/d_com/d_com_inf_game/asm/func_8002D008.s
+1 -1
View File
@@ -15,7 +15,7 @@ lbl_8002D030:
/* 8002D03C 00029F7C 3C 84 00 02 */ addis r4, r4, 2
/* 8002D040 00029F80 38 A0 00 80 */ li r5, 0x80
/* 8002D044 00029F84 38 84 C2 F8 */ addi r4, r4, -15624
/* 8002D048 00029F88 48 00 F1 4D */ bl dRes_control_c_NS_deleteRes
/* 8002D048 00029F88 48 00 F1 4D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci
/* 8002D04C 00029F8C 38 00 00 00 */ li r0, 0
/* 8002D050 00029F90 90 1F 00 04 */ stw r0, 4(r31)
/* 8002D054 00029F94 38 60 00 01 */ li r3, 1
include/d/d_com/d_com_inf_game/asm/func_8002D06C.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002D090 00029FD0 7D 89 03 A6 */ mtctr r12
/* 8002D094 00029FD4 4E 80 04 21 */ bctrl
/* 8002D098 00029FD8 7F E4 FB 78 */ mr r4, r31
/* 8002D09C 00029FDC 4B FF 8D A5 */ bl dStage_roomRead_dt_c_GetReverbStage
/* 8002D09C 00029FDC 4B FF 8D A5 */ bl dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi
/* 8002D0A0 00029FE0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8002D0A4 00029FE4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002D0A8 00029FE8 7C 08 03 A6 */ mtlr r0
include/d/d_com/d_com_inf_game/asm/func_8002D0B4.s
+2 -2
View File
@@ -31,7 +31,7 @@
/* 8002D12C 0002A06C 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8002D130 0002A070 7F A4 EB 78 */ mr r4, r29
/* 8002D134 0002A074 38 A1 00 08 */ addi r5, r1, 8
/* 8002D138 0002A078 48 04 76 0D */ bl cBgS_NS_GetTriPla
/* 8002D138 0002A078 48 04 76 0D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla
/* 8002D13C 0002A07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002D140 0002A080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002D144 0002A084 38 63 61 C0 */ addi r3, r3, 0x61c0
@@ -42,7 +42,7 @@
/* 8002D158 0002A098 7F C6 F3 78 */ mr r6, r30
/* 8002D15C 0002A09C FC 60 F8 90 */ fmr f3, f31
/* 8002D160 0002A0A0 7F E7 FB 78 */ mr r7, r31
/* 8002D164 0002A0A4 48 02 8E 21 */ bl dDlst_shadowControl_c_NS_setSimple
/* 8002D164 0002A0A4 48 02 8E 21 */ bl setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj
/* 8002D168 0002A0A8 3C 80 80 3A */ lis r4, lbl_803A37C0@ha
/* 8002D16C 0002A0AC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l
/* 8002D170 0002A0B0 90 01 00 18 */ stw r0, 0x18(r1)
include/d/d_com/d_com_inf_game/asm/func_8002D25C.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 8002D26C 0002A1AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002D270 0002A1B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002D274 0002A1B4 38 63 4E C4 */ addi r3, r3, 0x4ec4
/* 8002D278 0002A1B8 4B FF 71 0D */ bl dStage_roomControl_c_NS_getStatusRoomDt
/* 8002D278 0002A1B8 4B FF 71 0D */ bl getStatusRoomDt__20dStage_roomControl_cFi
/* 8002D27C 0002A1BC 28 03 00 00 */ cmplwi r3, 0
/* 8002D280 0002A1C0 40 82 00 0C */ bne lbl_8002D28C
/* 8002D284 0002A1C4 38 60 00 00 */ li r3, 0
include/d/d_com/d_com_inf_game/asm/func_8002D2AC.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 8002D2BC 0002A1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002D2C0 0002A200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002D2C4 0002A204 38 63 4E C4 */ addi r3, r3, 0x4ec4
/* 8002D2C8 0002A208 4B FF 70 BD */ bl dStage_roomControl_c_NS_getStatusRoomDt
/* 8002D2C8 0002A208 4B FF 70 BD */ bl getStatusRoomDt__20dStage_roomControl_cFi
/* 8002D2CC 0002A20C 28 03 00 00 */ cmplwi r3, 0
/* 8002D2D0 0002A210 40 82 00 0C */ bne lbl_8002D2DC
/* 8002D2D4 0002A214 38 60 00 00 */ li r3, 0
include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s
+6 -6
View File
@@ -32,7 +32,7 @@ lbl_8002D350:
/* 8002D374 0002A2B4 88 03 04 E2 */ lbz r0, 0x4e2(r3)
/* 8002D378 0002A2B8 7C 15 07 74 */ extsb r21, r0
/* 8002D37C 0002A2BC 38 61 00 0C */ addi r3, r1, 0xc
/* 8002D380 0002A2C0 48 01 1A DD */ bl dMapInfo_n_NS_getMapPlayerPos
/* 8002D380 0002A2C0 48 01 1A DD */ bl getMapPlayerPos__10dMapInfo_nFv
/* 8002D384 0002A2C4 C0 01 00 0C */ lfs f0, 0xc(r1)
/* 8002D388 0002A2C8 D0 01 00 18 */ stfs f0, 0x18(r1)
/* 8002D38C 0002A2CC C0 01 00 10 */ lfs f0, 0x10(r1)
@@ -41,7 +41,7 @@ lbl_8002D350:
/* 8002D398 0002A2D8 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 8002D39C 0002A2DC 80 76 5D B4 */ lwz r3, 0x5db4(r22)
/* 8002D3A0 0002A2E0 AA C3 04 E6 */ lha r22, 0x4e6(r3)
/* 8002D3A4 0002A2E4 48 00 1A BD */ bl dComIfGp_getNowLevel
/* 8002D3A4 0002A2E4 48 00 1A BD */ bl dComIfGp_getNowLevel__Fv
/* 8002D3A8 0002A2E8 7C 68 1B 78 */ mr r8, r3
/* 8002D3AC 0002A2EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002D3B0 0002A2F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -73,12 +73,12 @@ lbl_8002D408:
/* 8002D410 0002A350 40 82 00 14 */ bne lbl_8002D424
/* 8002D414 0002A354 38 60 00 06 */ li r3, 6
/* 8002D418 0002A358 38 80 00 02 */ li r4, 2
/* 8002D41C 0002A35C 48 00 1C 25 */ bl dComIfGs_setKeyNum
/* 8002D41C 0002A35C 48 00 1C 25 */ bl dComIfGs_setKeyNum__FiUc
/* 8002D420 0002A360 48 00 00 10 */ b lbl_8002D430
lbl_8002D424:
/* 8002D424 0002A364 38 60 00 06 */ li r3, 6
/* 8002D428 0002A368 38 80 00 00 */ li r4, 0
/* 8002D42C 0002A36C 48 00 1C 15 */ bl dComIfGs_setKeyNum
/* 8002D42C 0002A36C 48 00 1C 15 */ bl dComIfGs_setKeyNum__FiUc
lbl_8002D430:
/* 8002D430 0002A370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002D434 0002A374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -86,7 +86,7 @@ lbl_8002D430:
/* 8002D43C 0002A37C 28 03 00 00 */ cmplwi r3, 0
/* 8002D440 0002A380 41 82 00 0C */ beq lbl_8002D44C
/* 8002D444 0002A384 38 81 00 08 */ addi r4, r1, 8
/* 8002D448 0002A388 48 09 0A 01 */ bl daAlink_c_NS_setLastSceneMode
/* 8002D448 0002A388 48 09 0A 01 */ bl setLastSceneMode__9daAlink_cFPUl
lbl_8002D44C:
/* 8002D44C 0002A38C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8002D450 0002A390 38 63 01 88 */ addi r3, r3, lbl_80430188@l
@@ -108,7 +108,7 @@ lbl_8002D44C:
/* 8002D490 0002A3D0 3C 80 80 38 */ lis r4, lbl_80378F38@ha
/* 8002D494 0002A3D4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l
/* 8002D498 0002A3D8 38 84 01 51 */ addi r4, r4, 0x151
/* 8002D49C 0002A3DC 48 1F 0D F5 */ bl dMeter2Info_c_NS_setSaveStageName
/* 8002D49C 0002A3DC 48 1F 0D F5 */ bl setSaveStageName__13dMeter2Info_cFPCc
lbl_8002D4A0:
/* 8002D4A0 0002A3E0 2C 1E 00 02 */ cmpwi r30, 2
/* 8002D4A4 0002A3E4 41 82 00 34 */ beq lbl_8002D4D8
include/d/d_com/d_com_inf_game/asm/func_8002D554.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002D578 0002A4B8 39 00 00 01 */ li r8, 1
/* 8002D57C 0002A4BC 39 20 00 00 */ li r9, 0
/* 8002D580 0002A4C0 39 40 00 00 */ li r10, 0
/* 8002D584 0002A4C4 4B FF FD 79 */ bl dComIfGp_setNextStage
/* 8002D584 0002A4C4 4B FF FD 79 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii
/* 8002D588 0002A4C8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002D58C 0002A4CC 7C 08 03 A6 */ mtlr r0
/* 8002D590 0002A4D0 38 21 00 10 */ addi r1, r1, 0x10
include/d/d_com/d_com_inf_game/asm/func_8002D94C.s
+1 -1
View File
@@ -12,7 +12,7 @@ lbl_8002D96C:
/* 8002D974 0002A8B4 41 80 00 28 */ blt lbl_8002D99C
lbl_8002D978:
/* 8002D978 0002A8B8 7C 83 23 78 */ mr r3, r4
/* 8002D97C 0002A8BC 48 00 00 35 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002D97C 0002A8BC 48 00 00 35 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002D980 0002A8C0 54 64 28 34 */ slwi r4, r3, 5
/* 8002D984 0002A8C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002D988 0002A8C8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002D9CC.s
+1 -1
View File
@@ -12,7 +12,7 @@ lbl_8002D9EC:
/* 8002D9F4 0002A934 41 80 00 28 */ blt lbl_8002DA1C
lbl_8002D9F8:
/* 8002D9F8 0002A938 7C 83 23 78 */ mr r3, r4
/* 8002D9FC 0002A93C 4B FF FF B5 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002D9FC 0002A93C 4B FF FF B5 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DA00 0002A940 54 64 28 34 */ slwi r4, r3, 5
/* 8002DA04 0002A944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DA08 0002A948 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DA30.s
+1 -1
View File
@@ -14,7 +14,7 @@ lbl_8002DA50:
/* 8002DA60 0002A9A0 48 00 00 28 */ b lbl_8002DA88
lbl_8002DA64:
/* 8002DA64 0002A9A4 7C 83 23 78 */ mr r3, r4
/* 8002DA68 0002A9A8 4B FF FF 49 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002DA68 0002A9A8 4B FF FF 49 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DA6C 0002A9AC 54 64 28 34 */ slwi r4, r3, 5
/* 8002DA70 0002A9B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DA74 0002A9B4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DA9C.s
+1 -1
View File
@@ -12,7 +12,7 @@ lbl_8002DABC:
/* 8002DAC4 0002AA04 41 80 00 28 */ blt lbl_8002DAEC
lbl_8002DAC8:
/* 8002DAC8 0002AA08 7C 83 23 78 */ mr r3, r4
/* 8002DACC 0002AA0C 4B FF FE E5 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002DACC 0002AA0C 4B FF FE E5 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DAD0 0002AA10 54 64 28 34 */ slwi r4, r3, 5
/* 8002DAD4 0002AA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DAD8 0002AA18 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DB00.s
+1 -1
View File
@@ -12,7 +12,7 @@ lbl_8002DB20:
/* 8002DB28 0002AA68 41 80 00 28 */ blt lbl_8002DB50
lbl_8002DB2C:
/* 8002DB2C 0002AA6C 7C 83 23 78 */ mr r3, r4
/* 8002DB30 0002AA70 4B FF FE 81 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002DB30 0002AA70 4B FF FE 81 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DB34 0002AA74 54 64 28 34 */ slwi r4, r3, 5
/* 8002DB38 0002AA78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DB3C 0002AA7C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DB64.s
+1 -1
View File
@@ -14,7 +14,7 @@ lbl_8002DB84:
/* 8002DB94 0002AAD4 48 00 00 28 */ b lbl_8002DBBC
lbl_8002DB98:
/* 8002DB98 0002AAD8 7C 83 23 78 */ mr r3, r4
/* 8002DB9C 0002AADC 4B FF FE 15 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002DB9C 0002AADC 4B FF FE 15 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DBA0 0002AAE0 54 64 28 34 */ slwi r4, r3, 5
/* 8002DBA4 0002AAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DBA8 0002AAE8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DBD0.s
+1 -1
View File
@@ -14,7 +14,7 @@ lbl_8002DBF0:
/* 8002DC00 0002AB40 48 00 00 28 */ b lbl_8002DC28
lbl_8002DC04:
/* 8002DC04 0002AB44 7C 83 23 78 */ mr r3, r4
/* 8002DC08 0002AB48 4B FF FD A9 */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002DC08 0002AB48 4B FF FD A9 */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DC0C 0002AB4C 54 64 28 34 */ slwi r4, r3, 5
/* 8002DC10 0002AB50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DC14 0002AB54 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DC3C.s
+1 -1
View File
@@ -14,7 +14,7 @@ lbl_8002DC5C:
/* 8002DC6C 0002ABAC 48 00 00 28 */ b lbl_8002DC94
lbl_8002DC70:
/* 8002DC70 0002ABB0 7C 83 23 78 */ mr r3, r4
/* 8002DC74 0002ABB4 4B FF FD 3D */ bl dStage_roomControl_c_NS_getZoneNo
/* 8002DC74 0002ABB4 4B FF FD 3D */ bl getZoneNo__20dStage_roomControl_cFi
/* 8002DC78 0002ABB8 54 64 28 34 */ slwi r4, r3, 5
/* 8002DC7C 0002ABBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DC80 0002ABC0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002DD3C.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002DD60 0002ACA0 48 00 4C FD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 8002DD64 0002ACA4 7C 7F 1B 78 */ mr r31, r3
/* 8002DD68 0002ACA8 7F C3 F3 78 */ mr r3, r30
/* 8002DD6C 0002ACAC 48 00 00 5D */ bl dComIfGs_getMixItemIndex
/* 8002DD6C 0002ACAC 48 00 00 5D */ bl dComIfGs_getMixItemIndex__Fi
/* 8002DD70 0002ACB0 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 8002DD74 0002ACB4 28 00 00 0F */ cmplwi r0, 0xf
/* 8002DD78 0002ACB8 41 80 00 14 */ blt lbl_8002DD8C
include/d/d_com/d_com_inf_game/asm/func_8002DDF4.s
+2 -2
View File
@@ -25,7 +25,7 @@
/* 8002DE54 0002AD94 40 82 00 B4 */ bne lbl_8002DF08
/* 8002DE58 0002AD98 7F E3 FB 78 */ mr r3, r31
/* 8002DE5C 0002AD9C 38 80 00 FF */ li r4, 0xff
/* 8002DE60 0002ADA0 4B FF FE 65 */ bl dComIfGs_setSelectItemIndex
/* 8002DE60 0002ADA0 4B FF FE 65 */ bl dComIfGs_setSelectItemIndex__FiUc
/* 8002DE64 0002ADA4 48 00 00 A4 */ b lbl_8002DF08
lbl_8002DE68:
/* 8002DE68 0002ADA8 38 80 00 FF */ li r4, 0xff
@@ -62,7 +62,7 @@ lbl_8002DE80:
/* 8002DEE0 0002AE20 40 82 00 28 */ bne lbl_8002DF08
/* 8002DEE4 0002AE24 7F E3 FB 78 */ mr r3, r31
/* 8002DEE8 0002AE28 38 80 00 FF */ li r4, 0xff
/* 8002DEEC 0002AE2C 4B FF FD D9 */ bl dComIfGs_setSelectItemIndex
/* 8002DEEC 0002AE2C 4B FF FD D9 */ bl dComIfGs_setSelectItemIndex__FiUc
/* 8002DEF0 0002AE30 48 00 00 18 */ b lbl_8002DF08
lbl_8002DEF4:
/* 8002DEF4 0002AE34 38 80 00 FF */ li r4, 0xff
include/d/d_com/d_com_inf_game/asm/func_8002DF1C.s
+2 -2
View File
@@ -13,12 +13,12 @@
/* 8002DF4C 0002AE8C 40 82 00 E0 */ bne lbl_8002E02C
lbl_8002DF50:
/* 8002DF50 0002AE90 7F C3 F3 78 */ mr r3, r30
/* 8002DF54 0002AE94 4B FF FE 75 */ bl dComIfGs_getMixItemIndex
/* 8002DF54 0002AE94 4B FF FE 75 */ bl dComIfGs_getMixItemIndex__Fi
/* 8002DF58 0002AE98 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8002DF5C 0002AE9C 28 00 00 FF */ cmplwi r0, 0xff
/* 8002DF60 0002AEA0 41 82 00 CC */ beq lbl_8002E02C
/* 8002DF64 0002AEA4 7F C3 F3 78 */ mr r3, r30
/* 8002DF68 0002AEA8 4B FF FE 61 */ bl dComIfGs_getMixItemIndex
/* 8002DF68 0002AEA8 4B FF FE 61 */ bl dComIfGs_getMixItemIndex__Fi
/* 8002DF6C 0002AEAC 54 64 06 3E */ clrlwi r4, r3, 0x18
/* 8002DF70 0002AEB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002DF74 0002AEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
include/d/d_com/d_com_inf_game/asm/func_8002E0E0.s
+3 -3
View File
@@ -15,11 +15,11 @@ lbl_8002E10C:
/* 8002E114 0002B054 88 1F 5E 8F */ lbz r0, 0x5e8f(r31)
/* 8002E118 0002B058 28 00 00 00 */ cmplwi r0, 0
/* 8002E11C 0002B05C 40 82 00 08 */ bne lbl_8002E124
/* 8002E120 0002B060 48 00 01 0D */ bl dComIfGp_createSubExpHeap2D
/* 8002E120 0002B060 48 00 01 0D */ bl dComIfGp_createSubExpHeap2D__Fv
lbl_8002E124:
/* 8002E124 0002B064 38 00 00 05 */ li r0, 5
/* 8002E128 0002B068 98 1F 5E 8F */ stb r0, 0x5e8f(r31)
/* 8002E12C 0002B06C 48 00 02 1D */ bl dComIfGp_checkEmptySubHeap2D
/* 8002E12C 0002B06C 48 00 02 1D */ bl dComIfGp_checkEmptySubHeap2D__Fv
/* 8002E130 0002B070 2C 03 00 00 */ cmpwi r3, 0
/* 8002E134 0002B074 41 80 00 38 */ blt lbl_8002E16C
/* 8002E138 0002B078 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
@@ -31,7 +31,7 @@ lbl_8002E14C:
/* 8002E14C 0002B08C 28 00 00 00 */ cmplwi r0, 0
/* 8002E150 0002B090 40 82 00 10 */ bne lbl_8002E160
/* 8002E154 0002B094 38 60 00 00 */ li r3, 0
/* 8002E158 0002B098 48 00 00 31 */ bl dComIfGp_offHeapLockFlag
/* 8002E158 0002B098 48 00 00 31 */ bl dComIfGp_offHeapLockFlag__Fi
/* 8002E15C 0002B09C 48 00 00 10 */ b lbl_8002E16C
lbl_8002E160:
/* 8002E160 0002B0A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
include/d/d_com/d_com_inf_game/asm/func_8002E188.s
+2 -2
View File
@@ -12,7 +12,7 @@
/* 8002E1B4 0002B0F4 2C 03 00 08 */ cmpwi r3, 8
/* 8002E1B8 0002B0F8 40 82 00 5C */ bne lbl_8002E214
lbl_8002E1BC:
/* 8002E1BC 0002B0FC 48 00 01 CD */ bl dComIfGp_searchUseSubHeap2D
/* 8002E1BC 0002B0FC 48 00 01 CD */ bl dComIfGp_searchUseSubHeap2D__Fi
/* 8002E1C0 0002B100 2C 03 00 00 */ cmpwi r3, 0
/* 8002E1C4 0002B104 41 80 00 18 */ blt lbl_8002E1DC
/* 8002E1C8 0002B108 38 A0 00 00 */ li r5, 0
@@ -29,7 +29,7 @@ lbl_8002E1DC:
/* 8002E1F0 0002B130 88 03 5E 91 */ lbz r0, 0x5e91(r3)
/* 8002E1F4 0002B134 28 00 00 00 */ cmplwi r0, 0
/* 8002E1F8 0002B138 40 82 00 1C */ bne lbl_8002E214
/* 8002E1FC 0002B13C 48 00 00 E1 */ bl dComIfGp_destroySubExpHeap2D
/* 8002E1FC 0002B13C 48 00 00 E1 */ bl dComIfGp_destroySubExpHeap2D__Fv
/* 8002E200 0002B140 38 00 00 00 */ li r0, 0
/* 8002E204 0002B144 98 1F 5E 8F */ stb r0, 0x5e8f(r31)
/* 8002E208 0002B148 48 00 00 0C */ b lbl_8002E214
include/d/d_com/d_com_inf_game/asm/func_8002E2DC.s
+1 -1
View File
@@ -14,7 +14,7 @@ lbl_8002E304:
/* 8002E30C 0002B24C 80 63 5E C0 */ lwz r3, 0x5ec0(r3)
/* 8002E310 0002B250 28 03 00 00 */ cmplwi r3, 0
/* 8002E314 0002B254 41 82 00 0C */ beq lbl_8002E320
/* 8002E318 0002B258 4B FE 0E 95 */ bl mDoExt_destroyExpHeap
/* 8002E318 0002B258 4B FE 0E 95 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap
/* 8002E31C 0002B25C 93 DC 00 00 */ stw r30, 0(r28)
lbl_8002E320:
/* 8002E320 0002B260 3B 7B 00 01 */ addi r27, r27, 1
include/d/d_com/d_com_inf_game/asm/func_8002E5C0.s
+2 -2
View File
@@ -3,7 +3,7 @@
/* 8002E5C8 0002B508 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002E5CC 0002B50C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8002E5D0 0002B510 7C 7F 1B 78 */ mr r31, r3
/* 8002E5D4 0002B514 4B FF F9 49 */ bl dComIfGp_getSelectItem
/* 8002E5D4 0002B514 4B FF F9 49 */ bl dComIfGp_getSelectItem__Fi
/* 8002E5D8 0002B518 38 80 00 00 */ li r4, 0
/* 8002E5DC 0002B51C 38 03 FF 90 */ addi r0, r3, -112
/* 8002E5E0 0002B520 54 00 06 3E */ clrlwi r0, r0, 0x18
@@ -14,7 +14,7 @@
/* 8002E5F4 0002B534 40 82 00 2C */ bne lbl_8002E620
lbl_8002E5F8:
/* 8002E5F8 0002B538 7F E3 FB 78 */ mr r3, r31
/* 8002E5FC 0002B53C 4B FF F7 41 */ bl dComIfGs_getSelectMixItemNoArrowIndex
/* 8002E5FC 0002B53C 4B FF F7 41 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi
/* 8002E600 0002B540 38 03 FF F1 */ addi r0, r3, -15
/* 8002E604 0002B544 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8002E608 0002B548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
include/d/d_com/d_com_inf_game/asm/func_8002E688.s
+2 -2
View File
@@ -1,7 +1,7 @@
/* 8002E688 0002B5C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002E68C 0002B5CC 7C 08 02 A6 */ mflr r0
/* 8002E690 0002B5D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002E694 0002B5D4 4B FF F8 89 */ bl dComIfGp_getSelectItem
/* 8002E694 0002B5D4 4B FF F8 89 */ bl dComIfGp_getSelectItem__Fi
/* 8002E698 0002B5D8 7C 64 1B 78 */ mr r4, r3
/* 8002E69C 0002B5DC 38 60 00 00 */ li r3, 0
/* 8002E6A0 0002B5E0 54 85 06 3E */ clrlwi r5, r4, 0x18
@@ -31,7 +31,7 @@ lbl_8002E6E4:
lbl_8002E6F4:
/* 8002E6F4 0002B634 28 05 00 76 */ cmplwi r5, 0x76
/* 8002E6F8 0002B638 40 82 00 0C */ bne lbl_8002E704
/* 8002E6FC 0002B63C 4B FF FE BD */ bl dComIfGs_getBottleMax
/* 8002E6FC 0002B63C 4B FF FE BD */ bl dComIfGs_getBottleMax__Fv
/* 8002E700 0002B640 54 63 06 3E */ clrlwi r3, r3, 0x18
lbl_8002E704:
/* 8002E704 0002B644 80 01 00 14 */ lwz r0, 0x14(r1)
include/d/d_com/d_com_inf_game/asm/func_8002E714.s
+4 -4
View File
@@ -5,7 +5,7 @@
/* 8002E724 0002B664 48 33 3A B5 */ bl _savegpr_28
/* 8002E728 0002B668 7C 7C 1B 78 */ mr r28, r3
/* 8002E72C 0002B66C 7C 9F 23 78 */ mr r31, r4
/* 8002E730 0002B670 4B FF F7 ED */ bl dComIfGp_getSelectItem
/* 8002E730 0002B670 4B FF F7 ED */ bl dComIfGp_getSelectItem__Fi
/* 8002E734 0002B674 7C 7D 1B 78 */ mr r29, r3
/* 8002E738 0002B678 38 1D FF 90 */ addi r0, r29, -112
/* 8002E73C 0002B67C 54 00 06 3E */ clrlwi r0, r0, 0x18
@@ -16,7 +16,7 @@
/* 8002E750 0002B690 40 82 00 68 */ bne lbl_8002E7B8
lbl_8002E754:
/* 8002E754 0002B694 7F 83 E3 78 */ mr r3, r28
/* 8002E758 0002B698 4B FF F5 E5 */ bl dComIfGs_getSelectMixItemNoArrowIndex
/* 8002E758 0002B698 4B FF F5 E5 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi
/* 8002E75C 0002B69C 38 03 FF F1 */ addi r0, r3, -15
/* 8002E760 0002B6A0 54 1C 06 3E */ clrlwi r28, r0, 0x18
/* 8002E764 0002B6A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
@@ -57,12 +57,12 @@ lbl_8002E7D0:
/* 8002E7E4 0002B724 48 00 42 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 8002E7E8 0002B728 38 03 FF F5 */ addi r0, r3, -11
/* 8002E7EC 0002B72C 54 1C 06 3E */ clrlwi r28, r0, 0x18
/* 8002E7F0 0002B730 4B FF FD C9 */ bl dComIfGs_getBottleMax
/* 8002E7F0 0002B730 4B FF FD C9 */ bl dComIfGs_getBottleMax__Fv
/* 8002E7F4 0002B734 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 8002E7F8 0002B738 7F E0 07 34 */ extsh r0, r31
/* 8002E7FC 0002B73C 7C 00 18 00 */ cmpw r0, r3
/* 8002E800 0002B740 40 81 00 0C */ ble lbl_8002E80C
/* 8002E804 0002B744 4B FF FD B5 */ bl dComIfGs_getBottleMax
/* 8002E804 0002B744 4B FF FD B5 */ bl dComIfGs_getBottleMax__Fv
/* 8002E808 0002B748 54 7F 06 3E */ clrlwi r31, r3, 0x18
lbl_8002E80C:
/* 8002E80C 0002B74C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
include/d/d_com/d_com_inf_game/asm/func_8002E83C.s
+3 -3
View File
@@ -5,7 +5,7 @@
/* 8002E84C 0002B78C 93 C1 00 08 */ stw r30, 8(r1)
/* 8002E850 0002B790 7C 7E 1B 78 */ mr r30, r3
/* 8002E854 0002B794 7C 9F 23 78 */ mr r31, r4
/* 8002E858 0002B798 4B FF F6 C5 */ bl dComIfGp_getSelectItem
/* 8002E858 0002B798 4B FF F6 C5 */ bl dComIfGp_getSelectItem__Fi
/* 8002E85C 0002B79C 38 03 FF 90 */ addi r0, r3, -112
/* 8002E860 0002B7A0 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8002E864 0002B7A4 28 00 00 02 */ cmplwi r0, 2
@@ -15,14 +15,14 @@
/* 8002E874 0002B7B4 40 82 00 2C */ bne lbl_8002E8A0
lbl_8002E878:
/* 8002E878 0002B7B8 7F C3 F3 78 */ mr r3, r30
/* 8002E87C 0002B7BC 4B FF F4 C1 */ bl dComIfGs_getSelectMixItemNoArrowIndex
/* 8002E87C 0002B7BC 4B FF F4 C1 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi
/* 8002E880 0002B7C0 38 03 FF F1 */ addi r0, r3, -15
/* 8002E884 0002B7C4 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8002E888 0002B7C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002E88C 0002B7CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002E890 0002B7D0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8002E894 0002B7D4 7F E5 FB 78 */ mr r5, r31
/* 8002E898 0002B7D8 4B FF CA D5 */ bl dComIfG_play_c_NS_setItemBombNumCount
/* 8002E898 0002B7D8 4B FF CA D5 */ bl setItemBombNumCount__14dComIfG_play_cFUcs
/* 8002E89C 0002B7DC 48 00 00 5C */ b lbl_8002E8F8
lbl_8002E8A0:
/* 8002E8A0 0002B7E0 28 00 00 4B */ cmplwi r0, 0x4b
include/d/d_com/d_com_inf_game/asm/func_8002E910.s
+1 -1
View File
@@ -19,7 +19,7 @@ lbl_8002E944:
/* 8002E954 0002B894 7D 25 4B 78 */ mr r5, r9
/* 8002E958 0002B898 7C 06 03 78 */ mr r6, r0
/* 8002E95C 0002B89C EC 43 20 28 */ fsubs f2, f3, f4
/* 8002E960 0002B8A0 48 02 73 15 */ bl dDlst_shadowControl_c_NS_setReal
/* 8002E960 0002B8A0 48 02 73 15 */ bl setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c
lbl_8002E964:
/* 8002E964 0002B8A4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002E968 0002B8A8 7C 08 03 A6 */ mtlr r0
include/d/d_com/d_com_inf_game/asm/func_8002E974.s
+1 -1
View File
@@ -17,7 +17,7 @@
/* 8002E9B4 0002B8F4 39 00 00 01 */ li r8, 1
/* 8002E9B8 0002B8F8 39 20 00 00 */ li r9, 0
/* 8002E9BC 0002B8FC 39 40 00 00 */ li r10, 0
/* 8002E9C0 0002B900 4B FF E9 3D */ bl dComIfGp_setNextStage
/* 8002E9C0 0002B900 4B FF E9 3D */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii
/* 8002E9C4 0002B904 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002E9C8 0002B908 7C 08 03 A6 */ mtlr r0
/* 8002E9CC 0002B90C 38 21 00 10 */ addi r1, r1, 0x10
include/d/d_com/d_com_inf_game/asm/func_8002E9F0.s
+2 -2
View File
@@ -54,7 +54,7 @@ lbl_8002EA68:
/* 8002EAC0 0002BA00 2C 03 00 00 */ cmpwi r3, 0
/* 8002EAC4 0002BA04 40 82 00 14 */ bne lbl_8002EAD8
/* 8002EAC8 0002BA08 38 60 00 00 */ li r3, 0
/* 8002EACC 0002BA0C 4B FF DE B1 */ bl dComIfG_play_c_NS_getLayerNo
/* 8002EACC 0002BA0C 4B FF DE B1 */ bl getLayerNo__14dComIfG_play_cFi
/* 8002EAD0 0002BA10 2C 03 00 0C */ cmpwi r3, 0xc
/* 8002EAD4 0002BA14 41 82 01 1C */ beq lbl_8002EBF0
lbl_8002EAD8:
@@ -94,7 +94,7 @@ lbl_8002EB50:
/* 8002EB58 0002BA98 48 00 00 8C */ b lbl_8002EBE4
lbl_8002EB5C:
/* 8002EB5C 0002BA9C 38 61 00 40 */ addi r3, r1, 0x40
/* 8002EB60 0002BAA0 48 19 7A CD */ bl dMenuFmap_getStartStageName
/* 8002EB60 0002BAA0 48 19 7A CD */ bl dMenuFmap_getStartStageName__FPv
/* 8002EB64 0002BAA4 7F 3C D2 14 */ add r25, r28, r26
/* 8002EB68 0002BAA8 7F 24 CB 78 */ mr r4, r25
/* 8002EB6C 0002BAAC 48 33 9E 29 */ bl strcmp
include/d/d_com/d_com_inf_game/asm/func_8002EC54.s
+1 -1
View File
@@ -36,7 +36,7 @@ lbl_8002ECC8:
/* 8002ECDC 0002BC1C 48 00 00 78 */ b lbl_8002ED54
lbl_8002ECE0:
/* 8002ECE0 0002BC20 38 61 00 60 */ addi r3, r1, 0x60
/* 8002ECE4 0002BC24 48 19 79 49 */ bl dMenuFmap_getStartStageName
/* 8002ECE4 0002BC24 48 19 79 49 */ bl dMenuFmap_getStartStageName__FPv
/* 8002ECE8 0002BC28 7F BB FA 14 */ add r29, r27, r31
/* 8002ECEC 0002BC2C 7F A4 EB 78 */ mr r4, r29
/* 8002ECF0 0002BC30 48 33 9C A5 */ bl strcmp
include/d/d_com/d_com_inf_game/asm/func_8002F328.s
+1 -1
View File
@@ -17,7 +17,7 @@ lbl_8002F364:
/* 8002F364 0002C2A4 38 7B 00 04 */ addi r3, r27, 4
/* 8002F368 0002C2A8 80 9B 00 00 */ lwz r4, 0(r27)
/* 8002F36C 0002C2AC 7C 84 F8 2E */ lwzx r4, r4, r31
/* 8002F370 0002C2B0 4B FF DC 99 */ bl dComIfG_resDelete
/* 8002F370 0002C2B0 4B FF DC 99 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 8002F374 0002C2B4 93 DB 00 08 */ stw r30, 8(r27)
/* 8002F378 0002C2B8 3B BD FF FF */ addi r29, r29, -1
/* 8002F37C 0002C2BC 3B FF FF FC */ addi r31, r31, -4
include/d/d_com/d_com_inf_game/asm/func_8002F3B4.s
+1 -1
View File
@@ -9,7 +9,7 @@
/* 8002F3D4 0002C314 88 1F 00 0C */ lbz r0, 0xc(r31)
/* 8002F3D8 0002C318 54 00 10 3A */ slwi r0, r0, 2
/* 8002F3DC 0002C31C 7C 84 00 2E */ lwzx r4, r4, r0
/* 8002F3E0 0002C320 4B FF DB E1 */ bl dComIfG_resLoad_X1_
/* 8002F3E0 0002C320 4B FF DB E1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap
/* 8002F3E4 0002C324 2C 03 00 04 */ cmpwi r3, 4
/* 8002F3E8 0002C328 40 82 00 38 */ bne lbl_8002F420
/* 8002F3EC 0002C32C 80 9F 00 00 */ lwz r4, 0(r31)
include/d/d_com/d_com_inf_game/asm/func_8002F434.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002F458 0002C398 3C A5 00 02 */ addis r5, r5, 2
/* 8002F45C 0002C39C 38 A5 D4 F8 */ addi r5, r5, -11016
/* 8002F460 0002C3A0 38 C0 00 40 */ li r6, 0x40
/* 8002F464 0002C3A4 48 00 CF 19 */ bl dRes_control_c_NS_getRes_X1_
/* 8002F464 0002C3A4 48 00 CF 19 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci
/* 8002F468 0002C3A8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002F46C 0002C3AC 7C 08 03 A6 */ mtlr r0
/* 8002F470 0002C3B0 38 21 00 10 */ addi r1, r1, 0x10
include/d/d_com/d_com_inf_game/asm/func_8002F478.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 8002F49C 0002C3DC 3C A5 00 02 */ addis r5, r5, 2
/* 8002F4A0 0002C3E0 38 A5 D4 F8 */ addi r5, r5, -11016
/* 8002F4A4 0002C3E4 38 C0 00 40 */ li r6, 0x40
/* 8002F4A8 0002C3E8 48 00 CE D5 */ bl dRes_control_c_NS_getRes_X1_
/* 8002F4A8 0002C3E8 48 00 CE D5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci
/* 8002F4AC 0002C3EC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002F4B0 0002C3F0 7C 08 03 A6 */ mtlr r0
/* 8002F4B4 0002C3F4 38 21 00 10 */ addi r1, r1, 0x10
include/d/d_com/d_com_inf_game/asm/func_8002F4BC.s
+1 -1
View File
@@ -8,7 +8,7 @@
/* 8002F4D8 0002C418 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l
/* 8002F4DC 0002C41C 38 84 01 6E */ addi r4, r4, 0x16e
/* 8002F4E0 0002C420 4C C6 31 82 */ crclr 6
/* 8002F4E4 0002C424 48 33 6F F9 */ bl func_803664DC
/* 8002F4E4 0002C424 48 33 6F F9 */ bl sprintf
/* 8002F4E8 0002C428 3C 60 80 42 */ lis r3, lbl_80423FD0@ha
/* 8002F4EC 0002C42C 38 63 3F D0 */ addi r3, r3, lbl_80423FD0@l
/* 8002F4F0 0002C430 80 01 00 14 */ lwz r0, 0x14(r1)
include/d/d_com/d_com_inf_game/asm/func_8002F52C.s
+2 -2
View File
@@ -19,12 +19,12 @@
/* 8002F574 0002C4B4 7F C0 07 35 */ extsh. r0, r30
/* 8002F578 0002C4B8 40 82 00 10 */ bne lbl_8002F588
/* 8002F57C 0002C4BC 7F A4 EB 78 */ mr r4, r29
/* 8002F580 0002C4C0 48 22 DF B9 */ bl dTimer_c_NS_start
/* 8002F580 0002C4C0 48 22 DF B9 */ bl start__8dTimer_cFi
/* 8002F584 0002C4C4 48 00 00 10 */ b lbl_8002F594
lbl_8002F588:
/* 8002F588 0002C4C8 7F A4 EB 78 */ mr r4, r29
/* 8002F58C 0002C4CC 7F C5 F3 78 */ mr r5, r30
/* 8002F590 0002C4D0 48 22 E0 89 */ bl dTimer_c_NS_start_X1_
/* 8002F590 0002C4D0 48 22 E0 89 */ bl start__8dTimer_cFis
lbl_8002F594:
/* 8002F594 0002C4D4 38 60 00 01 */ li r3, 1
/* 8002F598 0002C4D8 48 00 00 10 */ b lbl_8002F5A8
include/d/d_com/d_com_inf_game/asm/func_8002F5C0.s
+1 -1
View File
@@ -16,7 +16,7 @@
/* 8002F5FC 0002C53C 28 03 00 00 */ cmplwi r3, 0
/* 8002F600 0002C540 41 82 00 14 */ beq lbl_8002F614
/* 8002F604 0002C544 38 80 00 04 */ li r4, 4
/* 8002F608 0002C548 48 22 E1 E1 */ bl dTimer_c_NS_stop
/* 8002F608 0002C548 48 22 E1 E1 */ bl stop__8dTimer_cFUc
/* 8002F60C 0002C54C 38 60 00 01 */ li r3, 1
/* 8002F610 0002C550 48 00 00 10 */ b lbl_8002F620
lbl_8002F614:
include/d/d_com/d_com_inf_game/asm/func_8002F638.s
+1 -1
View File
@@ -16,7 +16,7 @@
/* 8002F674 0002C5B4 28 03 00 00 */ cmplwi r3, 0
/* 8002F678 0002C5B8 41 82 00 14 */ beq lbl_8002F68C
/* 8002F67C 0002C5BC 38 80 00 04 */ li r4, 4
/* 8002F680 0002C5C0 48 22 E1 ED */ bl dTimer_c_NS_restart
/* 8002F680 0002C5C0 48 22 E1 ED */ bl restart__8dTimer_cFUc
/* 8002F684 0002C5C4 38 60 00 01 */ li r3, 1
/* 8002F688 0002C5C8 48 00 00 10 */ b lbl_8002F698
lbl_8002F68C:
include/d/d_com/d_com_inf_game/asm/func_8002F6B0.s
+1 -1
View File
@@ -17,7 +17,7 @@
/* 8002F6F0 0002C630 28 03 00 00 */ cmplwi r3, 0
/* 8002F6F4 0002C634 41 82 00 14 */ beq lbl_8002F708
/* 8002F6F8 0002C638 7F C4 F3 78 */ mr r4, r30
/* 8002F6FC 0002C63C 48 22 E2 25 */ bl dTimer_c_NS_end
/* 8002F6FC 0002C63C 48 22 E2 25 */ bl end__8dTimer_cFi
/* 8002F700 0002C640 38 60 00 01 */ li r3, 1
/* 8002F704 0002C644 48 00 00 10 */ b lbl_8002F714
lbl_8002F708:
include/d/d_com/d_com_inf_game/asm/func_8002F72C.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 8002F764 0002C6A4 4B FF D4 79 */ bl getTimerPtr__14dComIfG_play_cFv
/* 8002F768 0002C6A8 28 03 00 00 */ cmplwi r3, 0
/* 8002F76C 0002C6AC 41 82 00 0C */ beq lbl_8002F778
/* 8002F770 0002C6B0 48 22 DD B5 */ bl dTimer_c_NS_deleteCheck
/* 8002F770 0002C6B0 48 22 DD B5 */ bl deleteCheck__8dTimer_cFv
/* 8002F774 0002C6B4 48 00 00 10 */ b lbl_8002F784
lbl_8002F778:
/* 8002F778 0002C6B8 38 60 00 00 */ li r3, 0
include/d/d_com/d_com_inf_game/asm/func_8002F79C.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 8002F7D4 0002C714 4B FF D4 09 */ bl getTimerPtr__14dComIfG_play_cFv
/* 8002F7D8 0002C718 28 03 00 00 */ cmplwi r3, 0
/* 8002F7DC 0002C71C 41 82 00 10 */ beq lbl_8002F7EC
/* 8002F7E0 0002C720 48 22 E2 01 */ bl dTimer_c_NS_deleteRequest
/* 8002F7E0 0002C720 48 22 E2 01 */ bl deleteRequest__8dTimer_cFv
/* 8002F7E4 0002C724 38 60 00 01 */ li r3, 1
/* 8002F7E8 0002C728 48 00 00 10 */ b lbl_8002F7F8
lbl_8002F7EC:
include/d/d_com/d_com_inf_game/asm/func_8002FB20.s
+1 -1
View File
@@ -16,7 +16,7 @@ lbl_8002FB58:
/* 8002FB58 0002CA98 7F A3 EB 78 */ mr r3, r29
/* 8002FB5C 0002CA9C 7F C4 F3 78 */ mr r4, r30
/* 8002FB60 0002CAA0 7F E5 FB 78 */ mr r5, r31
/* 8002FB64 0002CAA4 4B FF FF BD */ bl dComLbG_PhaseHandler
/* 8002FB64 0002CAA4 4B FF FF BD */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv
lbl_8002FB68:
/* 8002FB68 0002CAA8 39 61 00 20 */ addi r11, r1, 0x20
/* 8002FB6C 0002CAAC 48 33 26 BD */ bl _restgpr_29
include/d/d_com/d_com_inf_game/asm/func_8002FD18.s
+4 -4
View File
@@ -12,10 +12,10 @@
/* 8002FD44 0002CC84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002FD48 0002CC88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002FD4C 0002CC8C 48 00 04 F9 */ bl __ct__13dComIfG_inf_cFv
/*.global dComIfG_inf_c_NS_dtor*/
/* 8002FD50 0002CC90 3C 80 80 03 */ lis r4, dComIfG_inf_c_NS_dtor@ha
/*.global dComIfG_inf_c_NS_dtor*/
/* 8002FD54 0002CC94 38 84 FD 74 */ addi r4, r4, dComIfG_inf_c_NS_dtor@l
/*.global __dt__13dComIfG_inf_cFv*/
/* 8002FD50 0002CC90 3C 80 80 03 */ lis r4, __dt__13dComIfG_inf_cFv@ha
/*.global __dt__13dComIfG_inf_cFv*/
/* 8002FD54 0002CC94 38 84 FD 74 */ addi r4, r4, __dt__13dComIfG_inf_cFv@l
/* 8002FD58 0002CC98 3C A0 80 40 */ lis r5, lbl_804061B4@ha
/* 8002FD5C 0002CC9C 38 A5 61 B4 */ addi r5, r5, lbl_804061B4@l
/* 8002FD60 0002CCA0 48 33 1E C5 */ bl func_80361C24
include/d/d_com/d_com_inf_game/asm/func_8002FD74.s
+3 -3
View File
@@ -9,13 +9,13 @@
/* 8002FD94 0002CCD4 3C 7E 00 02 */ addis r3, r30, 2
/* 8002FD98 0002CCD8 38 80 FF FF */ li r4, -1
/* 8002FD9C 0002CCDC 38 63 C2 F8 */ addi r3, r3, -15624
/* 8002FDA0 0002CCE0 48 00 C2 11 */ bl dRes_control_c_NS_dtor
/* 8002FDA0 0002CCE0 48 00 C2 11 */ bl __dt__14dRes_control_cFv
/* 8002FDA4 0002CCE4 38 7E 5F 64 */ addi r3, r30, 0x5f64
/* 8002FDA8 0002CCE8 38 80 FF FF */ li r4, -1
/* 8002FDAC 0002CCEC 48 02 66 E1 */ bl dDlst_list_c_NS_dtor
/* 8002FDAC 0002CCEC 48 02 66 E1 */ bl __dt__12dDlst_list_cFv
/* 8002FDB0 0002CCF0 38 7E 0F 38 */ addi r3, r30, 0xf38
/* 8002FDB4 0002CCF4 38 80 FF FF */ li r4, -1
/* 8002FDB8 0002CCF8 48 00 00 31 */ bl dComIfG_play_c_NS_dtor
/* 8002FDB8 0002CCF8 48 00 00 31 */ bl __dt__14dComIfG_play_cFv
/* 8002FDBC 0002CCFC 7F E0 07 35 */ extsh. r0, r31
/* 8002FDC0 0002CD00 40 81 00 0C */ ble lbl_8002FDCC
/* 8002FDC4 0002CD04 7F C3 F3 78 */ mr r3, r30
include/d/d_com/d_com_inf_game/asm/func_8002FDE8.s
+27 -27
View File
@@ -7,49 +7,49 @@
/* 8002FE00 0002CD40 7C 9E 23 78 */ mr r30, r4
/* 8002FE04 0002CD44 41 82 00 D8 */ beq lbl_8002FEDC
/* 8002FE08 0002CD48 38 7F 4E 3C */ addi r3, r31, 0x4e3c
/*.global dComIfG_camera_info_class_NS_dtor*/
/* 8002FE0C 0002CD4C 3C 80 80 03 */ lis r4, dComIfG_camera_info_class_NS_dtor@ha
/*.global dComIfG_camera_info_class_NS_dtor*/
/* 8002FE10 0002CD50 38 84 02 08 */ addi r4, r4, dComIfG_camera_info_class_NS_dtor@l
/*.global __dt__25dComIfG_camera_info_classFv*/
/* 8002FE0C 0002CD4C 3C 80 80 03 */ lis r4, __dt__25dComIfG_camera_info_classFv@ha
/*.global __dt__25dComIfG_camera_info_classFv*/
/* 8002FE10 0002CD50 38 84 02 08 */ addi r4, r4, __dt__25dComIfG_camera_info_classFv@l
/* 8002FE14 0002CD54 38 A0 00 38 */ li r5, 0x38
/* 8002FE18 0002CD58 38 C0 00 01 */ li r6, 1
/* 8002FE1C 0002CD5C 48 33 1E CD */ bl func_80361CE8
/* 8002FE1C 0002CD5C 48 33 1E CD */ bl __destroy_arr
/* 8002FE20 0002CD60 38 7F 4E 10 */ addi r3, r31, 0x4e10
/*.global dDlst_window_c_NS_dtor*/
/* 8002FE24 0002CD64 3C 80 80 03 */ lis r4, dDlst_window_c_NS_dtor@ha
/*.global dDlst_window_c_NS_dtor*/
/* 8002FE28 0002CD68 38 84 01 CC */ addi r4, r4, dDlst_window_c_NS_dtor@l
/*.global __dt__14dDlst_window_cFv*/
/* 8002FE24 0002CD64 3C 80 80 03 */ lis r4, __dt__14dDlst_window_cFv@ha
/*.global __dt__14dDlst_window_cFv*/
/* 8002FE28 0002CD68 38 84 01 CC */ addi r4, r4, __dt__14dDlst_window_cFv@l
/* 8002FE2C 0002CD6C 38 A0 00 2C */ li r5, 0x2c
/* 8002FE30 0002CD70 38 C0 00 01 */ li r6, 1
/* 8002FE34 0002CD74 48 33 1E B5 */ bl func_80361CE8
/* 8002FE34 0002CD74 48 33 1E B5 */ bl __destroy_arr
/* 8002FE38 0002CD78 38 7F 47 80 */ addi r3, r31, 0x4780
/* 8002FE3C 0002CD7C 38 80 FF FF */ li r4, -1
/* 8002FE40 0002CD80 48 04 09 35 */ bl dAttention_c_NS_dtor
/* 8002FE40 0002CD80 48 04 09 35 */ bl __dt__12dAttention_cFv
/* 8002FE44 0002CD84 34 1F 40 C0 */ addic. r0, r31, 0x40c0
/* 8002FE48 0002CD88 41 82 00 1C */ beq lbl_8002FE64
/* 8002FE4C 0002CD8C 38 7F 40 C0 */ addi r3, r31, 0x40c0
/*.global dEvDtBase_c_NS_dtor*/
/* 8002FE50 0002CD90 3C 80 80 03 */ lis r4, dEvDtBase_c_NS_dtor@ha
/*.global dEvDtBase_c_NS_dtor*/
/* 8002FE54 0002CD94 38 84 01 90 */ addi r4, r4, dEvDtBase_c_NS_dtor@l
/*.global __dt__11dEvDtBase_cFv*/
/* 8002FE50 0002CD90 3C 80 80 03 */ lis r4, __dt__11dEvDtBase_cFv@ha
/*.global __dt__11dEvDtBase_cFv*/
/* 8002FE54 0002CD94 38 84 01 90 */ addi r4, r4, __dt__11dEvDtBase_cFv@l
/* 8002FE58 0002CD98 38 A0 00 24 */ li r5, 0x24
/* 8002FE5C 0002CD9C 38 C0 00 0B */ li r6, 0xb
/* 8002FE60 0002CDA0 48 33 1E 89 */ bl func_80361CE8
/* 8002FE60 0002CDA0 48 33 1E 89 */ bl __destroy_arr
lbl_8002FE64:
/* 8002FE64 0002CDA4 34 1F 3F 90 */ addic. r0, r31, 0x3f90
/* 8002FE68 0002CDA8 41 82 00 1C */ beq lbl_8002FE84
/* 8002FE6C 0002CDAC 38 7F 3F 94 */ addi r3, r31, 0x3f94
/*.global dEvt_order_c_NS_dtor*/
/* 8002FE70 0002CDB0 3C 80 80 03 */ lis r4, dEvt_order_c_NS_dtor@ha
/*.global dEvt_order_c_NS_dtor*/
/* 8002FE74 0002CDB4 38 84 01 54 */ addi r4, r4, dEvt_order_c_NS_dtor@l
/*.global __dt__12dEvt_order_cFv*/
/* 8002FE70 0002CDB0 3C 80 80 03 */ lis r4, __dt__12dEvt_order_cFv@ha
/*.global __dt__12dEvt_order_cFv*/
/* 8002FE74 0002CDB4 38 84 01 54 */ addi r4, r4, __dt__12dEvt_order_cFv@l
/* 8002FE78 0002CDB8 38 A0 00 18 */ li r5, 0x18
/* 8002FE7C 0002CDBC 38 C0 00 08 */ li r6, 8
/* 8002FE80 0002CDC0 48 33 1E 69 */ bl func_80361CE8
/* 8002FE80 0002CDC0 48 33 1E 69 */ bl __destroy_arr
lbl_8002FE84:
/* 8002FE84 0002CDC4 38 7F 14 04 */ addi r3, r31, 0x1404
/* 8002FE88 0002CDC8 38 80 FF FF */ li r4, -1
/* 8002FE8C 0002CDCC 48 00 00 B5 */ bl dCcS_NS_dtor
/* 8002FE8C 0002CDCC 48 00 00 B5 */ bl __dt__4dCcSFv
/* 8002FE90 0002CDD0 28 1F 00 00 */ cmplwi r31, 0
/* 8002FE94 0002CDD4 41 82 00 38 */ beq lbl_8002FECC
/* 8002FE98 0002CDD8 3C 60 80 3B */ lis r3, lbl_803AB608@ha
@@ -60,13 +60,13 @@ lbl_8002FE84:
/* 8002FEAC 0002CDEC 38 03 B6 1C */ addi r0, r3, lbl_803AB61C@l
/* 8002FEB0 0002CDF0 90 1F 14 00 */ stw r0, 0x1400(r31)
/* 8002FEB4 0002CDF4 7F E3 FB 78 */ mr r3, r31
/*.global cBgS_ChkElm_NS_dtor*/
/* 8002FEB8 0002CDF8 3C 80 80 03 */ lis r4, cBgS_ChkElm_NS_dtor@ha
/*.global cBgS_ChkElm_NS_dtor*/
/* 8002FEBC 0002CDFC 38 84 FE F8 */ addi r4, r4, cBgS_ChkElm_NS_dtor@l
/*.global __dt__11cBgS_ChkElmFv*/
/* 8002FEB8 0002CDF8 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha
/*.global __dt__11cBgS_ChkElmFv*/
/* 8002FEBC 0002CDFC 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l
/* 8002FEC0 0002CE00 38 A0 00 14 */ li r5, 0x14
/* 8002FEC4 0002CE04 38 C0 01 00 */ li r6, 0x100
/* 8002FEC8 0002CE08 48 33 1E 21 */ bl func_80361CE8
/* 8002FEC8 0002CE08 48 33 1E 21 */ bl __destroy_arr
lbl_8002FECC:
/* 8002FECC 0002CE0C 7F C0 07 35 */ extsh. r0, r30
/* 8002FED0 0002CE10 40 81 00 0C */ ble lbl_8002FEDC
include/d/d_com/d_com_inf_game/asm/func_8002FF40.s
+10 -10
View File
@@ -64,21 +64,21 @@ lbl_80030010:
/* 80030030 0002CF70 90 1E 2A 2C */ stw r0, 0x2a2c(r30)
lbl_80030034:
/* 80030034 0002CF74 38 7E 29 D4 */ addi r3, r30, 0x29d4
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030038 0002CF78 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha
/*.global dCcMassS_Obj_NS_dtor*/
/* 8003003C 0002CF7C 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030038 0002CF78 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha
/*.global __dt__12dCcMassS_ObjFv*/
/* 8003003C 0002CF7C 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l
/* 80030040 0002CF80 38 A0 00 20 */ li r5, 0x20
/* 80030044 0002CF84 38 C0 00 02 */ li r6, 2
/* 80030048 0002CF88 48 33 1C A1 */ bl func_80361CE8
/* 80030048 0002CF88 48 33 1C A1 */ bl __destroy_arr
/* 8003004C 0002CF8C 38 7E 28 90 */ addi r3, r30, 0x2890
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030050 0002CF90 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030054 0002CF94 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030050 0002CF90 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030054 0002CF94 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l
/* 80030058 0002CF98 38 A0 00 20 */ li r5, 0x20
/* 8003005C 0002CF9C 38 C0 00 0A */ li r6, 0xa
/* 80030060 0002CFA0 48 33 1C 89 */ bl func_80361CE8
/* 80030060 0002CFA0 48 33 1C 89 */ bl __destroy_arr
/* 80030064 0002CFA4 34 1E 28 4C */ addic. r0, r30, 0x284c
/* 80030068 0002CFA8 41 82 00 24 */ beq lbl_8003008C
/* 8003006C 0002CFAC 3C 60 80 3A */ lis r3, lbl_803A7200@ha
include/d/d_com/d_com_inf_game/asm/func_80030244.s
+60 -60
View File
@@ -12,14 +12,14 @@
/* 80030270 0002D1B0 38 A0 00 00 */ li r5, 0
/* 80030274 0002D1B4 38 C0 00 20 */ li r6, 0x20
/* 80030278 0002D1B8 38 E0 00 20 */ li r7, 0x20
/* 8003027C 0002D1BC 48 33 1A E5 */ bl func_80361D60
/* 8003027C 0002D1BC 48 33 1A E5 */ bl __construct_array
/* 80030280 0002D1C0 38 7E 05 F0 */ addi r3, r30, 0x5f0
/* 80030284 0002D1C4 3C 80 80 03 */ lis r4, __ct__13dSv_memory2_cFv@ha
/* 80030288 0002D1C8 38 84 0D 80 */ addi r4, r4, __ct__13dSv_memory2_cFv@l
/* 8003028C 0002D1CC 38 A0 00 00 */ li r5, 0
/* 80030290 0002D1D0 38 C0 00 08 */ li r6, 8
/* 80030294 0002D1D4 38 E0 00 40 */ li r7, 0x40
/* 80030298 0002D1D8 48 33 1A C9 */ bl func_80361D60
/* 80030298 0002D1D8 48 33 1A C9 */ bl __construct_array
/* 8003029C 0002D1DC 38 7D 09 58 */ addi r3, r29, 0x958
/* 800302A0 0002D1E0 48 00 47 C5 */ bl init__12dSv_memory_cFv
/* 800302A4 0002D1E4 38 7D 09 B4 */ addi r3, r29, 0x9b4
@@ -30,7 +30,7 @@
/* 800302B0 0002D1F0 38 A0 00 00 */ li r5, 0
/* 800302B4 0002D1F4 38 C0 00 20 */ li r6, 0x20
/* 800302B8 0002D1F8 38 E0 00 20 */ li r7, 0x20
/* 800302BC 0002D1FC 48 33 1A A5 */ bl func_80361D60
/* 800302BC 0002D1FC 48 33 1A A5 */ bl __construct_array
/* 800302C0 0002D200 3B DF 0F 38 */ addi r30, r31, 0xf38
/* 800302C4 0002D204 7F DD F3 78 */ mr r29, r30
/* 800302C8 0002D208 3C 60 80 3B */ lis r3, lbl_803AB61C@ha
@@ -41,13 +41,13 @@
/* 800302D8 0002D218 3C 80 80 03 */ lis r4, __ct__11cBgS_ChkElmFv@ha
/*.global cBgS_ChkElm*/
/* 800302DC 0002D21C 38 84 0D 38 */ addi r4, r4, __ct__11cBgS_ChkElmFv@l
/*.global cBgS_ChkElm_NS_dtor*/
/* 800302E0 0002D220 3C A0 80 03 */ lis r5, cBgS_ChkElm_NS_dtor@ha
/*.global cBgS_ChkElm_NS_dtor*/
/* 800302E4 0002D224 38 A5 FE F8 */ addi r5, r5, cBgS_ChkElm_NS_dtor@l
/*.global __dt__11cBgS_ChkElmFv*/
/* 800302E0 0002D220 3C A0 80 03 */ lis r5, __dt__11cBgS_ChkElmFv@ha
/*.global __dt__11cBgS_ChkElmFv*/
/* 800302E4 0002D224 38 A5 FE F8 */ addi r5, r5, __dt__11cBgS_ChkElmFv@l
/* 800302E8 0002D228 38 C0 00 14 */ li r6, 0x14
/* 800302EC 0002D22C 38 E0 01 00 */ li r7, 0x100
/* 800302F0 0002D230 48 33 1A 71 */ bl func_80361D60
/* 800302F0 0002D230 48 33 1A 71 */ bl __construct_array
/* 800302F4 0002D234 3C 60 80 3B */ lis r3, lbl_803AB608@ha
/* 800302F8 0002D238 38 03 B6 08 */ addi r0, r3, lbl_803AB608@l
/* 800302FC 0002D23C 90 1D 14 00 */ stw r0, 0x1400(r29)
@@ -78,53 +78,53 @@
/* 80030360 0002D2A0 38 03 9C 48 */ addi r0, r3, lbl_803A9C48@l
/* 80030364 0002D2A4 90 1E 47 88 */ stw r0, 0x4788(r30)
/* 80030368 0002D2A8 38 7E 47 A8 */ addi r3, r30, 0x47a8
/*.global dAttDraw_c_NS_ctor*/
/* 8003036C 0002D2AC 3C 80 80 03 */ lis r4, dAttDraw_c_NS_ctor@ha
/*.global dAttDraw_c_NS_ctor*/
/* 80030370 0002D2B0 38 84 07 F0 */ addi r4, r4, dAttDraw_c_NS_ctor@l
/*.global dAttDraw_c_NS_dtor*/
/* 80030374 0002D2B4 3C A0 80 03 */ lis r5, dAttDraw_c_NS_dtor@ha
/*.global dAttDraw_c_NS_dtor*/
/* 80030378 0002D2B8 38 A5 05 4C */ addi r5, r5, dAttDraw_c_NS_dtor@l
/*.global __ct__10dAttDraw_cFv*/
/* 8003036C 0002D2AC 3C 80 80 03 */ lis r4, __ct__10dAttDraw_cFv@ha
/*.global __ct__10dAttDraw_cFv*/
/* 80030370 0002D2B0 38 84 07 F0 */ addi r4, r4, __ct__10dAttDraw_cFv@l
/*.global __dt__10dAttDraw_cFv*/
/* 80030374 0002D2B4 3C A0 80 03 */ lis r5, __dt__10dAttDraw_cFv@ha
/*.global __dt__10dAttDraw_cFv*/
/* 80030378 0002D2B8 38 A5 05 4C */ addi r5, r5, __dt__10dAttDraw_cFv@l
/* 8003037C 0002D2BC 38 C0 01 78 */ li r6, 0x178
/* 80030380 0002D2C0 38 E0 00 02 */ li r7, 2
/* 80030384 0002D2C4 48 33 19 DD */ bl func_80361D60
/* 80030384 0002D2C4 48 33 19 DD */ bl __construct_array
/* 80030388 0002D2C8 38 7E 4A B8 */ addi r3, r30, 0x4ab8
/*.global dAttList_c_NS_ctor*/
/* 8003038C 0002D2CC 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha
/*.global dAttList_c_NS_ctor*/
/* 80030390 0002D2D0 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l
/*.global dAttList_c_NS_dtor*/
/* 80030394 0002D2D4 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha
/*.global dAttList_c_NS_dtor*/
/* 80030398 0002D2D8 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l
/*.global __ct__10dAttList_cFv*/
/* 8003038C 0002D2CC 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha
/*.global __ct__10dAttList_cFv*/
/* 80030390 0002D2D0 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l
/*.global __dt__10dAttList_cFv*/
/* 80030394 0002D2D4 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha
/*.global __dt__10dAttList_cFv*/
/* 80030398 0002D2D8 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l
/* 8003039C 0002D2DC 38 C0 00 14 */ li r6, 0x14
/* 800303A0 0002D2E0 38 E0 00 08 */ li r7, 8
/* 800303A4 0002D2E4 48 33 19 BD */ bl func_80361D60
/* 800303A4 0002D2E4 48 33 19 BD */ bl __construct_array
/* 800303A8 0002D2E8 38 7E 4B 60 */ addi r3, r30, 0x4b60
/*.global dAttList_c_NS_ctor*/
/* 800303AC 0002D2EC 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha
/*.global dAttList_c_NS_ctor*/
/* 800303B0 0002D2F0 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l
/*.global dAttList_c_NS_dtor*/
/* 800303B4 0002D2F4 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha
/*.global dAttList_c_NS_dtor*/
/* 800303B8 0002D2F8 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l
/*.global __ct__10dAttList_cFv*/
/* 800303AC 0002D2EC 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha
/*.global __ct__10dAttList_cFv*/
/* 800303B0 0002D2F0 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l
/*.global __dt__10dAttList_cFv*/
/* 800303B4 0002D2F4 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha
/*.global __dt__10dAttList_cFv*/
/* 800303B8 0002D2F8 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l
/* 800303BC 0002D2FC 38 C0 00 14 */ li r6, 0x14
/* 800303C0 0002D300 38 E0 00 04 */ li r7, 4
/* 800303C4 0002D304 48 33 19 9D */ bl func_80361D60
/* 800303C4 0002D304 48 33 19 9D */ bl __construct_array
/* 800303C8 0002D308 38 7E 4B B8 */ addi r3, r30, 0x4bb8
/*.global dAttList_c_NS_ctor*/
/* 800303CC 0002D30C 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha
/*.global dAttList_c_NS_ctor*/
/* 800303D0 0002D310 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l
/*.global dAttList_c_NS_dtor*/
/* 800303D4 0002D314 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha
/*.global dAttList_c_NS_dtor*/
/* 800303D8 0002D318 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l
/*.global __ct__10dAttList_cFv*/
/* 800303CC 0002D30C 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha
/*.global __ct__10dAttList_cFv*/
/* 800303D0 0002D310 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l
/*.global __dt__10dAttList_cFv*/
/* 800303D4 0002D314 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha
/*.global __dt__10dAttList_cFv*/
/* 800303D8 0002D318 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l
/* 800303DC 0002D31C 38 C0 00 14 */ li r6, 0x14
/* 800303E0 0002D320 38 E0 00 04 */ li r7, 4
/* 800303E4 0002D324 48 33 19 7D */ bl func_80361D60
/* 800303E4 0002D324 48 33 19 7D */ bl __construct_array
/* 800303E8 0002D328 3C 60 80 3B */ lis r3, lbl_803A9C60@ha
/* 800303EC 0002D32C 38 03 9C 60 */ addi r0, r3, lbl_803A9C60@l
/* 800303F0 0002D330 90 1E 4C 88 */ stw r0, 0x4c88(r30)
@@ -133,25 +133,25 @@
/* 800303F8 0002D338 3C 80 80 03 */ lis r4, __ct__14dDlst_window_cFv@ha
/*.global dDlst_window_c*/
/* 800303FC 0002D33C 38 84 04 CC */ addi r4, r4, __ct__14dDlst_window_cFv@l
/*.global dDlst_window_c_NS_dtor*/
/* 80030400 0002D340 3C A0 80 03 */ lis r5, dDlst_window_c_NS_dtor@ha
/*.global dDlst_window_c_NS_dtor*/
/* 80030404 0002D344 38 A5 01 CC */ addi r5, r5, dDlst_window_c_NS_dtor@l
/*.global __dt__14dDlst_window_cFv*/
/* 80030400 0002D340 3C A0 80 03 */ lis r5, __dt__14dDlst_window_cFv@ha
/*.global __dt__14dDlst_window_cFv*/
/* 80030404 0002D344 38 A5 01 CC */ addi r5, r5, __dt__14dDlst_window_cFv@l
/* 80030408 0002D348 38 C0 00 2C */ li r6, 0x2c
/* 8003040C 0002D34C 38 E0 00 01 */ li r7, 1
/* 80030410 0002D350 48 33 19 51 */ bl func_80361D60
/* 80030410 0002D350 48 33 19 51 */ bl __construct_array
/* 80030414 0002D354 38 7E 4E 3C */ addi r3, r30, 0x4e3c
/*.global dComIfG_camera_info_class*/
/* 80030418 0002D358 3C 80 80 03 */ lis r4, __ct__25dComIfG_camera_info_classFv@ha
/*.global dComIfG_camera_info_class*/
/* 8003041C 0002D35C 38 84 04 C8 */ addi r4, r4, __ct__25dComIfG_camera_info_classFv@l
/*.global dComIfG_camera_info_class_NS_dtor*/
/* 80030420 0002D360 3C A0 80 03 */ lis r5, dComIfG_camera_info_class_NS_dtor@ha
/*.global dComIfG_camera_info_class_NS_dtor*/
/* 80030424 0002D364 38 A5 02 08 */ addi r5, r5, dComIfG_camera_info_class_NS_dtor@l
/*.global __dt__25dComIfG_camera_info_classFv*/
/* 80030420 0002D360 3C A0 80 03 */ lis r5, __dt__25dComIfG_camera_info_classFv@ha
/*.global __dt__25dComIfG_camera_info_classFv*/
/* 80030424 0002D364 38 A5 02 08 */ addi r5, r5, __dt__25dComIfG_camera_info_classFv@l
/* 80030428 0002D368 38 C0 00 38 */ li r6, 0x38
/* 8003042C 0002D36C 38 E0 00 01 */ li r7, 1
/* 80030430 0002D370 48 33 19 31 */ bl func_80361D60
/* 80030430 0002D370 48 33 19 31 */ bl __construct_array
/* 80030434 0002D374 38 00 FF FF */ li r0, -1
/* 80030438 0002D378 90 1E 50 04 */ stw r0, 0x5004(r30)
/* 8003043C 0002D37C 38 00 00 00 */ li r0, 0
@@ -169,21 +169,21 @@
/* 80030468 0002D3A8 3C 80 80 04 */ lis r4, __ct__11dRes_info_cFv@ha
/*.global dRes_info_c*/
/* 8003046C 0002D3AC 38 84 A2 60 */ addi r4, r4, __ct__11dRes_info_cFv@l
/* 80030470 0002D3B0 3C A0 80 04 */ lis r5, dRes_info_c_NS_dtor@ha
/* 80030474 0002D3B4 38 A5 A2 80 */ addi r5, r5, dRes_info_c_NS_dtor@l
/* 80030470 0002D3B0 3C A0 80 04 */ lis r5, __dt__11dRes_info_cFv@ha
/* 80030474 0002D3B4 38 A5 A2 80 */ addi r5, r5, __dt__11dRes_info_cFv@l
/* 80030478 0002D3B8 38 C0 00 24 */ li r6, 0x24
/* 8003047C 0002D3BC 38 E0 00 80 */ li r7, 0x80
/* 80030480 0002D3C0 48 33 18 E1 */ bl func_80361D60
/* 80030480 0002D3C0 48 33 18 E1 */ bl __construct_array
/* 80030484 0002D3C4 38 7D 12 00 */ addi r3, r29, 0x1200
/*.global dRes_info_c*/
/* 80030488 0002D3C8 3C 80 80 04 */ lis r4, __ct__11dRes_info_cFv@ha
/*.global dRes_info_c*/
/* 8003048C 0002D3CC 38 84 A2 60 */ addi r4, r4, __ct__11dRes_info_cFv@l
/* 80030490 0002D3D0 3C A0 80 04 */ lis r5, dRes_info_c_NS_dtor@ha
/* 80030494 0002D3D4 38 A5 A2 80 */ addi r5, r5, dRes_info_c_NS_dtor@l
/* 80030490 0002D3D0 3C A0 80 04 */ lis r5, __dt__11dRes_info_cFv@ha
/* 80030494 0002D3D4 38 A5 A2 80 */ addi r5, r5, __dt__11dRes_info_cFv@l
/* 80030498 0002D3D8 38 C0 00 24 */ li r6, 0x24
/* 8003049C 0002D3DC 38 E0 00 40 */ li r7, 0x40
/* 800304A0 0002D3E0 48 33 18 C1 */ bl func_80361D60
/* 800304A0 0002D3E0 48 33 18 C1 */ bl __construct_array
/* 800304A4 0002D3E4 7F E3 FB 78 */ mr r3, r31
/* 800304A8 0002D3E8 4B FF C7 3D */ bl ct__13dComIfG_inf_cFv
/* 800304AC 0002D3EC 7F E3 FB 78 */ mr r3, r31
include/d/d_com/d_com_inf_game/asm/func_8003054C.s
+25 -25
View File
@@ -47,45 +47,45 @@ lbl_800305D8:
/* 800305F8 0002D538 90 1E 01 00 */ stw r0, 0x100(r30)
lbl_800305FC:
/* 800305FC 0002D53C 38 7E 00 D0 */ addi r3, r30, 0xd0
/*.global mDoExt_btkAnm_NS_dtor*/
/* 80030600 0002D540 3C 80 80 03 */ lis r4, mDoExt_btkAnm_NS_dtor@ha
/*.global mDoExt_btkAnm_NS_dtor*/
/* 80030604 0002D544 38 84 07 9C */ addi r4, r4, mDoExt_btkAnm_NS_dtor@l
/*.global __dt__13mDoExt_btkAnmFv*/
/* 80030600 0002D540 3C 80 80 03 */ lis r4, __dt__13mDoExt_btkAnmFv@ha
/*.global __dt__13mDoExt_btkAnmFv*/
/* 80030604 0002D544 38 84 07 9C */ addi r4, r4, __dt__13mDoExt_btkAnmFv@l
/* 80030608 0002D548 38 A0 00 18 */ li r5, 0x18
/* 8003060C 0002D54C 38 C0 00 02 */ li r6, 2
/* 80030610 0002D550 48 33 16 D9 */ bl func_80361CE8
/* 80030610 0002D550 48 33 16 D9 */ bl __destroy_arr
/* 80030614 0002D554 38 7E 00 A0 */ addi r3, r30, 0xa0
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030618 0002D558 3C 80 80 03 */ lis r4, mDoExt_brkAnm_NS_dtor@ha
/*.global mDoExt_brkAnm_NS_dtor*/
/* 8003061C 0002D55C 38 84 07 48 */ addi r4, r4, mDoExt_brkAnm_NS_dtor@l
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030618 0002D558 3C 80 80 03 */ lis r4, __dt__13mDoExt_brkAnmFv@ha
/*.global __dt__13mDoExt_brkAnmFv*/
/* 8003061C 0002D55C 38 84 07 48 */ addi r4, r4, __dt__13mDoExt_brkAnmFv@l
/* 80030620 0002D560 38 A0 00 18 */ li r5, 0x18
/* 80030624 0002D564 38 C0 00 02 */ li r6, 2
/* 80030628 0002D568 48 33 16 C1 */ bl func_80361CE8
/* 80030628 0002D568 48 33 16 C1 */ bl __destroy_arr
/* 8003062C 0002D56C 38 7E 00 70 */ addi r3, r30, 0x70
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030630 0002D570 3C 80 80 03 */ lis r4, mDoExt_brkAnm_NS_dtor@ha
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030634 0002D574 38 84 07 48 */ addi r4, r4, mDoExt_brkAnm_NS_dtor@l
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030630 0002D570 3C 80 80 03 */ lis r4, __dt__13mDoExt_brkAnmFv@ha
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030634 0002D574 38 84 07 48 */ addi r4, r4, __dt__13mDoExt_brkAnmFv@l
/* 80030638 0002D578 38 A0 00 18 */ li r5, 0x18
/* 8003063C 0002D57C 38 C0 00 02 */ li r6, 2
/* 80030640 0002D580 48 33 16 A9 */ bl func_80361CE8
/* 80030640 0002D580 48 33 16 A9 */ bl __destroy_arr
/* 80030644 0002D584 38 7E 00 40 */ addi r3, r30, 0x40
/*.global mDoExt_bpkAnm_NS_dtor*/
/* 80030648 0002D588 3C 80 80 03 */ lis r4, mDoExt_bpkAnm_NS_dtor@ha
/*.global mDoExt_bpkAnm_NS_dtor*/
/* 8003064C 0002D58C 38 84 06 F4 */ addi r4, r4, mDoExt_bpkAnm_NS_dtor@l
/*.global __dt__13mDoExt_bpkAnmFv*/
/* 80030648 0002D588 3C 80 80 03 */ lis r4, __dt__13mDoExt_bpkAnmFv@ha
/*.global __dt__13mDoExt_bpkAnmFv*/
/* 8003064C 0002D58C 38 84 06 F4 */ addi r4, r4, __dt__13mDoExt_bpkAnmFv@l
/* 80030650 0002D590 38 A0 00 18 */ li r5, 0x18
/* 80030654 0002D594 38 C0 00 02 */ li r6, 2
/* 80030658 0002D598 48 33 16 91 */ bl func_80361CE8
/* 80030658 0002D598 48 33 16 91 */ bl __destroy_arr
/* 8003065C 0002D59C 38 7E 00 08 */ addi r3, r30, 8
/*.global mDoExt_bckAnm_NS_dtor*/
/* 80030660 0002D5A0 3C 80 80 03 */ lis r4, mDoExt_bckAnm_NS_dtor@ha
/*.global mDoExt_bckAnm_NS_dtor*/
/* 80030664 0002D5A4 38 84 06 A0 */ addi r4, r4, mDoExt_bckAnm_NS_dtor@l
/*.global __dt__13mDoExt_bckAnmFv*/
/* 80030660 0002D5A0 3C 80 80 03 */ lis r4, __dt__13mDoExt_bckAnmFv@ha
/*.global __dt__13mDoExt_bckAnmFv*/
/* 80030664 0002D5A4 38 84 06 A0 */ addi r4, r4, __dt__13mDoExt_bckAnmFv@l
/* 80030668 0002D5A8 38 A0 00 1C */ li r5, 0x1c
/* 8003066C 0002D5AC 38 C0 00 02 */ li r6, 2
/* 80030670 0002D5B0 48 33 16 79 */ bl func_80361CE8
/* 80030670 0002D5B0 48 33 16 79 */ bl __destroy_arr
/* 80030674 0002D5B4 7F E0 07 35 */ extsh. r0, r31
/* 80030678 0002D5B8 40 81 00 0C */ ble lbl_80030684
/* 8003067C 0002D5BC 7F C3 F3 78 */ mr r3, r30
include/d/d_com/d_com_inf_game/asm/func_800307F0.s
+29 -29
View File
@@ -9,68 +9,68 @@
/* 8003080C 0002D74C 3C 80 80 03 */ lis r4, __ct__13mDoExt_bckAnmFv@ha
/*.global mDoExt_bckAnm*/
/* 80030810 0002D750 38 84 0A 2C */ addi r4, r4, __ct__13mDoExt_bckAnmFv@l
/*.global mDoExt_bckAnm_NS_dtor*/
/* 80030814 0002D754 3C A0 80 03 */ lis r5, mDoExt_bckAnm_NS_dtor@ha
/*.global mDoExt_bckAnm_NS_dtor*/
/* 80030818 0002D758 38 A5 06 A0 */ addi r5, r5, mDoExt_bckAnm_NS_dtor@l
/*.global __dt__13mDoExt_bckAnmFv*/
/* 80030814 0002D754 3C A0 80 03 */ lis r5, __dt__13mDoExt_bckAnmFv@ha
/*.global __dt__13mDoExt_bckAnmFv*/
/* 80030818 0002D758 38 A5 06 A0 */ addi r5, r5, __dt__13mDoExt_bckAnmFv@l
/* 8003081C 0002D75C 38 C0 00 1C */ li r6, 0x1c
/* 80030820 0002D760 38 E0 00 02 */ li r7, 2
/* 80030824 0002D764 48 33 15 3D */ bl func_80361D60
/* 80030824 0002D764 48 33 15 3D */ bl __construct_array
/* 80030828 0002D768 38 7F 00 40 */ addi r3, r31, 0x40
/*.global mDoExt_bpkAnm*/
/* 8003082C 0002D76C 3C 80 80 03 */ lis r4, __ct__13mDoExt_bpkAnmFv@ha
/*.global mDoExt_bpkAnm*/
/* 80030830 0002D770 38 84 09 E4 */ addi r4, r4, __ct__13mDoExt_bpkAnmFv@l
/*.global mDoExt_bpkAnm_NS_dtor*/
/* 80030834 0002D774 3C A0 80 03 */ lis r5, mDoExt_bpkAnm_NS_dtor@ha
/*.global mDoExt_bpkAnm_NS_dtor*/
/* 80030838 0002D778 38 A5 06 F4 */ addi r5, r5, mDoExt_bpkAnm_NS_dtor@l
/*.global __dt__13mDoExt_bpkAnmFv*/
/* 80030834 0002D774 3C A0 80 03 */ lis r5, __dt__13mDoExt_bpkAnmFv@ha
/*.global __dt__13mDoExt_bpkAnmFv*/
/* 80030838 0002D778 38 A5 06 F4 */ addi r5, r5, __dt__13mDoExt_bpkAnmFv@l
/* 8003083C 0002D77C 38 C0 00 18 */ li r6, 0x18
/* 80030840 0002D780 38 E0 00 02 */ li r7, 2
/* 80030844 0002D784 48 33 15 1D */ bl func_80361D60
/* 80030844 0002D784 48 33 15 1D */ bl __construct_array
/* 80030848 0002D788 38 7F 00 70 */ addi r3, r31, 0x70
/*.global mDoExt_brkAnm*/
/* 8003084C 0002D78C 3C 80 80 03 */ lis r4, __ct__13mDoExt_brkAnmFv@ha
/*.global mDoExt_brkAnm*/
/* 80030850 0002D790 38 84 09 9C */ addi r4, r4, __ct__13mDoExt_brkAnmFv@l
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030854 0002D794 3C A0 80 03 */ lis r5, mDoExt_brkAnm_NS_dtor@ha
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030858 0002D798 38 A5 07 48 */ addi r5, r5, mDoExt_brkAnm_NS_dtor@l
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030854 0002D794 3C A0 80 03 */ lis r5, __dt__13mDoExt_brkAnmFv@ha
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030858 0002D798 38 A5 07 48 */ addi r5, r5, __dt__13mDoExt_brkAnmFv@l
/* 8003085C 0002D79C 38 C0 00 18 */ li r6, 0x18
/* 80030860 0002D7A0 38 E0 00 02 */ li r7, 2
/* 80030864 0002D7A4 48 33 14 FD */ bl func_80361D60
/* 80030864 0002D7A4 48 33 14 FD */ bl __construct_array
/* 80030868 0002D7A8 38 7F 00 A0 */ addi r3, r31, 0xa0
/*.global mDoExt_brkAnm*/
/* 8003086C 0002D7AC 3C 80 80 03 */ lis r4, __ct__13mDoExt_brkAnmFv@ha
/*.global mDoExt_brkAnm*/
/* 80030870 0002D7B0 38 84 09 9C */ addi r4, r4, __ct__13mDoExt_brkAnmFv@l
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030874 0002D7B4 3C A0 80 03 */ lis r5, mDoExt_brkAnm_NS_dtor@ha
/*.global mDoExt_brkAnm_NS_dtor*/
/* 80030878 0002D7B8 38 A5 07 48 */ addi r5, r5, mDoExt_brkAnm_NS_dtor@l
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030874 0002D7B4 3C A0 80 03 */ lis r5, __dt__13mDoExt_brkAnmFv@ha
/*.global __dt__13mDoExt_brkAnmFv*/
/* 80030878 0002D7B8 38 A5 07 48 */ addi r5, r5, __dt__13mDoExt_brkAnmFv@l
/* 8003087C 0002D7BC 38 C0 00 18 */ li r6, 0x18
/* 80030880 0002D7C0 38 E0 00 02 */ li r7, 2
/* 80030884 0002D7C4 48 33 14 DD */ bl func_80361D60
/* 80030884 0002D7C4 48 33 14 DD */ bl __construct_array
/* 80030888 0002D7C8 38 7F 00 D0 */ addi r3, r31, 0xd0
/*.global mDoExt_btkAnm*/
/* 8003088C 0002D7CC 3C 80 80 03 */ lis r4, __ct__13mDoExt_btkAnmFv@ha
/*.global mDoExt_btkAnm*/
/* 80030890 0002D7D0 38 84 09 54 */ addi r4, r4, __ct__13mDoExt_btkAnmFv@l
/*.global mDoExt_btkAnm_NS_dtor*/
/* 80030894 0002D7D4 3C A0 80 03 */ lis r5, mDoExt_btkAnm_NS_dtor@ha
/*.global mDoExt_btkAnm_NS_dtor*/
/* 80030898 0002D7D8 38 A5 07 9C */ addi r5, r5, mDoExt_btkAnm_NS_dtor@l
/*.global __dt__13mDoExt_btkAnmFv*/
/* 80030894 0002D7D4 3C A0 80 03 */ lis r5, __dt__13mDoExt_btkAnmFv@ha
/*.global __dt__13mDoExt_btkAnmFv*/
/* 80030898 0002D7D8 38 A5 07 9C */ addi r5, r5, __dt__13mDoExt_btkAnmFv@l
/* 8003089C 0002D7DC 38 C0 00 18 */ li r6, 0x18
/* 800308A0 0002D7E0 38 E0 00 02 */ li r7, 2
/* 800308A4 0002D7E4 48 33 14 BD */ bl func_80361D60
/* 800308A4 0002D7E4 48 33 14 BD */ bl __construct_array
/* 800308A8 0002D7E8 3B DF 01 00 */ addi r30, r31, 0x100
/* 800308AC 0002D7EC 3C 60 80 3A */ lis r3, lbl_803A3354@ha
/* 800308B0 0002D7F0 38 03 33 54 */ addi r0, r3, lbl_803A3354@l
/* 800308B4 0002D7F4 90 1F 01 00 */ stw r0, 0x100(r31)
/* 800308B8 0002D7F8 7F C3 F3 78 */ mr r3, r30
/* 800308BC 0002D7FC 38 80 00 00 */ li r4, 0
/* 800308C0 0002D800 48 2F 7B 3D */ bl J3DFrameCtrl_NS_init
/* 800308C0 0002D800 48 2F 7B 3D */ bl init__12J3DFrameCtrlFs
/* 800308C4 0002D804 38 00 00 00 */ li r0, 0
/* 800308C8 0002D808 90 1E 00 18 */ stw r0, 0x18(r30)
/* 800308CC 0002D80C 3B DF 01 1C */ addi r30, r31, 0x11c
@@ -79,7 +79,7 @@
/* 800308D8 0002D818 90 1F 01 1C */ stw r0, 0x11c(r31)
/* 800308DC 0002D81C 7F C3 F3 78 */ mr r3, r30
/* 800308E0 0002D820 38 80 00 00 */ li r4, 0
/* 800308E4 0002D824 48 2F 7B 19 */ bl J3DFrameCtrl_NS_init
/* 800308E4 0002D824 48 2F 7B 19 */ bl init__12J3DFrameCtrlFs
/* 800308E8 0002D828 38 00 00 00 */ li r0, 0
/* 800308EC 0002D82C 90 1E 00 14 */ stw r0, 0x14(r30)
/* 800308F0 0002D830 3B DF 01 34 */ addi r30, r31, 0x134
@@ -88,7 +88,7 @@
/* 800308FC 0002D83C 90 1F 01 34 */ stw r0, 0x134(r31)
/* 80030900 0002D840 7F C3 F3 78 */ mr r3, r30
/* 80030904 0002D844 38 80 00 00 */ li r4, 0
/* 80030908 0002D848 48 2F 7A F5 */ bl J3DFrameCtrl_NS_init
/* 80030908 0002D848 48 2F 7A F5 */ bl init__12J3DFrameCtrlFs
/* 8003090C 0002D84C 38 00 00 00 */ li r0, 0
/* 80030910 0002D850 90 1E 00 14 */ stw r0, 0x14(r30)
/* 80030914 0002D854 3B DF 01 4C */ addi r30, r31, 0x14c
@@ -97,7 +97,7 @@
/* 80030920 0002D860 90 1F 01 4C */ stw r0, 0x14c(r31)
/* 80030924 0002D864 7F C3 F3 78 */ mr r3, r30
/* 80030928 0002D868 38 80 00 00 */ li r4, 0
/* 8003092C 0002D86C 48 2F 7A D1 */ bl J3DFrameCtrl_NS_init
/* 8003092C 0002D86C 48 2F 7A D1 */ bl init__12J3DFrameCtrlFs
/* 80030930 0002D870 38 00 00 00 */ li r0, 0
/* 80030934 0002D874 90 1E 00 14 */ stw r0, 0x14(r30)
/* 80030938 0002D878 7F E3 FB 78 */ mr r3, r31
include/d/d_com/d_com_inf_game/asm/func_80030954.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 8003096C 0002D8AC 38 04 33 54 */ addi r0, r4, lbl_803A3354@l
/* 80030970 0002D8B0 90 03 00 00 */ stw r0, 0(r3)
/* 80030974 0002D8B4 38 80 00 00 */ li r4, 0
/* 80030978 0002D8B8 48 2F 7A 85 */ bl J3DFrameCtrl_NS_init
/* 80030978 0002D8B8 48 2F 7A 85 */ bl init__12J3DFrameCtrlFs
/* 8003097C 0002D8BC 38 00 00 00 */ li r0, 0
/* 80030980 0002D8C0 90 1F 00 14 */ stw r0, 0x14(r31)
/* 80030984 0002D8C4 7F E3 FB 78 */ mr r3, r31
include/d/d_com/d_com_inf_game/asm/func_8003099C.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 800309B4 0002D8F4 38 04 33 54 */ addi r0, r4, lbl_803A3354@l
/* 800309B8 0002D8F8 90 03 00 00 */ stw r0, 0(r3)
/* 800309BC 0002D8FC 38 80 00 00 */ li r4, 0
/* 800309C0 0002D900 48 2F 7A 3D */ bl J3DFrameCtrl_NS_init
/* 800309C0 0002D900 48 2F 7A 3D */ bl init__12J3DFrameCtrlFs
/* 800309C4 0002D904 38 00 00 00 */ li r0, 0
/* 800309C8 0002D908 90 1F 00 14 */ stw r0, 0x14(r31)
/* 800309CC 0002D90C 7F E3 FB 78 */ mr r3, r31
include/d/d_com/d_com_inf_game/asm/func_800309E4.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 800309FC 0002D93C 38 04 33 54 */ addi r0, r4, lbl_803A3354@l
/* 80030A00 0002D940 90 03 00 00 */ stw r0, 0(r3)
/* 80030A04 0002D944 38 80 00 00 */ li r4, 0
/* 80030A08 0002D948 48 2F 79 F5 */ bl J3DFrameCtrl_NS_init
/* 80030A08 0002D948 48 2F 79 F5 */ bl init__12J3DFrameCtrlFs
/* 80030A0C 0002D94C 38 00 00 00 */ li r0, 0
/* 80030A10 0002D950 90 1F 00 14 */ stw r0, 0x14(r31)
/* 80030A14 0002D954 7F E3 FB 78 */ mr r3, r31
include/d/d_com/d_com_inf_game/asm/func_80030A2C.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 80030A44 0002D984 38 04 33 54 */ addi r0, r4, lbl_803A3354@l
/* 80030A48 0002D988 90 03 00 00 */ stw r0, 0(r3)
/* 80030A4C 0002D98C 38 80 00 00 */ li r4, 0
/* 80030A50 0002D990 48 2F 79 AD */ bl J3DFrameCtrl_NS_init
/* 80030A50 0002D990 48 2F 79 AD */ bl init__12J3DFrameCtrlFs
/* 80030A54 0002D994 38 00 00 00 */ li r0, 0
/* 80030A58 0002D998 90 1F 00 18 */ stw r0, 0x18(r31)
/* 80030A5C 0002D99C 7F E3 FB 78 */ mr r3, r31
include/d/d_com/d_com_inf_game/asm/func_80030A74.s
+10 -10
View File
@@ -61,21 +61,21 @@ lbl_80030B34:
/* 80030B58 0002DA98 90 1E 01 E0 */ stw r0, 0x1e0(r30)
lbl_80030B5C:
/* 80030B5C 0002DA9C 38 7E 01 88 */ addi r3, r30, 0x188
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030B60 0002DAA0 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030B64 0002DAA4 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030B60 0002DAA0 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030B64 0002DAA4 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l
/* 80030B68 0002DAA8 38 A0 00 20 */ li r5, 0x20
/* 80030B6C 0002DAAC 38 C0 00 02 */ li r6, 2
/* 80030B70 0002DAB0 48 33 11 79 */ bl func_80361CE8
/* 80030B70 0002DAB0 48 33 11 79 */ bl __destroy_arr
/* 80030B74 0002DAB4 38 7E 00 44 */ addi r3, r30, 0x44
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030B78 0002DAB8 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha
/*.global dCcMassS_Obj_NS_dtor*/
/* 80030B7C 0002DABC 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030B78 0002DAB8 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha
/*.global __dt__12dCcMassS_ObjFv*/
/* 80030B7C 0002DABC 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l
/* 80030B80 0002DAC0 38 A0 00 20 */ li r5, 0x20
/* 80030B84 0002DAC4 38 C0 00 0A */ li r6, 0xa
/* 80030B88 0002DAC8 48 33 11 61 */ bl func_80361CE8
/* 80030B88 0002DAC8 48 33 11 61 */ bl __destroy_arr
/* 80030B8C 0002DACC 28 1E 00 00 */ cmplwi r30, 0
/* 80030B90 0002DAD0 41 82 00 20 */ beq lbl_80030BB0
/* 80030B94 0002DAD4 3C 60 80 3A */ lis r3, lbl_803A7200@ha
include/d/d_com/d_com_inf_game/asm/func_80030C50.s
+5 -5
View File
@@ -13,13 +13,13 @@
/* 80030C80 0002DBC0 3C 80 80 3B */ lis r4, lbl_803AB61C@ha
/* 80030C84 0002DBC4 38 04 B6 1C */ addi r0, r4, lbl_803AB61C@l
/* 80030C88 0002DBC8 90 1E 14 00 */ stw r0, 0x1400(r30)
/*.global cBgS_ChkElm_NS_dtor*/
/* 80030C8C 0002DBCC 3C 80 80 03 */ lis r4, cBgS_ChkElm_NS_dtor@ha
/*.global cBgS_ChkElm_NS_dtor*/
/* 80030C90 0002DBD0 38 84 FE F8 */ addi r4, r4, cBgS_ChkElm_NS_dtor@l
/*.global __dt__11cBgS_ChkElmFv*/
/* 80030C8C 0002DBCC 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha
/*.global __dt__11cBgS_ChkElmFv*/
/* 80030C90 0002DBD0 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l
/* 80030C94 0002DBD4 38 A0 00 14 */ li r5, 0x14
/* 80030C98 0002DBD8 38 C0 01 00 */ li r6, 0x100
/* 80030C9C 0002DBDC 48 33 10 4D */ bl func_80361CE8
/* 80030C9C 0002DBDC 48 33 10 4D */ bl __destroy_arr
lbl_80030CA0:
/* 80030CA0 0002DBE0 7F E0 07 35 */ extsh. r0, r31
/* 80030CA4 0002DBE4 40 81 00 0C */ ble lbl_80030CB0
include/d/d_com/d_com_inf_game/asm/func_80030CCC.s
+5 -5
View File
@@ -9,13 +9,13 @@
/* 80030CEC 0002DC2C 3C 80 80 3B */ lis r4, lbl_803AB61C@ha
/* 80030CF0 0002DC30 38 04 B6 1C */ addi r0, r4, lbl_803AB61C@l
/* 80030CF4 0002DC34 90 1E 14 00 */ stw r0, 0x1400(r30)
/*.global cBgS_ChkElm_NS_dtor*/
/* 80030CF8 0002DC38 3C 80 80 03 */ lis r4, cBgS_ChkElm_NS_dtor@ha
/*.global cBgS_ChkElm_NS_dtor*/
/* 80030CFC 0002DC3C 38 84 FE F8 */ addi r4, r4, cBgS_ChkElm_NS_dtor@l
/*.global __dt__11cBgS_ChkElmFv*/
/* 80030CF8 0002DC38 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha
/*.global __dt__11cBgS_ChkElmFv*/
/* 80030CFC 0002DC3C 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l
/* 80030D00 0002DC40 38 A0 00 14 */ li r5, 0x14
/* 80030D04 0002DC44 38 C0 01 00 */ li r6, 0x100
/* 80030D08 0002DC48 48 33 0F E1 */ bl func_80361CE8
/* 80030D08 0002DC48 48 33 0F E1 */ bl __destroy_arr
/* 80030D0C 0002DC4C 7F E0 07 35 */ extsh. r0, r31
/* 80030D10 0002DC50 40 81 00 0C */ ble lbl_80030D1C
/* 80030D14 0002DC54 7F C3 F3 78 */ mr r3, r30
include/d/d_com/d_com_inf_game/asm/func_80030D38.s
+1 -1
View File
@@ -6,7 +6,7 @@
/* 80030D4C 0002DC8C 3C 80 80 3B */ lis r4, lbl_803AB630@ha
/* 80030D50 0002DC90 38 04 B6 30 */ addi r0, r4, lbl_803AB630@l
/* 80030D54 0002DC94 90 03 00 10 */ stw r0, 0x10(r3)
/* 80030D58 0002DC98 48 04 33 9D */ bl cBgS_ChkElm_NS_Init
/* 80030D58 0002DC98 48 04 33 9D */ bl Init__11cBgS_ChkElmFv
/* 80030D5C 0002DC9C 7F E3 FB 78 */ mr r3, r31
/* 80030D60 0002DCA0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80030D64 0002DCA4 80 01 00 14 */ lwz r0, 0x14(r1)
include/d/d_com/d_com_inf_game/d_com_inf_game.h
+2 -2
View File
@@ -446,7 +446,7 @@ inline u16 dComIfGs_getMaxLife(void) {
inline void dComIfGs_offEventBit(u16 event) {
g_dComIfG_gameInfo.getSaveFile().getEventFlags().offEventBit(event);
}
// inline int dComIfGs_isEventBit(u16 event) {
// inline int dComIfGs_isEventBit__FUs(u16 event) {
// return g_dComIfG_gameInfo.getSaveFile().getEventFlags().isEventBit(event);
// }
inline const char* dComIfGs_getLastWarpMarkStageName(void) {
@@ -493,7 +493,7 @@ inline void dComIfGd_reset(void) {
}
extern "C" {
void dComIfGs_staffroll_next_go(void);
void dComIfGs_staffroll_next_go__Fv(void);
}
#endif