encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

a few dSv_info_c methods ok

Browse Source
This commit is contained in:
unknown
2020-11-28 19:18:27 -05:00
parent 9982bcab28
commit f861af3f37
35 changed files with 740 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -10,7 +10,7 @@ TARGET := dolzel2
BUILD_DIR := build/$(TARGET)
SRC_DIRS := $(shell find src/ -type f -name '*.cpp')
SRC_DIRS := $(shell find src/ libs/ -type f -name '*.cpp')
ASM_DIRS := $(shell find asm/ -type f -name '*.s')
# Inputs
asm/Z2AudioLib/Z2SceneMgr.s
+2 -2
View File
@@ -1354,14 +1354,14 @@ lbl_802B7B58:
/* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802B7BB8 002B4AF8 38 80 00 2E */ li r4, 0x2e
/* 802B7BBC 002B4AFC 38 A0 00 00 */ li r5, 0
/* 802B7BC0 002B4B00 4B D7 D7 A1 */ bl dSv_info_c_NS_isSwitch
/* 802B7BC0 002B4B00 4B D7 D7 A1 */ bl isSwitch__10dSv_info_cCFii
/* 802B7BC4 002B4B04 2C 03 00 00 */ cmpwi r3, 0
/* 802B7BC8 002B4B08 41 82 00 3C */ beq lbl_802B7C04
/* 802B7BCC 002B4B0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802B7BD0 002B4B10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802B7BD4 002B4B14 38 80 00 11 */ li r4, 0x11
/* 802B7BD8 002B4B18 38 A0 00 00 */ li r5, 0
/* 802B7BDC 002B4B1C 4B D7 D7 85 */ bl dSv_info_c_NS_isSwitch
/* 802B7BDC 002B4B1C 4B D7 D7 85 */ bl isSwitch__10dSv_info_cCFii
/* 802B7BE0 002B4B20 2C 03 00 00 */ cmpwi r3, 0
/* 802B7BE4 002B4B24 40 82 00 20 */ bne lbl_802B7C04
/* 802B7BE8 002B4B28 38 61 01 5C */ addi r3, r1, 0x15c
asm/d/a/d_a_alink.s
+6 -6
View File
@@ -3526,7 +3526,7 @@ lbl_800A0A24:
/* 800A0A34 0009D974 88 9A 05 69 */ lbz r4, 0x569(r26)
/* 800A0A38 0009D978 88 1A 04 BA */ lbz r0, 0x4ba(r26)
/* 800A0A3C 0009D97C 7C 05 07 74 */ extsb r5, r0
/* 800A0A40 0009D980 4B F9 49 21 */ bl dSv_info_c_NS_isSwitch
/* 800A0A40 0009D980 4B F9 49 21 */ bl isSwitch__10dSv_info_cCFii
/* 800A0A44 0009D984 2C 03 00 00 */ cmpwi r3, 0
/* 800A0A48 0009D988 41 82 00 14 */ beq lbl_800A0A5C
lbl_800A0A4C:
@@ -10032,7 +10032,7 @@ lbl_800A65D8:
/* 800A65E0 000A3520 38 80 00 6F */ li r4, 0x6f
/* 800A65E4 000A3524 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 800A65E8 000A3528 7C 05 07 74 */ extsb r5, r0
/* 800A65EC 000A352C 4B F8 EC C5 */ bl dSv_info_c_NS_offSwitch
/* 800A65EC 000A352C 4B F8 EC C5 */ bl offSwitch__10dSv_info_cFii
lbl_800A65F0:
/* 800A65F0 000A3530 38 60 00 04 */ li r3, 4
lbl_800A65F4:
@@ -40250,7 +40250,7 @@ lbl_800C0C90:
/* 800C0CC4 000BDC04 38 80 00 4D */ li r4, 0x4d
/* 800C0CC8 000BDC08 88 1C 04 BA */ lbz r0, 0x4ba(r28)
/* 800C0CCC 000BDC0C 7C 05 07 74 */ extsb r5, r0
/* 800C0CD0 000BDC10 4B F7 46 91 */ bl dSv_info_c_NS_isSwitch
/* 800C0CD0 000BDC10 4B F7 46 91 */ bl isSwitch__10dSv_info_cCFii
/* 800C0CD4 000BDC14 2C 03 00 00 */ cmpwi r3, 0
/* 800C0CD8 000BDC18 41 82 00 24 */ beq lbl_800C0CFC
/* 800C0CDC 000BDC1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -40258,7 +40258,7 @@ lbl_800C0C90:
/* 800C0CE4 000BDC24 38 80 00 18 */ li r4, 0x18
/* 800C0CE8 000BDC28 88 1C 04 BA */ lbz r0, 0x4ba(r28)
/* 800C0CEC 000BDC2C 7C 05 07 74 */ extsb r5, r0
/* 800C0CF0 000BDC30 4B F7 46 71 */ bl dSv_info_c_NS_isSwitch
/* 800C0CF0 000BDC30 4B F7 46 71 */ bl isSwitch__10dSv_info_cCFii
/* 800C0CF4 000BDC34 2C 03 00 00 */ cmpwi r3, 0
/* 800C0CF8 000BDC38 41 82 00 64 */ beq lbl_800C0D5C
lbl_800C0CFC:
@@ -84289,7 +84289,7 @@ daAlink_c_NS_checkChainEmphasys:
/* 800E79C4 000E4904 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 800E79C8 000E4908 88 05 04 BA */ lbz r0, 0x4ba(r5)
/* 800E79CC 000E490C 7C 05 07 74 */ extsb r5, r0
/* 800E79D0 000E4910 4B F4 D9 91 */ bl dSv_info_c_NS_isSwitch
/* 800E79D0 000E4910 4B F4 D9 91 */ bl isSwitch__10dSv_info_cCFii
/* 800E79D4 000E4914 2C 03 00 00 */ cmpwi r3, 0
/* 800E79D8 000E4918 41 82 00 0C */ beq lbl_800E79E4
/* 800E79DC 000E491C 38 60 00 00 */ li r3, 0
@@ -139393,7 +139393,7 @@ daAlink_c_NS_setShapeAngleToTalkActor:
/* 801185AC 001154EC 88 9E 05 69 */ lbz r4, 0x569(r30)
/* 801185B0 001154F0 88 1E 04 BA */ lbz r0, 0x4ba(r30)
/* 801185B4 001154F4 7C 05 07 74 */ extsb r5, r0
/* 801185B8 001154F8 4B F1 CD A9 */ bl dSv_info_c_NS_isSwitch
/* 801185B8 001154F8 4B F1 CD A9 */ bl isSwitch__10dSv_info_cCFii
/* 801185BC 001154FC 2C 03 00 00 */ cmpwi r3, 0
/* 801185C0 00115500 40 82 00 7C */ bne lbl_8011863C
lbl_801185C4:
asm/d/a/obj/d_a_obj_item.s
+4 -4
View File
@@ -586,7 +586,7 @@ lbl_8015B5B8:
/* 8015B5D0 00158510 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015B5D4 00158514 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015B5D8 00158518 7C 05 07 74 */ extsb r5, r0
/* 8015B5DC 0015851C 4B ED 9D 85 */ bl dSv_info_c_NS_isSwitch
/* 8015B5DC 0015851C 4B ED 9D 85 */ bl isSwitch__10dSv_info_cCFii
/* 8015B5E0 00158520 2C 03 00 00 */ cmpwi r3, 0
/* 8015B5E4 00158524 40 82 00 20 */ bne lbl_8015B604
/* 8015B5E8 00158528 7F E3 FB 78 */ mr r3, r31
@@ -837,7 +837,7 @@ lbl_8015B948:
/* 8015B980 001588C0 80 9F 09 20 */ lwz r4, 0x920(r31)
/* 8015B984 001588C4 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015B988 001588C8 7C 05 07 74 */ extsb r5, r0
/* 8015B98C 001588CC 4B ED 9C 05 */ bl dSv_info_c_NS_isItem
/* 8015B98C 001588CC 4B ED 9C 05 */ bl isItem__10dSv_info_cCFii
/* 8015B990 001588D0 2C 03 00 00 */ cmpwi r3, 0
/* 8015B994 001588D4 41 82 00 0C */ beq lbl_8015B9A0
/* 8015B998 001588D8 38 60 00 05 */ li r3, 5
@@ -1733,7 +1733,7 @@ lbl_8015C62C:
/* 8015C664 001595A4 80 9F 09 3C */ lwz r4, 0x93c(r31)
/* 8015C668 001595A8 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015C66C 001595AC 7C 05 07 74 */ extsb r5, r0
/* 8015C670 001595B0 4B ED 8C F1 */ bl dSv_info_c_NS_isSwitch
/* 8015C670 001595B0 4B ED 8C F1 */ bl isSwitch__10dSv_info_cCFii
/* 8015C674 001595B4 2C 03 00 00 */ cmpwi r3, 0
/* 8015C678 001595B8 41 82 00 7C */ beq lbl_8015C6F4
/* 8015C67C 001595BC 38 7F 05 8C */ addi r3, r31, 0x58c
@@ -2435,7 +2435,7 @@ lbl_8015D03C:
/* 8015D044 00159F84 80 9F 09 20 */ lwz r4, 0x920(r31)
/* 8015D048 00159F88 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015D04C 00159F8C 7C 05 07 74 */ extsb r5, r0
/* 8015D050 00159F90 4B ED 84 91 */ bl dSv_info_c_NS_onItem
/* 8015D050 00159F90 4B ED 84 91 */ bl onItem__10dSv_info_cFii
/* 8015D054 00159F94 38 00 00 00 */ li r0, 0
/* 8015D058 00159F98 90 1F 08 08 */ stw r0, 0x808(r31)
/* 8015D05C 00159F9C 80 1F 08 0C */ lwz r0, 0x80c(r31)
asm/d/com/d_com_static.s
+5 -5
View File
@@ -69,7 +69,7 @@ daSus_c_NS_data_c_NS_isSwitch:
/* 80030FF0 0002DF30 88 85 00 02 */ lbz r4, 2(r5)
/* 80030FF4 0002DF34 88 A5 00 00 */ lbz r5, 0(r5)
/* 80030FF8 0002DF38 7C A5 07 74 */ extsb r5, r5
/* 80030FFC 0002DF3C 48 00 43 65 */ bl dSv_info_c_NS_isSwitch
/* 80030FFC 0002DF3C 48 00 43 65 */ bl isSwitch__10dSv_info_cCFii
/* 80031000 0002DF40 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 80031004 0002DF44 48 00 00 24 */ b lbl_80031028
lbl_80031008:
@@ -78,7 +78,7 @@ lbl_80031008:
/* 80031010 0002DF50 88 85 00 02 */ lbz r4, 2(r5)
/* 80031014 0002DF54 88 A5 00 00 */ lbz r5, 0(r5)
/* 80031018 0002DF58 7C A5 07 74 */ extsb r5, r5
/* 8003101C 0002DF5C 48 00 43 45 */ bl dSv_info_c_NS_isSwitch
/* 8003101C 0002DF5C 48 00 43 45 */ bl isSwitch__10dSv_info_cCFii
/* 80031020 0002DF60 7C 60 00 34 */ cntlzw r0, r3
/* 80031024 0002DF64 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
lbl_80031028:
@@ -951,7 +951,7 @@ daTagMagne_c_NS_checkMagneA:
/* 80031C14 0002EB54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80031C18 0002EB58 88 05 04 BA */ lbz r0, 0x4ba(r5)
/* 80031C1C 0002EB5C 7C 05 07 74 */ extsb r5, r0
/* 80031C20 0002EB60 48 00 37 41 */ bl dSv_info_c_NS_isSwitch
/* 80031C20 0002EB60 48 00 37 41 */ bl isSwitch__10dSv_info_cCFii
/* 80031C24 0002EB64 2C 03 00 00 */ cmpwi r3, 0
/* 80031C28 0002EB68 41 82 00 0C */ beq lbl_80031C34
lbl_80031C2C:
@@ -978,7 +978,7 @@ daTagMagne_c_NS_checkMagneB:
/* 80031C68 0002EBA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80031C6C 0002EBAC 88 05 04 BA */ lbz r0, 0x4ba(r5)
/* 80031C70 0002EBB0 7C 05 07 74 */ extsb r5, r0
/* 80031C74 0002EBB4 48 00 36 ED */ bl dSv_info_c_NS_isSwitch
/* 80031C74 0002EBB4 48 00 36 ED */ bl isSwitch__10dSv_info_cCFii
/* 80031C78 0002EBB8 2C 03 00 00 */ cmpwi r3, 0
/* 80031C7C 0002EBBC 41 82 00 0C */ beq lbl_80031C88
lbl_80031C80:
@@ -1005,7 +1005,7 @@ daTagMagne_c_NS_checkMagneC:
/* 80031CBC 0002EBFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80031CC0 0002EC00 88 05 04 BA */ lbz r0, 0x4ba(r5)
/* 80031CC4 0002EC04 7C 05 07 74 */ extsb r5, r0
/* 80031CC8 0002EC08 48 00 36 99 */ bl dSv_info_c_NS_isSwitch
/* 80031CC8 0002EC08 48 00 36 99 */ bl isSwitch__10dSv_info_cCFii
/* 80031CCC 0002EC0C 2C 03 00 00 */ cmpwi r3, 0
/* 80031CD0 0002EC10 41 82 00 0C */ beq lbl_80031CDC
lbl_80031CD4:
asm/d/com/inf/d_com_inf_game.s
+2 -2
View File
@@ -2685,7 +2685,7 @@ dComIfGs_offStageSwitch:
/* 8002D6FC 0002A63C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002D700 0002A640 7F E4 FB 78 */ mr r4, r31
/* 8002D704 0002A644 38 A0 FF FF */ li r5, -1
/* 8002D708 0002A648 48 00 7B A9 */ bl dSv_info_c_NS_offSwitch
/* 8002D708 0002A648 48 00 7B A9 */ bl offSwitch__10dSv_info_cFii
lbl_8002D70C:
/* 8002D70C 0002A64C 57 C4 28 34 */ slwi r4, r30, 5
/* 8002D710 0002A650 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -2724,7 +2724,7 @@ dComIfGs_isStageSwitch:
/* 8002D788 0002A6C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002D78C 0002A6CC 7F E4 FB 78 */ mr r4, r31
/* 8002D790 0002A6D0 38 A0 FF FF */ li r5, -1
/* 8002D794 0002A6D4 48 00 7B CD */ bl dSv_info_c_NS_isSwitch
/* 8002D794 0002A6D4 48 00 7B CD */ bl isSwitch__10dSv_info_cCFii
/* 8002D798 0002A6D8 48 00 00 20 */ b lbl_8002D7B8
lbl_8002D79C:
/* 8002D79C 0002A6DC 57 C4 28 34 */ slwi r4, r30, 5
asm/d/d_camera.s
+1 -1
View File
@@ -38532,7 +38532,7 @@ daTagMwait_c_NS_checkEndMessage:
/* 80182DB4 0017FCF4 88 85 05 69 */ lbz r4, 0x569(r5)
/* 80182DB8 0017FCF8 88 05 04 BA */ lbz r0, 0x4ba(r5)
/* 80182DBC 0017FCFC 7C 05 07 74 */ extsb r5, r0
/* 80182DC0 0017FD00 4B EB 25 A1 */ bl dSv_info_c_NS_isSwitch
/* 80182DC0 0017FD00 4B EB 25 A1 */ bl isSwitch__10dSv_info_cCFii
/* 80182DC4 0017FD04 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80182DC8 0017FD08 7C 08 03 A6 */ mtlr r0
/* 80182DCC 0017FD0C 38 21 00 10 */ addi r1, r1, 0x10
asm/d/d_event.s
+1 -1
View File
@@ -176,7 +176,7 @@ dEvt_control_c_NS_order:
/* 800416D8 0003E618 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800416DC 0003E61C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800416E0 0003E620 7E E5 BB 78 */ mr r5, r23
/* 800416E4 0003E624 4B FF 3C 7D */ bl dSv_info_c_NS_isSwitch
/* 800416E4 0003E624 4B FF 3C 7D */ bl isSwitch__10dSv_info_cCFii
/* 800416E8 0003E628 2C 03 00 00 */ cmpwi r3, 0
/* 800416EC 0003E62C 41 82 00 0C */ beq lbl_800416F8
/* 800416F0 0003E630 38 60 00 00 */ li r3, 0
asm/d/d_kankyo.s
+2 -2
View File
@@ -11066,7 +11066,7 @@ dKy_lightswitch_check:
/* 801A6224 001A3164 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801A6228 001A3168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801A622C 001A316C 7C A5 07 74 */ extsb r5, r5
/* 801A6230 001A3170 4B E8 F1 31 */ bl dSv_info_c_NS_isSwitch
/* 801A6230 001A3170 4B E8 F1 31 */ bl isSwitch__10dSv_info_cCFii
/* 801A6234 001A3174 2C 03 00 00 */ cmpwi r3, 0
/* 801A6238 001A3178 41 82 00 28 */ beq lbl_801A6260
/* 801A623C 001A317C 3B E0 00 00 */ li r31, 0
@@ -11075,7 +11075,7 @@ lbl_801A6244:
/* 801A6244 001A3184 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801A6248 001A3188 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801A624C 001A318C 7C A5 07 74 */ extsb r5, r5
/* 801A6250 001A3190 4B E8 F1 11 */ bl dSv_info_c_NS_isSwitch
/* 801A6250 001A3190 4B E8 F1 11 */ bl isSwitch__10dSv_info_cCFii
/* 801A6254 001A3194 2C 03 00 00 */ cmpwi r3, 0
/* 801A6258 001A3198 40 82 00 08 */ bne lbl_801A6260
/* 801A625C 001A319C 3B E0 00 00 */ li r31, 0
asm/d/d_map.s
+4 -4
View File
@@ -967,7 +967,7 @@ lbl_8002929C:
/* 800292B8 000261F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800292BC 000261FC 88 BB 00 01 */ lbz r5, 1(r27)
/* 800292C0 00026200 7C A5 07 74 */ extsb r5, r5
/* 800292C4 00026204 48 00 C0 9D */ bl dSv_info_c_NS_isSwitch
/* 800292C4 00026204 48 00 C0 9D */ bl isSwitch__10dSv_info_cCFii
/* 800292C8 00026208 2C 03 00 00 */ cmpwi r3, 0
/* 800292CC 0002620C 41 82 04 04 */ beq lbl_800296D0
lbl_800292D0:
@@ -1089,7 +1089,7 @@ lbl_80029464:
/* 80029478 000263B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002947C 000263BC 88 BB 00 01 */ lbz r5, 1(r27)
/* 80029480 000263C0 7C A5 07 74 */ extsb r5, r5
/* 80029484 000263C4 48 00 BE DD */ bl dSv_info_c_NS_isSwitch
/* 80029484 000263C4 48 00 BE DD */ bl isSwitch__10dSv_info_cCFii
/* 80029488 000263C8 2C 03 00 00 */ cmpwi r3, 0
/* 8002948C 000263CC 41 82 02 44 */ beq lbl_800296D0
lbl_80029490:
@@ -1109,7 +1109,7 @@ lbl_80029490:
/* 800294C4 00026404 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800294C8 00026408 88 BB 00 01 */ lbz r5, 1(r27)
/* 800294CC 0002640C 7C A5 07 74 */ extsb r5, r5
/* 800294D0 00026410 48 00 BE 91 */ bl dSv_info_c_NS_isSwitch
/* 800294D0 00026410 48 00 BE 91 */ bl isSwitch__10dSv_info_cCFii
/* 800294D4 00026414 2C 03 00 00 */ cmpwi r3, 0
/* 800294D8 00026418 41 82 01 F8 */ beq lbl_800296D0
lbl_800294DC:
@@ -1195,7 +1195,7 @@ lbl_800295E4:
/* 80029610 00026550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029614 00026554 88 BB 00 01 */ lbz r5, 1(r27)
/* 80029618 00026558 7C A5 07 74 */ extsb r5, r5
/* 8002961C 0002655C 48 00 BD 45 */ bl dSv_info_c_NS_isSwitch
/* 8002961C 0002655C 48 00 BD 45 */ bl isSwitch__10dSv_info_cCFii
/* 80029620 00026560 2C 03 00 00 */ cmpwi r3, 0
/* 80029624 00026564 41 82 00 AC */ beq lbl_800296D0
lbl_80029628:
asm/d/d_path.s
+1 -1
View File
@@ -179,7 +179,7 @@ lbl_800519E4:
/* 800519F0 0004E930 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800519F4 0004E934 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800519F8 0004E938 7F 65 DB 78 */ mr r5, r27
/* 800519FC 0004E93C 4B FE 39 65 */ bl dSv_info_c_NS_isSwitch
/* 800519FC 0004E93C 4B FE 39 65 */ bl isSwitch__10dSv_info_cCFii
/* 80051A00 0004E940 2C 03 00 00 */ cmpwi r3, 0
/* 80051A04 0004E944 41 82 00 0C */ beq lbl_80051A10
/* 80051A08 0004E948 38 60 00 00 */ li r3, 0
asm/d/d_save.s
-661
View File
File diff suppressed because it is too large Load Diff
asm/d/d_stage.s
+3 -3
View File
@@ -1923,7 +1923,7 @@ lbl_8002589C:
/* 800258A0 000227E0 A0 9E 00 1E */ lhz r4, 0x1e(r30)
/* 800258A4 000227E4 88 BB 00 04 */ lbz r5, 4(r27)
/* 800258A8 000227E8 7C A5 07 74 */ extsb r5, r5
/* 800258AC 000227EC 48 00 FE 79 */ bl dSv_info_c_NS_isActor
/* 800258AC 000227EC 48 00 FE 79 */ bl isActor__10dSv_info_cCFii
/* 800258B0 000227F0 2C 03 00 00 */ cmpwi r3, 0
/* 800258B4 000227F4 40 82 00 74 */ bne lbl_80025928
/* 800258B8 000227F8 88 7B 00 04 */ lbz r3, 4(r27)
@@ -2047,7 +2047,7 @@ lbl_80025A68:
/* 80025A6C 000229AC A0 9E 00 1E */ lhz r4, 0x1e(r30)
/* 80025A70 000229B0 88 BB 00 04 */ lbz r5, 4(r27)
/* 80025A74 000229B4 7C A5 07 74 */ extsb r5, r5
/* 80025A78 000229B8 48 00 FC AD */ bl dSv_info_c_NS_isActor
/* 80025A78 000229B8 48 00 FC AD */ bl isActor__10dSv_info_cCFii
/* 80025A7C 000229BC 2C 03 00 00 */ cmpwi r3, 0
/* 80025A80 000229C0 40 82 00 74 */ bne lbl_80025AF4
/* 80025A84 000229C4 88 7B 00 04 */ lbz r3, 4(r27)
@@ -2109,7 +2109,7 @@ lbl_80025B54:
/* 80025B58 00022A98 A0 9E 00 1E */ lhz r4, 0x1e(r30)
/* 80025B5C 00022A9C 88 BB 00 04 */ lbz r5, 4(r27)
/* 80025B60 00022AA0 7C A5 07 74 */ extsb r5, r5
/* 80025B64 00022AA4 48 00 FB C1 */ bl dSv_info_c_NS_isActor
/* 80025B64 00022AA4 48 00 FB C1 */ bl isActor__10dSv_info_cCFii
/* 80025B68 00022AA8 2C 03 00 00 */ cmpwi r3, 0
/* 80025B6C 00022AAC 40 82 00 60 */ bne lbl_80025BCC
/* 80025B70 00022AB0 4B FF 3F 39 */ bl fopAcM_CreateAppend
asm/d/d_tresure.s
+3 -3
View File
@@ -207,7 +207,7 @@ lbl_8009BE88:
/* 8009BE90 00098DD0 7C 80 D2 14 */ add r4, r0, r26
/* 8009BE94 00098DD4 88 BD 00 01 */ lbz r5, 1(r29)
/* 8009BE98 00098DD8 7C A5 07 74 */ extsb r5, r5
/* 8009BE9C 00098DDC 4B F9 94 C5 */ bl dSv_info_c_NS_isSwitch
/* 8009BE9C 00098DDC 4B F9 94 C5 */ bl isSwitch__10dSv_info_cCFii
/* 8009BEA0 00098DE0 20 03 00 00 */ subfic r0, r3, 0
/* 8009BEA4 00098DE4 7C 60 01 10 */ subfe r3, r0, r0
/* 8009BEA8 00098DE8 7F C0 D0 30 */ slw r0, r30, r26
@@ -373,7 +373,7 @@ lbl_8009C0F0:
/* 8009C0F8 00099038 88 9D 00 10 */ lbz r4, 0x10(r29)
/* 8009C0FC 0009903C 88 BD 00 01 */ lbz r5, 1(r29)
/* 8009C100 00099040 7C A5 07 74 */ extsb r5, r5
/* 8009C104 00099044 4B F9 92 5D */ bl dSv_info_c_NS_isSwitch
/* 8009C104 00099044 4B F9 92 5D */ bl isSwitch__10dSv_info_cCFii
/* 8009C108 00099048 2C 03 00 00 */ cmpwi r3, 0
/* 8009C10C 0009904C 41 82 00 1C */ beq lbl_8009C128
/* 8009C110 00099050 80 9F 00 08 */ lwz r4, 8(r31)
@@ -514,7 +514,7 @@ lbl_8009C2A0:
/* 8009C2F8 00099238 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8009C2FC 0009923C 88 1F 00 01 */ lbz r0, 1(r31)
/* 8009C300 00099240 7C 05 07 74 */ extsb r5, r0
/* 8009C304 00099244 4B F9 90 5D */ bl dSv_info_c_NS_isSwitch
/* 8009C304 00099244 4B F9 90 5D */ bl isSwitch__10dSv_info_cCFii
/* 8009C308 00099248 2C 03 00 00 */ cmpwi r3, 0
/* 8009C30C 0009924C 41 82 00 38 */ beq lbl_8009C344
lbl_8009C310:
asm/d/event/d_event_manager.s
+1 -1
View File
@@ -33,7 +33,7 @@ dEvent_exception_c_NS_setStartDemo:
/* 80046434 00043374 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80046438 00043378 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8004643C 0004337C 7F E5 FB 78 */ mr r5, r31
/* 80046440 00043380 4B FE EF 21 */ bl dSv_info_c_NS_isSwitch
/* 80046440 00043380 4B FE EF 21 */ bl isSwitch__10dSv_info_cCFii
/* 80046444 00043384 2C 03 00 00 */ cmpwi r3, 0
/* 80046448 00043388 41 82 00 0C */ beq lbl_80046454
/* 8004644C 0004338C 38 60 00 FF */ li r3, 0xff
asm/d/file/d_file_select.s
+2 -2
View File
@@ -3547,7 +3547,7 @@ dFile_select_c_NS_menuSelectStart:
/* 80186944 00183884 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80186948 00183888 38 9F 03 B8 */ addi r4, r31, 0x3b8
/* 8018694C 0018388C 88 BF 02 65 */ lbz r5, 0x265(r31)
/* 80186950 00183890 4B EA F0 B5 */ bl dSv_info_c_NS_card_to_memory
/* 80186950 00183890 4B EA F0 B5 */ bl card_to_memory__10dSv_info_cFPci
/* 80186954 00183894 38 00 00 01 */ li r0, 1
/* 80186958 00183898 98 1F 02 70 */ stb r0, 0x270(r31)
/* 8018695C 0018389C 38 00 00 2E */ li r0, 0x2e
@@ -12483,7 +12483,7 @@ lbl_8018ED68:
/* 8018EDBC 0018BCFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8018EDC0 0018BD00 38 9F 03 B8 */ addi r4, r31, 0x3b8
/* 8018EDC4 0018BD04 38 A0 00 00 */ li r5, 0
/* 8018EDC8 0018BD08 4B EA 6C 3D */ bl dSv_info_c_NS_card_to_memory
/* 8018EDC8 0018BD08 4B EA 6C 3D */ bl card_to_memory__10dSv_info_cFPci
/* 8018EDCC 0018BD0C 38 80 00 01 */ li r4, 1
/* 8018EDD0 0018BD10 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8018EDD4 0018BD14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
asm/d/map/path/d_map_path_dmap.s
+3 -3
View File
@@ -247,7 +247,7 @@ lbl_8003EFAC:
/* 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
/* 8003EFE4 0003BF24 4B FF 63 7D */ bl dSv_info_c_NS_isSwitch
/* 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
lbl_8003EFF0:
@@ -1270,7 +1270,7 @@ lbl_8003FDC0:
/* 8003FDD0 0003CD10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@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 dSv_info_c_NS_isSwitch
/* 8003FDDC 0003CD1C 4B FF 55 85 */ bl isSwitch__10dSv_info_cCFii
/* 8003FDE0 0003CD20 7C 60 00 34 */ cntlzw r0, r3
/* 8003FDE4 0003CD24 54 03 D9 7E */ srwi r3, r0, 5
/* 8003FDE8 0003CD28 48 00 00 20 */ b lbl_8003FE08
@@ -1279,7 +1279,7 @@ lbl_8003FDEC:
/* 8003FDF0 0003CD30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@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 dSv_info_c_NS_isSwitch
/* 8003FDFC 0003CD3C 4B FF 55 65 */ bl isSwitch__10dSv_info_cCFii
/* 8003FE00 0003CD40 30 03 FF FF */ addic r0, r3, -1
/* 8003FE04 0003CD44 7C 60 19 10 */ subfe r3, r0, r3
lbl_8003FE08:
asm/d/map/path/d_map_path_fmap.s
+4 -4
View File
@@ -1204,7 +1204,7 @@ lbl_8003E768:
/* 8003E7C4 0003B704 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8003E7C8 0003B708 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003E7CC 0003B70C 7F A5 EB 78 */ mr r5, r29
/* 8003E7D0 0003B710 4B FF 6B 91 */ bl dSv_info_c_NS_isSwitch
/* 8003E7D0 0003B710 4B FF 6B 91 */ bl isSwitch__10dSv_info_cCFii
/* 8003E7D4 0003B714 2C 03 00 00 */ cmpwi r3, 0
/* 8003E7D8 0003B718 41 82 00 08 */ beq lbl_8003E7E0
/* 8003E7DC 0003B71C 3B 60 00 01 */ li r27, 1
@@ -1316,7 +1316,7 @@ lbl_8003E938:
/* 8003E95C 0003B89C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8003E960 0003B8A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003E964 0003B8A4 7F A5 EB 78 */ mr r5, r29
/* 8003E968 0003B8A8 4B FF 69 F9 */ bl dSv_info_c_NS_isSwitch
/* 8003E968 0003B8A8 4B FF 69 F9 */ bl isSwitch__10dSv_info_cCFii
/* 8003E96C 0003B8AC 2C 03 00 00 */ cmpwi r3, 0
/* 8003E970 0003B8B0 41 82 00 08 */ beq lbl_8003E978
/* 8003E974 0003B8B4 3B 60 00 01 */ li r27, 1
@@ -1363,7 +1363,7 @@ lbl_8003E9E8:
/* 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
/* 8003EA10 0003B950 4B FF 69 51 */ bl dSv_info_c_NS_isSwitch
/* 8003EA10 0003B950 4B FF 69 51 */ bl isSwitch__10dSv_info_cCFii
/* 8003EA14 0003B954 30 03 FF FF */ addic r0, r3, -1
/* 8003EA18 0003B958 7F 80 19 10 */ subfe r28, r0, r3
/* 8003EA1C 0003B95C 48 00 00 D8 */ b lbl_8003EAF4
@@ -1401,7 +1401,7 @@ lbl_8003EA20:
/* 8003EA98 0003B9D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8003EA9C 0003B9DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003EAA0 0003B9E0 7F A5 EB 78 */ mr r5, r29
/* 8003EAA4 0003B9E4 4B FF 68 BD */ bl dSv_info_c_NS_isSwitch
/* 8003EAA4 0003B9E4 4B FF 68 BD */ bl isSwitch__10dSv_info_cCFii
/* 8003EAA8 0003B9E8 2C 03 00 00 */ cmpwi r3, 0
/* 8003EAAC 0003B9EC 41 82 00 08 */ beq lbl_8003EAB4
/* 8003EAB0 0003B9F0 3B 60 00 01 */ li r27, 1
asm/d/menu/d_menu_dmap.s
+1 -1
View File
@@ -5274,7 +5274,7 @@ lbl_801BCCAC:
/* 801BCCE4 001B9C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BCCE8 001B9C28 88 A1 00 08 */ lbz r5, 8(r1)
/* 801BCCEC 001B9C2C 7C A5 07 74 */ extsb r5, r5
/* 801BCCF0 001B9C30 4B E7 86 71 */ bl dSv_info_c_NS_isSwitch
/* 801BCCF0 001B9C30 4B E7 86 71 */ bl isSwitch__10dSv_info_cCFii
/* 801BCCF4 001B9C34 2C 03 00 00 */ cmpwi r3, 0
/* 801BCCF8 001B9C38 41 82 00 30 */ beq lbl_801BCD28
lbl_801BCCFC:
asm/d/menu/d_menu_save.s
+1 -1
View File
@@ -3442,7 +3442,7 @@ dMenu_save_c_NS_dataWrite:
/* 801F2888 001EF7C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F288C 001EF7CC 38 9D 01 D0 */ addi r4, r29, 0x1d0
/* 801F2890 001EF7D0 88 BD 00 54 */ lbz r5, 0x54(r29)
/* 801F2894 001EF7D4 4B E4 2F 05 */ bl dSv_info_c_NS_memory_to_card
/* 801F2894 001EF7D4 4B E4 2F 05 */ bl memory_to_card__10dSv_info_cFPci
/* 801F2898 001EF7D8 38 7D 01 D0 */ addi r3, r29, 0x1d0
/* 801F289C 001EF7DC 88 9D 00 54 */ lbz r4, 0x54(r29)
/* 801F28A0 001EF7E0 4B E2 54 99 */ bl mDoMemCdRWm_SetCheckSumGameData

Some files were not shown because too many files have changed in this diff Show More