mirror of
https://github.com/zeldaret/tp
synced 2026-07-11 15:28:38 -04:00
d_item (#18)
* item_funcs ok * item_getcheck_func ok * remove unnecessary asm file * execItemGet / checkItemGet ok, add enums for readability * fix return types
This commit is contained in:
TakaRikka
@@ -13,8 +13,8 @@ dMpath_n_NS_dTexObjAggregate_c_NS_create:
|
||||
/* 8003C870 000397B0 7C 7A 1B 78 */ mr r26, r3
|
||||
/* 8003C874 000397B4 3B 60 00 00 */ li r27, 0
|
||||
/* 8003C878 000397B8 3B E0 00 00 */ li r31, 0
|
||||
/* 8003C87C 000397BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003C880 000397C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003C87C 000397BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003C880 000397C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003C884 000397C4 3F 83 00 02 */ addis r28, r3, 2
|
||||
/* 8003C888 000397C8 3C 60 80 38 */ lis r3, lbl_80379C4C@ha
|
||||
/* 8003C88C 000397CC 3B A3 9C 4C */ addi r29, r3, lbl_80379C4C@l
|
||||
@@ -782,8 +782,8 @@ dRenderingFDAmap_c_NS_postRenderingMap:
|
||||
/* 8003D384 0003A2C4 48 32 32 4D */ bl GXSetClipMode
|
||||
/* 8003D388 0003A2C8 38 60 00 01 */ li r3, 1
|
||||
/* 8003D38C 0003A2CC 48 32 2A 4D */ bl GXSetDither
|
||||
/* 8003D390 0003A2D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003D394 0003A2D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003D390 0003A2D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003D394 0003A2D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003D398 0003A2D8 80 63 5F 50 */ lwz r3, 0x5f50(r3)
|
||||
/* 8003D39C 0003A2DC 81 83 00 00 */ lwz r12, 0(r3)
|
||||
/* 8003D3A0 0003A2E0 81 8C 00 18 */ lwz r12, 0x18(r12)
|
||||
|
||||
@@ -8,8 +8,8 @@ dMapInfo_n_NS_chkGetCompass:
|
||||
/* 8003ECA0 0003BBE0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8003ECA4 0003BBE4 7C 08 02 A6 */ mflr r0
|
||||
/* 8003ECA8 0003BBE8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8003ECAC 0003BBEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003ECB0 0003BBF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003ECAC 0003BBEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003ECB0 0003BBF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003ECB4 0003BBF4 38 63 09 58 */ addi r3, r3, 0x958
|
||||
/* 8003ECB8 0003BBF8 38 80 00 01 */ li r4, 1
|
||||
/* 8003ECBC 0003BBFC 4B FF 5C 79 */ bl isDungeonItem__12dSv_memBit_cCFi
|
||||
@@ -25,8 +25,8 @@ dMapInfo_n_NS_chkGetMap:
|
||||
/* 8003ECD8 0003BC18 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8003ECDC 0003BC1C 7C 08 02 A6 */ mflr r0
|
||||
/* 8003ECE0 0003BC20 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8003ECE4 0003BC24 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003ECE8 0003BC28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003ECE4 0003BC24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003ECE8 0003BC28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003ECEC 0003BC2C 38 63 09 58 */ addi r3, r3, 0x958
|
||||
/* 8003ECF0 0003BC30 38 80 00 00 */ li r4, 0
|
||||
/* 8003ECF4 0003BC34 4B FF 5C 41 */ bl isDungeonItem__12dSv_memBit_cCFi
|
||||
@@ -144,8 +144,8 @@ dMapInfo_n_NS_getMapPlayerPos:
|
||||
/* 8003EE68 0003BDA8 93 E1 00 1C */ stw r31, 0x1c(r1)
|
||||
/* 8003EE6C 0003BDAC 93 C1 00 18 */ stw r30, 0x18(r1)
|
||||
/* 8003EE70 0003BDB0 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 8003EE74 0003BDB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003EE78 0003BDB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003EE74 0003BDB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003EE78 0003BDB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003EE7C 0003BDBC 80 63 5D AC */ lwz r3, 0x5dac(r3)
|
||||
/* 8003EE80 0003BDC0 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 8003EE84 0003BDC4 41 82 00 20 */ beq lbl_8003EEA4
|
||||
@@ -196,8 +196,8 @@ dMapInfo_n_NS_getMapPlayerAngleY:
|
||||
/* 8003EF20 0003BE60 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13)
|
||||
/* 8003EF24 0003BE64 7C 00 07 74 */ extsb r0, r0
|
||||
/* 8003EF28 0003BE68 38 60 00 00 */ li r3, 0
|
||||
/* 8003EF2C 0003BE6C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
|
||||
/* 8003EF30 0003BE70 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
|
||||
/* 8003EF2C 0003BE6C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
|
||||
/* 8003EF30 0003BE70 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
|
||||
/* 8003EF34 0003BE74 80 84 5D AC */ lwz r4, 0x5dac(r4)
|
||||
/* 8003EF38 0003BE78 28 04 00 00 */ cmplwi r4, 0
|
||||
/* 8003EF3C 0003BE7C 41 82 00 08 */ beq lbl_8003EF44
|
||||
@@ -229,8 +229,8 @@ dMapInfo_n_NS_getConstRestartIconPointer:
|
||||
/* 8003EF94 0003BED4 48 05 D3 CD */ bl dTres_c_NS_getFirstData
|
||||
/* 8003EF98 0003BED8 7C 7D 1B 78 */ mr r29, r3
|
||||
/* 8003EF9C 0003BEDC 3B 80 00 00 */ li r28, 0
|
||||
/* 8003EFA0 0003BEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003EFA4 0003BEE4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
|
||||
/* 8003EFA0 0003BEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003EFA4 0003BEE4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003EFA8 0003BEE8 48 00 00 58 */ b lbl_8003F000
|
||||
lbl_8003EFAC:
|
||||
/* 8003EFAC 0003BEEC 88 1D 00 01 */ lbz r0, 1(r29)
|
||||
@@ -245,8 +245,8 @@ lbl_8003EFAC:
|
||||
/* 8003EFD0 0003BF10 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 8003EFD4 0003BF14 28 04 00 FF */ cmplwi r4, 0xff
|
||||
/* 8003EFD8 0003BF18 41 82 00 18 */ beq lbl_8003EFF0
|
||||
/* 8003EFDC 0003BF1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003EFE0 0003BF20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003EFDC 0003BF1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003EFE0 0003BF20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003EFE4 0003BF24 4B FF 63 7D */ bl isSwitch__10dSv_info_cCFii
|
||||
/* 8003EFE8 0003BF28 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 8003EFEC 0003BF2C 40 82 00 24 */ bne lbl_8003F010
|
||||
@@ -288,8 +288,8 @@ dMapInfo_n_NS_getMapRestartPos:
|
||||
/* 8003F064 0003BFA4 D0 01 00 10 */ stfs f0, 0x10(r1)
|
||||
/* 8003F068 0003BFA8 48 00 00 24 */ b lbl_8003F08C
|
||||
lbl_8003F06C:
|
||||
/* 8003F06C 0003BFAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003F070 0003BFB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003F06C 0003BFAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003F070 0003BFB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003F074 0003BFB4 C0 03 0D BC */ lfs f0, 0xdbc(r3)
|
||||
/* 8003F078 0003BFB8 D0 01 00 08 */ stfs f0, 8(r1)
|
||||
/* 8003F07C 0003BFBC C0 03 0D C0 */ lfs f0, 0xdc0(r3)
|
||||
@@ -299,8 +299,8 @@ lbl_8003F06C:
|
||||
lbl_8003F08C:
|
||||
/* 8003F08C 0003BFCC 3C 60 80 3F */ lis r3, lbl_803F6094@ha
|
||||
/* 8003F090 0003BFD0 38 83 60 94 */ addi r4, r3, lbl_803F6094@l
|
||||
/* 8003F094 0003BFD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003F098 0003BFD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003F094 0003BFD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003F098 0003BFD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003F09C 0003BFDC 88 03 0D B4 */ lbz r0, 0xdb4(r3)
|
||||
/* 8003F0A0 0003BFE0 7C 00 07 74 */ extsb r0, r0
|
||||
/* 8003F0A4 0003BFE4 1C 00 04 04 */ mulli r0, r0, 0x404
|
||||
@@ -331,8 +331,8 @@ dMapInfo_n_NS_getMapRestartAngleY:
|
||||
/* 8003F0FC 0003C03C 7C 08 02 A6 */ mflr r0
|
||||
/* 8003F100 0003C040 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8003F104 0003C044 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8003F108 0003C048 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003F10C 0003C04C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003F108 0003C048 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003F10C 0003C04C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003F110 0003C050 AB E3 0D BA */ lha r31, 0xdba(r3)
|
||||
/* 8003F114 0003C054 4B FF FE 5D */ bl dMapInfo_n_NS_getConstRestartIconPointer
|
||||
/* 8003F118 0003C058 28 03 00 00 */ cmplwi r3, 0
|
||||
@@ -353,8 +353,8 @@ lbl_8003F140:
|
||||
lbl_8003F150:
|
||||
/* 8003F150 0003C090 3C 60 80 3F */ lis r3, lbl_803F6094@ha
|
||||
/* 8003F154 0003C094 38 83 60 94 */ addi r4, r3, lbl_803F6094@l
|
||||
/* 8003F158 0003C098 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003F15C 0003C09C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003F158 0003C098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003F15C 0003C09C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003F160 0003C0A0 88 03 0D B4 */ lbz r0, 0xdb4(r3)
|
||||
/* 8003F164 0003C0A4 7C 00 07 74 */ extsb r0, r0
|
||||
/* 8003F168 0003C0A8 1C 00 04 04 */ mulli r0, r0, 0x404
|
||||
@@ -447,8 +447,8 @@ dMapInfo_n_NS_getFloorParameter:
|
||||
/* 8003F28C 0003C1CC 7C BD 2B 78 */ mr r29, r5
|
||||
/* 8003F290 0003C1D0 7C DE 33 78 */ mr r30, r6
|
||||
/* 8003F294 0003C1D4 7C FF 3B 78 */ mr r31, r7
|
||||
/* 8003F298 0003C1D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003F29C 0003C1DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003F298 0003C1D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003F29C 0003C1DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003F2A0 0003C1E0 3B 43 4E 20 */ addi r26, r3, 0x4e20
|
||||
/* 8003F2A4 0003C1E4 7F 43 D3 78 */ mr r3, r26
|
||||
/* 8003F2A8 0003C1E8 81 9A 00 00 */ lwz r12, 0(r26)
|
||||
@@ -1098,8 +1098,8 @@ dMpath_c_NS_create:
|
||||
/* 8003FB70 0003CAB0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8003FB74 0003CAB4 7C 08 02 A6 */ mflr r0
|
||||
/* 8003FB78 0003CAB8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8003FB7C 0003CABC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003FB80 0003CAC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003FB7C 0003CABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003FB80 0003CAC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003FB84 0003CAC4 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
|
||||
/* 8003FB88 0003CAC8 81 8C 00 BC */ lwz r12, 0xbc(r12)
|
||||
/* 8003FB8C 0003CACC 7D 89 03 A6 */ mtctr r12
|
||||
@@ -1243,8 +1243,8 @@ renderingDAmap_c_NS_entry:
|
||||
/* 8003FD68 0003CCA8 D0 06 00 0C */ stfs f0, 0xc(r6)
|
||||
/* 8003FD6C 0003CCAC 90 86 00 2C */ stw r4, 0x2c(r6)
|
||||
/* 8003FD70 0003CCB0 98 A6 00 30 */ stb r5, 0x30(r6)
|
||||
/* 8003FD74 0003CCB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003FD78 0003CCB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003FD74 0003CCB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003FD78 0003CCB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003FD7C 0003CCBC 38 63 5F 64 */ addi r3, r3, 0x5f64
|
||||
/* 8003FD80 0003CCC0 38 83 00 64 */ addi r4, r3, 0x64
|
||||
/* 8003FD84 0003CCC4 38 A3 00 68 */ addi r5, r3, 0x68
|
||||
@@ -1266,8 +1266,8 @@ lbl_8003FDC0:
|
||||
/* 8003FDC0 0003CD00 88 04 00 01 */ lbz r0, 1(r4)
|
||||
/* 8003FDC4 0003CD04 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 8003FDC8 0003CD08 40 82 00 24 */ bne lbl_8003FDEC
|
||||
/* 8003FDCC 0003CD0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003FDD0 0003CD10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003FDCC 0003CD0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003FDD0 0003CD10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003FDD4 0003CD14 7C A4 2B 78 */ mr r4, r5
|
||||
/* 8003FDD8 0003CD18 80 A6 00 24 */ lwz r5, 0x24(r6)
|
||||
/* 8003FDDC 0003CD1C 4B FF 55 85 */ bl isSwitch__10dSv_info_cCFii
|
||||
@@ -1275,8 +1275,8 @@ lbl_8003FDC0:
|
||||
/* 8003FDE4 0003CD24 54 03 D9 7E */ srwi r3, r0, 5
|
||||
/* 8003FDE8 0003CD28 48 00 00 20 */ b lbl_8003FE08
|
||||
lbl_8003FDEC:
|
||||
/* 8003FDEC 0003CD2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003FDF0 0003CD30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003FDEC 0003CD2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003FDF0 0003CD30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003FDF4 0003CD34 7C A4 2B 78 */ mr r4, r5
|
||||
/* 8003FDF8 0003CD38 80 A6 00 24 */ lwz r5, 0x24(r6)
|
||||
/* 8003FDFC 0003CD3C 4B FF 55 65 */ bl isSwitch__10dSv_info_cCFii
|
||||
@@ -1672,8 +1672,8 @@ renderingPlusDoorAndCursor_c_NS_afterDrawPath:
|
||||
/* 80040370 0003D2B0 3B A0 00 01 */ li r29, 1
|
||||
/* 80040374 0003D2B4 57 C0 06 3F */ clrlwi. r0, r30, 0x18
|
||||
/* 80040378 0003D2B8 41 82 00 44 */ beq lbl_800403BC
|
||||
/* 8004037C 0003D2BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 80040380 0003D2C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8004037C 0003D2BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 80040380 0003D2C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 80040384 0003D2C4 88 03 0D B4 */ lbz r0, 0xdb4(r3)
|
||||
/* 80040388 0003D2C8 7C 1E 07 74 */ extsb r30, r0
|
||||
/* 8004038C 0003D2CC 38 61 00 20 */ addi r3, r1, 0x20
|
||||
@@ -1693,8 +1693,8 @@ lbl_800403BC:
|
||||
/* 800403C0 0003D300 41 82 00 68 */ beq lbl_80040428
|
||||
/* 800403C4 0003D304 3B A0 00 1F */ li r29, 0x1f
|
||||
/* 800403C8 0003D308 80 9F 00 2C */ lwz r4, 0x2c(r31)
|
||||
/* 800403CC 0003D30C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 800403D0 0003D310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 800403CC 0003D30C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 800403D0 0003D310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 800403D4 0003D314 88 03 0D B4 */ lbz r0, 0xdb4(r3)
|
||||
/* 800403D8 0003D318 7C 00 07 74 */ extsb r0, r0
|
||||
/* 800403DC 0003D31C 7C 04 00 00 */ cmpw r4, r0
|
||||
@@ -1738,8 +1738,8 @@ lbl_80040458:
|
||||
/* 80040468 0003D3A8 4E 80 04 21 */ bctrl
|
||||
/* 8004046C 0003D3AC 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 80040470 0003D3B0 41 82 00 58 */ beq lbl_800404C8
|
||||
/* 80040474 0003D3B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 80040478 0003D3B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 80040474 0003D3B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 80040478 0003D3B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8004047C 0003D3BC 80 03 5D AC */ lwz r0, 0x5dac(r3)
|
||||
/* 80040480 0003D3C0 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80040484 0003D3C4 41 82 00 44 */ beq lbl_800404C8
|
||||
|
||||
@@ -52,8 +52,8 @@ dMenu_Fmap_room_data_c_NS_isArrival:
|
||||
/* 8003D828 0003A768 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8003D82C 0003A76C 80 63 00 0C */ lwz r3, 0xc(r3)
|
||||
/* 8003D830 0003A770 80 83 00 08 */ lwz r4, 8(r3)
|
||||
/* 8003D834 0003A774 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003D838 0003A778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003D834 0003A774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003D838 0003A778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003D83C 0003A77C 88 84 00 02 */ lbz r4, 2(r4)
|
||||
/* 8003D840 0003A780 4B FF 78 69 */ bl getSave2__10dSv_save_cFi
|
||||
/* 8003D844 0003A784 88 9F 00 10 */ lbz r4, 0x10(r31)
|
||||
@@ -154,8 +154,8 @@ dMenu_Fmap_stage_data_c_NS_isArrival:
|
||||
/* 8003D974 0003A8B4 83 C3 00 0C */ lwz r30, 0xc(r3)
|
||||
/* 8003D978 0003A8B8 80 63 00 08 */ lwz r3, 8(r3)
|
||||
/* 8003D97C 0003A8BC 8B A3 00 02 */ lbz r29, 2(r3)
|
||||
/* 8003D980 0003A8C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003D984 0003A8C4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
|
||||
/* 8003D980 0003A8C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003D984 0003A8C4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003D988 0003A8C8 48 00 00 24 */ b lbl_8003D9AC
|
||||
lbl_8003D98C:
|
||||
/* 8003D98C 0003A8CC 7F E3 FB 78 */ mr r3, r31
|
||||
@@ -348,8 +348,8 @@ lbl_8003DC08:
|
||||
/* 8003DC1C 0003AB5C 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 8003DC20 0003AB60 41 82 02 30 */ beq lbl_8003DE50
|
||||
lbl_8003DC24:
|
||||
/* 8003DC24 0003AB64 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003DC28 0003AB68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003DC24 0003AB64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003DC28 0003AB68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003DC2C 0003AB6C 80 81 00 38 */ lwz r4, 0x38(r1)
|
||||
/* 8003DC30 0003AB70 4B FF 74 79 */ bl getSave2__10dSv_save_cFi
|
||||
/* 8003DC34 0003AB74 88 99 00 10 */ lbz r4, 0x10(r25)
|
||||
@@ -723,8 +723,8 @@ dMenuFmapIconPointer_c_NS_init:
|
||||
/* 8003E134 0003B074 7C DD 33 78 */ mr r29, r6
|
||||
/* 8003E138 0003B078 7C FE 3B 78 */ mr r30, r7
|
||||
/* 8003E13C 0003B07C 7D 1F 43 78 */ mr r31, r8
|
||||
/* 8003E140 0003B080 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003E144 0003B084 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E140 0003B080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003E144 0003B084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003E148 0003B088 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
|
||||
/* 8003E14C 0003B08C 81 8C 00 BC */ lwz r12, 0xbc(r12)
|
||||
/* 8003E150 0003B090 7D 89 03 A6 */ mtctr r12
|
||||
@@ -768,8 +768,8 @@ dMenuFmapIconPointer_c_NS_getFirstData:
|
||||
/* 8003E1D4 0003B114 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 8003E1D8 0003B118 3B E0 00 00 */ li r31, 0
|
||||
/* 8003E1DC 0003B11C 80 63 00 14 */ lwz r3, 0x14(r3)
|
||||
/* 8003E1E0 0003B120 3C 80 80 40 */ lis r4, lbl_804061C0@ha
|
||||
/* 8003E1E4 0003B124 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
|
||||
/* 8003E1E0 0003B120 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
|
||||
/* 8003E1E4 0003B124 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
|
||||
/* 8003E1E8 0003B128 38 84 4E 00 */ addi r4, r4, 0x4e00
|
||||
/* 8003E1EC 0003B12C 48 32 A7 A9 */ bl strcmp
|
||||
/* 8003E1F0 0003B130 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -838,8 +838,8 @@ dMenuFmapIconPointer_c_NS_getData:
|
||||
/* 8003E2D0 0003B210 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 8003E2D4 0003B214 3B E0 00 00 */ li r31, 0
|
||||
/* 8003E2D8 0003B218 80 63 00 14 */ lwz r3, 0x14(r3)
|
||||
/* 8003E2DC 0003B21C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
|
||||
/* 8003E2E0 0003B220 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
|
||||
/* 8003E2DC 0003B21C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
|
||||
/* 8003E2E0 0003B220 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
|
||||
/* 8003E2E4 0003B224 38 84 4E 00 */ addi r4, r4, 0x4e00
|
||||
/* 8003E2E8 0003B228 48 32 A6 AD */ bl strcmp
|
||||
/* 8003E2EC 0003B22C 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -925,8 +925,8 @@ dMenuFmapIconPointer_c_NS_getNextData:
|
||||
/* 8003E3EC 0003B32C 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 8003E3F0 0003B330 3B E0 00 01 */ li r31, 1
|
||||
/* 8003E3F4 0003B334 80 63 00 14 */ lwz r3, 0x14(r3)
|
||||
/* 8003E3F8 0003B338 3C 80 80 40 */ lis r4, lbl_804061C0@ha
|
||||
/* 8003E3FC 0003B33C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
|
||||
/* 8003E3F8 0003B338 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
|
||||
/* 8003E3FC 0003B33C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
|
||||
/* 8003E400 0003B340 38 84 4E 00 */ addi r4, r4, 0x4e00
|
||||
/* 8003E404 0003B344 48 32 A5 91 */ bl strcmp
|
||||
/* 8003E408 0003B348 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -1080,8 +1080,8 @@ lbl_8003E5F8:
|
||||
/* 8003E608 0003B548 90 05 00 00 */ stw r0, 0(r5)
|
||||
lbl_8003E60C:
|
||||
/* 8003E60C 0003B54C 80 7C 00 14 */ lwz r3, 0x14(r28)
|
||||
/* 8003E610 0003B550 3C 80 80 40 */ lis r4, lbl_804061C0@ha
|
||||
/* 8003E614 0003B554 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
|
||||
/* 8003E610 0003B550 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
|
||||
/* 8003E614 0003B554 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
|
||||
/* 8003E618 0003B558 38 84 4E 00 */ addi r4, r4, 0x4e00
|
||||
/* 8003E61C 0003B55C 48 32 A3 79 */ bl strcmp
|
||||
/* 8003E620 0003B560 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -1201,8 +1201,8 @@ lbl_8003E768:
|
||||
/* 8003E7B8 0003B6F8 41 82 00 34 */ beq lbl_8003E7EC
|
||||
/* 8003E7BC 0003B6FC 7F 9B E3 78 */ mr r27, r28
|
||||
/* 8003E7C0 0003B700 41 82 00 20 */ beq lbl_8003E7E0
|
||||
/* 8003E7C4 0003B704 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003E7C8 0003B708 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E7C4 0003B704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003E7C8 0003B708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003E7CC 0003B70C 7F A5 EB 78 */ mr r5, r29
|
||||
/* 8003E7D0 0003B710 4B FF 6B 91 */ bl isSwitch__10dSv_info_cCFii
|
||||
/* 8003E7D4 0003B714 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -1239,8 +1239,8 @@ lbl_8003E834:
|
||||
/* 8003E840 0003B780 4B FF 05 A1 */ bl dComIfGp_isLightDropMapVisible
|
||||
/* 8003E844 0003B784 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 8003E848 0003B788 41 82 00 6C */ beq lbl_8003E8B4
|
||||
/* 8003E84C 0003B78C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003E850 0003B790 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E84C 0003B78C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003E850 0003B790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003E854 0003B794 88 03 4E 0C */ lbz r0, 0x4e0c(r3)
|
||||
/* 8003E858 0003B798 2C 00 00 02 */ cmpwi r0, 2
|
||||
/* 8003E85C 0003B79C 40 82 00 54 */ bne lbl_8003E8B0
|
||||
@@ -1252,8 +1252,8 @@ lbl_8003E834:
|
||||
/* 8003E874 0003B7B4 2C 03 00 35 */ cmpwi r3, 0x35
|
||||
/* 8003E878 0003B7B8 40 82 00 30 */ bne lbl_8003E8A8
|
||||
lbl_8003E87C:
|
||||
/* 8003E87C 0003B7BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003E880 0003B7C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E87C 0003B7BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003E880 0003B7C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003E884 0003B7C4 38 63 07 F0 */ addi r3, r3, 0x7f0
|
||||
/* 8003E888 0003B7C8 3C 80 80 3A */ lis r4, lbl_803A7288@ha
|
||||
/* 8003E88C 0003B7CC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l
|
||||
@@ -1292,8 +1292,8 @@ lbl_8003E8B4:
|
||||
/* 8003E904 0003B844 41 82 00 34 */ beq lbl_8003E938
|
||||
/* 8003E908 0003B848 7F 9F E3 78 */ mr r31, r28
|
||||
/* 8003E90C 0003B84C 41 82 00 20 */ beq lbl_8003E92C
|
||||
/* 8003E910 0003B850 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003E914 0003B854 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E910 0003B850 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003E914 0003B854 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003E918 0003B858 38 63 09 58 */ addi r3, r3, 0x958
|
||||
/* 8003E91C 0003B85C 4B FF 5E CD */ bl isTbox__12dSv_memBit_cCFi
|
||||
/* 8003E920 0003B860 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -1313,8 +1313,8 @@ lbl_8003E938:
|
||||
/* 8003E950 0003B890 41 82 00 34 */ beq lbl_8003E984
|
||||
/* 8003E954 0003B894 3B 60 00 00 */ li r27, 0
|
||||
/* 8003E958 0003B898 41 82 00 20 */ beq lbl_8003E978
|
||||
/* 8003E95C 0003B89C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003E960 0003B8A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E95C 0003B89C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003E960 0003B8A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003E964 0003B8A4 7F A5 EB 78 */ mr r5, r29
|
||||
/* 8003E968 0003B8A8 4B FF 69 F9 */ bl isSwitch__10dSv_info_cCFii
|
||||
/* 8003E96C 0003B8AC 2C 03 00 00 */ cmpwi r3, 0
|
||||
@@ -1358,8 +1358,8 @@ lbl_8003E9E8:
|
||||
/* 8003E9F0 0003B930 80 1B 00 0C */ lwz r0, 0xc(r27)
|
||||
/* 8003E9F4 0003B934 7C 1E 00 00 */ cmpw r30, r0
|
||||
/* 8003E9F8 0003B938 40 82 00 28 */ bne lbl_8003EA20
|
||||
/* 8003E9FC 0003B93C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003EA00 0003B940 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003E9FC 0003B93C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003EA00 0003B940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003EA04 0003B944 80 9B 00 2C */ lwz r4, 0x2c(r27)
|
||||
/* 8003EA08 0003B948 88 84 00 10 */ lbz r4, 0x10(r4)
|
||||
/* 8003EA0C 0003B94C 7F A5 EB 78 */ mr r5, r29
|
||||
@@ -1398,8 +1398,8 @@ lbl_8003EA20:
|
||||
/* 8003EA8C 0003B9CC 41 82 00 68 */ beq lbl_8003EAF4
|
||||
/* 8003EA90 0003B9D0 3B 60 00 00 */ li r27, 0
|
||||
/* 8003EA94 0003B9D4 41 82 00 20 */ beq lbl_8003EAB4
|
||||
/* 8003EA98 0003B9D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
|
||||
/* 8003EA9C 0003B9DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
|
||||
/* 8003EA98 0003B9D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
|
||||
/* 8003EA9C 0003B9DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
|
||||
/* 8003EAA0 0003B9E0 7F A5 EB 78 */ mr r5, r29
|
||||
/* 8003EAA4 0003B9E4 4B FF 68 BD */ bl isSwitch__10dSv_info_cCFii
|
||||
/* 8003EAA8 0003B9E8 2C 03 00 00 */ cmpwi r3, 0
|
||||
|
||||
Reference in New Issue
Block a user