From b0ffcd38785ba5a2eee0298bc1c1c6f5d7a8aec1 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2020 22:02:39 -0500 Subject: [PATCH] some dSv_memBit_c methods ok --- asm/Z2AudioLib/Z2EnvSeMgr.s | 72 +++++++++--------- asm/Z2AudioLib/Z2SceneMgr.s | 2 +- asm/d/a/d_a_alink.s | 8 +- asm/d/com/inf/d_com_inf_game.s | 22 +++--- asm/d/d_item.s | 22 +++--- asm/d/d_kankyo.s | 24 +++--- asm/d/d_map.s | 4 +- asm/d/d_save.s | 117 ++---------------------------- asm/d/d_tresure.s | 4 +- asm/d/kankyo/d_kankyo_rain.s | 2 +- asm/d/map/path/d_map_path_dmap.s | 4 +- asm/d/menu/d_menu_dmap.s | 20 ++--- asm/d/menu/dmap/d_menu_dmap_map.s | 4 +- asm/d/meter/d_meter_map.s | 12 +-- asm/d/msg/d_msg_flow.s | 12 +-- asm/d/save/d_save_HIO.s | 4 +- asm/d/shop/d_shop_system.s | 18 ++--- include/func_80034810.s | 10 +++ include/func_80034838.s | 10 +++ include/func_80034860.s | 11 +++ include/func_8003488C.s | 14 ++++ include/func_800348C4.s | 10 +++ include/func_800348EC.s | 11 +++ src/d/d_save/d_save.cpp | 39 +++++++++- 24 files changed, 227 insertions(+), 229 deletions(-) create mode 100644 include/func_80034810.s create mode 100644 include/func_80034838.s create mode 100644 include/func_80034860.s create mode 100644 include/func_8003488C.s create mode 100644 include/func_800348C4.s create mode 100644 include/func_800348EC.s diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s index 6ce740a4d99..bcffac52e6c 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr.s @@ -5002,7 +5002,7 @@ lbl_802CA04C: /* 802CA058 002C6F98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA05C 002C6F9C 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA060 002C6FA0 38 80 00 08 */ li r4, 8 -/* 802CA064 002C6FA4 4B D6 A7 FD */ bl dSv_memBit_c_NS_isSwitch +/* 802CA064 002C6FA4 4B D6 A7 FD */ bl isSwitch__12dSv_memBit_cCFi /* 802CA068 002C6FA8 2C 03 00 00 */ cmpwi r3, 0 /* 802CA06C 002C6FAC 41 82 00 14 */ beq lbl_802CA080 /* 802CA070 002C6FB0 38 7D 02 24 */ addi r3, r29, 0x224 @@ -5017,7 +5017,7 @@ lbl_802CA080: /* 802CA090 002C6FD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA094 002C6FD4 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA098 002C6FD8 38 80 00 09 */ li r4, 9 -/* 802CA09C 002C6FDC 4B D6 A7 C5 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA09C 002C6FDC 4B D6 A7 C5 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA0A0 002C6FE0 2C 03 00 00 */ cmpwi r3, 0 /* 802CA0A4 002C6FE4 41 82 00 14 */ beq lbl_802CA0B8 /* 802CA0A8 002C6FE8 38 7D 02 24 */ addi r3, r29, 0x224 @@ -5033,12 +5033,12 @@ lbl_802CA0B8: /* 802CA0CC 002C700C 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA0D0 002C7010 7F 83 E3 78 */ mr r3, r28 /* 802CA0D4 002C7014 38 80 00 08 */ li r4, 8 -/* 802CA0D8 002C7018 4B D6 A7 89 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA0D8 002C7018 4B D6 A7 89 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA0DC 002C701C 2C 03 00 00 */ cmpwi r3, 0 /* 802CA0E0 002C7020 41 82 00 28 */ beq lbl_802CA108 /* 802CA0E4 002C7024 7F 83 E3 78 */ mr r3, r28 /* 802CA0E8 002C7028 38 80 00 03 */ li r4, 3 -/* 802CA0EC 002C702C 4B D6 A7 75 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA0EC 002C702C 4B D6 A7 75 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA0F0 002C7030 2C 03 00 00 */ cmpwi r3, 0 /* 802CA0F4 002C7034 41 82 00 14 */ beq lbl_802CA108 /* 802CA0F8 002C7038 38 7D 02 24 */ addi r3, r29, 0x224 @@ -5054,12 +5054,12 @@ lbl_802CA108: /* 802CA11C 002C705C 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA120 002C7060 7F 83 E3 78 */ mr r3, r28 /* 802CA124 002C7064 38 80 00 09 */ li r4, 9 -/* 802CA128 002C7068 4B D6 A7 39 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA128 002C7068 4B D6 A7 39 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA12C 002C706C 2C 03 00 00 */ cmpwi r3, 0 /* 802CA130 002C7070 41 82 06 4C */ beq lbl_802CA77C /* 802CA134 002C7074 7F 83 E3 78 */ mr r3, r28 /* 802CA138 002C7078 38 80 00 01 */ li r4, 1 -/* 802CA13C 002C707C 4B D6 A7 25 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA13C 002C707C 4B D6 A7 25 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA140 002C7080 2C 03 00 00 */ cmpwi r3, 0 /* 802CA144 002C7084 41 82 06 38 */ beq lbl_802CA77C /* 802CA148 002C7088 38 7D 02 24 */ addi r3, r29, 0x224 @@ -5074,12 +5074,12 @@ lbl_802CA108: /* 802CA16C 002C70AC 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA170 002C70B0 7F 83 E3 78 */ mr r3, r28 /* 802CA174 002C70B4 38 80 00 08 */ li r4, 8 -/* 802CA178 002C70B8 4B D6 A6 E9 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA178 002C70B8 4B D6 A6 E9 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA17C 002C70BC 2C 03 00 00 */ cmpwi r3, 0 /* 802CA180 002C70C0 40 82 00 28 */ bne lbl_802CA1A8 /* 802CA184 002C70C4 7F 83 E3 78 */ mr r3, r28 /* 802CA188 002C70C8 38 80 00 09 */ li r4, 9 -/* 802CA18C 002C70CC 4B D6 A6 D5 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA18C 002C70CC 4B D6 A6 D5 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA190 002C70D0 2C 03 00 00 */ cmpwi r3, 0 /* 802CA194 002C70D4 40 82 00 14 */ bne lbl_802CA1A8 /* 802CA198 002C70D8 38 7D 01 F0 */ addi r3, r29, 0x1f0 @@ -5095,12 +5095,12 @@ lbl_802CA1A8: /* 802CA1BC 002C70FC 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA1C0 002C7100 7F 83 E3 78 */ mr r3, r28 /* 802CA1C4 002C7104 38 80 00 08 */ li r4, 8 -/* 802CA1C8 002C7108 4B D6 A6 99 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA1C8 002C7108 4B D6 A6 99 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA1CC 002C710C 2C 03 00 00 */ cmpwi r3, 0 /* 802CA1D0 002C7110 41 82 00 18 */ beq lbl_802CA1E8 /* 802CA1D4 002C7114 7F 83 E3 78 */ mr r3, r28 /* 802CA1D8 002C7118 38 80 00 09 */ li r4, 9 -/* 802CA1DC 002C711C 4B D6 A6 85 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA1DC 002C711C 4B D6 A6 85 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA1E0 002C7120 2C 03 00 00 */ cmpwi r3, 0 /* 802CA1E4 002C7124 41 82 00 38 */ beq lbl_802CA21C lbl_802CA1E8: @@ -5109,12 +5109,12 @@ lbl_802CA1E8: /* 802CA1F0 002C7130 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA1F4 002C7134 7F 83 E3 78 */ mr r3, r28 /* 802CA1F8 002C7138 38 80 00 08 */ li r4, 8 -/* 802CA1FC 002C713C 4B D6 A6 65 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA1FC 002C713C 4B D6 A6 65 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA200 002C7140 2C 03 00 00 */ cmpwi r3, 0 /* 802CA204 002C7144 40 82 00 28 */ bne lbl_802CA22C /* 802CA208 002C7148 7F 83 E3 78 */ mr r3, r28 /* 802CA20C 002C714C 38 80 00 09 */ li r4, 9 -/* 802CA210 002C7150 4B D6 A6 51 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA210 002C7150 4B D6 A6 51 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA214 002C7154 2C 03 00 00 */ cmpwi r3, 0 /* 802CA218 002C7158 41 82 00 14 */ beq lbl_802CA22C lbl_802CA21C: @@ -5128,12 +5128,12 @@ lbl_802CA22C: /* 802CA234 002C7174 40 82 00 38 */ bne lbl_802CA26C /* 802CA238 002C7178 7F 83 E3 78 */ mr r3, r28 /* 802CA23C 002C717C 38 80 00 08 */ li r4, 8 -/* 802CA240 002C7180 4B D6 A6 21 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA240 002C7180 4B D6 A6 21 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA244 002C7184 2C 03 00 00 */ cmpwi r3, 0 /* 802CA248 002C7188 41 82 00 24 */ beq lbl_802CA26C /* 802CA24C 002C718C 7F 83 E3 78 */ mr r3, r28 /* 802CA250 002C7190 38 80 00 09 */ li r4, 9 -/* 802CA254 002C7194 4B D6 A6 0D */ bl dSv_memBit_c_NS_isSwitch +/* 802CA254 002C7194 4B D6 A6 0D */ bl isSwitch__12dSv_memBit_cCFi /* 802CA258 002C7198 2C 03 00 00 */ cmpwi r3, 0 /* 802CA25C 002C719C 41 82 00 10 */ beq lbl_802CA26C /* 802CA260 002C71A0 38 7D 01 F0 */ addi r3, r29, 0x1f0 @@ -5147,7 +5147,7 @@ lbl_802CA26C: /* 802CA27C 002C71BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA280 002C71C0 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA284 002C71C4 38 80 00 08 */ li r4, 8 -/* 802CA288 002C71C8 4B D6 A5 D9 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA288 002C71C8 4B D6 A5 D9 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA28C 002C71CC 2C 03 00 00 */ cmpwi r3, 0 /* 802CA290 002C71D0 41 82 00 10 */ beq lbl_802CA2A0 /* 802CA294 002C71D4 38 7D 02 24 */ addi r3, r29, 0x224 @@ -5161,7 +5161,7 @@ lbl_802CA2A0: /* 802CA2B0 002C71F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA2B4 002C71F4 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA2B8 002C71F8 38 80 00 09 */ li r4, 9 -/* 802CA2BC 002C71FC 4B D6 A5 A5 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA2BC 002C71FC 4B D6 A5 A5 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA2C0 002C7200 2C 03 00 00 */ cmpwi r3, 0 /* 802CA2C4 002C7204 41 82 00 10 */ beq lbl_802CA2D4 /* 802CA2C8 002C7208 38 7D 02 24 */ addi r3, r29, 0x224 @@ -5176,12 +5176,12 @@ lbl_802CA2D4: /* 802CA2E8 002C7228 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA2EC 002C722C 7F 83 E3 78 */ mr r3, r28 /* 802CA2F0 002C7230 38 80 00 08 */ li r4, 8 -/* 802CA2F4 002C7234 4B D6 A5 6D */ bl dSv_memBit_c_NS_isSwitch +/* 802CA2F4 002C7234 4B D6 A5 6D */ bl isSwitch__12dSv_memBit_cCFi /* 802CA2F8 002C7238 2C 03 00 00 */ cmpwi r3, 0 /* 802CA2FC 002C723C 41 82 00 28 */ beq lbl_802CA324 /* 802CA300 002C7240 7F 83 E3 78 */ mr r3, r28 /* 802CA304 002C7244 38 80 00 03 */ li r4, 3 -/* 802CA308 002C7248 4B D6 A5 59 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA308 002C7248 4B D6 A5 59 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA30C 002C724C 2C 03 00 00 */ cmpwi r3, 0 /* 802CA310 002C7250 41 82 00 14 */ beq lbl_802CA324 /* 802CA314 002C7254 38 7D 02 8C */ addi r3, r29, 0x28c @@ -5197,12 +5197,12 @@ lbl_802CA324: /* 802CA338 002C7278 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA33C 002C727C 7F 83 E3 78 */ mr r3, r28 /* 802CA340 002C7280 38 80 00 08 */ li r4, 8 -/* 802CA344 002C7284 4B D6 A5 1D */ bl dSv_memBit_c_NS_isSwitch +/* 802CA344 002C7284 4B D6 A5 1D */ bl isSwitch__12dSv_memBit_cCFi /* 802CA348 002C7288 2C 03 00 00 */ cmpwi r3, 0 /* 802CA34C 002C728C 41 82 00 24 */ beq lbl_802CA370 /* 802CA350 002C7290 7F 83 E3 78 */ mr r3, r28 /* 802CA354 002C7294 38 80 00 03 */ li r4, 3 -/* 802CA358 002C7298 4B D6 A5 09 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA358 002C7298 4B D6 A5 09 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA35C 002C729C 2C 03 00 00 */ cmpwi r3, 0 /* 802CA360 002C72A0 40 82 00 10 */ bne lbl_802CA370 /* 802CA364 002C72A4 38 7D 02 58 */ addi r3, r29, 0x258 @@ -5217,12 +5217,12 @@ lbl_802CA370: /* 802CA384 002C72C4 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA388 002C72C8 7F 83 E3 78 */ mr r3, r28 /* 802CA38C 002C72CC 38 80 00 09 */ li r4, 9 -/* 802CA390 002C72D0 4B D6 A4 D1 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA390 002C72D0 4B D6 A4 D1 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA394 002C72D4 2C 03 00 00 */ cmpwi r3, 0 /* 802CA398 002C72D8 41 82 00 28 */ beq lbl_802CA3C0 /* 802CA39C 002C72DC 7F 83 E3 78 */ mr r3, r28 /* 802CA3A0 002C72E0 38 80 00 01 */ li r4, 1 -/* 802CA3A4 002C72E4 4B D6 A4 BD */ bl dSv_memBit_c_NS_isSwitch +/* 802CA3A4 002C72E4 4B D6 A4 BD */ bl isSwitch__12dSv_memBit_cCFi /* 802CA3A8 002C72E8 2C 03 00 00 */ cmpwi r3, 0 /* 802CA3AC 002C72EC 41 82 00 14 */ beq lbl_802CA3C0 /* 802CA3B0 002C72F0 38 7D 02 8C */ addi r3, r29, 0x28c @@ -5238,12 +5238,12 @@ lbl_802CA3C0: /* 802CA3D4 002C7314 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA3D8 002C7318 7F 83 E3 78 */ mr r3, r28 /* 802CA3DC 002C731C 38 80 00 09 */ li r4, 9 -/* 802CA3E0 002C7320 4B D6 A4 81 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA3E0 002C7320 4B D6 A4 81 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA3E4 002C7324 2C 03 00 00 */ cmpwi r3, 0 /* 802CA3E8 002C7328 41 82 03 94 */ beq lbl_802CA77C /* 802CA3EC 002C732C 7F 83 E3 78 */ mr r3, r28 /* 802CA3F0 002C7330 38 80 00 01 */ li r4, 1 -/* 802CA3F4 002C7334 4B D6 A4 6D */ bl dSv_memBit_c_NS_isSwitch +/* 802CA3F4 002C7334 4B D6 A4 6D */ bl isSwitch__12dSv_memBit_cCFi /* 802CA3F8 002C7338 2C 03 00 00 */ cmpwi r3, 0 /* 802CA3FC 002C733C 40 82 03 80 */ bne lbl_802CA77C /* 802CA400 002C7340 38 7D 02 58 */ addi r3, r29, 0x258 @@ -5254,7 +5254,7 @@ lbl_802CA3C0: /* 802CA414 002C7354 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA418 002C7358 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA41C 002C735C 38 80 00 08 */ li r4, 8 -/* 802CA420 002C7360 4B D6 A4 41 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA420 002C7360 4B D6 A4 41 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA424 002C7364 2C 03 00 00 */ cmpwi r3, 0 /* 802CA428 002C7368 41 82 03 54 */ beq lbl_802CA77C /* 802CA42C 002C736C 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -5276,12 +5276,12 @@ lbl_802CA448: /* 802CA468 002C73A8 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA46C 002C73AC 7F 83 E3 78 */ mr r3, r28 /* 802CA470 002C73B0 38 80 00 09 */ li r4, 9 -/* 802CA474 002C73B4 4B D6 A3 ED */ bl dSv_memBit_c_NS_isSwitch +/* 802CA474 002C73B4 4B D6 A3 ED */ bl isSwitch__12dSv_memBit_cCFi /* 802CA478 002C73B8 2C 03 00 00 */ cmpwi r3, 0 /* 802CA47C 002C73BC 41 82 00 64 */ beq lbl_802CA4E0 /* 802CA480 002C73C0 7F 83 E3 78 */ mr r3, r28 /* 802CA484 002C73C4 38 80 00 01 */ li r4, 1 -/* 802CA488 002C73C8 4B D6 A3 D9 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA488 002C73C8 4B D6 A3 D9 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA48C 002C73CC 2C 03 00 00 */ cmpwi r3, 0 /* 802CA490 002C73D0 41 82 00 50 */ beq lbl_802CA4E0 /* 802CA494 002C73D4 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -5320,7 +5320,7 @@ lbl_802CA4E0: /* 802CA50C 002C744C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA510 002C7450 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA514 002C7454 38 80 00 31 */ li r4, 0x31 -/* 802CA518 002C7458 4B D6 A3 49 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA518 002C7458 4B D6 A3 49 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA51C 002C745C 2C 03 00 00 */ cmpwi r3, 0 /* 802CA520 002C7460 41 82 00 14 */ beq lbl_802CA534 /* 802CA524 002C7464 38 7D 01 F0 */ addi r3, r29, 0x1f0 @@ -5335,7 +5335,7 @@ lbl_802CA534: /* 802CA544 002C7484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA548 002C7488 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA54C 002C748C 38 80 00 31 */ li r4, 0x31 -/* 802CA550 002C7490 4B D6 A3 11 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA550 002C7490 4B D6 A3 11 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA554 002C7494 2C 03 00 00 */ cmpwi r3, 0 /* 802CA558 002C7498 41 82 00 14 */ beq lbl_802CA56C /* 802CA55C 002C749C 38 7D 02 8C */ addi r3, r29, 0x28c @@ -5350,7 +5350,7 @@ lbl_802CA56C: /* 802CA57C 002C74BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA580 002C74C0 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA584 002C74C4 38 80 00 08 */ li r4, 8 -/* 802CA588 002C74C8 4B D6 A2 D9 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA588 002C74C8 4B D6 A2 D9 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA58C 002C74CC 2C 03 00 00 */ cmpwi r3, 0 /* 802CA590 002C74D0 41 82 00 14 */ beq lbl_802CA5A4 /* 802CA594 002C74D4 38 7D 02 58 */ addi r3, r29, 0x258 @@ -5365,7 +5365,7 @@ lbl_802CA5A4: /* 802CA5B4 002C74F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA5B8 002C74F8 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA5BC 002C74FC 38 80 00 31 */ li r4, 0x31 -/* 802CA5C0 002C7500 4B D6 A2 A1 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA5C0 002C7500 4B D6 A2 A1 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA5C4 002C7504 2C 03 00 00 */ cmpwi r3, 0 /* 802CA5C8 002C7508 41 82 01 B4 */ beq lbl_802CA77C /* 802CA5CC 002C750C 38 7D 01 BC */ addi r3, r29, 0x1bc @@ -5376,7 +5376,7 @@ lbl_802CA5A4: /* 802CA5E0 002C7520 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802CA5E4 002C7524 38 63 09 58 */ addi r3, r3, 0x958 /* 802CA5E8 002C7528 38 80 00 09 */ li r4, 9 -/* 802CA5EC 002C752C 4B D6 A2 75 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA5EC 002C752C 4B D6 A2 75 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA5F0 002C7530 2C 03 00 00 */ cmpwi r3, 0 /* 802CA5F4 002C7534 41 82 00 50 */ beq lbl_802CA644 /* 802CA5F8 002C7538 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -5413,12 +5413,12 @@ lbl_802CA644: /* 802CA668 002C75A8 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA66C 002C75AC 7F 83 E3 78 */ mr r3, r28 /* 802CA670 002C75B0 38 80 00 08 */ li r4, 8 -/* 802CA674 002C75B4 4B D6 A1 ED */ bl dSv_memBit_c_NS_isSwitch +/* 802CA674 002C75B4 4B D6 A1 ED */ bl isSwitch__12dSv_memBit_cCFi /* 802CA678 002C75B8 2C 03 00 00 */ cmpwi r3, 0 /* 802CA67C 002C75BC 41 82 01 00 */ beq lbl_802CA77C /* 802CA680 002C75C0 7F 83 E3 78 */ mr r3, r28 /* 802CA684 002C75C4 38 80 00 03 */ li r4, 3 -/* 802CA688 002C75C8 4B D6 A1 D9 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA688 002C75C8 4B D6 A1 D9 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA68C 002C75CC 2C 03 00 00 */ cmpwi r3, 0 /* 802CA690 002C75D0 41 82 00 EC */ beq lbl_802CA77C /* 802CA694 002C75D4 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -5440,7 +5440,7 @@ lbl_802CA6B0: /* 802CA6D0 002C7610 3B 83 09 58 */ addi r28, r3, 0x958 /* 802CA6D4 002C7614 7F 83 E3 78 */ mr r3, r28 /* 802CA6D8 002C7618 38 80 00 30 */ li r4, 0x30 -/* 802CA6DC 002C761C 4B D6 A1 85 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA6DC 002C761C 4B D6 A1 85 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA6E0 002C7620 2C 03 00 00 */ cmpwi r3, 0 /* 802CA6E4 002C7624 41 82 00 80 */ beq lbl_802CA764 /* 802CA6E8 002C7628 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -5462,7 +5462,7 @@ lbl_802CA71C: /* 802CA720 002C7660 40 82 00 28 */ bne lbl_802CA748 /* 802CA724 002C7664 7F 83 E3 78 */ mr r3, r28 /* 802CA728 002C7668 38 80 00 09 */ li r4, 9 -/* 802CA72C 002C766C 4B D6 A1 35 */ bl dSv_memBit_c_NS_isSwitch +/* 802CA72C 002C766C 4B D6 A1 35 */ bl isSwitch__12dSv_memBit_cCFi /* 802CA730 002C7670 2C 03 00 00 */ cmpwi r3, 0 /* 802CA734 002C7674 41 82 00 14 */ beq lbl_802CA748 /* 802CA738 002C7678 38 7D 02 58 */ addi r3, r29, 0x258 diff --git a/asm/Z2AudioLib/Z2SceneMgr.s b/asm/Z2AudioLib/Z2SceneMgr.s index 81c95582edb..b28b290df9a 100644 --- a/asm/Z2AudioLib/Z2SceneMgr.s +++ b/asm/Z2AudioLib/Z2SceneMgr.s @@ -3519,7 +3519,7 @@ dComIfGs_isSaveSwitch: /* 802B9AA4 002B69E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 802B9AA8 002B69E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 802B9AAC 002B69EC 38 63 09 58 */ addi r3, r3, 0x958 -/* 802B9AB0 002B69F0 4B D7 AD B1 */ bl dSv_memBit_c_NS_isSwitch +/* 802B9AB0 002B69F0 4B D7 AD B1 */ bl isSwitch__12dSv_memBit_cCFi /* 802B9AB4 002B69F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B9AB8 002B69F8 7C 08 03 A6 */ mtlr r0 /* 802B9ABC 002B69FC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index 9ef10d177e8..b11534fac4b 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -136533,12 +136533,12 @@ lbl_80115DD4: /* 80115DDC 00112D1C 3B 63 09 58 */ addi r27, r3, 0x958 /* 80115DE0 00112D20 7F 63 DB 78 */ mr r3, r27 /* 80115DE4 00112D24 38 80 00 06 */ li r4, 6 -/* 80115DE8 00112D28 4B F1 EB 4D */ bl dSv_memBit_c_NS_isDungeonItem +/* 80115DE8 00112D28 4B F1 EB 4D */ bl isDungeonItem__12dSv_memBit_cCFi /* 80115DEC 00112D2C 2C 03 00 00 */ cmpwi r3, 0 /* 80115DF0 00112D30 41 82 00 B4 */ beq lbl_80115EA4 /* 80115DF4 00112D34 7F 63 DB 78 */ mr r3, r27 /* 80115DF8 00112D38 38 80 00 03 */ li r4, 3 -/* 80115DFC 00112D3C 4B F1 EB 39 */ bl dSv_memBit_c_NS_isDungeonItem +/* 80115DFC 00112D3C 4B F1 EB 39 */ bl isDungeonItem__12dSv_memBit_cCFi /* 80115E00 00112D40 2C 03 00 00 */ cmpwi r3, 0 /* 80115E04 00112D44 40 82 00 A0 */ bne lbl_80115EA4 /* 80115E08 00112D48 3B 60 00 05 */ li r27, 5 @@ -143902,7 +143902,7 @@ lbl_8011C524: /* 8011C53C 0011947C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8011C540 00119480 38 63 09 58 */ addi r3, r3, 0x958 /* 8011C544 00119484 38 80 00 03 */ li r4, 3 -/* 8011C548 00119488 4B F1 83 ED */ bl dSv_memBit_c_NS_isDungeonItem +/* 8011C548 00119488 4B F1 83 ED */ bl isDungeonItem__12dSv_memBit_cCFi /* 8011C54C 0011948C 2C 03 00 00 */ cmpwi r3, 0 /* 8011C550 00119490 41 82 00 5C */ beq lbl_8011C5AC lbl_8011C554: @@ -143912,7 +143912,7 @@ lbl_8011C554: /* 8011C560 001194A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8011C564 001194A4 38 63 09 58 */ addi r3, r3, 0x958 /* 8011C568 001194A8 38 80 00 07 */ li r4, 7 -/* 8011C56C 001194AC 4B F1 83 C9 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8011C56C 001194AC 4B F1 83 C9 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8011C570 001194B0 2C 03 00 00 */ cmpwi r3, 0 /* 8011C574 001194B4 41 82 00 38 */ beq lbl_8011C5AC lbl_8011C578: diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index cc36038b0a0..ea041049784 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -2654,7 +2654,7 @@ lbl_8002D680: /* 8002D68C 0002A5CC 7C 60 22 14 */ add r3, r0, r4 /* 8002D690 0002A5D0 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D694 0002A5D4 7F E4 FB 78 */ mr r4, r31 -/* 8002D698 0002A5D8 48 00 71 79 */ bl dSv_memBit_c_NS_onSwitch +/* 8002D698 0002A5D8 48 00 71 79 */ bl onSwitch__12dSv_memBit_cFi /* 8002D69C 0002A5DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002D6A0 0002A5E0 83 C1 00 08 */ lwz r30, 8(r1) /* 8002D6A4 0002A5E4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2693,7 +2693,7 @@ lbl_8002D70C: /* 8002D718 0002A658 7C 60 22 14 */ add r3, r0, r4 /* 8002D71C 0002A65C 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D720 0002A660 7F E4 FB 78 */ mr r4, r31 -/* 8002D724 0002A664 48 00 71 15 */ bl dSv_memBit_c_NS_offSwitch +/* 8002D724 0002A664 48 00 71 15 */ bl offSwitch__12dSv_memBit_cFi /* 8002D728 0002A668 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002D72C 0002A66C 83 C1 00 08 */ lwz r30, 8(r1) /* 8002D730 0002A670 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2733,7 +2733,7 @@ lbl_8002D79C: /* 8002D7A8 0002A6E8 7C 60 22 14 */ add r3, r0, r4 /* 8002D7AC 0002A6EC 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D7B0 0002A6F0 7F E4 FB 78 */ mr r4, r31 -/* 8002D7B4 0002A6F4 48 00 70 AD */ bl dSv_memBit_c_NS_isSwitch +/* 8002D7B4 0002A6F4 48 00 70 AD */ bl isSwitch__12dSv_memBit_cCFi lbl_8002D7B8: /* 8002D7B8 0002A6F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002D7BC 0002A6FC 83 C1 00 08 */ lwz r30, 8(r1) @@ -2762,10 +2762,10 @@ lbl_8002D7B8: /* 8002D818 0002A758 3B E3 09 58 */ addi r31, r3, 0x958 /* 8002D81C 0002A75C 7F E3 FB 78 */ mr r3, r31 /* 8002D820 0002A760 38 80 00 03 */ li r4, 3 -/* 8002D824 0002A764 48 00 70 F5 */ bl dSv_memBit_c_NS_onDungeonItem +/* 8002D824 0002A764 48 00 70 F5 */ bl onDungeonItem__12dSv_memBit_cFi /* 8002D828 0002A768 7F E3 FB 78 */ mr r3, r31 /* 8002D82C 0002A76C 38 80 00 06 */ li r4, 6 -/* 8002D830 0002A770 48 00 70 E9 */ bl dSv_memBit_c_NS_onDungeonItem +/* 8002D830 0002A770 48 00 70 E9 */ bl onDungeonItem__12dSv_memBit_cFi lbl_8002D834: /* 8002D834 0002A774 57 C4 28 34 */ slwi r4, r30, 5 /* 8002D838 0002A778 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2774,10 +2774,10 @@ lbl_8002D834: /* 8002D844 0002A784 3B E3 01 F0 */ addi r31, r3, 0x1f0 /* 8002D848 0002A788 7F E3 FB 78 */ mr r3, r31 /* 8002D84C 0002A78C 38 80 00 03 */ li r4, 3 -/* 8002D850 0002A790 48 00 70 C9 */ bl dSv_memBit_c_NS_onDungeonItem +/* 8002D850 0002A790 48 00 70 C9 */ bl onDungeonItem__12dSv_memBit_cFi /* 8002D854 0002A794 7F E3 FB 78 */ mr r3, r31 /* 8002D858 0002A798 38 80 00 06 */ li r4, 6 -/* 8002D85C 0002A79C 48 00 70 BD */ bl dSv_memBit_c_NS_onDungeonItem +/* 8002D85C 0002A79C 48 00 70 BD */ bl onDungeonItem__12dSv_memBit_cFi /* 8002D860 0002A7A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002D864 0002A7A4 83 C1 00 08 */ lwz r30, 8(r1) /* 8002D868 0002A7A8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2806,7 +2806,7 @@ dComIfGs_isDungeonItemWarp: /* 8002D8B8 0002A7F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002D8BC 0002A7FC 38 63 09 58 */ addi r3, r3, 0x958 /* 8002D8C0 0002A800 38 80 00 06 */ li r4, 6 -/* 8002D8C4 0002A804 48 00 70 71 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8002D8C4 0002A804 48 00 70 71 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8002D8C8 0002A808 48 00 00 20 */ b lbl_8002D8E8 lbl_8002D8CC: /* 8002D8CC 0002A80C 57 E4 28 34 */ slwi r4, r31, 5 @@ -2815,7 +2815,7 @@ lbl_8002D8CC: /* 8002D8D8 0002A818 7C 60 22 14 */ add r3, r0, r4 /* 8002D8DC 0002A81C 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D8E0 0002A820 38 80 00 06 */ li r4, 6 -/* 8002D8E4 0002A824 48 00 70 51 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8002D8E4 0002A824 48 00 70 51 */ bl isDungeonItem__12dSv_memBit_cCFi lbl_8002D8E8: /* 8002D8E8 0002A828 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002D8EC 0002A82C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5250,7 +5250,7 @@ lbl_8002F91C: /* 8002F960 0002C8A0 40 82 00 20 */ bne lbl_8002F980 /* 8002F964 0002C8A4 38 63 09 58 */ addi r3, r3, 0x958 /* 8002F968 0002C8A8 38 80 00 0C */ li r4, 0xc -/* 8002F96C 0002C8AC 48 00 4E F5 */ bl dSv_memBit_c_NS_isSwitch +/* 8002F96C 0002C8AC 48 00 4E F5 */ bl isSwitch__12dSv_memBit_cCFi /* 8002F970 0002C8B0 2C 03 00 00 */ cmpwi r3, 0 /* 8002F974 0002C8B4 40 82 00 0C */ bne lbl_8002F980 /* 8002F978 0002C8B8 3B E0 00 00 */ li r31, 0 @@ -5273,7 +5273,7 @@ lbl_8002F980: /* 8002F9B8 0002C8F8 40 82 00 1C */ bne lbl_8002F9D4 /* 8002F9BC 0002C8FC 38 63 09 58 */ addi r3, r3, 0x958 /* 8002F9C0 0002C900 38 80 00 0D */ li r4, 0xd -/* 8002F9C4 0002C904 48 00 4E 9D */ bl dSv_memBit_c_NS_isSwitch +/* 8002F9C4 0002C904 48 00 4E 9D */ bl isSwitch__12dSv_memBit_cCFi /* 8002F9C8 0002C908 2C 03 00 00 */ cmpwi r3, 0 /* 8002F9CC 0002C90C 40 82 00 08 */ bne lbl_8002F9D4 /* 8002F9D0 0002C910 3B E0 00 00 */ li r31, 0 diff --git a/asm/d/d_item.s b/asm/d/d_item.s index db60675b97f..c8995375dcd 100644 --- a/asm/d/d_item.s +++ b/asm/d/d_item.s @@ -306,7 +306,7 @@ lbl_80097F18: /* 80098324 00095264 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098328 00095268 38 63 09 58 */ addi r3, r3, 0x958 /* 8009832C 0009526C 38 80 00 04 */ li r4, 4 -/* 80098330 00095270 4B F9 C5 E9 */ bl dSv_memBit_c_NS_onDungeonItem +/* 80098330 00095270 4B F9 C5 E9 */ bl onDungeonItem__12dSv_memBit_cFi /* 80098334 00095274 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098338 00095278 7C 08 03 A6 */ mtlr r0 /* 8009833C 0009527C 38 21 00 10 */ addi r1, r1, 0x10 @@ -318,7 +318,7 @@ lbl_80097F18: /* 80098354 00095294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098358 00095298 38 63 09 58 */ addi r3, r3, 0x958 /* 8009835C 0009529C 38 80 00 00 */ li r4, 0 -/* 80098360 000952A0 4B F9 C5 B9 */ bl dSv_memBit_c_NS_onDungeonItem +/* 80098360 000952A0 4B F9 C5 B9 */ bl onDungeonItem__12dSv_memBit_cFi /* 80098364 000952A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098368 000952A8 7C 08 03 A6 */ mtlr r0 /* 8009836C 000952AC 38 21 00 10 */ addi r1, r1, 0x10 @@ -330,7 +330,7 @@ lbl_80097F18: /* 80098384 000952C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098388 000952C8 38 63 09 58 */ addi r3, r3, 0x958 /* 8009838C 000952CC 38 80 00 01 */ li r4, 1 -/* 80098390 000952D0 4B F9 C5 89 */ bl dSv_memBit_c_NS_onDungeonItem +/* 80098390 000952D0 4B F9 C5 89 */ bl onDungeonItem__12dSv_memBit_cFi /* 80098394 000952D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098398 000952D8 7C 08 03 A6 */ mtlr r0 /* 8009839C 000952DC 38 21 00 10 */ addi r1, r1, 0x10 @@ -342,7 +342,7 @@ lbl_80097F18: /* 800983B4 000952F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800983B8 000952F8 38 63 09 58 */ addi r3, r3, 0x958 /* 800983BC 000952FC 38 80 00 06 */ li r4, 6 -/* 800983C0 00095300 4B F9 C5 59 */ bl dSv_memBit_c_NS_onDungeonItem +/* 800983C0 00095300 4B F9 C5 59 */ bl onDungeonItem__12dSv_memBit_cFi /* 800983C4 00095304 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 800983C8 00095308 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800983CC 0009530C 38 63 00 9C */ addi r3, r3, 0x9c @@ -360,7 +360,7 @@ lbl_80097F18: /* 800983FC 0009533C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098400 00095340 38 63 09 58 */ addi r3, r3, 0x958 /* 80098404 00095344 38 80 00 02 */ li r4, 2 -/* 80098408 00095348 4B F9 C5 11 */ bl dSv_memBit_c_NS_onDungeonItem +/* 80098408 00095348 4B F9 C5 11 */ bl onDungeonItem__12dSv_memBit_cFi /* 8009840C 0009534C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098410 00095350 7C 08 03 A6 */ mtlr r0 /* 80098414 00095354 38 21 00 10 */ addi r1, r1, 0x10 @@ -1503,7 +1503,7 @@ lbl_80098F68: /* 800995B4 000964F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800995B8 000964F8 38 63 09 58 */ addi r3, r3, 0x958 /* 800995BC 000964FC 38 80 00 02 */ li r4, 2 -/* 800995C0 00096500 4B F9 B3 59 */ bl dSv_memBit_c_NS_onDungeonItem +/* 800995C0 00096500 4B F9 B3 59 */ bl onDungeonItem__12dSv_memBit_cFi /* 800995C4 00096504 80 01 00 14 */ lwz r0, 0x14(r1) /* 800995C8 00096508 7C 08 03 A6 */ mtlr r0 /* 800995CC 0009650C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1521,7 +1521,7 @@ lbl_80098F68: /* 800995FC 0009653C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099600 00096540 38 63 09 58 */ addi r3, r3, 0x958 /* 80099604 00096544 38 80 00 02 */ li r4, 2 -/* 80099608 00096548 4B F9 B3 11 */ bl dSv_memBit_c_NS_onDungeonItem +/* 80099608 00096548 4B F9 B3 11 */ bl onDungeonItem__12dSv_memBit_cFi /* 8009960C 0009654C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099610 00096550 7C 08 03 A6 */ mtlr r0 /* 80099614 00096554 38 21 00 10 */ addi r1, r1, 0x10 @@ -1796,7 +1796,7 @@ lbl_80098F68: /* 80099A48 00096988 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099A4C 0009698C 38 63 09 58 */ addi r3, r3, 0x958 /* 80099A50 00096990 38 80 00 00 */ li r4, 0 -/* 80099A54 00096994 4B F9 AE E1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 80099A54 00096994 4B F9 AE E1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 80099A58 00096998 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099A5C 0009699C 7C 08 03 A6 */ mtlr r0 /* 80099A60 000969A0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1827,7 +1827,7 @@ lbl_80098F68: /* 80099AC4 00096A04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099AC8 00096A08 38 63 09 58 */ addi r3, r3, 0x958 /* 80099ACC 00096A0C 38 80 00 02 */ li r4, 2 -/* 80099AD0 00096A10 4B F9 AE 65 */ bl dSv_memBit_c_NS_isDungeonItem +/* 80099AD0 00096A10 4B F9 AE 65 */ bl isDungeonItem__12dSv_memBit_cCFi /* 80099AD4 00096A14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099AD8 00096A18 7C 08 03 A6 */ mtlr r0 /* 80099ADC 00096A1C 38 21 00 10 */ addi r1, r1, 0x10 @@ -3539,7 +3539,7 @@ lbl_8009A438: /* 8009B558 00098498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B55C 0009849C 38 63 09 58 */ addi r3, r3, 0x958 /* 8009B560 000984A0 38 80 00 02 */ li r4, 2 -/* 8009B564 000984A4 4B F9 93 D1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8009B564 000984A4 4B F9 93 D1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8009B568 000984A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B56C 000984AC 7C 08 03 A6 */ mtlr r0 /* 8009B570 000984B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -3603,7 +3603,7 @@ lbl_8009A438: /* 8009B658 00098598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B65C 0009859C 38 63 09 58 */ addi r3, r3, 0x958 /* 8009B660 000985A0 38 80 00 02 */ li r4, 2 -/* 8009B664 000985A4 4B F9 92 D1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8009B664 000985A4 4B F9 92 D1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8009B668 000985A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B66C 000985AC 7C 08 03 A6 */ mtlr r0 /* 8009B670 000985B0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index 8218c9e762b..44945a253a0 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -45,12 +45,12 @@ lbl_8019C3CC: /* 8019C40C 0019934C 3B E3 09 58 */ addi r31, r3, 0x958 /* 8019C410 00199350 7F E3 FB 78 */ mr r3, r31 /* 8019C414 00199354 38 80 00 11 */ li r4, 0x11 -/* 8019C418 00199358 4B E9 84 49 */ bl dSv_memBit_c_NS_isSwitch +/* 8019C418 00199358 4B E9 84 49 */ bl isSwitch__12dSv_memBit_cCFi /* 8019C41C 0019935C 2C 03 00 00 */ cmpwi r3, 0 /* 8019C420 00199360 41 82 00 1C */ beq lbl_8019C43C /* 8019C424 00199364 7F E3 FB 78 */ mr r3, r31 /* 8019C428 00199368 38 80 00 75 */ li r4, 0x75 -/* 8019C42C 0019936C 4B E9 84 35 */ bl dSv_memBit_c_NS_isSwitch +/* 8019C42C 0019936C 4B E9 84 35 */ bl isSwitch__12dSv_memBit_cCFi /* 8019C430 00199370 2C 03 00 00 */ cmpwi r3, 0 /* 8019C434 00199374 40 82 00 08 */ bne lbl_8019C43C /* 8019C438 00199378 3B C0 00 02 */ li r30, 2 @@ -16781,7 +16781,7 @@ lbl_801AB320: /* 801AB340 001A8280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AB344 001A8284 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB348 001A8288 38 80 00 03 */ li r4, 3 -/* 801AB34C 001A828C 4B E8 95 E9 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801AB34C 001A828C 4B E8 95 E9 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801AB350 001A8290 2C 03 00 00 */ cmpwi r3, 0 /* 801AB354 001A8294 41 82 00 10 */ beq lbl_801AB364 /* 801AB358 001A8298 2C 1C 00 0B */ cmpwi r28, 0xb @@ -16860,7 +16860,7 @@ lbl_801AB438: /* 801AB458 001A8398 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AB45C 001A839C 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB460 001A83A0 38 80 00 03 */ li r4, 3 -/* 801AB464 001A83A4 4B E8 94 D1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801AB464 001A83A4 4B E8 94 D1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801AB468 001A83A8 2C 03 00 00 */ cmpwi r3, 0 /* 801AB46C 001A83AC 41 82 00 10 */ beq lbl_801AB47C /* 801AB470 001A83B0 2C 1C 00 0B */ cmpwi r28, 0xb @@ -17065,7 +17065,7 @@ lbl_801AB704: /* 801AB724 001A8664 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AB728 001A8668 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB72C 001A866C 38 80 00 03 */ li r4, 3 -/* 801AB730 001A8670 4B E8 92 05 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801AB730 001A8670 4B E8 92 05 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801AB734 001A8674 2C 03 00 00 */ cmpwi r3, 0 /* 801AB738 001A8678 41 82 00 10 */ beq lbl_801AB748 /* 801AB73C 001A867C 2C 1A 00 0B */ cmpwi r26, 0xb @@ -17166,7 +17166,7 @@ lbl_801AB86C: /* 801AB88C 001A87CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AB890 001A87D0 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB894 001A87D4 38 80 00 03 */ li r4, 3 -/* 801AB898 001A87D8 4B E8 90 9D */ bl dSv_memBit_c_NS_isDungeonItem +/* 801AB898 001A87D8 4B E8 90 9D */ bl isDungeonItem__12dSv_memBit_cCFi /* 801AB89C 001A87DC 2C 03 00 00 */ cmpwi r3, 0 /* 801AB8A0 001A87E0 41 82 00 10 */ beq lbl_801AB8B0 /* 801AB8A4 001A87E4 2C 1A 00 0B */ cmpwi r26, 0xb @@ -17268,7 +17268,7 @@ lbl_801AB9D8: /* 801AB9F8 001A8938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AB9FC 001A893C 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABA00 001A8940 38 80 00 03 */ li r4, 3 -/* 801ABA04 001A8944 4B E8 8F 31 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801ABA04 001A8944 4B E8 8F 31 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801ABA08 001A8948 2C 03 00 00 */ cmpwi r3, 0 /* 801ABA0C 001A894C 41 82 00 10 */ beq lbl_801ABA1C /* 801ABA10 001A8950 2C 1A 00 0B */ cmpwi r26, 0xb @@ -17369,7 +17369,7 @@ lbl_801ABB40: /* 801ABB60 001A8AA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801ABB64 001A8AA4 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABB68 001A8AA8 38 80 00 03 */ li r4, 3 -/* 801ABB6C 001A8AAC 4B E8 8D C9 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801ABB6C 001A8AAC 4B E8 8D C9 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801ABB70 001A8AB0 2C 03 00 00 */ cmpwi r3, 0 /* 801ABB74 001A8AB4 41 82 00 10 */ beq lbl_801ABB84 /* 801ABB78 001A8AB8 2C 1A 00 0B */ cmpwi r26, 0xb @@ -17468,7 +17468,7 @@ lbl_801ABCA0: /* 801ABCC0 001A8C00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801ABCC4 001A8C04 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABCC8 001A8C08 38 80 00 03 */ li r4, 3 -/* 801ABCCC 001A8C0C 4B E8 8C 69 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801ABCCC 001A8C0C 4B E8 8C 69 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801ABCD0 001A8C10 2C 03 00 00 */ cmpwi r3, 0 /* 801ABCD4 001A8C14 41 82 00 10 */ beq lbl_801ABCE4 /* 801ABCD8 001A8C18 2C 1C 00 0B */ cmpwi r28, 0xb @@ -17558,7 +17558,7 @@ lbl_801ABDDC: /* 801ABDFC 001A8D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801ABE00 001A8D40 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABE04 001A8D44 38 80 00 03 */ li r4, 3 -/* 801ABE08 001A8D48 4B E8 8B 2D */ bl dSv_memBit_c_NS_isDungeonItem +/* 801ABE08 001A8D48 4B E8 8B 2D */ bl isDungeonItem__12dSv_memBit_cCFi /* 801ABE0C 001A8D4C 2C 03 00 00 */ cmpwi r3, 0 /* 801ABE10 001A8D50 41 82 00 10 */ beq lbl_801ABE20 /* 801ABE14 001A8D54 2C 1B 00 0B */ cmpwi r27, 0xb @@ -17656,7 +17656,7 @@ lbl_801ABF38: /* 801ABF58 001A8E98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801ABF5C 001A8E9C 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABF60 001A8EA0 38 80 00 03 */ li r4, 3 -/* 801ABF64 001A8EA4 4B E8 89 D1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801ABF64 001A8EA4 4B E8 89 D1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801ABF68 001A8EA8 2C 03 00 00 */ cmpwi r3, 0 /* 801ABF6C 001A8EAC 41 82 00 10 */ beq lbl_801ABF7C /* 801ABF70 001A8EB0 2C 1C 00 0B */ cmpwi r28, 0xb @@ -17746,7 +17746,7 @@ lbl_801AC074: /* 801AC094 001A8FD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AC098 001A8FD8 38 63 09 58 */ addi r3, r3, 0x958 /* 801AC09C 001A8FDC 38 80 00 03 */ li r4, 3 -/* 801AC0A0 001A8FE0 4B E8 88 95 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801AC0A0 001A8FE0 4B E8 88 95 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801AC0A4 001A8FE4 2C 03 00 00 */ cmpwi r3, 0 /* 801AC0A8 001A8FE8 41 82 00 10 */ beq lbl_801AC0B8 /* 801AC0AC 001A8FEC 2C 1B 00 0B */ cmpwi r27, 0xb diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 5f2fe06c418..898b577137c 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -1117,7 +1117,7 @@ lbl_800294DC: /* 800294E0 00026420 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800294E4 00026424 38 63 09 58 */ addi r3, r3, 0x958 /* 800294E8 00026428 38 80 00 03 */ li r4, 3 -/* 800294EC 0002642C 48 00 B4 49 */ bl dSv_memBit_c_NS_isDungeonItem +/* 800294EC 0002642C 48 00 B4 49 */ bl isDungeonItem__12dSv_memBit_cCFi /* 800294F0 00026430 2C 03 00 00 */ cmpwi r3, 0 /* 800294F4 00026434 40 82 01 DC */ bne lbl_800296D0 /* 800294F8 00026438 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -1227,7 +1227,7 @@ lbl_80029668: /* 80029688 000265C8 3B 23 09 58 */ addi r25, r3, 0x958 /* 8002968C 000265CC 7F 23 CB 78 */ mr r3, r25 /* 80029690 000265D0 38 80 00 03 */ li r4, 3 -/* 80029694 000265D4 48 00 B2 A1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 80029694 000265D4 48 00 B2 A1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 80029698 000265D8 2C 03 00 00 */ cmpwi r3, 0 /* 8002969C 000265DC 40 82 00 34 */ bne lbl_800296D0 /* 800296A0 000265E0 88 9B 00 00 */ lbz r4, 0(r27) diff --git a/asm/d/d_save.s b/asm/d/d_save.s index 829b1936411..6d58719dc23 100644 --- a/asm/d/d_save.s +++ b/asm/d/d_save.s @@ -2,111 +2,6 @@ .section .text, "ax" # 80032918 -.global dSv_memBit_c_NS_onSwitch -dSv_memBit_c_NS_onSwitch: -/* 80034810 00031750 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034814 00031754 54 00 10 3A */ slwi r0, r0, 2 -/* 80034818 00031758 7C C3 02 14 */ add r6, r3, r0 -/* 8003481C 0003175C 80 A6 00 08 */ lwz r5, 8(r6) -/* 80034820 00031760 38 60 00 01 */ li r3, 1 -/* 80034824 00031764 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034828 00031768 7C 60 00 30 */ slw r0, r3, r0 -/* 8003482C 0003176C 7C A0 03 78 */ or r0, r5, r0 -/* 80034830 00031770 90 06 00 08 */ stw r0, 8(r6) -/* 80034834 00031774 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_offSwitch -dSv_memBit_c_NS_offSwitch: -/* 80034838 00031778 7C 80 2E 70 */ srawi r0, r4, 5 -/* 8003483C 0003177C 54 00 10 3A */ slwi r0, r0, 2 -/* 80034840 00031780 7C C3 02 14 */ add r6, r3, r0 -/* 80034844 00031784 80 A6 00 08 */ lwz r5, 8(r6) -/* 80034848 00031788 38 60 00 01 */ li r3, 1 -/* 8003484C 0003178C 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034850 00031790 7C 60 00 30 */ slw r0, r3, r0 -/* 80034854 00031794 7C A0 00 78 */ andc r0, r5, r0 -/* 80034858 00031798 90 06 00 08 */ stw r0, 8(r6) -/* 8003485C 0003179C 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_isSwitch -dSv_memBit_c_NS_isSwitch: -/* 80034860 000317A0 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034864 000317A4 54 00 10 3A */ slwi r0, r0, 2 -/* 80034868 000317A8 7C 63 02 14 */ add r3, r3, r0 -/* 8003486C 000317AC 80 A3 00 08 */ lwz r5, 8(r3) -/* 80034870 000317B0 38 60 00 01 */ li r3, 1 -/* 80034874 000317B4 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034878 000317B8 7C 60 00 30 */ slw r0, r3, r0 -/* 8003487C 000317BC 7C A3 00 38 */ and r3, r5, r0 -/* 80034880 000317C0 30 03 FF FF */ addic r0, r3, -1 -/* 80034884 000317C4 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034888 000317C8 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_revSwitch -dSv_memBit_c_NS_revSwitch: -/* 8003488C 000317CC 7C 86 2E 70 */ srawi r6, r4, 5 -/* 80034890 000317D0 38 A0 00 01 */ li r5, 1 -/* 80034894 000317D4 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034898 000317D8 7C A4 00 30 */ slw r4, r5, r0 -/* 8003489C 000317DC 54 C0 10 3A */ slwi r0, r6, 2 -/* 800348A0 000317E0 7C 63 02 14 */ add r3, r3, r0 -/* 800348A4 000317E4 80 03 00 08 */ lwz r0, 8(r3) -/* 800348A8 000317E8 7C 00 22 78 */ xor r0, r0, r4 -/* 800348AC 000317EC 90 03 00 08 */ stw r0, 8(r3) -/* 800348B0 000317F0 80 03 00 08 */ lwz r0, 8(r3) -/* 800348B4 000317F4 7C 03 20 38 */ and r3, r0, r4 -/* 800348B8 000317F8 30 03 FF FF */ addic r0, r3, -1 -/* 800348BC 000317FC 7C 60 19 10 */ subfe r3, r0, r3 -/* 800348C0 00031800 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_onItem -dSv_memBit_c_NS_onItem: -/* 800348C4 00031804 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800348C8 00031808 54 00 10 3A */ slwi r0, r0, 2 -/* 800348CC 0003180C 7C C3 02 14 */ add r6, r3, r0 -/* 800348D0 00031810 80 A6 00 18 */ lwz r5, 0x18(r6) -/* 800348D4 00031814 38 60 00 01 */ li r3, 1 -/* 800348D8 00031818 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 800348DC 0003181C 7C 60 00 30 */ slw r0, r3, r0 -/* 800348E0 00031820 7C A0 03 78 */ or r0, r5, r0 -/* 800348E4 00031824 90 06 00 18 */ stw r0, 0x18(r6) -/* 800348E8 00031828 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_isItem -dSv_memBit_c_NS_isItem: -/* 800348EC 0003182C 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800348F0 00031830 54 00 10 3A */ slwi r0, r0, 2 -/* 800348F4 00031834 7C 63 02 14 */ add r3, r3, r0 -/* 800348F8 00031838 80 A3 00 18 */ lwz r5, 0x18(r3) -/* 800348FC 0003183C 38 60 00 01 */ li r3, 1 -/* 80034900 00031840 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034904 00031844 7C 60 00 30 */ slw r0, r3, r0 -/* 80034908 00031848 7C A3 00 38 */ and r3, r5, r0 -/* 8003490C 0003184C 30 03 FF FF */ addic r0, r3, -1 -/* 80034910 00031850 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034914 00031854 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_onDungeonItem -dSv_memBit_c_NS_onDungeonItem: -/* 80034918 00031858 88 A3 00 1D */ lbz r5, 0x1d(r3) -/* 8003491C 0003185C 38 00 00 01 */ li r0, 1 -/* 80034920 00031860 7C 00 20 30 */ slw r0, r0, r4 -/* 80034924 00031864 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80034928 00031868 7C A0 03 78 */ or r0, r5, r0 -/* 8003492C 0003186C 98 03 00 1D */ stb r0, 0x1d(r3) -/* 80034930 00031870 4E 80 00 20 */ blr - -.global dSv_memBit_c_NS_isDungeonItem -dSv_memBit_c_NS_isDungeonItem: -/* 80034934 00031874 88 63 00 1D */ lbz r3, 0x1d(r3) -/* 80034938 00031878 38 00 00 01 */ li r0, 1 -/* 8003493C 0003187C 7C 00 20 30 */ slw r0, r0, r4 -/* 80034940 00031880 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80034944 00031884 7C 63 00 38 */ and r3, r3, r0 -/* 80034948 00031888 30 03 FF FF */ addic r0, r3, -1 -/* 8003494C 0003188C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034950 00031890 4E 80 00 20 */ blr - .global dSv_event_c_NS_init dSv_event_c_NS_init: /* 80034954 00031894 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -843,7 +738,7 @@ lbl_80035230: /* 80035230 00032170 2C 1F 00 80 */ cmpwi r31, 0x80 /* 80035234 00032174 40 80 00 10 */ bge lbl_80035244 /* 80035238 00032178 38 7E 09 58 */ addi r3, r30, 0x958 -/* 8003523C 0003217C 4B FF F5 D5 */ bl dSv_memBit_c_NS_onSwitch +/* 8003523C 0003217C 4B FF F5 D5 */ bl onSwitch__12dSv_memBit_cFi /* 80035240 00032180 48 00 00 58 */ b lbl_80035298 lbl_80035244: /* 80035244 00032184 2C 1F 00 C0 */ cmpwi r31, 0xc0 @@ -895,7 +790,7 @@ lbl_800352E0: /* 800352E0 00032220 2C 1F 00 80 */ cmpwi r31, 0x80 /* 800352E4 00032224 40 80 00 10 */ bge lbl_800352F4 /* 800352E8 00032228 38 7E 09 58 */ addi r3, r30, 0x958 -/* 800352EC 0003222C 4B FF F5 4D */ bl dSv_memBit_c_NS_offSwitch +/* 800352EC 0003222C 4B FF F5 4D */ bl offSwitch__12dSv_memBit_cFi /* 800352F0 00032230 48 00 00 58 */ b lbl_80035348 lbl_800352F4: /* 800352F4 00032234 2C 1F 00 C0 */ cmpwi r31, 0xc0 @@ -949,7 +844,7 @@ lbl_80035394: /* 80035394 000322D4 2C 1F 00 80 */ cmpwi r31, 0x80 /* 80035398 000322D8 40 80 00 10 */ bge lbl_800353A8 /* 8003539C 000322DC 38 7E 09 58 */ addi r3, r30, 0x958 -/* 800353A0 000322E0 4B FF F4 C1 */ bl dSv_memBit_c_NS_isSwitch +/* 800353A0 000322E0 4B FF F4 C1 */ bl isSwitch__12dSv_memBit_cCFi /* 800353A4 000322E4 48 00 00 70 */ b lbl_80035414 lbl_800353A8: /* 800353A8 000322E8 2C 1F 00 C0 */ cmpwi r31, 0xc0 @@ -1008,7 +903,7 @@ lbl_80035460: /* 80035460 000323A0 2C 1F 00 80 */ cmpwi r31, 0x80 /* 80035464 000323A4 40 80 00 10 */ bge lbl_80035474 /* 80035468 000323A8 38 7E 09 58 */ addi r3, r30, 0x958 -/* 8003546C 000323AC 4B FF F4 21 */ bl dSv_memBit_c_NS_revSwitch +/* 8003546C 000323AC 4B FF F4 21 */ bl revSwitch__12dSv_memBit_cFi /* 80035470 000323B0 48 00 00 58 */ b lbl_800354C8 lbl_80035474: /* 80035474 000323B4 2C 1F 00 C0 */ cmpwi r31, 0xc0 @@ -1067,7 +962,7 @@ lbl_80035524: /* 80035528 00032468 40 80 00 14 */ bge lbl_8003553C /* 8003552C 0003246C 38 7E 09 58 */ addi r3, r30, 0x958 /* 80035530 00032470 38 9F FF 80 */ addi r4, r31, -128 -/* 80035534 00032474 4B FF F3 91 */ bl dSv_memBit_c_NS_onItem +/* 80035534 00032474 4B FF F3 91 */ bl onItem__12dSv_memBit_cFi /* 80035538 00032478 48 00 00 40 */ b lbl_80035578 lbl_8003553C: /* 8003553C 0003247C 7C A3 2B 78 */ mr r3, r5 @@ -1121,7 +1016,7 @@ lbl_800355D8: /* 800355DC 0003251C 40 80 00 14 */ bge lbl_800355F0 /* 800355E0 00032520 38 7E 09 58 */ addi r3, r30, 0x958 /* 800355E4 00032524 38 9F FF 80 */ addi r4, r31, -128 -/* 800355E8 00032528 4B FF F3 05 */ bl dSv_memBit_c_NS_isItem +/* 800355E8 00032528 4B FF F3 05 */ bl isItem__12dSv_memBit_cCFi /* 800355EC 0003252C 48 00 00 40 */ b lbl_8003562C lbl_800355F0: /* 800355F0 00032530 7C A3 2B 78 */ mr r3, r5 diff --git a/asm/d/d_tresure.s b/asm/d/d_tresure.s index 12c07e39aed..aac43eaac19 100644 --- a/asm/d/d_tresure.s +++ b/asm/d/d_tresure.s @@ -501,7 +501,7 @@ lbl_8009C2A0: /* 8009C2C4 00099204 3B C3 09 58 */ addi r30, r3, 0x958 /* 8009C2C8 00099208 7F C3 F3 78 */ mr r3, r30 /* 8009C2CC 0009920C 38 80 00 01 */ li r4, 1 -/* 8009C2D0 00099210 4B F9 86 65 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8009C2D0 00099210 4B F9 86 65 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8009C2D4 00099214 2C 03 00 00 */ cmpwi r3, 0 /* 8009C2D8 00099218 41 82 00 6C */ beq lbl_8009C344 /* 8009C2DC 0009921C 88 1F 00 10 */ lbz r0, 0x10(r31) @@ -520,7 +520,7 @@ lbl_8009C2A0: lbl_8009C310: /* 8009C310 00099250 7F C3 F3 78 */ mr r3, r30 /* 8009C314 00099254 38 80 00 03 */ li r4, 3 -/* 8009C318 00099258 4B F9 86 1D */ bl dSv_memBit_c_NS_isDungeonItem +/* 8009C318 00099258 4B F9 86 1D */ bl isDungeonItem__12dSv_memBit_cCFi /* 8009C31C 0009925C 2C 03 00 00 */ cmpwi r3, 0 /* 8009C320 00099260 40 82 00 24 */ bne lbl_8009C344 /* 8009C324 00099264 C0 3F 00 08 */ lfs f1, 8(r31) diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index 392ca888b55..ca11d006a54 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -18720,7 +18720,7 @@ lbl_8006C7F0: /* 8006C814 00069754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8006C818 00069758 38 63 09 58 */ addi r3, r3, 0x958 /* 8006C81C 0006975C 38 80 00 03 */ li r4, 3 -/* 8006C820 00069760 4B FC 81 15 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8006C820 00069760 4B FC 81 15 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8006C824 00069764 2C 03 00 00 */ cmpwi r3, 0 /* 8006C828 00069768 40 82 00 14 */ bne lbl_8006C83C /* 8006C82C 0006976C C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index 0517667d980..ba0aae48a00 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -12,7 +12,7 @@ dMapInfo_n_NS_chkGetCompass: /* 8003ECB0 0003BBF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@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 dSv_memBit_c_NS_isDungeonItem +/* 8003ECBC 0003BBFC 4B FF 5C 79 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8003ECC0 0003BC00 30 03 FF FF */ addic r0, r3, -1 /* 8003ECC4 0003BC04 7C 60 19 10 */ subfe r3, r0, r3 /* 8003ECC8 0003BC08 80 01 00 14 */ lwz r0, 0x14(r1) @@ -29,7 +29,7 @@ dMapInfo_n_NS_chkGetMap: /* 8003ECE8 0003BC28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@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 dSv_memBit_c_NS_isDungeonItem +/* 8003ECF4 0003BC34 4B FF 5C 41 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8003ECF8 0003BC38 30 03 FF FF */ addic r0, r3, -1 /* 8003ECFC 0003BC3C 7C 60 19 10 */ subfe r3, r0, r3 /* 8003ED00 0003BC40 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index 172355d0ff8..263cae646d5 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -94,12 +94,12 @@ lbl_801B8018: /* 801B8070 001B4FB0 3B C3 09 58 */ addi r30, r3, 0x958 /* 801B8074 001B4FB4 7F C3 F3 78 */ mr r3, r30 /* 801B8078 001B4FB8 38 80 00 00 */ li r4, 0 -/* 801B807C 001B4FBC 4B E7 C8 B9 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801B807C 001B4FBC 4B E7 C8 B9 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801B8080 001B4FC0 2C 03 00 00 */ cmpwi r3, 0 /* 801B8084 001B4FC4 40 82 00 18 */ bne lbl_801B809C /* 801B8088 001B4FC8 7F C3 F3 78 */ mr r3, r30 /* 801B808C 001B4FCC 38 80 00 01 */ li r4, 1 -/* 801B8090 001B4FD0 4B E7 C8 A5 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801B8090 001B4FD0 4B E7 C8 A5 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801B8094 001B4FD4 2C 03 00 00 */ cmpwi r3, 0 /* 801B8098 001B4FD8 41 82 00 20 */ beq lbl_801B80B8 lbl_801B809C: @@ -4605,13 +4605,13 @@ lbl_801BC30C: /* 801BC314 001B9254 3B 03 09 58 */ addi r24, r3, 0x958 /* 801BC318 001B9258 7F 03 C3 78 */ mr r3, r24 /* 801BC31C 001B925C 38 80 00 02 */ li r4, 2 -/* 801BC320 001B9260 4B E7 86 15 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801BC320 001B9260 4B E7 86 15 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801BC324 001B9264 2C 03 00 00 */ cmpwi r3, 0 /* 801BC328 001B9268 41 82 00 30 */ beq lbl_801BC358 /* 801BC32C 001B926C 3B 80 00 F6 */ li r28, 0xf6 /* 801BC330 001B9270 7F 03 C3 78 */ mr r3, r24 /* 801BC334 001B9274 38 80 00 02 */ li r4, 2 -/* 801BC338 001B9278 4B E7 85 FD */ bl dSv_memBit_c_NS_isDungeonItem +/* 801BC338 001B9278 4B E7 85 FD */ bl isDungeonItem__12dSv_memBit_cCFi /* 801BC33C 001B927C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801BC340 001B9280 20 00 00 00 */ subfic r0, r0, 0 /* 801BC344 001B9284 7C 60 01 10 */ subfe r3, r0, r0 @@ -4727,7 +4727,7 @@ lbl_801BC454: /* 801BC4E8 001B9428 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801BC4EC 001B942C 38 63 09 58 */ addi r3, r3, 0x958 /* 801BC4F0 001B9430 38 80 00 02 */ li r4, 2 -/* 801BC4F4 001B9434 4B E7 84 41 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801BC4F4 001B9434 4B E7 84 41 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801BC4F8 001B9438 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801BC4FC 001B943C 20 00 00 00 */ subfic r0, r0, 0 /* 801BC500 001B9440 7C 60 01 10 */ subfe r3, r0, r0 @@ -4740,7 +4740,7 @@ lbl_801BC510: /* 801BC518 001B9458 3B 03 09 58 */ addi r24, r3, 0x958 /* 801BC51C 001B945C 7F 03 C3 78 */ mr r3, r24 /* 801BC520 001B9460 38 80 00 00 */ li r4, 0 -/* 801BC524 001B9464 4B E7 84 11 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801BC524 001B9464 4B E7 84 11 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801BC528 001B9468 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801BC52C 001B946C 20 00 00 00 */ subfic r0, r0, 0 /* 801BC530 001B9470 7C 60 01 10 */ subfe r3, r0, r0 @@ -4749,7 +4749,7 @@ lbl_801BC510: /* 801BC53C 001B947C 98 1F 01 74 */ stb r0, 0x174(r31) /* 801BC540 001B9480 7F 03 C3 78 */ mr r3, r24 /* 801BC544 001B9484 38 80 00 01 */ li r4, 1 -/* 801BC548 001B9488 4B E7 83 ED */ bl dSv_memBit_c_NS_isDungeonItem +/* 801BC548 001B9488 4B E7 83 ED */ bl isDungeonItem__12dSv_memBit_cCFi /* 801BC54C 001B948C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801BC550 001B9490 20 00 00 00 */ subfic r0, r0, 0 /* 801BC554 001B9494 7C 60 01 10 */ subfe r3, r0, r0 @@ -6225,7 +6225,7 @@ lbl_801BDA30: /* 801BDA50 001BA990 3B A3 09 58 */ addi r29, r3, 0x958 /* 801BDA54 001BA994 7F A3 EB 78 */ mr r3, r29 /* 801BDA58 001BA998 38 80 00 67 */ li r4, 0x67 -/* 801BDA5C 001BA99C 4B E7 6E 05 */ bl dSv_memBit_c_NS_isSwitch +/* 801BDA5C 001BA99C 4B E7 6E 05 */ bl isSwitch__12dSv_memBit_cCFi /* 801BDA60 001BA9A0 2C 03 00 00 */ cmpwi r3, 0 /* 801BDA64 001BA9A4 41 82 00 0C */ beq lbl_801BDA70 /* 801BDA68 001BA9A8 3B 80 00 01 */ li r28, 1 @@ -6233,12 +6233,12 @@ lbl_801BDA30: lbl_801BDA70: /* 801BDA70 001BA9B0 7F A3 EB 78 */ mr r3, r29 /* 801BDA74 001BA9B4 38 80 00 66 */ li r4, 0x66 -/* 801BDA78 001BA9B8 4B E7 6D E9 */ bl dSv_memBit_c_NS_isSwitch +/* 801BDA78 001BA9B8 4B E7 6D E9 */ bl isSwitch__12dSv_memBit_cCFi /* 801BDA7C 001BA9BC 2C 03 00 00 */ cmpwi r3, 0 /* 801BDA80 001BA9C0 40 82 00 10 */ bne lbl_801BDA90 /* 801BDA84 001BA9C4 7F A3 EB 78 */ mr r3, r29 /* 801BDA88 001BA9C8 38 80 00 65 */ li r4, 0x65 -/* 801BDA8C 001BA9CC 4B E7 6D D5 */ bl dSv_memBit_c_NS_isSwitch +/* 801BDA8C 001BA9CC 4B E7 6D D5 */ bl isSwitch__12dSv_memBit_cCFi lbl_801BDA90: /* 801BDA90 001BA9D0 80 7F 00 08 */ lwz r3, 8(r31) /* 801BDA94 001BA9D4 C0 03 0D A4 */ lfs f0, 0xda4(r3) diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index 39538548817..6ab8cb7a2d5 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -120,7 +120,7 @@ lbl_801C09FC: /* 801C0A00 001BD940 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801C0A04 001BD944 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0A08 001BD948 38 80 00 03 */ li r4, 3 -/* 801C0A0C 001BD94C 4B E7 3F 29 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801C0A0C 001BD94C 4B E7 3F 29 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801C0A10 001BD950 2C 03 00 00 */ cmpwi r3, 0 /* 801C0A14 001BD954 40 82 01 10 */ bne lbl_801C0B24 /* 801C0A18 001BD958 3B E0 00 01 */ li r31, 1 @@ -179,7 +179,7 @@ lbl_801C0AD0: /* 801C0AE0 001BDA20 3B C3 09 58 */ addi r30, r3, 0x958 /* 801C0AE4 001BDA24 7F C3 F3 78 */ mr r3, r30 /* 801C0AE8 001BDA28 38 80 00 03 */ li r4, 3 -/* 801C0AEC 001BDA2C 4B E7 3E 49 */ bl dSv_memBit_c_NS_isDungeonItem +/* 801C0AEC 001BDA2C 4B E7 3E 49 */ bl isDungeonItem__12dSv_memBit_cCFi /* 801C0AF0 001BDA30 2C 03 00 00 */ cmpwi r3, 0 /* 801C0AF4 001BDA34 40 82 00 30 */ bne lbl_801C0B24 /* 801C0AF8 001BDA38 57 40 06 3F */ clrlwi. r0, r26, 0x18 diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index b8b5a3a028a..69795ccc5a4 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -503,11 +503,11 @@ lbl_8020DB2C: /* 8020DB38 0020AA78 3B C3 09 58 */ addi r30, r3, 0x958 /* 8020DB3C 0020AA7C 7F C3 F3 78 */ mr r3, r30 /* 8020DB40 0020AA80 38 80 00 01 */ li r4, 1 -/* 8020DB44 0020AA84 4B E2 6D F1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8020DB44 0020AA84 4B E2 6D F1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8020DB48 0020AA88 90 7F 00 0C */ stw r3, 0xc(r31) /* 8020DB4C 0020AA8C 7F C3 F3 78 */ mr r3, r30 /* 8020DB50 0020AA90 38 80 00 00 */ li r4, 0 -/* 8020DB54 0020AA94 4B E2 6D E1 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8020DB54 0020AA94 4B E2 6D E1 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8020DB58 0020AA98 90 7F 00 10 */ stw r3, 0x10(r31) /* 8020DB5C 0020AA9C 38 00 00 00 */ li r0, 0 /* 8020DB60 0020AAA0 90 1F 00 14 */ stw r0, 0x14(r31) @@ -1081,7 +1081,7 @@ lbl_8020E3A0: /* 8020E3A8 0020B2E8 3B C3 09 58 */ addi r30, r3, 0x958 /* 8020E3AC 0020B2EC 7F C3 F3 78 */ mr r3, r30 /* 8020E3B0 0020B2F0 38 80 00 01 */ li r4, 1 -/* 8020E3B4 0020B2F4 4B E2 65 81 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8020E3B4 0020B2F4 4B E2 65 81 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8020E3B8 0020B2F8 80 1D 00 0C */ lwz r0, 0xc(r29) /* 8020E3BC 0020B2FC 7C 00 18 00 */ cmpw r0, r3 /* 8020E3C0 0020B300 41 82 00 38 */ beq lbl_8020E3F8 @@ -1097,12 +1097,12 @@ lbl_8020E3A0: lbl_8020E3E8: /* 8020E3E8 0020B328 7F C3 F3 78 */ mr r3, r30 /* 8020E3EC 0020B32C 38 80 00 01 */ li r4, 1 -/* 8020E3F0 0020B330 4B E2 65 45 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8020E3F0 0020B330 4B E2 65 45 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8020E3F4 0020B334 90 7D 00 0C */ stw r3, 0xc(r29) lbl_8020E3F8: /* 8020E3F8 0020B338 7F C3 F3 78 */ mr r3, r30 /* 8020E3FC 0020B33C 38 80 00 00 */ li r4, 0 -/* 8020E400 0020B340 4B E2 65 35 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8020E400 0020B340 4B E2 65 35 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8020E404 0020B344 80 1D 00 10 */ lwz r0, 0x10(r29) /* 8020E408 0020B348 7C 00 18 00 */ cmpw r0, r3 /* 8020E40C 0020B34C 41 82 00 38 */ beq lbl_8020E444 @@ -1118,7 +1118,7 @@ lbl_8020E3F8: lbl_8020E434: /* 8020E434 0020B374 7F C3 F3 78 */ mr r3, r30 /* 8020E438 0020B378 38 80 00 00 */ li r4, 0 -/* 8020E43C 0020B37C 4B E2 64 F9 */ bl dSv_memBit_c_NS_isDungeonItem +/* 8020E43C 0020B37C 4B E2 64 F9 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8020E440 0020B380 90 7D 00 10 */ stw r3, 0x10(r29) lbl_8020E444: /* 8020E444 0020B384 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index f9c13670a96..4884e12a90d 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -1628,7 +1628,7 @@ lbl_8024B3E8: /* 8024B594 002484D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024B598 002484D8 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B59C 002484DC A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B5A0 002484E0 4B DE 92 C1 */ bl dSv_memBit_c_NS_isSwitch +/* 8024B5A0 002484E0 4B DE 92 C1 */ bl isSwitch__12dSv_memBit_cCFi /* 8024B5A4 002484E4 7C 60 00 34 */ cntlzw r0, r3 /* 8024B5A8 002484E8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B5AC 002484EC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1642,7 +1642,7 @@ lbl_8024B3E8: /* 8024B5CC 0024850C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024B5D0 00248510 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B5D4 00248514 A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B5D8 00248518 4B DE 93 15 */ bl dSv_memBit_c_NS_isItem +/* 8024B5D8 00248518 4B DE 93 15 */ bl isItem__12dSv_memBit_cCFi /* 8024B5DC 0024851C 7C 60 00 34 */ cntlzw r0, r3 /* 8024B5E0 00248520 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B5E4 00248524 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2958,7 +2958,7 @@ lbl_8024C938: /* 8024C93C 0024987C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024C940 00249880 38 63 09 58 */ addi r3, r3, 0x958 /* 8024C944 00249884 A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024C948 00249888 4B DE 7E C9 */ bl dSv_memBit_c_NS_onSwitch +/* 8024C948 00249888 4B DE 7E C9 */ bl onSwitch__12dSv_memBit_cFi /* 8024C94C 0024988C 48 00 00 30 */ b lbl_8024C97C lbl_8024C950: /* 8024C950 00249890 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -3015,7 +3015,7 @@ lbl_8024CA00: /* 8024CA04 00249944 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CA08 00249948 38 63 09 58 */ addi r3, r3, 0x958 /* 8024CA0C 0024994C A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024CA10 00249950 4B DE 7E 29 */ bl dSv_memBit_c_NS_offSwitch +/* 8024CA10 00249950 4B DE 7E 29 */ bl offSwitch__12dSv_memBit_cFi /* 8024CA14 00249954 48 00 00 30 */ b lbl_8024CA44 lbl_8024CA18: /* 8024CA18 00249958 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4006,7 +4006,7 @@ lbl_8024D85C: /* 8024D8A0 0024A7E0 7C 60 22 14 */ add r3, r0, r4 /* 8024D8A4 0024A7E4 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8024D8A8 0024A7E8 A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024D8AC 0024A7EC 4B DE 6F 65 */ bl dSv_memBit_c_NS_onSwitch +/* 8024D8AC 0024A7EC 4B DE 6F 65 */ bl onSwitch__12dSv_memBit_cFi /* 8024D8B0 0024A7F0 38 60 00 01 */ li r3, 1 /* 8024D8B4 0024A7F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024D8B8 0024A7F8 7C 08 03 A6 */ mtlr r0 @@ -4027,7 +4027,7 @@ lbl_8024D85C: /* 8024D8F4 0024A834 7C 60 22 14 */ add r3, r0, r4 /* 8024D8F8 0024A838 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8024D8FC 0024A83C A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024D900 0024A840 4B DE 6F 39 */ bl dSv_memBit_c_NS_offSwitch +/* 8024D900 0024A840 4B DE 6F 39 */ bl offSwitch__12dSv_memBit_cFi /* 8024D904 0024A844 38 60 00 01 */ li r3, 1 /* 8024D908 0024A848 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024D90C 0024A84C 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index 0f01525f371..654669b420f 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -35,7 +35,7 @@ dSvBit_childSwPerfectionHIO_c_NS_init: lbl_8025BBD4: /* 8025BBD4 00258B14 7F E3 FB 78 */ mr r3, r31 /* 8025BBD8 00258B18 7F C4 F3 78 */ mr r4, r30 -/* 8025BBDC 00258B1C 4B DD 8C 85 */ bl dSv_memBit_c_NS_isSwitch +/* 8025BBDC 00258B1C 4B DD 8C 85 */ bl isSwitch__12dSv_memBit_cCFi /* 8025BBE0 00258B20 7C 9D F2 14 */ add r4, r29, r30 /* 8025BBE4 00258B24 98 64 00 05 */ stb r3, 5(r4) /* 8025BBE8 00258B28 88 04 00 05 */ lbz r0, 5(r4) @@ -193,7 +193,7 @@ dSvBit_childItPerfectionHIO_c_NS_init: lbl_8025BDCC: /* 8025BDCC 00258D0C 7F E3 FB 78 */ mr r3, r31 /* 8025BDD0 00258D10 7F C4 F3 78 */ mr r4, r30 -/* 8025BDD4 00258D14 4B DD 8B 19 */ bl dSv_memBit_c_NS_isItem +/* 8025BDD4 00258D14 4B DD 8B 19 */ bl isItem__12dSv_memBit_cCFi /* 8025BDD8 00258D18 7C 9D F2 14 */ add r4, r29, r30 /* 8025BDDC 00258D1C 98 64 00 05 */ stb r3, 5(r4) /* 8025BDE0 00258D20 88 04 00 05 */ lbz r0, 5(r4) diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index 587a5fdc276..c9525edce5a 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -62,7 +62,7 @@ dShopSystem_searchItemActor: /* 80197170 001940B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80197174 001940B4 38 63 09 58 */ addi r3, r3, 0x958 /* 80197178 001940B8 7F 64 DB 78 */ mr r4, r27 -/* 8019717C 001940BC 4B E9 D6 E5 */ bl dSv_memBit_c_NS_isSwitch +/* 8019717C 001940BC 4B E9 D6 E5 */ bl isSwitch__12dSv_memBit_cCFi /* 80197180 001940C0 2C 03 00 00 */ cmpwi r3, 0 /* 80197184 001940C4 40 82 00 D0 */ bne lbl_80197254 lbl_80197188: @@ -72,7 +72,7 @@ lbl_80197188: /* 80197194 001940D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80197198 001940D8 38 63 09 58 */ addi r3, r3, 0x958 /* 8019719C 001940DC 7F 84 E3 78 */ mr r4, r28 -/* 801971A0 001940E0 4B E9 D6 C1 */ bl dSv_memBit_c_NS_isSwitch +/* 801971A0 001940E0 4B E9 D6 C1 */ bl isSwitch__12dSv_memBit_cCFi /* 801971A4 001940E4 2C 03 00 00 */ cmpwi r3, 0 /* 801971A8 001940E8 41 82 00 AC */ beq lbl_80197254 lbl_801971AC: @@ -90,7 +90,7 @@ lbl_801971AC: /* 801971D8 00194118 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801971DC 0019411C 38 63 09 58 */ addi r3, r3, 0x958 /* 801971E0 00194120 7F 64 DB 78 */ mr r4, r27 -/* 801971E4 00194124 4B E9 D6 2D */ bl dSv_memBit_c_NS_onSwitch +/* 801971E4 00194124 4B E9 D6 2D */ bl onSwitch__12dSv_memBit_cFi /* 801971E8 00194128 48 00 00 6C */ b lbl_80197254 lbl_801971EC: /* 801971EC 0019412C 28 1F 00 00 */ cmplwi r31, 0 @@ -3566,12 +3566,12 @@ dShopSystem_c_NS_setSoldOut: /* 8019A3BC 001972FC 3B A3 09 58 */ addi r29, r3, 0x958 /* 8019A3C0 00197300 7F A3 EB 78 */ mr r3, r29 /* 8019A3C4 00197304 7F E4 FB 78 */ mr r4, r31 -/* 8019A3C8 00197308 4B E9 A4 99 */ bl dSv_memBit_c_NS_isSwitch +/* 8019A3C8 00197308 4B E9 A4 99 */ bl isSwitch__12dSv_memBit_cCFi /* 8019A3CC 0019730C 2C 03 00 00 */ cmpwi r3, 0 /* 8019A3D0 00197310 40 82 00 10 */ bne lbl_8019A3E0 /* 8019A3D4 00197314 7F A3 EB 78 */ mr r3, r29 /* 8019A3D8 00197318 7F E4 FB 78 */ mr r4, r31 -/* 8019A3DC 0019731C 4B E9 A4 35 */ bl dSv_memBit_c_NS_onSwitch +/* 8019A3DC 0019731C 4B E9 A4 35 */ bl onSwitch__12dSv_memBit_cFi lbl_8019A3E0: /* 8019A3E0 00197320 8B FE 0F 73 */ lbz r31, 0xf73(r30) /* 8019A3E4 00197324 38 80 00 FF */ li r4, 0xff @@ -3994,14 +3994,14 @@ lbl_8019A990: /* 8019A9A8 001978E8 28 04 00 FF */ cmplwi r4, 0xff /* 8019A9AC 001978EC 41 82 00 48 */ beq lbl_8019A9F4 /* 8019A9B0 001978F0 7E E3 BB 78 */ mr r3, r23 -/* 8019A9B4 001978F4 4B E9 9E AD */ bl dSv_memBit_c_NS_isSwitch +/* 8019A9B4 001978F4 4B E9 9E AD */ bl isSwitch__12dSv_memBit_cCFi /* 8019A9B8 001978F8 2C 03 00 00 */ cmpwi r3, 0 /* 8019A9BC 001978FC 40 82 00 38 */ bne lbl_8019A9F4 /* 8019A9C0 00197900 28 1B 00 FF */ cmplwi r27, 0xff /* 8019A9C4 00197904 41 82 00 30 */ beq lbl_8019A9F4 /* 8019A9C8 00197908 7E E3 BB 78 */ mr r3, r23 /* 8019A9CC 0019790C 7F 64 DB 78 */ mr r4, r27 -/* 8019A9D0 00197910 4B E9 9E 91 */ bl dSv_memBit_c_NS_isSwitch +/* 8019A9D0 00197910 4B E9 9E 91 */ bl isSwitch__12dSv_memBit_cCFi /* 8019A9D4 00197914 2C 03 00 00 */ cmpwi r3, 0 /* 8019A9D8 00197918 40 82 00 1C */ bne lbl_8019A9F4 /* 8019A9DC 0019791C 7F C3 F3 78 */ mr r3, r30 @@ -4049,14 +4049,14 @@ lbl_8019AA60: /* 8019AA78 001979B8 28 04 00 FF */ cmplwi r4, 0xff /* 8019AA7C 001979BC 41 82 00 48 */ beq lbl_8019AAC4 /* 8019AA80 001979C0 7E E3 BB 78 */ mr r3, r23 -/* 8019AA84 001979C4 4B E9 9D DD */ bl dSv_memBit_c_NS_isSwitch +/* 8019AA84 001979C4 4B E9 9D DD */ bl isSwitch__12dSv_memBit_cCFi /* 8019AA88 001979C8 2C 03 00 00 */ cmpwi r3, 0 /* 8019AA8C 001979CC 40 82 00 38 */ bne lbl_8019AAC4 /* 8019AA90 001979D0 28 1B 00 FF */ cmplwi r27, 0xff /* 8019AA94 001979D4 41 82 00 30 */ beq lbl_8019AAC4 /* 8019AA98 001979D8 7E E3 BB 78 */ mr r3, r23 /* 8019AA9C 001979DC 7F 64 DB 78 */ mr r4, r27 -/* 8019AAA0 001979E0 4B E9 9D C1 */ bl dSv_memBit_c_NS_isSwitch +/* 8019AAA0 001979E0 4B E9 9D C1 */ bl isSwitch__12dSv_memBit_cCFi /* 8019AAA4 001979E4 2C 03 00 00 */ cmpwi r3, 0 /* 8019AAA8 001979E8 40 82 00 1C */ bne lbl_8019AAC4 /* 8019AAAC 001979EC 7F C3 F3 78 */ mr r3, r30 diff --git a/include/func_80034810.s b/include/func_80034810.s new file mode 100644 index 00000000000..5ff87156ea2 --- /dev/null +++ b/include/func_80034810.s @@ -0,0 +1,10 @@ +/* 80034810 00031750 7C 80 2E 70 */ srawi r0, r4, 5 +/* 80034814 00031754 54 00 10 3A */ slwi r0, r0, 2 +/* 80034818 00031758 7C C3 02 14 */ add r6, r3, r0 +/* 8003481C 0003175C 80 A6 00 08 */ lwz r5, 8(r6) +/* 80034820 00031760 38 60 00 01 */ li r3, 1 +/* 80034824 00031764 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034828 00031768 7C 60 00 30 */ slw r0, r3, r0 +/* 8003482C 0003176C 7C A0 03 78 */ or r0, r5, r0 +/* 80034830 00031770 90 06 00 08 */ stw r0, 8(r6) +/* 80034834 00031774 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_80034838.s b/include/func_80034838.s new file mode 100644 index 00000000000..03c54daf1ef --- /dev/null +++ b/include/func_80034838.s @@ -0,0 +1,10 @@ +/* 80034838 00031778 7C 80 2E 70 */ srawi r0, r4, 5 +/* 8003483C 0003177C 54 00 10 3A */ slwi r0, r0, 2 +/* 80034840 00031780 7C C3 02 14 */ add r6, r3, r0 +/* 80034844 00031784 80 A6 00 08 */ lwz r5, 8(r6) +/* 80034848 00031788 38 60 00 01 */ li r3, 1 +/* 8003484C 0003178C 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034850 00031790 7C 60 00 30 */ slw r0, r3, r0 +/* 80034854 00031794 7C A0 00 78 */ andc r0, r5, r0 +/* 80034858 00031798 90 06 00 08 */ stw r0, 8(r6) +/* 8003485C 0003179C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_80034860.s b/include/func_80034860.s new file mode 100644 index 00000000000..5dd9b984271 --- /dev/null +++ b/include/func_80034860.s @@ -0,0 +1,11 @@ +/* 80034860 000317A0 7C 80 2E 70 */ srawi r0, r4, 5 +/* 80034864 000317A4 54 00 10 3A */ slwi r0, r0, 2 +/* 80034868 000317A8 7C 63 02 14 */ add r3, r3, r0 +/* 8003486C 000317AC 80 A3 00 08 */ lwz r5, 8(r3) +/* 80034870 000317B0 38 60 00 01 */ li r3, 1 +/* 80034874 000317B4 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034878 000317B8 7C 60 00 30 */ slw r0, r3, r0 +/* 8003487C 000317BC 7C A3 00 38 */ and r3, r5, r0 +/* 80034880 000317C0 30 03 FF FF */ addic r0, r3, -1 +/* 80034884 000317C4 7C 60 19 10 */ subfe r3, r0, r3 +/* 80034888 000317C8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_8003488C.s b/include/func_8003488C.s new file mode 100644 index 00000000000..2f5c63e552e --- /dev/null +++ b/include/func_8003488C.s @@ -0,0 +1,14 @@ +/* 8003488C 000317CC 7C 86 2E 70 */ srawi r6, r4, 5 +/* 80034890 000317D0 38 A0 00 01 */ li r5, 1 +/* 80034894 000317D4 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034898 000317D8 7C A4 00 30 */ slw r4, r5, r0 +/* 8003489C 000317DC 54 C0 10 3A */ slwi r0, r6, 2 +/* 800348A0 000317E0 7C 63 02 14 */ add r3, r3, r0 +/* 800348A4 000317E4 80 03 00 08 */ lwz r0, 8(r3) +/* 800348A8 000317E8 7C 00 22 78 */ xor r0, r0, r4 +/* 800348AC 000317EC 90 03 00 08 */ stw r0, 8(r3) +/* 800348B0 000317F0 80 03 00 08 */ lwz r0, 8(r3) +/* 800348B4 000317F4 7C 03 20 38 */ and r3, r0, r4 +/* 800348B8 000317F8 30 03 FF FF */ addic r0, r3, -1 +/* 800348BC 000317FC 7C 60 19 10 */ subfe r3, r0, r3 +/* 800348C0 00031800 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_800348C4.s b/include/func_800348C4.s new file mode 100644 index 00000000000..d00fd655163 --- /dev/null +++ b/include/func_800348C4.s @@ -0,0 +1,10 @@ +/* 800348C4 00031804 7C 80 2E 70 */ srawi r0, r4, 5 +/* 800348C8 00031808 54 00 10 3A */ slwi r0, r0, 2 +/* 800348CC 0003180C 7C C3 02 14 */ add r6, r3, r0 +/* 800348D0 00031810 80 A6 00 18 */ lwz r5, 0x18(r6) +/* 800348D4 00031814 38 60 00 01 */ li r3, 1 +/* 800348D8 00031818 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 800348DC 0003181C 7C 60 00 30 */ slw r0, r3, r0 +/* 800348E0 00031820 7C A0 03 78 */ or r0, r5, r0 +/* 800348E4 00031824 90 06 00 18 */ stw r0, 0x18(r6) +/* 800348E8 00031828 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_800348EC.s b/include/func_800348EC.s new file mode 100644 index 00000000000..d91a800b265 --- /dev/null +++ b/include/func_800348EC.s @@ -0,0 +1,11 @@ +/* 800348EC 0003182C 7C 80 2E 70 */ srawi r0, r4, 5 +/* 800348F0 00031830 54 00 10 3A */ slwi r0, r0, 2 +/* 800348F4 00031834 7C 63 02 14 */ add r3, r3, r0 +/* 800348F8 00031838 80 A3 00 18 */ lwz r5, 0x18(r3) +/* 800348FC 0003183C 38 60 00 01 */ li r3, 1 +/* 80034900 00031840 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034904 00031844 7C 60 00 30 */ slw r0, r3, r0 +/* 80034908 00031848 7C A3 00 38 */ and r3, r5, r0 +/* 8003490C 0003184C 30 03 FF FF */ addic r0, r3, -1 +/* 80034910 00031850 7C 60 19 10 */ subfe r3, r0, r3 +/* 80034914 00031854 4E 80 00 20 */ blr \ No newline at end of file diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 8d2eff49020..f656c26ac69 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -983,4 +983,41 @@ asm bool dSv_memBit_c::isTbox(int param_1) const { nofralloc #include "func_800347E8.s" } -#endif \ No newline at end of file +#endif + +asm void dSv_memBit_c::onSwitch(int) { + nofralloc + #include "func_80034810.s" +} + +asm void dSv_memBit_c::offSwitch(int) { + nofralloc + #include "func_80034838.s" +} + +asm bool dSv_memBit_c::isSwitch(int) const { + nofralloc + #include "func_80034860.s" +} + +asm u8 dSv_memBit_c::revSwitch(int){ + nofralloc + #include "func_8003488C.s" +} + +asm void dSv_memBit_c::onItem(int) { + nofralloc + #include "func_800348C4.s" +} +asm bool dSv_memBit_c::isItem(int) const { + nofralloc + #include "func_800348EC.s" +} + +void dSv_memBit_c::onDungeonItem(int param_1) { + this->dungeons_flags = this->dungeons_flags | (u8)(1 << param_1); +} + +bool dSv_memBit_c::isDungeonItem(int param_1) const { + return this->dungeons_flags & (u8)(1 << param_1) ? true : false; +} \ No newline at end of file